verdnatura/salix
verdnatura
/
salix
3
5
Fork 0
Code Issues Pull Requests 64 Releases Wiki Activity

Merge

This commit is contained in:
Juan Ferrer Toribio 2016-12-14 09:30:56 +01:00
parent ae70f9b509
commit bd0e68d98b
12 changed files with 55 additions and 58 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

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

@ -6,11 +6,12 @@ export class InputAttrsNormalizer {
$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)

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

@ -1,27 +1,27 @@
<form ng-submit="basicData.submit()" pad-large>
<vn-title>Datos básicos</vn-title>
<vn-horizontal>
<vn-textfield vn-one label="Alias" name="alias" model="basicData.client"></vn-textfield>
<vn-textfield vn-one label="NIF/CIF" name="fi" model="basicData.client"></vn-textfield>
<vn-textfield vn-one label="Alias" field="alias" entity="client"></vn-textfield>
<vn-textfield vn-one label="NIF/CIF" field="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="Contacto" field="contact" entity="client"></vn-textfield>
<vn-textfield vn-one label="Teléfono" field="telefono" entity="client"></vn-textfield>
</vn-horizontal>
<vn-horizontal>
<vn-textfield vn-one label="Calidad" name="quality" model="basicData.client"></vn-textfield>
<vn-combo vn-one label="Comercial" name="salesPerson" model="basicData.client">
<vn-textfield vn-one label="Calidad" field="quality" entity="client"></vn-textfield>
<vn-combo vn-one label="Comercial" field="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>

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/webpack.config.js
View File

@ -49,16 +49,16 @@ var config = {
]
},
plugins: [],
//devtool: 'source-map'
devtool: 'source-map'
};
//if (!devMode) {
if (!devMode) {
config.plugins.push (
new webpack.optimize.UglifyJsPlugin({
minimize: true,
compress: { warnings: false }
})
);
//}
}
module.exports = config;