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

Merge branch 'master' of ssh://git.verdnatura.es:/var/lib/git/salix 

# Conflicts:
#	@salix/crud/src/client/basic-data/index.html
This commit is contained in:
nelo 2016-12-15 08:34:07 +01:00
parent e9d222d2b1 441537bffb
commit 440e9705d2
33 changed files with 211 additions and 137 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
@salix/app/src/styles/margin.scss
View File

@ -28,13 +28,13 @@ html [margin-small-bottom], .margin-small-bottom {
margin-bottom: $margin-small;
}
html [margin-small-v], .margin-small-v {
margin-left: $margin-small;
margin-right: $margin-small;
}
html [margin-small-h], .margin-small-h {
margin-top: $margin-small;
margin-bottom: $margin-small;
}
html [margin-small-h], .margin-small-h {
margin-left: $margin-small;
margin-right: $margin-small;
}
/* Medium */
@ -54,13 +54,13 @@ html [margin-medium-bottom], .margin-medium-bottom {
margin-bottom: $margin-medium;
}
html [margin-medium-v], .margin-medium-v {
margin-left: $margin-medium;
margin-right: $margin-medium;
}
html [margin-medium-h], .margin-medium-h {
margin-top: $margin-medium;
margin-bottom: $margin-medium;
}
html [margin-medium-h], .margin-medium-h {
margin-left: $margin-medium;
margin-right: $margin-medium;
}
/* Large */
@ -80,10 +80,10 @@ html [margin-large-bottom], .margin-large-bottom {
margin-bottom: $margin-large;
}
html [margin-large-v], .margin-large-v {
margin-left: $margin-large;
margin-right: $margin-large;
}
html [margin-large-h], .margin-large-h {
margin-top: $margin-large;
margin-bottom: $margin-large;
}
html [margin-large-h], .margin-large-h {
margin-left: $margin-large;
margin-right: $margin-large;
}

24
@salix/app/src/styles/padding.scss
View File

@ -28,13 +28,13 @@ html [pad-small-bottom], .pad-small-bottom {
padding-bottom: $pad-small;
}
html [pad-small-v], .pad-small-v {
padding-left: $pad-small;
padding-right: $pad-small;
}
html [pad-small-h], .pad-small-h {
padding-top: $pad-small;
padding-bottom: $pad-small;
}
html [pad-small-h], .pad-small-h {
padding-left: $pad-small;
padding-right: $pad-small;
}
/* Medium */
@ -54,13 +54,13 @@ html [pad-medium-bottom], .pad-medium-bottom {
padding-bottom: $pad-medium;
}
html [pad-medium-v], .pad-medium-v {
padding-left: $pad-medium;
padding-right: $pad-medium;
}
html [pad-medium-h], .pad-medium-h {
padding-top: $pad-medium;
padding-bottom: $pad-medium;
}
html [pad-medium-h], .pad-medium-h {
padding-left: $pad-medium;
padding-right: $pad-medium;
}
/* Large */
@ -80,10 +80,10 @@ html [pad-large-bottom], .pad-large-bottom {
padding-bottom: $pad-large;
}
html [pad-large-v], .pad-large-v {
padding-left: $pad-large;
padding-right: $pad-large;
}
html [pad-large-h], .pad-large-h {
padding-top: $pad-large;
padding-bottom: $pad-large;
}
html [pad-large-h], .pad-large-h {
padding-left: $pad-large;
padding-right: $pad-large;
}

2
@salix/core/src/button/button.mdl.html
View File

@ -1,3 +1,3 @@
<button type = "*[typeName]*" class="*[className]*" *[enabled]* >
*[text]*
*[label]*
</button>

7
@salix/core/src/button/button.mdl.js
View File

@ -4,17 +4,14 @@ import * as constant from '../constants';
import template from './button.mdl.html';
const _NAME = 'button';
const DEFAULT_CLASS = 'mdl-button mdl-js-button mdl-button--raised';
const DEFAULT_TEXT = 'Button';
export const NAME = util.getFactoryName(_NAME + constant.MATERIAL_DESIGN_FRAMEWORK);
export function factory() {
return {
template: template,
default: {
text: DEFAULT_TEXT,
className: DEFAULT_CLASS,
label: 'Submit',
className: 'mdl-button mdl-js-button mdl-button--raised',
enabled: 'true',
typeName: 'button'
}

10
@salix/core/src/check/check.js
View File

@ -1,16 +1,18 @@
import {module as _module} from '../module';
import * as resolveFactory from '../resolveDefaultComponents';
import * as normalizerFactory from '../inputAttrsNormalizer';
import * as util from '../util';
const _NAME = 'check';
export const NAME = util.getName(_NAME);
directive.$inject =[resolveFactory.NAME];
export function directive (resolve){
directive.$inject =[resolveFactory.NAME, normalizerFactory.NAME];
export function directive (resolve, normalizer){
return{
require:'E',
template: function(_,attr){
return resolve.getTemplate(_NAME, attr);
template: function(_,attrs){
normalizer.normalize (attrs);
return resolve.getTemplate(_NAME, attrs);
}
}
}

2
@salix/core/src/check/check.mdl.html
View File

@ -1,4 +1,4 @@
<label class="mdl-checkbox mdl-js-checkbox mdl-js-ripple-effect">
<input type="checkbox" name="*[name]*" class="*[className]*" ng-model="*[model]*.*[name]*" *[enabled]*>
<input type="checkbox" name="*[name]*" class="*[className]*" name="*[name]*" ng-model="*[model]*" rule="*[rule]*" *[enabled]* *[focus]*>
<span class="mdl-checkbox__label">*[label]*</span>
</label>

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

@ -1,17 +1,19 @@
import {module as _module} from '../module';
import * as resolveFactory from '../resolveDefaultComponents';
import * as normalizerFactory from '../inputAttrsNormalizer';
import * as util from '../util';
const _NAME = 'combo';
export const NAME = util.getName(_NAME);
directive.$inject = [resolveFactory.NAME];
export function directive(resolve) {
directive.$inject = [resolveFactory.NAME, normalizerFactory.NAME];
export function directive(resolve, normalizer) {
return {
require: 'E',
transclude: true,
template: function(_, attr) {
return resolve.getTemplate(_NAME, attr);
template: function(_, attrs) {
normalizer.normalize (attrs);
return resolve.getTemplate(_NAME, attrs);
}
};
}

2
@salix/core/src/combo/combo.mdl.html
View File

@ -1,5 +1,5 @@
<div class="mdl-textfield mdl-js-textfield mdl-textfield--floating-label">
<select class="mdl-textfield__input" class="*[className]*" name="*[name]*" ng-model="*[model]*.*[name]*" *[enabled]* ng-transclude>
<select class="mdl-textfield__input" class="*[className]*" name="*[name]*" ng-model="*[model]*" rule="*[rule]*" *[enabled]* ng-transclude>
</select>
<label class="mdl-textfield__label">*[label]*</label>
</div>

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

@ -8,6 +8,9 @@ export {NAME as RESOLVEDEFAULTCOMPONENT, ResolveDefaultComponent} from './resolv
export {NAME as INTERPOLATE, Interpolate} from './interpolate'
export {NAME as ROUTES_LOADER, RoutesLoader} from './routesLoader'
export {NAME as FOCUS, directive as Focus} from './focus'
export {NAME as RULE, directive as Rule} from './rule'
export {NAME as BUTTON, directive as ButtonDirective} from './button/button'
export {NAME as BUTTON_MDL, factory as buttonMdl} from './button/button.mdl'
export {NAME as BUTTON_BT, factory as buttonBt} from './button/button.bt'
@ -39,7 +42,4 @@ export {NAME as DATE_PICKER, directive as DatePickerDirective} from './date-pick
export {NAME as DATE_PICKER_MDL, factory as datePickerMdl} from './date-picker/date-picker.mdl'
export {NAME as TITLE, COMPONENT as TITLE_COMPONENT} from './title/title'
export {NAME as SUBTITLE, COMPONENT as SUBTITLE_COMPONENT} from './subtitle/subtitle'

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

@ -1,16 +1,18 @@
import {module as _module} from '../module';
import * as resolveFactory from '../resolveDefaultComponents';
import * as normalizerFactory from '../inputAttrsNormalizer';
import * as util from '../util';
const _NAME = 'datePicker';
export const NAME = util.getName(_NAME);
directive.$inject = [resolveFactory.NAME];
export function directive(resolve) {
directive.$inject = [resolveFactory.NAME, normalizerFactory.NAME];
export function directive(resolve, normalizer) {
return {
require: 'E',
template: function(_, attr) {
return resolve.getTemplate(_NAME, attr);
template: function(_, attrs) {
normalizer.normalize (attrs);
return resolve.getTemplate(_NAME, attrs);
}
};
}

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

@ -1,4 +1,4 @@
<div class="mdl-textfield mdl-js-textfield mdl-textfield--floating-label">
<input class="mdl-textfield__input *[className]*" type="text" name="*[name]*" ng-model="*[model]*.*[name]*" *[enabled]*>
<input class="mdl-textfield__input *[className]*" type="text" name="*[name]*" ng-model="*[model]*" rule="*[rule]*" *[enabled]*>
<label class="mdl-textfield__label">*[label]*</label>
</div>

16
@salix/core/src/focus.js Normal file
View File

@ -0,0 +1,16 @@
import {module} from './module';
export const NAME = 'vnFocus';
export function directive() {
return {
restrict: 'A',
link: function (scope, elements, attrs){
let element = elements[0];
element.focus();
let len = element.value ? element.value.length : 0;
element.setSelectionRange(0, len);
//element.select();
}
};
}
module.directive(NAME, directive);

31
@salix/core/src/inputAttrsNormalizer.js Normal file
View File

@ -0,0 +1,31 @@
import {module} from './module';
export const NAME = 'vnInputAttrsNormalizer';
export class InputAttrsNormalizer {
constructor () {}
$get(){
return {
normalize: function(attrs) {
/*
if (!attrs.entity)
throw new Error(`Attribute 'entity' not defined on input`);
if (!attrs.field)
throw new Error(`Attribute 'field' not defined on input`);
*/
if (attrs.model === undefined)
attrs.model = `${attrs.entity}.model.${attrs.field}`;
if (attrs.rule === undefined)
attrs.rule = `${attrs.entity}.${attrs.field}`;
if (attrs.label === undefined)
attrs.label = `${attrs.entity}.${attrs.field}`;
if (attrs.name === undefined)
attrs.name = attrs.field;
if (attrs.focus !== undefined)
attrs.focus = 'vn-focus';
}
};
}
}
module.provider (NAME, () => new InputAttrsNormalizer ())

10
@salix/core/src/password/password.js
View File

@ -1,16 +1,18 @@
import {module as _module} from '../module';
import * as resolveFactory from '../resolveDefaultComponents';
import * as normalizerFactory from '../inputAttrsNormalizer';
import * as util from '../util';
const _NAME = 'password';
export const NAME = util.getName(_NAME);
directive.$inject =[resolveFactory.NAME];
export function directive (resolve){
directive.$inject =[resolveFactory.NAME, normalizerFactory.NAME];
export function directive (resolve, normalizer){
return{
require:'E',
template: function(_,attr){
return resolve.getTemplate(_NAME, attr);
template: function(_, attrs){
normalizer.normalize (attrs);
return resolve.getTemplate(_NAME, attrs);
}
}
}

2
@salix/core/src/password/password.mdl.html
View File

@ -1,4 +1,4 @@
<div class="mdl-textfield mdl-js-textfield mdl-textfield--floating-label">
<input class="*[className]*" type="password" name="*[name]*" ng-model="*[model]*.*[name]*" *[enabled]*>
<input class="*[className]*" type="password" name="*[name]*" ng-model="*[model]*" rule="*[rule]*" *[enabled]* *[focus]*>
<label class="mdl-textfield__label">*[label]*</label>
</div>

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

@ -5,9 +5,9 @@ import Interpolate from './interpolate';
export const NAME = util.getProviderName('ResolveDefaultComponent');
function $get($injector,vnInterpolate){
function $get($injector, vnInterpolate){
return {
getTemplate:function(name ,attr) {
getTemplate:function(name, attrs) {
this._frameworkName = 'Mdl';
let _name = util.getFactoryName( name + this._frameworkName);
let defaultfactory = $injector.has(_name) ? $injector.get(_name) : undefined;
@ -18,7 +18,7 @@ function $get($injector,vnInterpolate){
let defaultValues = defaultfactory.default;
let template = defaultfactory.template;
let scope = Object.assign(defaultValues || {},attr||{});
let scope = Object.assign({}, defaultValues || {}, attrs || {});
return template && vnInterpolate(template)(scope);
}
};

11
@salix/core/src/rule.js Normal file
View File

@ -0,0 +1,11 @@
import {module} from './module';
export const NAME = 'vnRule';
export function directive() {
return {
restrict: 'A',
link: function (attrs, element){
}
};
}
module.directive(NAME, directive);

2
@salix/core/src/subtitle/subtitle.html Normal file
View File

@ -0,0 +1,2 @@
<h5 style="margin-top: 0;" class="border-dashed-top pad-medium-v" level="*[level]*" ng-transclude>
</h5>

9
@salix/core/src/subtitle/subtitle.js Normal file
View File

@ -0,0 +1,9 @@
import template from './subtitle.html';
import {module} from '../module';
export const NAME = "vnSubtitle";
export const COMPONENT = {
template: template,
transclude: true
};
module.component(NAME, COMPONENT);

10
@salix/core/src/textfield/textfield.js
View File

@ -1,16 +1,18 @@
import {module as _module} from '../module';
import * as resolveFactory from '../resolveDefaultComponents';
import * as normalizerFactory from '../inputAttrsNormalizer';
import * as util from '../util';
const _NAME = 'textfield';
export const NAME = util.getName(_NAME);
directive.$inject =[resolveFactory.NAME];
export function directive (resolve){
directive.$inject =[resolveFactory.NAME, normalizerFactory.NAME];
export function directive (resolve, normalizer){
return{
require:'E',
template: function(_,attr){
return resolve.getTemplate(_NAME, attr);
template: function(_, attrs){
normalizer.normalize (attrs);
return resolve.getTemplate(_NAME, attrs);
}
}
}

2
@salix/core/src/textfield/textfield.mdl.html
View File

@ -1,4 +1,4 @@
<div class="mdl-textfield mdl-js-textfield mdl-textfield--floating-label">
<input class="*[className]*" type="*[type]*" name="*[name]*" ng-model="*[model]*.*[name]*" *[enabled]* *[focus]*>
<input class="*[className]*" type="*[type]*" name="*[name]*" ng-model="*[model]*" rule="*[rule]*" *[enabled]* *[focus]*>
<label class="mdl-textfield__label">*[label]*</label>
</div>

4
@salix/core/src/textfield/textfield.mdl.js
View File

@ -16,10 +16,8 @@ export function factory() {
default: {
label: DEFAULT_LABEL,
name: 'textfield',
enabled: 'enabled',
className: DEFAULT_CLASS,
type: DEFAULT_TYPE,
model: '$ctrl.model'
type: DEFAULT_TYPE
}
}
}

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

@ -1,28 +1,28 @@
<form ng-submit="basicData.submit()" pad-large>
<vn-title>Datos básicos</vn-title>
<vn-horizontal>
<vn-textfield vn-one label="Nombre" name="name" model="basicData.client"></vn-textfield>
<vn-textfield vn-one label="NIF/CIF" name="fi" model="basicData.client"></vn-textfield>
<vn-textfield vn-one label="Nombre" name="name" entity="client"></vn-textfield>
<vn-textfield vn-one label="NIF/CIF" name="fi" entity="client"></vn-textfield>
</vn-horizontal>
<vn-horizontal>
<vn-textfield autofocus vn-one label="Razón social" name="socialName" model="basicData.client"></vn-textfield>
<vn-date-picker vn-one label="Fecha alta" name="dischargeDate" model="basicData.client"></vn-date-picker>
<vn-textfield autofocus vn-one label="Razón social" field="socialName" entity="client"></vn-textfield>
<vn-date-picker vn-one label="Fecha alta" field="dischargeDate" entity="client"></vn-date-picker>
</vn-horizontal>
<vn-horizontal>
<!--<vn-textfield vn-one label="Contacto" name="contact" model="basicData.client"></vn-textfield>-->
<vn-textfield vn-one label="Teléfono" name="telefono" model="basicData.client"></vn-textfield>
<vn-textfield vn-one label="Fax" name="fax" model="basicData.client"></vn-textfield>
<vn-textfield vn-one label="Email" name="email" model="basicData.client"></vn-textfield>
<vn-textfield vn-one label="Teléfono" name="telefono" entity="client"></vn-textfield>
<vn-textfield vn-one label="Fax" name="fax" entity="client"></vn-textfield>
<vn-textfield vn-one label="Email" name="email" entity="client"></vn-textfield>
</vn-horizontal>
<vn-horizontal>
<vn-combo vn-one label="Comercial" name="salesPerson" model="basicData.client">
<vn-combo vn-one label="Comercial" name="salesPerson" entity="client">
<option value="1">Comercial 1</option>
<option value="2">Comercial 2</option>
</vn-combo>
</vn-horizontal>
<vn-horizontal>
<vn-one>
<vn-submit text="Guardar" id="save"></vn-submit>
<vn-submit label="Guardar" id="save"></vn-submit>
</vn-one>
</vn-horizontal>
</form>

3
@salix/crud/src/client/basic-data/index.js
View File

@ -15,7 +15,8 @@ export const COMPONENT = {
json => console.error(json.data.error.message)
);
};
}
},
controllerAs: 'client'
};
COMPONENT.controller.$inject = ['$http'];
module.component(NAME, COMPONENT);

1
@salix/crud/src/client/descriptor/descriptor.html
View File

@ -7,5 +7,4 @@
<vn-one class="margin-none">{{descriptor.descriptor.name}}</vn-one>
<vn-one class="margin-none">{{descriptor.descriptor.phone}}</vn-one>
</vn-vertical>
</vn-horizontal>

44
@salix/crud/src/client/fiscal-data/index.html
View File

@ -2,48 +2,48 @@
<form ng-submit="frm.isValid && fiscal.submit()" pad-large>
<vn-title>Datos fiscales y de facturación</vn-title>
<vn-horizontal>
<vn-check vn-one label="Cliente Activo" name="active" model="fiscal.model"></vn-check>
<vn-check vn-one label="Facturar" name="invoice" model="fiscal.model"></vn-check>
<vn-check vn-one label="Factura Impresa" name="mailInvoice" model="fiscal.model"></vn-check>
<vn-check vn-one label="Cliente Activo" field="active" entity="fiscal"></vn-check>
<vn-check vn-one label="Facturar" field="invoice" entity="fiscal"></vn-check>
<vn-check vn-one label="Factura Impresa" field="mailInvoice" entity="fiscal"></vn-check>
</vn-horizontal>
<vn-horizontal>
<vn-textfield vn-two label="Domicilio Fiscal" name="consignee" model="fiscal.model"></vn-textfield>
<vn-textfield vn-one label="Municipio" name="city" model="fiscal.model"></vn-textfield>
<vn-textfield vn-two label="Domicilio Fiscal" field="consignee" entity="fiscal"></vn-textfield>
<vn-textfield vn-one label="Municipio" field="city" entity="fiscal"></vn-textfield>
</vn-horizontal>
<vn-horizontal>
<vn-textfield vn-one label="Codigo Postal" name="postcode" model="fiscal.model"></vn-textfield>
<vn-combo vn-one label="Provincia" name="province" model="fiscal.model"></vn-combo>
<vn-combo vn-one label="Pais" name="country" model="fiscal.model">
<vn-textfield vn-one label="Codigo Postal" field="postcode" entity="fiscal"></vn-textfield>
<vn-combo vn-one label="Provincia" field="province" entity="fiscal"></vn-combo>
<vn-combo vn-one label="Pais" field="country" entity="fiscal">
<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="phone" model="fiscal.model"></vn-textfield>
<vn-textfield vn-one label="Telefono Movil" name="mobile" model="fiscal.model"></vn-textfield>
<vn-textfield vn-one label="Email" name="email" model="fiscal.model"></vn-textfield>
<vn-textfield vn-one label="Telefono Fijo" field="phone" entity="fiscal"></vn-textfield>
<vn-textfield vn-one label="Telefono Movil" field="mobile" entity="fiscal"></vn-textfield>
<vn-textfield vn-one label="Email" field="email" entity="fiscal"></vn-textfield>
</vn-horizontal>
<hr class="border-dashed-top"/>
<h5 vn-one style="margin-top: 0;">Información de facturación</h5>
<vn-horizontal>
<vn-combo vn-two label="Forma de Pago" name="payMethod" model="fiscal.model"></vn-combo>
<vn-textfield vn-one label="Vencimiento" name="expiration" model="fiscal.model"></vn-textfield>
<vn-check vn-three label="Recargo de equivalencia" name="er" model="fiscal.model"></vn-check>
<vn-combo vn-two label="Forma de Pago" field="payMethod" entity="fiscal"></vn-combo>
<vn-textfield vn-one label="Vencimiento" field="expiration" entity="fiscal"></vn-textfield>
<vn-check vn-three label="Recargo de equivalencia" field="er" entity="fiscal"></vn-check>
</vn-horizontal>
<vn-horizontal>
<vn-textfield vn-one label="Credito" name="credit" model="fiscal.model"></vn-textfield>
<vn-textfield vn-one label="CyC" name="cyc" model="fiscal.model"></vn-textfield>
<vn-textfield vn-one label="IAE" name="iae" model="fiscal.model"></vn-textfield>
<vn-textfield vn-three label="iban" name="iban" model="fiscal.model"></vn-textfield>
<vn-textfield vn-one label="Credito" field="credit" entity="fiscal"></vn-textfield>
<vn-textfield vn-one label="CyC" field="cyc" entity="fiscal"></vn-textfield>
<vn-textfield vn-one label="IAE" field="iae" entity="fiscal"></vn-textfield>
<vn-textfield vn-three label="iban" field="iban" entity="fiscal"></vn-textfield>
</vn-horizontal>
<hr class="border-dashed-top"/>
<h5 style="margin-top: 0;">Documentación</h5>
<vn-horizontal>
<vn-check vn-two label="Recibido core vnh" name="coreVnh" model="fiscal.model"></vn-check>
<vn-check vn-two label="Recibido core vnl" name="coreVnl" model="fiscal.model"></vn-check>
<vn-check vn-two label="Recibido B2B vnl" name="sepaVnl" model="fiscal.model"></vn-check>
<vn-check vn-two label="Recibido core vnh" field="coreVnh" entity="fiscal"></vn-check>
<vn-check vn-two label="Recibido core vnl" field="coreVnl" entity="fiscal"></vn-check>
<vn-check vn-two label="Recibido B2B vnl" field="sepaVnl" entity="fiscal"></vn-check>
</vn-horizontal>
<vn-empty class="margin-large-top">
<vn-submit text="Guardar"></vn-submit>
<vn-submit label="Guardar"></vn-submit>
</vn-empty>
</form>

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

@ -9,8 +9,8 @@
<vn-horizontal>
<vn-three></vn-three>
<vn-vertical>
<vn-item-client ng-repeat="client in search.clients" client = "client" vn-six></vn-item-client>
<vn-item-client ng-repeat="client in search.clients" client="client" vn-six></vn-item-client>
</vn-vertical>
<vn-three></vn-three>
</vn-horizontal>
</vn-horizontal>
</vn-vertical>

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

@ -6,7 +6,7 @@
<div>{{itemClient.client.phone}}, {{itemClient.client.contact}}</div>
</vn-auto>
<vn-empty>
<a ui-sref="clientCard.basicData({ id: {{itemClient.client.id}} })"><vn-icon-button icon="edit" ></vn-icon-button></a>
<a ui-sref="clientCard.basicData({ id: {{itemClient.client.id}} })"><vn-icon-button icon="edit"></vn-icon-button></a>
</vn-empty>
</vn-horizontal>
</vn-auto>

4
@salix/crud/src/client/notes/index.html
View File

@ -1,5 +1,5 @@
<form ng-submit="note.submit()" pad-large>
<vn-title>Notas</vn-title>
<vn-textfield label="Notas" class="padd-medium-top" name="notes" model="note.model"></vn-textfield>
<vn-submit text="Guardar"></vn-submit>
<vn-textfield label="Notas" class="padd-medium-top" field="notes" entity="note"></vn-textfield>
<vn-submit label="Guardar"></vn-submit>
</form>

16
@salix/crud/src/client/search-panel/search-panel.html
View File

@ -1,22 +1,22 @@
<div class="mdl-menu mdl-js-menu mdl-menu--bottom-left user-menu" pad-medium for="searchbar" style="width:600px">
<form ng-submit="search.submit()" pad-large>
<vn-horizontal>
<vn-textfield vn-one label="Id Cliente" name="id" model="search.model"></vn-textfield>
<vn-textfield vn-one label="NIF/CIF" name="fi" model="search.model"></vn-textfield>
<vn-textfield vn-one label="Id Cliente" field="id" entity="search"></vn-textfield>
<vn-textfield vn-one label="NIF/CIF" field="fi" entity="search"></vn-textfield>
</vn-horizontal>
<vn-horizontal>
<vn-textfield vn-one label="Alias" name="alias" model="search.model"></vn-textfield>
<vn-textfield vn-one label="Alias" field="alias" entity="search"></vn-textfield>
</vn-horizontal>
<vn-horizontal>
<vn-textfield vn-two label="Razon Social" name="name" model="search.model"></vn-textfield>
<vn-textfield vn-two label="Razon Social" field="name" entity="search"></vn-textfield>
</vn-horizontal>
<vn-horizontal>
<vn-textfield vn-one label="Población" name="city" model="search.model"></vn-textfield>
<vn-textfield vn-one label="Código Postal" name="postcode" model="search.model"></vn-textfield>
<vn-textfield vn-one label="Población" field="city" entity="search"></vn-textfield>
<vn-textfield vn-one label="Código Postal" field="postcode" entity="search"></vn-textfield>
</vn-horizontal>
<vn-horizontal>
<vn-textfield vn-one label="Email" name="email" model="search.model"></vn-textfield>
<vn-textfield vn-one label="Teléfono" name="phone" model="search.model"></vn-textfield>
<vn-textfield vn-one label="Email" field="email" entity="search"></vn-textfield>
<vn-textfield vn-one label="Teléfono" field="phone" entity="search"></vn-textfield>
</vn-horizontal>
<vn-submit label="">
<i class="material-icons">add_shopping_cart</i>Add to shopping cart

6
@salix/crud/src/client/web-access/index.html
View File

@ -1,6 +1,6 @@
<form ng-submit="web.submit()" pad-large>
<vn-title>Acceso Web</vn-title>
<vn-check label="Acceso web activo" name="active" model="web.model"></vn-check>
<vn-textfield label="Usuario" class="padd-medium-top" name="user" model="web.model"></vn-textfield>
<vn-submit text="Guardar"></vn-submit>
<vn-check label="Acceso web activo" field="active" entity="web"></vn-check>
<vn-textfield label="Usuario" class="padd-medium-top" field="user" entity="web"></vn-textfield>
<vn-submit label="Guardar"></vn-submit>
</form>

6
@salix/login/src/login/login.html
View File

@ -3,9 +3,9 @@
<div class="box">
<img src="./logo.svg"/>
<form name="form" ng-submit="login.submit()">
<vn-textfield label="User" name="email" model="login.model"></vn-textfield>
<vn-password label="Password" name="password" model="login.model"></vn-password>
<vn-check label="Do not close session" name="remember" model="login.model"></vn-check>
<vn-textfield label="User" entity="login" field="email"></vn-textfield>
<vn-password label="Password" entity="login" field="password"></vn-password>
<vn-check label="Do not close session" entity="login" field="remember"></vn-check>
<div class="footer">
<vn-submit label="Enter"></vn-submit>
<vn-spinner id="spinner"></vn-spinner>

40
docker-compose.yml
View File

@ -1,22 +1,22 @@
version: '2'
services:
account:
build:
context: ./@salix-services/account
ports:
- "3000:3000"
client:
build:
context: ./@salix-services/client
ports:
- "3002:3002"
nginx:
build:
context: ./@salix
ports:
- "8080:8080"
salix:
build:
context: ./@salix-services/salix
ports:
- "3001:3001"
salix:
build:
context: ./services/salix
ports:
- "3001:3001"
account:
build:
context: ./services/account
ports:
- "3000:3000"
nginx:
build:
context: ./@salix
ports:
- "8080:8080"
client:
build:
context: ./services/client
ports:
- "3002:3002"