From 186f7e77fe0730358e5b9a1c9b92164a01ab4a95 Mon Sep 17 00:00:00 2001
From: efernandez <efernandez@focasoftware.com>
Date: Wed, 7 Nov 2018 13:34:59 -0300
Subject: [PATCH] refactor agregar domicilio en modal

---
 src/js/controller.js           | 61 +++++++++++++++++----------
 src/js/service.js              |  8 ++--
 src/views/modal-domicilio.html | 95 +++++++++++++-----------------------------
 3 files changed, 75 insertions(+), 89 deletions(-)

diff --git a/src/js/controller.js b/src/js/controller.js
index 72624d4..55939cd 100644
--- a/src/js/controller.js
+++ b/src/js/controller.js
@@ -9,8 +9,9 @@ angular.module('focaModalDomicilio')
             function($filter, $scope, $uibModalInstance, idCliente,focaModalDomicilioService) {
 
                 $scope.buscar = function() {
-                    focaModalDomicilioService.getDomiciliosByIdCliente($scope.idCliente).then(
-                        function(res) {
+                    focaModalDomicilioService
+                        .getDomiciliosEntregaByIdCliente($scope.idCliente)
+                        .then(function(res) {
                             $scope.domicilios = res.data;
                             $scope.search();
                             $scope.primerBusqueda = true;
@@ -95,29 +96,47 @@ angular.module('focaModalDomicilio')
                     }
                 };
 
-                $scope.agregarContacto = function() {
-                    $scope.contactos.push({item: $scope.contactos[$scope.contactos.length]});
-                };
-
-                $scope.quitarContacto = function(key) {
-                    $scope.contactos.splice(key, 1);
-                };
-
                 $scope.agregarDomicilio= function() {
+                    $scope.domicilio.valores = [];
                     $scope.domicilio.idCliente = $scope.idCliente;
-                    $scope.domicilio.idDomicilioTipo = 2; //siempre es tipo de entrega
-                    for(var i = 0; i < $scope.contactos.length; i++) {
-                        $scope.contactos[i].idCliente = idCliente;
-                        focaModalDomicilioService.guardarContacto($scope.contactos[i]);
+                    if($scope.domicilio.calle) {
+                        $scope.domicilio.valores.push({
+                            ID_ADAC_1: 1,
+                            dato: $scope.domicilio.calle
+                        });
                     }
-                    focaModalDomicilioService
-                        .guardarDomicilio($scope.domicilio)
-                        .then(function() {
-                            $scope.buscar();
+                    if($scope.domicilio.numeroCalle) {
+                        $scope.domicilio.valores.push({
+                            ID_ADAC_1: 2,
+                            dato: $scope.domicilio.numeroCalle
                         });
-                    $scope.ingreso = false;
-                    $scope.domicilio = {};
-                    $scope.contactos = [{}];
+                    }
+                    if($scope.domicilio.localidad) {
+                        $scope.domicilio.valores.push({
+                            ID_ADAC_1: 3,
+                            dato: $scope.domicilio.localidad
+                        });
+                    }
+                    if($scope.domicilio.provincia) {
+                        $scope.domicilio.valores.push({
+                            ID_ADAC_1: 4,
+                            dato: $scope.domicilio.provincia
+                        });
+                    }
+                    //domicilios de entrega corresponden al 1
+                    focaModalDomicilioService
+                        .obtenerUltimoPorNivelPadre(1)
+                        .then(function(res) {
+                            $scope.domicilio.nivel1 = 1;//domicilio de entrega corresponde 1
+                            $scope.domicilio.nivel2 = res.data[0].ultimo + 1;
+                            focaModalDomicilioService
+                                .guardarDomicilio($scope.domicilio)
+                                .then(function() {
+                                    $scope.buscar();
+                                    $scope.ingreso = false;
+                                    $scope.domicilio = {};
+                                });
+                    });
                 };
 
                 function calcularPages(paginaActual) {
diff --git a/src/js/service.js b/src/js/service.js
index 3155bc8..e6ca51c 100644
--- a/src/js/service.js
+++ b/src/js/service.js
@@ -4,16 +4,18 @@ angular.module('focaModalDomicilio')
         'API_ENDPOINT',
         function($http, API_ENDPOINT) {
             return {
-                getDomiciliosByIdCliente: function(id) {
-                    var idTipoDom = 2;//El tipo para nota de pedido es 2 (tipo de entrega)
+                getDomiciliosEntregaByIdCliente: function(id) {
                     return $http.get(API_ENDPOINT.URL +
-                        '/domicilio/tipo/' + idTipoDom + '/cliente/' + id);
+                        '/domicilio/entrega/cliente/' + id);
                 },
                 guardarDomicilio: function(domicilio) {
                     return $http.post(API_ENDPOINT.URL + '/domicilio', {domicilio: domicilio});
                 },
                 guardarContacto: function(contacto) {
                     return $http.post(API_ENDPOINT.URL + '/contacto', {contacto: contacto});
+                },
+                obtenerUltimoPorNivelPadre: function(nivel1) {
+                    return $http.get(API_ENDPOINT.URL + '/domicilio/ultimo/' + nivel1);
                 }
             };
         }
diff --git a/src/views/modal-domicilio.html b/src/views/modal-domicilio.html
index 92bc5fd..3732700 100644
--- a/src/views/modal-domicilio.html
+++ b/src/views/modal-domicilio.html
@@ -17,28 +17,21 @@
         <table ng-show="!ingreso" class="table table-striped table-sm">
             <thead>
                 <tr>
-                    <th>Domicilio</th>
+                    <th>Titulo</th>
+                    <th>Calle</th>
                     <th>Localidad</th>
                     <th>Provincia</th>
-                    <th colspan="5" class="text-center">Contacto</th>
                     <th></th>
                 </tr>
-                <tr>
-                    <th></th>
-                    <th></th>
-                    <th></th>
-                    <th>Tipo</th>
-                    <th>Contacto</th>
-                </tr>
             </thead>
             <tbody>
                 <tr ng-show="currentPageDomicilios.length == 0 && primerBusqueda">
-                    <td colspan="6">
+                    <td colspan="5">
                         No se encontraron resultados.
                     </td>
                 </tr>
                 <tr>
-                    <td colspan="5" ng-show="!ingreso">
+                    <td colspan="4" ng-show="!ingreso">
                         <input
                             class="form-control form-control-sm"
                             type="text"
@@ -66,11 +59,10 @@
                 <tr class="selectable"
                     ng-repeat="(key,domicilio) in currentPageDomicilios"
                     ng-click="select(domicilio)">
-                    <td ng-bind="domicilio.dom"></td>
-                    <td ng-bind="domicilio.loc"></td>
-                    <td ng-bind="domicilio.pci"></td>
-                    <td ng-bind="domicilio.contacto[0].tipo"></td>
-                    <td ng-bind="domicilio.contacto[0].contacto"></td>
+                    <td ng-bind="domicilio.titulo"></td>
+                    <td ng-bind="domicilio.Calle + ' ' + domicilio.Numero"></td>
+                    <td ng-bind="domicilio.Localidad"></td>
+                    <td ng-bind="domicilio.Provincia"></td>
                     <td>
                         <button 
                             type="button"
@@ -128,25 +120,35 @@
                     <option ng-value="2">Entrega</option>
                 </select>
             </div>
-            <div class="col-4">
-                <label>Código Postal</label>
+            <div class="col-8">
+                <label>Titulo</label>
                 <input
                     type="text"
                     foca-focus="ingreso"
                     class="form-control"
-                    ng-model="domicilio.cpo"
+                    ng-model="domicilio.titulo"
+                    placeholder="Ingrese título"
+                    ng-required="true"
+                />
+            </div>
+            <div class="col-9">
+                <label>Calle</label>
+                <input
+                    type="text"
+                    class="form-control"
+                    ng-model="domicilio.calle"
+                    placeholder="Ingrese calle"
                     ng-required="true"
-                    placeholder="Ingrese código postal"
                 />
             </div>
-            <div class="col-12">
-                <label>Domicilio</label>
+            <div class="col-3">
+                <label>Nº</label>
                 <input
                     type="text"
                     class="form-control"
-                    ng-model="domicilio.dom"
+                    ng-model="domicilio.numeroCalle"
+                    placeholder="Ingrese Numero"
                     ng-required="true"
-                    placeholder="Ingrese domicilio"
                 />
             </div>
             <div class="col-6">
@@ -154,9 +156,9 @@
                 <input
                     type="text"
                     class="form-control"
-                    ng-model="domicilio.loc"
-                    ng-required="true"
+                    ng-model="domicilio.localidad"
                     placeholder="Ingrese localidad"
+                    ng-required="true"
                 />            
             </div>
             <div class="col-6">
@@ -164,48 +166,11 @@
                 <input
                     type="text"
                     class="form-control"
-                    ng-model="domicilio.pci"
-                    ng-required="true"
+                    ng-model="domicilio.provincia"
                     placeholder="Ingrese provincia"
+                    ng-required="true"
                 />
             </div>
-            <label class="col-12">Ingrese Contactos</label>
-            <div class="col-12 form-row mb-1" ng-repeat="(key, contacto) in contactos">
-                <div class="col-3">
-                    <select class="form-control" ng-model="contacto.tipo" ng-required="true">
-                        <option ng-value="0">Teléfono Móvil</option>
-                        <option ng-value="1">Teléfono Fijo</option>
-                        <option ng-value="2">Fax</option>
-                        <option ng-value="3">Email</option>
-                    </select>
-                </div>
-                <div class="col-7">
-                    <input
-                        type="text"
-                        class="form-control"
-                        ng-model="contacto.contacto"
-                        placeholder="Ingrese contacto"
-                        ng-required="true"
-                    >
-                </div>
-                <div class="col-1">
-                    <button
-                        type="button"
-                        class="form-control"
-                        ng-click="quitarContacto(key)"
-                        ng-disabled="contactos.length === 1"
-                    ><i class="fa fa-minus" aria-hidden="true"></i>
-                    </button>
-                </div>
-                <div class="col-1">
-                    <button
-                        type="button"
-                        class="form-control"
-                        ng-click="agregarContacto()"
-                    ><i class="fa fa-plus" aria-hidden="true"></i>
-                    </button>
-                </div>
-            </div>
         </div>
     </form>
 </div>
-- 
1.9.1