Merge branch 'master' of ssh://git.verdnatura.es:/var/lib/git/salix
# Conflicts: # @salix/crud/src/client/basic-data/index.html # @salix/crud/src/client/client.js # @salix/crud/src/client/index/index.js # @salix/crud/src/client/routes.js
This commit is contained in:
commit
e740a0aba1
|
@ -7,5 +7,8 @@ import padding from './styles/layout.css'
|
||||||
import margin from './styles/margin.scss'
|
import margin from './styles/margin.scss'
|
||||||
import layout from './styles/padding.scss'
|
import layout from './styles/padding.scss'
|
||||||
import background from './styles/background.scss'
|
import background from './styles/background.scss'
|
||||||
|
import border from './styles/border.scss'
|
||||||
|
import fontStyle from './styles/font-style.scss'
|
||||||
|
import misc from './styles/misc.scss'
|
||||||
|
|
||||||
bootstrap();
|
bootstrap();
|
||||||
|
|
|
@ -0,0 +1,45 @@
|
||||||
|
@import "colors";
|
||||||
|
|
||||||
|
$border-color: #AAA;
|
||||||
|
$border-thin: 1px;
|
||||||
|
$border-thick: 2px;
|
||||||
|
|
||||||
|
html [border-none], .border-none {
|
||||||
|
border: 0;
|
||||||
|
}
|
||||||
|
|
||||||
|
/* Solid border */
|
||||||
|
|
||||||
|
html [border-solid], .border-solid {
|
||||||
|
border: $border-thin solid $border-color;
|
||||||
|
}
|
||||||
|
html [border-solid-top], .border-solid-top {
|
||||||
|
border-top: $border-thin solid $border-color;
|
||||||
|
}
|
||||||
|
html [border-solid-left], .border-solid-left {
|
||||||
|
border-left: $border-thin solid $border-color;
|
||||||
|
}
|
||||||
|
html [border-solid-right], .border-solid-right {
|
||||||
|
border-right: $border-thin solid $border-color;
|
||||||
|
}
|
||||||
|
html [border-solid-bottom], .border-solid-bottom {
|
||||||
|
border-bottom: $border-thin solid $border-color;
|
||||||
|
}
|
||||||
|
|
||||||
|
/* Dashed border */
|
||||||
|
|
||||||
|
html [border-dashed], .border-dashed {
|
||||||
|
border: $border-thin dashed $border-color;
|
||||||
|
}
|
||||||
|
html [border-dashed-top], .border-dashed-top {
|
||||||
|
border-top: $border-thin dashed $border-color;
|
||||||
|
}
|
||||||
|
html [border-dashed-left], .border-dashed-left {
|
||||||
|
border-left: $border-thin dashed $border-color;
|
||||||
|
}
|
||||||
|
html [border-dashed-right], .border-dashed-right {
|
||||||
|
border-right: $border-thin dashed $border-color;
|
||||||
|
}
|
||||||
|
html [border-dashed-bottom], .border-dashed-bottom {
|
||||||
|
border-bottom: $border-thin dashed $border-color;
|
||||||
|
}
|
|
@ -1,8 +1,7 @@
|
||||||
|
|
||||||
$color-green: rgb(139,195,74);
|
$color-green: rgb(139,195,74);
|
||||||
$color-orange: rgb(255,171,64);
|
$color-orange: rgb(255,171,64);
|
||||||
$color-dark-grey: #424242;
|
|
||||||
$color-light-grey: #e6e6e6;
|
|
||||||
$color-white: white;
|
$color-white: white;
|
||||||
$color-dark: #3c393b;
|
$color-dark: #3c393b;
|
||||||
|
$color-dark-grey: #424242;
|
||||||
|
$color-light-grey: #e6e6e6;
|
|
@ -0,0 +1,10 @@
|
||||||
|
@import "colors";
|
||||||
|
|
||||||
|
$font-color: $color-dark-grey;
|
||||||
|
|
||||||
|
body {
|
||||||
|
color: $font-color;
|
||||||
|
}
|
||||||
|
html [uppercase], .uppercase {
|
||||||
|
text-transform: uppercase;
|
||||||
|
}
|
|
@ -0,0 +1,7 @@
|
||||||
|
@import "padding";
|
||||||
|
|
||||||
|
.form {
|
||||||
|
height: 100%;
|
||||||
|
box-sizing: border-box;
|
||||||
|
padding: $pad-large;
|
||||||
|
}
|
|
@ -1,3 +0,0 @@
|
||||||
<!-- por definir -->
|
|
||||||
|
|
||||||
|
|
|
@ -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);
|
|
|
@ -1,4 +0,0 @@
|
||||||
<button type = "*[typeName]*" class="*[className]*">
|
|
||||||
<i class="material-icons">*[image]*</i>
|
|
||||||
</button>
|
|
||||||
|
|
|
@ -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);
|
|
|
@ -1,4 +1,4 @@
|
||||||
<label class="mdl-checkbox mdl-js-checkbox mdl-js-ripple-effect" for="*[name]*">
|
<label class="mdl-checkbox mdl-js-checkbox mdl-js-ripple-effect" for="*[id]*">
|
||||||
<input type="checkbox" name="*[name]*" id="*[name]*" class="*[className]*" *[enabled]*>
|
<input type="checkbox" name="*[name]*" id="*[id]*" class="*[className]*" ng-model="*[model]*" *[enabled]*>
|
||||||
<span class="mdl-checkbox__label">*[label]*</span>
|
<span class="mdl-checkbox__label">*[label]*</span>
|
||||||
</label>
|
</label>
|
||||||
|
|
|
@ -4,7 +4,6 @@ import * as constant from '../constants';
|
||||||
import template from './check.mt.html';
|
import template from './check.mt.html';
|
||||||
|
|
||||||
const _NAME = 'check';
|
const _NAME = 'check';
|
||||||
const DEFAULT_TEXT = 'check';
|
|
||||||
const DEFAULT_CLASS = 'mdl-checkbox__input';
|
const DEFAULT_CLASS = 'mdl-checkbox__input';
|
||||||
|
|
||||||
export const NAME = util.getFactoryName(_NAME + constant.MATERIAL_DESIGN_FRAMEWORK);
|
export const NAME = util.getFactoryName(_NAME + constant.MATERIAL_DESIGN_FRAMEWORK);
|
||||||
|
@ -13,9 +12,7 @@ export function factory() {
|
||||||
return {
|
return {
|
||||||
template: template,
|
template: template,
|
||||||
default: {
|
default: {
|
||||||
label: DEFAULT_TEXT,
|
|
||||||
enabled: 'true',
|
enabled: 'true',
|
||||||
id: 'checkboxId',
|
|
||||||
className: DEFAULT_CLASS
|
className: DEFAULT_CLASS
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -5,15 +5,14 @@ import * as util from '../util';
|
||||||
const _NAME = 'combo';
|
const _NAME = 'combo';
|
||||||
export const NAME = util.getName(_NAME);
|
export const NAME = util.getName(_NAME);
|
||||||
|
|
||||||
directive.$inject =[resolveFactory.NAME];
|
directive.$inject = [resolveFactory.NAME];
|
||||||
export function directive (resolve){
|
export function directive(resolve) {
|
||||||
return{
|
return {
|
||||||
require:'E',
|
require: 'E',
|
||||||
transclude: true,
|
transclude: true,
|
||||||
template: function(_,attr){
|
template: function(_, attr) {
|
||||||
return resolve.getTemplate(_NAME, attr);
|
return resolve.getTemplate(_NAME, attr);
|
||||||
}
|
}
|
||||||
}
|
};
|
||||||
}
|
}
|
||||||
|
module.directive(NAME, directive);
|
||||||
module.directive(NAME,directive);
|
|
||||||
|
|
|
@ -2,7 +2,6 @@ import {module} from '../module';
|
||||||
import template from './combo.mt.html';
|
import template from './combo.mt.html';
|
||||||
|
|
||||||
export const NAME = 'vnCombomtFactory';
|
export const NAME = 'vnCombomtFactory';
|
||||||
|
|
||||||
export function factory() {
|
export function factory() {
|
||||||
return {
|
return {
|
||||||
template: template,
|
template: template,
|
||||||
|
@ -12,5 +11,4 @@ export function factory() {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
module.factory(NAME, factory);
|
module.factory(NAME, factory);
|
||||||
|
|
|
@ -7,42 +7,41 @@ export * from './util'
|
||||||
|
|
||||||
export {SplitingRegister as splitingRegister} from './splitingregister'
|
export {SplitingRegister as splitingRegister} from './splitingregister'
|
||||||
export {NAME as RESOLVEDEFAULTCOMPONENT, ResolveDefaultComponent} from './resolveDefaultComponents'
|
export {NAME as RESOLVEDEFAULTCOMPONENT, ResolveDefaultComponent} from './resolveDefaultComponents'
|
||||||
export {NAME as INTERPOLATE,Interpolate} from './interpolate'
|
export {NAME as INTERPOLATE, Interpolate} from './interpolate'
|
||||||
export {NAME as ROUTESLOADER, RoutesLoader} from './routesLoader'
|
export {NAME as ROUTES_LOADER, RoutesLoader} from './routesLoader'
|
||||||
|
|
||||||
export {NAME as BUTTON,directive as ButtonDirective} from './button/button'
|
export {NAME as BUTTON, directive as ButtonDirective} from './button/button'
|
||||||
export {NAME as BUTTONMT,factory as buttonmt} from './button/button.mt'
|
export {NAME as BUTTON_MT, factory as buttonMt} from './button/button.mt'
|
||||||
export {NAME as BUTTONBT,factory as buttonbt} from './button/button.bt'
|
export {NAME as BUTTON_BT, 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 CHECK,directive as CheckDirective} from './check/check'
|
export {NAME as CHECK,directive as CheckDirective} from './check/check'
|
||||||
export {NAME as CHECKMT,factory as checknmt} from './check/check.mt'
|
export {NAME as CHECK_MT, factory as checknMt} from './check/check.mt'
|
||||||
export {NAME as CHECKBT,factory as checkbt} from './check/check.bt'
|
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 RADIO,directive as RadioDirective} from './radio/radio'
|
||||||
export {NAME as RADIOMT,factory as radionmt} from './radio/radio.mt'
|
export {NAME as RADIO_MT, factory as radionMt} from './radio/radio.mt'
|
||||||
export {NAME as RADIOBT,factory as radiobt} from './radio/radio.bt'
|
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, directive as TextfieldDirective} from './textfield/textfield'
|
||||||
export {NAME as TEXTFIELDMT,factory as textfieldmt} from './textfield/textfield.mt'
|
export {NAME as TEXTFIELD_MT, factory as textfieldMt} from './textfield/textfield.mt'
|
||||||
export {NAME as TEXTFIELDBT,factory as textfieldbt} from './textfield/textfield.bt'
|
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, directive as LabelDirective} from './label/label'
|
||||||
export {NAME as LABELMT,factory as labelmt} from './label/label.mt'
|
export {NAME as LABEL_MT, factory as labelMt} from './label/label.mt'
|
||||||
export {NAME as LABELBT,factory as labelbt} from './label/label.bt'
|
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 SEARCHBAR,factory as searchbar} from './searchbar/searchbar'
|
||||||
export {NAME as SEARCHBARMT,factory as searchbarmt} from './searchbar/searchbar.mt'
|
export {NAME as SEARCHBAR_MT, factory as searchbarMt} from './searchbar/searchbar.mt'
|
||||||
export {NAME as SEARCHBARBT,factory as searchbarbt} from './searchbar/searchbar.bt'
|
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, directive as PasswordDirective} from './password/password'
|
||||||
export {NAME as PASSWORD_MT,factory as passwordMt} from './password/password.mt'
|
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, directive as SubmitDirective} from './submit/submit'
|
||||||
export {NAME as SUBMIT_MT,factory as submitMt} from './submit/submit.mt'
|
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, directive as SnackbarDirective} from './snackbar/snackbar'
|
||||||
export {NAME as SNACKBAR_MT,factory as snackbarMt} from './snackbar/snackbar.mt'
|
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, directive as SpinnerDirective} from './spinner/spinner'
|
||||||
export {NAME as SPINNER_MT,factory as spinnerMt} from './spinner/spinner.mt'
|
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, directive as ComboDirective} from './combo/combo'
|
||||||
export {NAME as COMBO_MT,factory as comboMt} from './combo/combo.mt'
|
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, 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 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';
|
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 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 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 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';
|
||||||
|
|
||||||
|
|
|
@ -5,14 +5,13 @@ import * as util from '../util';
|
||||||
const _NAME = 'datePicker';
|
const _NAME = 'datePicker';
|
||||||
export const NAME = util.getName(_NAME);
|
export const NAME = util.getName(_NAME);
|
||||||
|
|
||||||
directive.$inject =[resolveFactory.NAME];
|
directive.$inject = [resolveFactory.NAME];
|
||||||
export function directive (resolve){
|
export function directive(resolve) {
|
||||||
return{
|
return {
|
||||||
require:'E',
|
require: 'E',
|
||||||
template: function(_,attr){
|
template: function(_, attr) {
|
||||||
return resolve.getTemplate(_NAME, attr);
|
return resolve.getTemplate(_NAME, attr);
|
||||||
}
|
}
|
||||||
}
|
};
|
||||||
}
|
}
|
||||||
|
module.directive(NAME, directive);
|
||||||
module.directive(NAME,directive);
|
|
||||||
|
|
|
@ -1,4 +1,4 @@
|
||||||
<div class="mdl-textfield mdl-js-textfield mdl-textfield--floating-label">
|
<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>
|
<label class="mdl-textfield__label">*[label]*</label>
|
||||||
</div>
|
</div>
|
||||||
|
|
|
@ -2,16 +2,13 @@ import {module} from '../module';
|
||||||
import template from './date-picker.mt.html';
|
import template from './date-picker.mt.html';
|
||||||
|
|
||||||
export const NAME = 'vnDatePickermtFactory';
|
export const NAME = 'vnDatePickermtFactory';
|
||||||
|
|
||||||
export function factory() {
|
export function factory() {
|
||||||
return {
|
return {
|
||||||
template: template,
|
template: template,
|
||||||
default: {
|
default: {
|
||||||
label: 'Label',
|
label: 'Label',
|
||||||
enabled: 'enabled',
|
enabled: 'enabled'
|
||||||
className: 'mdl-textfield__input'
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
module.factory(NAME, factory);
|
module.factory(NAME, factory);
|
||||||
|
|
|
@ -1,8 +1,8 @@
|
||||||
import {module as _module} from '../module';
|
import {module} from '../module';
|
||||||
import * as resolveFactory from '../resolveDefaultComponents';
|
import * as resolveFactory from '../resolveDefaultComponents';
|
||||||
import * as util from '../util';
|
import * as util from '../util';
|
||||||
|
|
||||||
const _NAME = 'buttonicon';
|
const _NAME = 'iconButton';
|
||||||
export const NAME = util.getName(_NAME);
|
export const NAME = util.getName(_NAME);
|
||||||
|
|
||||||
directive.$inject = [resolveFactory.NAME];
|
directive.$inject = [resolveFactory.NAME];
|
||||||
|
@ -14,6 +14,4 @@ export function directive(resolve) {
|
||||||
}
|
}
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
module.directive(NAME, directive);
|
||||||
_module.directive(NAME, directive);
|
|
||||||
|
|
|
@ -0,0 +1,3 @@
|
||||||
|
<button type="*[typeName]*" class="mdl-button mdl-js-button mdl-button--icon *[className]*">
|
||||||
|
<i class="material-icons">*[icon]*</i>
|
||||||
|
</button>
|
|
@ -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);
|
|
@ -1,2 +1,2 @@
|
||||||
<input type="radio" class="*[className]*" *[enabled]* >
|
<input type="radio" class="*[className]*" name="*[name]*" *[enabled]* >
|
||||||
<span class="mdl-radio__label"> *[text]*</span>
|
<span class="mdl-radio__label">*[text]*</span>
|
||||||
|
|
|
@ -4,7 +4,6 @@ import * as constant from '../constants';
|
||||||
import template from './radio.mt.html';
|
import template from './radio.mt.html';
|
||||||
|
|
||||||
const _NAME = 'radio';
|
const _NAME = 'radio';
|
||||||
const DEFAULT_TEXT = 'radio';
|
|
||||||
const DEFAULT_CLASS = 'mdl-radio mdl-js-radio mdl-js-ripple-effect';
|
const DEFAULT_CLASS = 'mdl-radio mdl-js-radio mdl-js-ripple-effect';
|
||||||
|
|
||||||
export const NAME = util.getFactoryName(_NAME + constant.MATERIAL_DESIGN_FRAMEWORK);
|
export const NAME = util.getFactoryName(_NAME + constant.MATERIAL_DESIGN_FRAMEWORK);
|
||||||
|
@ -13,7 +12,6 @@ export function factory() {
|
||||||
return {
|
return {
|
||||||
template: template,
|
template: template,
|
||||||
default: {
|
default: {
|
||||||
text: DEFAULT_TEXT,
|
|
||||||
enabled: 'true',
|
enabled: 'true',
|
||||||
className: DEFAULT_CLASS
|
className: DEFAULT_CLASS
|
||||||
}
|
}
|
||||||
|
|
|
@ -6,7 +6,6 @@ import Interpolate from './interpolate';
|
||||||
export const NAME = util.getProviderName('ResolveDefaultComponent');
|
export const NAME = util.getProviderName('ResolveDefaultComponent');
|
||||||
|
|
||||||
export class ResolveDefaultComponent {
|
export class ResolveDefaultComponent {
|
||||||
|
|
||||||
constructor(){
|
constructor(){
|
||||||
this._frameworkName="mt";
|
this._frameworkName="mt";
|
||||||
}
|
}
|
||||||
|
@ -14,7 +13,6 @@ export class ResolveDefaultComponent {
|
||||||
//mt or bt
|
//mt or bt
|
||||||
this._frameworkName = value;
|
this._frameworkName = value;
|
||||||
}
|
}
|
||||||
|
|
||||||
$get($injector,vnInterpolate){
|
$get($injector,vnInterpolate){
|
||||||
//Service Locator
|
//Service Locator
|
||||||
return {
|
return {
|
||||||
|
@ -35,5 +33,4 @@ export class ResolveDefaultComponent {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
// _module.provider(NAME,ResolveDefaultComponent)
|
|
||||||
_module.provider(NAME,() => new ResolveDefaultComponent());
|
_module.provider(NAME,() => new ResolveDefaultComponent());
|
|
@ -1,27 +1,31 @@
|
||||||
<vn-vertical full-height pad-large style="box-sizing: border-box;">
|
<vn-vertical class="form">
|
||||||
<vn-horizontal>
|
<vn-horizontal>
|
||||||
<h3 style="margin-top: 0;">Addresses</h3>
|
<h3 style="margin-top: 0;">Addresses</h3>
|
||||||
</vn-horizontal>
|
</vn-horizontal>
|
||||||
<vn-horizontal style="border-bottom: .1em dashed; text-transform: uppercase; text-align: center;" class="pad-medium-bottom">
|
<vn-horizontal class="pad-medium-bottom border-dashed-bottom uppercase" style="text-align: center;">
|
||||||
<vn-empty style="width: 7em;">Default</vn-empty>
|
<vn-empty style="width: 7em;">Default</vn-empty>
|
||||||
<vn-auto>Consignee</vn-auto>
|
<vn-auto>Consignee</vn-auto>
|
||||||
<vn-empty style="width: 7em;">Enabled</vn-empty>
|
<vn-empty style="width: 7em;">Enabled</vn-empty>
|
||||||
</vn-horizontal>
|
</vn-horizontal>
|
||||||
<vn-horizontal ng-repeat="i in $ctrl.addresses" style="align-items: center;" class="pad-medium-top">
|
<vn-horizontal ng-repeat="i in $ctrl.addresses" class="pad-medium-top" style="align-items: center;">
|
||||||
<vn-empty style="width: 7em; text-align: center;">
|
<vn-empty style="width: 7em; text-align: center;">
|
||||||
<input type="radio" name="default"/>
|
<vn-radio name="default"></vn-radio>
|
||||||
</vn-empty>
|
</vn-empty>
|
||||||
<vn-auto style="border: 1px solid black; border-radius: .5em;" class="pad-small">
|
<vn-auto style="border-radius: .5em;" class="pad-small border-solid">
|
||||||
<button style="float: right;">
|
<vn-horizontal style="align-items: center;">
|
||||||
Edit
|
<vn-auto>
|
||||||
</button>
|
<div><b>{{i.consignee}}</b></div>
|
||||||
<h5>{{i.consignee}}</h5>
|
<div>{{i.street}}</div>
|
||||||
<div>{{i.street}}</div>
|
<div>{{i.city}}, {{i.province}}</div>
|
||||||
<div>{{i.city}}, {{i.province}}</div>
|
<div>{{i.phone}}, {{i.mobile}}</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-auto>
|
||||||
<vn-empty style="width: 7em; text-align: center;">
|
<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-empty>
|
||||||
</vn-horizontal>
|
</vn-horizontal>
|
||||||
</vn-vertical>
|
</vn-vertical>
|
|
@ -6,27 +6,25 @@ export const COMPONENT = {
|
||||||
template: template,
|
template: template,
|
||||||
controller: function ($http)
|
controller: function ($http)
|
||||||
{
|
{
|
||||||
this.addresses = [{
|
/* $http.get('/client/api/Addresses', this.model).then (
|
||||||
consignee: 'Consignee 1',
|
(json) => { this.addresses = json.data; },
|
||||||
street: 'Street',
|
(json) => console.error (json.data.error.message)
|
||||||
city: 'City',
|
);
|
||||||
postcode: '46600',
|
*/
|
||||||
province: 'Province',
|
this.addresses = [];
|
||||||
country: 'Country',
|
|
||||||
phone: 'XX-XXX-XX-XX',
|
for (var i = 1; i <= 4; i++)
|
||||||
mobile: 'XX-6XX-XX-XX',
|
this.addresses.push ({
|
||||||
enabled: true
|
"consignee": "Consignee",
|
||||||
},{
|
"street": "Street",
|
||||||
consignee: 'Consignee 2',
|
"city": "City",
|
||||||
street: 'Street',
|
"postcode": "46600",
|
||||||
city: 'City',
|
"province": "Province",
|
||||||
postcode: '46600',
|
"country": "Country",
|
||||||
province: 'Province',
|
"phone": "+XX XXX XX XX XX",
|
||||||
country: 'Country',
|
"mobile": "+XX 6XX XX XX XX",
|
||||||
phone: 'XX-XXX-XX-XX',
|
"enabled": true
|
||||||
mobile: 'XX-6XX-XX-XX',
|
});
|
||||||
enabled: false
|
|
||||||
}];
|
|
||||||
},
|
},
|
||||||
};
|
};
|
||||||
module.component(NAME, COMPONENT);
|
module.component(NAME, COMPONENT);
|
||||||
|
|
|
@ -5,4 +5,8 @@ export {NAME as CLIENT_BASIC_DATA_INDEX,
|
||||||
export {NAME as CLIENT_ADDRESSES,
|
export {NAME as CLIENT_ADDRESSES,
|
||||||
COMPONENT as CLIENT_ADDRESSES_COMPONENT} from './addresses/index';
|
COMPONENT as CLIENT_ADDRESSES_COMPONENT} from './addresses/index';
|
||||||
export {NAME as CLIENTS,
|
export {NAME as CLIENTS,
|
||||||
COMPONENT as CLIENTS_COMPONENT} from './index/index';
|
COMPONENT as CLIENTS_COMPONENT} from './index/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';
|
||||||
|
|
|
@ -0,0 +1,64 @@
|
||||||
|
<form ng-submit="$ctrl.submit()">
|
||||||
|
<vn-vertical class="form uppercase">
|
||||||
|
<vn-horizontal>
|
||||||
|
<vn-one>
|
||||||
|
<h3 style="margin-top: 0;">Datos fiscales y de facturación</h3>
|
||||||
|
<hr/>
|
||||||
|
</vn-one>
|
||||||
|
</vn-horizontal>
|
||||||
|
<vn-horizontal>
|
||||||
|
<vn-check vn-one label="Cliente Activo" name"active" model="$ctrl.model.active"></vn-check>
|
||||||
|
<vn-check vn-one label="Facturar" name="invoice" model="$ctrl.model.invoice"></vn-check>
|
||||||
|
<vn-check vn-one label="Factura Impresa" name="mail" model="$ctrl.model.mail"></vn-check>
|
||||||
|
</vn-horizontal>
|
||||||
|
<vn-horizontal>
|
||||||
|
<vn-textfield vn-two label="Domicilio Fiscal" name"Domicilio" model="$ctrl.model.Domicilio"></vn-textfield>
|
||||||
|
<vn-textfield vn-one label="Municipio" name"Poblacion" model="$ctrl.model.dischargeDate"></vn-textfield>
|
||||||
|
</vn-horizontal>
|
||||||
|
<vn-horizontal>
|
||||||
|
|
||||||
|
<vn-textfield vn-one label="Codigo Postal" name="codpos" model="$ctrl.model.codpos"></vn-textfield>
|
||||||
|
<vn-combo vn-one label="Provincia" name="province_id" model="$ctrl.model.province_id"></vn-combo>
|
||||||
|
<vn-combo vn-one label="Pais" name="Id_Pais" model="$ctrl.model.Id_Pais">
|
||||||
|
<option value="1">Comercial 1</option>
|
||||||
|
<option value="2">Comercial 2</option>
|
||||||
|
</vn-combo>
|
||||||
|
</vn-horizontal>
|
||||||
|
<vn-horizontal>
|
||||||
|
<vn-textfield vn-one label="Telefono Fijo" name="Telefono" model="$ctrl.model.Telefono"></vn-textfield>
|
||||||
|
<vn-textfield vn-one label="Telefono Movil" name="movil" model="$ctrl.model.movil"></vn-textfield>
|
||||||
|
<vn-textfield vn-one label="Email" name="email" model="$ctrl.model.email"></vn-textfield>
|
||||||
|
</vn-horizontal>
|
||||||
|
<hr class="border-dashed-top"/>
|
||||||
|
<vn-horizontal>
|
||||||
|
<h5 vn-one style="margin-top: 0;">Información de facturación</h5>
|
||||||
|
</vn-horizontal>
|
||||||
|
<vn-horizontal>
|
||||||
|
<vn-combo vn-two label="Forma de Pago" name="pay_met_id" model="$ctrl.model.pay_met_id"></vn-combo>
|
||||||
|
<vn-textfield vn-one label="Vencimiento" name="Vencimiento" model="$ctrl.model.Vencimiento"></vn-textfield>
|
||||||
|
<vn-check vn-three label="Recargo de" name"re" model="$ctrl.model.re"></vn-check>
|
||||||
|
</vn-horizontal>
|
||||||
|
<vn-horizontal>
|
||||||
|
<vn-textfield vn-one label="Credito" name="Credito" model="$ctrl.model.Credito"></vn-textfield>
|
||||||
|
<vn-textfield vn-one label="Cyc" name="cyc" model="$ctrl.model.cyc"></vn-textfield>
|
||||||
|
<vn-textfield vn-one label="iae" name"re" model="$ctrl.model.re"></vn-textfield>
|
||||||
|
<vn-textfield vn-three label="iban" name"iban" model="$ctrl.model.iban"></vn-textfield>
|
||||||
|
</vn-horizontal>
|
||||||
|
<hr class="border-dashed-top"/>
|
||||||
|
<vn-horizontal>
|
||||||
|
<vn-one>
|
||||||
|
<h5 style="margin-top: 0;">DOCUMENTACION</h5>
|
||||||
|
</vn-one>
|
||||||
|
</vn-horizontal>
|
||||||
|
<vn-horizontal>
|
||||||
|
<vn-check vn-two label="Recibido core vnh" name"corevnh" model="$ctrl.model.corevnh"></vn-check>
|
||||||
|
<vn-check vn-two label="Recibido core vnl" name="corevnl" model="$ctrl.model.corevnl"></vn-check>
|
||||||
|
<vn-check vn-two label="Recibido B2B vnl" name="sepavnl" model="$ctrl.model.sepavnl"></vn-check>
|
||||||
|
</vn-horizontal>
|
||||||
|
<vn-horizontal class="margin-large-top">
|
||||||
|
<vn-one>
|
||||||
|
<vn-submit class="colored " text="Guardar"></vn-submit>
|
||||||
|
</vn-one>
|
||||||
|
</vn-horizontal>
|
||||||
|
</vn-vertical>
|
||||||
|
</form>
|
|
@ -0,0 +1,16 @@
|
||||||
|
import template from './index.html';
|
||||||
|
import {module} from '../../module';
|
||||||
|
|
||||||
|
export const NAME = 'vnClientFiscalData';
|
||||||
|
export const COMPONENT = {
|
||||||
|
template: template,
|
||||||
|
controller: function($http) {
|
||||||
|
this.submit = function() {
|
||||||
|
$http.post('/client/api/Clients', this.model).then(
|
||||||
|
json => console.log(json.statusText),
|
||||||
|
json => console.error(json.data.error.message)
|
||||||
|
);
|
||||||
|
};
|
||||||
|
}
|
||||||
|
};
|
||||||
|
module.component(NAME, COMPONENT);
|
|
@ -24,7 +24,18 @@
|
||||||
state: 'client.addresses',
|
state: 'client.addresses',
|
||||||
template: '<vn-client-addresses full-height></vn-client-addresses>',
|
template: '<vn-client-addresses full-height></vn-client-addresses>',
|
||||||
module: 'crud'
|
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'
|
||||||
}
|
}
|
||||||
]
|
];
|
||||||
|
|
||||||
|
|
||||||
|
|
|
@ -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>
|
|
@ -1,7 +1,7 @@
|
||||||
import template from './index.html';
|
import template from './index.html';
|
||||||
import {module} from '../../module';
|
import {module} from '../../module';
|
||||||
|
|
||||||
export const NAME = 'customerWebClient';
|
export const NAME = 'vnClientWebAccess';
|
||||||
export const COMPONENT = {
|
export const COMPONENT = {
|
||||||
template: template
|
template: template
|
||||||
};
|
};
|
|
@ -1,5 +1,5 @@
|
||||||
export * from './module';
|
export * from './module';
|
||||||
export * from './client/client'
|
export * from './client/client';
|
||||||
|
|
||||||
export {NAME as CUSTOMER_INDEX,
|
export {NAME as CUSTOMER_INDEX,
|
||||||
COMPONENT as CUSTOMER_INDEX_COMPONENT} from './customer/index';
|
COMPONENT as CUSTOMER_INDEX_COMPONENT} from './customer/index';
|
||||||
|
@ -14,9 +14,6 @@ export {NAME as CUSTOMER_DESCRIPTOR,
|
||||||
export {NAME as CUSTOMER_ACTIONS,
|
export {NAME as CUSTOMER_ACTIONS,
|
||||||
COMPONENT as CUSTOMER_ACTIONS_COMPONENT} from './customer/edit/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,
|
export {NAME as NAVIGATION_INDEX,
|
||||||
COMPONENT as NAVIGATION_INDEX_COMPONENT} from './navigation/index';
|
COMPONENT as NAVIGATION_INDEX_COMPONENT} from './navigation/index';
|
||||||
export {NAME as NAVIGATION_ITEM,
|
export {NAME as NAVIGATION_ITEM,
|
||||||
|
|
|
@ -34,5 +34,4 @@
|
||||||
description: '',
|
description: '',
|
||||||
image: ''
|
image: ''
|
||||||
}
|
}
|
||||||
|
|
||||||
]
|
]
|
||||||
|
|
|
@ -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>
|
|
1
dev.sh
1
dev.sh
|
@ -13,7 +13,6 @@ case "$1" in
|
||||||
$0 stop
|
$0 stop
|
||||||
echo "################################ Starting services"
|
echo "################################ Starting services"
|
||||||
forever start forever.json
|
forever start forever.json
|
||||||
forever list
|
|
||||||
"$nginxBin" -c "$nginxConf" -p "$nginxPrefix"
|
"$nginxBin" -c "$nginxConf" -p "$nginxPrefix"
|
||||||
cd @salix && gulp
|
cd @salix && gulp
|
||||||
;;
|
;;
|
||||||
|
|
Loading…
Reference in New Issue