From b8df169eebb7f822b430e2def0cfafa73f8b66cc Mon Sep 17 00:00:00 2001
From: Juan Ferrer Toribio <juan.ferrer.toribio@gmail.com>
Date: Tue, 29 Nov 2016 13:00:15 +0100
Subject: [PATCH 1/4] Consignatarios acabado

---
 @salix/core/src/buttonicon/buttonicon.bt.html |  3 -
 @salix/core/src/buttonicon/buttonicon.bt.js   | 23 -------
 @salix/core/src/buttonicon/buttonicon.mt.html |  4 --
 @salix/core/src/buttonicon/buttonicon.mt.js   | 23 -------
 @salix/core/src/check/check.mt.html           |  4 +-
 @salix/core/src/check/check.mt.js             |  3 -
 @salix/core/src/combo/combo.js                | 17 +++--
 @salix/core/src/combo/combo.mt.js             |  2 -
 @salix/core/src/core.js                       | 63 +++++++++----------
 @salix/core/src/date-picker/date-picker.js    | 17 +++--
 .../core/src/date-picker/date-picker.mt.html  |  2 +-
 @salix/core/src/date-picker/date-picker.mt.js |  5 +-
 .../icon-button.js}                           |  8 +--
 .../core/src/icon-button/icon-button.mt.html  |  3 +
 @salix/core/src/icon-button/icon-button.mt.js | 15 +++++
 @salix/core/src/radio/radio.mt.html           |  4 +-
 @salix/core/src/radio/radio.mt.js             |  2 -
 @salix/core/src/resolveDefaultComponents.js   |  3 -
 @salix/crud/src/client/addresses/index.html   | 22 ++++---
 @salix/crud/src/client/addresses/index.js     | 25 +++++---
 20 files changed, 102 insertions(+), 146 deletions(-)
 delete mode 100644 @salix/core/src/buttonicon/buttonicon.bt.html
 delete mode 100644 @salix/core/src/buttonicon/buttonicon.bt.js
 delete mode 100644 @salix/core/src/buttonicon/buttonicon.mt.html
 delete mode 100644 @salix/core/src/buttonicon/buttonicon.mt.js
 rename @salix/core/src/{buttonicon/buttonicon.js => icon-button/icon-button.js} (76%)
 create mode 100644 @salix/core/src/icon-button/icon-button.mt.html
 create mode 100644 @salix/core/src/icon-button/icon-button.mt.js

diff --git a/@salix/core/src/buttonicon/buttonicon.bt.html b/@salix/core/src/buttonicon/buttonicon.bt.html
deleted file mode 100644
index 8dbb62512..000000000
--- a/@salix/core/src/buttonicon/buttonicon.bt.html
+++ /dev/null
@@ -1,3 +0,0 @@
-<!-- por definir -->
-
-
diff --git a/@salix/core/src/buttonicon/buttonicon.bt.js b/@salix/core/src/buttonicon/buttonicon.bt.js
deleted file mode 100644
index 02b0d72b6..000000000
--- a/@salix/core/src/buttonicon/buttonicon.bt.js
+++ /dev/null
@@ -1,23 +0,0 @@
-import {module as _module} from '../module';
-import * as util from '../util';
-import * as constant from '../constants';
-import template from './buttonicon.bt.html';
-
-const _NAME = 'buttonicon';
-const DEFAULT_CLASS = 'mdl-button mdl-js-button mdl-button--icon';
-
-export const NAME = util.getFactoryName(_NAME + constant.MATERIAL_DESIGN_FRAMEWORK);
-
-export function factory() {
-    return {
-        template: template,
-        default: {
-            className: DEFAULT_CLASS,
-            enabled: 'true',
-            typeName: 'button',
-            image:'',
-        }
-    }
-}
-
-_module.factory(NAME, factory);
diff --git a/@salix/core/src/buttonicon/buttonicon.mt.html b/@salix/core/src/buttonicon/buttonicon.mt.html
deleted file mode 100644
index 7814cfde7..000000000
--- a/@salix/core/src/buttonicon/buttonicon.mt.html
+++ /dev/null
@@ -1,4 +0,0 @@
-<button type = "*[typeName]*" class="*[className]*">
-    <i class="material-icons">*[image]*</i>
-</button>
-
diff --git a/@salix/core/src/buttonicon/buttonicon.mt.js b/@salix/core/src/buttonicon/buttonicon.mt.js
deleted file mode 100644
index 5d951a217..000000000
--- a/@salix/core/src/buttonicon/buttonicon.mt.js
+++ /dev/null
@@ -1,23 +0,0 @@
-import {module as _module} from '../module';
-import * as util from '../util';
-import * as constant from '../constants';
-import template from './buttonicon.mt.html';
-
-const _NAME = 'buttonicon';
-const DEFAULT_CLASS = 'mdl-button mdl-js-button mdl-button--icon';
-
-export const NAME = util.getFactoryName(_NAME + constant.MATERIAL_DESIGN_FRAMEWORK);
-
-export function factory() {
-    return {
-        template: template,
-        default: {
-            className: DEFAULT_CLASS,
-            enabled: 'true',
-            typeName: 'button',
-            image:'',
-        }
-    }
-}
-
-_module.factory(NAME, factory);
diff --git a/@salix/core/src/check/check.mt.html b/@salix/core/src/check/check.mt.html
index a4616186e..671daf162 100644
--- a/@salix/core/src/check/check.mt.html
+++ b/@salix/core/src/check/check.mt.html
@@ -1,4 +1,4 @@
-<label class="mdl-checkbox mdl-js-checkbox mdl-js-ripple-effect" for="*[name]*">
-	<input type="checkbox" name="*[name]*" id="*[name]*" class="*[className]*" *[enabled]*>
+<label class="mdl-checkbox mdl-js-checkbox mdl-js-ripple-effect" for="*[id]*">
+	<input type="checkbox" name="*[name]*" id="*[id]*" class="*[className]*" ng-model="*[model]*" *[enabled]*>
 	<span class="mdl-checkbox__label">*[label]*</span>
 </label>
diff --git a/@salix/core/src/check/check.mt.js b/@salix/core/src/check/check.mt.js
index cacd3c541..4a7a4cecd 100644
--- a/@salix/core/src/check/check.mt.js
+++ b/@salix/core/src/check/check.mt.js
@@ -4,7 +4,6 @@ import * as constant from '../constants';
 import template from './check.mt.html';
 
 const _NAME = 'check';
-const DEFAULT_TEXT = 'check';
 const DEFAULT_CLASS = 'mdl-checkbox__input';
 
 export const NAME = util.getFactoryName(_NAME + constant.MATERIAL_DESIGN_FRAMEWORK);
@@ -13,9 +12,7 @@ export function factory() {
     return {
         template: template,
         default: {
-            label: DEFAULT_TEXT,
             enabled: 'true',
-            id: 'checkboxId',
             className: DEFAULT_CLASS
         }
     }
diff --git a/@salix/core/src/combo/combo.js b/@salix/core/src/combo/combo.js
index 745582a33..de416a116 100644
--- a/@salix/core/src/combo/combo.js
+++ b/@salix/core/src/combo/combo.js
@@ -5,15 +5,14 @@ import * as util from '../util';
 const _NAME = 'combo';
 export const NAME = util.getName(_NAME);
 
-directive.$inject =[resolveFactory.NAME];
-export function directive (resolve){
-    return{
-        require:'E',
+directive.$inject = [resolveFactory.NAME];
+export function directive(resolve) {
+    return {
+        require: 'E',
         transclude: true,
-        template: function(_,attr){
-           return resolve.getTemplate(_NAME, attr);
+        template: function(_, attr) {
+            return resolve.getTemplate(_NAME, attr);
         }
-    }
+    };
 }
-
-module.directive(NAME,directive);
+module.directive(NAME, directive);
diff --git a/@salix/core/src/combo/combo.mt.js b/@salix/core/src/combo/combo.mt.js
index a35bb898e..598627280 100644
--- a/@salix/core/src/combo/combo.mt.js
+++ b/@salix/core/src/combo/combo.mt.js
@@ -2,7 +2,6 @@ import {module} from '../module';
 import template from './combo.mt.html';
 
 export const NAME = 'vnCombomtFactory';
-
 export function factory() {
     return {
         template: template,
@@ -12,5 +11,4 @@ export function factory() {
         }
     }
 }
-
 module.factory(NAME, factory);
diff --git a/@salix/core/src/core.js b/@salix/core/src/core.js
index 8ea3aa417..2d8168c8d 100644
--- a/@salix/core/src/core.js
+++ b/@salix/core/src/core.js
@@ -7,42 +7,41 @@ export * from './util'
 
 export {SplitingRegister as splitingRegister} from './splitingregister'
 export {NAME as RESOLVEDEFAULTCOMPONENT, ResolveDefaultComponent} from './resolveDefaultComponents'
-export {NAME as INTERPOLATE,Interpolate} from './interpolate'
-export {NAME as ROUTESLOADER, RoutesLoader} from './routesLoader'
+export {NAME as INTERPOLATE, Interpolate} from './interpolate'
+export {NAME as ROUTES_LOADER, RoutesLoader} from './routesLoader'
 
-export {NAME as BUTTON,directive as ButtonDirective} from './button/button'
-export {NAME as BUTTONMT,factory as buttonmt} from './button/button.mt'
-export {NAME as BUTTONBT,factory as buttonbt} from './button/button.bt'
-export {NAME as BUTTONICON,directive as ButtoniconDirective} from './buttonicon/buttonicon'
-export {NAME as BUTTONICONMT,factory as buttoniconmt} from './buttonicon/buttonicon.mt'
-export {NAME as BUTTONICONBT,factory as buttoniconbt} from './buttonicon/buttonicon.bt'
+export {NAME as BUTTON, directive as ButtonDirective} from './button/button'
+export {NAME as BUTTON_MT, factory as buttonMt} from './button/button.mt'
+export {NAME as BUTTON_BT, factory as buttonBt} from './button/button.bt'
 export {NAME as CHECK,directive as CheckDirective} from './check/check'
-export {NAME as CHECKMT,factory as checknmt} from './check/check.mt'
-export {NAME as CHECKBT,factory as checkbt} from './check/check.bt'
+export {NAME as CHECK_MT, factory as checknMt} from './check/check.mt'
+export {NAME as CHECK_BT, factory as checkBt} from './check/check.bt'
 export {NAME as RADIO,directive as RadioDirective} from './radio/radio'
-export {NAME as RADIOMT,factory as radionmt} from './radio/radio.mt'
-export {NAME as RADIOBT,factory as radiobt} from './radio/radio.bt'
-export {NAME as TEXTFIELD,directive as TextfieldDirective} from './textfield/textfield'
-export {NAME as TEXTFIELDMT,factory as textfieldmt} from './textfield/textfield.mt'
-export {NAME as TEXTFIELDBT,factory as textfieldbt} from './textfield/textfield.bt'
-export {NAME as LABEL,directive as LabelDirective} from './label/label'
-export {NAME as LABELMT,factory as labelmt} from './label/label.mt'
-export {NAME as LABELBT,factory as labelbt} from './label/label.bt'
+export {NAME as RADIO_MT, factory as radionMt} from './radio/radio.mt'
+export {NAME as RADIO_BT, factory as radioBt} from './radio/radio.bt'
+export {NAME as TEXTFIELD, directive as TextfieldDirective} from './textfield/textfield'
+export {NAME as TEXTFIELD_MT, factory as textfieldMt} from './textfield/textfield.mt'
+export {NAME as TEXTFIELD_BT, factory as textfieldBt} from './textfield/textfield.bt'
+export {NAME as LABEL, directive as LabelDirective} from './label/label'
+export {NAME as LABEL_MT, factory as labelMt} from './label/label.mt'
+export {NAME as LABEL_BT, factory as labelBt} from './label/label.bt'
+export {NAME as ICON_BUTTON, directive as IconButtonDirective} from './icon-button/icon-button'
+export {NAME as ICON_BUTTON_MT, factory as iconButtonMt} from './icon-button/icon-button.mt'
 export {NAME as SEARCHBAR,factory as searchbar} from './searchbar/searchbar'
-export {NAME as SEARCHBARMT,factory as searchbarmt} from './searchbar/searchbar.mt'
-export {NAME as SEARCHBARBT,factory as searchbarbt} from './searchbar/searchbar.bt'
-export {NAME as PASSWORD,directive as PasswordDirective} from './password/password'
+export {NAME as SEARCHBAR_MT, factory as searchbarMt} from './searchbar/searchbar.mt'
+export {NAME as SEARCHBAR_BT,factory as searchbarBt} from './searchbar/searchbar.bt'
+export {NAME as PASSWORD, directive as PasswordDirective} from './password/password'
 export {NAME as PASSWORD_MT,factory as passwordMt} from './password/password.mt'
-export {NAME as SUBMIT,directive as SubmitDirective} from './submit/submit'
-export {NAME as SUBMIT_MT,factory as submitMt} from './submit/submit.mt'
-export {NAME as SNACKBAR,directive as SnackbarDirective} from './snackbar/snackbar'
-export {NAME as SNACKBAR_MT,factory as snackbarMt} from './snackbar/snackbar.mt'
-export {NAME as SPINNER,directive as SpinnerDirective} from './spinner/spinner'
-export {NAME as SPINNER_MT,factory as spinnerMt} from './spinner/spinner.mt'
-export {NAME as COMBO,directive as ComboDirective} from './combo/combo'
-export {NAME as COMBO_MT,factory as comboMt} from './combo/combo.mt'
-export {NAME as DATE_PICKER,directive as DatePickerDirective} from './date-picker/date-picker'
-export {NAME as DATE_PICKER_MT,factory as datePickerMt} from './date-picker/date-picker.mt'
+export {NAME as SUBMIT, directive as SubmitDirective} from './submit/submit'
+export {NAME as SUBMIT_MT, factory as submitMt} from './submit/submit.mt'
+export {NAME as SNACKBAR, directive as SnackbarDirective} from './snackbar/snackbar'
+export {NAME as SNACKBAR_MT, factory as snackbarMt} from './snackbar/snackbar.mt'
+export {NAME as SPINNER, directive as SpinnerDirective} from './spinner/spinner'
+export {NAME as SPINNER_MT, factory as spinnerMt} from './spinner/spinner.mt'
+export {NAME as COMBO, directive as ComboDirective} from './combo/combo'
+export {NAME as COMBO_MT, factory as comboMt} from './combo/combo.mt'
+export {NAME as DATE_PICKER, directive as DatePickerDirective} from './date-picker/date-picker'
+export {NAME as DATE_PICKER_MT, factory as datePickerMt} from './date-picker/date-picker.mt'
 
 export {NAME as VN_MAINMENU, COMPONENT as VN_MAINMENU_COMPONENT} from './main-menu/main-menu';
 
@@ -50,5 +49,5 @@ export {NAME as ACTIONS, COMPONENT as ACTIONS_COMPONENT} from './left-menu/actio
 export {NAME as DESCRIPTOR, COMPONENT as DESCRIPTOR_COMPONENT} from './left-menu/descriptor';
 export {NAME as LEFT_MENU, COMPONENT as LEFTMENU_COMPONENT} from './left-menu/left-menu';
 export {NAME as MENU_ITEM, COMPONENT as MENU_ITEM_COMPONENT} from './left-menu/menu-item';
-export {NAME as CLIENT_TOP_BAR, COMPONENT as CLIENT_TOP_BAR_COMPONENT} from './topbar/topbar';
+export {NAME as CLIENT_TOPBAR, COMPONENT as CLIENT_TOPBAR_COMPONENT} from './topbar/topbar';
 
diff --git a/@salix/core/src/date-picker/date-picker.js b/@salix/core/src/date-picker/date-picker.js
index c9230b8d5..371498a41 100644
--- a/@salix/core/src/date-picker/date-picker.js
+++ b/@salix/core/src/date-picker/date-picker.js
@@ -5,14 +5,13 @@ import * as util from '../util';
 const _NAME = 'datePicker';
 export const NAME = util.getName(_NAME);
 
-directive.$inject =[resolveFactory.NAME];
-export function directive (resolve){
-    return{
-        require:'E',
-        template: function(_,attr){
-           return resolve.getTemplate(_NAME, attr);
+directive.$inject = [resolveFactory.NAME];
+export function directive(resolve) {
+    return {
+        require: 'E',
+        template: function(_, attr) {
+            return resolve.getTemplate(_NAME, attr);
         }
-    }
+    };
 }
-
-module.directive(NAME,directive);
+module.directive(NAME, directive);
diff --git a/@salix/core/src/date-picker/date-picker.mt.html b/@salix/core/src/date-picker/date-picker.mt.html
index c9a546eb4..cd1617e7b 100644
--- a/@salix/core/src/date-picker/date-picker.mt.html
+++ b/@salix/core/src/date-picker/date-picker.mt.html
@@ -1,4 +1,4 @@
 <div class="mdl-textfield mdl-js-textfield mdl-textfield--floating-label">
-	<input class="*[className]*" type="text" name="*[name]*" ng-model="*[model]*" *[enabled]*>
+	<input class="mdl-textfield__input *[className]*" type="text" name="*[name]*" ng-model="*[model]*" *[enabled]*>
 	<label class="mdl-textfield__label">*[label]*</label>
 </div>
diff --git a/@salix/core/src/date-picker/date-picker.mt.js b/@salix/core/src/date-picker/date-picker.mt.js
index 52371047e..e9c401385 100644
--- a/@salix/core/src/date-picker/date-picker.mt.js
+++ b/@salix/core/src/date-picker/date-picker.mt.js
@@ -2,16 +2,13 @@ import {module} from '../module';
 import template from './date-picker.mt.html';
 
 export const NAME = 'vnDatePickermtFactory';
-
 export function factory() {
     return {
         template: template,
         default: {
             label: 'Label',
-            enabled: 'enabled',
-            className: 'mdl-textfield__input'
+            enabled: 'enabled'
         }
     }
 }
-
 module.factory(NAME, factory);
diff --git a/@salix/core/src/buttonicon/buttonicon.js b/@salix/core/src/icon-button/icon-button.js
similarity index 76%
rename from @salix/core/src/buttonicon/buttonicon.js
rename to @salix/core/src/icon-button/icon-button.js
index add5b650b..095911090 100644
--- a/@salix/core/src/buttonicon/buttonicon.js
+++ b/@salix/core/src/icon-button/icon-button.js
@@ -1,8 +1,8 @@
-import {module as _module} from '../module';
+import {module} from '../module';
 import * as resolveFactory from '../resolveDefaultComponents';
 import * as util from '../util';
 
-const _NAME = 'buttonicon';
+const _NAME = 'iconButton';
 export const NAME = util.getName(_NAME);
 
 directive.$inject = [resolveFactory.NAME];
@@ -14,6 +14,4 @@ export function directive(resolve) {
         }
     };
 }
-
-_module.directive(NAME, directive);
-
+module.directive(NAME, directive);
diff --git a/@salix/core/src/icon-button/icon-button.mt.html b/@salix/core/src/icon-button/icon-button.mt.html
new file mode 100644
index 000000000..5335a59c8
--- /dev/null
+++ b/@salix/core/src/icon-button/icon-button.mt.html
@@ -0,0 +1,3 @@
+<button type="*[typeName]*" class="mdl-button mdl-js-button mdl-button--icon *[className]*">
+    <i class="material-icons">*[icon]*</i>
+</button>
\ No newline at end of file
diff --git a/@salix/core/src/icon-button/icon-button.mt.js b/@salix/core/src/icon-button/icon-button.mt.js
new file mode 100644
index 000000000..7ef6c222d
--- /dev/null
+++ b/@salix/core/src/icon-button/icon-button.mt.js
@@ -0,0 +1,15 @@
+import {module} from '../module';
+import template from './icon-button.mt.html';
+
+export const NAME = 'vnIconButtonmtFactory';
+export function factory() {
+    return {
+        template: template,
+        default: {
+            enabled: 'true',
+            typeName: 'button',
+            icon: '',
+        }
+    }
+}
+module.factory(NAME, factory);
diff --git a/@salix/core/src/radio/radio.mt.html b/@salix/core/src/radio/radio.mt.html
index 0d9e7e77c..5563b2d84 100644
--- a/@salix/core/src/radio/radio.mt.html
+++ b/@salix/core/src/radio/radio.mt.html
@@ -1,2 +1,2 @@
-<input type="radio" class="*[className]*" *[enabled]* >
- <span class="mdl-radio__label"> *[text]*</span>  
+<input type="radio" class="*[className]*" name="*[name]*" *[enabled]* >
+<span class="mdl-radio__label">*[text]*</span>  
diff --git a/@salix/core/src/radio/radio.mt.js b/@salix/core/src/radio/radio.mt.js
index 1fee7e597..3d523cdea 100644
--- a/@salix/core/src/radio/radio.mt.js
+++ b/@salix/core/src/radio/radio.mt.js
@@ -4,7 +4,6 @@ import * as constant from '../constants';
 import template from './radio.mt.html';
 
 const _NAME = 'radio';
-const DEFAULT_TEXT = 'radio';
 const DEFAULT_CLASS = 'mdl-radio mdl-js-radio mdl-js-ripple-effect';
 
 export const NAME = util.getFactoryName(_NAME + constant.MATERIAL_DESIGN_FRAMEWORK);
@@ -13,7 +12,6 @@ export function factory() {
     return {
         template: template,
         default: {
-            text: DEFAULT_TEXT,
             enabled: 'true',
             className: DEFAULT_CLASS
         }
diff --git a/@salix/core/src/resolveDefaultComponents.js b/@salix/core/src/resolveDefaultComponents.js
index 4013a77d2..03a46d2e0 100644
--- a/@salix/core/src/resolveDefaultComponents.js
+++ b/@salix/core/src/resolveDefaultComponents.js
@@ -6,7 +6,6 @@ import Interpolate from './interpolate';
 export const NAME = util.getProviderName('ResolveDefaultComponent');
 
 export class ResolveDefaultComponent {
-
     constructor(){
         this._frameworkName="mt";
     }
@@ -14,7 +13,6 @@ export class ResolveDefaultComponent {
         //mt or bt
         this._frameworkName = value;
     }
-    
     $get($injector,vnInterpolate){
         //Service Locator
         return {
@@ -35,5 +33,4 @@ export class ResolveDefaultComponent {
     }
 }
 
-// _module.provider(NAME,ResolveDefaultComponent)
 _module.provider(NAME,() => new ResolveDefaultComponent());
\ No newline at end of file
diff --git a/@salix/crud/src/client/addresses/index.html b/@salix/crud/src/client/addresses/index.html
index 65069c6c0..6dc691c09 100644
--- a/@salix/crud/src/client/addresses/index.html
+++ b/@salix/crud/src/client/addresses/index.html
@@ -9,19 +9,23 @@
     </vn-horizontal>
     <vn-horizontal ng-repeat="i in $ctrl.addresses" class="pad-medium-top" style="align-items: center;">
         <vn-empty style="width: 7em; text-align: center;">
-            <input type="radio" name="default"/>
+            <vn-radio name="default"></vn-radio>
         </vn-empty>
         <vn-auto style="border-radius: .5em;" class="pad-small border-solid">
-            <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-horizontal style="align-items: center;">
+                <vn-auto>
+                    <div><b>{{i.consignee}}</b></div>
+                    <div>{{i.street}}</div>
+                    <div>{{i.city}}, {{i.province}}</div>
+                    <div>{{i.phone}}, {{i.mobile}}</div>
+                </vn-auto>
+                <vn-empty>
+                    <vn-icon-button icon="edit"></vn-icon-button>
+                </vn-empty>
+            </vn-horizontal>
         </vn-auto>
         <vn-empty style="width: 7em; text-align: center;">
-            <input type="checkbox" name="enabled" ng-model="i.enabled"/>
+            <vn-check name="enabled" model="i.enabled"></vn-check>
         </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
index 307209ab7..83cee40fd 100644
--- a/@salix/crud/src/client/addresses/index.js
+++ b/@salix/crud/src/client/addresses/index.js
@@ -6,19 +6,24 @@ export const COMPONENT = {
     template: template,
 	controller: function ($http)
 	{
+/*		$http.get('/client/api/Addresses', this.model).then (
+			(json) => { this.addresses = json.data; },
+			(json) => console.error (json.data.error.message)
+		);
+*/		
 		this.addresses = [];
-		
+
 		for (var i = 1; i <= 4; i++)
 			this.addresses.push ({
-				consignee: 'Consignee '+ i,
-				street: 'Street',
-				city: 'City',
-				postcode: '46600',
-				province: 'Province',
-				country: 'Country',
-				phone: '+XX XXX XX XX XX',
-				mobile: '+XX 6XX XX XX XX',
-				enabled: i % 2 == 0
+				"consignee": "Consignee",
+				"street": "Street",
+				"city": "City",
+				"postcode": "46600",
+				"province": "Province",
+				"country": "Country",
+				"phone": "+XX XXX XX XX XX",
+				"mobile": "+XX 6XX XX XX XX",
+				"enabled": true
 			});
 	},
 };

From ced1e8669a7956c2d09c69d35a72a80f92f40640 Mon Sep 17 00:00:00 2001
From: Juan Ferrer Toribio <juan.ferrer.toribio@gmail.com>
Date: Tue, 29 Nov 2016 13:13:17 +0100
Subject: [PATCH 2/4] Uppercase

---
 @salix/crud/src/client/basic-data/index.html | 68 ++++++++++----------
 1 file changed, 35 insertions(+), 33 deletions(-)

diff --git a/@salix/crud/src/client/basic-data/index.html b/@salix/crud/src/client/basic-data/index.html
index c6c910a53..646e175dd 100644
--- a/@salix/crud/src/client/basic-data/index.html
+++ b/@salix/crud/src/client/basic-data/index.html
@@ -1,41 +1,43 @@
 <form ng-submit="$ctrl.submit()">
-<vn-vertical  class="form">
+<vn-vertical class="form">
     <vn-horizontal>
         <vn-one>
             <h3 style="margin-top: 0;">Datos básicos</h3>
         </vn-one>
     </vn-horizontal>
-    <vn-horizontal>
-        <vn-one>
-            <vn-textfield label="Alias" name"alias" model="$ctrl.model.alias"></vn-textfield>
-            <vn-textfield label="NIF/CIF" name="fi" model="$ctrl.model.fi"></vn-textfield>
-        </vn-one>
-     </vn-horizontal>
-     <vn-horizontal>
-        <vn-one>
-          <vn-textfield label="Razón social" name"socialName" model="$ctrl.model.name"></vn-textfield>
-          <vn-date-picker label="Fecha alta" name"dischargeDate" model="$ctrl.model.dischargeDate"></vn-date-picker>
-        </vn-one> 
-    </vn-horizontal>
-    <vn-horizontal>
-        <vn-one>
-          <vn-textfield label="Contacto" name="contact" model="$ctrl.model.contact"></vn-textfield>
-          <vn-textfield label="Teléfono" name="telefono" model="$ctrl.model.phone"></vn-textfield>
-        </vn-one>
-    </vn-horizontal>
-    <vn-horizontal>
-        <vn-one>
-            <vn-textfield label="Calidad" name="quality" model="$ctrl.model.quality"></vn-textfield>
-            <vn-combo label="Comercial" name="salesPerson" model="$ctrl.model.salesPerson">
-                <option value="1">Comercial 1</option>
-                <option value="2">Comercial 2</option>
-            </vn-combo>
-        </vn-one>
-    </vn-horizontal>
-    <vn-horizontal>
-        <vn-one>
-            <vn-submit class="colored" text="Guardar"></vn-submit>
-        </vn-one>
-    </vn-horizontal>
+    <vn-vertical class="uppercase">
+        <vn-horizontal>
+            <vn-one>
+                <vn-textfield label="Alias" name"alias" model="$ctrl.model.alias"></vn-textfield>
+                <vn-textfield label="NIF/CIF" name="fi" model="$ctrl.model.fi"></vn-textfield>
+            </vn-one>
+        </vn-horizontal>
+        <vn-horizontal>
+            <vn-one>
+            <vn-textfield label="Razón social" name"socialName" model="$ctrl.model.name"></vn-textfield>
+            <vn-date-picker label="Fecha alta" name"dischargeDate" model="$ctrl.model.dischargeDate"></vn-date-picker>
+            </vn-one> 
+        </vn-horizontal>
+        <vn-horizontal>
+            <vn-one>
+            <vn-textfield label="Contacto" name="contact" model="$ctrl.model.contact"></vn-textfield>
+            <vn-textfield label="Teléfono" name="telefono" model="$ctrl.model.phone"></vn-textfield>
+            </vn-one>
+        </vn-horizontal>
+        <vn-horizontal>
+            <vn-one>
+                <vn-textfield label="Calidad" name="quality" model="$ctrl.model.quality"></vn-textfield>
+                <vn-combo label="Comercial" name="salesPerson" model="$ctrl.model.salesPerson">
+                    <option value="1">Comercial 1</option>
+                    <option value="2">Comercial 2</option>
+                </vn-combo>
+            </vn-one>
+        </vn-horizontal>
+        <vn-horizontal>
+            <vn-one>
+                <vn-submit class="colored" text="Guardar"></vn-submit>
+            </vn-one>
+        </vn-horizontal>
+    </vn-vertical>
 </vn-vertical>
 </form>
\ No newline at end of file

From 7e1b4d6c7efaa3f7657b4b6785b4f0c6fab2f412 Mon Sep 17 00:00:00 2001
From: "SAMBA\\vfalco" <vicente.falco@gmail.com>
Date: Tue, 29 Nov 2016 13:22:19 +0100
Subject: [PATCH 3/4] Client access web

---
 @salix/crud/src/client/client.js                   |  3 +++
 @salix/crud/src/client/routes.js                   |  5 +++++
 @salix/crud/src/client/web-access/index.html       | 14 ++++++++++++++
 .../webclient => client/web-access}/index.js       |  2 +-
 @salix/crud/src/crud.js                            |  3 ---
 @salix/crud/src/customer/routes.js                 |  1 -
 @salix/crud/src/customer/webclient/index.html      | 14 --------------
 7 files changed, 23 insertions(+), 19 deletions(-)
 create mode 100644 @salix/crud/src/client/web-access/index.html
 rename @salix/crud/src/{customer/webclient => client/web-access}/index.js (63%)
 delete mode 100644 @salix/crud/src/customer/webclient/index.html

diff --git a/@salix/crud/src/client/client.js b/@salix/crud/src/client/client.js
index b4e35cc0e..a5fea374e 100644
--- a/@salix/crud/src/client/client.js
+++ b/@salix/crud/src/client/client.js
@@ -4,3 +4,6 @@ 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';
+export {NAME as CLIENT_WEB_ACCESS,
+	COMPONENT as CLIENT_WEB_ACCESS_COMPONENT} from './web-access/index';
+
diff --git a/@salix/crud/src/client/routes.js b/@salix/crud/src/client/routes.js
index c339a9d60..702ffae93 100644
--- a/@salix/crud/src/client/routes.js
+++ b/@salix/crud/src/client/routes.js
@@ -15,6 +15,11 @@
     state: 'client.addresses',
     template: '<vn-client-addresses full-height></vn-client-addresses>',
     module: 'crud'
+},{
+    url: '/web-access',
+    state: 'client.webaccess',
+    template: '<vn-client-web-access full-height></vn-client-web-access>',
+    module: 'crud'
 }]
 
 
diff --git a/@salix/crud/src/client/web-access/index.html b/@salix/crud/src/client/web-access/index.html
new file mode 100644
index 000000000..138266875
--- /dev/null
+++ b/@salix/crud/src/client/web-access/index.html
@@ -0,0 +1,14 @@
+<vn-vertical  full-height pad-medium>
+    <vn-one>
+        <h3>Acceso Web</h3>
+    </vn-one>
+    <vn-two>
+        <vn-check label="Acceso web activo"></vn-check>
+    </vn-two>
+    <vn-three>
+        <vn-textfield label="USUARIO" class="pada-medium-top"></vn-textfield>
+    </vn-three>
+    <vn-four>
+        <vn-button text="Generar Contraseña"  class="pad-medium-top"></vn-button>
+    </vn-four>
+</vn-vertical>
\ No newline at end of file
diff --git a/@salix/crud/src/customer/webclient/index.js b/@salix/crud/src/client/web-access/index.js
similarity index 63%
rename from @salix/crud/src/customer/webclient/index.js
rename to @salix/crud/src/client/web-access/index.js
index b9207f05e..1660ec601 100644
--- a/@salix/crud/src/customer/webclient/index.js
+++ b/@salix/crud/src/client/web-access/index.js
@@ -1,7 +1,7 @@
 import template from './index.html';
 import {module} from '../../module';
 
-export const NAME = 'customerWebClient';
+export const NAME = 'vnClientWebAccess';
 export const COMPONENT = {
     template: template
 };
diff --git a/@salix/crud/src/crud.js b/@salix/crud/src/crud.js
index 62666d119..e7c0c6159 100644
--- a/@salix/crud/src/crud.js
+++ b/@salix/crud/src/crud.js
@@ -14,9 +14,6 @@ export {NAME as CUSTOMER_DESCRIPTOR,
 export {NAME as CUSTOMER_ACTIONS,
 	COMPONENT as CUSTOMER_ACTIONS_COMPONENT} from './customer/edit/actions';
 
-export {NAME as CUSTOMER_WEB_CLIENT_INDEX,
-	COMPONENT as CUSTOMER_WEB_CLIENT_INDEX_COMPONENT} from './customer/webclient';
-
 export {NAME as NAVIGATION_INDEX,
     COMPONENT as NAVIGATION_INDEX_COMPONENT} from './navigation/index';
 export {NAME as NAVIGATION_ITEM,
diff --git a/@salix/crud/src/customer/routes.js b/@salix/crud/src/customer/routes.js
index a2ada44a6..9eed639df 100644
--- a/@salix/crud/src/customer/routes.js
+++ b/@salix/crud/src/customer/routes.js
@@ -34,5 +34,4 @@
     description: '',
     image: ''
 }
-
 ]
diff --git a/@salix/crud/src/customer/webclient/index.html b/@salix/crud/src/customer/webclient/index.html
deleted file mode 100644
index e065cd47b..000000000
--- a/@salix/crud/src/customer/webclient/index.html
+++ /dev/null
@@ -1,14 +0,0 @@
-<vn-vertical  full-height pad-medium>
-    <vn-one>
-        <h2>CLIENTE_acceso web</h2>
-    </vn-one>
-    <vn-two>
-        <vn-check label="Acceso web activo" name="accesoweb" model="customer.activo"></vn-check>
-    </vn-two>
-    <vn-three>
-        <vn-textfield label="USUARIO" model="customer.user"></vn-textfield>
-    </vn-three>
-    <vn-four>
-        <vn-button text="Generar Contraseña"  class="colored"></vn-button>
-    </vn-four>
-</vn-vertical>
\ No newline at end of file

From ce34c4c15101b5f16ba0c88620b9af1b740ae689 Mon Sep 17 00:00:00 2001
From: "SAMBA\\vfalco" <vicente.falco@gmail.com>
Date: Tue, 29 Nov 2016 14:50:10 +0100
Subject: [PATCH 4/4] model access-web

---
 @salix/crud/src/client/web-access/index.html | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/@salix/crud/src/client/web-access/index.html b/@salix/crud/src/client/web-access/index.html
index 138266875..f0a1d0b8e 100644
--- a/@salix/crud/src/client/web-access/index.html
+++ b/@salix/crud/src/client/web-access/index.html
@@ -1,14 +1,16 @@
-<vn-vertical  full-height pad-medium>
+<form ng-submit="$ctrl.submit()">
+<vn-vertical  class="form">
     <vn-one>
         <h3>Acceso Web</h3>
     </vn-one>
     <vn-two>
-        <vn-check label="Acceso web activo"></vn-check>
+        <vn-check label="Acceso web activo"  model="$ctrl.model.active"></vn-check>
     </vn-two>
     <vn-three>
-        <vn-textfield label="USUARIO" class="pada-medium-top"></vn-textfield>
+        <vn-textfield label="USUARIO" class="pada-medium-top"  model="$ctrl.model.usuario"></vn-textfield>
     </vn-three>
     <vn-four>
-        <vn-button text="Generar Contraseña"  class="pad-medium-top"></vn-button>
+            <vn-submit class="colored" text="Guardar"></vn-submit>
     </vn-four>
-</vn-vertical>
\ No newline at end of file
+</vn-vertical>
+</form>
\ No newline at end of file