From 74d6f921f299b3bf652094beef013b43e0ddfb16 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jo=C3=A3o=20Maur=C3=ADcio?= <deactivated@coded.pt>
Date: Fri, 9 May 2014 09:37:31 +0000
Subject: [PATCH] =?UTF-8?q?Ficha=20Cl=C3=ADnica=20Peri=C3=B3dica?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

git-svn-id: https://svn.coded.pt/svn/SIPRP@1908 bb69d46d-e84e-40c8-a05a-06db0d633741
---
 .../static/html/app/Form3/Form3View.html      |  8 ++--
 .../static/html/app/Form4/Form4Controller.js  | 13 ++++--
 .../static/html/app/Form4/Form4View.html      | 44 +++++++++----------
 3 files changed, 36 insertions(+), 29 deletions(-)

diff --git a/trunk/SiprpWebFichasClinicas/WebContent/static/html/app/Form3/Form3View.html b/trunk/SiprpWebFichasClinicas/WebContent/static/html/app/Form3/Form3View.html
index 700f2539..9e4a0a59 100644
--- a/trunk/SiprpWebFichasClinicas/WebContent/static/html/app/Form3/Form3View.html
+++ b/trunk/SiprpWebFichasClinicas/WebContent/static/html/app/Form3/Form3View.html
@@ -176,11 +176,11 @@
                     <div class="panel-body">
                         <div class="form-group">
                             <label class="control-label">Saúde</label>
-                            <textarea ng-model="editing.resumo.problemas_saude" rows="3" class="form-control"></textarea>
+                            <textarea ng-model="editing.problemasSolucoes.problemas_saude" rows="3" class="form-control"></textarea>
                         </div>
                         <div class="form-group">
                             <label class="control-label">Trabalho</label>
-                            <textarea ng-model="editing.resumo.problemas_trabalho" rows="3" class="form-control"></textarea>
+                            <textarea ng-model="editing.problemasSolucoes.problemas_trabalho" rows="3" class="form-control"></textarea>
                         </div>
                     </div>
                 </div> 
@@ -193,11 +193,11 @@
                     <div class="panel-body">
                         <div class="form-group">
                             <label class="control-label">Saúde</label>
-                            <textarea ng-model="editing.resumo.solucoes_saude" rows="3" class="form-control"></textarea>
+                            <textarea ng-model="editing.problemasSolucoes.solucoes_problemas_saude" rows="3" class="form-control"></textarea>
                         </div>
                         <div class="form-group">
                             <label class="control-label">Trabalho</label>
-                            <textarea ng-model="editing.resumo.solucoes_trabalho" rows="3" class="form-control"></textarea>
+                            <textarea ng-model="editing.problemasSolucoes.solucoes_problemas_trabalho" rows="3" class="form-control"></textarea>
                         </div>
                     </div>
                 </div> 
diff --git a/trunk/SiprpWebFichasClinicas/WebContent/static/html/app/Form4/Form4Controller.js b/trunk/SiprpWebFichasClinicas/WebContent/static/html/app/Form4/Form4Controller.js
index 5a0580ca..263ace54 100644
--- a/trunk/SiprpWebFichasClinicas/WebContent/static/html/app/Form4/Form4Controller.js
+++ b/trunk/SiprpWebFichasClinicas/WebContent/static/html/app/Form4/Form4Controller.js
@@ -103,11 +103,18 @@
                 $scope.editing.ficha.data_conclusao = null;
             }
 
-            $scope.storeFichasClinicas.upsert($scope.selected, $scope.editing, function(response, selected, editing, isNewRecord){
+            //var isNewRecord = $scope.editing.ficha.id == null;
+
+            $scope.storeFichasClinicas.upsert($scope.selected, $scope.editing, function(response, selected, editing){
+
+                //if(isNewRecord && response.success)
+                //{
+                //    $scope.isNewRecord = true;
+                //}
 
                 if(response.success && complete)
                 {
-                    globals.plugins.hideSideMenu();
+                    globals.plugins.hideFloatingSideMenu();
 
                     $scope.$parent.loadModule({Controller: 'Search'}, function(className, scope, isNewModule){
                 
@@ -116,7 +123,7 @@
                 }
             }); 
         }
-    };
+    };    
 
     $scope.cancel = function(){
         
diff --git a/trunk/SiprpWebFichasClinicas/WebContent/static/html/app/Form4/Form4View.html b/trunk/SiprpWebFichasClinicas/WebContent/static/html/app/Form4/Form4View.html
index 0dc297f5..62b1dcdb 100644
--- a/trunk/SiprpWebFichasClinicas/WebContent/static/html/app/Form4/Form4View.html
+++ b/trunk/SiprpWebFichasClinicas/WebContent/static/html/app/Form4/Form4View.html
@@ -81,15 +81,15 @@
                     <div class="col-md-12">
                         <label class="control-label">Ocorreu alguma mudança na sua função ou nas condições de trabalho? </label>
                         <label class="checkbox-inline">
-                            <input ng-model="editing.actividade.posto_representa_risco_saude" name="rb_posto_representa_risco_saude" ng-value="false" type="radio" />
+                            <input ng-model="editing.informacaoPeriodica.mudanca_funcao_condicoes" name="rb_mudanca_funcao_condicoes" ng-value="false" type="radio" />
                             Não					       
                         </label>
                         <label class="checkbox-inline">
-                            <input ng-model="editing.actividade.posto_representa_risco_saude" name="rb_posto_representa_risco_saude" ng-value="true" type="radio" />
+                            <input ng-model="editing.informacaoPeriodica.mudanca_funcao_condicoes" name="rb_mudanca_funcao_condicoes" ng-value="true" type="radio" />
                             Sim					       
                         </label>
-                        <div ng-show="editing.actividade.posto_representa_risco_saude" class="form-group">
-                            <textarea ng-model="editing.absentismo.motivos_ausencia" rows="3" class="form-control"></textarea>
+                        <div ng-show="editing.informacaoPeriodica.mudanca_funcao_condicoes" class="form-group">
+                            <textarea ng-model="editing.informacaoPeriodica.mudanca_funcao_condicoes_detalhe" rows="3" class="form-control"></textarea>
                         </div>
                     </div>
                 </div>
@@ -101,7 +101,7 @@
                 <div class="row">
                     <div class="col-md-12">
                         <label class="control-label">Quais são as tarefas actualmente? </label>
-                        <textarea ng-model="editing.eee.fff2134" rows="3" class="form-control"></textarea>
+                        <textarea ng-model="editing.ficha.trabalhador_tarefas" rows="3" class="form-control"></textarea>
                     </div>
                 </div>
             </div>
@@ -113,15 +113,15 @@
                     <div class="col-md-12">
                         <label class="control-label">Ocorreu algum acidente de trabalho? Se sim, indique a data(s) e descrição do(s) acidente(s).</label>
                         <label class="checkbox-inline">
-                            <input ng-model="editing.actividade.wweee" name="rb_rrrdasdasde" ng-value="false" type="radio" />
+                            <input ng-model="editing.informacaoPeriodica.acidente_trabalho" name="rb_acidente_trabalho" ng-value="false" type="radio" />
                             Não					       
                         </label>
                         <label class="checkbox-inline">
-                            <input ng-model="editing.actividade.wweee" name="rb_rrrdasdasde" ng-value="true" type="radio" />
+                            <input ng-model="editing.informacaoPeriodica.acidente_trabalho" name="rb_acidente_trabalho" ng-value="true" type="radio" />
                             Sim					       
                         </label>
-                        <div ng-show="editing.actividade.wweee" class="form-group">
-                            <textarea ng-model="editing.absentismo.asdpasdaspdasdpa" rows="3" class="form-control"></textarea>
+                        <div ng-show="editing.informacaoPeriodica.acidente_trabalho" class="form-group">
+                            <textarea ng-model="editing.informacaoPeriodica.acidente_trabalho_detalhe" rows="3" class="form-control"></textarea>
                         </div>
                     </div>
                 </div>
@@ -134,15 +134,15 @@
                     <div class="col-md-12">
                         <label class="control-label">Houve alguma alteração no seu estado de saúde? (cirúrgias/internamentos/doenças/fracturas/traumatismos)</label>
                         <label class="checkbox-inline">
-                            <input ng-model="editing.actividade.jhgfdsxcfds" name="rb_kjhgfdsa" ng-value="false" type="radio" />
+                            <input ng-model="editing.informacaoPeriodica.alteracoes_estado_saude" name="rb_alteracoes_estado_saude" ng-value="false" type="radio" />
                             Não					       
                         </label>
                         <label class="checkbox-inline">
-                            <input ng-model="editing.actividade.jhgfdsxcfds" name="rb_kjhgfdsa" ng-value="true" type="radio" />
+                            <input ng-model="editing.informacaoPeriodica.alteracoes_estado_saude" name="rb_alteracoes_estado_saude" ng-value="true" type="radio" />
                             Sim					       
                         </label>
-                        <div ng-show="editing.actividade.jhgfdsxcfds" class="form-group">
-                            <textarea ng-model="editing.absentismo.sdasdasdadasd" rows="3" class="form-control"></textarea>
+                        <div ng-show="editing.informacaoPeriodica.alteracoes_estado_saude" class="form-group">
+                            <textarea ng-model="editing.informacaoPeriodica.alteracoes_estado_saude_detalhe" rows="3" class="form-control"></textarea>
                         </div>
                     </div>
                 </div>
@@ -155,15 +155,15 @@
                     <div class="col-md-12">
                         <label class="control-label">Relaciona com o seu trabalho alguma queixa de saúde que tenha surgido?</label>
                         <label class="checkbox-inline">
-                            <input ng-model="editing.actividade.uytgfdsz" name="rb_cvbhgtresxcv" ng-value="false" type="radio" />
+                            <input ng-model="editing.informacaoPeriodica.relaciona_trabalho_saude" name="rb_relaciona_trabalho_saude" ng-value="false" type="radio" />
                             Não					       
                         </label>
                         <label class="checkbox-inline">
-                            <input ng-model="editing.actividade.uytgfdsz" name="rb_cvbhgtresxcv" ng-value="true" type="radio" />
+                            <input ng-model="editing.informacaoPeriodica.relaciona_trabalho_saude" name="rb_relaciona_trabalho_saude" ng-value="true" type="radio" />
                             Sim					       
                         </label>
-                        <div ng-show="editing.actividade.uytgfdsz" class="form-group">
-                            <textarea ng-model="editing.absentismo.iuytfrdsa" rows="3" class="form-control"></textarea>
+                        <div ng-show="editing.informacaoPeriodica.relaciona_trabalho_saude" class="form-group">
+                            <textarea ng-model="editing.informacaoPeriodica.relaciona_trabalho_saude_detalhe" rows="3" class="form-control"></textarea>
                         </div>
                     </div>
                 </div>
@@ -1092,11 +1092,11 @@
                     <div class="panel-body">
                         <div class="form-group">
                             <label class="control-label">Saúde</label>
-                            <textarea ng-model="editing.resumo.problemas_saude" rows="3" class="form-control"></textarea>
+                            <textarea ng-model="editing.problemasSolucoes.problemas_saude" rows="3" class="form-control"></textarea>
                         </div>
                         <div class="form-group">
                             <label class="control-label">Trabalho</label>
-                            <textarea ng-model="editing.resumo.problemas_trabalho" rows="3" class="form-control"></textarea>
+                            <textarea ng-model="editing.problemasSolucoes.problemas_trabalho" rows="3" class="form-control"></textarea>
                         </div>
                     </div>
                 </div> 
@@ -1109,11 +1109,11 @@
                     <div class="panel-body">
                         <div class="form-group">
                             <label class="control-label">Saúde</label>
-                            <textarea ng-model="editing.resumo.solucoes_saude" rows="3" class="form-control"></textarea>
+                            <textarea ng-model="editing.problemasSolucoes.solucoes_problemas_saude" rows="3" class="form-control"></textarea>
                         </div>
                         <div class="form-group">
                             <label class="control-label">Trabalho</label>
-                            <textarea ng-model="editing.resumo.solucoes_trabalho" rows="3" class="form-control"></textarea>
+                            <textarea ng-model="editing.problemasSolucoes.solucoes_problemas_trabalho" rows="3" class="form-control"></textarea>
                         </div>
                     </div>
                 </div> 
@@ -1125,7 +1125,7 @@
             <div class="col-sm-12">
                 <div class="form-group">
                     <label class="control-label">Observações/Restrições</label>
-                    <textarea ng-model="editing.ficha.observacoes_restricoes" rows="3" class="form-control"></textarea>
+                    <textarea ng-model="editing.ficha.observacoes" rows="3" class="form-control"></textarea>
                 </div>
             </div>
         </div>