Luigi / foca-modal-remito

Download as
Browse Code »

Commit 1460dc1e50ba69cb619938bf5ba6d362a016b72e

Authored by Jose Pinto
1 parent c59633afeb
Exists in master and in 1 other branch develop

buscador en header, paginado en footer, cambio icons

Showing 2 changed files with 71 additions and 66 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 ladda@1.0.6 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+https://debo.suite.repo/modulos-npm/foca-directivas"
  10 + "install-dev": "npm install -D angular angular-ladda ladda@1.0.6 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 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",
  42 + "foca-directivas": "git+ssh://git@git.focasoftware.com:npm/foca-directivas",
43 43 "font-awesome": "^4.7.0",
44 44 "gulp": "^3.9.1",
45 45 "gulp-angular-templatecache": "^2.2.5",
src/views/foca-modal-remito.html
Diff comments   View file @ 1460dc1
1 1 <div class="modal-header py-1">
2   - <h5 class="modal-title">Busqueda de Remito</h5>
  2 + <div class="row w-100">
  3 + <div class="col-lg-6">
  4 + <h5 class="modal-title my-1">Busqueda de Remito</h5>
  5 + </div>
  6 + <div class="input-group col-lg-6 pr-0 my-2">
  7 + <input
  8 + ladda="searchLoading"
  9 + type="text"
  10 + class="form-control form-control-sm"
  11 + placeholder="Razón social"
  12 + ng-model="filters"
  13 + ng-change="search()"
  14 + ng-keydown="busquedaDown($event.keyCode)"
  15 + ng-keypress="busquedaPress($event.keyCode)"
  16 + foca-focus="selectedRemito == -1"
  17 + ng-focus="selectedRemito = -1"
  18 + teclado-virtual
  19 + >
  20 + <div class="input-group-append">
  21 + <button
  22 + ladda="searchLoading"
  23 + class="btn btn-outline-secondary"
  24 + type="button"
  25 + ng-click="busquedaPress(13)"
  26 + >
  27 + <i class="fa fa-search" aria-hidden="true"></i>
  28 + </button>
  29 + </div>
  30 + </div>
  31 + </div>
  32 +
3 33 </div>
4 34 <div class="modal-body" id="modal-body">
5 35 <div class="input-group row">
... ... @@ -38,31 +68,6 @@
38 68 />
39 69 </div>
40 70 </div>
41   - <div class="input-group">
42   - <input
43   - ladda="searchLoading"
44   - type="text"
45   - class="form-control form-control-sm"
46   - placeholder="Razón social"
47   - ng-model="filters"
48   - ng-change="search()"
49   - ng-keydown="busquedaDown($event.keyCode)"
50   - ng-keypress="busquedaPress($event.keyCode)"
51   - foca-focus="selectedRemito == -1"
52   - ng-focus="selectedRemito = -1"
53   - teclado-virtual
54   - >
55   - <div class="input-group-append">
56   - <button
57   - ladda="searchLoading"
58   - class="btn btn-outline-secondary"
59   - type="button"
60   - ng-click="busquedaPress(13)"
61   - >
62   - <i class="fa fa-search" aria-hidden="true"></i>
63   - </button>
64   - </div>
65   - </div>
66 71 <table ng-show="primerBusqueda" class="table table-striped table-sm">
67 72 <thead>
68 73 <tr>
... ... @@ -95,49 +100,49 @@
95 100 foca-focus="selectedRemito == {{key}}"
96 101 ng-keydown="itemRemito($event.keyCode)"
97 102 >
98   - <i class="fa fa-arrow-right" aria-hidden="true"></i>
  103 + <i class="fa fa-circle-thin" aria-hidden="true"></i>
99 104 </button>
100 105 </td>
101 106 </tr>
102 107 </tbody>
103 108 </table>
104   - <nav ng-show="currentPageRemitos.length > 0 && primerBusqueda">
105   - <ul class="pagination pagination-sm justify-content mb-0">
106   - <li class="page-item" ng-class="{'disabled': currentPage == 1}">
107   - <a
108   - class="page-link"
109   - href="javascript:void();"
110   - ng-click="selectPage(currentPage - 1)"
111   - >
112   - <span aria-hidden="true">&laquo;</span>
113   - <span class="sr-only">Anterior</span>
114   - </a>
115   - </li>
116   - <li
117   - class="page-item"
118   - ng-repeat="pagina in paginas"
119   - ng-class="{'active': pagina == currentPage}"
120   - >
121   - <a
122   - class="page-link"
123   - href="javascript:void();"
124   - ng-click="selectPage(pagina)"
125   - ng-bind="pagina"
126   - ></a>
127   - </li>
128   - <li class="page-item" ng-class="{'disabled': currentPage == lastPage}">
129   - <a
130   - class="page-link"
131   - href="javascript:void();"
132   - ng-click="selectPage(currentPage + 1)"
133   - >
134   - <span aria-hidden="true">&raquo;</span>
135   - <span class="sr-only">Siguiente</span>
136   - </a>
137   - </li>
138   - </ul>
139   - </nav>
140 109 </div>
141 110 <div class="modal-footer py-1">
  111 + <nav ng-show="currentPageRemitos.length > 0 && primerBusqueda" class="mr-auto">
  112 + <ul class="pagination pagination-sm justify-content mb-0">
  113 + <li class="page-item" ng-class="{'disabled': currentPage == 1}">
  114 + <a
  115 + class="page-link"
  116 + href="javascript:void();"
  117 + ng-click="selectPage(currentPage - 1)"
  118 + >
  119 + <span aria-hidden="true">&laquo;</span>
  120 + <span class="sr-only">Anterior</span>
  121 + </a>
  122 + </li>
  123 + <li
  124 + class="page-item"
  125 + ng-repeat="pagina in paginas"
  126 + ng-class="{'active': pagina == currentPage}"
  127 + >
  128 + <a
  129 + class="page-link"
  130 + href="javascript:void();"
  131 + ng-click="selectPage(pagina)"
  132 + ng-bind="pagina"
  133 + ></a>
  134 + </li>
  135 + <li class="page-item" ng-class="{'disabled': currentPage == lastPage}">
  136 + <a
  137 + class="page-link"
  138 + href="javascript:void();"
  139 + ng-click="selectPage(currentPage + 1)"
  140 + >
  141 + <span aria-hidden="true">&raquo;</span>
  142 + <span class="sr-only">Siguiente</span>
  143 + </a>
  144 + </li>
  145 + </ul>
  146 + </nav>
142 147 <button class="btn btn-sm btn-secondary" type="button" ng-click="cancel()">Cancelar</button>
143 148 </div>