Luigi / foca-modal-cobranza

Commit 7619329841fe447b61a5e2b16b18e21689617c77

Authored by Eric Fernandez 2018-12-26 16:26:35 -0300

Merge branch 'master' into 'master'

agrego importe a los resultados

See merge request !3

Showing 2 changed files Show diff stats

src/js/controller.js

Diff comments View file @ 7619329

 angular.module('focaModalCobranza')
     .controller('focaModalCobranzaController',
         [
             '$timeout',
             '$filter',
             '$scope',
             '$uibModalInstance',
             'focaModalCobranzaService',
             function($timeout, $filter, $scope, $uibModalInstance, focaModalCobranzaService) {
                 var fecha = new Date();
                 $scope.fechaHasta = new Date();
                 $scope.fechaDesde = new Date(fecha.setMonth(fecha.getMonth() - 1));
                 $scope.filters = '';
                 $scope.cobranzas = [];
                 $scope.primerBusqueda = false;
                 $scope.searchLoading = false;
                 // pagination
                 $scope.numPerPage = 10;
                 $scope.currentPage = 1;
                 $scope.filteredCobranzas = [];
                 $scope.currentPageCobranzas = [];
                 $scope.selectedCobranza = -1;
                 $scope.dateOptions = {
                     maxDate: new Date()
                 };
                 //METODOS
                 $scope.busquedaPress = function(key) {
                     if (key === 13) {
                         //TODO Validaciones con alertas de foca
                         if(!$scope.fechaDesde) {
                             alert('INGRESE FECHA DESDE');
                             return;
                         }
                         if(!$scope.fechaHasta) {
                             alert('INGRESE FECHA HASTA');
                             return;
                         }
                         if($scope.fechaDesde > $scope.fechaHasta) {
                             alert('La fecha desde no puede ser mayor a la fecha hasta');
                             return;
                         }
                         $scope.searchLoading = true;
                         //TODO: usar filtros en vez de toISOString
                         focaModalCobranzaService
                             .getCobranzas($scope.fechaDesde.toISOString().split('.')[0],
                                 $scope.fechaHasta.toISOString().split('.')[0])
                             .then(llenarDatos);
                     }
                 };
                 function llenarDatos(res) {
                     $scope.cobranzas = [];
                     $scope.filteredCobranzas = [];
                     $scope.currentPageCobranzas = [];
                     $scope.selectedCobranza = -1;
                     $scope.searchLoading = false;
                     $scope.primerBusqueda = true;
                     $scope.cobranzas = res.data;
                     $scope.search(true);
                     primera();
                 }
                 $scope.search = function(pressed) {
                     if($scope.cobranzas.length > 0) {
                         $scope.filteredCobranzas = $filter('filter')(
                             $scope.cobranzas,
                             {$: $scope.filters}
                         );
                         if(pressed && $scope.filteredCobranzas.length === 0){
                             $timeout(function() {
                                 angular.element('#search')[0].focus();
                                 $scope.filters = '';
                             });
                         }
                         $scope.lastPage = Math.ceil(
                             $scope.filteredCobranzas.length / $scope.numPerPage
                         );
                         $scope.resetPage();
                     }
                 };
                 $scope.resetPage = function() {
                     $scope.currentPage = 1;
                     $scope.selectPage(1);
                 };
                 $scope.selectPage = function(page) {
                     var start = (page - 1) * $scope.numPerPage;
                     var end = start + $scope.numPerPage;
                     $scope.paginas = [];
                     $scope.paginas = calcularPages(page);
                     $scope.currentPageCobranzas = $scope.filteredCobranzas.slice(start, end);
                     $scope.currentPage = page;
                 };
                 $scope.select = function(cobranza) {
                     $uibModalInstance.close(cobranza);
                 };
                 $scope.cancel = function() {
                     $uibModalInstance.dismiss('cancel');
                 };
                 $scope.busquedaDown = function(key) {
                     if (key === 40) {
                         primera(key);
                     }
                 };
                 $scope.itemCobranza = function(key) {
                     if (key === 38) {
                         anterior(key);
                     }
                     if (key === 40) {
                         siguiente(key);
                     }
                     if (key === 37) {
                         retrocederPagina();
                     }
                     if (key === 39) {
                         avanzarPagina();
                     }
                 };
+                $scope.getTotalCobrado = function(cobros) {
+                    var total = 0;
+                    for (var i = 0; i < cobros.length; i++) {
+                        total += cobros[i].importe;
+                    }
+                    return parseFloat(total.toFixed(2));
+                };
                 function calcularPages(paginaActual) {
                     var paginas = [];
                     paginas.push(paginaActual);
                     if (paginaActual - 1 > 1) {
                         paginas.unshift(paginaActual - 1);
                         if (paginaActual - 2 > 1) {
                             paginas.unshift(paginaActual - 2);
                         }
                     }
                     if (paginaActual + 1 < $scope.lastPage) {
                         paginas.push(paginaActual + 1);
                         if (paginaActual + 2 < $scope.lastPage) {
                             paginas.push(paginaActual + 2);
                         }
                     }
                     if (paginaActual !== 1) {
                         paginas.unshift(1);
                     }
                     if (paginaActual !== $scope.lastPage) {
                         paginas.push($scope.lastPage);
                     }
                     return paginas;
                 }
                 function primera() {
                     $scope.selectedCobranza = 0;
                 }
                 function anterior() {
                     if ($scope.selectedCobranza === 0 && $scope.currentPage > 1) {
                         retrocederPagina();
                     } else {
                         $scope.selectedCobranza--;
                     }
                 }
                 function siguiente() {
                     if ($scope.selectedCobranza < $scope.currentPageCobranzas.length - 1 ) {
                         $scope.selectedCobranza++;
                     } else {
                             avanzarPagina();
                     }
                 }
                 function retrocederPagina() {
                     if ($scope.currentPage > 1) {
                         $scope.selectPage($scope.currentPage - 1);
                         $scope.selectedCobranza = $scope.numPerPage - 1;
                     }
                 }
                 function avanzarPagina() {
                     if ($scope.currentPage < $scope.lastPage) {
                         $scope.selectPage($scope.currentPage + 1);
                         $scope.selectedCobranza = 0;
                     }
                 }
             }
         ]
     );

src/views/foca-modal-cobranza.html

Diff comments View file @ 7619329

 <div class="modal-header py-1">
     <div class="row w-100">
         <div class="col-lg-6">
             <h5 class="modal-title my-1">Búsqueda de Cobranza</h5>
         </div>
         <div class="input-group col-lg-6 pr-0 my-2">
             <input
                 ladda="searchLoading"
                 type="text"
                 class="form-control form-control-sm"
                 placeholder="Razón social"
                 ng-model="filters"
                 ng-change="search()"
                 ng-keydown="busquedaDown($event.keyCode)"
                 ng-keypress="busquedaPress($event.keyCode)"
                 foca-focus="selectedCobranza == -1"
                 ng-focus="selectedCobranza = -1"
                 id="search"
                 teclado-virtual
             >
             <div class="input-group-append">
                 <button
                     ladda="searchLoading"
                     data-spinner-color="#FF0000"
                     class="btn btn-outline-secondary"
                     type="button"
                     ng-click="busquedaPress(13)"
                 >
                     <i class="fa fa-search" aria-hidden="true"></i>
                 </button>
             </div>
         </div>
     </div>
 </div>
 <div class="modal-body" id="modal-body">
     <div class="input-group row">
         <small class="col-md-2 col-4 text-left my-1">Fecha Desde</small>
         <div class="col-md-4 col-8 input-group mb-2">
             <div class="input-group-prepend">
                 <div class="input-group-text form-control-sm">
                     <i class="fa fa-calendar"></i>
                 </div>
             </div>
             <input
                 class="form-control form-control-sm"
                 id="inlineFormInputGroup"
                 ladda="searchLoading"
                 type="text"
                 ng-model="fechaDesde"
                 ng-required="true"
                 uib-datepicker-popup="dd/MM/yyyy"
                 show-button-bar="false"
                 is-open="datepickerOpen"
                 on-open-focus="false"
                 ng-focus="datepickerOpen = true"
                 datepicker-options="dateOptions"
             />
         </div>
         <small class="col-md-2 col-4 text-left my-1">Fecha Hasta</small>
         <div class="col-md-4 col-8 input-group mb-2">
             <div class="input-group-prepend">
                 <div class="input-group-text form-control-sm">
                     <i class="fa fa-calendar"></i>
                 </div>
             </div>
             <input
                 class="form-control form-control-sm"
                 id="inlineFormInputGroup"
                 ladda="searchLoading"
                 type="text"
                 ng-model="fechaHasta"
                 ng-required="true"
                 uib-datepicker-popup="dd/MM/yyyy"
                 show-button-bar="false"
                 is-open="datepicker2Open"
                 on-open-focus="false"
                 ng-focus="datepicker2Open = true"
                 datepicker-options="dateOptions"
             />
         </div>
     </div>
     <table ng-show="primerBusqueda" class="table table-striped table-sm">
         <thead>
             <tr>
                 <th>Fecha</th>
                 <th>Cliente</th>
                 <th>Comprobante</th>
+                <th>Importe</th>
                 <th></th>
             </tr>
         </thead>
         <tbody>
             <tr ng-show="currentPageCobranzas.length == 0 && primerBusqueda">
                 <td colspan="5">
                     No se encontraron resultados.
                 </td>
             </tr>
             <tr class="selectable"
                 ng-repeat="(key, cobranza) in currentPageCobranzas"
                 ng-click="select(cobranza)">
                 <td ng-bind="cobranza.fecha | date : 'dd/MM/yyyy'"></td>
                 <td ng-bind="cobranza.cliente.NOM"></td>
                 <td ng-bind="[cobranza.puntoVenta, cobranza.numeroRecibo] | comprobante"></td>
+                <td ng-bind="getTotalCobrado(cobranza.cobros) | number: 2"></td>
                 <td>
                     <button
                         type="button"
                         class="btn btn-xs p-1 float-right"
                         ng-class="{
                             'btn-secondary': selectedCobranza != key,
                             'btn-primary': selectedCobranza == key
                         }"
                         foca-focus="selectedCobranza == {{key}}"
                         ng-keydown="itemCobranza($event.keyCode)"
                     >
                         <i class="fa fa-circle-thin" aria-hidden="true"></i>
                     </button>
                 </td>
             </tr>
         </tbody>
     </table>
 </div>
 <div class="modal-footer py-1">
         <nav ng-show="currentPageCobranzas.length > 0 && primerBusqueda" class="mr-auto">
             <ul class="pagination pagination-sm justify-content mb-0">
                 <li class="page-item" ng-class="{'disabled': currentPage == 1}">
                     <a
                         class="page-link"
                         href="javascript:void();"
                         ng-click="selectPage(currentPage - 1)"
                     >
                         <span aria-hidden="true">&laquo;</span>
                         <span class="sr-only">Anterior</span>
                     </a>
                 </li>
                 <li
                     class="page-item"
                     ng-repeat="pagina in paginas"
                     ng-class="{'active': pagina == currentPage}"
                 >
                     <a
                         class="page-link"
                         href="javascript:void();"
                         ng-click="selectPage(pagina)"
                         ng-bind="pagina"
                     ></a>
                 </li>
                 <li class="page-item" ng-class="{'disabled': currentPage == lastPage}">
                     <a
                         class="page-link"
                         href="javascript:void();"
                         ng-click="selectPage(currentPage + 1)"
                     >
                         <span aria-hidden="true">&raquo;</span>
                         <span class="sr-only">Siguiente</span>
                     </a>
                 </li>
             </ul>
         </nav>
     <button class="btn btn-sm btn-secondary" type="button" ng-click="cancel()">Cancelar</button>
 </div>