Jose Pinto / foca-abm-vehiculo

Commit 75a9948b74d542a202d678ba5f8633b1a4e45ae8

Authored by Eric Fernandez 2019-01-17 15:47:33 -0300

Exists in master

Merge branch 'master' into 'master'

Master

See merge request !18

Showing 2 changed files Show diff stats

src/js/controller.js

Diff comments View file @ 75a9948

 angular.module('focaAbmVehiculo')
     .controller('focaAbmVehiculosController', [
         '$scope', 'focaAbmVehiculoService', '$location', 'focaModalService',
         '$uibModal', 'focaBotoneraLateralService', '$timeout',
         function($scope, focaAbmVehiculoService, $location, focaModalService,
             $uibModal, focaBotoneraLateralService, $timeout) {
             $scope.now = new Date();
             $scope.botonera = [{
                 label: 'Transportista',
                 image: 'cliente.png'
             }];
             //SETEO BOTONERA LATERAL
-            focaBotoneraLateralService.showSalir(true);
+            focaBotoneraLateralService.showSalir(false);
             focaBotoneraLateralService.showPausar(false);
             focaBotoneraLateralService.showCancelar(false);
             focaBotoneraLateralService.showGuardar(false);
+            focaBotoneraLateralService.addCustomButton('Salir', salir);
             if(focaAbmVehiculoService.transportistaSeleccionado.COD) {
                 elegirTransportista(focaAbmVehiculoService.transportistaSeleccionado);
             }
             focaAbmVehiculoService.cleanCisternasLocal();
             $scope.editar = function(id) {
                 $location.path('/vehiculo/' + id + '/' + $scope.idTransportista);
             };
             $scope.solicitarConfirmacion = function(vehiculo) {
                 focaModalService.confirm('¿Está seguro que desea borrar el vehiculo ' +
                 vehiculo.id + ' ' + vehiculo.tractor + ' ?').then(
                         function(data) {
                             if(data) {
                                 focaAbmVehiculoService.deleteVehiculo(vehiculo.id);
                                 $scope.vehiculos.splice($scope.vehiculos.indexOf(vehiculo), 1);
                             }
                         }
                     );
             };
             $scope.seleccionarTransportista = function() {
                 var modalInstance = $uibModal.open(
                     {
                         ariaLabelledBy: 'Busqueda de Transportista',
                         templateUrl: 'modal-proveedor.html',
                         controller: 'focaModalProveedorCtrl',
                         size: 'lg',
                         resolve: {
                             transportista: function() {
                                 return true;
                             }
                         }
                     }
                 );
                 modalInstance.result.then(
                     function(transportista) {
                         elegirTransportista(transportista);
                         focaAbmVehiculoService.transportistaSeleccionado = transportista;
                     }, function() {
                     }
                 );
             };
             function elegirTransportista(transportista) {
                 var codigo = ('00000' + transportista.COD).slice(-5);
                 $scope.idTransportista = transportista.COD;
                 $scope.filtros = transportista.NOM.trim();
                 $timeout(function() {
                     $scope.$broadcast('addCabecera', {
                         label: 'Transportista:',
                         valor: codigo + ' - ' + transportista.NOM
                     });
                 });
                 buscar(transportista.COD);
             }
             function buscar(idTransportista) {
                 focaAbmVehiculoService
                     .getVehiculosPorTransportista(idTransportista)
                     .then(function(datos) {
                         $scope.vehiculos = datos.data;
                     });
             }
+            function salir() {
+                focaAbmVehiculoService.transportistaSeleccionado = {};
+                $location.path('/');
+            }
         }
     ])
     .controller('focaAbmVehiculoController', [
         '$scope', 'focaAbmVehiculoService', '$routeParams', '$location', '$uibModal',
         'focaModalService', '$timeout', 'focaBotoneraLateralService', '$window',
         function($scope, focaAbmVehiculoService, $routeParams, $location, $uibModal,
         focaModalService, $timeout, focaBotoneraLateralService, $window) {
             $scope.nuevo = $routeParams.idVehiculo === '0' ? true : false;
             $scope.now = new Date();
             $scope.focused = 1;
             $scope.transportistaStamp = '';
             $scope.cisternas = [];
             $timeout(function() {
                 focaBotoneraLateralService.showSalir(false);
                 focaBotoneraLateralService.showPausar(false);
                 focaBotoneraLateralService.showCancelar(false);
                 focaBotoneraLateralService.showGuardar(true, $scope.guardar);
                 focaBotoneraLateralService.addCustomButton('Salir', $scope.cancelar);
             });
             if($scope.nuevo) {
                 focaAbmVehiculoService
                     .getTransportistaPorId($routeParams.idTransportista)
                     .then(function(res) {
                         var codigo = ('00000' + res.data.COD).slice(-5);
                         $scope.vehiculo.idTransportista = res.data.COD;
                         $scope.vehiculo.transportista = res.data;
                         $scope.$broadcast('addCabecera', {
                             label: 'Transportista:',
                             valor: codigo + ' - ' + res.data.NOM
                         });
                     });
             }
             $scope.vehiculo = {};
             focaAbmVehiculoService.getVehiculo($routeParams.idVehiculo).then(function(res) {
                 if(res.data) {
                     $scope.transportistaStamp = ('00000' + res.data.transportista.COD).slice(-5);
                     $scope.transportistaStamp += ' - ' + res.data.transportista.NOM
                     $scope.vehiculo = res.data;
                     $scope.$broadcast('addCabecera', {
                         label: 'Transportista:',
                         valor: $scope.transportistaStamp
                     });
                     $scope.$broadcast('addCabecera', {
                         label: 'Unidad:',
                         valor: res.data.codigo
                     });
                 }
             });
             focaAbmVehiculoService.getCisternadoPorVehiculo($routeParams.idVehiculo)
                 .then(function(res) {
                     //CONCATENA LAS CISTERNAS DEL SERVICIO Y LAS DE LA BASE DE DATOS
                     $scope.cisternas = focaAbmVehiculoService.getCisternasLocal().concat(res.data);
             });
             $scope.next = function(key) {
                 if (key === 13) $scope.focused++;
             };
             $scope.cancelar = function() {
                 $location.path('/vehiculo');
             };
             $scope.editar = function(cisterna) {
                 if(cisterna) {
                     if(cisterna.idTemp != undefined) {
                         $location.path('/vehiculo/' + $routeParams.idVehiculo +
                             '/cisterna/0/' + cisterna.idTemp);
                     }else {
                         $location.path('/vehiculo/' + $routeParams.idVehiculo +
                             '/cisterna/' + cisterna.id);
                     }
                 }else {
                     $location.path('/vehiculo/' + $routeParams.idVehiculo + '/cisterna/0/');
                 }
             };
-            $scope.guardar = function() {
+            $scope.guardar = function(key) {
-                //Valida si existe numero de unidad
+                key = (typeof key  === 'undefined') ? 13 : key;
-                if(!validaTotalCargas() && !$scope.nuevo) {
+                if(key === 13){
-                    focaModalService.alert('La suma de las capacidades de las cisternas' +
+                    //Valida si existe numero de unidad
-                        ' debe ser igual a la capacidad total del vehículo');
+                    if(!validaTotalCargas() && !$scope.nuevo) {
-                    return;
+                        focaModalService.alert('La suma de las capacidades de las cisternas' +
+                            ' debe ser igual a la capacidad total del vehículo');
+                        return;
+                    }
+                    validaCodigoUnidad().then(function() {
+                        delete $scope.vehiculo.transportista;
+                        delete $scope.vehiculo.cisternas;
+                        focaAbmVehiculoService.guardarVehiculo($scope.vehiculo)
+                            .then(function(res) {
+                                if($scope.nuevo) {
+                                    $location.path('/vehiculo/' + res.data.id +
+                                        '/' + res.data.idTransportista);
+                                }else {
+                                    guardarCisternas().then(function() {
+                                        $window.location.assign('/#!/vehiculo');
+                                    });
+                                }
+                            });
+                    }, function(){
+                        focaModalService.alert('Código de unidad existente');
+                    });
                 }
-                validaCodigoUnidad().then(function() {
-                    delete $scope.vehiculo.transportista;
-                    delete $scope.vehiculo.cisternas;
-                    focaAbmVehiculoService.guardarVehiculo($scope.vehiculo)
-                        .then(function(res) {
-                            if($scope.nuevo) {
-                                $location.path('/vehiculo/' + res.data.id +
-                                    '/' + res.data.idTransportista);
-                            }else {
-                                guardarCisternas().then(function() {
-                                    $window.location.assign('/#!/vehiculo');
-                                });
-                            }
-                        });
-                }, function(){
-                    focaModalService.alert('Código de unidad existente');
-                });
             };
             $scope.solicitarConfirmacionCisterna = function(cisterna) {
                 focaModalService.confirm('¿Está seguro que desea borrar la cisterna ' +
                 cisterna.id + ' ' + cisterna.codigo + ' ?').then(
                         function(data) {
                             if(data) {
                                 if(cisterna.id) {
                                     focaAbmVehiculoService.deleteCisterna(cisterna.id);
                                 }
                                 $scope.cisternas.splice($scope.cisternas.indexOf(cisterna), 1);
                             }
                         }
                     );
             };
             function validaCodigoUnidad() {
                 return new Promise(function(resolve, reject) {
                     focaAbmVehiculoService
                         .getVehiculosPorTransportista(parseInt($routeParams.idTransportista))
                         .then(function(res) {
                             //Valida si existe numero de unidad
                             var existe = res.data.filter(function(vehiculo) {
                                 return vehiculo.codigo === $scope.vehiculo.codigo &&
                                     vehiculo.id !== $scope.vehiculo.id;
                             });
                             if(existe.length) {
                                 reject(existe);
                             }else {
                                 resolve();
                             }
                         });
                 });
             }
             function validaTotalCargas() {
                 var total = 0;
                 $scope.cisternas.forEach(function(cisterna) {
                     total += parseInt(cisterna.capacidad);

src/views/foca-abm-vehiculos-item.html

Diff comments View file @ 75a9948

 <div class="row">
     <foca-cabecera-facturador
     titulo="'Vehículo'"
     fecha="now"
     class="mb-0 col-lg-12"
     ></foca-cabecera-facturador>
 </div>
 <div class="row">
     <div class="col-12 col-md-10 p-0 mt-4 border border-white rounded">
         <form name="formVehiculo" class="px-3">
             <input type="hidden" name="id" ng-model="sector.id" />
             <div class="row mt-3">
                 <div class="form-group d-flex mb-2 col-md-6">
-                    <label class="col-form-label col-md-3">Transportista</label>
+                    <label class="col-form-label col-md-4">Unidad</label>
-                    <div class="input-group col-md-9 pl-0">
+                    <div class="input-group col-md-8 pl-0">
-                        <input
-                            class="form-control"
-                            type="text"
-                            ng-value="transportistaStamp"
-                            readonly
-                        />
-                    </div>
-                </div>
-                <div class="form-group d-flex mb-2 col-md-6">
-                    <label class="col-form-label col-md-3">Unidad</label>
-                    <div class="input-group col-md-9 pl-0">
                         <input
                             class="form-control"
                             type="text"
                             teclado-virtual
                             ng-model="vehiculo.codigo"
-                            foca-focus="focused == 3"
+                            foca-focus="focused == 1"
-                            ng-focus="focused = 3"
+                            ng-focus="focused = 1"
                             ng-keypress="next($event.keyCode)"
                         />
                     </div>
                 </div>
                 <div class="form-group d-flex mb-2 col-md-6">
                     <label class="col-form-label col-md-4">Dominio tractor</label>
                     <div class="input-group col-md-8 pl-0">
                         <input
                             class="form-control"
                             type="text"
                             teclado-virtual
                             ng-model="vehiculo.tractor"
                             ng-required="true"
-                            foca-focus="focused == 1"
+                            foca-focus="focused == 2"
-                            ng-focus="focused = 1"
+                            ng-focus="focused = 2"
                             ng-keypress="next($event.keyCode)"
                         />
                     </div>
                 </div>
                 <div class="form-group d-flex mb-2 col-md-6">
                     <label class="col-form-label col-md-4">Dominio semi</label>
                     <div class="input-group col-md-8 pl-0">
                         <input
                             class="form-control"
                             type="text"
                             teclado-virtual
                             ng-model="vehiculo.semi"
                             ng-required="true"
-                            foca-focus="focused == 4"
+                            foca-focus="focused == 3"
-                            ng-focus="focused = 4"
+                            ng-focus="focused = 3"
                             ng-keypress="next($event.keyCode)"
                         />
                     </div>
                 </div>
                 <div class="form-group d-flex mb-2 col-md-6">
                     <label class="col-form-label col-md-4">Capacidad total</label>
                     <div class="input-group col-md-8 pl-0">
                         <input
                             class="form-control"
                             type="text"
                             teclado-virtual
                             ng-model="vehiculo.capacidad"
                             ng-required="true"
-                            foca-focus="focused == 2"
+                            foca-focus="focused == 4"
-                            ng-focus="focused = 2"
+                            ng-focus="focused = 4"
-                            ng-keypress="next($event.keyCode)"
+                            ng-keypress="guardar($event.keyCode)"
                         />
                     </div>
                 </div>
             </div>
         </form>
         <div ng-show="!nuevo">
             <h5 class="pl-4 table-title">Cisternas</h5>
             <table class="table table-default table-hover table-sm table-abm table-striped mb-0">
                 <thead>
                     <tr>
                         <th class="px-5">Código</th>
                         <th class="text-right px-5">Capacidad</th>
                         <th class="text-center px-4">
                             <button
                                 class="btn btn-outline-debo boton-accion"
                                 title="Agregar"
                                 ng-click="editar()">
                                 <i class="fa fa-plus"></i>
                             </button>
                         </th>
                     </tr>
                 </thead>
                 <tbody>
                     <tr ng-repeat="cisterna in cisternas | filter:filtros">
                         <td ng-bind="cisterna.codigo" class="px-5"></td>
                         <td ng-bind="cisterna.capacidad + ' ' + cisterna.unidadMedida.NOM" class="text-right px-5"></td>
                         <td class="text-center px-4">
                             <button
                                 class="btn btn-outline-dark boton-accion"
                                 title="Editar"
                                 ng-click="editar(cisterna)"
                             >
                                 <i class="fa fa-pencil"></i>
                             </button>
                             <button
                                 class="btn btn-outline-dark boton-accion"
                                 title="Eliminar"
                                 ng-click="solicitarConfirmacionCisterna(cisterna)"
                             >
                                 <i class="fa fa-trash"></i>
                             </button>
                         </td>
                     </tr>
                 </body>
             </table>
         </div>
     </div>
 </div>