Jose Pinto / foca-modal-proveedor

Download as
Browse Code »

Commit b7b8bd719052ee7cf1b749894a53a405bbcf91c5

Authored by Nicolás Guarnieri
2 parents 9f5b5bdf2c 8455c40bb2
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,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 jquery font-awesome gulp gulp-concat gulp-jshint gulp-rename gulp-replace gulp-uglify-es gulp-clean jshint pump gulp-connect gulp-uglify jasmine-core pre-commit gulp-angular-templatecache ui-bootstrap4 gulp-htmlmin git+https://debo.suite.repo/modulos-npm/foca-directivas"
  10 + "install-dev": "npm install -D angular angular-ladda ladda@1.0.6 bootstrap jquery font-awesome gulp gulp-concat gulp-jshint gulp-rename gulp-replace gulp-uglify-es gulp-clean jshint pump gulp-connect gulp-uglify jasmine-core pre-commit gulp-angular-templatecache ui-bootstrap4 gulp-htmlmin git+ssh://git@git.focasoftware.com:npm/foca-directivas"
11 11 },
12 12 "pre-commit": [
13 13 "gulp-pre-commit"
... ... @@ -34,13 +34,13 @@
34 34 "gulp-uglify": "^3.0.1",
35 35 "jquery": "^3.3.1",
36 36 "pump": "^3.0.0",
37   - "foca-directivas": "git+https://debo.suite.repo/modulos-npm/foca-directivas"
  37 + "foca-directivas": "git+ssh://git@git.focasoftware.com:npm/foca-directivas"
38 38 },
39 39 "devDependencies": {
40 40 "angular": "^1.7.5",
41 41 "angular-ladda": "^0.4.3",
42 42 "bootstrap": "^4.1.3",
43   - "foca-directivas": "git+https://debo.suite.repo/modulos-npm/foca-directivas",
  43 + "foca-directivas": "git+ssh://git@git.focasoftware.com:npm/foca-directivas",
44 44 "font-awesome": "^4.7.0",
45 45 "gulp": "^3.9.1",
46 46 "gulp-angular-templatecache": "^2.2.3",
src/views/modal-proveedor.html
Diff comments   View file @ b7b8bd7
1 1 <div class="modal-header py-1">
2   - <h5 class="modal-title" ng-hide="transportista">Búsqueda de Proveedor</h5>
3   - <h5 class="modal-title" ng-show="transportista">Búsqueda de Transportista</h5>
  2 + <div class="row w-100">
  3 + <div class="col-lg-6">
  4 + <h5 class="modal-title my-1" ng-hide="transportista">Búsqueda de Proveedor</h5>
  5 + <h5 class="modal-title my-1" ng-show="transportista">Búsqueda de Transportista</h5>
  6 + </div>
  7 + <div class="input-group col-lg-6 pr-0 my-2">
  8 + <input
  9 + ladda="searchLoading"
  10 + type="text"
  11 + class="form-control form-control-sm"
  12 + placeholder="Busqueda"
  13 + ng-model="filters"
  14 + ng-change="search()"
  15 + ng-keydown="busquedaDown($event.keyCode)"
  16 + ng-keypress="busquedaPress($event.keyCode)"
  17 + foca-focus="selectedProveedores == -1"
  18 + ng-focus="selectedProveedores = -1"
  19 + teclado-virtual
  20 + >
  21 + <div class="input-group-append">
  22 + <button
  23 + ladda="searchLoading"
  24 + class="btn btn-outline-secondary"
  25 + type="button"
  26 + ng-click="busquedaPress(13)">
  27 + <i class="fa fa-search" aria-hidden="true"></i>
  28 + </button>
  29 + </div>
  30 + </div>
  31 + </div>
4 32 </div>
5 33 <div class="modal-body" id="modal-body">
6   - <div class="input-group">
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="selectedProveedores == -1"
17   - ng-focus="selectedProveedores = -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>
  34 +
  35 + <div ng-show="!primerBusqueda">
  36 + Debe realizar una primer búsqueda.
28 37 </div>
29   -</div>
  38 +
30 39 <table ng-show="primerBusqueda" class="table table-striped table-sm">
31 40 <thead>
32 41 <tr>
... ... @@ -61,13 +70,16 @@
61 70 foca-focus="selectedProveedores == {{key}}"
62 71 ng-keydown="itemProveedor($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="currentPageProveedores.length > 0 && primerBusqueda">
  79 +
  80 +</div>
  81 +<div class="modal-footer py-1">
  82 + <nav ng-show="currentPageProveedores.length > 0 && primerBusqueda" class="mr-auto">
71 83 <ul class="pagination pagination-sm 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>