Commit 7001935009c1b0065a65b8342ddc322c8a613dd0
Exists in
master
and in
1 other branch
Merge branch 'master' into 'master'
Master See merge request !4
Showing
4 changed files
Show diff stats
gulpfile.js
| ... | ... | @@ -45,7 +45,7 @@ gulp.task('uglify', ['templates'], function() { |
| 45 | 45 | ]), |
| 46 | 46 | concat('foca-modal-cobranza.js'), |
| 47 | 47 | replace('src/views/', ''), |
| 48 | - replace("['ui.bootstrap', 'focaDirectivas', 'angular-ladda']", '[]'), | |
| 48 | + replace("['ui.bootstrap', 'focaDirectivas', 'focaFiltros, 'angular-ladda', 'focaModal']", '[]'), | |
| 49 | 49 | gulp.dest(paths.tmp), |
| 50 | 50 | rename('foca-modal-cobranza.min.js'), |
| 51 | 51 | uglify(), |
src/js/app.js
src/js/controller.js
| ... | ... | @@ -6,7 +6,9 @@ angular.module('focaModalCobranza') |
| 6 | 6 | '$scope', |
| 7 | 7 | '$uibModalInstance', |
| 8 | 8 | 'focaModalCobranzaService', |
| 9 | - function($timeout, $filter, $scope, $uibModalInstance, focaModalCobranzaService) { | |
| 9 | + 'focaModalService', | |
| 10 | + function($timeout, $filter, $scope, $uibModalInstance, | |
| 11 | + focaModalCobranzaService, focaModalService) { | |
| 10 | 12 | var fecha = new Date(); |
| 11 | 13 | $scope.fechaHasta = new Date(); |
| 12 | 14 | $scope.fechaDesde = new Date(fecha.setMonth(fecha.getMonth() - 1)); |
| ... | ... | @@ -20,24 +22,21 @@ angular.module('focaModalCobranza') |
| 20 | 22 | $scope.filteredCobranzas = []; |
| 21 | 23 | $scope.currentPageCobranzas = []; |
| 22 | 24 | $scope.selectedCobranza = -1; |
| 23 | - $scope.dateOptions = { | |
| 24 | - maxDate: new Date() | |
| 25 | - }; | |
| 26 | 25 | |
| 27 | 26 | //METODOS |
| 28 | 27 | $scope.busquedaPress = function(key) { |
| 29 | 28 | if (key === 13) { |
| 30 | - //TODO Validaciones con alertas de foca | |
| 31 | 29 | if(!$scope.fechaDesde) { |
| 32 | - alert('INGRESE FECHA DESDE'); | |
| 30 | + focaModalService.alert('INGRESE FECHA DESDE'); | |
| 33 | 31 | return; |
| 34 | 32 | } |
| 35 | 33 | if(!$scope.fechaHasta) { |
| 36 | - alert('INGRESE FECHA HASTA'); | |
| 34 | + focaModalService.alert('INGRESE FECHA HASTA'); | |
| 37 | 35 | return; |
| 38 | 36 | } |
| 39 | 37 | if($scope.fechaDesde > $scope.fechaHasta) { |
| 40 | - alert('La fecha desde no puede ser mayor a la fecha hasta'); | |
| 38 | + focaModalService | |
| 39 | + .alert('La fecha desde no puede ser mayor a la fecha hasta'); | |
| 41 | 40 | return; |
| 42 | 41 | } |
| 43 | 42 | $scope.searchLoading = true; |
src/views/foca-modal-cobranza.html
| ... | ... | @@ -54,7 +54,6 @@ |
| 54 | 54 | is-open="datepickerOpen" |
| 55 | 55 | on-open-focus="false" |
| 56 | 56 | ng-focus="datepickerOpen = true" |
| 57 | - datepicker-options="dateOptions" | |
| 58 | 57 | /> |
| 59 | 58 | </div> |
| 60 | 59 | <small class="col-md-2 col-4 text-left my-1">Fecha Hasta</small> |
| ... | ... | @@ -76,7 +75,6 @@ |
| 76 | 75 | is-open="datepicker2Open" |
| 77 | 76 | on-open-focus="false" |
| 78 | 77 | ng-focus="datepicker2Open = true" |
| 79 | - datepicker-options="dateOptions" | |
| 80 | 78 | /> |
| 81 | 79 | </div> |
| 82 | 80 | </div> |