diff --git a/trunk/SiprpWebFichasClinicas/WebContent/static/html/app/Form1/Form1Controller.js b/trunk/SiprpWebFichasClinicas/WebContent/static/html/app/Form1/Form1Controller.js
index 8360a6ec..1d2909dd 100644
--- a/trunk/SiprpWebFichasClinicas/WebContent/static/html/app/Form1/Form1Controller.js
+++ b/trunk/SiprpWebFichasClinicas/WebContent/static/html/app/Form1/Form1Controller.js
@@ -2,6 +2,8 @@
{
$scope.globals = globals;
+ $scope.descricao = null;
+
$scope.calculatedAge = 0;
$scope.storeFichasClinicas = new globals.dataService.store({
@@ -91,25 +93,16 @@
{
$scope.storeFichasClinicas.upsert($scope.selected, $scope.editing, function(response, selected, editing, isNewRecord){
- //TODO: id's de cada ficha - injectar no modelo em edição
-
-
- //if(isNewRecord)
- //{
- // //$scope.isNewRecord = isNewRecord;
- //}
-
- //$scope.editing.ficha.id = editing.ficha.id;
-
- //if(response.success)
- //{
- // $scope.edit($scope.selected);
- //}
+ //TODO: check the need for other keys!!!
+ if(response.data)
+ {
+ $scope.editing.ficha.id = response.data.ficha.id;
+ }
});
}
};
- $scope.gridAddItem = function(item, array, arrayName){
+ $scope.gridAddItem = function(item, array, arrayName, el){
if(!angular.isArray(array))
{
@@ -118,12 +111,56 @@
}
array.push(item);
+
+ $timeout(function () {
+
+ if(el != undefined)
+ {
+ var table = $(el.target).closest('table');
+ if(table.length > 0)
+ {
+ var inputs = $(table[0]).find('input[data-required="true"]');
+
+ $.each(inputs, function(index, el) {
+
+ var input = $(el);
+
+ //activate field validation
+ $scope.editForm.$removeConstraints(input, false);
+ });
+ }
+ }
+ });
};
- $scope.gridRemoveItem = function(index, array){
+ $scope.gridRemoveItem = function(index, array, el){
if(angular.isArray(array))
{
+ if(el != undefined)
+ {
+ var table = $(el.target).closest('table');
+ if(table.length > 0)
+ {
+ var trs = $(table[0]).find('tr[class="ng-scope"]');
+
+ if(trs.length > 0 && trs[index] != undefined)
+ {
+ var tr = $(trs[index]);
+
+ var inputs = tr.find('input[data-required="true"]');
+
+ $.each(inputs, function(index, el) {
+
+ var input = $(el);
+
+ //disable field validation
+ $scope.editForm.$removeConstraints(input, true);
+ });
+ }
+ }
+ }
+
array.splice(index, 1);
}
};
diff --git a/trunk/SiprpWebFichasClinicas/WebContent/static/html/app/Form1/Form1View.html b/trunk/SiprpWebFichasClinicas/WebContent/static/html/app/Form1/Form1View.html
index 78ba418f..6390b7b9 100644
--- a/trunk/SiprpWebFichasClinicas/WebContent/static/html/app/Form1/Form1View.html
+++ b/trunk/SiprpWebFichasClinicas/WebContent/static/html/app/Form1/Form1View.html
@@ -12,7 +12,7 @@
Ficha Clínica
- Exame de Admissão/Inicial
+
@@ -612,7 +612,7 @@
|
-
+
|
@@ -760,7 +760,7 @@
|
-
+
|
@@ -779,7 +779,7 @@
- |
@@ -818,7 +818,7 @@
|
-
+
|
@@ -3366,42 +3366,42 @@
diff --git a/trunk/SiprpWebFichasClinicas/WebContent/static/html/app/Form2/Form2Controller.js b/trunk/SiprpWebFichasClinicas/WebContent/static/html/app/Form2/Form2Controller.js
index 59da1e38..8814f004 100644
--- a/trunk/SiprpWebFichasClinicas/WebContent/static/html/app/Form2/Form2Controller.js
+++ b/trunk/SiprpWebFichasClinicas/WebContent/static/html/app/Form2/Form2Controller.js
@@ -1,26 +1,70 @@
evoapp.controller('Form2Controller', function($rootScope, $scope, $timeout, $compile, $injector, $filter, globals)
{
- $scope.save = function(){
+ $scope.globals = globals;
+
+ $scope.descricao = null;
+
+ $scope.add = function(selected){
+
+ $scope.editForm.$reset();
+
+ $scope.editing = angular.copy(selected);
+ };
+
+ $scope.edit = function(selected){
+
+ $timeout(function () {
+
+ $scope.editForm.$reset();
- //globals.message.confirm({
- // question: 'Tem a certeza que deseja continuar?',
- // answer: function(result){
- // if(result)
- // {
-
- // }
- // }
- //});
+
+ }, 0);
+ };
+
+ $scope.save = function(){
var isValid = $scope.editForm.$isValid();
if(isValid)
{
-
-
+
}
- };
+ };
+
+ $scope.cancel = function(){
+
+ globals.message.custom({
+ title: null,
+ message: 'Pretende anular as alterações à ficha ou gravar para edição posterior?',
+ buttons: {
+ cancelar: {
+ label: 'Cancelar',
+ className: 'btn-default',
+ callback: function() {
+ //cancelar diálogo
+ }
+ },
+ anular: {
+ label: 'Anular',
+ className: 'btn-danger',
+ callback: function() {
+
+ $scope.$parent.loadModule({Controller: 'Search'}, function(className, scope, isNewModule){
+
+ });
+ }
+ },
+ gravar: {
+ label: 'Gravar',
+ className: 'btn-success',
+ callback: function() {
+ $scope.save();
+ }
+ }
+ }
+ });
+ };
$scope.$on('afterrender', function(event, args){
diff --git a/trunk/SiprpWebFichasClinicas/WebContent/static/html/app/Form2/Form2View.html b/trunk/SiprpWebFichasClinicas/WebContent/static/html/app/Form2/Form2View.html
index ba537cdc..82b9c45d 100644
--- a/trunk/SiprpWebFichasClinicas/WebContent/static/html/app/Form2/Form2View.html
+++ b/trunk/SiprpWebFichasClinicas/WebContent/static/html/app/Form2/Form2View.html
@@ -1,31 +1,79 @@