From e4cec04eb7fab032a0076f3e2a4590840282f3e4 Mon Sep 17 00:00:00 2001 From: nelo Date: Thu, 24 Nov 2016 15:10:13 +0100 Subject: [PATCH 1/2] Cambiar customer por databais Incluido views en config-routes Modificaciones top bar --- @salix/app/src/configroutes.js | 2 ++ @salix/core/src/leftmenu/itemmenu.html | 12 ++++----- @salix/core/src/topbar/topbar.html | 6 +++-- @salix/crud/src/client/client.js | 2 +- .../databasic/{index.html => databasic.html} | 0 .../databasic/{index.js => databasic.js} | 6 ++--- @salix/crud/src/client/index/index.html | 2 +- @salix/crud/src/client/routes.js | 26 +++++++++++++------ 8 files changed, 34 insertions(+), 22 deletions(-) rename @salix/crud/src/client/databasic/{index.html => databasic.html} (100%) rename @salix/crud/src/client/databasic/{index.js => databasic.js} (58%) diff --git a/@salix/app/src/configroutes.js b/@salix/app/src/configroutes.js index 3ccdc078c..112a9d7d0 100644 --- a/@salix/app/src/configroutes.js +++ b/@salix/app/src/configroutes.js @@ -24,9 +24,11 @@ function config($stateProvider, $urlRouterProvider) { $stateProvider.state(route.state, { url: route.url, template: route.template, + views: route.views, resolve: { loader: loader(route) } + }) }); } diff --git a/@salix/core/src/leftmenu/itemmenu.html b/@salix/core/src/leftmenu/itemmenu.html index 42a643f3b..d911b6a14 100644 --- a/@salix/core/src/leftmenu/itemmenu.html +++ b/@salix/core/src/leftmenu/itemmenu.html @@ -1,7 +1,5 @@ - -
  • - keyboard_arrow_right - {{$ctrl.item.image}} - {{$ctrl.item.text}} -
    • - \ No newline at end of file +
  • + keyboard_arrow_right + {{$ctrl.item.image}} + {{$ctrl.item.text}} +
    • \ No newline at end of file diff --git a/@salix/core/src/topbar/topbar.html b/@salix/core/src/topbar/topbar.html index ebfd62735..e9238e0f2 100644 --- a/@salix/core/src/topbar/topbar.html +++ b/@salix/core/src/topbar/topbar.html @@ -1,6 +1,8 @@ -

    Client

    - +

    Client

     + + +     \ No newline at end of file diff --git a/@salix/crud/src/client/client.js b/@salix/crud/src/client/client.js index fea0999f2..fc65dc835 100644 --- a/@salix/crud/src/client/client.js +++ b/@salix/crud/src/client/client.js @@ -1,4 +1,4 @@ export {NAME as CLIENT_DATA_BASIC_INDEX, - COMPONENT as CLIENT_DATA_BASIC_INDEX_COMPONENT} from './databasic/index'; + COMPONENT as CLIENT_DATA_BASIC_INDEX_COMPONENT} from './databasic/databasic'; export {NAME as CLIENT_INDEX, COMPONENT as CLIENT_INDEX_COMPONENT} from './index/index'; diff --git a/@salix/crud/src/client/databasic/index.html b/@salix/crud/src/client/databasic/databasic.html similarity index 100% rename from @salix/crud/src/client/databasic/index.html rename to @salix/crud/src/client/databasic/databasic.html diff --git a/@salix/crud/src/client/databasic/index.js b/@salix/crud/src/client/databasic/databasic.js similarity index 58% rename from @salix/crud/src/client/databasic/index.js rename to @salix/crud/src/client/databasic/databasic.js index 4f23a56f6..a83180364 100644 --- a/@salix/crud/src/client/databasic/index.js +++ b/@salix/crud/src/client/databasic/databasic.js @@ -1,9 +1,9 @@ -import template from './index.html'; +import template from './databasic.html'; import {module} from '../../module'; -export const _NAME = 'customerDataBasic'; +export const _NAME = 'clientDataBasic'; //export const NAME = module.getName(_NAME); -export const NAME = "vnCustomerDataBasic"; +export const NAME = "vnClientDataBasic"; export const COMPONENT = { template: template diff --git a/@salix/crud/src/client/index/index.html b/@salix/crud/src/client/index/index.html index f9fe275ba..5a1f690af 100644 --- a/@salix/crud/src/client/index/index.html +++ b/@salix/crud/src/client/index/index.html @@ -5,7 +5,7 @@ - + diff --git a/@salix/crud/src/client/routes.js b/@salix/crud/src/client/routes.js index e25da9fb5..95a506e2b 100644 --- a/@salix/crud/src/client/routes.js +++ b/@salix/crud/src/client/routes.js @@ -1,9 +1,19 @@ -[{ - url: '/client/client-index', - state: 'client-index', - template: '', - module: 'crud', - description: '', - image: '', -} +[ + { + url: '/client/client-databasic', + state: 'client-databasic', + template: '', + module: 'crud', + description: '', + image: '', + }, + { + url: '/client/client-index', + state: 'client-index', + template: '', + module: 'crud', + description: '', + image: '', + + } ] From ea330b782f2f9c6e3830f8fe7923506aa0dadb30 Mon Sep 17 00:00:00 2001 From: Javi Gallego Date: Fri, 25 Nov 2016 15:33:27 +0100 Subject: [PATCH 2/2] Ficha Cliente resumida --- @salix/core/src/leftmenu/actions.html | 2 +- @salix/core/src/leftmenu/descriptor.html | 8 +++++--- @salix/core/src/leftmenu/descriptor.js | 5 ++++- @salix/core/src/leftmenu/leftmenu.html | 2 +- @salix/core/src/leftmenu/leftmenu.js | 3 ++- @salix/crud/src/client/index/index.html | 2 +- @salix/crud/src/client/index/index.js | 13 +++++++++---- 7 files changed, 23 insertions(+), 12 deletions(-) diff --git a/@salix/core/src/leftmenu/actions.html b/@salix/core/src/leftmenu/actions.html index 36ca2b424..5c9fa9095 100644 --- a/@salix/core/src/leftmenu/actions.html +++ b/@salix/core/src/leftmenu/actions.html @@ -1,5 +1,5 @@
      - +
    diff --git a/@salix/core/src/leftmenu/descriptor.html b/@salix/core/src/leftmenu/descriptor.html index 34d2702cf..6b310ff2c 100644 --- a/@salix/core/src/leftmenu/descriptor.html +++ b/@salix/core/src/leftmenu/descriptor.html @@ -1,3 +1,5 @@ - - descriptor - \ No newline at end of file +
    + person_outline_black + {{descriptor1.text}} + +
    diff --git a/@salix/core/src/leftmenu/descriptor.js b/@salix/core/src/leftmenu/descriptor.js index 4be9d0fb6..39597e846 100644 --- a/@salix/core/src/leftmenu/descriptor.js +++ b/@salix/core/src/leftmenu/descriptor.js @@ -5,6 +5,9 @@ import * as util from '../util'; const _NAME = 'descriptor'; export const NAME = util.getName(_NAME); export const COMPONENT = { - template: template + template: template, + bindings: { + descriptor: '<' + } }; module.component(NAME, COMPONENT); diff --git a/@salix/core/src/leftmenu/leftmenu.html b/@salix/core/src/leftmenu/leftmenu.html index 7f978d25c..b32ca864b 100644 --- a/@salix/core/src/leftmenu/leftmenu.html +++ b/@salix/core/src/leftmenu/leftmenu.html @@ -1,4 +1,4 @@ - + \ No newline at end of file diff --git a/@salix/core/src/leftmenu/leftmenu.js b/@salix/core/src/leftmenu/leftmenu.js index 0b58ea761..da6187423 100644 --- a/@salix/core/src/leftmenu/leftmenu.js +++ b/@salix/core/src/leftmenu/leftmenu.js @@ -7,7 +7,8 @@ export const NAME = util.getName(_NAME); export const COMPONENT = { template: template, bindings: { - items: '<' + items: '<', + descriptor: '<' } }; module.component(NAME, COMPONENT); diff --git a/@salix/crud/src/client/index/index.html b/@salix/crud/src/client/index/index.html index f9fe275ba..91ab54879 100644 --- a/@salix/crud/src/client/index/index.html +++ b/@salix/crud/src/client/index/index.html @@ -2,7 +2,7 @@ - + diff --git a/@salix/crud/src/client/index/index.js b/@salix/crud/src/client/index/index.js index 0fee98c74..337f2654a 100644 --- a/@salix/crud/src/client/index/index.js +++ b/@salix/crud/src/client/index/index.js @@ -2,18 +2,23 @@ import template from './index.html'; import {module} from '../../module'; const _NAME = 'clientIndex'; -//export const NAME = module.getName(_NAME); +// export const NAME = module.getName(_NAME); export const NAME = "vnClientIndex"; export const COMPONENT = { template: template, - controller: function(){ + controller: function() { this.items = [ {text: "Datos básicos", image: "person"}, - {text: "Datos facturación", image: "assignment"}, + {text: "Datos facturación", image: "assignment"}, {text: "Acceso web", image: "language"}, {text: "Consignatarios", image: "local_shipping"}, {text: "Notas", image: "insert_drive_file"} - ] + ]; + this.descriptor = [ + {text: "Cliente 1231"}, + {text: "Floristeria Lola"}, + {text: "987 654 321"} + ]; } }; module.component(NAME, COMPONENT);