Commit dda9cee9cc8727a81a2ea73d2c876f378da66d90
Exists in
master
Merge branch 'develop' of git.focasoftware.com:npm/foca-hoja-ruta
Showing
1 changed file
Show diff stats
src/js/controller.js
| ... | ... | @@ -8,6 +8,8 @@ angular.module('focaHojaRuta') |
| 8 | 8 | 'hojaRutaService', |
| 9 | 9 | 'focaLoginService', |
| 10 | 10 | 'focaModalService', |
| 11 | + '$rootScope', | |
| 12 | + '$localStorage', | |
| 11 | 13 | function( |
| 12 | 14 | $scope, |
| 13 | 15 | $location, |
| ... | ... | @@ -15,11 +17,26 @@ angular.module('focaHojaRuta') |
| 15 | 17 | $uibModal, |
| 16 | 18 | hojaRutaService, |
| 17 | 19 | focaLoginService, |
| 18 | - focaModalService | |
| 20 | + focaModalService, | |
| 21 | + $rootScope, | |
| 22 | + $localStorage | |
| 19 | 23 | ) { |
| 24 | + | |
| 20 | 25 | var loginData = focaLoginService.getLoginData(); |
| 21 | 26 | |
| 27 | + config(); | |
| 28 | + | |
| 29 | + function config() { | |
| 30 | + | |
| 31 | + $scope.cabecera = []; | |
| 32 | + $scope.showCabecera = true; | |
| 33 | + $scope.now = new Date(); | |
| 34 | + $scope.puntoVenta = '0000'; | |
| 35 | + $scope.comprobante = '00000000'; | |
| 36 | + } | |
| 37 | + | |
| 22 | 38 | hojaRutaService.getHojaRuta(loginData.chofer).then(function(res) { |
| 39 | + | |
| 23 | 40 | if (res.data) { |
| 24 | 41 | var hojaRuta = res.data; |
| 25 | 42 | $scope.hojaRuta = hojaRuta; |
| ... | ... | @@ -32,14 +49,22 @@ angular.module('focaHojaRuta') |
| 32 | 49 | focaModalService.alert('Sin hoja de ruta asignada'); |
| 33 | 50 | $location.path('/'); |
| 34 | 51 | } |
| 52 | + | |
| 53 | + watch(); | |
| 54 | + | |
| 55 | + if (!$scope.esatadoRed) { | |
| 56 | + getLSHojaRuta(); | |
| 57 | + } | |
| 58 | + | |
| 35 | 59 | }); |
| 36 | 60 | |
| 37 | - $scope.cabecera = []; | |
| 38 | - $scope.showCabecera = true; | |
| 61 | + function watch() { | |
| 62 | + | |
| 63 | + $scope.$watch('hojaRuta', function(nuevoValor) { | |
| 64 | + $localStorage.hojaRuta = JSON.stringify(nuevoValor); | |
| 65 | + }, true); | |
| 66 | + } | |
| 39 | 67 | |
| 40 | - $scope.now = new Date(); | |
| 41 | - $scope.puntoVenta = '0000'; | |
| 42 | - $scope.comprobante = '00000000'; | |
| 43 | 68 | $scope.verDetalle = function(remito) { |
| 44 | 69 | var modalInstance = $uibModal.open( |
| 45 | 70 | { |
| ... | ... | @@ -54,10 +79,8 @@ angular.module('focaHojaRuta') |
| 54 | 79 | size: 'lg' |
| 55 | 80 | } |
| 56 | 81 | ); |
| 57 | - modalInstance.result.then(function(detalle) { | |
| 58 | - console.log(detalle); | |
| 59 | - //función a ejecutar cuando se carga la cisterna | |
| 60 | - //eliminar console log en produccion cuando sea necesario | |
| 82 | + modalInstance.result.then(function() { | |
| 83 | + //funcion se ejecuta cuando se carga pantalla | |
| 61 | 84 | }); |
| 62 | 85 | }; |
| 63 | 86 | |
| ... | ... | @@ -69,13 +92,6 @@ angular.module('focaHojaRuta') |
| 69 | 92 | $scope.cabecera.push({label: label, valor: valor}); |
| 70 | 93 | } |
| 71 | 94 | } |
| 72 | - //TODO Descomentar cuando se use | |
| 73 | - // function removeCabecera(label) { | |
| 74 | - // var propiedad = $filter('filter')($scope.cabecera, {label: label}, true); | |
| 75 | - // if(propiedad.length === 1) { | |
| 76 | - // $scope.cabecera.splice($scope.cabecera.indexOf(propiedad[0]), 1); | |
| 77 | - // } | |
| 78 | - // } | |
| 79 | 95 | |
| 80 | 96 | $scope.rellenar = function(relleno, longitud) { |
| 81 | 97 | relleno = '' + relleno; |
| ... | ... | @@ -85,6 +101,7 @@ angular.module('focaHojaRuta') |
| 85 | 101 | |
| 86 | 102 | return relleno; |
| 87 | 103 | }; |
| 104 | + | |
| 88 | 105 | $scope.salir = function() { |
| 89 | 106 | $location.path('/'); |
| 90 | 107 | }; |
| ... | ... | @@ -128,5 +145,20 @@ angular.module('focaHojaRuta') |
| 128 | 145 | ); |
| 129 | 146 | modalInstance.result.then(terminar); |
| 130 | 147 | }; |
| 148 | + | |
| 149 | + $rootScope.$on('estadoRed', function(event, value) { | |
| 150 | + $scope.esatadoRed = value; | |
| 151 | + }); | |
| 152 | + | |
| 153 | + function getLSHojaRuta() { | |
| 154 | + | |
| 155 | + var hojaRuta = JSON.parse($localStorage.hojaRuta || null); | |
| 156 | + | |
| 157 | + if (hojaRuta) { | |
| 158 | + $scope.hojaRuta = hojaRuta; | |
| 159 | + delete $localStorage.hojaRuta; | |
| 160 | + } | |
| 161 | + } | |
| 162 | + | |
| 131 | 163 | } |
| 132 | 164 | ]); |