From a569e95189f794bbd5efbb439ecb05b971eeb761 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jo=C3=A3o=20Maur=C3=ADcio?= Date: Tue, 29 Apr 2014 17:16:54 +0000 Subject: [PATCH] git-svn-id: https://svn.coded.pt/svn/SIPRP@1880 bb69d46d-e84e-40c8-a05a-06db0d633741 --- .../WebContent/static/html/app/Form1/Form1Controller.js | 4 ++-- .../WebContent/static/html/app/Form2/Form2Controller.js | 4 ++-- .../WebContent/static/html/app/directives/customCombo.js | 6 ++++++ 3 files changed, 10 insertions(+), 4 deletions(-) diff --git a/trunk/SiprpWebFichasClinicas/WebContent/static/html/app/Form1/Form1Controller.js b/trunk/SiprpWebFichasClinicas/WebContent/static/html/app/Form1/Form1Controller.js index 013b9f56..28e74397 100644 --- a/trunk/SiprpWebFichasClinicas/WebContent/static/html/app/Form1/Form1Controller.js +++ b/trunk/SiprpWebFichasClinicas/WebContent/static/html/app/Form1/Form1Controller.js @@ -96,7 +96,7 @@ $scope.$parent.loadModule({Controller: 'Search'}, function(className, scope, isNewModule){ - scope.storeResumoTrabalhador.refresh(); + angular.element(scope.comboTrabalhadores.domEl).triggerHandler('change'); }); } @@ -202,7 +202,7 @@ $scope.$parent.loadModule({Controller: 'Search'}, function(className, scope, isNewModule){ - scope.storeResumoTrabalhador.refresh(); + angular.element(scope.comboTrabalhadores.domEl).triggerHandler('change'); }); } diff --git a/trunk/SiprpWebFichasClinicas/WebContent/static/html/app/Form2/Form2Controller.js b/trunk/SiprpWebFichasClinicas/WebContent/static/html/app/Form2/Form2Controller.js index 3c6a1c4b..3ce0c505 100644 --- a/trunk/SiprpWebFichasClinicas/WebContent/static/html/app/Form2/Form2Controller.js +++ b/trunk/SiprpWebFichasClinicas/WebContent/static/html/app/Form2/Form2Controller.js @@ -65,7 +65,7 @@ $scope.$parent.loadModule({Controller: 'Search'}, function(className, scope, isNewModule){ - scope.storeResumoTrabalhador.refresh(); + angular.element(scope.comboTrabalhadores.domEl).triggerHandler('change'); }); } }); @@ -105,7 +105,7 @@ $scope.$parent.loadModule({Controller: 'Search'}, function(className, scope, isNewModule){ - scope.storeResumoTrabalhador.refresh(); + angular.element(scope.comboTrabalhadores.domEl).triggerHandler('change'); }); } } diff --git a/trunk/SiprpWebFichasClinicas/WebContent/static/html/app/directives/customCombo.js b/trunk/SiprpWebFichasClinicas/WebContent/static/html/app/directives/customCombo.js index ad2ef9e8..5fe8ce8d 100644 --- a/trunk/SiprpWebFichasClinicas/WebContent/static/html/app/directives/customCombo.js +++ b/trunk/SiprpWebFichasClinicas/WebContent/static/html/app/directives/customCombo.js @@ -84,6 +84,12 @@ evoapp.directive('customCombo', function() { $scope.options = $scope.store.items; + //$timeout(function () { + + // $scope.setValue(null); + // angular.element($scope.domEl).triggerHandler('select'); + //}); + if(callBackFn != null) { callback(callBackFn, [response, status, headers, config, items]);