Merge branch 'master' into 'develop'

Master See merge request !15

Merge branch 'master' into 'develop'
Master See merge request !15
Luigi
2 parents 68149af34a 570d9fce9b
Showing 3 changed files Show diff stats
src/js/controller.js
src/views/foca-abm-precios-condiciones-item.html
src/views/foca-abm-precios-condiciones-listado.html
@@ -5,11 +5,16 @@ angular.module(&#39;focaAbmPreciosCondiciones&#39;)
         function($scope, focaAbmPreciosCondicionesService, $location,
             focaModalService, focaBotoneraLateralService, $timeout, $localStorage) {
  
+            $scope.focusSearch = false;
+            $scope.filters = '';
+            $scope.now = new Date();
             $timeout(function() {
                 focaBotoneraLateralService.showSalir(true);
                 focaBotoneraLateralService.showPausar(false);
                 focaBotoneraLateralService.showCancelar(false);
                 focaBotoneraLateralService.showGuardar(false);
+
+                $scope.focusSearch = true;
             });
  
             $scope.filters = '';
@@ -89,6 +89,7 @@
                         foca-focus="focused == 4"
                         ng-focus="focused = 4"
                         placeholder="Días"
+                        teclado-virtual
                     />
                     <div class="input-group-append">
                         <button
@@ -16,6 +16,7 @@
                         teclado-virtual
                         ng-keypress="buscar($event.keyCode)"
                         ng-model="filters"
+                        foca-focus="focusSearch"
                     />
                     <div class="input-group-append">
                         <button
...	...	@@ -5,11 +5,16 @@ angular.module('focaAbmPreciosCondiciones')
5	5	function($scope, focaAbmPreciosCondicionesService, $location,
6	6	focaModalService, focaBotoneraLateralService, $timeout, $localStorage) {
7	7
	8	+ $scope.focusSearch = false;
	9	+ $scope.filters = '';
	10	+ $scope.now = new Date();
8	11	$timeout(function() {
9	12	focaBotoneraLateralService.showSalir(true);
10	13	focaBotoneraLateralService.showPausar(false);
11	14	focaBotoneraLateralService.showCancelar(false);
12	15	focaBotoneraLateralService.showGuardar(false);
	16	+
	17	+ $scope.focusSearch = true;
13	18	});
14	19
15	20	$scope.filters = '';
...	...	@@ -89,6 +89,7 @@
89	89	foca-focus="focused == 4"
90	90	ng-focus="focused = 4"
91	91	placeholder="Días"
	92	+ teclado-virtual
92	93	/>
93	94	<div class="input-group-append">
94	95	<button
...	...	@@ -16,6 +16,7 @@
16	16	teclado-virtual
17	17	ng-keypress="buscar($event.keyCode)"
18	18	ng-model="filters"
	19	+ foca-focus="focusSearch"
19	20	/>
20	21	<div class="input-group-append">
21	22	<button