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

file.relative solucionado

This commit is contained in:
Juan Ferrer Toribio 2016-12-15 11:26:15 +01:00
parent 441537bffb
commit 0e9628436e
6 changed files with 36 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -6,8 +6,7 @@ export class InputAttrsNormalizer {
$get(){
return {
normalize: function(attrs) {
/*
if (!attrs.entity)
/* if (!attrs.entity)
throw new Error(`Attribute 'entity' not defined on input`);
if (!attrs.field)
throw new Error(`Attribute 'field' not defined on input`);

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

@ -1,20 +1,20 @@
<form ng-submit="basicData.submit()" pad-large>
<vn-title>Datos básicos</vn-title>
<vn-horizontal>
<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-textfield vn-one label="Alias" field="alias" entity="basicData"></vn-textfield>
<vn-textfield vn-one label="NIF/CIF" field="fi" entity="basicData"></vn-textfield>
</vn-horizontal>
<vn-horizontal>
<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-textfield autofocus vn-one label="Razón social" field="socialName" entity="basicData"></vn-textfield>
<vn-date-picker vn-one label="Fecha alta" field="dischargeDate" entity="basicData"></vn-date-picker>
</vn-horizontal>
<vn-horizontal>
<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-textfield vn-one label="Contacto" field="contact" entity="basicData"></vn-textfield>
<vn-textfield vn-one label="Teléfono" field="telefono" entity="basicData"></vn-textfield>
</vn-horizontal>
<vn-horizontal>
<vn-textfield vn-one label="Calidad" field="quality" entity="client"></vn-textfield>
<vn-combo vn-one label="Comercial" field="salesPerson" entity="client">
<vn-textfield vn-one label="Calidad" field="quality" entity="basicData"></vn-textfield>
<vn-combo vn-one label="Comercial" field="salesPerson" entity="basicData">
<option value="1">Comercial 1</option>
<option value="2">Comercial 2</option>
</vn-combo>

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

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

6
@salix/crud/src/client/card/card.js
View File

@ -8,10 +8,7 @@ export const COMPONENT = {
template: template,
controllerAs: 'card',
controller: function($http, $stateParams) {
let clientRoutes = routes['src/client/routes.js'].routes;
this.items = [];
this.client = null;
$http.get(`/client/api/Clients/${$stateParams.id}`).then(
(json) => {
this.client = json.data;
@ -24,7 +21,8 @@ export const COMPONENT = {
(json) => console.error (json.data.error.message)
);
clientRoutes.forEach ((i) => {
this.items = [];
routes['client'].routes.forEach ((i) => {
if (i.description)
this.items.push ({
description: i.description,

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

@ -2,46 +2,46 @@
<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" field="active" entity="fiscal"></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-check vn-one label="Factura impresa" field="mailInvoice" entity="fiscal"></vn-check>
</vn-horizontal>
<vn-horizontal>
<vn-textfield vn-two label="Domicilio Fiscal" field="consignee" entity="fiscal"></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" field="postcode" entity="fiscal"></vn-textfield>
<vn-textfield vn-one label="Código 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">
<vn-combo vn-one label="País" 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" 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-textfield vn-one label="Teléfono Fijo" field="phone" entity="fiscal"></vn-textfield>
<vn-textfield vn-one label="Teléfono Movil" field="mobile" entity="fiscal"></vn-textfield>
<vn-textfield vn-one label="Correo electrónico" 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" field="payMethod" entity="fiscal"></vn-combo>
<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" field="credit" entity="fiscal"></vn-textfield>
<vn-textfield vn-one label="Crédito" 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-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" 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-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 label="Guardar"></vn-submit>

13
@salix/gulpfile.js
View File

@ -8,7 +8,7 @@ var babel = require('gulp-babel');
var fs = require('fs');
var del = require('del');
var webpack = require('webpack');
var WebpackDevServer = require("webpack-dev-server");
var WebpackDevServer = require('webpack-dev-server');
var webpackConfig = require('./webpack.config.js');
// Clean
@ -100,11 +100,18 @@ gulp.task('webpack-dev-server', ['spliting'], function() {
var routeFiles = './crud/**/routes.js';
gulp.task('routes', function() {
var fileTpl = '\n"<%=file.relative%>": <%=contents%>';
var fileTpl = '\n"<%=dirname%>": <%=contents%>';
var globalTpl = 'var routes = {<%=contents%>\n}';
var regex = new RegExp('^src/(.*)/routes\.js$');
function cb(file) {
var relative = file.relative.replace('\\', '/');
var dirname = relative.match(regex)[1];
return {dirname: dirname};
}
return gulp.src(routeFiles)
.pipe(wrap(fileTpl))
.pipe(wrap(fileTpl, cb))
.pipe(concat('salix.routes.js', {newLine: ','}))
.pipe(wrap(globalTpl))
.pipe(babel({presets: ['es2015']}))