From 23573a7f60f30fa96c03b0aecdeb8922a8e81618 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jo=C3=A3o=20Maur=C3=ADcio?= Date: Thu, 8 May 2014 14:56:27 +0000 Subject: [PATCH] git-svn-id: https://svn.coded.pt/svn/SIPRP@1905 bb69d46d-e84e-40c8-a05a-06db0d633741 --- .../html/app/Documents/DocumentsView.html | 3 - .../static/html/app/Form3/Form3Controller.js | 41 ++++++++++- .../static/html/app/Form4/Form4Controller.js | 69 ++++++++++++++++++- .../static/html/app/Form4/Form4View.html | 18 ++--- .../html/app/SearchForm/SearchView.html | 10 +-- .../static/html/app/directives/fileUpload.js | 2 +- .../static/html/app/services/Plugins.js | 6 +- .../WebContent/static/html/css/theme.css | 26 ++++++- .../WebContent/static/html/index.html | 2 +- 9 files changed, 153 insertions(+), 24 deletions(-) diff --git a/trunk/SiprpWebFichasClinicas/WebContent/static/html/app/Documents/DocumentsView.html b/trunk/SiprpWebFichasClinicas/WebContent/static/html/app/Documents/DocumentsView.html index 96459765..bb8b38cc 100644 --- a/trunk/SiprpWebFichasClinicas/WebContent/static/html/app/Documents/DocumentsView.html +++ b/trunk/SiprpWebFichasClinicas/WebContent/static/html/app/Documents/DocumentsView.html @@ -17,9 +17,6 @@ {{item.nome}} - diff --git a/trunk/SiprpWebFichasClinicas/WebContent/static/html/app/Form3/Form3Controller.js b/trunk/SiprpWebFichasClinicas/WebContent/static/html/app/Form3/Form3Controller.js index 041d3e5a..ebeabb90 100644 --- a/trunk/SiprpWebFichasClinicas/WebContent/static/html/app/Form3/Form3Controller.js +++ b/trunk/SiprpWebFichasClinicas/WebContent/static/html/app/Form3/Form3Controller.js @@ -3,6 +3,17 @@ $scope.globals = globals; $scope.descricao = null; + + $scope.calculatedAge = 0; + + $scope.storeFichasClinicas = new globals.dataService.store({ + model: null, + actions: { + get: 'getFicha', + upsert: 'sendFicha', + destroy: 'sendFicha' + } + }); $scope.add = function(selected){ @@ -33,7 +44,16 @@ $scope.editForm.$reset(); + $scope.storeFichasClinicas.extraParams = { + fichaID: selected.id + }; + $scope.storeFichasClinicas.get(function(response, status, headers, config, items){ + + $scope.selected = items; + + $scope.editing = angular.copy($scope.selected); + }); }, 0); }; @@ -52,6 +72,19 @@ { $scope.editing.ficha.data_conclusao = null; } + + $scope.storeFichasClinicas.upsert($scope.selected, $scope.editing, function(response, selected, editing, isNewRecord){ + + if(response.success && complete) + { + globals.plugins.hideSideMenu(); + + $scope.$parent.loadModule({Controller: 'Search'}, function(className, scope, isNewModule){ + + angular.element(scope.comboTrabalhadores.domEl).triggerHandler('change'); + }); + } + }); } }; @@ -77,6 +110,7 @@ $scope.$parent.loadModule({Controller: 'Search'}, function(className, scope, isNewModule){ + angular.element(scope.comboTrabalhadores.domEl).triggerHandler('change'); }); } }, @@ -84,9 +118,14 @@ label: 'Gravar', className: 'btn-success', callback: function() { - $scope.save(false); + $scope.save(false); globals.plugins.hideFloatingSideMenu(); + + $scope.$parent.loadModule({Controller: 'Search'}, function(className, scope, isNewModule){ + + angular.element(scope.comboTrabalhadores.domEl).triggerHandler('change'); + }); } } } diff --git a/trunk/SiprpWebFichasClinicas/WebContent/static/html/app/Form4/Form4Controller.js b/trunk/SiprpWebFichasClinicas/WebContent/static/html/app/Form4/Form4Controller.js index a4634dc0..5a0580ca 100644 --- a/trunk/SiprpWebFichasClinicas/WebContent/static/html/app/Form4/Form4Controller.js +++ b/trunk/SiprpWebFichasClinicas/WebContent/static/html/app/Form4/Form4Controller.js @@ -1,13 +1,47 @@ evoapp.controller('Form4Controller', function($rootScope, $scope, $timeout, $compile, $injector, $filter, globals) { $scope.globals = globals; + + var scrollspyItems = $( + '
' + + ' ' + + '
' + ); $scope.descricao = null; + + $scope.calculatedAge = 0; + + $scope.storeFichasClinicas = new globals.dataService.store({ + model: null, + actions: { + get: 'getFicha', + upsert: 'sendFicha', + destroy: 'sendFicha' + } + }); $scope.add = function(selected){ globals.plugins.buildFloatingSideMenu({ title: 'Ficha Clinica', + scrollspyItems: scrollspyItems, + afterrender: function(){ + + $('body').scrollspy({ + target: '#scrollspyItems' + }); + }, documentclick: function(){ $scope.openModalDocumentos(); @@ -23,6 +57,13 @@ globals.plugins.buildFloatingSideMenu({ title: 'Ficha Clinica', + scrollspyItems: scrollspyItems, + afterrender: function(){ + + $('body').scrollspy({ + target: '#scrollspyItems' + }); + }, documentclick: function(){ $scope.openModalDocumentos(); @@ -33,7 +74,16 @@ $scope.editForm.$reset(); + $scope.storeFichasClinicas.extraParams = { + fichaID: selected.id + }; + + $scope.storeFichasClinicas.get(function(response, status, headers, config, items){ + + $scope.selected = items; + $scope.editing = angular.copy($scope.selected); + }); }, 0); }; @@ -53,7 +103,18 @@ $scope.editing.ficha.data_conclusao = null; } + $scope.storeFichasClinicas.upsert($scope.selected, $scope.editing, function(response, selected, editing, isNewRecord){ + if(response.success && complete) + { + globals.plugins.hideSideMenu(); + + $scope.$parent.loadModule({Controller: 'Search'}, function(className, scope, isNewModule){ + + angular.element(scope.comboTrabalhadores.domEl).triggerHandler('change'); + }); + } + }); } }; @@ -79,6 +140,7 @@ $scope.$parent.loadModule({Controller: 'Search'}, function(className, scope, isNewModule){ + angular.element(scope.comboTrabalhadores.domEl).triggerHandler('change'); }); } }, @@ -86,9 +148,14 @@ label: 'Gravar', className: 'btn-success', callback: function() { - $scope.save(false); + $scope.save(false); globals.plugins.hideFloatingSideMenu(); + + $scope.$parent.loadModule({Controller: 'Search'}, function(className, scope, isNewModule){ + + angular.element(scope.comboTrabalhadores.domEl).triggerHandler('change'); + }); } } } diff --git a/trunk/SiprpWebFichasClinicas/WebContent/static/html/app/Form4/Form4View.html b/trunk/SiprpWebFichasClinicas/WebContent/static/html/app/Form4/Form4View.html index a694540a..0dc297f5 100644 --- a/trunk/SiprpWebFichasClinicas/WebContent/static/html/app/Form4/Form4View.html +++ b/trunk/SiprpWebFichasClinicas/WebContent/static/html/app/Form4/Form4View.html @@ -20,7 +20,7 @@
-
+
@@ -170,7 +170,7 @@
-
Hábitos
+
Hábitos
@@ -445,7 +445,7 @@
-
Exame Objectivo
+
Exame Objectivo
@@ -903,7 +903,7 @@
-
Classificação Individual de Saúde
+
Classificação Individual de Saúde
@@ -955,7 +955,7 @@
-
Absentismo
+
Absentismo
@@ -969,7 +969,7 @@
-
Esquema Vacinal
+
Esquema Vacinal
@@ -1083,7 +1083,7 @@
-
Resumo
+
Resumo
@@ -1132,7 +1132,7 @@
-
Parecer
+
Parecer
@@ -1225,7 +1225,7 @@
-
Data do Exame
+
Data do Exame
diff --git a/trunk/SiprpWebFichasClinicas/WebContent/static/html/app/SearchForm/SearchView.html b/trunk/SiprpWebFichasClinicas/WebContent/static/html/app/SearchForm/SearchView.html index a67c8f75..f9800115 100644 --- a/trunk/SiprpWebFichasClinicas/WebContent/static/html/app/SearchForm/SearchView.html +++ b/trunk/SiprpWebFichasClinicas/WebContent/static/html/app/SearchForm/SearchView.html @@ -107,7 +107,7 @@ {{item.concluido ? 'Concluido' : 'Em Aberto'}} - @@ -148,9 +148,11 @@
 
- +
diff --git a/trunk/SiprpWebFichasClinicas/WebContent/static/html/app/directives/fileUpload.js b/trunk/SiprpWebFichasClinicas/WebContent/static/html/app/directives/fileUpload.js index bee8658e..7d88dc2e 100644 --- a/trunk/SiprpWebFichasClinicas/WebContent/static/html/app/directives/fileUpload.js +++ b/trunk/SiprpWebFichasClinicas/WebContent/static/html/app/directives/fileUpload.js @@ -48,7 +48,7 @@ dataType: 'json', singleFileUploads: true, autoUpload: false, - acceptFileTypes: /(\.|\/)(gif|jpe?g|png|pdf|doc|docx)$/i + acceptFileTypes: /(\.|\/)(gif|jpe?g|png|pdf|doc|docx|odt|ods|odp)$/i }).on('fileuploadadd', function (e, data) { var file = data.files[0]; diff --git a/trunk/SiprpWebFichasClinicas/WebContent/static/html/app/services/Plugins.js b/trunk/SiprpWebFichasClinicas/WebContent/static/html/app/services/Plugins.js index 30fa5586..4fca4cde 100644 --- a/trunk/SiprpWebFichasClinicas/WebContent/static/html/app/services/Plugins.js +++ b/trunk/SiprpWebFichasClinicas/WebContent/static/html/app/services/Plugins.js @@ -262,8 +262,10 @@ var btnOpenDocuments = $( '
' + - ' ' + '
' ); diff --git a/trunk/SiprpWebFichasClinicas/WebContent/static/html/css/theme.css b/trunk/SiprpWebFichasClinicas/WebContent/static/html/css/theme.css index c225cba1..c6c3a1dd 100644 --- a/trunk/SiprpWebFichasClinicas/WebContent/static/html/css/theme.css +++ b/trunk/SiprpWebFichasClinicas/WebContent/static/html/css/theme.css @@ -26,7 +26,7 @@ body { /* Not required for template or sticky footer method. */ body > .container { - padding: 60px 15px 0; + padding: 0px 15px 0; } .container .text-muted { margin: 20px 0; @@ -457,4 +457,26 @@ div.floating-side-menu .nav li.active a .custom-modal-footer { padding:10px; -} \ No newline at end of file +} + +.badge.documents-badge{ + + color: #ffffff; + top: -8px; + padding: 5px 8px 4px 8px; + background-color: #f0ad4e; +} + + + + + + + + + + + + + + diff --git a/trunk/SiprpWebFichasClinicas/WebContent/static/html/index.html b/trunk/SiprpWebFichasClinicas/WebContent/static/html/index.html index 5543c3c5..d0d3e9e3 100644 --- a/trunk/SiprpWebFichasClinicas/WebContent/static/html/index.html +++ b/trunk/SiprpWebFichasClinicas/WebContent/static/html/index.html @@ -85,7 +85,7 @@ -