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

trunk/SiprpWebFichasClinicas/WebContent/static/html/app/Form1/Form1Controller.js

@@ -61,9 +61,9 @@
         $scope.editing.antecentesOcupacionaisActividadesAnteriores = [];
         
         //TODO: rever estes modelos - 3 novas grelhas
-        $scope.editing.cirurgias = [];
-        $scope.editing.fracturas = [];
-        $scope.editing.internamentos = [];
+        $scope.editing.antecedentesPessoaisCirurgias = [];
+        $scope.editing.antecedentesPessoaisFracturas = [];
+        $scope.editing.antecedentesPessoaisInternamentos = [];
         
         $scope.editing.actividade = {
     		posto_representa_risco_saude: false

trunk/SiprpWebFichasClinicas/WebContent/static/html/app/Form1/Form1View.html

@@ -1136,7 +1136,7 @@
 						<tr>
 							<td colspan="5">
 								<button
-									ng-click="gridAddItem({}, editing.cirurgias, 'cirurgias', $event)"
+									ng-click="gridAddItem({}, editing.antecedentesPessoaisCirurgias, 'antecedentesPessoaisCirurgias', $event)"
 									type="button" class="btn btn-default btn-xs">
 									<span class="glyphicon glyphicon-plus"></span>Adicionar
 								</button>
@@ -1144,7 +1144,7 @@
 						</tr>
 					</tfoot>
 					<tbody>
-						<tr ng-repeat="item in editing.cirurgias">
+						<tr ng-repeat="item in editing.antecedentesPessoaisCirurgias">
 							<td><input ng-model="item.data" data-required="true"
 								data-regexp="^\d{4}[\/\-](0?[1-9]|1[012])[\/\-](0?[1-9]|[12][0-9]|3[01])$"
 								type="text" class="form-control" datepicker /></td>
@@ -1152,7 +1152,7 @@
 								data-required="true" type="text" class="form-control" /></td>
 							<td>
 								<button
-									ng-click="gridRemoveItem($index, editing.cirurgias, $event)"
+									ng-click="gridRemoveItem($index, editing.antecedentesPessoaisCirurgias, $event)"
 									type="button" class="btn btn-danger btn-xs">
 									<span class="glyphicon glyphicon-remove"></span>
 								</button>
@@ -1178,7 +1178,7 @@
 						<tr>
 							<td colspan="5">
 								<button
-									ng-click="gridAddItem({}, editing.fracturas, 'fracturas', $event)"
+									ng-click="gridAddItem({}, editing.antecedentesPessoaisFracturas, 'antecedentesPessoaisFracturas', $event)"
 									type="button" class="btn btn-default btn-xs">
 									<span class="glyphicon glyphicon-plus"></span>Adicionar
 								</button>
@@ -1186,7 +1186,7 @@
 						</tr>
 					</tfoot>
 					<tbody>
-						<tr ng-repeat="item in editing.fracturas">
+						<tr ng-repeat="item in editing.antecedentesPessoaisFracturas">
 							<td><input ng-model="item.data" data-required="true"
 								data-regexp="^\d{4}[\/\-](0?[1-9]|1[012])[\/\-](0?[1-9]|[12][0-9]|3[01])$"
 								type="text" class="form-control" datepicker /></td>
@@ -1194,7 +1194,7 @@
 								data-required="true" type="text" class="form-control" /></td>
 							<td>
 								<button
-									ng-click="gridRemoveItem($index, editing.fracturas, $event)"
+									ng-click="gridRemoveItem($index, editing.antecedentesPessoaisFracturas, $event)"
 									type="button" class="btn btn-danger btn-xs">
 									<span class="glyphicon glyphicon-remove"></span>
 								</button>
@@ -1220,7 +1220,7 @@
 						<tr>
 							<td colspan="5">
 								<button
-									ng-click="gridAddItem({}, editing.internamentos, 'internamentos', $event)"
+									ng-click="gridAddItem({}, editing.antecedentesPessoaisInternamentos, 'antecedentesPessoaisInternamentos', $event)"
 									type="button" class="btn btn-default btn-xs">
 									<span class="glyphicon glyphicon-plus"></span>Adicionar
 								</button>
@@ -1228,7 +1228,7 @@
 						</tr>
 					</tfoot>
 					<tbody>
-						<tr ng-repeat="item in editing.internamentos">
+						<tr ng-repeat="item in editing.antecedentesPessoaisInternamentos">
 							<td><input ng-model="item.data" data-required="true"
 								data-regexp="^\d{4}[\/\-](0?[1-9]|1[012])[\/\-](0?[1-9]|[12][0-9]|3[01])$"
 								type="text" class="form-control" datepicker /></td>
@@ -1236,7 +1236,7 @@
 								data-required="true" type="text" class="form-control" /></td>
 							<td>
 								<button
-									ng-click="gridRemoveItem($index, editing.internamentos, $event)"
+									ng-click="gridRemoveItem($index, editing.antecedentesPessoaisInternamentos, $event)"
 									type="button" class="btn btn-danger btn-xs">
 									<span class="glyphicon glyphicon-remove"></span>
 								</button>
@@ -1301,6 +1301,10 @@
     <p>&nbsp;</p>
     <p>&nbsp;</p>
     
+    <p>&nbsp;</p>
+    <p>&nbsp;</p>
+    <p>&nbsp;</p>
+
     <modal-window item-id="modalDocumentos" width="modal-small" view="Documents" title="Documentos"></modal-window>
 
 </section>

trunk/SiprpWebFichasClinicas/WebContent/static/html/app/partials/Reavaliacao-1.html

@@ -42,7 +42,7 @@ usage example: <partials-renderer partial-id="Reavaliacao-1"></partials-renderer
 	                                    <label class="control-label">Qual?</label>
 	                                </div>
 	                                <div class="col-md-10">
-	                                    <input ng-model="editing.conclusoesResumo.reavaliacao_outra_peridicidade_detalhe" type="text" class="form-control input-sm" />
+	                                    <input ng-model="editing.conclusoesResumo.reavaliacao_detalhe" type="text" class="form-control input-sm" />
 	                                </div>
 	                            </div>
 	                        </div>