Luigi / foca-modal-cheque

Download as
Browse Code »

Commit f2515ee9ff027a3bb82d23751f5b246ff0c00612

Authored by Eric Fernandez
2 parents e6205404e5 ff2a51ac7f
Exists in master and in 1 other branch develop

conflictos

Showing 2 changed files   Show diff stats
src/js/controller.js
Diff comments   View file @ f2515ee
... ... @@ -5,7 +5,8 @@ angular.module('focaModalCheque')
5 5 '$scope',
6 6 '$uibModalInstance',
7 7 '$uibModal',
8   - function($filter, $scope, $uibModalInstance, $uibModal) {
  8 + 'sugerido',
  9 + function($filter, $scope, $uibModalInstance, $uibModal, sugerido) {
9 10 $scope.cheque = {
10 11 banco: {
11 12 desbco: ''//Nombre del banco
... ... @@ -18,8 +19,11 @@ angular.module('focaModalCheque')
18 19 },
19 20 fechaEmision: new Date()
20 21 };
  22 + $scope.focused = 1;
21 23  
22   -
  24 + if(sugerido && sugerido < 0) {
  25 + $scope.cheque.importe = Math.abs(sugerido);
  26 + }
23 27  
24 28 $scope.seleccionarBanco = function(key) {
25 29 if(key === 13) {
... ... @@ -34,6 +38,7 @@ angular.module(&#39;focaModalCheque&#39;)
34 38 );
35 39 modalInstance.result.then(function(banco) {
36 40 $scope.cheque.banco = banco;
  41 + $scope.focused = 2;
37 42 }, function() {
38 43 //TODO: función llamada cuando cancela el modal
39 44 });
... ... @@ -55,6 +60,7 @@ angular.module(&#39;focaModalCheque&#39;)
55 60 );
56 61 modalInstance.result.then(function(provincia) {
57 62 $scope.cheque.provincia = provincia;
  63 + $scope.focused = 3;
58 64 }, function() {
59 65 //TODO: función llamada cuando cancela el modal
60 66 });
... ... @@ -84,6 +90,7 @@ angular.module(&#39;focaModalCheque&#39;)
84 90 );
85 91 modalInstance.result.then(function(localidad) {
86 92 $scope.cheque.localidad = localidad;
  93 + $scope.focused = 4;
87 94 }, function() {
88 95 //TODO: función llamada cuando cancela el modal
89 96 });
src/views/modal-cheque.html
Diff comments   View file @ f2515ee
... ... @@ -10,13 +10,14 @@
10 10 <div class="col-12 col-md-10 input-group">
11 11 <input
12 12 type="text"
13   - foca-focus="true"
14 13 teclado-virtual
15 14 class="form-control form-control-sm"
16 15 placeholder="Nombre del banco o código"
17 16 ng-model="cheque.banco.desbco"
18 17 ng-required="true"
19 18 ng-keypress="seleccionarBanco($event.keyCode)"
  19 + foca-focus="focused == 1"
  20 + ng-focus="focused = 1"
20 21 />
21 22 <div class="input-group-append">
22 23 <button
... ... @@ -40,7 +41,9 @@
40 41 placeholder="Nombre o Código de Provincia "
41 42 ng-model="cheque.provincia.NOMBRE"
42 43 ng-required="true"
43   - ng-keypress="seleccionarProvincia($event.keyCode)"/>
  44 + ng-keypress="seleccionarProvincia($event.keyCode)"
  45 + foca-focus="focused == 2"
  46 + ng-focus="focused = 2"/>
44 47 <div class="input-group-append">
45 48 <button
46 49 ladda="searchLoading"
... ... @@ -63,7 +66,9 @@
63 66 placeholder="Nombre o código del lugar"
64 67 ng-model="cheque.localidad.NOMBRE"
65 68 ng-required="true"
66   - ng-keypress="seleccionarLocalidad($event.keyCode)"/>
  69 + ng-keypress="seleccionarLocalidad($event.keyCode)"
  70 + foca-focus="focused == 3"
  71 + ng-focus="focused = 3"/>
67 72 <div class="input-group-append">
68 73 <button
69 74 ladda="searchLoading"
... ... @@ -85,7 +90,10 @@
85 90 class="form-control form-control-sm"
86 91 placeholder="Librador"
87 92 ng-model="cheque.librador"
88   - ng-required="true"/>
  93 + ng-required="true"
  94 + ng-keypress="focused = 5"
  95 + foca-focus="focused == 4"
  96 + ng-focus="focused = 4"/>
89 97 </div>
90 98 <div class="col-12 col-md-2">
91 99 <label class="form-control-sm">Cheque:</label>
... ... @@ -97,7 +105,10 @@
97 105 class="form-control form-control-sm"
98 106 placeholder="Número"
99 107 ng-model="cheque.numero"
100   - ng-required="true"/>
  108 + ng-required="true"
  109 + ng-keypress="focused = 6"
  110 + foca-focus="focused == 5"
  111 + ng-focus="focused = 5"/>
101 112 </div>
102 113 <div class="col-6 col-md-7 input-group mb-2">
103 114 <div class="input-group-prepend">
... ... @@ -109,7 +120,10 @@
109 120 class="form-control form-control-sm"
110 121 placeholder="Importe"
111 122 ng-model="cheque.importe"
112   - ng-required="true"/>
  123 + ng-keypress="focused = 7; datepickerOpen = true"
  124 + ng-required="true"
  125 + foca-focus="focused == 6"
  126 + ng-focus="focused = 6"/>
113 127 </div>
114 128 <div class="col-12 col-md-2">
115 129 <label class="form-control-sm">Emisión:</label>
... ... @@ -121,11 +135,18 @@
121 135 </div>
122 136 </div>
123 137 <input
124   - type="date"
  138 + type="text"
125 139 class="form-control form-control-sm"
126 140 placeholder="Fecha"
127 141 ng-model="cheque.fechaEmision"
128   - ng-required="true"/>
  142 + uib-datepicker-popup="dd/MM/yyyy"
  143 + show-button-bar="false"
  144 + is-open="datepickerOpen"
  145 + on-open-focus="false"
  146 + ng-focus="datepickerOpen = true; focused = 7"
  147 + ng-required="true"
  148 + foca-focus="focused == 7"
  149 + ng-blur="focused = 8"/>
129 150 </div>
130 151 <div class="col-12 col-md-2">
131 152 <label class="form-control-sm">Presentación:</label>
... ... @@ -137,17 +158,28 @@
137 158 </div>
138 159 </div>
139 160 <input
140   - type="date"
  161 + type="text"
141 162 class="form-control form-control-sm"
142 163 placeholder="Fecha"
143 164 ng-model="cheque.fechaPresentacion"
144   - ng-required="true"/>
  165 + uib-datepicker-popup="dd/MM/yyyy"
  166 + show-button-bar="false"
  167 + is-open="datepicker2Open"
  168 + on-open-focus="false"
  169 + ng-focus="datepicker2Open = true; focused = 8"
  170 + ng-required="true"
  171 + foca-focus="focused == 8"
  172 + ng-blur="focused = 9"/>
145 173 </div>
146 174 <div class="col-12 col-md-2">
147 175 <label class="form-control-sm">Observaciones:</label>
148 176 </div>
149 177 <div class="col-12 col-md-10">
150   - <textarea teclado-virtual ng-model="cheque.observaciones" class="form-control form-control-sm"></textarea>
  178 + <textarea teclado-virtual
  179 + ng-model="cheque.observaciones"
  180 + class="form-control form-control-sm"
  181 + foca-focus="focused == 9"
  182 + ng-focus="focused = 9"></textarea>
151 183 </div>
152 184 </div>
153 185 </form>