diff --git a/gulpfile.js b/gulpfile.js index 1544570..29b4420 100644 --- a/gulpfile.js +++ b/gulpfile.js @@ -45,7 +45,7 @@ gulp.task('uglify', ['templates'], function() { ]), concat('foca-modal-factura.js'), replace('src/views/', ''), - replace("['ui.bootstrap', 'focaDirectivas', 'angular-ladda']", '[]'), + replace("['ui.bootstrap', 'focaDirectivas', 'angular-ladda', 'focaModal']", '[]'), gulp.dest(paths.tmp), rename('foca-modal-factura.min.js'), uglify(), diff --git a/src/js/app.js b/src/js/app.js index 8a19c56..17e9a81 100644 --- a/src/js/app.js +++ b/src/js/app.js @@ -1 +1 @@ -angular.module('focaModalFactura', ['ui.bootstrap', 'focaDirectivas', 'angular-ladda']); +angular.module('focaModalFactura', ['ui.bootstrap', 'focaDirectivas', 'angular-ladda', 'focaModal']); diff --git a/src/js/controller.js b/src/js/controller.js index 0b23b0e..63f5730 100644 --- a/src/js/controller.js +++ b/src/js/controller.js @@ -6,8 +6,9 @@ angular.module('focaModalFactura') '$uibModalInstance', 'focaModalFacturaService', 'parametrosFactura', + '$uibModal', function($filter, $scope, $uibModalInstance, - focaModalFacturaService, parametrosFactura + focaModalFacturaService, parametrosFactura, $uibModal ) { var fecha = new Date(); $scope.fechaHasta = new Date(); @@ -44,7 +45,7 @@ angular.module('focaModalFactura') //TODO hacer filtro de fecha focaModalFacturaService .getFacturasByIdCliente( - parametrosFactura.cliente, + parametrosFactura.cliente.COD, parametrosFactura.moneda, '2001-01-01', '2100-12-31' @@ -74,6 +75,23 @@ angular.module('focaModalFactura') $scope.search(); primera(); } + + $scope.verFactura = function(factura) { + var modalInstance = $uibModal.open( + { + ariaLabelledBy: 'Detalle de factura', + templateUrl: 'foca-modal-factura-detalle.html', + controller: 'focaModalFacturaDetalleController', + size: 'md', + resolve: { + factura: factura, + cliente: parametrosFactura.cliente + } + } + ); + modalInstance.result.then(); + }; + $scope.search = function() { if($scope.facturas.length > 0) { $scope.filteredFacturas = $filter('filter')( diff --git a/src/views/foca-modal-factura.html b/src/views/foca-modal-factura.html index e0f3b8b..401e326 100644 --- a/src/views/foca-modal-factura.html +++ b/src/views/foca-modal-factura.html @@ -14,6 +14,8 @@ Importe Saldo + + @@ -23,8 +25,7 @@ + ng-repeat="(key,factura) in currentPageFacturas"> {{factura.numeroFactura}} {{factura.FECHA_COMPROBANTE | date : 'dd/MM/yyyy' : 'GMT'}} {{(factura.TCO == 'FT') ? factura.NCU + ' - ' : ''}}{{factura.FEV | date : 'dd/MM/yyyy' : 'GMT'}} @@ -46,6 +47,21 @@ ng-model="factura.checked" /> + + + + + +