Jose Pinto / foca-modal-vehiculo

Download as
Browse Code »

Commit a7d374b5e8450913c0764cb4efd00e6f1c83d4d2

Authored by Jose Pinto
1 parent 28fbfe450c
Exists in master

buscador en header, paginado en footer, cambio icons

Showing 2 changed files with 40 additions and 30 deletions   Show diff stats
... ... @@ -7,7 +7,7 @@
7 7 "gulp-pre-commit": "gulp pre-commit",
8 8 "compile": "gulp uglify",
9 9 "postinstall": "npm run compile && gulp clean-post-install",
10   - "install-dev": "npm install -D angular angular-ladda bootstrap font-awesome gulp gulp-angular-templatecache gulp-clean gulp-concat gulp-connect gulp-htmlmin gulp-jshint gulp-rename gulp-replace gulp-uglify jasmine-core jquery jshint ladda@1.0.6 pre-commit pump ui-bootstrap4 && npm i -D git+https://debo.suite.repo/modulos-npm/foca-directivas.git"
  10 + "install-dev": "npm install -D angular angular-ladda bootstrap font-awesome gulp gulp-angular-templatecache gulp-clean gulp-concat gulp-connect gulp-htmlmin gulp-jshint gulp-rename gulp-replace gulp-uglify jasmine-core jquery jshint ladda@1.0.6 pre-commit pump ui-bootstrap4 && npm i -D git+ssh://git@git.focasoftware.com:npm/foca-directivas.git"
11 11 },
12 12 "pre-commit": [
13 13 "gulp-pre-commit"
... ... @@ -33,13 +33,13 @@
33 33 "gulp-uglify": "^3.0.1",
34 34 "jquery": "^3.3.1",
35 35 "pump": "^3.0.0",
36   - "foca-directivas": "git+https://debo.suite.repo/modulos-npm/foca-directivas"
  36 + "foca-directivas": "git+ssh://git@git.focasoftware.com:npm/foca-directivas"
37 37 },
38 38 "devDependencies": {
39 39 "angular": "^1.7.5",
40 40 "angular-ladda": "^0.4.3",
41 41 "bootstrap": "^4.1.3",
42   - "foca-directivas": "git+https://debo.suite.repo/modulos-npm/foca-directivas.git",
  42 + "foca-directivas": "git+ssh://git@git.focasoftware.com:npm/foca-directivas.git",
43 43 "font-awesome": "^4.7.0",
44 44 "gulp": "^3.9.1",
45 45 "gulp-angular-templatecache": "^2.2.5",
src/views/modal-vehiculo.html
Diff comments   View file @ a7d374b
1 1 <div class="modal-header py-1">
2   - <h5 class="modal-title">Busqueda de Vehiculo</h5>
3   -</div>
4   -<div class="modal-body" id="modal-body">
5   - <div class="input-group">
6   - <input
7   - ladda="searchLoading"
8   - type="text"
9   - class="form-control"
10   - placeholder="Busqueda"
11   - ng-model="filters"
12   - ng-change="search()"
13   - ng-keydown="busquedaDown($event.keyCode)"
14   - ng-keypress="busquedaPress($event.keyCode)"
15   - foca-focus="selectedVehiculo == -1"
16   - ng-focus="selectedVehiculo = -1"
17   - >
18   - <div class="input-group-append">
19   - <button
  2 + <div class="row w-100">
  3 + <div class="col-lg-6">
  4 + <h5 class="modal-title my-1">Busqueda de Vehiculo</h5>
  5 + </div>
  6 + <div class="input-group col-lg-6 pr-0 my-2">
  7 + <input
20 8 ladda="searchLoading"
21   - class="btn btn-outline-secondary"
22   - type="button"
23   - ng-click="busquedaPress(13)"
  9 + type="text"
  10 + class="form-control"
  11 + placeholder="Busqueda"
  12 + ng-model="filters"
  13 + ng-change="search()"
  14 + ng-keydown="busquedaDown($event.keyCode)"
  15 + ng-keypress="busquedaPress($event.keyCode)"
  16 + foca-focus="selectedVehiculo == -1"
  17 + ng-focus="selectedVehiculo = -1"
24 18 >
25   - <i class="fa fa-search" aria-hidden="true"></i>
26   - </button>
  19 + <div class="input-group-append">
  20 + <button
  21 + ladda="searchLoading"
  22 + class="btn btn-outline-secondary"
  23 + type="button"
  24 + ng-click="busquedaPress(13)"
  25 + >
  26 + <i class="fa fa-search" aria-hidden="true"></i>
  27 + </button>
  28 + </div>
27 29 </div>
28 30 </div>
  31 +</div>
  32 +<div class="modal-body" id="modal-body">
  33 +
  34 + <div ng-show="!primerBusqueda">
  35 + Debe realizar una primer búsqueda.
  36 + </div>
  37 +
29 38 <table ng-show="primerBusqueda" class="table table-striped table-sm">
30 39 <thead>
31 40 <tr>
... ... @@ -61,13 +70,16 @@
61 70 foca-focus="selectedVehiculo == {{key}}"
62 71 ng-keydown="itemVehiculo($event.keyCode)"
63 72 >
64   - <i class="fa fa-arrow-right" aria-hidden="true"></i>
  73 + <i class="fa fa-circle-thin" aria-hidden="true"></i>
65 74 </button>
66 75 </td>
67 76 </tr>
68 77 </tbody>
69 78 </table>
70   - <nav ng-show="currentPageVehiculos.length > 0 && primerBusqueda">
  79 +
  80 +</div>
  81 +<div class="modal-footer py-1">
  82 + <nav ng-show="currentPageVehiculos.length > 0 && primerBusqueda" class="mr-auto">
71 83 <ul class="pagination pagination-sm justify-content mb-0">
72 84 <li class="page-item" ng-class="{'disabled': currentPage == 1}">
73 85 <a class="page-link" href="javascript:void();" ng-click="selectPage(currentPage - 1)">
... ... @@ -95,7 +107,5 @@
95 107 </li>
96 108 </ul>
97 109 </nav>
98   -</div>
99   -<div class="modal-footer py-1">
100 110 <button class="btn btn-sm btn-secondary" type="button" ng-click="cancel()">Cancelar</button>
101 111 </div>