Eric Fernandez / foca-busqueda-cliente

Download as
Browse Code »

Commit 8c34b01447106f6f3b29bb9a297120618be2dd92

Authored by Nicolás Guarnieri
2 parents 33b30985b9 9dd189c3fe
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
... ... @@ -7,11 +7,11 @@
7 7 "test": "echo \"Error: no test specified\" && exit 1",
8 8 "compile": "gulp uglify",
9 9 "postinstall": "npm run compile && gulp clean-post-install",
10   - "install-dev": "npm install -D angular bootstrap angular-ladda ladda@1.0.6 angular-ui-bootstrap ui-bootstrap4 font-awesome jquery pre-commit jshint pump jasmine-core gulp gulp-connect gulp-angular-templatecache gulp-concat gulp-htmlmin gulp-jshint gulp-rename gulp-replace gulp-uglify-es gulp-clean gulp-uglify git+https://debo.suite.repo/modulos-npm/foca-directivas.git"
  10 + "install-dev": "npm install -D angular bootstrap angular-ladda ladda@1.0.6 angular-ui-bootstrap ui-bootstrap4 font-awesome jquery pre-commit jshint pump jasmine-core gulp gulp-connect gulp-angular-templatecache gulp-concat gulp-htmlmin gulp-jshint gulp-rename gulp-replace gulp-uglify-es gulp-clean gulp-uglify git+http://git.focasoftware.com/npm/foca-directivas.git"
11 11 },
12 12 "repository": {
13 13 "type": "git",
14   - "url": "https://debo.suite.repo/modulos-npm/foca-busqueda-cliente.git"
  14 + "url": "http://git.focasoftware.com/npm/foca-busqueda-cliente.git"
15 15 },
16 16 "author": "Foca Software",
17 17 "license": "ISC",
... ... @@ -34,7 +34,7 @@
34 34 "angular-ladda": "^0.4.3",
35 35 "angular-ui-bootstrap": "^2.5.6",
36 36 "bootstrap": "^4.1.3",
37   - "foca-directivas": "git+https://debo.suite.repo/modulos-npm/foca-directivas.git",
  37 + "foca-directivas": "git+http://git.focasoftware.com/npm/foca-directivas.git",
38 38 "font-awesome": "^4.7.0",
39 39 "gulp": "^3.9.1",
40 40 "gulp-angular-templatecache": "^2.2.1",
src/views/foca-busqueda-cliente-modal.html
Diff comments   View file @ 8c34b01
1 1 <div class="modal-header py-1">
2   - <h5 class="modal-title">Búsqueda de Cliente</h5>
  2 + <div class="row w-100">
  3 + <div class="col-lg-6">
  4 + <h5 class="modal-title my-1">Búsqueda de Cliente</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="Busqueda"
  12 + ng-model="filters"
  13 + ng-change="search()"
  14 + ng-keydown="busquedaDown($event.keyCode)"
  15 + ng-keypress="busquedaPress($event.keyCode)"
  16 + foca-focus="selectedClientes == -1"
  17 + ng-focus="selectedClientes = -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 + <i class="fa fa-search" aria-hidden="true"></i>
  27 + </button>
  28 + </div>
  29 + </div>
  30 + </div>
3 31 </div>
4 32 <div class="modal-body" id="modal-body">
5   - <div class="input-group">
6   - <input
7   - ladda="searchLoading"
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="selectedClientes == -1"
16   - ng-focus="selectedClientes = -1"
17   - teclado-virtual
18   - >
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   - <i class="fa fa-search" aria-hidden="true"></i>
26   - </button>
  33 +
  34 + <div ng-show="!primerBusqueda">
  35 + Debe realizar una primer búsqueda.
27 36 </div>
28   -</div>
  37 +
29 38 <table ng-show="primerBusqueda" class="table table-striped table-sm">
30 39 <thead>
31 40 <tr>
... ... @@ -60,13 +69,16 @@
60 69 foca-focus="selectedClientes == {{key}}"
61 70 ng-keydown="itemCliente($event.keyCode)"
62 71 >
63   - <i class="fa fa-arrow-right" aria-hidden="true"></i>
  72 + <i class="fa fa-circle-thin" aria-hidden="true"></i>
64 73 </button>
65 74 </td>
66 75 </tr>
67 76 </tbody>
68 77 </table>
69   - <nav ng-show="currentPageClientes.length > 0 && primerBusqueda">
  78 +
  79 +</div>
  80 +<div class="modal-footer py-1">
  81 + <nav ng-show="currentPageClientes.length > 0 && primerBusqueda" class="mr-auto">
70 82 <ul class="pagination pagination-sm mb-0">
71 83 <li class="page-item" ng-class="{'disabled': currentPage == 1}">
72 84 <a class="page-link" href="javascript:void()" ng-click="selectPage(currentPage - 1)">
... ... @@ -94,7 +106,5 @@
94 106 </li>
95 107 </ul>
96 108 </nav>
97   -</div>
98   -<div class="modal-footer py-1">
99 109 <button class="btn btn-sm btn-secondary" type="button" ng-click="cancel()">Cancelar</button>
100 110 </div>