Ficha Clínica
diff --git a/trunk/SiprpWebFichasClinicas/WebContent/static/html/app/Form5/Form5Controller.js b/trunk/SiprpWebFichasClinicas/WebContent/static/html/app/Form5/Form5Controller.js index 2e799c00..3214256a 100644 --- a/trunk/SiprpWebFichasClinicas/WebContent/static/html/app/Form5/Form5Controller.js +++ b/trunk/SiprpWebFichasClinicas/WebContent/static/html/app/Form5/Form5Controller.js @@ -16,7 +16,11 @@ }); $scope.add = function(selected){ + + $scope.editForm.$reset(); + $scope.editing = angular.copy(selected); + globals.plugins.buildFloatingSideMenu({ title: 'Ficha de Aptidão', documentclick: function(){ @@ -24,38 +28,35 @@ $scope.openModalDocumentos(); } }); - - $scope.editForm.$reset(); - - $scope.editing = angular.copy(selected); }; $scope.edit = function(selected){ - globals.plugins.buildFloatingSideMenu({ - title: 'Ficha de Aptidão', - documentclick: function(){ + $scope.editForm.$reset(); - $scope.openModalDocumentos(); - } - }); + $scope.storeFichasClinicas.extraParams = { + fichaID: selected.id + }; - $timeout(function () { - - $scope.editForm.$reset(); + $scope.storeFichasClinicas.get(function(response, status, headers, config, items){ + + $scope.selected = items; - //$scope.storeFichasClinicas.extraParams = { - // fichaID: selected.id - //}; + $scope.editing = angular.copy($scope.selected); + + $timeout(function () { + + globals.plugins.buildFloatingSideMenu({ + title: 'Ficha de Aptidão', + documentclick: function(){ - //$scope.storeFichasClinicas.get(function(response, status, headers, config, items){ - - // $scope.selected = items; + $scope.openModalDocumentos(); + } + }); - // $scope.editing = angular.copy($scope.selected); - //}); + }, 0); - }, 0); + }); }; $scope.save = function(complete){ @@ -64,27 +65,10 @@ if(isValid) { - //if(complete) - //{ - // $scope.editing.ficha.data_conclusao = new Date(); - //} - //else - //{ - // $scope.editing.ficha.data_conclusao = null; - //} - - //$scope.storeFichasClinicas.upsert($scope.selected, $scope.editing, function(response, selected, editing, isNewRecord){ - - // if(response.success && complete) - // { - // globals.plugins.hideFloatingSideMenu(); - - // $scope.$parent.loadModule({Controller: 'Search'}, function(className, scope, isNewModule){ - - // angular.element(scope.comboTrabalhadores.domEl).triggerHandler('change'); - // }); - // } - //}); + $scope.storeFichasClinicas.upsert($scope.selected, $scope.editing, function(response, selected, editing){ + + + }); } }; diff --git a/trunk/SiprpWebFichasClinicas/WebContent/static/html/app/Login/LoginController.js b/trunk/SiprpWebFichasClinicas/WebContent/static/html/app/Login/LoginController.js index dcae95c5..2e2db0cc 100644 --- a/trunk/SiprpWebFichasClinicas/WebContent/static/html/app/Login/LoginController.js +++ b/trunk/SiprpWebFichasClinicas/WebContent/static/html/app/Login/LoginController.js @@ -11,8 +11,8 @@ $scope.storeLogin.broadcastEvents = false; $scope.editing = { - user: '', - pass: '' + user: 'admin', + pass: '2Yz146Oss5Q' }; $scope.login = function(e) { diff --git a/trunk/SiprpWebFichasClinicas/WebContent/static/html/app/SearchForm/SearchView.html b/trunk/SiprpWebFichasClinicas/WebContent/static/html/app/SearchForm/SearchView.html index 7cc0bd70..ed17ae5a 100644 --- a/trunk/SiprpWebFichasClinicas/WebContent/static/html/app/SearchForm/SearchView.html +++ b/trunk/SiprpWebFichasClinicas/WebContent/static/html/app/SearchForm/SearchView.html @@ -113,12 +113,12 @@
| {{item.nome}} |