From 608a057800deb086b117a066cf6c74a3085c6cee Mon Sep 17 00:00:00 2001
From: efernandez <efernandez@focasoftware.com>
Date: Tue, 18 Dec 2018 16:02:53 -0300
Subject: [PATCH] refactor vehiculos

---
 src/js/controller.js                      | 13 +++++++++++--
 src/js/route.js                           |  2 +-
 src/js/service.js                         |  3 +++
 src/views/foca-abm-vehiculos-item.html    |  8 ++++----
 src/views/foca-abm-vehiculos-listado.html | 18 +++++++++++++++---
 5 files changed, 34 insertions(+), 10 deletions(-)

diff --git a/src/js/controller.js b/src/js/controller.js
index 48239ac..18508ca 100644
--- a/src/js/controller.js
+++ b/src/js/controller.js
@@ -10,7 +10,7 @@ angular.module('focaAbmVehiculo')
                     });
             };
             $scope.editar = function(id) {
-                $location.path('/vehiculo/' + id);
+                $location.path('/vehiculo/' + id + '/' + $scope.idTransportista);
             };
             $scope.solicitarConfirmacion = function(vehiculo) {
                 focaModalService.confirm('¿Está seguro que desea borrar el vehiculo ' +
@@ -39,8 +39,9 @@ angular.module('focaAbmVehiculo')
                 );
                 modalInstance.result.then(
                     function(transprotista) {
-                        $scope.buscar(transprotista.COD);
+                        $scope.idTransportista = transprotista.COD;
                         $scope.filtros = transprotista.NOM.trim();
+                        $scope.buscar(transprotista.COD);
                     }, function() {
 
                     }
@@ -54,6 +55,14 @@ angular.module('focaAbmVehiculo')
         function($scope, focaAbmVehiculoService, $routeParams, $location, $uibModal,
         focaModalService) {
             $scope.nuevo = $routeParams.idVehiculo == 0 ? true : false;
+            if($scope.nuevo) {
+                focaAbmVehiculoService
+                    .getTransportistaPorId($routeParams.idTransportista)
+                    .then(function(res) {
+                        console.log(res.data);
+                        $scope.vehiculo.transportista = res.data;
+                    })
+            }
             $scope.vehiculo = {};
             focaAbmVehiculoService.getVehiculo($routeParams.idVehiculo).then(function(res) {
                 if(res.data) $scope.vehiculo = res.data;
diff --git a/src/js/route.js b/src/js/route.js
index d44a0b5..92c9351 100644
--- a/src/js/route.js
+++ b/src/js/route.js
@@ -11,7 +11,7 @@ angular.module('focaAbmVehiculo')
     .config([
         '$routeProvider',
         function($routeProvider) {
-            $routeProvider.when('/vehiculo/:idVehiculo', {
+            $routeProvider.when('/vehiculo/:idVehiculo/:idTransportista', {
                 controller: 'focaAbmVehiculoController',
                 templateUrl: 'src/views/foca-abm-vehiculos-item.html'
             });
diff --git a/src/js/service.js b/src/js/service.js
index 6192bbc..9bdb44e 100644
--- a/src/js/service.js
+++ b/src/js/service.js
@@ -30,6 +30,9 @@ angular.module('focaAbmVehiculo')
             },
             getVehiculosPorTransportista: function(id) {
                 return $http.get(API_ENDPOINT.URL + '/vehiculo/transportista/' + id);
+            },
+            getTransportistaPorId: function(id) {
+                return $http.get(API_ENDPOINT.URL + '/transportista/' + id);
             }
         };
     }]);
diff --git a/src/views/foca-abm-vehiculos-item.html b/src/views/foca-abm-vehiculos-item.html
index d420431..9587efc 100644
--- a/src/views/foca-abm-vehiculos-item.html
+++ b/src/views/foca-abm-vehiculos-item.html
@@ -10,14 +10,14 @@
                 ng-model="vehiculo.transportista.NOM"
                 readonly
             />
-            <div class="input-group-append">
+            <!-- <div class="input-group-append">
                 <button
                     class="btn btn-outline-secondary form-control"
                     type="button"
                     ng-click="seleccionarTransportista()">
                     <i class="fa fa-search" aria-hidden="true"></i>
                 </button>
-            </div>
+            </div> -->
         </div>
     </div>
     <div class="form-group row">
@@ -32,7 +32,7 @@
         </div>
     </div>
     <div class="form-group row">
-        <label class="offset-sm-1 col-sm-2 col-form-label">Tractor</label>
+        <label class="offset-sm-1 col-sm-2 col-form-label">Dominio tractor</label>
         <div class="col-sm-4">
             <input
                 class="form-control"
@@ -44,7 +44,7 @@
         </div>
     </div>
     <div class="form-group row">
-        <label class="offset-sm-1 col-sm-2 col-form-label">Semi</label>
+        <label class="offset-sm-1 col-sm-2 col-form-label">Dominio semi</label>
         <div class="col-sm-4">
             <input
                 class="form-control"
diff --git a/src/views/foca-abm-vehiculos-listado.html b/src/views/foca-abm-vehiculos-listado.html
index b1a06ed..3bf7608 100644
--- a/src/views/foca-abm-vehiculos-listado.html
+++ b/src/views/foca-abm-vehiculos-listado.html
@@ -25,12 +25,17 @@
     <table class="table table-sm table-striped table-dark">
         <thead>
             <tr>
-                <th>Código</th>                
+                <th>Código</th>
                 <th>Tractor</th>
+                <th>Semi</th>
                 <th>Capacidad</th>
+                <th>Cisternado</th>
                 <th class="text-center">
-                    <button class="btn btn-default boton-accion" ng-click="editar(0)">
-                        <i class="fa fa-plus"></i>
+                    <button
+                        ng-disabled="!idTransportista"
+                        class="btn btn-default boton-accion"
+                        ng-click="editar(0)"
+                    ><i class="fa fa-plus"></i>
                     </button>
                 </th>
             </tr>
@@ -39,7 +44,9 @@
             <tr ng-repeat="vehiculo in vehiculos | filter:filtros">
                 <td ng-bind="vehiculo.id"></td>
                 <td ng-bind="vehiculo.tractor"></td>
+                <td ng-bind="vehiculo.semi"></td>
                 <td ng-bind="vehiculo.capacidad"></td>
+                <td ng-bind="vehiculo.cisternado"></td>
                 <td class="text-center">
                     <button
                         class="btn btn-default boton-accion"
@@ -57,4 +64,9 @@
             </tr>
         </body>
     </table>
+    <a href="#!/" title="Salir" 
+        class="btn btn-secondary btn-block float-right col-md-2"
+    >
+        Salir
+    </a>
 </div>
-- 
1.9.1