Merge branch 'master' of ssh://git.verdnatura.es:/var/lib/git/salix

@salix/app/src/components.js

@@ -1,6 +1,5 @@
 export {NAME as VN_MAINMENU, COMPONENT as VN_MAINMENU_COMPONENT} from './components/main-menu/main-menu';
 export {NAME as ACTIONS, COMPONENT as ACTIONS_COMPONENT} from './components/left-menu/actions';
-export {NAME as DESCRIPTOR, COMPONENT as DESCRIPTOR_COMPONENT} from './components/left-menu/descriptor';
 export {NAME as LEFT_MENU, COMPONENT as LEFTMENU_COMPONENT} from './components/left-menu/left-menu';
 export {NAME as MENU_ITEM, COMPONENT as MENU_ITEM_COMPONENT} from './components/left-menu/menu-item';
 export {NAME as CLIENT_TOPBAR, COMPONENT as CLIENT_TOPBAR_COMPONENT} from './components/topbar/topbar';

@salix/app/src/components/left-menu/descriptor.html

@@ -1,4 +0,0 @@
-<div class="pad-medium">
-    <i class="material-icons" style="font-size:60px; margin-right: 10px; float: left;">person</i>
-    <p class="margin-none" ng-repeat="descriptor1 in $ctrl.descriptor">{{descriptor1.text}} </p>
-</div>

@salix/app/src/components/left-menu/left-menu.html

@@ -1,4 +1,3 @@
 <vn-vertical>
-    <vn-descriptor descriptor = "$ctrl.descriptor" ></vn-descriptor>
     <vn-actions items = "$ctrl.items"></vn-actions>
 </vn-vertical>

@salix/app/src/components/left-menu/left-menu.js

@@ -1,13 +1,12 @@
+require('./style.css');
 import template from './left-menu.html';
-import style from './style.css';
 import {module} from '../../module';
 
 export const NAME = "vnLeftMenu";
 export const COMPONENT = {
     template: template,
     bindings: {
-        items: '<',
+        items: '<'
-        descriptor: '<'
     }
 };
 module.component(NAME, COMPONENT);

@salix/crud/src/client/basic-data/index.js

@@ -4,13 +4,13 @@ import {module} from '../../module';
 export const NAME = 'vnClientBasicData';
 export const COMPONENT = {
     template: template,
-	controller: function ($http) {
+    controller: function($http) {
-		this.submit = function () {
+        this.submit = function() {
-            $http.post('/client/api/Clients', this.model).then (
+            $http.post('/client/api/Clients', this.model).then(
-                (json) => console.log (json.statusText),
+                json => console.log(json.statusText),
-                (json) => console.error (json.data.error.message)
+                json => console.error(json.data.error.message)
             );
-		};
+        };
-	},
+    }
 };
 module.component(NAME, COMPONENT);

@salix/crud/src/client/client.js

@@ -10,3 +10,5 @@ export {NAME as CLIENT_FISCAL_DATA_INDEX,
 	COMPONENT as CLIENT_FISCAL_DATA_INDEX_COMPONENT} from './fiscal-data/index';
 export {NAME as CLIENT_WEB_ACCESS,
 	COMPONENT as CLIENT_WEB_ACCESS_COMPONENT} from './web-access/index';
+export {NAME as CLIENT_DESCRIPTOR,
+	COMPONENT as CLIENT_DESCRIPTOR_COMPONENT} from './descriptor/descriptor';

@salix/crud/src/client/client/client.html

@@ -2,7 +2,8 @@
     <vn-topbar></vn-topbar>
     <vn-horizontal class="full-height">
         <vn-empty class="bg-content" style="width: 18em">
-            <vn-left-menu items="$ctrl.items" descriptor="$ctrl.descriptor"></vn-left-menu>
+            <vn-descriptor descriptor = "$ctrl.descriptor"></vn-descriptor>
+            <vn-left-menu items="$ctrl.items"></vn-left-menu>
         </vn-empty>
         <vn-auto>
             <vn-vertical ui-view></vn-vertical>

@salix/crud/src/client/client/client.js

@@ -14,11 +14,11 @@ export const COMPONENT = {
             {text: "Consignatarios", image: "local_shipping", href: "#/client/addresses"},
             {text: "Notas", image: "insert_drive_file", href: "#/client/notes"}
         ];
-        this.descriptor = [
+        this.descriptor =
-            {text: "Cliente 1231"},
+            {clientId: "Cliente 1231",
-            {text: "Floristeria Lola"},
+            name: "Floristeria Lola",
-            {text: "987 654 321"}
+            phone: "987 654 321"}
-        ];
+        ;
     }
 };
 module.component(NAME, COMPONENT);

@salix/crud/src/client/descriptor/descriptor.html

@@ -0,0 +1,11 @@
+<vn-horizontal class="margin-large">
+    <vn-one>
+        <i class="material-icons" style="font-size:60px;">person</i>
+    </vn-one>
+    <vn-vertical>
+        <vn-one class="margin-right: .4em;" class="margin-none">{{$ctrl.descriptor.clientId}}</vn-one>
+        <vn-one class="margin-none">{{$ctrl.descriptor.name}}</vn-one>
+        <vn-one class="margin-none">{{$ctrl.descriptor.phone}}</vn-one>
+    </vn-vertical>
+    
+</vn-horizontal>

@salix/crud/src/client/fiscal-data/index.html

@@ -1,4 +1,5 @@
-<form ng-submit="$ctrl.submit()" pad-large>
+
+<form ng-submit="frm.isValid && $ctrl.submit()" pad-large>
     <vn-title>Datos fiscales y de facturación</vn-title>
     <vn-horizontal>
         <vn-check vn-one label="Cliente Activo" name="active" model="$ctrl.model"></vn-check>

@salix/crud/src/client/index/index.js

@@ -4,19 +4,19 @@ import {module} from '../../module';
 export const NAME = "vnClientIndex";
 export const COMPONENT = {
     template: template,
-    controller: function($http){
+    controller: function($http) {
-        this.submit = function () {
+        this.submit = function() {
-            var query = {"where": this.model, "fields": {"id": true}};
+            var query = {where: this.model, fields: {id: true}};
             console.log(query);
-            $http.get(`/client/api/Clients/findOne?filter=${JSON.stringify(query)}`).then (
+            $http.get(`/client/api/Clients/findOne?filter=${JSON.stringify(query)}`).then(
-                function(response){
+                function(response) {
                     console.log(response);
                 },
-                function(response){
+                function(response) {
                     console.log(response);
                 }
             );
-		};
+        };
     }
 };
 module.component(NAME, COMPONENT);

@salix/crud/src/module.js

@@ -2,5 +2,5 @@ import * as vendors from 'vendor';
 import * as core from 'core';
 
 export const NAME = 'crud';
-export const  module = vendors.ng.module(NAME,[]);
+export const module = vendors.ng.module(NAME, []);