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

merge

This commit is contained in:
Javi Gallego 2016-11-29 14:54:17 +01:00
parent 6cddd841c0 ce34c4c151
commit c78ddc77d4
28 changed files with 165 additions and 203 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
@salix/core/src/buttonicon/buttonicon.bt.html
View File

@ -1,3 +0,0 @@
<!-- por definir -->

23
@salix/core/src/buttonicon/buttonicon.bt.js
View File

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

4
@salix/core/src/buttonicon/buttonicon.mt.html
View File

@ -1,4 +0,0 @@
<button type = "*[typeName]*" class="*[className]*">
<i class="material-icons">*[image]*</i>
</button>

23
@salix/core/src/buttonicon/buttonicon.mt.js
View File

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

4
@salix/core/src/check/check.mt.html
View File

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

3
@salix/core/src/check/check.mt.js
View File

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

17
@salix/core/src/combo/combo.js
View File

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

2
@salix/core/src/combo/combo.mt.js
View File

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

63
@salix/core/src/core.js
View File

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

17
@salix/core/src/date-picker/date-picker.js
View File

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

2
@salix/core/src/date-picker/date-picker.mt.html
View File

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

5
@salix/core/src/date-picker/date-picker.mt.js
View File

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

8
@salix/core/src/buttonicon/buttonicon.js → @salix/core/src/icon-button/icon-button.js
View File

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

3
@salix/core/src/icon-button/icon-button.mt.html Normal file
View File

@ -0,0 +1,3 @@
<button type="*[typeName]*" class="mdl-button mdl-js-button mdl-button--icon *[className]*">
<i class="material-icons">*[icon]*</i>
</button>

15
@salix/core/src/icon-button/icon-button.mt.js Normal file
View File

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

4
@salix/core/src/radio/radio.mt.html
View File

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

2
@salix/core/src/radio/radio.mt.js
View File

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

3
@salix/core/src/resolveDefaultComponents.js
View File

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

22
@salix/crud/src/client/addresses/index.html
View File

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

25
@salix/crud/src/client/addresses/index.js
View File

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

68
@salix/crud/src/client/basic-data/index.html
View File

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

2
@salix/crud/src/client/client.js
View File

@ -6,3 +6,5 @@ export {NAME as CLIENT_ADDRESSES,
COMPONENT as CLIENT_ADDRESSES_COMPONENT} from './addresses/index';
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';

14
@salix/crud/src/client/routes.js
View File

@ -5,21 +5,25 @@
module: 'crud',
description: '',
image: ''
},{
}, {
url: '/basic-data',
state: 'client.basicdata',
template: '<vn-client-basic-data full-height></vn-client-basic-data>',
module: 'crud'
},{
}, {
url: '/addresses',
state: 'client.addresses',
template: '<vn-client-addresses full-height></vn-client-addresses>',
module: 'crud'
},{
}, {
url: '/fiscal-data',
state: 'client.fiscaldata',
template: '<vn-client-fiscal-data full-height></vn-client-fiscal-data>',
module: 'crud'
}]
}, {
url: '/web-access',
state: 'client.webaccess',
template: '<vn-client-web-access full-height></vn-client-web-access>',
module: 'crud'
}];

16
@salix/crud/src/client/web-access/index.html Normal file
View File

@ -0,0 +1,16 @@
<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" model="$ctrl.model.active"></vn-check>
</vn-two>
<vn-three>
<vn-textfield label="USUARIO" class="pada-medium-top" model="$ctrl.model.usuario"></vn-textfield>
</vn-three>
<vn-four>
<vn-submit class="colored" text="Guardar"></vn-submit>
</vn-four>
</vn-vertical>
</form>

2
@salix/crud/src/customer/webclient/index.js → @salix/crud/src/client/web-access/index.js
View File

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

3
@salix/crud/src/crud.js
View File

@ -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,

1
@salix/crud/src/customer/routes.js
View File

@ -34,5 +34,4 @@
description: '',
image: ''
}
]

14
@salix/crud/src/customer/webclient/index.html
View File

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