Commit 2588f348ea04d2b6a96a79cbbe4a010604113a61
1 parent
6824e5640d
Exists in
master
and in
1 other branch
ok orden divs
Showing
1 changed file
with
41 additions
and
41 deletions
Show diff stats
src/views/modal-punto-descarga.html
| 1 | 1 | <div class="modal-header d-flex"> |
| 2 | 2 | <h5 class="modal-title my-1" ng-hide="ingreso || cargaArticulos">Búsqueda de puntos de descarga</h5> |
| 3 | 3 | <h5 class="modal-title my-1" ng-show="ingreso">Crear punto de descarga</h5> |
| 4 | - <h5 class="modal-title my-1" ng-show="cargaArticulos">Cargar articulos en puntos de descarga</h5> | |
| 4 | + <h5 class="modal-title my-1" ng-show="cargaArticulos">Cargar artículos en puntos de descarga</h5> | |
| 5 | 5 | <button |
| 6 | 6 | class="btn btn-primary" |
| 7 | 7 | ng-click="ingreso = true" |
| ... | ... | @@ -23,7 +23,7 @@ |
| 23 | 23 | </tr> |
| 24 | 24 | </thead> |
| 25 | 25 | <tbody> |
| 26 | - <tr ng-show="puntosDescarga.length == 0"> | |
| 26 | + <tr ng-show="!puntosDescarga.length"> | |
| 27 | 27 | <td colspan="3"> |
| 28 | 28 | No se encontraron resultados. |
| 29 | 29 | </td> |
| ... | ... | @@ -65,48 +65,11 @@ |
| 65 | 65 | </tr> |
| 66 | 66 | </tbody> |
| 67 | 67 | </table> |
| 68 | - <form ng-show="ingreso"> | |
| 69 | - <div class="row"> | |
| 70 | - <div class="col-12"> | |
| 71 | - <label>Descripción</label> | |
| 72 | - <input | |
| 73 | - type="text" | |
| 74 | - class="form-control form-control-sm" | |
| 75 | - ng-model="puntoDescarga.descripcion" | |
| 76 | - uppercase-only> | |
| 77 | - </div> | |
| 78 | - </div> | |
| 79 | - <div class="row"> | |
| 80 | - <div class="col-6"> | |
| 81 | - <label>Latitud</label> | |
| 82 | - <input | |
| 83 | - type="text" | |
| 84 | - class="form-control form-control-sm" | |
| 85 | - ng-model="puntoDescarga.latitud" | |
| 86 | - ng-required="true" | |
| 87 | - /> | |
| 88 | - </div> | |
| 89 | - <div class="col-6"> | |
| 90 | - <label>Longitud</label> | |
| 91 | - <input | |
| 92 | - type="text" | |
| 93 | - class="form-control form-control-sm" | |
| 94 | - ng-model="puntoDescarga.longitud" | |
| 95 | - ng-required="true" | |
| 96 | - /> | |
| 97 | - </div> | |
| 98 | - </div> | |
| 99 | - <osm-punto-descarga | |
| 100 | - latitud="puntoDescarga.latitud" | |
| 101 | - longitud="puntoDescarga.longitud" | |
| 102 | - zoom="14" | |
| 103 | - /> | |
| 104 | - </form> | |
| 105 | 68 | <div ng-show="cargaArticulos"> |
| 106 | - <div ng-show="articulos.length === 0"> | |
| 69 | + <div ng-show="!articulos.length"> | |
| 107 | 70 | <h6>No existen articulos para agregar</h6> |
| 108 | 71 | </div> |
| 109 | - <div ng-show="articulos.length > 0"> | |
| 72 | + <div ng-show="articulos.length"> | |
| 110 | 73 | <div class="row"> |
| 111 | 74 | <div class="col-12"> |
| 112 | 75 | <table class="table table-sm"> |
| ... | ... | @@ -202,6 +165,43 @@ |
| 202 | 165 | </div> |
| 203 | 166 | </div> |
| 204 | 167 | </div> |
| 168 | + <form ng-show="ingreso"> | |
| 169 | + <div class="row"> | |
| 170 | + <div class="col-12"> | |
| 171 | + <label>Descripción</label> | |
| 172 | + <input | |
| 173 | + type="text" | |
| 174 | + class="form-control form-control-sm" | |
| 175 | + ng-model="puntoDescarga.descripcion" | |
| 176 | + uppercase-only> | |
| 177 | + </div> | |
| 178 | + </div> | |
| 179 | + <div class="row"> | |
| 180 | + <div class="col-6"> | |
| 181 | + <label>Latitud</label> | |
| 182 | + <input | |
| 183 | + type="text" | |
| 184 | + class="form-control form-control-sm" | |
| 185 | + ng-model="puntoDescarga.latitud" | |
| 186 | + ng-required="true" | |
| 187 | + /> | |
| 188 | + </div> | |
| 189 | + <div class="col-6"> | |
| 190 | + <label>Longitud</label> | |
| 191 | + <input | |
| 192 | + type="text" | |
| 193 | + class="form-control form-control-sm" | |
| 194 | + ng-model="puntoDescarga.longitud" | |
| 195 | + ng-required="true" | |
| 196 | + /> | |
| 197 | + </div> | |
| 198 | + </div> | |
| 199 | + <osm-punto-descarga | |
| 200 | + latitud="puntoDescarga.latitud" | |
| 201 | + longitud="puntoDescarga.longitud" | |
| 202 | + zoom="14" | |
| 203 | + /> | |
| 204 | + </form> | |
| 205 | 205 | </div> |
| 206 | 206 | <div class="modal-footer"> |
| 207 | 207 | <button |