Marcelo Puebla / foca-abm-vehiculo

Commit 336ca8d5e98e9b7a8dd352003bd12a1431d83236

Authored by Nicolás Guarnieri 2018-12-19 17:26:16 -0300

Merge branch 'master' into 'master'

Master(efernandez)

See merge request !7

Showing 2 changed files Show diff stats

src/js/controller.js

Diff comments View file @ 336ca8d

 angular.module('focaAbmVehiculo')
     .controller('focaAbmVehiculosController', [
         '$scope', 'focaAbmVehiculoService', '$location', 'focaModalService', '$uibModal',
         function($scope, focaAbmVehiculoService, $location, focaModalService, $uibModal) {
             $scope.buscar = function(idTransportista) {
                 focaAbmVehiculoService
                     .getVehiculosPorTransportista(idTransportista)
                     .then(function(datos) {
                         $scope.vehiculos = datos.data;
                     });
             };
             $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(transprotista) {
                         $scope.idTransportista = transprotista.COD;
                         $scope.filtros = transprotista.NOM.trim();
                         $scope.buscar(transprotista.COD);
                     }, function() {
                     }
                 );
             };
         }
     ])
     .controller('focaAbmVehiculoController', [
         '$scope', 'focaAbmVehiculoService', '$routeParams', '$location', '$uibModal',
         'focaModalService',
         function($scope, focaAbmVehiculoService, $routeParams, $location, $uibModal,
         focaModalService) {
             $scope.nuevo = $routeParams.idVehiculo == 0 ? true : false;
             if($scope.nuevo) {
                 focaAbmVehiculoService
                     .getTransportistaPorId($routeParams.idTransportista)
                     .then(function(res) {
                         $scope.vehiculo.idTransportista = res.data.COD;
                         $scope.vehiculo.transportista = res.data;
                     });
             }
             $scope.vehiculo = {};
             focaAbmVehiculoService.getVehiculo($routeParams.idVehiculo).then(function(res) {
                 if(res.data) $scope.vehiculo = res.data;
             });
             focaAbmVehiculoService.getCisternadoPorVehiculo($routeParams.idVehiculo)
                 .then(function(res) {
                     $scope.cisternas = res.data;
             });
             $scope.cancelar = function() {
                 $location.path('/vehiculo');
             };
             $scope.editar = function(id) {
                 $location.path('/vehiculo/' + $routeParams.idVehiculo + '/cisterna/' + id);
             };
             $scope.guardar = function() {
                 if(!$scope.vehiculo.transportista) {
                     focaModalService.alert('Elija Transportista');
                     return;
                 }
                 delete $scope.vehiculo.transportista;
                 focaAbmVehiculoService.guerdarVehiculo($scope.vehiculo).then(function(res) {
-                    console.log(res.data);
+                    if($scope.nuevo) {
-                    $location.path('/vehiculo/' + res.data.id + '/' + res.data.idTransportista);
+                        $location.path('/vehiculo/' + res.data.id + '/' + res.data.idTransportista);
+                    } else {
+                        $location.path('/vehiculo');
+                    }
                 });
             };
             $scope.solicitarConfirmacionCisterna = function(cisterna) {
                 focaModalService.confirm('¿Está seguro que desea borrar la cisterna ' +
                 cisterna.id + ' ' + cisterna.codigo + ' ?').then(
                         function(data) {
                             if(data) {
                                 focaAbmVehiculoService.deleteCisterna(cisterna.id);
                                 $scope.cisternas.splice($scope.cisternas.indexOf(cisterna), 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(transprotista) {
                         $scope.vehiculo.idTransportista = transprotista.COD;
                         $scope.vehiculo.transportista = transprotista;
                     }, function() {
                     }
                 );
             };
         }
     ]);

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

Diff comments View file @ 336ca8d

 <div class="col-12">
     <h4>Vehiculos</h4>
     <div class="col-4 form-group input-group">
         <input
             class="form-control form-control-sm"
             ng-model="filtros"
             placeholder="Transportista"
         />
         <div class="input-group-append">
             <button
                 class="btn btn-outline-secondary form-control-sm"
                 ng-click="seleccionarTransportista()"
             ><i class="fa fa-search" aria-hidden="true"></i></button>
         </div>
     </div>
     <!-- <div class="col-6 form-group">
         <input
             type="text"
             teclado-virtual
             class="form-control form-control-sm"
             placeholder="Búsqueda"
             ng-model="filtros"
         />
     </div> -->
     <table class="table table-sm table-striped table-dark">
         <thead>
             <tr>
                 <th>Unidad</th>
-                <th>Tractor</th>
+                <th>Dominio Tractor</th>
-                <th>Semi</th>
+                <th>Dominio Semi</th>
                 <th>Capacidad</th>
-                <th>Cisternado</th>
                 <th class="text-center">
                     <button
                         ng-disabled="!idTransportista"
                         class="btn btn-default boton-accion"
                         ng-click="editar(0)"
                     ><i class="fa fa-plus"></i>
                     </button>
                 </th>
             </tr>
         </thead>
         <tbody>
             <tr ng-repeat="vehiculo in vehiculos | filter:filtros">
                 <td ng-bind="vehiculo.codigo"></td>
                 <td ng-bind="vehiculo.tractor"></td>
                 <td ng-bind="vehiculo.semi"></td>
-                <td ng-bind="vehiculo.capacidad"></td>
+                <td ng-bind="vehiculo.capacidadTotalCisternas"></td>
-                <td ng-bind="vehiculo.cisternado"></td>
                 <td class="text-center">
                     <button
                         class="btn btn-default boton-accion"
                         ng-click="editar(vehiculo.id)"
                     >
                         <i class="fa fa-pencil"></i>
                     </button>
                     <button
                         class="btn btn-default boton-accion"
                         ng-click="solicitarConfirmacion(vehiculo)"
                     >
                         <i class="fa fa-trash"></i>
                     </button>
                 </td>
             </tr>
         </body>
     </table>
     <a href="#!/" title="Salir"
         class="btn btn-secondary btn-block float-right col-md-2"
     >
         Salir
     </a>
 </div>