From 69ebeb9d0fe5b704b6f07da011ea2e323eb18510 Mon Sep 17 00:00:00 2001
From: nelo <nelo@verdnatura.es>
Date: Thu, 12 Jan 2017 09:52:20 +0100
Subject: [PATCH 1/3] =?UTF-8?q?Arreglado=20problema=20con=20las=20provinci?=
 =?UTF-8?q?as=20El=20objeto=20cliente=20se=20copia=20hacia=20abajo=20Se=20?=
 =?UTF-8?q?ha=20generado=20la=20funci=C3=B3n=20copy=20y=20la=20funci=C3=B3?=
 =?UTF-8?q?n=20equals=20A=C3=B1adidos=20m=C3=A1rgenes=20a=20los=20botones?=
 =?UTF-8?q?=20de=20guardar?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 @salix/core/src/copy.js                       |  5 ++++
 @salix/core/src/core.js                       |  4 ++-
 @salix/core/src/equals.js                     |  5 ++++
 .../crud/src/client/addresses-data/index.html |  2 +-
 @salix/crud/src/client/basic-data/index.html  |  2 +-
 @salix/crud/src/client/basic-data/index.js    | 30 ++++++++++++++-----
 @salix/crud/src/client/card/card.html         |  2 +-
 @salix/crud/src/client/card/card.js           |  6 ----
 @salix/crud/src/client/create/index.html      |  2 +-
 .../src/client/descriptor/descriptor.html     |  8 ++---
 .../crud/src/client/descriptor/descriptor.js  |  2 +-
 @salix/crud/src/client/fiscal-data/index.html | 10 +++----
 @salix/crud/src/client/notes/index.html       |  2 +-
 @salix/crud/src/client/web-access/index.html  |  4 +--
 services/client/common/models/Client.json     |  9 ------
 15 files changed, 53 insertions(+), 40 deletions(-)
 create mode 100644 @salix/core/src/copy.js
 create mode 100644 @salix/core/src/equals.js

diff --git a/@salix/core/src/copy.js b/@salix/core/src/copy.js
new file mode 100644
index 000000000..7e8b4e1f4
--- /dev/null
+++ b/@salix/core/src/copy.js
@@ -0,0 +1,5 @@
+import {module} from './module';
+
+export const NAME = 'copyObject';
+
+module.value(NAME, angular.copy);
diff --git a/@salix/core/src/core.js b/@salix/core/src/core.js
index f70bb48e4..7b5aaa0f1 100644
--- a/@salix/core/src/core.js
+++ b/@salix/core/src/core.js
@@ -7,6 +7,8 @@ export {SplitingRegister as splitingRegister} from './splitingregister';
 export {NAME as RESOLVEDEFAULTCOMPONENT, ResolveDefaultComponent} from './resolveDefaultComponents';
 export {NAME as INTERPOLATE, Interpolate} from './interpolate';
 export {NAME as ROUTES_LOADER, RoutesLoader} from './routesLoader';
+export {NAME as COPY_OBJECT} from './copy';
+export {NAME as EQUALS_OBJECT} from './equals';
 
 export {NAME as FOCUS, directive as Focus} from './focus';
 export {NAME as RULE, directive as Rule} from './rule';
@@ -51,4 +53,4 @@ export {directive as Icon} from './icon/icon';
 export {factory as IconMdl} from './icon/icon.mdl';
 
 export {NAME as TITLE, COMPONENT as TITLE_COMPONENT} from './title/title';
-export {NAME as SUBTITLE, COMPONENT as SUBTITLE_COMPONENT} from './subtitle/subtitle';
+export {NAME as SUBTITLE, COMPONENT as SUBTITLE_COMPONENT} from './subtitle/subtitle';
\ No newline at end of file
diff --git a/@salix/core/src/equals.js b/@salix/core/src/equals.js
new file mode 100644
index 000000000..ee8f76cb4
--- /dev/null
+++ b/@salix/core/src/equals.js
@@ -0,0 +1,5 @@
+import {module} from './module';
+
+export const NAME = 'equalsObject';
+
+module.value(NAME, angular.equals);
diff --git a/@salix/crud/src/client/addresses-data/index.html b/@salix/crud/src/client/addresses-data/index.html
index a67dfdbe7..373a6fb26 100644
--- a/@salix/crud/src/client/addresses-data/index.html
+++ b/@salix/crud/src/client/addresses-data/index.html
@@ -25,7 +25,7 @@
                       <option ng-repeat="a in addressData.agencies | orderBy:'name'" value="{{a.id}}">{{a.name}}</ng-repeat>
                  </vn-combo>
             </vn-horizontal>
-            <vn-empty>
+            <vn-empty margin-large-top>
                      <vn-submit label="Guardar" id="save"></vn-submit>
             </vn-empty>
          </vn-vertical>
diff --git a/@salix/crud/src/client/basic-data/index.html b/@salix/crud/src/client/basic-data/index.html
index aeb0eb2d1..fc23f53b3 100644
--- a/@salix/crud/src/client/basic-data/index.html
+++ b/@salix/crud/src/client/basic-data/index.html
@@ -19,7 +19,7 @@
                 <vn-two></vn-two>
             </vn-horizontal>
             <vn-horizontal>
-                <vn-one>
+                <vn-one margin-large-top>
                     <vn-submit label="Guardar" id="save"></vn-submit>
                 </vn-one>
             </vn-horizontal>
diff --git a/@salix/crud/src/client/basic-data/index.js b/@salix/crud/src/client/basic-data/index.js
index 5e283f555..0231f92d9 100644
--- a/@salix/crud/src/client/basic-data/index.js
+++ b/@salix/crud/src/client/basic-data/index.js
@@ -6,20 +6,36 @@ export const COMPONENT = {
     template: template,
     controllerAs: 'basicData',
     bindings: {
-        client: '='
+        client: '<'
     },
-    controller: function($http) {
+    controller: function($http, $rootScope, copyObject, equalsObject) {
+
+        this.$onChanges = function (changes) {
+            if(this.client)
+                this.clientOld = copyObject(this.client);
+        }
+
+        /*$rootScope.$on("$locationChangeStart", function(event) {
+            if(!equalsObject(this.client, this.clientOld)){
+                event.preventDefault();
+            }
+        });*/
+
         $http.get('/client/api/SalesPeople').then(
             json => this.sales = json.data,
             json => console.error(json.data.error.message)
         );
+
         this.submit = function() {
-            $http.put('/client/api/Clients', this.client).then(
-                json => console.log(json.statusText),
-                json => console.error(json.data.error.message)
-            );
+            if(!equalsObject(this.client, this.clientOld)){
+                this.client.modify = "BasicData";
+                $http.put('/client/api/Clients', this.client).then(
+                    json => console.log(json.statusText),
+                    json => console.error(json.data.error.message)
+                );
+            }
         };
     }
 };
-COMPONENT.controller.$inject = ['$http'];
+COMPONENT.controller.$inject = ['$http', '$rootScope', 'copyObject', 'equalsObject'];
 module.component(NAME, COMPONENT);
diff --git a/@salix/crud/src/client/card/card.html b/@salix/crud/src/client/card/card.html
index 57bd9441d..ca9e25f75 100644
--- a/@salix/crud/src/client/card/card.html
+++ b/@salix/crud/src/client/card/card.html
@@ -2,7 +2,7 @@
     <vn-topbar></vn-topbar>
     <vn-horizontal class="full-height">
         <vn-empty  pad-medium-left >
-            <vn-descriptor descriptor="card.descriptor" class="display-block" ></vn-descriptor>
+            <vn-descriptor client="card.client" class="display-block" ></vn-descriptor>
             <vn-left-menu items="card.items"></vn-left-menu>
         </vn-empty>
         <vn-auto > 
diff --git a/@salix/crud/src/client/card/card.js b/@salix/crud/src/client/card/card.js
index e38652026..8edba83e8 100644
--- a/@salix/crud/src/client/card/card.js
+++ b/@salix/crud/src/client/card/card.js
@@ -13,12 +13,6 @@ export const COMPONENT = {
         $http.get(`/client/api/Clients/${$stateParams.id}`).then(
             json => {
                 this.client = json.data;
-                this.descriptor = {
-                    clientId: this.client.id,
-                    name: this.client.name,
-                    phone: this.client.phone,
-                    active: this.client.active
-                };
             },
             json => console.error(json.data.error.message)
         );
diff --git a/@salix/crud/src/client/create/index.html b/@salix/crud/src/client/create/index.html
index c1df86615..d794b59ab 100644
--- a/@salix/crud/src/client/create/index.html
+++ b/@salix/crud/src/client/create/index.html
@@ -12,7 +12,7 @@
                 <vn-one></vn-one>
             </vn-horizontal>
             <vn-horizontal>
-                <vn-one>
+                <vn-one margin-large-top>
                     <vn-submit label="Crear" id="create"></vn-submit>
                 </vn-one>
             </vn-horizontal>
diff --git a/@salix/crud/src/client/descriptor/descriptor.html b/@salix/crud/src/client/descriptor/descriptor.html
index cdd9bec0c..74cef41dd 100644
--- a/@salix/crud/src/client/descriptor/descriptor.html
+++ b/@salix/crud/src/client/descriptor/descriptor.html
@@ -5,11 +5,11 @@
                 <i class="material-icons descriptor-icon">person</i>
             </vn-one>
             <vn-vertical vn-two>
-                <div class="margin-none">{{descriptor.descriptor.clientId}}</div>
-                <div class="margin-none">{{descriptor.descriptor.name}}</div>
-                <div class="margin-none">{{descriptor.descriptor.phone}}</div>
+                <div class="margin-none">{{descriptor.client.clientId}}</div>
+                <div class="margin-none">{{descriptor.client.name}}</div>
+                <div class="margin-none">{{descriptor.client.phone}}</div>
             </vn-vertical>
         </vn-horizontal>
-        <vn-switch label="Activo" field="descriptor.descriptor.active"></vn-switch>
+        <vn-switch label="Activo" field="descriptor.client.active"></vn-switch>
     </vn-vertical>
 </vn-card>
diff --git a/@salix/crud/src/client/descriptor/descriptor.js b/@salix/crud/src/client/descriptor/descriptor.js
index 36de83103..e01a64c18 100644
--- a/@salix/crud/src/client/descriptor/descriptor.js
+++ b/@salix/crud/src/client/descriptor/descriptor.js
@@ -7,7 +7,7 @@ export const COMPONENT = {
     template: template,
     controllerAs: 'descriptor',
     bindings: {
-        descriptor: '<'
+        client: '<'
     }
 };
 module.component(NAME, COMPONENT);
diff --git a/@salix/crud/src/client/fiscal-data/index.html b/@salix/crud/src/client/fiscal-data/index.html
index b677d9c0e..aa651fe9b 100644
--- a/@salix/crud/src/client/fiscal-data/index.html
+++ b/@salix/crud/src/client/fiscal-data/index.html
@@ -15,10 +15,10 @@
             <vn-horizontal>
                 <vn-textfield vn-one label="Código postal" field="fiscal.client.postcode"></vn-textfield>
                 <vn-combo vn-one label="Provincia" field="fiscal.client.province">
-                    <option ng-repeat="p in fiscal.provinces" value="{{p.id}}">{{p.name}}</option>
+                    <option ng-repeat="p in fiscal.provinces | orderBy:'name'" value="{{p.id}}">{{p.name}}</option>
                 </vn-combo>
                 <vn-combo vn-one label="País" field="fiscal.client.country">
-                    <option ng-repeat="c in fiscal.countries" value="{{c.id}}">{{c.name}}</option>
+                    <option ng-repeat="c in fiscal.countries | orderBy:'name'" value="{{c.id}}">{{c.name}}</option>
                 </vn-combo>
             </vn-horizontal>
             <vn-horizontal>
@@ -54,9 +54,9 @@
                 <vn-check vn-two label="Recibido core VNL" field="fiscal.client.coreVnl"></vn-check>
                 <vn-check vn-two label="Recibido B2B VNL" field="fiscal.client.sepaVnl"></vn-check>
             </vn-horizontal>
-            <vn-empty class="margin-large-top">
-                <vn-submit label="Guardar"></vn-submit>
-            </vn-empty>
         </vn-vertical>
     </vn-card>
+    <vn-empty margin-large-top>
+        <vn-submit label="Guardar"></vn-submit>
+    </vn-empty>
 </form>
\ No newline at end of file
diff --git a/@salix/crud/src/client/notes/index.html b/@salix/crud/src/client/notes/index.html
index 83ba1a4a0..be69576e2 100644
--- a/@salix/crud/src/client/notes/index.html
+++ b/@salix/crud/src/client/notes/index.html
@@ -3,7 +3,7 @@
         <vn-vertical pad-large>
             <vn-title>Notas</vn-title>
             <vn-textfield label="Notas" class="padd-medium-top" field="note.model.notes"></vn-textfield>
-            <vn-submit label="Guardar"></vn-submit>
+            <vn-submit margin-large-top label="Guardar"></vn-submit>
         </vn-vertical>
     </vn-card>
     
diff --git a/@salix/crud/src/client/web-access/index.html b/@salix/crud/src/client/web-access/index.html
index 84f10f1ef..ba6696619 100644
--- a/@salix/crud/src/client/web-access/index.html
+++ b/@salix/crud/src/client/web-access/index.html
@@ -3,8 +3,8 @@
         <vn-vertical pad-large>
             <vn-title>Acceso Web</vn-title>
             <vn-check label="Acceso web activo" field="web.client.active"></vn-check>
-            <vn-textfield label="Usuario" class="padd-medium-top margin-medium-top margin-medium-bottom" field="web.client.user" focus></vn-textfield>
-            <vn-submit label="Guardar"></vn-submit>
+            <vn-textfield label="Usuario" class="padd-medium-top margin-medium-top" field="web.client.user" focus></vn-textfield>
+            <vn-submit margin-large-top label="Guardar"></vn-submit>
         </vn-vertical>
     </vn-card>
 </form>
\ No newline at end of file
diff --git a/services/client/common/models/Client.json b/services/client/common/models/Client.json
index e76911c2f..ac23f54fe 100644
--- a/services/client/common/models/Client.json
+++ b/services/client/common/models/Client.json
@@ -36,12 +36,6 @@
     "postcode": {
       "type": "string"
     },
-    "province": {
-      "type": "Number"
-    },
-    "country": {
-      "type": "string"
-    },
     "email": {
       "type": "string"
     },
@@ -63,9 +57,6 @@
     "iban": {
       "type": "string"
     },
-    "payMethod": {
-      "type": "string"
-    },
     "dueDay": {
       "type": "Number"
     },

From 4d9e3d2684fdde4557763787992fe91c54e1d539 Mon Sep 17 00:00:00 2001
From: jgallego <jgallego@verdnatura.es>
Date: Thu, 12 Jan 2017 11:02:22 +0100
Subject: [PATCH 2/3] validacion prueba

---
 services/client/common/models/Address.json       |  6 +++---
 services/client/common/models/Agency.json        |  2 +-
 services/client/common/models/Client.js          | 14 ++++++++++++++
 services/client/common/models/Client.json        |  3 ++-
 services/client/common/models/Country.json       |  2 +-
 services/client/common/models/PaymentMethod.json |  2 +-
 services/client/common/models/Province.json      |  2 +-
 services/client/common/models/SalesPerson.json   |  2 +-
 services/client/common/models/account.json       |  2 +-
 9 files changed, 25 insertions(+), 10 deletions(-)
 create mode 100644 services/client/common/models/Client.js

diff --git a/services/client/common/models/Address.json b/services/client/common/models/Address.json
index 8d4cb3327..69ab68a20 100644
--- a/services/client/common/models/Address.json
+++ b/services/client/common/models/Address.json
@@ -9,15 +9,15 @@
     },
     "street": {
       "type": "string",
-      "required": "true"
+      "required": true
     },
     "consignee": {
       "type": "string",
-      "required": "true"
+      "required": true
     },
     "city": {
       "type": "string",
-      "required": "true"
+      "required": true
     },
     "postcode": {
       "type": "string"
diff --git a/services/client/common/models/Agency.json b/services/client/common/models/Agency.json
index 33cd2944d..d44a9aff4 100644
--- a/services/client/common/models/Agency.json
+++ b/services/client/common/models/Agency.json
@@ -9,7 +9,7 @@
     },
     "name": {
       "type": "string",
-      "required": "true"
+      "required": true
     }
   }
 }
diff --git a/services/client/common/models/Client.js b/services/client/common/models/Client.js
new file mode 100644
index 000000000..d927d8e1b
--- /dev/null
+++ b/services/client/common/models/Client.js
@@ -0,0 +1,14 @@
+module.exports = function(Client) {
+
+    // prueba uno
+        // Client.validatesUniquenessOf('name', {message: 'el nombre debe ser unico'});
+
+    // prueba dos
+    Client.validate('name',hasCC,{message: 'Introducir cuenta bancaria'});
+
+    function hasCC(err) {
+    if (this.payMethod == 2) err();
+
+    }
+
+};
\ No newline at end of file
diff --git a/services/client/common/models/Client.json b/services/client/common/models/Client.json
index e76911c2f..4fd27b5bd 100644
--- a/services/client/common/models/Client.json
+++ b/services/client/common/models/Client.json
@@ -1,6 +1,7 @@
 {
   "name": "Client",
   "base": "PersistedModel",
+  "validateUpsert": true,
   "properties": {
     "id": {
       "type": "Number",
@@ -9,7 +10,7 @@
     },
     "name": {
       "type": "string",
-      "required": "true"
+      "required": true
     }, 
     "fi": {
       "type": "string",
diff --git a/services/client/common/models/Country.json b/services/client/common/models/Country.json
index 464380345..8433f109b 100644
--- a/services/client/common/models/Country.json
+++ b/services/client/common/models/Country.json
@@ -9,7 +9,7 @@
     },
     "name": {
       "type": "string",
-      "required": "true"
+      "required": true
     }
   }
 }
\ No newline at end of file
diff --git a/services/client/common/models/PaymentMethod.json b/services/client/common/models/PaymentMethod.json
index 8a7f82b85..3cb5d5a29 100644
--- a/services/client/common/models/PaymentMethod.json
+++ b/services/client/common/models/PaymentMethod.json
@@ -9,7 +9,7 @@
     },
     "name": {
       "type": "string",
-      "required": "true"
+      "required": true
     }
   }
 }
diff --git a/services/client/common/models/Province.json b/services/client/common/models/Province.json
index 16738ef16..68c73d9d1 100644
--- a/services/client/common/models/Province.json
+++ b/services/client/common/models/Province.json
@@ -9,7 +9,7 @@
     },
     "name": {
       "type": "string",
-      "required": "true"
+      "required": true
     }
   }
 }
\ No newline at end of file
diff --git a/services/client/common/models/SalesPerson.json b/services/client/common/models/SalesPerson.json
index 07d998b12..76d1aa58b 100644
--- a/services/client/common/models/SalesPerson.json
+++ b/services/client/common/models/SalesPerson.json
@@ -9,7 +9,7 @@
     },
     "name": {
       "type": "string",
-      "required": "true"
+      "required": true
     }
   }
 }
diff --git a/services/client/common/models/account.json b/services/client/common/models/account.json
index 98a2b86f4..8a18abc75 100644
--- a/services/client/common/models/account.json
+++ b/services/client/common/models/account.json
@@ -9,7 +9,7 @@
     },
     "name": {
       "type": "string",
-      "required": "true"
+      "required": true
     }, 
     "active": {
       "type": "boolean"

From c85863b5c4c6f2240ec01776bfaf4c9dd27f9351 Mon Sep 17 00:00:00 2001
From: nelo <nelo@verdnatura.es>
Date: Thu, 12 Jan 2017 13:09:53 +0100
Subject: [PATCH 3/3] =?UTF-8?q?c=C3=B3digo=20para=20capturar=20el=20evento?=
 =?UTF-8?q?=20del=20ui-router?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 @salix/crud/src/client/basic-data/index.js | 15 +++++++++------
 1 file changed, 9 insertions(+), 6 deletions(-)

diff --git a/@salix/crud/src/client/basic-data/index.js b/@salix/crud/src/client/basic-data/index.js
index 0231f92d9..5f7622dca 100644
--- a/@salix/crud/src/client/basic-data/index.js
+++ b/@salix/crud/src/client/basic-data/index.js
@@ -8,18 +8,21 @@ export const COMPONENT = {
     bindings: {
         client: '<'
     },
-    controller: function($http, $rootScope, copyObject, equalsObject) {
+    controller: function($http, $rootScope, copyObject, equalsObject, $state) {
+
+        this.currentstate = $state.current;
+        var self = this;
 
         this.$onChanges = function (changes) {
             if(this.client)
                 this.clientOld = copyObject(this.client);
         }
 
-        /*$rootScope.$on("$locationChangeStart", function(event) {
-            if(!equalsObject(this.client, this.clientOld)){
+        $rootScope.$on("$stateChangeStart", function(event, next) {
+            //if(!equalsObject(self.client, self.clientOld)){
                 event.preventDefault();
-            }
-        });*/
+            //}
+        });
 
         $http.get('/client/api/SalesPeople').then(
             json => this.sales = json.data,
@@ -37,5 +40,5 @@ export const COMPONENT = {
         };
     }
 };
-COMPONENT.controller.$inject = ['$http', '$rootScope', 'copyObject', 'equalsObject'];
+COMPONENT.controller.$inject = ['$http', '$rootScope', 'copyObject', 'equalsObject', '$state'];
 module.component(NAME, COMPONENT);