git-svn-id: https://svn.coded.pt/svn/SIPRP@1905 bb69d46d-e84e-40c8-a05a-06db0d633741

12 years ago · 23573a7f60
parent 0d50b62de0
commit 23573a7f60
9 changed files with 153 additions and 24 deletions
--- a/trunk/SiprpWebFichasClinicas/WebContent/static/html/app/Documents/DocumentsView.html
+++ b/trunk/SiprpWebFichasClinicas/WebContent/static/html/app/Documents/DocumentsView.html
@ -17,9 +17,6 @@
                    <tr ng-repeat="item in storeDocuments.items">
                        <td style="width:80%;">{{item.nome}}</td>
                        <td style="width:20%">
-                            <button ng-click="edit(item)" class="btn btn-xs btn-default pull-right">
-                                <i class="glyphicon glyphicon-pencil"></i>
-                            </button>
                            <button ng-click="download(item)" class="btn btn-xs btn-default pull-right m-r-5">
                                <i class="glyphicon glyphicon-download-alt"></i>
                            </button>
--- 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');
+                        });
                    }
                }
            }
--- 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 = $(
+        '<div id="scrollspyItems">                      ' + 
+            '<ul class="nav nav-pills nav-stacked m-t-5 m-b-5">        ' + 
+            '    <li><a href="#section1">Identifica&ccedil;&atilde;o</a></li>' +   
+            '    <li><a href="#section2">Hábitos</a></li>' +  
+            '    <li><a href="#section3">Exame Objectivo</a></li>' +   
+            '    <li><a href="#section4">Classificação Individual de Saúde</a></li>' + 
+            '    <li><a href="#section5">Absentismo</a></li>' +    
+            '    <li><a href="#section6">Esquema Vacinal</a></li>' +  
+            '    <li><a href="#section7">Resumo</a></li>' +          
+            '    <li><a href="#section8">Parecer</a></li>' + 
+            '    <li><a href="#section9">Data do Exame</a></li>' +   
+            '</ul>                                         ' + 
+        '</div>'
+    ); 

    $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');
+                        });
                    }
                }
            }
--- a/trunk/SiprpWebFichasClinicas/WebContent/static/html/app/Form4/Form4View.html
+++ b/trunk/SiprpWebFichasClinicas/WebContent/static/html/app/Form4/Form4View.html
@ -20,7 +20,7 @@

    <form role="form" name="editForm" parsley-validate>

-        <div class="panel panel-default">
+        <div class="panel panel-default" id="section1">
            <div class="panel-body">

                <div class="form-horizontal">
@ -170,7 +170,7 @@
            </div>
        </div>

-        <h5 class="section-title" id="H3">Hábitos</h5>
+        <h5 class="section-title" id="section2">Hábitos</h5>
        <div class="panel panel-default">
            <div class="panel-body">
                <div class="row">
@ -445,7 +445,7 @@
            </div>
        </div>

-        <h5 class="section-title" id="H5">Exame Objectivo</h5>
+        <h5 class="section-title" id="section3">Exame Objectivo</h5>
        <div class="panel panel-default">
            <div class="panel-body">
                <div class="form-horizontal">
@ -903,7 +903,7 @@
            </div>
        </div>

-        <h5 class="section-title" id="H7">Classificação Individual de Saúde</h5>
+        <h5 class="section-title" id="section4">Classificação Individual de Saúde</h5>
        <div class="panel panel-default">
            <div class="panel-body">
                <div class="row">
@ -955,7 +955,7 @@
            </div>
        </div>

-        <h5 class="section-title" id="H8">Absentismo</h5>
+        <h5 class="section-title" id="section5">Absentismo</h5>
        <div class="panel panel-default">
            <div class="panel-body">
                <div class="form-group">
@ -969,7 +969,7 @@
            </div>
        </div>

-        <h5 class="section-title" id="H9">Esquema Vacinal</h5>
+        <h5 class="section-title" id="section6">Esquema Vacinal</h5>
        <div class="panel panel-default">
            <div class="panel-body">

@ -1083,7 +1083,7 @@
            </div>
        </div>

-        <h5 class="section-title">Resumo</h5>
+        <h5 class="section-title" id="section7">Resumo</h5>
        <div class="row">
            <div class="col-sm-6">
                
@ -1132,7 +1132,7 @@

        <div class="row">
            <div class="col-md-6">
-                <h5 class="section-title">Parecer</h5>
+                <h5 class="section-title" id="section8">Parecer</h5>
                <div class="panel panel-default">
                    <div class="panel-body">
                        
@ -1225,7 +1225,7 @@
            </div>
        </div>

-        <h5 class="section-title" id="H13">Data do Exame</h5>
+        <h5 class="section-title" id="section9">Data do Exame</h5>
        <div class="panel panel-default">
            <div class="panel-body">
                <div class="row">
--- a/trunk/SiprpWebFichasClinicas/WebContent/static/html/app/SearchForm/SearchView.html
+++ b/trunk/SiprpWebFichasClinicas/WebContent/static/html/app/SearchForm/SearchView.html
@ -107,7 +107,7 @@
                                    <td><span ng-bind="item.responsavel"></span></td>
                                    <td><span ng-class="{'label label-success': item.concluido, 'label label-primary': !item.concluido}">{{item.concluido ? 'Concluido' : 'Em Aberto'}}</span></td>
                                    <td>
-                                        <button data-toggle="tooltip" data-placement="left" title="Tooltip on left" ng-click="edit(item)" type="button" class="btn btn-xs btn-default">
+                                        <button data-toggle="tooltip" data-placement="left" title="Editar" ng-click="edit(item)" type="button" class="btn btn-xs btn-default">
                                            <span class="glyphicon glyphicon-pencil"></span>
                                        </button>
                                    </td>
@ -148,9 +148,11 @@
                        <div class="col-sm-2">&nbsp;</div>
                        <div class="col-sm-10">
                            
-                            <button ng-click="openModalDocumentos()" ng-show="dadosTrabalhador != null" type="button" class="btn btn-xs btn-primary">
-                                <span class="glyphicon glyphicon-folder-open m-r-5"></span> <small>Documentos</small>
-                            </button>
+							<button ng-click="openModalDocumentos()" ng-show="dadosTrabalhador != null" class="btn btn-primary btn-xs" type="button">
+						      <span class="glyphicon glyphicon-folder-open m-r-5"></span> 
+						      <span>Documentos</span> 
+						      <span class="badge documents-badge">6</span>
+						    </button>

                        </div>
                    </div>
--- 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];
--- 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 = $(
            '<div class="buttons-area">' + 
-                '<button type="button" class="btn btn-xs btn btn-primary">                      ' + 
-                '    <span class="glyphicon glyphicon-folder-open m-r-5"></span> <small>Documentos</small> ' + 
+                '<button type="button" class="btn btn-primary btn-xs">                      ' + 
+			      '<span class="glyphicon glyphicon-folder-open m-r-5"></span> ' + 
+			      '<span>Documentos</span> ' + 
+			      '<span class="badge documents-badge">6</span>' + 
                '</button>                                                                  ' + 
            '</div>'
        );
--- 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;
-}
+}
+
+.badge.documents-badge{
+	
+	color: #ffffff;
+	top: -8px;
+	padding: 5px 8px 4px 8px;
+	background-color: #f0ad4e;		
+}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
--- a/trunk/SiprpWebFichasClinicas/WebContent/static/html/index.html
+++ b/trunk/SiprpWebFichasClinicas/WebContent/static/html/index.html
@ -85,7 +85,7 @@

 </head>
 <body ng-cloak>
-    <div class="navbar navbar-default navbar-fixed-top" role="navigation">
+    <div class="navbar navbar-default navbar-static-top" role="navigation">
        <div class="container">

            <div class="navbar-header">