Marcelo Puebla / foca-abm-vehiculo

Commit 24c7093d71bef134185148a207d2d0d7124377ce

Authored by Eric Fernandez 2019-01-17 17:20:06 -0300

Merge branch 'master' into 'master'

Master

See merge request !19

Showing 3 changed files Show diff stats

src/js/controllerCisterna.js

Diff comments View file @ 24c7093

 angular.module('focaAbmVehiculo')
     .controller('focaAbmVehiculoCisternaController', [
         '$scope', 'focaAbmVehiculoService', '$routeParams', '$location', '$uibModal',
         'focaModalService', 'focaBotoneraLateralService', '$timeout', '$window',
         function($scope, focaAbmVehiculoService, $routeParams, $location, $uibModal,
         focaModalService, focaBotoneraLateralService, $timeout, $window) {
+            $scope.nuevo = ($routeParams.id > 0) ? false : true;
             $scope.editar = false;
             $scope.now = new Date();
             $scope.cisterna = {};
-            $scope.focused = 1;
+            $scope.focused = $scope.nuevo ? 1 : 2;
             $scope.next = function(key) {
                 if (key === 13) $scope.focused++;
             };
             $scope.capacidadVechiulo = 0;
             $scope.transportista = '';
             //SETEO BOTONERA LATERAL
             $timeout(function() {
                 focaBotoneraLateralService.showSalir(false);
                 focaBotoneraLateralService.showPausar(false);
                 focaBotoneraLateralService.showCancelar(true);
                 focaBotoneraLateralService.showGuardar(true, $scope.guardar);
             });
             if($routeParams.idTemp != undefined) {
                 $scope.cisterna = focaAbmVehiculoService.getCisternasLocal()[$routeParams.idTemp];
             }else {
                 focaAbmVehiculoService.getCisterna($routeParams.id).then(function(res) {
                     if(res.data) $scope.cisterna = res.data;
                 });
             }
             focaAbmVehiculoService.getVehiculo($routeParams.idVehiculo).then(function(res) {
                 var codigo = ('00000' + res.data.transportista.COD).slice(-5);
                 $scope.transportista = res.data.transportista.COD;
                 $scope.capacidadVechiulo = res.data.capacidad;
                 $scope.$broadcast('addCabecera', {
                     label: 'Transportista:',
                     valor: codigo + ' - ' + res.data.transportista.NOM
                 });
                 $scope.$broadcast('addCabecera', {
                     label: 'Unidad:',
                     valor: res.data.codigo
                 });
                 $scope.$broadcast('addCabecera', {
                     label: 'Capacidad total vehículo:',
                     valor: res.data.capacidad
                 });
             });
             $scope.cancelar = function() {
                 $location.path('/vehiculo/' + $routeParams.idVehiculo);
             };
             $scope.guardar = function() {
                 if(!$scope.cisterna.unidadMedida) {
                     focaModalService.alert('Ingrese unidad de medida');
                     return;
                 }
                 validaCodigoCapacidad().then(function() {
                     $scope.cisterna.idVehiculo = parseInt($routeParams.idVehiculo);
                     delete $scope.cisterna.vehiculo;
                     if($routeParams.idTemp != undefined) {
                     //SI SE EDITA UNA CISTERNA LOCALMENTE
                         focaAbmVehiculoService
                             .guardarCisternaLocal($scope.cisterna, $routeParams.idTemp);
                     }else if($scope.cisterna.id) {
                     //SI SE EDITA UNA CISTERNA PREVIAMENTE GUARDADA
                         focaAbmVehiculoService.deleteCisterna($scope.cisterna.id);
                         focaAbmVehiculoService.guardarCisternaLocal($scope.cisterna);
                     }else {
                     //SI SE EDITA CREA UNA NUEVA CISTERNA
                         focaAbmVehiculoService.guardarCisternaLocal($scope.cisterna);
                     }
                     $window.location.assign('/#!/vehiculo/' + $routeParams.idVehiculo +
                     '/' + $scope.transportista);
                 }, function(err) {
                     focaModalService.alert(err);
                 });
             };
             $scope.seleccionarUnidadMedida = function() {
                 var modalInstance = $uibModal.open(
                     {
                         ariaLabelledBy: 'Busqueda de Unidades de medida',
                         templateUrl: 'modal-unidad-medida.html',
                         controller: 'focaModalUnidadMedidaCtrl',
                         size: 'lg'
                     }
                 );
                 modalInstance.result.then(function(unidaMedida) {
                     $scope.cisterna.idUnidadMedida = unidaMedida.ID;
                     $scope.cisterna.unidadMedida = unidaMedida;
                 });
             };
             function validaCodigoCapacidad() {
                 return new Promise(function(resolve, reject) {
                     focaAbmVehiculoService
                         .getCisternadoPorVehiculo($routeParams.idVehiculo)
                         .then(function(res) {
                             var cisternas = focaAbmVehiculoService.getCisternasLocal().concat(res.data);
                             var totalCargado = 0;
                             cisternas.forEach(function(cisterna) {
                                 //SI EL CODIGO YA EXISTE
                                 if(cisterna.codigo === $scope.cisterna.codigo &&
                                     (cisterna.id !== $scope.cisterna.id ||
                                         cisterna.idTemp !== $scope.cisterna.idTemp)) {
                                     reject('Código de cisterna existente');
                                 }
                                 if(cisterna.id !== $scope.cisterna.id) {
                                     totalCargado += cisterna.capacidad;
                                 }
                             });
                             //SI EL TOTAL DE CAPACIDAD DE CISTERNAS ES MAYOR QUE LA DEL VEHICULO
                             totalCargado = totalCargado + parseInt($scope.cisterna.capacidad);
                             if(totalCargado > $scope.capacidadVechiulo) {
                                 reject('La capacidad total de las cisternas' +
                                     ' no debe ser mayor a la del vehiculo');
                             }else {
                                 resolve();
                             }
                         });
                 });
             }
         }
     ]);

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

Diff comments View file @ 24c7093

 <div class="row">
     <foca-cabecera-facturador
     titulo="'Vehículo cisterna'"
     fecha="now"
     class="mb-0 col-lg-12"
     ></foca-cabecera-facturador>
 </div>
 <div class="row"></div>
 <form name="formCisterna">
     <div class="form-group row">
         <label class="offset-sm-1 col-sm-2 col-form-label">Código de cisterna</label>
         <div class="col-sm-4">
             <input
                 class="form-control"
                 type="text"
                 ng-required="true"
                 ng-model="cisterna.codigo"
                 ng-keypress="next($event.keyCode)"
                 foca-focus="focused == 1"
                 ng-focus="focused = 1"
+                ng-disabled="!nuevo"
                 teclado-virtual
             />
         </div>
     </div>
     <div class="form-group row">
         <label class="offset-sm-1 col-sm-2 col-form-label">Capacidad</label>
         <div class="col-sm-4">
             <input
                 class="form-control"
                 type="text"
                 teclado-virtual
                 foca-tipo-input
                 ng-model="cisterna.capacidad"
                 ng-required="true"
                 ng-keypress="next($event.keyCode)"
                 foca-focus="focused == 2"
                 ng-focus="focused = 2"
             />
         </div>
     </div>
     <div class="form-group row">
         <label class="offset-sm-1 col-sm-2 col-form-label">Unidad de medida</label>
         <div class="col-sm-4 input-group">
             <input
                 ng-model="cisterna.unidadMedida.NOM"
                 class="form-control"
                 readonly
             />
             <div class="input-group-append">
                 <button
                     ladda="searchLoading"
                     class="btn btn-outline-secondary form-control"
                     type="button"
                     ng-click="seleccionarUnidadMedida()"
                     foca-focus="focused == 3"
                 >
                     <i class="fa fa-search" aria-hidden="true"></i>
                 </button>
             </div>
         </div>
     </div>
 </form>

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

Diff comments View file @ 24c7093

 <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-4">Unidad</label>
                     <div class="input-group col-md-8 pl-0">
                         <input
                             class="form-control"
                             type="text"
                             teclado-virtual
                             ng-model="vehiculo.codigo"
                             foca-focus="focused == 1"
                             ng-focus="focused = 1"
                             ng-keypress="next($event.keyCode)"
+                            ng-disabled="!nuevo"
                         />
                     </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 == 2"
                             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 == 3"
                             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 == 4"
                             ng-focus="focused = 4"
                             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>