Commit 3128419e84c00cb67bdc84868a7e66fc361a880e

Authored by Eric Fernandez
Exists in master and in 1 other branch develop

Merge branch 'master' into 'master'

agrego importe a resultados

See merge request !5
src/views/foca-modal-remito.html
1 <div class="modal-header py-1"> 1 <div class="modal-header py-1">
2 <div class="row w-100"> 2 <div class="row w-100">
3 <div class="col-lg-6"> 3 <div class="col-lg-6">
4 <h5 class="modal-title my-1">Búsqueda de Remito</h5> 4 <h5 class="modal-title my-1">Búsqueda de Remito</h5>
5 </div> 5 </div>
6 <div class="input-group col-lg-6 pr-0 my-2"> 6 <div class="input-group col-lg-6 pr-0 my-2">
7 <input 7 <input
8 ladda="searchLoading" 8 ladda="searchLoading"
9 type="text" 9 type="text"
10 class="form-control form-control-sm" 10 class="form-control form-control-sm"
11 placeholder="Razón social" 11 placeholder="Razón social"
12 ng-model="filters" 12 ng-model="filters"
13 ng-change="search()" 13 ng-change="search()"
14 ng-keydown="busquedaDown($event.keyCode)" 14 ng-keydown="busquedaDown($event.keyCode)"
15 ng-keypress="busquedaPress($event.keyCode)" 15 ng-keypress="busquedaPress($event.keyCode)"
16 foca-focus="selectedRemito == -1" 16 foca-focus="selectedRemito == -1"
17 ng-focus="selectedRemito = -1" 17 ng-focus="selectedRemito = -1"
18 id="search" 18 id="search"
19 teclado-virtual 19 teclado-virtual
20 > 20 >
21 <div class="input-group-append"> 21 <div class="input-group-append">
22 <button 22 <button
23 ladda="searchLoading" 23 ladda="searchLoading"
24 data-spinner-color="#FF0000" 24 data-spinner-color="#FF0000"
25 class="btn btn-outline-secondary" 25 class="btn btn-outline-secondary"
26 type="button" 26 type="button"
27 ng-click="busquedaPress(13)" 27 ng-click="busquedaPress(13)"
28 > 28 >
29 <i class="fa fa-search" aria-hidden="true"></i> 29 <i class="fa fa-search" aria-hidden="true"></i>
30 </button> 30 </button>
31 </div> 31 </div>
32 </div> 32 </div>
33 </div> 33 </div>
34 34
35 </div> 35 </div>
36 <div class="modal-body" id="modal-body"> 36 <div class="modal-body" id="modal-body">
37 <div class="input-group row"> 37 <div class="input-group row">
38 <small class="col-md-2 col-4 text-left my-1">Fecha Desde</small> 38 <small class="col-md-2 col-4 text-left my-1">Fecha Desde</small>
39 <div class="col-md-4 col-8 input-group mb-2"> 39 <div class="col-md-4 col-8 input-group mb-2">
40 <div class="input-group-prepend"> 40 <div class="input-group-prepend">
41 <div class="input-group-text form-control-sm"> 41 <div class="input-group-text form-control-sm">
42 <i class="fa fa-calendar"></i> 42 <i class="fa fa-calendar"></i>
43 </div> 43 </div>
44 </div> 44 </div>
45 <input 45 <input
46 class="form-control form-control-sm" 46 class="form-control form-control-sm"
47 id="inlineFormInputGroup" 47 id="inlineFormInputGroup"
48 ladda="searchLoading" 48 ladda="searchLoading"
49 type="text" 49 type="text"
50 ng-model="fechaDesde" 50 ng-model="fechaDesde"
51 ng-required="true" 51 ng-required="true"
52 uib-datepicker-popup="dd/MM/yyyy" 52 uib-datepicker-popup="dd/MM/yyyy"
53 show-button-bar="false" 53 show-button-bar="false"
54 is-open="datepickerOpen" 54 is-open="datepickerOpen"
55 on-open-focus="false" 55 on-open-focus="false"
56 ng-focus="datepickerOpen = true" 56 ng-focus="datepickerOpen = true"
57 datepicker-options="dateOptions" 57 datepicker-options="dateOptions"
58 /> 58 />
59 </div> 59 </div>
60 <small class="col-md-2 col-4 text-left my-1">Fecha Hasta</small> 60 <small class="col-md-2 col-4 text-left my-1">Fecha Hasta</small>
61 <div class="col-md-4 col-8 input-group mb-2"> 61 <div class="col-md-4 col-8 input-group mb-2">
62 <div class="input-group-prepend"> 62 <div class="input-group-prepend">
63 <div class="input-group-text form-control-sm"> 63 <div class="input-group-text form-control-sm">
64 <i class="fa fa-calendar"></i> 64 <i class="fa fa-calendar"></i>
65 </div> 65 </div>
66 </div> 66 </div>
67 <input 67 <input
68 class="form-control form-control-sm" 68 class="form-control form-control-sm"
69 id="inlineFormInputGroup" 69 id="inlineFormInputGroup"
70 ladda="searchLoading" 70 ladda="searchLoading"
71 type="text" 71 type="text"
72 ng-model="fechaHasta" 72 ng-model="fechaHasta"
73 ng-required="true" 73 ng-required="true"
74 uib-datepicker-popup="dd/MM/yyyy" 74 uib-datepicker-popup="dd/MM/yyyy"
75 show-button-bar="false" 75 show-button-bar="false"
76 is-open="datepicker2Open" 76 is-open="datepicker2Open"
77 on-open-focus="false" 77 on-open-focus="false"
78 ng-focus="datepicker2Open = true" 78 ng-focus="datepicker2Open = true"
79 datepicker-options="dateOptions" 79 datepicker-options="dateOptions"
80 /> 80 />
81 </div> 81 </div>
82 </div> 82 </div>
83 <table ng-show="primerBusqueda" class="table table-striped table-sm"> 83 <table ng-show="primerBusqueda" class="table table-striped table-sm">
84 <thead> 84 <thead>
85 <tr> 85 <tr>
86 <th>Fecha</th> 86 <th>Fecha</th>
87 <th>Cliente</th> 87 <th>Cliente</th>
88 <th>Comprobante</th>
88 <th>Comprobante</th> 89 <th>Importe</th>
89 <th></th> 90 <th></th>
90 </tr> 91 </tr>
91 </thead> 92 </thead>
92 <tbody> 93 <tbody>
93 <tr ng-show="currentPageRemitos.length == 0 && primerBusqueda"> 94 <tr ng-show="currentPageRemitos.length == 0 && primerBusqueda">
94 <td colspan="5"> 95 <td colspan="5">
95 No se encontraron resultados. 96 No se encontraron resultados.
96 </td> 97 </td>
97 </tr> 98 </tr>
98 <tr class="selectable" 99 <tr class="selectable"
99 ng-repeat="(key, remito) in currentPageRemitos" 100 ng-repeat="(key, remito) in currentPageRemitos"
100 ng-click="select(remito)"> 101 ng-click="select(remito)">
101 <td ng-bind="remito.fechaRemito | date : 'dd/MM/yyyy'"></td> 102 <td ng-bind="remito.fechaRemito | date : 'dd/MM/yyyy'"></td>
102 <td ng-bind="remito.nombreCliente"></td> 103 <td ng-bind="remito.nombreCliente"></td>
104 <td ng-bind="[remito.sucursal, remito.numeroRemito] | comprobante"></td>
103 <td ng-bind="[remito.sucursal, remito.numeroRemito] | comprobante"></td> 105 <td ng-bind="remito.total | number: 2"></td>
104 <td> 106 <td>
105 <button 107 <button
106 type="button" 108 type="button"
107 class="btn btn-xs p-1 float-right" 109 class="btn btn-xs p-1 float-right"
108 ng-class="{ 110 ng-class="{
109 'btn-secondary': selectedRemito != key, 111 'btn-secondary': selectedRemito != key,
110 'btn-primary': selectedRemito == key 112 'btn-primary': selectedRemito == key
111 }" 113 }"
112 foca-focus="selectedRemito == {{key}}" 114 foca-focus="selectedRemito == {{key}}"
113 ng-keydown="itemRemito($event.keyCode)" 115 ng-keydown="itemRemito($event.keyCode)"
114 > 116 >
115 <i class="fa fa-circle-thin" aria-hidden="true"></i> 117 <i class="fa fa-circle-thin" aria-hidden="true"></i>
116 </button> 118 </button>
117 </td> 119 </td>
118 </tr> 120 </tr>
119 </tbody> 121 </tbody>
120 </table> 122 </table>
121 </div> 123 </div>
122 <div class="modal-footer py-1"> 124 <div class="modal-footer py-1">
123 <nav ng-show="currentPageRemitos.length > 0 && primerBusqueda" class="mr-auto"> 125 <nav ng-show="currentPageRemitos.length > 0 && primerBusqueda" class="mr-auto">
124 <ul class="pagination pagination-sm justify-content mb-0"> 126 <ul class="pagination pagination-sm justify-content mb-0">
125 <li class="page-item" ng-class="{'disabled': currentPage == 1}"> 127 <li class="page-item" ng-class="{'disabled': currentPage == 1}">
126 <a 128 <a
127 class="page-link" 129 class="page-link"
128 href="javascript:void();" 130 href="javascript:void();"
129 ng-click="selectPage(currentPage - 1)" 131 ng-click="selectPage(currentPage - 1)"
130 > 132 >
131 <span aria-hidden="true">&laquo;</span> 133 <span aria-hidden="true">&laquo;</span>
132 <span class="sr-only">Anterior</span> 134 <span class="sr-only">Anterior</span>
133 </a> 135 </a>
134 </li> 136 </li>
135 <li 137 <li
136 class="page-item" 138 class="page-item"
137 ng-repeat="pagina in paginas" 139 ng-repeat="pagina in paginas"
138 ng-class="{'active': pagina == currentPage}" 140 ng-class="{'active': pagina == currentPage}"
139 > 141 >
140 <a 142 <a
141 class="page-link" 143 class="page-link"
142 href="javascript:void();" 144 href="javascript:void();"
143 ng-click="selectPage(pagina)" 145 ng-click="selectPage(pagina)"
144 ng-bind="pagina" 146 ng-bind="pagina"
145 ></a> 147 ></a>
146 </li> 148 </li>
147 <li class="page-item" ng-class="{'disabled': currentPage == lastPage}"> 149 <li class="page-item" ng-class="{'disabled': currentPage == lastPage}">
148 <a 150 <a
149 class="page-link" 151 class="page-link"
150 href="javascript:void();" 152 href="javascript:void();"
151 ng-click="selectPage(currentPage + 1)" 153 ng-click="selectPage(currentPage + 1)"
152 > 154 >
153 <span aria-hidden="true">&raquo;</span> 155 <span aria-hidden="true">&raquo;</span>
154 <span class="sr-only">Siguiente</span> 156 <span class="sr-only">Siguiente</span>
155 </a> 157 </a>
156 </li> 158 </li>
157 </ul> 159 </ul>
158 </nav> 160 </nav>
159 <button class="btn btn-sm btn-secondary" type="button" ng-click="cancel()">Cancelar</button> 161 <button class="btn btn-sm btn-secondary" type="button" ng-click="cancel()">Cancelar</button>
160 </div> 162 </div>
161 163