Jose Pinto / foca-modal-precio-condiciones

Download as
Browse Code »

Commit 4a3ff5358af9074349d48776fd3655815b2d958b

Authored by Nicolás Guarnieri
2 parents c000ab1734 7336e61af5
Exists in master

Merge branch 'master' into 'master' 

buscador en header, paginado en footer, cambio icons

See merge request !1
Showing 2 changed files   Show diff stats
... ... @@ -8,7 +8,7 @@
8 8 "gulp-pre-commit": "gulp pre-commit",
9 9 "compile": "gulp uglify",
10 10 "postinstall": "npm run compile && gulp clean-post-install",
11   - "install-dev": "npm install -D angular font-awesome jquery bootstrap ui-bootstrap4 jshint gulp gulp-uglify gulp-concat gulp-htmlmin gulp-rename gulp-uglify gulp-jshint gulp-replace gulp-connect gulp-clean gulp-angular-templatecache git+https://debo.suite.repo/modulos-npm/foca-directivas.git git+https://debo.suite.repo/modulos-npm/foca-modal.git"
  11 + "install-dev": "npm install -D angular font-awesome jquery bootstrap ui-bootstrap4 jshint gulp gulp-uglify gulp-concat gulp-htmlmin gulp-rename gulp-uglify gulp-jshint gulp-replace gulp-connect gulp-clean gulp-angular-templatecache git+ssh://git@git.focasoftware.com:npm/foca-directivas.git git+ssh://git@git.focasoftware.com:npm/foca-modal.git"
12 12 },
13 13 "pre-commit": [
14 14 "gulp-pre-commit"
... ... @@ -22,8 +22,8 @@
22 22 "devDependencies": {
23 23 "angular": "^1.7.5",
24 24 "bootstrap": "^4.1.3",
25   - "foca-directivas": "git+https://debo.suite.repo/modulos-npm/foca-directivas.git",
26   - "foca-modal": "git+https://debo.suite.repo/modulos-npm/foca-modal.git",
  25 + "foca-directivas": "git+ssh://git@git.focasoftware.com:npm/foca-directivas.git",
  26 + "foca-modal": "git+ssh://git@git.focasoftware.com:npm/foca-modal.git",
27 27 "font-awesome": "^4.7.0",
28 28 "gulp": "^3.9.1",
29 29 "gulp-angular-templatecache": "^2.2.2",
src/views/modal-precio-condicion.html
Diff comments   View file @ 4a3ff53
1 1 <div class="modal-header py-1">
2   - <h5 ng-show="!ingreso" class="modal-title">Busqueda de Precio-Condición</h5>
3   - <h5 ng-show="ingreso" class="modal-title">Nuevos Plazos</h5>
4   -</div>
5   -<div class="modal-body" id="modal-body">
6   - <div class="input-group" ng-show="!ingreso">
7   - <input
8   - type="text"
9   - class="form-control form-control-sm"
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="selectedPrecioCondicion == -1"
16   - ng-focus="selectedPrecioCondicion = -1"
17   - teclado-virtual
18   - >
19   - <div class="input-group-append">
20   - <button class="btn btn-outline-secondary" type="button" ng-click="busquedaPress(13)">
21   - <i class="fa fa-search" aria-hidden="true"></i>
22   - </button>
  2 + <div class="row w-100">
  3 + <div class="col-lg-6">
  4 + <h5 ng-show="!ingreso" class="modal-title my-1">Busqueda de Precio-Condición</h5>
  5 + <h5 ng-show="ingreso" class="modal-title my-1">Nuevos Plazos</h5>
  6 + </div>
  7 + <div class="input-group col-lg-6 pr-0 my-2" ng-show="!ingreso">
  8 + <input
  9 + type="text"
  10 + class="form-control form-control-sm"
  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="selectedPrecioCondicion == -1"
  17 + ng-focus="selectedPrecioCondicion = -1"
  18 + teclado-virtual
  19 + >
  20 + <div class="input-group-append">
  21 + <button class="btn btn-outline-secondary" type="button" ng-click="busquedaPress(13)">
  22 + <i class="fa fa-search" aria-hidden="true"></i>
  23 + </button>
  24 + </div>
23 25 </div>
24 26 </div>
  27 +</div>
  28 +<div class="modal-body" id="modal-body">
  29 +
25 30  
26 31 <table ng-show="!ingreso" class="table table-striped table-sm">
27 32 <thead>
... ... @@ -61,7 +66,7 @@
61 66 ng-keydown="itemProducto($event.keyCode)"
62 67 ng-click="ingreso = !ingreso"
63 68 >
64   - <i class="fa fa-arrow-right" aria-hidden="true"></i>
  69 + <i class="fa fa-circle-thin" aria-hidden="true"></i>
65 70 </button>
66 71 </td>
67 72 </tr>
... ... @@ -83,40 +88,13 @@
83 88 foca-focus="selectedPrecioCondicion == {{key + 1}}"
84 89 ng-keydown="itemProducto($event.keyCode)"
85 90 >
86   - <i class="fa fa-arrow-right" aria-hidden="true"></i>
  91 + <i class="fa fa-circle-thin" aria-hidden="true"></i>
87 92 </button>
88 93 </td>
89 94 </tr>
90 95 </tbody>
91 96 </table>
92   - <nav ng-show="currentPagePrecioCondicion.length > 0 && !ingreso">
93   - <ul class="pagination pagination-sm mb-0">
94   - <li class="page-item" ng-class="{'disabled': currentPage == 1}">
95   - <a class="page-link" href="javascript:void();" ng-click="selectPage(currentPage - 1)">
96   - <span aria-hidden="true">&laquo;</span>
97   - <span class="sr-only">Anterior</span>
98   - </a>
99   - </li>
100   - <li
101   - class="page-item"
102   - ng-repeat="pagina in paginas"
103   - ng-class="{'active': pagina == currentPage}"
104   - >
105   - <a
106   - class="page-link"
107   - href="javascript:void();"
108   - ng-click="selectPage(pagina)"
109   - ng-bind="pagina"
110   - ></a>
111   - </li>
112   - <li class="page-item" ng-class="{'disabled': currentPage == lastPage}">
113   - <a class="page-link" href="javascript:void();" ng-click="selectPage(currentPage + 1)">
114   - <span aria-hidden="true">&raquo;</span>
115   - <span class="sr-only">Siguiente</span>
116   - </a>
117   - </li>
118   - </ul>
119   - </nav>
  97 +
120 98 <table class="table table-striped table-sm" ng-show="ingreso">
121 99 <thead>
122 100 <tr>
... ... @@ -170,6 +148,34 @@
170 148 </table>
171 149 </div>
172 150 <div class="modal-footer py-1">
  151 + <nav ng-show="currentPagePrecioCondicion.length > 0 && !ingreso" class="mr-auto">
  152 + <ul class="pagination pagination-sm mb-0">
  153 + <li class="page-item" ng-class="{'disabled': currentPage == 1}">
  154 + <a class="page-link" href="javascript:void();" ng-click="selectPage(currentPage - 1)">
  155 + <span aria-hidden="true">&laquo;</span>
  156 + <span class="sr-only">Anterior</span>
  157 + </a>
  158 + </li>
  159 + <li
  160 + class="page-item"
  161 + ng-repeat="pagina in paginas"
  162 + ng-class="{'active': pagina == currentPage}"
  163 + >
  164 + <a
  165 + class="page-link"
  166 + href="javascript:void();"
  167 + ng-click="selectPage(pagina)"
  168 + ng-bind="pagina"
  169 + ></a>
  170 + </li>
  171 + <li class="page-item" ng-class="{'disabled': currentPage == lastPage}">
  172 + <a class="page-link" href="javascript:void();" ng-click="selectPage(currentPage + 1)">
  173 + <span aria-hidden="true">&raquo;</span>
  174 + <span class="sr-only">Siguiente</span>
  175 + </a>
  176 + </li>
  177 + </ul>
  178 + </nav>
173 179 <button
174 180 ng-show="!ingreso"
175 181 class="btn btn-sm btn-secondary"