Mauricio Cattafi / foca-modal-vendedores

Download as
Browse Code »

Commit 332745ca6fee41ecbfe4358772daef0a5ccdb82d

Authored by Jose Pinto
1 parent 821b28eccd
Exists in master

buscador en header, paginado en footer, cambio icons

Showing 2 changed files with 86 additions and 77 deletions   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 angular-ladda ladda@1.0.6 bootstrap font-awesome gulp gulp-angular-templatecache gulp-concat gulp-connect gulp-htmlmin gulp-jshint gulp-rename gulp-clean gulp-replace gulp-uglify jasmine-core jquery jshint pre-commit pump ui-bootstrap4 && npm i -D git+https://debo.suite.repo/modulos-npm/foca-directivas"
  11 + "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-clean gulp-replace gulp-uglify jasmine-core jquery jshint pre-commit pump ui-bootstrap4 && npm i -D git+http://git.focasoftware.com/npm/foca-directivas.git"
12 12 },
13 13 "pre-commit": [
14 14 "gulp-pre-commit"
... ... @@ -37,27 +37,27 @@
37 37 "foca-directivas": "git+https://debo.suite.repo/modulos-npm/foca-directivas"
38 38 },
39 39 "devDependencies": {
40   - "angular": "^1.7.5",
41   - "angular-ladda": "^0.4.3",
42   - "bootstrap": "^4.1.3",
  40 + "angular": "1.7.5",
  41 + "angular-ladda": "0.4.3",
  42 + "bootstrap": "4.1.3",
43 43 "foca-directivas": "git+https://debo.suite.repo/modulos-npm/foca-directivas",
44   - "font-awesome": "^4.7.0",
45   - "gulp": "^3.9.1",
46   - "gulp-angular-templatecache": "^2.2.3",
47   - "gulp-clean": "^0.4.0",
48   - "gulp-concat": "^2.6.1",
49   - "gulp-connect": "^5.6.1",
50   - "gulp-htmlmin": "^5.0.1",
51   - "gulp-jshint": "^2.1.0",
52   - "gulp-rename": "^1.4.0",
53   - "gulp-replace": "^1.0.0",
54   - "gulp-uglify": "^3.0.1",
55   - "jasmine-core": "^3.3.0",
56   - "jquery": "^3.3.1",
57   - "jshint": "^2.9.6",
  44 + "font-awesome": "4.7.0",
  45 + "gulp": "3.9.1",
  46 + "gulp-angular-templatecache": "2.2.5",
  47 + "gulp-clean": "0.4.0",
  48 + "gulp-concat": "2.6.1",
  49 + "gulp-connect": "5.6.1",
  50 + "gulp-htmlmin": "5.0.1",
  51 + "gulp-jshint": "2.1.0",
  52 + "gulp-rename": "1.4.0",
  53 + "gulp-replace": "1.0.0",
  54 + "gulp-uglify": "3.0.1",
  55 + "jasmine-core": "3.3.0",
  56 + "jquery": "3.3.1",
  57 + "jshint": "2.9.6",
58 58 "ladda": "1.0.6",
59   - "pre-commit": "^1.2.2",
60   - "pump": "^3.0.0",
61   - "ui-bootstrap4": "^3.0.5"
  59 + "pre-commit": "1.2.2",
  60 + "pump": "3.0.0",
  61 + "ui-bootstrap4": "3.0.5"
62 62 }
63 63 }
src/views/modal-vendedores.html
Diff comments   View file @ 332745c
1   -<div class="modal-header">
2   - <h5 class="modal-title my-1">Búsqueda de vendedores</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 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="selectedVendedor == -1"
16   - ng-focus="selectedVendedor = -1"
17   - teclado-virtual
18   - >
19   - <div class="input-group-append">
20   - <button
  1 +<div class="modal-header py-1">
  2 + <div class="row w-100">
  3 + <div class="col-lg-6 col-xs-12">
  4 + <h5 class="modal-title my-1">Búsqueda de vendedores</h5>
  5 + </div>
  6 + <div class="input-group col-lg-6 col-xs-12 pr-0 my-2">
  7 + <input
21 8 ladda="searchLoading"
22   - class="btn btn-outline-secondary"
23   - type="button"
24   - ng-click="busquedaPress(13)"
  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="selectedVendedor == -1"
  17 + ng-focus="selectedVendedor = -1"
  18 + teclado-virtual
25 19 >
26   - <i class="fa fa-search" aria-hidden="true"></i>
27   - </button>
  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>
28 30 </div>
29 31 </div>
  32 +</div>
  33 +<div class="modal-body" id="modal-body">
  34 +
  35 + <div ng-show="!primerBusqueda">
  36 + Debe realizar una primer búsqueda.
  37 + </div>
  38 +
30 39 <table ng-show="primerBusqueda" class="table table-striped table-sm col-12">
31 40 <thead>
32 41 <tr>
... ... @@ -48,7 +57,7 @@
48 57 <td ng-bind="vendedor.CodVen"></td>
49 58 <td ng-bind="vendedor.NomVen"></td>
50 59 <td class="d-md-none text-primary">
51   - <i class="fa fa-arrow-right" aria-hidden="true"></i>
  60 + <i class="fa fa-circle-thin" aria-hidden="true"></i>
52 61 </td>
53 62 <td class="d-none d-md-table-cell">
54 63 <button
... ... @@ -60,41 +69,41 @@
60 69 }"
61 70 foca-focus="selectedVendedor == {{key}}"
62 71 ng-keydown="itemVendedor($event.keyCode)">
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="currentPageVendedores.length > 0 && primerBusqueda">
70   - <ul class="pagination pagination-sm justify-content mb-0">
71   - <li class="page-item" ng-class="{'disabled': currentPage == 1}">
72   - <a class="page-link" href="javascript:void();" ng-click="selectPage(currentPage - 1)">
73   - <span aria-hidden="true">&laquo;</span>
74   - <span class="sr-only">Anterior</span>
75   - </a>
76   - </li>
77   - <li
78   - class="page-item"
79   - ng-repeat="pagina in paginas"
80   - ng-class="{'active': pagina == currentPage}"
81   - >
82   - <a
83   - class="page-link"
84   - href="javascript:void();"
85   - ng-click="selectPage(pagina)"
86   - ng-bind="pagina"
87   - ></a>
88   - </li>
89   - <li class="page-item" ng-class="{'disabled': currentPage == lastPage}">
90   - <a class="page-link" href="javascript:void();" ng-click="selectPage(currentPage + 1)">
91   - <span aria-hidden="true">&raquo;</span>
92   - <span class="sr-only">Siguiente</span>
93   - </a>
94   - </li>
95   - </ul>
96   - </nav>
97 78 </div>
98   -<div class="modal-footer">
  79 +<div class="modal-footer py-1">
  80 + <nav ng-show="currentPageVendedores.length > 0 && primerBusqueda" class="mr-auto">
  81 + <ul class="pagination pagination-sm justify-content mb-0">
  82 + <li class="page-item" ng-class="{'disabled': currentPage == 1}">
  83 + <a class="page-link" href="javascript:void();" ng-click="selectPage(currentPage - 1)">
  84 + <span aria-hidden="true">&laquo;</span>
  85 + <span class="sr-only">Anterior</span>
  86 + </a>
  87 + </li>
  88 + <li
  89 + class="page-item"
  90 + ng-repeat="pagina in paginas"
  91 + ng-class="{'active': pagina == currentPage}"
  92 + >
  93 + <a
  94 + class="page-link"
  95 + href="javascript:void();"
  96 + ng-click="selectPage(pagina)"
  97 + ng-bind="pagina"
  98 + ></a>
  99 + </li>
  100 + <li class="page-item" ng-class="{'disabled': currentPage == lastPage}">
  101 + <a class="page-link" href="javascript:void();" ng-click="selectPage(currentPage + 1)">
  102 + <span aria-hidden="true">&raquo;</span>
  103 + <span class="sr-only">Siguiente</span>
  104 + </a>
  105 + </li>
  106 + </ul>
  107 + </nav>
99 108 <button class="btn btn-sm btn-secondary my-1" type="button" ng-click="cancel()">Cancelar</button>
100 109 </div>