Merge branch 'master' into 'master'

Master See merge request !19

Merge branch 'master' into 'master'
Master See merge request !19
Eric Fernandez
2 parents 75a9948b74 62ccc3b54b
Showing 3 changed files Show diff stats
src/js/controllerCisterna.js
src/views/foca-abm-cisterna-item.html
src/views/foca-abm-vehiculos-item.html
@@ -4,11 +4,12 @@ angular.module(&#39;focaAbmVehiculo&#39;)
         'focaModalService', 'focaBotoneraLateralService', '$timeout', '$window',
         function($scope, focaAbmVehiculoService, $routeParams, $location, $uibModal,
         focaModalService, focaBotoneraLateralService, $timeout, $window) {
+            $scope.nuevo = ($routeParams.id > 0) ? false : true;
             $scope.editar = false;
             $scope.now = new Date();
             $scope.cisterna = {};
  
-            $scope.focused = 1;
+            $scope.focused = $scope.nuevo ? 1 : 2;
             $scope.next = function(key) {
                 if (key === 13) $scope.focused++;
             };
@@ -18,6 +18,7 @@
                 ng-keypress="next($event.keyCode)"
                 foca-focus="focused == 1"
                 ng-focus="focused = 1"
+                ng-disabled="!nuevo"
                 teclado-virtual
             />
         </div>
@@ -21,6 +21,7 @@
                             foca-focus="focused == 1"
                             ng-focus="focused = 1"
                             ng-keypress="next($event.keyCode)"
+                            ng-disabled="!nuevo"
                         />
                     </div>
                 </div>
...	...	@@ -4,11 +4,12 @@ angular.module('focaAbmVehiculo')
4	4	'focaModalService', 'focaBotoneraLateralService', '$timeout', '$window',
5	5	function($scope, focaAbmVehiculoService, $routeParams, $location, $uibModal,
6	6	focaModalService, focaBotoneraLateralService, $timeout, $window) {
	7	+ $scope.nuevo = ($routeParams.id > 0) ? false : true;
7	8	$scope.editar = false;
8	9	$scope.now = new Date();
9	10	$scope.cisterna = {};
10	11
11		- $scope.focused = 1;
	12	+ $scope.focused = $scope.nuevo ? 1 : 2;
12	13	$scope.next = function(key) {
13	14	if (key === 13) $scope.focused++;
14	15	};
...	...	@@ -18,6 +18,7 @@
18	18	ng-keypress="next($event.keyCode)"
19	19	foca-focus="focused == 1"
20	20	ng-focus="focused = 1"
	21	+ ng-disabled="!nuevo"
21	22	teclado-virtual
22	23	/>
23	24	</div>
...	...	@@ -21,6 +21,7 @@
21	21	foca-focus="focused == 1"
22	22	ng-focus="focused = 1"
23	23	ng-keypress="next($event.keyCode)"
	24	+ ng-disabled="!nuevo"
24	25	/>
25	26	</div>
26	27	</div>