Commit f7edb0803098570362ad4a3b07b715a03d5e0f6b
Exists in
master
and in
1 other branch
Merge branch 'master' into 'develop'
Cambiado color de botón crear domicilio. See merge request !14
Showing
1 changed file
Show diff stats
src/views/modal-domicilio.html
1 | <div class="modal-header py-1"> | 1 | <div class="modal-header py-1"> |
2 | <div class="row w-100"> | 2 | <div class="row w-100"> |
3 | <div class="col-lg-6"> | 3 | <div class="col-lg-6"> |
4 | <h5 class="modal-title my-1" ng-hide="ingreso">Búsqueda de Domicilios</h5> | 4 | <h5 class="modal-title my-1" ng-hide="ingreso">Búsqueda de Domicilios</h5> |
5 | <h5 class="modal-title my-1" ng-show="ingreso">Crear domicilios de descarga</h5> | 5 | <h5 class="modal-title my-1" ng-show="ingreso">Crear domicilios de descarga</h5> |
6 | </div> | 6 | </div> |
7 | <div class="input-group col-lg-6 pr-0 my-2"> | 7 | <div class="input-group col-lg-6 pr-0 my-2"> |
8 | <button | ||
9 | class="btn btn-outline-debo mr-2" | ||
10 | ng-click="ingreso = true" | ||
11 | ng-show="!ingreso" | ||
12 | title="Nuevo"> | ||
13 | <i class="fa fa-plus" aria-hidden="true"></i> | ||
14 | </button> | ||
8 | <input | 15 | <input |
9 | type="text" | 16 | type="text" |
10 | class="form-control form-control-sm" | 17 | class="form-control form-control-sm" |
11 | id="search" | 18 | id="search" |
12 | placeholder="Búsqueda" | 19 | placeholder="Búsqueda" |
13 | ng-model="filters" | 20 | ng-model="filters" |
14 | ng-change="search()" | 21 | ng-change="search()" |
15 | ng-keydown="busquedaDown($event.keyCode)" | 22 | ng-keydown="busquedaDown($event.keyCode)" |
16 | ng-keypress="busquedaPress($event.keyCode)" | 23 | ng-keypress="busquedaPress($event.keyCode)" |
17 | foca-focus="selectedDomicilio == -1" | 24 | foca-focus="selectedDomicilio == -1" |
18 | ng-focus="selectedDomicilio = -1" | 25 | ng-focus="selectedDomicilio = -1" |
19 | teclado-virtual | 26 | teclado-virtual |
20 | > | 27 | > |
21 | <div class="input-group-append"> | 28 | <div class="input-group-append"> |
22 | <button | 29 | <button |
23 | ladda="searchLoading" | 30 | ladda="searchLoading" |
24 | class="btn btn-outline-secondary" | 31 | class="btn btn-outline-secondary" |
25 | type="button" | 32 | type="button" |
26 | ng-click="busquedaPress(13)" | 33 | ng-click="busquedaPress(13)" |
27 | > | 34 | > |
28 | <i class="fa fa-search" aria-hidden="true"></i> | 35 | <i class="fa fa-search" aria-hidden="true"></i> |
29 | </button> | 36 | </button> |
30 | </div> | 37 | </div> |
31 | </div> | 38 | </div> |
32 | </div> | 39 | </div> |
33 | </div> | 40 | </div> |
34 | <div class="modal-body" id="modal-body"> | 41 | <div class="modal-body" id="modal-body"> |
35 | 42 | ||
36 | <div ng-show="!primerBusqueda"> | 43 | <div ng-show="!primerBusqueda"> |
37 | Debe realizar una primer búsqueda. | 44 | Debe realizar una primer búsqueda. |
38 | </div> | 45 | </div> |
39 | 46 | ||
40 | <div ng-show="!ingreso"> | 47 | <div ng-show="!ingreso"> |
41 | <table ng-show="!ingreso" class="table table-striped table-sm"> | 48 | <table ng-show="!ingreso" class="table table-striped table-sm"> |
42 | <thead> | 49 | <thead> |
43 | <tr> | 50 | <tr> |
44 | <th>Titulo</th> | 51 | <th>Titulo</th> |
45 | <th>Calle</th> | 52 | <th>Calle</th> |
46 | <th>Localidad</th> | 53 | <th>Localidad</th> |
47 | <th>Provincia</th> | 54 | <th>Provincia</th> |
48 | <th></th> | 55 | <th></th> |
49 | <th></th> | 56 | <th></th> |
50 | </tr> | 57 | </tr> |
51 | </thead> | 58 | </thead> |
52 | <tbody> | 59 | <tbody> |
53 | <tr ng-show="currentPageDomicilios.length == 0 && primerBusqueda"> | 60 | <tr ng-show="currentPageDomicilios.length == 0 && primerBusqueda"> |
54 | <td colspan="5"> | 61 | <td colspan="5"> |
55 | No se encontraron resultados. | 62 | No se encontraron resultados. |
56 | </td> | 63 | </td> |
57 | </tr> | 64 | </tr> |
58 | <tr> | ||
59 | <td colspan="6" ng-show="!ingreso"> | ||
60 | <button | ||
61 | class="form-control form-control-sm btn-rounded" | ||
62 | type="text" | ||
63 | readonly | ||
64 | ng-click="ingreso = !ingreso" | ||
65 | > | ||
66 | <i class="fa fa-plus left" aria-hidden="true"></i> | ||
67 | Crear domicilio de entrega | ||
68 | </button> | ||
69 | </td> | ||
70 | </tr> | ||
71 | <tr class="selectable" | 65 | <tr class="selectable" |
72 | ng-repeat="(key,domicilio) in currentPageDomicilios"> | 66 | ng-repeat="(key,domicilio) in currentPageDomicilios"> |
73 | <td | 67 | <td |
74 | ng-bind="domicilio.titulo" | 68 | ng-bind="domicilio.titulo" |
75 | ng-click="select(domicilio)" | 69 | ng-click="select(domicilio)" |
76 | ></td> | 70 | ></td> |
77 | <td | 71 | <td |
78 | ng-bind="domicilio.Calle + ' ' + domicilio.Numero" | 72 | ng-bind="domicilio.Calle + ' ' + domicilio.Numero" |
79 | ng-click="select(domicilio)" | 73 | ng-click="select(domicilio)" |
80 | ></td> | 74 | ></td> |
81 | <td | 75 | <td |
82 | ng-bind="domicilio.Localidad" | 76 | ng-bind="domicilio.Localidad" |
83 | ng-click="select(domicilio)" | 77 | ng-click="select(domicilio)" |
84 | ></td> | 78 | ></td> |
85 | <td | 79 | <td |
86 | ng-bind="domicilio.Provincia" | 80 | ng-bind="domicilio.Provincia" |
87 | ng-click="select(domicilio)" | 81 | ng-click="select(domicilio)" |
88 | ></td> | 82 | ></td> |
89 | <td> | 83 | <td> |
90 | <button | 84 | <button |
91 | type="button" | 85 | type="button" |
92 | class="btn btn-sm p-1 float-right btn-secondary" | 86 | class="btn btn-sm p-1 float-right btn-secondary" |
93 | ng-click="verPuntosDescarga(key)" | 87 | ng-click="verPuntosDescarga(key)" |
94 | title="Puntos de descarga" | 88 | title="Puntos de descarga" |
95 | > | 89 | > |
96 | <small>PD</small> | 90 | <small>PD</small> |
97 | </button> | 91 | </button> |
98 | </td> | 92 | </td> |
99 | <td> | 93 | <td> |
100 | <button | 94 | <button |
101 | type="button" | 95 | type="button" |
102 | class="btn btn-sm p-1 float-right" | 96 | class="btn btn-sm p-1 float-right" |
103 | ng-class="{ | 97 | ng-class="{ |
104 | 'btn-secondary': selectedDomicilio != key + 1, | 98 | 'btn-secondary': selectedDomicilio != key + 1, |
105 | 'btn-primary': selectedDomicilio == key + 1 | 99 | 'btn-primary': selectedDomicilio == key + 1 |
106 | }" | 100 | }" |
107 | foca-focus="selectedDomicilio == {{key + 1}}" | 101 | foca-focus="selectedDomicilio == {{key + 1}}" |
108 | ng-keydown="itemDomicilio($event.keyCode)" | 102 | ng-keydown="itemDomicilio($event.keyCode)" |
109 | ng-click="select(domicilio)" | 103 | ng-click="select(domicilio)" |
110 | title="Seleccionar" | 104 | title="Seleccionar" |
111 | > | 105 | > |
112 | <i class="fa fa-circle-thin" aria-hidden="true"></i> | 106 | <i class="fa fa-circle-thin" aria-hidden="true"></i> |
113 | </button> | 107 | </button> |
114 | </td> | 108 | </td> |
115 | </tr> | 109 | </tr> |
116 | </tbody> | 110 | </tbody> |
117 | </table> | 111 | </table> |
118 | </div> | 112 | </div> |
119 | <form name="formDomicilio" ng-show="ingreso"> | 113 | <form name="formDomicilio" ng-show="ingreso"> |
120 | <input | 114 | <input |
121 | type="hidden" | 115 | type="hidden" |
122 | ng-model="domicilio.latitud" | 116 | ng-model="domicilio.latitud" |
123 | ng-required="true"> | 117 | ng-required="true"> |
124 | <input | 118 | <input |
125 | type="hidden" | 119 | type="hidden" |
126 | ng-model="domicilio.longitud" | 120 | ng-model="domicilio.longitud" |
127 | ng-required="true"> | 121 | ng-required="true"> |
128 | <div class="row"> | 122 | <div class="row"> |
129 | <div class="col-4"> | 123 | <div class="col-4"> |
130 | <label>Tipo</label> | 124 | <label>Tipo</label> |
131 | <select | 125 | <select |
132 | class="form-control" | 126 | class="form-control" |
133 | ng-disabled="true" | 127 | ng-disabled="true" |
134 | > | 128 | > |
135 | <option ng-value="2">Entrega</option> | 129 | <option ng-value="2">Entrega</option> |
136 | </select> | 130 | </select> |
137 | </div> | 131 | </div> |
138 | <div class="col-8"> | 132 | <div class="col-8"> |
139 | <label>Titulo</label> | 133 | <label>Titulo</label> |
140 | <input | 134 | <input |
141 | type="text" | 135 | type="text" |
142 | foca-focus="ingreso" | 136 | foca-focus="ingreso" |
143 | class="form-control" | 137 | class="form-control" |
144 | ng-model="domicilio.titulo" | 138 | ng-model="domicilio.titulo" |
145 | placeholder="Ingrese título" | 139 | placeholder="Ingrese título" |
146 | ng-required="true" | 140 | ng-required="true" |
147 | ng-keypress="next($event.keyCode)" | 141 | ng-keypress="next($event.keyCode)" |
148 | ng-focus="focused = 1" | 142 | ng-focus="focused = 1" |
149 | foca-focus="focused == 1" | 143 | foca-focus="focused == 1" |
150 | teclado-virtual | 144 | teclado-virtual |
151 | /> | 145 | /> |
152 | </div> | 146 | </div> |
153 | <div class="col-9"> | 147 | <div class="col-9"> |
154 | <label>Calle</label> | 148 | <label>Calle</label> |
155 | <input | 149 | <input |
156 | type="text" | 150 | type="text" |
157 | class="form-control" | 151 | class="form-control" |
158 | ng-model="domicilio.calle" | 152 | ng-model="domicilio.calle" |
159 | placeholder="Ingrese calle" | 153 | placeholder="Ingrese calle" |
160 | ng-required="true" | 154 | ng-required="true" |
161 | ng-keypress="next($event.keyCode)" | 155 | ng-keypress="next($event.keyCode)" |
162 | ng-focus="focused = 2" | 156 | ng-focus="focused = 2" |
163 | foca-focus="focused == 2" | 157 | foca-focus="focused == 2" |
164 | teclado-virtual | 158 | teclado-virtual |
165 | /> | 159 | /> |
166 | </div> | 160 | </div> |
167 | <div class="col-3"> | 161 | <div class="col-3"> |
168 | <label>Nº</label> | 162 | <label>Nº</label> |
169 | <input | 163 | <input |
170 | type="text" | 164 | type="text" |
171 | class="form-control" | 165 | class="form-control" |
172 | ng-model="domicilio.numeroCalle" | 166 | ng-model="domicilio.numeroCalle" |
173 | placeholder="Ingrese Numero" | 167 | placeholder="Ingrese Numero" |
174 | ng-required="true" | 168 | ng-required="true" |
175 | ng-keypress="next($event.keyCode)" | 169 | ng-keypress="next($event.keyCode)" |
176 | ng-focus="focused = 3" | 170 | ng-focus="focused = 3" |
177 | foca-focus="focused == 3" | 171 | foca-focus="focused == 3" |
178 | teclado-virtual | 172 | teclado-virtual |
179 | /> | 173 | /> |
180 | </div> | 174 | </div> |
181 | <div class="col-6"> | 175 | <div class="col-6"> |
182 | <label>Localidad</label> | 176 | <label>Localidad</label> |
183 | <input | 177 | <input |
184 | type="text" | 178 | type="text" |
185 | class="form-control" | 179 | class="form-control" |
186 | ng-model="domicilio.localidad" | 180 | ng-model="domicilio.localidad" |
187 | placeholder="Ingrese localidad" | 181 | placeholder="Ingrese localidad" |
188 | ng-required="true" | 182 | ng-required="true" |
189 | ng-keypress="next($event.keyCode)" | 183 | ng-keypress="next($event.keyCode)" |
190 | ng-focus="focused = 4" | 184 | ng-focus="focused = 4" |
191 | foca-focus="focused == 4" | 185 | foca-focus="focused == 4" |
192 | teclado-virtual | 186 | teclado-virtual |
193 | /> | 187 | /> |
194 | </div> | 188 | </div> |
195 | <div class="col-6"> | 189 | <div class="col-6"> |
196 | <label>Provincia</label> | 190 | <label>Provincia</label> |
197 | <input | 191 | <input |
198 | type="text" | 192 | type="text" |
199 | class="form-control" | 193 | class="form-control" |
200 | ng-model="domicilio.provincia" | 194 | ng-model="domicilio.provincia" |
201 | placeholder="Ingrese provincia" | 195 | placeholder="Ingrese provincia" |
202 | ng-required="true" | 196 | ng-required="true" |
203 | ng-keypress="next($event.keyCode)" | 197 | ng-keypress="next($event.keyCode)" |
204 | ng-focus="focused = 5" | 198 | ng-focus="focused = 5" |
205 | foca-focus="focused == 5" | 199 | foca-focus="focused == 5" |
206 | teclado-virtual | 200 | teclado-virtual |
207 | /> | 201 | /> |
208 | </div> | 202 | </div> |
209 | </div> | 203 | </div> |
210 | <div class="row mt-3"> | 204 | <div class="row mt-3"> |
211 | <div class="col-12"> | 205 | <div class="col-12"> |
212 | <button | 206 | <button |
213 | type="button" | 207 | type="button" |
214 | class="btn btn-primary float-right ml-3" | 208 | class="btn btn-primary float-right ml-3" |
215 | ng-click="localizarDomicilio()">Buscar</button> | 209 | ng-click="localizarDomicilio()">Buscar</button> |
216 | <button | 210 | <button |
217 | type="button" | 211 | type="button" |
218 | class="btn btn-primary float-right" | 212 | class="btn btn-primary float-right" |
219 | ng-disabled="!domicilio.calle || !domicilio.numeroCalle || !domicilio.localidad || !domicilio.provincia" | 213 | ng-disabled="!domicilio.calle || !domicilio.numeroCalle || !domicilio.localidad || !domicilio.provincia" |
220 | ng-click="localizarDomicilio(true)">Localizar</button> | 214 | ng-click="localizarDomicilio(true)">Localizar</button> |
221 | </div> | 215 | </div> |
222 | </div> | 216 | </div> |
223 | </form> | 217 | </form> |
224 | </div> | 218 | </div> |
225 | <div class="modal-footer"> | 219 | <div class="modal-footer"> |
226 | <nav ng-show="currentPageDomicilios.length > 0 && !ingreso" class="mr-auto"> | 220 | <nav ng-show="currentPageDomicilios.length > 0 && !ingreso" class="mr-auto"> |
227 | <ul class="pagination pagination-sm mb-0 justify-content-end"> | 221 | <ul class="pagination pagination-sm mb-0 justify-content-end"> |
228 | <li class="page-item" ng-class="{'disabled': currentPage == 1}"> | 222 | <li class="page-item" ng-class="{'disabled': currentPage == 1}"> |
229 | <a class="page-link" href="javascript:void();" ng-click="selectPage(currentPage - 1)"> | 223 | <a class="page-link" href="javascript:void();" ng-click="selectPage(currentPage - 1)"> |
230 | <span aria-hidden="true">«</span> | 224 | <span aria-hidden="true">«</span> |
231 | <span class="sr-only">Anterior</span> | 225 | <span class="sr-only">Anterior</span> |
232 | </a> | 226 | </a> |
233 | </li> | 227 | </li> |
234 | <li | 228 | <li |
235 | class="page-item" | 229 | class="page-item" |
236 | ng-repeat="pagina in paginas" | 230 | ng-repeat="pagina in paginas" |
237 | ng-class="{'active': pagina == currentPage}" | 231 | ng-class="{'active': pagina == currentPage}" |
238 | > | 232 | > |
239 | <a | 233 | <a |
240 | class="page-link" | 234 | class="page-link" |
241 | href="javascript:void();" | 235 | href="javascript:void();" |
242 | ng-click="selectPage(pagina)" | 236 | ng-click="selectPage(pagina)" |
243 | ng-bind="pagina" | 237 | ng-bind="pagina" |
244 | ></a> | 238 | ></a> |
245 | </li> | 239 | </li> |
246 | <li class="page-item" ng-class="{'disabled': currentPage == lastPage}"> | 240 | <li class="page-item" ng-class="{'disabled': currentPage == lastPage}"> |
247 | <a class="page-link" href="javascript:void();" ng-click="selectPage(currentPage + 1)"> | 241 | <a class="page-link" href="javascript:void();" ng-click="selectPage(currentPage + 1)"> |
248 | <span aria-hidden="true">»</span> | 242 | <span aria-hidden="true">»</span> |
249 | <span class="sr-only">Siguiente</span> | 243 | <span class="sr-only">Siguiente</span> |
250 | </a> | 244 | </a> |
251 | </li> | 245 | </li> |
252 | </ul> | 246 | </ul> |
253 | </nav> | 247 | </nav> |
254 | <button | 248 | <button |
255 | ng-show="!ingreso" | 249 | ng-show="!ingreso" |
256 | class="btn btn-sm btn-secondary" | 250 | class="btn btn-sm btn-secondary" |
257 | type="button" | 251 | type="button" |
258 | ng-click="cancel()" | 252 | ng-click="cancel()" |
259 | >Volver | 253 | >Volver |
260 | </button> | 254 | </button> |
261 | <button | 255 | <button |
262 | ng-show="ingreso" | 256 | ng-show="ingreso" |
263 | class="btn btn-secondary btn-sm" | 257 | class="btn btn-secondary btn-sm" |
264 | type="button" | 258 | type="button" |
265 | ng-click="ingreso = !ingreso; domicilio = {}; contactos = [{}]" | 259 | ng-click="ingreso = !ingreso; domicilio = {}; contactos = [{}]" |
266 | >Cancelar | 260 | >Cancelar |
267 | </button> | 261 | </button> |
268 | <button | 262 | <button |
269 | ng-show="ingreso" | 263 | ng-show="ingreso" |