From a46cf821bec3bb33fba2f991091970975c69077a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jo=C3=A3o=20Maur=C3=ADcio?= <deactivated@coded.pt>
Date: Wed, 11 Jun 2014 09:43:21 +0000
Subject: [PATCH] =?UTF-8?q?Correc=C3=A7=C3=B5es=20CLASSIFICA=C3=87=C3=83O?=
 =?UTF-8?q?=20INDIVIDUAL=20DE=20SA=C3=9ADE.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

git-svn-id: https://svn.coded.pt/svn/SIPRP@1930 bb69d46d-e84e-40c8-a05a-06db0d633741
---
 .../static/html/app/Main/MainController.js    |   2 +-
 .../ClassificacaoIndividualSaude-1.html       | 176 ++++++++++++++----
 .../static/html/js/parsley-custom.js          |  11 +-
 3 files changed, 151 insertions(+), 38 deletions(-)

diff --git a/trunk/SiprpWebFichasClinicas/WebContent/static/html/app/Main/MainController.js b/trunk/SiprpWebFichasClinicas/WebContent/static/html/app/Main/MainController.js
index e298e3c2..0ca03ece 100644
--- a/trunk/SiprpWebFichasClinicas/WebContent/static/html/app/Main/MainController.js
+++ b/trunk/SiprpWebFichasClinicas/WebContent/static/html/app/Main/MainController.js
@@ -192,7 +192,7 @@
                             {
                                 var fieldEl = $(fieldDomEl[0]);
 
-                                scope.editForm.domEl.parsley('removeItem', fieldEl); 
+                                scope.editForm.domEl.parsley('removeItem', fieldEl);
 
                                 if(!remove)
                                 {
diff --git a/trunk/SiprpWebFichasClinicas/WebContent/static/html/app/partials/ClassificacaoIndividualSaude-1.html b/trunk/SiprpWebFichasClinicas/WebContent/static/html/app/partials/ClassificacaoIndividualSaude-1.html
index cd803f19..a707cd5f 100644
--- a/trunk/SiprpWebFichasClinicas/WebContent/static/html/app/partials/ClassificacaoIndividualSaude-1.html
+++ b/trunk/SiprpWebFichasClinicas/WebContent/static/html/app/partials/ClassificacaoIndividualSaude-1.html
@@ -19,47 +19,157 @@ notice: only contents inside this div will be rendered/compiled
 	                            Sem problemas de saúde </label>
 	                    </div>
 	                    
-	                    <div class="checkbox">
-	                        <label>
-	                            <input ng-click="classificacaoIndividualSaude(false)"
-	                            ng-model="editing.classificacaoIndividualSaude.alteracao_temporaria_saude" value="true" type="checkbox" />
-	                            Com alteração temporária de saúde </label>
+	                    <div class="checkbox">	                    
+                            <div class="row">
+                                <div class="col-md-4">
+			                        <label>
+			                            <input ng-click="classificacaoIndividualSaude(false)" ng-model="editing.classificacaoIndividualSaude.alteracao_temporaria_saude" value="true" type="checkbox" />
+			                            Com alteração temporária de saúde 
+		                            </label>                                
+                                </div>
+                                <div class="col-md-8 p-l-none">
+	                                <div ng-show="editing.classificacaoIndividualSaude.alteracao_temporaria_saude" class="row">
+	                                    <div class="col-md-2">
+	                                        <label class="control-label">Quais?</label>
+	                                    </div>
+	                                    <div class="col-md-10">
+	                                        <textarea ng-model="editing.classificacaoIndividualSaude.alteracao_temporaria_saude_quais" rows="2" class="form-control"></textarea>
+	                                    </div>
+	                                </div>                              
+                                </div>
+                            </div>                            
 	                    </div>
-	                    <div class="checkbox">
-	                        <label>
-	                            <input ng-click="classificacaoIndividualSaude(false)"
-	                            ng-model="editing.classificacaoIndividualSaude.doenca_cronica_sem_interferencia" value="true" type="checkbox" />
-	                            Com doença crónica sem interferência na função </label>
+	                    
+	                    <div class="checkbox"> 
+                            <div class="row">
+                                <div class="col-md-4">
+			                        <label>
+			                            <input ng-click="classificacaoIndividualSaude(false)"
+			                            ng-model="editing.classificacaoIndividualSaude.doenca_cronica_sem_interferencia" value="true" type="checkbox" />
+			                            Com doença crónica sem interferência na função 
+		                           	</label>                               
+                                </div>
+                                <div class="col-md-8 p-l-none">
+	                                <div ng-show="editing.classificacaoIndividualSaude.doenca_cronica_sem_interferencia" class="row">
+	                                    <div class="col-md-2">
+	                                        <label class="control-label">Qual?</label>
+	                                    </div>
+	                                    <div class="col-md-10">
+	                                    	<input ng-model="editing.classificacaoIndividualSaude.doenca_cronica_sem_interferencia_quais" type="text" class="form-control" />
+	                                    </div>
+	                                </div>                              
+                                </div>
+                            </div>
 	                    </div>
-	                    <div class="checkbox">
-	                        <label>
-	                            <input ng-click="classificacaoIndividualSaude(false)"
-	                            ng-model="editing.classificacaoIndividualSaude.doenca_cronica_com_interferencia" value="true" type="checkbox" />
-	                            Com doença crónica com interferência na função </label>
+	                    
+	                    <div class="checkbox">                           
+                            <div class="row">
+                                <div class="col-md-4">
+			                        <label>
+			                            <input ng-click="classificacaoIndividualSaude(false)"
+			                            ng-model="editing.classificacaoIndividualSaude.doenca_cronica_com_interferencia" value="true" type="checkbox" />
+			                            Com doença crónica com interferência na função 
+		                            </label>                              
+                                </div>
+                                <div class="col-md-8 p-l-none">
+	                                <div ng-show="editing.classificacaoIndividualSaude.doenca_cronica_com_interferencia" class="row">
+	                                    <div class="col-md-2">
+	                                        <label class="control-label">Qual?</label>
+	                                    </div>
+	                                    <div class="col-md-10">
+	                                    	<input ng-model="editing.classificacaoIndividualSaude.doenca_cronica_com_interferencia_quais" type="text" class="form-control" />
+	                                    </div>
+	                                </div>                              
+                                </div>
+                            </div>                            
 	                    </div>
-	                    <div class="checkbox">
-	                        <label>
-	                            <input ng-click="classificacaoIndividualSaude(false)"
-	                            ng-model="editing.classificacaoIndividualSaude.doenca_profissional" value="true" type="checkbox" />
-	                            Com doença profissional </label>
+	                    
+	                    <div class="checkbox">                            
+                            <div class="row">
+                                <div class="col-md-4">
+			                        <label>
+			                            <input ng-click="classificacaoIndividualSaude(false)"
+			                            ng-model="editing.classificacaoIndividualSaude.doenca_profissional" value="true" type="checkbox" />
+			                            Com doença profissional 
+		                            </label>                             
+                                </div>
+                                <div class="col-md-8 p-l-none">
+	                                <div ng-show="editing.classificacaoIndividualSaude.doenca_profissional" class="row">
+	                                    <div class="col-md-2">
+	                                        <label class="control-label">Qual?</label>
+	                                    </div>
+	                                    <div class="col-md-10">
+	                                    	<input ng-model="editing.classificacaoIndividualSaude.doenca_profissional_quais" type="text" class="form-control" />
+	                                    </div>
+	                                </div>                              
+                                </div>
+                            </div>                             
 	                    </div>
-	                    <div class="checkbox">
-	                        <label>
-	                            <input ng-click="classificacaoIndividualSaude(false)"
-	                            ng-model="editing.classificacaoIndividualSaude.incapacidade_parcial" value="true" type="checkbox" />
-	                            Com incapacidade parcial </label>
+	                    
+	                    <div class="checkbox">                           
+                            <div class="row">
+                                <div class="col-md-4">
+			                        <label>
+			                            <input ng-click="classificacaoIndividualSaude(false)"
+			                            ng-model="editing.classificacaoIndividualSaude.incapacidade_parcial" value="true" type="checkbox" />
+			                            Com incapacidade parcial 
+		                            </label>                           
+                                </div>
+                                <div class="col-md-8 p-l-none">
+	                                <div ng-show="editing.classificacaoIndividualSaude.incapacidade_parcial" class="row">
+	                                    <div class="col-md-2">
+	                                        <label class="control-label">Qual?</label>
+	                                    </div>
+	                                    <div class="col-md-10">
+	                                    	<input ng-model="editing.classificacaoIndividualSaude.incapacidade_parcial_quais" type="text" class="form-control" />
+	                                    </div>
+	                                </div>                              
+                                </div>
+                            </div>                             
 	                    </div>
+	                    
 	                    <div class="checkbox">
-	                        <label>
-	                            <input ng-click="classificacaoIndividualSaude(false)"
-	                            ng-model="editing.classificacaoIndividualSaude.incapacidade_total" value="true" type="checkbox" />
-	                            Com incapacidade total </label>
+                            <div class="row">
+                                <div class="col-md-4">
+			                        <label>
+			                            <input ng-click="classificacaoIndividualSaude(false)"
+			                            ng-model="editing.classificacaoIndividualSaude.incapacidade_total" value="true" type="checkbox" />
+			                            Com incapacidade total 
+		                            </label>                         
+                                </div>
+                                <div class="col-md-8 p-l-none">
+	                                <div ng-show="editing.classificacaoIndividualSaude.incapacidade_total" class="row">
+	                                    <div class="col-md-2">
+	                                        <label class="control-label">Qual?</label>
+	                                    </div>
+	                                    <div class="col-md-10">
+	                                    	<input ng-model="editing.classificacaoIndividualSaude.incapacidade_total_quais" type="text" class="form-control" />
+	                                    </div>
+	                                </div>                              
+                                </div>
+                            </div>
 	                    </div>
+	                    
 	                    <div class="checkbox">
-	                        <label>
-	                            <input ng-click="classificacaoIndividualSaude(false)"
-	                            ng-model="editing.classificacaoIndividualSaude.parecer_em_estudo" value="true" type="checkbox" />
-	                            Parecer em estudo </label>
+                            <div class="row">
+                                <div class="col-md-4">
+			                        <label>
+			                            <input ng-click="classificacaoIndividualSaude(false)"
+			                            ng-model="editing.classificacaoIndividualSaude.parecer_em_estudo" value="true" type="checkbox" />
+			                            Parecer em estudo 
+		                            </label>                        
+                                </div>
+                                <div class="col-md-8 p-l-none">
+	                                <div ng-show="editing.classificacaoIndividualSaude.parecer_em_estudo" class="row">
+	                                    <div class="col-md-2">
+	                                        <label class="control-label">Qual?</label>
+	                                    </div>
+	                                    <div class="col-md-10">
+	                                    	<input ng-model="editing.classificacaoIndividualSaude.parecer_em_estudo_quais" type="text" class="form-control" />
+	                                    </div>
+	                                </div>                              
+                                </div>
+                            </div>
 	                    </div>
 	                    
 	                </div>
diff --git a/trunk/SiprpWebFichasClinicas/WebContent/static/html/js/parsley-custom.js b/trunk/SiprpWebFichasClinicas/WebContent/static/html/js/parsley-custom.js
index 7dbd7de9..ed0c0f67 100644
--- a/trunk/SiprpWebFichasClinicas/WebContent/static/html/js/parsley-custom.js
+++ b/trunk/SiprpWebFichasClinicas/WebContent/static/html/js/parsley-custom.js
@@ -1264,17 +1264,20 @@
     * @return {Boolean}
     */
     , removeItem: function ( elem ) {
+    	
       var parsleyItem = $( elem ).parsley();
 
       // identify & remove item if same Parsley hash
       for ( var i = 0; i < this.items.length; i++ ) {
 
         if(parsleyItem != null)
-        {
-            if(this.items[ i ].hash && parsleyItem.hash){// <!--- change date 19-11-2013
+        {
+        	var item = this.items[ i ];
+        	
+            if(item.hash && parsleyItem.hash){// <!--- change date 19-11-2013
 
-                if ( this.items[ i ].hash === parsleyItem.hash ) {
-                  this.items[ i ].destroy();
+                if ( item.hash === parsleyItem.hash ) {
+                  item.destroy();
                   this.items.splice( i, 1 );
                   return true;
                 }