From 76ed8478c138cd223ff52025f3416bbfd36a142c Mon Sep 17 00:00:00 2001
From: Juan Ferrer Toribio <juan.ferrer.toribio@gmail.com>
Date: Mon, 28 Nov 2016 18:21:55 +0100
Subject: [PATCH] Consignatarios

---
 @salix/core/src/left-menu/actions.html        |  2 +-
 @salix/crud/src/client/addresses/index.html   | 27 ++++++++++++++
 @salix/crud/src/client/addresses/index.js     | 32 +++++++++++++++++
 @salix/crud/src/client/basic-data/index.js    | 15 +++-----
 @salix/crud/src/client/client.js              |  6 ++--
 .../crud/src/client/databasic/databasic.html  | 36 -------------------
 @salix/crud/src/client/databasic/databasic.js | 11 ------
 @salix/crud/src/client/routes.js              | 36 +++++++++----------
 services/client/common/models/Address.json    | 10 ++++++
 9 files changed, 97 insertions(+), 78 deletions(-)
 create mode 100644 @salix/crud/src/client/addresses/index.html
 create mode 100644 @salix/crud/src/client/addresses/index.js
 delete mode 100644 @salix/crud/src/client/databasic/databasic.html
 delete mode 100644 @salix/crud/src/client/databasic/databasic.js

diff --git a/@salix/core/src/left-menu/actions.html b/@salix/core/src/left-menu/actions.html
index de19f738e4..3daf705512 100644
--- a/@salix/core/src/left-menu/actions.html
+++ b/@salix/core/src/left-menu/actions.html
@@ -1,5 +1,5 @@
 <vn-horizontal>
-    <ul style="list-style-type: none; margin: 0; padding: 0; width: 100%;">
+    <ul style="list-style-type: none; margin: 0; padding: 0; width: 100%; color: #666;">
         <vn-menu-item ng-repeat="item in $ctrl.items" item = "item"></vn-menu-item>
     </ul>
 </vn-horizontal>
diff --git a/@salix/crud/src/client/addresses/index.html b/@salix/crud/src/client/addresses/index.html
new file mode 100644
index 0000000000..9a2d9cd507
--- /dev/null
+++ b/@salix/crud/src/client/addresses/index.html
@@ -0,0 +1,27 @@
+<vn-vertical full-height pad-large style="box-sizing: border-box;">
+    <vn-horizontal>
+        <h3 style="margin-top: 0;">Addresses</h3>
+    </vn-horizontal>
+    <vn-horizontal style="border-bottom: .1em dashed; text-transform: uppercase; text-align: center;" class="pad-medium-bottom">
+        <vn-empty style="width: 7em;">Default</vn-empty>
+        <vn-auto>Consignee</vn-auto>
+        <vn-empty style="width: 7em;">Enabled</vn-empty>
+    </vn-horizontal>
+    <vn-horizontal ng-repeat="i in $ctrl.addresses" style="align-items: center;" class="pad-medium-top">
+        <vn-empty style="width: 7em; text-align: center;">
+            <input type="radio" name="default"/>
+        </vn-empty>
+        <vn-auto vn-one style="border: 1px solid black; border-radius: .5em;" class="pad-small">
+            <button style="float: right;">
+                Edit
+            </button>
+            <h5>{{i.consignee}}</h5>
+            <div>{{i.street}}</div>
+            <div>{{i.city}}, {{i.province}}</div>
+            <div>{{i.phone}}, {{i.mobile}}</div>
+        </vn-auto>
+        <vn-empty style="width: 7em; text-align: center;">
+            <input type="checkbox" name="enabled" model="i.enabled"/>
+        </vn-empty>
+    </vn-horizontal>
+</vn-vertical>
\ No newline at end of file
diff --git a/@salix/crud/src/client/addresses/index.js b/@salix/crud/src/client/addresses/index.js
new file mode 100644
index 0000000000..1745ca5f52
--- /dev/null
+++ b/@salix/crud/src/client/addresses/index.js
@@ -0,0 +1,32 @@
+import template from './index.html';
+import {module} from '../../module';
+
+export const NAME = 'vnClientAddresses';
+export const COMPONENT = {
+    template: template,
+	controller: function ($http)
+	{
+		this.addresses = [{
+			consignee: 'Consignee 1',
+			street: 'Street',
+			city: 'City',
+			postcode: '46600',
+			province: 'Province',
+			country: 'Country',
+			phone: 'XX-XXX-XX-XX',
+			mobile: 'XX-6XX-XX-XX',
+			enabled: true
+		},{
+			consignee: 'Consignee 2',
+			street: 'Street',
+			city: 'City',
+			postcode: '46600',
+			province: 'Province',
+			country: 'Country',
+			phone: 'XX-XXX-XX-XX',
+			mobile: 'XX-6XX-XX-XX',
+			enabled: true
+		}];
+	},
+};
+module.component(NAME, COMPONENT);
diff --git a/@salix/crud/src/client/basic-data/index.js b/@salix/crud/src/client/basic-data/index.js
index 980684df4f..75d59cc17d 100644
--- a/@salix/crud/src/client/basic-data/index.js
+++ b/@salix/crud/src/client/basic-data/index.js
@@ -1,19 +1,14 @@
 import template from './index.html';
 import {module} from '../../module';
 
-export const _NAME = 'customerBasicData';
-//export const NAME = module.getName(_NAME);
-export const NAME = 'vnCustomerBasicData';
-
+export const NAME = 'vnClientBasicData';
 export const COMPONENT = {
     template: template,
-	controller: function ($http)
-	{
-		this.submit = function ()
-		{
+	controller: function ($http) {
+		this.submit = function () {
             $http.post('/client/api/Clients', this.model).then (
-                () => console.log ('OK'),
-                () => console.log ('ER')
+                (json) => console.log (json.statusText),
+                (json) => console.error (json.data.error.message)
             );
 		};
 	},
diff --git a/@salix/crud/src/client/client.js b/@salix/crud/src/client/client.js
index 3e0e7aa311..b4e35cc0e8 100644
--- a/@salix/crud/src/client/client.js
+++ b/@salix/crud/src/client/client.js
@@ -1,4 +1,6 @@
-export {NAME as CLIENT_BASIC_DATA_INDEX,
-	COMPONENT as CLIENT_BASIC_DATA_INDEX_COMPONENT} from './basic-data/index';
 export {NAME as CLIENT_INDEX,
 	COMPONENT as CLIENT_INDEX_COMPONENT} from './index/index';
+export {NAME as CLIENT_BASIC_DATA_INDEX,
+	COMPONENT as CLIENT_BASIC_DATA_INDEX_COMPONENT} from './basic-data/index';
+export {NAME as CLIENT_ADDRESSES,
+	COMPONENT as CLIENT_ADDRESSES_COMPONENT} from './addresses/index';
diff --git a/@salix/crud/src/client/databasic/databasic.html b/@salix/crud/src/client/databasic/databasic.html
deleted file mode 100644
index bf453058b8..0000000000
--- a/@salix/crud/src/client/databasic/databasic.html
+++ /dev/null
@@ -1,36 +0,0 @@
-<vn-vertical full-height pad-medium>
-    <vn-horizontal>
-        <vn-one>
-            <h3>Datos básicos</h3>
-        </vn-one>
-    </vn-horizontal>
-    <vn-horizontal>
-        <vn-one>
-            <vn-textfield label="Alias" name"alias" model="customer.alias"></vn-textfield>
-            <vn-textfield label="NIF/CIF" name="fi" model="customer.fi"></vn-textfield>
-        </vn-one>
-     </vn-horizontal>
-     <vn-horizontal>
-        <vn-one>
-          <vn-textfield label="Razón social" name"socialName" model="customer.socialName"></vn-textfield>
-          <vn-date-picker label="Fecha alta" name"dischargeDate" model="customer.dischargeDate"></vn-date-picker>
-        </vn-one> 
-    </vn-horizontal>
-    <vn-horizontal>
-        <vn-one>
-          <vn-textfield label="Contacto" name="contact" model="customer.contact"></vn-textfield>
-          <vn-textfield label="Teléfono" name="telefono" model="customer.phone"></vn-textfield>
-        </vn-one>
-    </vn-horizontal>
-    <vn-horizontal>
-        <vn-one>
-            <vn-textfield label="Calidad" name="quality" model="customer.quality"></vn-textfield>
-            <vn-combo label="Comercial" name="salesPerson" model="customer.salesPerson"></vn-combo>
-        </vn-one>
-    </vn-horizontal>
-    <vn-horizontal>
-        <vn-one>
-            <vn-button class="colored" text="Guardar"></vn-button>
-        </vn-one>
-    </vn-horizontal>
-</vn-vertical>
\ No newline at end of file
diff --git a/@salix/crud/src/client/databasic/databasic.js b/@salix/crud/src/client/databasic/databasic.js
deleted file mode 100644
index a83180364c..0000000000
--- a/@salix/crud/src/client/databasic/databasic.js
+++ /dev/null
@@ -1,11 +0,0 @@
-import template from './databasic.html';
-import {module} from '../../module';
-
-export const _NAME = 'clientDataBasic';
-//export const NAME = module.getName(_NAME);
-export const NAME = "vnClientDataBasic";
-
-export const COMPONENT = {
-    template: template
-};
-module.component(NAME, COMPONENT);
diff --git a/@salix/crud/src/client/routes.js b/@salix/crud/src/client/routes.js
index 1d630f3375..c339a9d607 100644
--- a/@salix/crud/src/client/routes.js
+++ b/@salix/crud/src/client/routes.js
@@ -1,20 +1,20 @@
-[
-    {
-        url: '/client',
-        state: 'client',
-        template: '<vn-client-index full-height></vn-client-index>',
-        module: 'crud',
-        description: '',
-        image: '',
-    },
-    {
-        url: '/basic-data',
-        state: 'client.basicdata',
-        template: '<vn-customer-basic-data full-height></vn-customer-basic-data>',
-        module: 'crud',
-        description: '',
-        image: '',
-    }
-]
+[{
+    url: '/client',
+    state: 'client',
+    template: '<vn-client-index full-height></vn-client-index>',
+    module: 'crud',
+    description: '',
+    image: '',
+},{
+    url: '/basic-data',
+    state: 'client.basicdata',
+    template: '<vn-client-basic-data full-height></vn-client-basic-data>',
+    module: 'crud'
+},{
+    url: '/addresses',
+    state: 'client.addresses',
+    template: '<vn-client-addresses full-height></vn-client-addresses>',
+    module: 'crud'
+}]
 
 
diff --git a/services/client/common/models/Address.json b/services/client/common/models/Address.json
index a819747b50..01c060a4ba 100644
--- a/services/client/common/models/Address.json
+++ b/services/client/common/models/Address.json
@@ -11,6 +11,10 @@
       "type": "string",
       "required": "true"
     },
+    "consignee": {
+      "type": "string",
+      "required": "true"
+    },
     "city": {
       "type": "string",
       "required": "true"
@@ -25,8 +29,14 @@
       "type": "string",
       "required": "true"
     },
+    "enabled": {
+      "type": "boolean"
+    },
     "phone": {
       "type": "string"
+    },
+    "mobile": {
+      "type": "string"
     }
   }
 }