diff --git a/@salix/app/src/configroutes.js b/@salix/app/src/configroutes.js index ba5151542..8b9876b77 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/left-menu/descriptor.html b/@salix/core/src/left-menu/descriptor.html index d61b2221f..0ca4b6737 100644 --- a/@salix/core/src/left-menu/descriptor.html +++ b/@salix/core/src/left-menu/descriptor.html @@ -1,5 +1,4 @@ - - -

Descriptor

- - \ No newline at end of file +
+ person +

{{descriptor1.text}}

+
diff --git a/@salix/core/src/left-menu/descriptor.js b/@salix/core/src/left-menu/descriptor.js index 4be9d0fb6..39597e846 100644 --- a/@salix/core/src/left-menu/descriptor.js +++ b/@salix/core/src/left-menu/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/left-menu/left-menu.html b/@salix/core/src/left-menu/left-menu.html index 7f978d25c..b32ca864b 100644 --- a/@salix/core/src/left-menu/left-menu.html +++ b/@salix/core/src/left-menu/left-menu.html @@ -1,4 +1,4 @@ - + \ No newline at end of file diff --git a/@salix/core/src/left-menu/left-menu.js b/@salix/core/src/left-menu/left-menu.js index 3d7f1f83e..6c01f5019 100644 --- a/@salix/core/src/left-menu/left-menu.js +++ b/@salix/core/src/left-menu/left-menu.js @@ -8,7 +8,8 @@ export const NAME = util.getName(_NAME); export const COMPONENT = { template: template, bindings: { - items: '<' + items: '<', + descriptor: '<' } }; module.component(NAME, COMPONENT); diff --git a/@salix/core/src/left-menu/menu-item.html b/@salix/core/src/left-menu/menu-item.html index 5452c7031..6575be0d2 100644 --- a/@salix/core/src/left-menu/menu-item.html +++ b/@salix/core/src/left-menu/menu-item.html @@ -1,4 +1,3 @@ -
  • keyboard_arrow_right 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/databasic/databasic.html b/@salix/crud/src/client/databasic/databasic.html new file mode 100644 index 000000000..bf453058b --- /dev/null +++ b/@salix/crud/src/client/databasic/databasic.html @@ -0,0 +1,36 @@ + + + +

    Datos básicos

    +     +     + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +     \ No newline at end of file diff --git a/@salix/crud/src/client/databasic/databasic.js b/@salix/crud/src/client/databasic/databasic.js new file mode 100644 index 000000000..a83180364 --- /dev/null +++ b/@salix/crud/src/client/databasic/databasic.js @@ -0,0 +1,11 @@ +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/index/index.html b/@salix/crud/src/client/index/index.html index 2487fee34..3151d1830 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 a4138dd7f..ea82f2e91 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", href: "#/client/basic-data"}, {text: "Datos facturación", image: "assignment", href: "#/client/invoicing-data"}, {text: "Acceso web", image: "language", href: "#/client/web-access"}, {text: "Consignatarios", image: "local_shipping", href: "#/client/addresses"}, {text: "Notas", image: "insert_drive_file", href: "#/client/notes"} - ] + ]; + this.descriptor = [ + {text: "Cliente 1231"}, + {text: "Floristeria Lola"}, + {text: "987 654 321"} + ]; } }; module.component(NAME, COMPONENT);