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

modificaciones para hacer el pull

This commit is contained in:
nelo 2016-12-15 08:31:15 +01:00
parent ea70fecf35
commit e9d222d2b1
4 changed files with 22 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1,7 +1,7 @@
<form ng-submit="basicData.submit()" pad-large> <form ng-submit="basicData.submit()" pad-large>
<vn-title>Datos básicos</vn-title> <vn-title>Datos básicos</vn-title>
<vn-horizontal> <vn-horizontal>
<vn-textfield vn-one label="Alias" name="alias" model="basicData.client"></vn-textfield> <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="NIF/CIF" name="fi" model="basicData.client"></vn-textfield>
</vn-horizontal> </vn-horizontal>
<vn-horizontal> <vn-horizontal>
@ -9,11 +9,12 @@
<vn-date-picker vn-one label="Fecha alta" name="dischargeDate" model="basicData.client"></vn-date-picker> <vn-date-picker vn-one label="Fecha alta" name="dischargeDate" model="basicData.client"></vn-date-picker>
</vn-horizontal> </vn-horizontal>
<vn-horizontal> <vn-horizontal>
<vn-textfield vn-one label="Contacto" name="contact" model="basicData.client"></vn-textfield> <!--<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="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-horizontal> </vn-horizontal>
<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-combo vn-one label="Comercial" name="salesPerson" model="basicData.client">
<option value="1">Comercial 1</option> <option value="1">Comercial 1</option>
<option value="2">Comercial 2</option> <option value="2">Comercial 2</option>

6
@salix/webpack.config.js
View File

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

4
db.json
View File

@ -12,8 +12,8 @@
"NUf7o684TmteojFX9KmPOpaDLthjP5Def4wuy83Yjv31i43HHiWgV3FyBp6pX8Ue": "{\"id\":\"NUf7o684TmteojFX9KmPOpaDLthjP5Def4wuy83Yjv31i43HHiWgV3FyBp6pX8Ue\",\"ttl\":1209600,\"created\":\"2016-11-21T11:06:11.113Z\",\"userId\":1}" "NUf7o684TmteojFX9KmPOpaDLthjP5Def4wuy83Yjv31i43HHiWgV3FyBp6pX8Ue": "{\"id\":\"NUf7o684TmteojFX9KmPOpaDLthjP5Def4wuy83Yjv31i43HHiWgV3FyBp6pX8Ue\",\"ttl\":1209600,\"created\":\"2016-11-21T11:06:11.113Z\",\"userId\":1}"
}, },
"Client": { "Client": {
"1": "{\"name\":\"Cliente1 SL\",\"salesPerson\":1,\"fi\":\"123456789\",\"alias\":\"Cliente1\",\"dischargeDate\":\"29/11/2016\",\"contact\":\"a@a.com\",\"phone\":\"123456789\",\"quality\":\"1\",\"id\":1}", "1": "{\"name\":\"Cliente1 SL\",\"salesPerson\":1,\"fi\":\"123456789\",\"registerDate\":\"29/11/2016\",\"contact\":\"a@a.com\",\"phone\":\"123456789\",\"quality\":\"1\",\"id\":1}",
"2": "{\"name\":\"Cliente2 SL\",\"salesPerson\":1,\"fi\":\"123456788\",\"alias\":\"Cliente2\",\"contact\":\"b@b.com\",\"phone\":\"222222222\",\"quality\":\"1\",\"id\":2}" "2": "{\"name\":\"Cliente2 SL\",\"salesPerson\":1,\"fi\":\"123456788\",\"contact\":\"b@b.com\",\"phone\":\"222222222\",\"quality\":\"1\",\"id\":2}"
} }
} }
} }

24
services/client/common/models/Client.json
View File

@ -11,21 +11,14 @@
"type": "string", "type": "string",
"required": "true" "required": "true"
}, },
"salesPerson": {
"type": "Number",
"required": "true"
},
"fi": { "fi": {
"type": "string", "type": "string",
"description": "Fiscal indetifier" "description": "Fiscal indetifier"
}, },
"alias": {
"type": "string"
},
"socialName": { "socialName": {
"type": "string" "type": "string"
}, },
"dischargeDate": { "registerDate": {
"type": "string" "type": "string"
}, },
"contact": { "contact": {
@ -40,12 +33,11 @@
"fax": { "fax": {
"type": "string" "type": "string"
}, },
"quality": {
"type": "string"
},
"active": { "active": {
"type": "boolean" "type": "boolean"
}, }
/*
"credit": { "credit": {
"type": "Number" "type": "Number"
}, },
@ -70,5 +62,13 @@
"type": "boolean", "type": "boolean",
"description": "Send invoices by email" "description": "Send invoices by email"
} }
"salesPerson": {
"type": "Number",
"required": "true"
},*/
} }
} }