verdnatura/salix
verdnatura
/
salix
3
4
Fork 0
Code Issues Pull Requests 55 Releases Wiki Activity

Merge

This commit is contained in:
Juan Ferrer Toribio 2016-11-25 15:48:57 +01:00
parent 6ed1a92773 96b35cd205
commit a930b15963
11 changed files with 73 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
@salix/app/src/configroutes.js
View File

@ -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)
}
})
});
}

9
@salix/core/src/left-menu/descriptor.html
View File

@ -1,5 +1,4 @@
<vn-horizontal>
<vn-one style="padding: 0 1em;">
<h3>Descriptor</h3>
</vn-one>
</vn-horizontal>
<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>

5
@salix/core/src/left-menu/descriptor.js
View File

@ -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);

2
@salix/core/src/left-menu/left-menu.html
View File

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

3
@salix/core/src/left-menu/left-menu.js
View File

@ -8,7 +8,8 @@ export const NAME = util.getName(_NAME);
export const COMPONENT = {
template: template,
bindings: {
items: '<'
items: '<',
descriptor: '<'
}
};
module.component(NAME, COMPONENT);

1
@salix/core/src/left-menu/menu-item.html
View File

@ -1,4 +1,3 @@
<li>
<a href="{{$ctrl.item.href}}" style="display: block; text-decoration: none; color: inherit; padding: .5em 1em;">
<i class="material-icons" style="float: right; margin-left: .4em;">keyboard_arrow_right</i>

6
@salix/core/src/topbar/topbar.html
View File

@ -1,6 +1,8 @@
<vn-horizontal style="color: white; height: 100%;" class="bg-dark-bar">
<vn-one>
<h3 style="float: left;">Client</h3>
<vn-searchbar ></vn-searchbar>
<h3 style="float: left;" class="pad-large-left">Client</h3>
</vn-one>
<vn-two>
<vn-searchbar ></vn-searchbar>
</vn-two>
</vn-horizontal>

36
@salix/crud/src/client/databasic/databasic.html Normal file
View File

@ -0,0 +1,36 @@
<vn-vertical full-height pad-medium>
<vn-horizontal>
<vn-one>
<h3>Datos básicos</h3>
</vn-one>
</vn-horizontal>
<vn-horizontal>
<vn-one>
<vn-textfield label="Alias" name"alias" model="customer.alias"></vn-textfield>
<vn-textfield label="NIF/CIF" name="fi" model="customer.fi"></vn-textfield>
</vn-one>
</vn-horizontal>
<vn-horizontal>
<vn-one>
<vn-textfield label="Razón social" name"socialName" model="customer.socialName"></vn-textfield>
<vn-date-picker label="Fecha alta" name"dischargeDate" model="customer.dischargeDate"></vn-date-picker>
</vn-one>
</vn-horizontal>
<vn-horizontal>
<vn-one>
<vn-textfield label="Contacto" name="contact" model="customer.contact"></vn-textfield>
<vn-textfield label="Teléfono" name="telefono" model="customer.phone"></vn-textfield>
</vn-one>
</vn-horizontal>
<vn-horizontal>
<vn-one>
<vn-textfield label="Calidad" name="quality" model="customer.quality"></vn-textfield>
<vn-combo label="Comercial" name="salesPerson" model="customer.salesPerson"></vn-combo>
</vn-one>
</vn-horizontal>
<vn-horizontal>
<vn-one>
<vn-button class="colored" text="Guardar"></vn-button>
</vn-one>
</vn-horizontal>
</vn-vertical>

11
@salix/crud/src/client/databasic/databasic.js Normal file
View File

@ -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);

2
@salix/crud/src/client/index/index.html
View File

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

11
@salix/crud/src/client/index/index.js
View File

@ -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);