Marcelo Puebla / foca-modal-factura

Commit ba29d625c5bb40188bfc2a453ec1ae4a69cc6362

Authored by Nicolás Guarnieri 2018-12-07 18:05:16 -0300

Merge branch 'master' into 'master'

Mastersaco buscador, orden y data resultados ok

See merge request !7

Showing 2 changed files Show diff stats

src/js/controller.js

Diff comments View file @ ba29d62

 angular.module('focaModalFactura')
     .controller('focaModalFacturaController',
         [
             '$filter',
             '$scope',
             '$uibModalInstance',
             'focaModalFacturaService',
             'parametrosFactura',
             function($filter, $scope, $uibModalInstance,
                 focaModalFacturaService, parametrosFactura
             ) {
                 var fecha = new Date();
                 $scope.fechaHasta = new Date();
                 $scope.fechaDesde = new Date(fecha.setMonth(fecha.getMonth() - 1));
                 $scope.filters = '';
                 $scope.facturas = [];
                 $scope.primerBusqueda = false;
                 $scope.searchLoading = false;
                 $scope.parametrosFactura = parametrosFactura;
                 // pagination
                 $scope.numPerPage = 10;
                 $scope.currentPage = 1;
                 $scope.filteredFacturas = [];
                 $scope.currentPageFacturas = [];
                 $scope.selectedFactura = -1;
                 //METODOS
                 $scope.busquedaPress = function(key) {
                     if (key === 13) {
                         //TODO Validaciones con alertas
                         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 hacer filtro de fecha
                         focaModalFacturaService
                             .getFacturasByIdCliente(
                                 parametrosFactura.cliente,
                                 '2001-01-01',
                                 '2100-12-31'
                             )
                             .then(llenarDatos);
                     }
                 };
                 $scope.aceptar = function() {
                     var result = $scope.facturas.filter(function(a) {return a.checked === true;});
                     $uibModalInstance.close(result);
                 };
                 $scope.tieneAlMenosUno = function() {
                     var result = $scope.facturas.filter(function(a) {return a.checked === true;});
                     return !result.length;
                 };
                 function llenarDatos(res) {
                     $scope.facturas = [];
                     $scope.filteredFacturas = [];
                     $scope.currentPageFacturas = [];
                     $scope.selectedFactura = -1;
                     $scope.searchLoading = false;
                     $scope.primerBusqueda = true;
-                    $scope.facturas = res.data;
+                    $scope.facturas = calcularSaldos(res.data);
                     $scope.search();
                     primera();
                 }
                 $scope.search = function() {
                     if($scope.facturas.length > 0) {
                         $scope.filteredFacturas = $filter('filter')(
                             $scope.facturas,
                             {$: $scope.filters}
                         );
                         $scope.lastPage = Math.ceil(
                             $scope.filteredFacturas.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.currentPageFacturas = $scope.filteredFacturas.slice(start, end);
                     $scope.currentPage = page;
                 };
                 $scope.cancel = function() {
                     $uibModalInstance.dismiss('cancel');
                 };
                 $scope.busquedaDown = function(key) {
                     if (key === 40) {
                         primera(key);
                     }
                 };
                 $scope.itemFactura = function(key) {
                     if (key === 38) {
                         anterior(key);
                     }
                     if (key === 40) {
                         siguiente(key);
                     }
                     if (key === 37) {
                         retrocederPagina();
                     }
                     if (key === 39) {
                         avanzarPagina();
                     }
                 };
                 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.selectedFactura = 0;
                 }
                 function anterior() {
                     if ($scope.selectedFactura === 0 && $scope.currentPage > 1) {
                         retrocederPagina();
                     } else {
                         $scope.selectedFactura--;
                     }
                 }
                 function siguiente() {
                     if ($scope.selectedFactura < $scope.currentPageFacturas.length - 1 ) {
                         $scope.selectedFactura++;
                     } else {
                             avanzarPagina();
                     }
                 }
                 function retrocederPagina() {
                     if ($scope.currentPage > 1) {
                         $scope.selectPage($scope.currentPage - 1);
                         $scope.selectedFactura = $scope.numPerPage - 1;
                     }
                 }
                 function avanzarPagina() {
                     if ($scope.currentPage < $scope.lastPage) {
                         $scope.selectPage($scope.currentPage + 1);
                         $scope.selectedFactura = 0;
                     }
                 }
+                function calcularSaldos(facturas) {
+                    var saldo = 0;
+                    facturas.forEach(function(factura) {
+                        if (factura.TCO === 'CI' ||
+                            factura.TCO === 'FT' ||
+                            factura.TCO === 'ND'){
+                            factura.IPA = factura.IPA * -1;
+                        }else{
+                            factura.IPA = factura.IPA;
+                        }
+                        saldo += factura.IPA;
+                        factura.saldo = saldo;
+                    });
+                    return facturas;
+                }
+                $scope.busquedaPress(13);
             }
         ]
     );

src/views/foca-modal-factura.html

Diff comments View file @ ba29d62

 <div class="modal-header py-1">
     <div class="row w-100">
         <div class="col-lg-6">
             <h5 class="modal-title">Búsqueda de Comprobantes</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="Búsqueda"
-                ng-model="filters"
-                ng-change="search()"
-                ng-keydown="busquedaDown($event.keyCode)"
-                ng-keypress="busquedaPress($event.keyCode)"
-                foca-focus="selectedFactura == -1"
-                ng-focus="selectedFactura = -1"
-                teclado-virtual
-            />
-            <div class="input-group-append">
-                <button
-                    ladda="searchLoading"
-                    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 ng-show="!primerBusqueda">
-        Debe realizar una primer búsqueda.
-    </div>
     <table ng-show="primerBusqueda" class="table table-striped table-sm">
         <thead>
             <tr>
-                <th>Fecha</th>
+                <th>Comprobante</th>
-                <th>Nro</th>
+                <th>Vencimiento</th>
                 <th class="text-right">Importe</th>
+                <th class="text-right">Saldo</th>
                 <th class="text-right"></th>
             </tr>
         </thead>
         <tbody>
             <tr ng-show="currentPageFacturas.length == 0 && primerBusqueda">
                 <td colspan="5">
                     No se encontraron resultados.
                 </td>
             </tr>
             <tr class="selectable"
-                ng-repeat="(key,factura) in currentPageFacturas">
+                ng-repeat="(key,factura) in currentPageFacturas"
-                <td ng-bind="factura.FEP | date : 'dd/MM/yyyy'"></td>
+                ng-click="factura.checked = !factura.checked">
-                <td ng-bind= "factura.numeroFactura"></td>
+                <td>{{factura.numeroFactura}} {{factura.FEP | date : 'dd/MM/yyyy' : 'GMT'}}</td>
-                <td
+                <td>{{(factura.TCO == 'FT') ? factura.NCU + ' - ' : ''}}{{factura.FEV | date : 'dd/MM/yyyy' : 'GMT'}}</td>
-                    class="text-right"
+                <td class="text-right">
-                    ng-bind="(factura.IPA / parametrosFactura.cotizacion) |
+                    <span ng-if="factura.IPA >= 0">+</span>{{(factura.IPA / parametrosFactura.cotizacion) | number:2}}
-                        currency: parametrosFactura.simbolo"></td>
+                </td>
+                <td class="text-right">
+                    <span ng-if="factura.saldo >= 0">+</span>{{factura.saldo | number:2}}
+                </td>
                 <td class="text-right">
                     <input
                         ng-class="{
                         'btn-secondary': selectedFactura != key,
                         'btn-primary': selectedFactura == key}"
                         ng-keydown="itemFactura($event.keyCode)"
                         foca-focus="selectedFactura == {{key}}"
                         type="checkbox"
                         ng-model="factura.checked"
                     />
                 </td>
             </tr>
         </tbody>
     </table>
 </div>
 <div class="modal-footer py-1">
     <nav ng-show="currentPageFacturas.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>
     <button
         class="btn btn-sm btn-primary"
         type="button"
         ng-click="aceptar()"