Commit 5988e1dc5c44725cf59c10a1cbe7daa2219426b1
Exists in
lab
Merge branch 'master' into 'lab'
Master(benjamin) See merge request !14
Showing
1 changed file
Show diff stats
src/views/foca-modal-remito.html
... | ... | @@ -5,59 +5,25 @@ |
5 | 5 | </div> |
6 | 6 | <div class="input-group col-lg-6 pr-0 my-2"> |
7 | 7 | <div class="mr-4"> |
8 | - <input | |
9 | - ladda="searchLoading" | |
10 | - type="text" | |
11 | - class="form-control form-control-sm" | |
12 | - placeholder="CLIENTE" | |
13 | - ng-model="filtersCliente" | |
14 | - ng-change="searchCliente()" | |
15 | - ng-keydown="busquedaDown($event.keyCode)" | |
16 | - ng-keypress="busquedaPress($event.keyCode)" | |
17 | - foca-focus="selectedRemito == -1" | |
18 | - ng-focus="selectedRemito = -1" | |
19 | - id="search" | |
20 | - teclado-virtual | |
21 | - > | |
22 | - <button | |
23 | - ng-show="filtersCliente.length >= 1" | |
24 | - type="button" | |
25 | - class="clear-input" | |
26 | - ng-click="filtersCliente = ''" | |
27 | - > | |
8 | + <input ladda="searchLoading" type="text" class="form-control form-control-sm" placeholder="CLIENTE" | |
9 | + ng-model="filtersCliente" ng-change="searchCliente()" ng-keydown="busquedaDown($event.keyCode)" | |
10 | + ng-keypress="busquedaPress($event.keyCode)" foca-focus="selectedRemito == -1" | |
11 | + ng-focus="selectedRemito = -1" id="search" teclado-virtual> | |
12 | + <button ng-show="filtersCliente.length >= 1" type="button" class="clear-input" | |
13 | + ng-click="filtersCliente = ''"> | |
28 | 14 | <i class="fa fa-times"></i> |
29 | 15 | </button> |
30 | 16 | </div> |
31 | - <input | |
32 | - ladda="searchLoading" | |
33 | - type="text" | |
34 | - class="form-control form-control-sm" | |
35 | - placeholder="REMITO" | |
36 | - ng-model="filtersRemito" | |
37 | - ng-change="searchRemito()" | |
38 | - ng-keydown="busquedaDown($event.keyCode)" | |
39 | - ng-keypress="busquedaPress($event.keyCode)" | |
40 | - foca-focus="selectedRemito == -1" | |
41 | - ng-focus="selectedRemito = -1" | |
42 | - id="search" | |
43 | - teclado-virtual | |
44 | - > | |
45 | - <button | |
46 | - ng-show="filtersRemito.length >= 1" | |
47 | - type="button" | |
48 | - class="clear-input" | |
49 | - ng-click="filtersRemito = ''" | |
50 | - > | |
17 | + <input ladda="searchLoading" type="text" class="form-control form-control-sm" placeholder="REMITO" | |
18 | + ng-model="filtersRemito" ng-change="searchRemito()" ng-keydown="busquedaDown($event.keyCode)" | |
19 | + ng-keypress="busquedaPress($event.keyCode)" foca-focus="selectedRemito == -1" | |
20 | + ng-focus="selectedRemito = -1" id="search" teclado-virtual> | |
21 | + <button ng-show="filtersRemito.length >= 1" type="button" class="clear-input" ng-click="filtersRemito = ''"> | |
51 | 22 | <i class="fa fa-times"></i> |
52 | 23 | </button> |
53 | 24 | <div class="input-group-append"> |
54 | - <button | |
55 | - ladda="searchLoading" | |
56 | - data-spinner-color="#FF0000" | |
57 | - class="btn btn-outline-secondary" | |
58 | - type="button" | |
59 | - ng-click="busquedaPress(13)" | |
60 | - > | |
25 | + <button ladda="searchLoading" data-spinner-color="#FF0000" class="btn btn-outline-secondary" | |
26 | + type="button" ng-click="busquedaPress(13)"> | |
61 | 27 | <i class="fa fa-search" aria-hidden="true"></i> |
62 | 28 | </button> |
63 | 29 | </div> |
... | ... | @@ -69,52 +35,24 @@ |
69 | 35 | <small class="col-md-2 col-4 text-left my-1">Fecha Desde</small> |
70 | 36 | <div class="col-md-4 col-8 input-group mb-3"> |
71 | 37 | <div class="input-group-prepend"> |
72 | - <button | |
73 | - class="input-group-text" | |
74 | - type="button" | |
75 | - ng-click="datepickerOpen = true" | |
76 | - > | |
38 | + <button class="input-group-text" type="button" ng-click="datepickerOpen = true"> | |
77 | 39 | <i class="fa fa-calendar"></i> |
78 | 40 | </button> |
79 | 41 | </div> |
80 | - <input | |
81 | - class="form-control form-control-sm" | |
82 | - id="inlineFormInputGroup" | |
83 | - ladda="searchLoading" | |
84 | - type="text" | |
85 | - ng-model="fechaDesde" | |
86 | - ng-required="true" | |
87 | - uib-datepicker-popup="dd/MM/yyyy" | |
88 | - show-button-bar="false" | |
89 | - is-open="datepickerOpen" | |
90 | - on-open-focus="false" | |
91 | - ng-focus="datepickerOpen = true" | |
92 | - /> | |
42 | + <input class="form-control form-control-sm" id="inlineFormInputGroup" ladda="searchLoading" type="text" | |
43 | + ng-model="fechaDesde" ng-required="true" uib-datepicker-popup="dd/MM/yyyy" show-button-bar="false" | |
44 | + is-open="datepickerOpen" on-open-focus="false" ng-focus="datepickerOpen = true" /> | |
93 | 45 | </div> |
94 | 46 | <small class="col-md-2 col-4 text-left my-1">Fecha Hasta</small> |
95 | 47 | <div class="col-md-4 col-8 input-group mb-3"> |
96 | 48 | <div class="input-group-prepend"> |
97 | - <button | |
98 | - class="input-group-text" | |
99 | - type="button" | |
100 | - ng-click="datepicker2Open = true" | |
101 | - > | |
49 | + <button class="input-group-text" type="button" ng-click="datepicker2Open = true"> | |
102 | 50 | <i class="fa fa-calendar"></i> |
103 | 51 | </button> |
104 | 52 | </div> |
105 | - <input | |
106 | - class="form-control form-control-sm" | |
107 | - id="inlineFormInputGroup" | |
108 | - ladda="searchLoading" | |
109 | - type="text" | |
110 | - ng-model="fechaHasta" | |
111 | - ng-required="true" | |
112 | - uib-datepicker-popup="dd/MM/yyyy" | |
113 | - show-button-bar="false" | |
114 | - is-open="datepicker2Open" | |
115 | - on-open-focus="false" | |
116 | - ng-focus="datepicker2Open = true" | |
117 | - /> | |
53 | + <input class="form-control form-control-sm" id="inlineFormInputGroup" ladda="searchLoading" type="text" | |
54 | + ng-model="fechaHasta" ng-required="true" uib-datepicker-popup="dd/MM/yyyy" show-button-bar="false" | |
55 | + is-open="datepicker2Open" on-open-focus="false" ng-focus="datepicker2Open = true" /> | |
118 | 56 | </div> |
119 | 57 | </div> |
120 | 58 | <table ng-show="primerBusqueda" class="table table-hover table-sm"> |
... | ... | @@ -134,32 +72,22 @@ |
134 | 72 | No se encontraron resultados. |
135 | 73 | </td> |
136 | 74 | </tr> |
137 | - <tr class="selectable" | |
138 | - ng-repeat-start="(key, remito) in currentPageRemitos" | |
139 | - > | |
75 | + <tr class="selectable" ng-repeat-start="(key, remito) in currentPageRemitos"> | |
140 | 76 | <td ng-bind="remito.fechaRemito | date : 'dd/MM/yyyy'"></td> |
141 | 77 | <td ng-bind="remito.nombreCliente"></td> |
142 | 78 | <td ng-bind="[remito.sucursal, remito.numeroRemito] | comprobante"></td> |
143 | 79 | <td ng-bind="remito.total | number: 2"></td> |
144 | 80 | <td> |
145 | - <button | |
146 | - type="button" | |
147 | - class="btn btn-secondary btn-xs p-1" | |
148 | - ng-click="isCollapsed = !isCollapsed ; verProductos = remito.articulosRemito" | |
149 | - ><i class="fa fa-eye"></i> | |
81 | + <button type="button" class="btn btn-secondary btn-xs p-1" | |
82 | + ng-click="isCollapsed = !isCollapsed ; verProductos = remito.articulosRemito"><i | |
83 | + class="fa fa-eye"></i> | |
150 | 84 | </button> |
151 | 85 | </td> |
152 | 86 | <td> |
153 | - <button ng-click="select(remito);" | |
154 | - type="button" | |
155 | - class="btn btn-xs p-1 float-right" | |
156 | - ng-class="{ | |
87 | + <button ng-click="select(remito);" type="button" class="btn btn-xs p-1 float-right" ng-class="{ | |
157 | 88 | 'btn-secondary': selectedRemito != key, |
158 | 89 | 'btn-primary': selectedRemito == key |
159 | - }" | |
160 | - foca-focus="selectedRemito == {{key}}" | |
161 | - ng-keydown="itemRemito($event.keyCode)" | |
162 | - > | |
90 | + }" foca-focus="selectedRemito == {{key}}" ng-keydown="itemRemito($event.keyCode)"> | |
163 | 91 | <i class="fa fa-circle-thin" aria-hidden="true"></i> |
164 | 92 | </button> |
165 | 93 | </td> |
... | ... | @@ -173,14 +101,14 @@ |
173 | 101 | <th>Descripciรณn</th> |
174 | 102 | <th>Cantidad</th> |
175 | 103 | </tr> |
176 | - </thead> | |
104 | + </thead> | |
177 | 105 | <tbody> |
178 | 106 | <tr ng-repeat="(key, articulo) in verProductos"> |
179 | 107 | <td>{{articulo.codigo}}</td> |
180 | 108 | <td>{{articulo.descripcion}}</td> |
181 | 109 | <td>{{articulo.cantidad}}</td> |
182 | 110 | </tr> |
183 | - </tbody> | |
111 | + </tbody> | |
184 | 112 | </table> |
185 | 113 | </td> |
186 | 114 | </tr> |
... | ... | @@ -188,41 +116,24 @@ |
188 | 116 | </table> |
189 | 117 | </div> |
190 | 118 | <div class="modal-footer py-1"> |
191 | - <nav ng-show="currentPageRemitos.length > 0 && primerBusqueda" class="mr-auto"> | |
192 | - <ul class="pagination pagination-sm justify-content mb-0"> | |
193 | - <li class="page-item" ng-class="{'disabled': currentPage == 1}"> | |
194 | - <a | |
195 | - class="page-link" | |
196 | - href="javascript:void();" | |
197 | - ng-click="selectPage(currentPage - 1)" | |
198 | - > | |
199 | - <span aria-hidden="true">«</span> | |
200 | - <span class="sr-only">Anterior</span> | |
201 | - </a> | |
202 | - </li> | |
203 | - <li | |
204 | - class="page-item" | |
205 | - ng-repeat="pagina in paginas" | |
206 | - ng-class="{'active': pagina == currentPage}" | |
207 | - > | |
208 | - <a | |
209 | - class="page-link" | |
210 | - href="javascript:void();" | |
211 | - ng-click="selectPage(pagina)" | |
212 | - ng-bind="pagina" | |
213 | - ></a> | |
214 | - </li> | |
215 | - <li class="page-item" ng-class="{'disabled': currentPage == lastPage}"> | |
216 | - <a | |
217 | - class="page-link" | |
218 | - href="javascript:void();" | |
219 | - ng-click="selectPage(currentPage + 1)" | |
220 | - > | |
221 | - <span aria-hidden="true">»</span> | |
222 | - <span class="sr-only">Siguiente</span> | |
223 | - </a> | |
224 | - </li> | |
225 | - </ul> | |
226 | - </nav> | |
119 | + <nav ng-show="currentPageRemitos.length > 0 && primerBusqueda" class="mr-auto"> | |
120 | + <ul class="pagination pagination-sm justify-content mb-0"> | |
121 | + <li class="page-item" ng-class="{'disabled': currentPage == 1}"> | |
122 | + <a class="page-link" href="javascript:void();" ng-click="selectPage(currentPage - 1)"> | |
123 | + <span aria-hidden="true">«</span> | |
124 | + <span class="sr-only">Anterior</span> | |
125 | + </a> | |
126 | + </li> | |
127 | + <li class="page-item" ng-repeat="pagina in paginas" ng-class="{'active': pagina == currentPage}"> | |
128 | + <a class="page-link" href="javascript:void();" ng-click="selectPage(pagina)" ng-bind="pagina"></a> | |
129 | + </li> | |
130 | + <li class="page-item" ng-class="{'disabled': currentPage == lastPage}"> | |
131 | + <a class="page-link" href="javascript:void();" ng-click="selectPage(currentPage + 1)"> | |
132 | + <span aria-hidden="true">»</span> | |
133 | + <span class="sr-only">Siguiente</span> | |
134 | + </a> | |
135 | + </li> | |
136 | + </ul> | |
137 | + </nav> | |
227 | 138 | <button class="btn btn-sm btn-secondary" type="button" ng-click="cancel()">Cancelar</button> |
228 | 139 | -</div> |
140 | +</div> | |
229 | 141 | \ No newline at end of file |