Marcelo Puebla / foca-modal-domicilio

Download as
Browse Code »

Commit be6e41e4781f2e79a7f5153e84877342319604d9

Authored by Marcelo Puebla
2 parents 33aed4d212 0a476e275d
Exists in develop

Merge tag 'v0.1.2A' of git.focasoftware.com:npm/foca-modal-domicilio into HEAD

Showing 2 changed files   Show diff stats
1 { 1 {
2 "name": "foca-modal-domicilio", 2 "name": "foca-modal-domicilio",
3 "version": "0.0.1", 3 "version": "v0.1.2A",
4 "description": "Modal para busqueda de domicilios", 4 "description": "Modal para busqueda de domicilios",
5 "scripts": { 5 "scripts": {
6 "test": "echo \"Error: no test specified\" && exit 1", 6 "test": "echo \"Error: no test specified\" && exit 1",
7 "gulp-pre-commit": "gulp pre-commit", 7 "gulp-pre-commit": "gulp pre-commit",
8 "compile": "gulp uglify", 8 "compile": "gulp uglify",
9 "postinstall": "npm run compile && gulp clean-post-install", 9 "postinstall": "npm run compile && gulp clean-post-install",
10 "install-dev": "npm install -D angular bootstrap font-awesome gulp gulp-angular-templatecache gulp-concat gulp-connect gulp-htmlmin gulp-jshint gulp-rename gulp-replace gulp-uglify gulp-clean jasmine-core jquery jshint pre-commit pump ui-bootstrap4 && npm i -D git+ssh://git@git.focasoftware.com:npm/foca-directivas" 10 "install-dev": "npm install -D angular bootstrap font-awesome gulp gulp-angular-templatecache gulp-concat gulp-connect gulp-htmlmin gulp-jshint gulp-rename gulp-replace gulp-uglify gulp-clean jasmine-core jquery jshint pre-commit pump ui-bootstrap4 && npm i -D git+ssh://git@git.focasoftware.com:npm/foca-directivas"
11 }, 11 },
12 "pre-commit": [ 12 "pre-commit": [
13 "gulp-pre-commit" 13 "gulp-pre-commit"
14 ], 14 ],
15 "repository": { 15 "repository": {
16 "type": "git", 16 "type": "git",
17 "url": "http://git.focasoftware.com/npm/foca-modal-domicilio.git" 17 "url": "http://git.focasoftware.com/npm/foca-modal-domicilio.git"
18 }, 18 },
19 "author": "Foca Software", 19 "author": "Foca Software",
20 "license": "ISC", 20 "license": "ISC",
21 "peerDependencies": { 21 "peerDependencies": {
22 "angular": "^1.7.4", 22 "angular": "^1.7.4",
23 "bootstrap": "^4.1.3", 23 "bootstrap": "^4.1.3",
24 "font-awesome": "^4.7.0", 24 "font-awesome": "^4.7.0",
25 "ui-bootstrap4": "^3.0.4", 25 "ui-bootstrap4": "^3.0.4",
26 "gulp": "^3.9.1", 26 "gulp": "^3.9.1",
27 "gulp-angular-templatecache": "^2.2.1", 27 "gulp-angular-templatecache": "^2.2.1",
28 "gulp-concat": "^2.6.1", 28 "gulp-concat": "^2.6.1",
29 "gulp-connect": "^5.6.1", 29 "gulp-connect": "^5.6.1",
30 "gulp-htmlmin": "^5.0.1", 30 "gulp-htmlmin": "^5.0.1",
31 "gulp-rename": "^1.4.0", 31 "gulp-rename": "^1.4.0",
32 "gulp-replace": "^1.0.0", 32 "gulp-replace": "^1.0.0",
33 "gulp-uglify": "^3.0.1", 33 "gulp-uglify": "^3.0.1",
34 "jquery": "^3.3.1", 34 "jquery": "^3.3.1",
35 "pump": "^3.0.0", 35 "pump": "^3.0.0",
36 "foca-directivas": "git+ssh://git@git.focasoftware.com:npm/foca-directivas" 36 "foca-directivas": "git+ssh://git@git.focasoftware.com:npm/foca-directivas"
37 }, 37 },
38 "devDependencies": { 38 "devDependencies": {
39 "angular": "^1.7.5", 39 "angular": "^1.7.5",
40 "bootstrap": "^4.1.3", 40 "bootstrap": "^4.1.3",
41 "foca-directivas": "git+ssh://git@git.focasoftware.com:npm/foca-directivas", 41 "foca-directivas": "git+ssh://git@git.focasoftware.com:npm/foca-directivas",
42 "font-awesome": "^4.7.0", 42 "font-awesome": "^4.7.0",
43 "gulp": "^3.9.1", 43 "gulp": "^3.9.1",
44 "gulp-angular-templatecache": "^2.2.3", 44 "gulp-angular-templatecache": "^2.2.3",
45 "gulp-clean": "^0.4.0", 45 "gulp-clean": "^0.4.0",
46 "gulp-concat": "^2.6.1", 46 "gulp-concat": "^2.6.1",
47 "gulp-connect": "^5.6.1", 47 "gulp-connect": "^5.6.1",
48 "gulp-htmlmin": "^5.0.1", 48 "gulp-htmlmin": "^5.0.1",
49 "gulp-jshint": "^2.1.0", 49 "gulp-jshint": "^2.1.0",
50 "gulp-rename": "^1.4.0", 50 "gulp-rename": "^1.4.0",
51 "gulp-replace": "^1.0.0", 51 "gulp-replace": "^1.0.0",
52 "gulp-uglify": "^3.0.1", 52 "gulp-uglify": "^3.0.1",
53 "jasmine-core": "^3.3.0", 53 "jasmine-core": "^3.3.0",
54 "jquery": "^3.3.1", 54 "jquery": "^3.3.1",
55 "jshint": "^2.9.6", 55 "jshint": "^2.9.6",
56 "pre-commit": "^1.2.2", 56 "pre-commit": "^1.2.2",
57 "pump": "^3.0.0", 57 "pump": "^3.0.0",
58 "ui-bootstrap4": "^3.0.5" 58 "ui-bootstrap4": "^3.0.5"
59 } 59 }
60 } 60 }
61 61
src/views/modal-domicilio.html
Diff comments   View file @ be6e41e
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 <input
61 class="form-control form-control-sm"
62 type="text"
63 placeholder="Nuevo domicilio"
64 readonly
65 ng-click="ingreso = !ingreso"
66 />
67 </td>
68 </tr>
69 <tr class="selectable" 65 <tr class="selectable"
70 ng-repeat="(key,domicilio) in currentPageDomicilios"> 66 ng-repeat="(key,domicilio) in currentPageDomicilios">
71 <td 67 <td
72 ng-bind="domicilio.titulo" 68 ng-bind="domicilio.titulo"
73 ng-click="select(domicilio)" 69 ng-click="select(domicilio)"
74 ></td> 70 ></td>
75 <td 71 <td
76 ng-bind="domicilio.Calle + ' ' + domicilio.Numero" 72 ng-bind="domicilio.Calle + ' ' + domicilio.Numero"
77 ng-click="select(domicilio)" 73 ng-click="select(domicilio)"
78 ></td> 74 ></td>
79 <td 75 <td
80 ng-bind="domicilio.Localidad" 76 ng-bind="domicilio.Localidad"
81 ng-click="select(domicilio)" 77 ng-click="select(domicilio)"
82 ></td> 78 ></td>
83 <td 79 <td
84 ng-bind="domicilio.Provincia" 80 ng-bind="domicilio.Provincia"
85 ng-click="select(domicilio)" 81 ng-click="select(domicilio)"
86 ></td> 82 ></td>
87 <td> 83 <td>
88 <button 84 <button
89 type="button" 85 type="button"
90 class="btn btn-sm p-1 float-right btn-secondary" 86 class="btn btn-sm p-1 float-right btn-secondary"
91 ng-click="verPuntosDescarga(key)" 87 ng-click="verPuntosDescarga(key)"
92 title="Puntos de descarga" 88 title="Puntos de descarga"
93 > 89 >
94 <small>PD</small> 90 <small>PD</small>
95 </button> 91 </button>
96 </td> 92 </td>
97 <td> 93 <td>
98 <button 94 <button
99 type="button" 95 type="button"
100 class="btn btn-sm p-1 float-right" 96 class="btn btn-sm p-1 float-right"
101 ng-class="{ 97 ng-class="{
102 'btn-secondary': selectedDomicilio != key + 1, 98 'btn-secondary': selectedDomicilio != key + 1,
103 'btn-primary': selectedDomicilio == key + 1 99 'btn-primary': selectedDomicilio == key + 1
104 }" 100 }"
105 foca-focus="selectedDomicilio == {{key + 1}}" 101 foca-focus="selectedDomicilio == {{key + 1}}"
106 ng-keydown="itemDomicilio($event.keyCode)" 102 ng-keydown="itemDomicilio($event.keyCode)"
107 ng-click="select(domicilio)" 103 ng-click="select(domicilio)"
108 title="Seleccionar" 104 title="Seleccionar"
109 > 105 >
110 <i class="fa fa-circle-thin" aria-hidden="true"></i> 106 <i class="fa fa-circle-thin" aria-hidden="true"></i>
111 </button> 107 </button>
112 </td> 108 </td>
113 </tr> 109 </tr>
114 </tbody> 110 </tbody>
115 </table> 111 </table>
116 </div> 112 </div>
117 <form name="formDomicilio" ng-show="ingreso"> 113 <form name="formDomicilio" ng-show="ingreso">
118 <input 114 <input
119 type="hidden" 115 type="hidden"
120 ng-model="domicilio.latitud" 116 ng-model="domicilio.latitud"
121 ng-required="true"> 117 ng-required="true">
122 <input 118 <input
123 type="hidden" 119 type="hidden"
124 ng-model="domicilio.longitud" 120 ng-model="domicilio.longitud"
125 ng-required="true"> 121 ng-required="true">
126 <div class="row"> 122 <div class="row">
127 <div class="col-4"> 123 <div class="col-4">
128 <label>Tipo</label> 124 <label>Tipo</label>
129 <select 125 <select
130 class="form-control" 126 class="form-control"
131 ng-disabled="true" 127 ng-disabled="true"
132 > 128 >
133 <option ng-value="2">Entrega</option> 129 <option ng-value="2">Entrega</option>
134 </select> 130 </select>
135 </div> 131 </div>
136 <div class="col-8"> 132 <div class="col-8">
137 <label>Titulo</label> 133 <label>Titulo</label>
138 <input 134 <input
139 type="text" 135 type="text"
140 foca-focus="ingreso" 136 foca-focus="ingreso"
141 class="form-control" 137 class="form-control"
142 ng-model="domicilio.titulo" 138 ng-model="domicilio.titulo"
143 placeholder="Ingrese título" 139 placeholder="Ingrese título"
144 ng-required="true" 140 ng-required="true"
145 ng-keypress="next($event.keyCode)" 141 ng-keypress="next($event.keyCode)"
146 ng-focus="focused = 1" 142 ng-focus="focused = 1"
147 foca-focus="focused == 1" 143 foca-focus="focused == 1"
148 teclado-virtual 144 teclado-virtual
149 /> 145 />
150 </div> 146 </div>
151 <div class="col-9"> 147 <div class="col-9">
152 <label>Calle</label> 148 <label>Calle</label>
153 <input 149 <input
154 type="text" 150 type="text"
155 class="form-control" 151 class="form-control"
156 ng-model="domicilio.calle" 152 ng-model="domicilio.calle"
157 placeholder="Ingrese calle" 153 placeholder="Ingrese calle"
158 ng-required="true" 154 ng-required="true"
159 ng-keypress="next($event.keyCode)" 155 ng-keypress="next($event.keyCode)"
160 ng-focus="focused = 2" 156 ng-focus="focused = 2"
161 foca-focus="focused == 2" 157 foca-focus="focused == 2"
162 teclado-virtual 158 teclado-virtual
163 /> 159 />
164 </div> 160 </div>
165 <div class="col-3"> 161 <div class="col-3">
166 <label>Nº</label> 162 <label>Nº</label>
167 <input 163 <input
168 type="text" 164 type="text"
169 class="form-control" 165 class="form-control"
170 ng-model="domicilio.numeroCalle" 166 ng-model="domicilio.numeroCalle"
171 placeholder="Ingrese Numero" 167 placeholder="Ingrese Numero"
172 ng-required="true" 168 ng-required="true"
173 ng-keypress="next($event.keyCode)" 169 ng-keypress="next($event.keyCode)"
174 ng-focus="focused = 3" 170 ng-focus="focused = 3"
175 foca-focus="focused == 3" 171 foca-focus="focused == 3"
176 teclado-virtual 172 teclado-virtual
177 /> 173 />
178 </div> 174 </div>
179 <div class="col-6"> 175 <div class="col-6">
180 <label>Localidad</label> 176 <label>Localidad</label>
181 <input 177 <input
182 type="text" 178 type="text"
183 class="form-control" 179 class="form-control"
184 ng-model="domicilio.localidad" 180 ng-model="domicilio.localidad"
185 placeholder="Ingrese localidad" 181 placeholder="Ingrese localidad"
186 ng-required="true" 182 ng-required="true"
187 ng-keypress="next($event.keyCode)" 183 ng-keypress="next($event.keyCode)"
188 ng-focus="focused = 4" 184 ng-focus="focused = 4"
189 foca-focus="focused == 4" 185 foca-focus="focused == 4"
190 teclado-virtual 186 teclado-virtual
191 /> 187 />
192 </div> 188 </div>
193 <div class="col-6"> 189 <div class="col-6">
194 <label>Provincia</label> 190 <label>Provincia</label>
195 <input 191 <input
196 type="text" 192 type="text"
197 class="form-control" 193 class="form-control"
198 ng-model="domicilio.provincia" 194 ng-model="domicilio.provincia"
199 placeholder="Ingrese provincia" 195 placeholder="Ingrese provincia"
200 ng-required="true" 196 ng-required="true"
201 ng-keypress="next($event.keyCode)" 197 ng-keypress="next($event.keyCode)"
202 ng-focus="focused = 5" 198 ng-focus="focused = 5"
203 foca-focus="focused == 5" 199 foca-focus="focused == 5"
204 teclado-virtual 200 teclado-virtual
205 /> 201 />
206 </div> 202 </div>
207 </div> 203 </div>
208 <div class="row mt-3"> 204 <div class="row mt-3">
209 <div class="col-12"> 205 <div class="col-12">
210 <button 206 <button
211 type="button" 207 type="button"
212 class="btn btn-primary float-right ml-3" 208 class="btn btn-primary float-right ml-3"
213 ng-click="localizarDomicilio()">Buscar</button> 209 ng-click="localizarDomicilio()">Buscar</button>
214 <button 210 <button
215 type="button" 211 type="button"
216 class="btn btn-primary float-right" 212 class="btn btn-primary float-right"
217 ng-disabled="!domicilio.calle || !domicilio.numeroCalle || !domicilio.localidad || !domicilio.provincia" 213 ng-disabled="!domicilio.calle || !domicilio.numeroCalle || !domicilio.localidad || !domicilio.provincia"
218 ng-click="localizarDomicilio(true)">Localizar</button> 214 ng-click="localizarDomicilio(true)">Localizar</button>
219 </div> 215 </div>
220 </div> 216 </div>
221 </form> 217 </form>
222 </div> 218 </div>
223 <div class="modal-footer"> 219 <div class="modal-footer">
224 <nav ng-show="currentPageDomicilios.length > 0 && !ingreso" class="mr-auto"> 220 <nav ng-show="currentPageDomicilios.length > 0 && !ingreso" class="mr-auto">
225 <ul class="pagination pagination-sm mb-0 justify-content-end"> 221 <ul class="pagination pagination-sm mb-0 justify-content-end">
226 <li class="page-item" ng-class="{'disabled': currentPage == 1}"> 222 <li class="page-item" ng-class="{'disabled': currentPage == 1}">
227 <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)">
228 <span aria-hidden="true">&laquo;</span> 224 <span aria-hidden="true">&laquo;</span>
229 <span class="sr-only">Anterior</span> 225 <span class="sr-only">Anterior</span>
230 </a> 226 </a>
231 </li> 227 </li>
232 <li 228 <li
233 class="page-item" 229 class="page-item"
234 ng-repeat="pagina in paginas" 230 ng-repeat="pagina in paginas"
235 ng-class="{'active': pagina == currentPage}" 231 ng-class="{'active': pagina == currentPage}"
236 > 232 >
237 <a 233 <a
238 class="page-link" 234 class="page-link"
239 href="javascript:void();" 235 href="javascript:void();"
240 ng-click="selectPage(pagina)" 236 ng-click="selectPage(pagina)"
241 ng-bind="pagina" 237 ng-bind="pagina"
242 ></a> 238 ></a>
243 </li> 239 </li>
244 <li class="page-item" ng-class="{'disabled': currentPage == lastPage}"> 240 <li class="page-item" ng-class="{'disabled': currentPage == lastPage}">
245 <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)">
246 <span aria-hidden="true">&raquo;</span> 242 <span aria-hidden="true">&raquo;</span>
247 <span class="sr-only">Siguiente</span> 243 <span class="sr-only">Siguiente</span>
248 </a> 244 </a>
249 </li> 245 </li>
250 </ul> 246 </ul>
251 </nav> 247 </nav>
252 <button 248 <button
253 ng-show="!ingreso" 249 ng-show="!ingreso"
254 class="btn btn-sm btn-secondary" 250 class="btn btn-sm btn-secondary"
255 type="button" 251 type="button"
256 ng-click="cancel()" 252 ng-click="cancel()"
257 >Volver 253 >Volver
258 </button> 254 </button>
259 <button 255 <button
260 ng-show="ingreso" 256 ng-show="ingreso"
261 class="btn btn-secondary btn-sm" 257 class="btn btn-secondary btn-sm"
262 type="button" 258 type="button"
263 ng-click="ingreso = !ingreso; domicilio = {}; contactos = [{}]" 259 ng-click="ingreso = !ingreso; domicilio = {}; contactos = [{}]"
264 >Cancelar 260 >Cancelar
265 </button> 261 </button>
266 <button 262 <button
267 ng-show="ingreso" 263 ng-show="ingreso"