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

Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev

This commit is contained in:
Javi Gallego 2019-01-28 12:07:18 +01:00
parent 086b773423 cb85610c5d
commit 5954cc7034
16 changed files with 54 additions and 257 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
back/model-config.json
View File

@ -43,5 +43,11 @@
}, },
"PersonMedia": { "PersonMedia": {
"dataSource": "vn" "dataSource": "vn"
},
"PersonDepartment": {
"dataSource": "vn"
} }
} }

31
back/models/person-department.json Normal file
View File

@ -0,0 +1,31 @@
{
"name": "PersonDepartment",
"base": "VnModel",
"options": {
"mysql": {
"table": "personDepartment"
}
},
"properties": {
"name": {
"type": "String"
},
"firstName": {
"type": "String"
},
"workerFk": {
"id": true,
"type": "Number"
},
"department": {
"type": "Number"
}
},
"relations": {
"worker": {
"type": "belongsTo",
"model": "Worker",
"foreignKey": "workerFk"
}
}
}

2
front/salix/components/login/style.scss
View File

@ -55,7 +55,7 @@ vn-login {
position: absolute; position: absolute;
width: 0; width: 0;
top: .2em; top: .2em;
right: -.4em; right: -.5em;
overflow: visible; overflow: visible;
} }
} }

13
front/salix/components/main-menu/main-menu.html
View File

@ -5,14 +5,6 @@
class="unselectable"> class="unselectable">
{{currentUserName}} {{currentUserName}}
</div> </div>
<a href="version-notes.html"
target="version-notes"
translate-attr="{title: 'What is new'}">
<vn-icon
id="version-notes"
icon="info">
</vn-icon>
</a>
<vn-icon <vn-icon
id="lang" id="lang"
icon="language" icon="language"
@ -43,11 +35,6 @@
</li> </li>
</ul> </ul>
</vn-menu> </vn-menu>
<a id="home"
ui-sref="home"
translate-attr="{title: 'Return to home'}">
<vn-icon icon="home"></vn-icon>
</a>
<vn-icon <vn-icon
id="logout" id="logout"
icon="exit_to_app" icon="exit_to_app"

2
front/salix/manifest.json
View File

@ -8,5 +8,5 @@
], ],
"start_url": "index.html", "start_url": "index.html",
"display": "standalone", "display": "standalone",
"theme_color": "#f7931e" "theme_color": "#3d3d3d"
} }

4
gulpfile.js
View File

@ -18,9 +18,11 @@ let modulesDir = './modules';
let buildDir = 'dist'; let buildDir = 'dist';
let backSources = [ let backSources = [
'!node_modules',
'loopback', 'loopback',
'modules/*/back/**', 'modules/*/back/**',
'back' 'back',
'print'
]; ];
// Development // Development

2
modules/client/front/billing-data/index.html
View File

@ -39,7 +39,7 @@
fields="['name']" fields="['name']"
initial-data="$ctrl.client.bankEntityFk" initial-data="$ctrl.client.bankEntityFk"
on-change="$ctrl.autofillBic()" on-change="$ctrl.autofillBic()"
search-function="{or: [{bic: {regexp: $search}}, {name: {regexp: $search}}]}" search-function="{or: [{bic: {like: $search +'%'}}, {name: {like: '%'+ $search +'%'}}]}"
value-field="id" value-field="id"
show-field="bic" show-field="bic"
vn-acl="salesAssistant" vn-acl="salesAssistant"

4
modules/item/front/create/index.html
View File

@ -23,7 +23,7 @@
fields="['code', 'name']" fields="['code', 'name']"
value-field="id" value-field="id"
field="$ctrl.item.typeFk" field="$ctrl.item.typeFk"
search-function="{or: [{code: {like: '%'+ $search +'%'}}, {name: {like: '%'+ $search +'%'}}]}"> search-function="{or: [{code: {like: $search +'%'}}, {name: {like: '%'+ $search +'%'}}]}">
<tpl-item style="display: flex;"> <tpl-item style="display: flex;">
<div style="width: 3em; padding-right: 1em;">{{::code}}</div> <div style="width: 3em; padding-right: 1em;">{{::code}}</div>
<div>{{::name}}</div> <div>{{::name}}</div>
@ -35,7 +35,7 @@
show-field="description" show-field="description"
value-field="id" value-field="id"
field="$ctrl.item.intrastatFk" field="$ctrl.item.intrastatFk"
search-function="{or: [{id: {like: '%'+ $search +'%'}}, {description: {like: '%'+ $search +'%'}}]}"> search-function="{or: [{id: {like: $search +'%'}}, {description: {like: '%'+ $search +'%'}}]}">
<tpl-item style="display: flex;"> <tpl-item style="display: flex;">
<div style="width: 6em; text-align: right; padding-right: 1em;">{{::id}}</div> <div style="width: 6em; text-align: right; padding-right: 1em;">{{::id}}</div>
<div>{{::description}}</div> <div>{{::description}}</div>

2
modules/item/front/data/index.html
View File

@ -34,7 +34,7 @@
show-field="description" show-field="description"
value-field="id" value-field="id"
field="$ctrl.item.intrastatFk" field="$ctrl.item.intrastatFk"
search-function="{or: [{id: {regexp: $search}}, {description: {regexp: $search}}]}" search-function="{or: [{id: {like: $search +'%'}}, {description: {like: '%'+ $search +'%'}}]}"
initial-data="$ctrl.item.intrastat"> initial-data="$ctrl.item.intrastat">
<tpl-item style="display: flex;"> <tpl-item style="display: flex;">
<div style="width: 6em; text-align: right; padding-right: 1em;">{{::id}}</div> <div style="width: 6em; text-align: right; padding-right: 1em;">{{::id}}</div>

2
modules/item/front/tags/index.html
View File

@ -47,7 +47,7 @@
ng-show="tag.selection.isFree === false" ng-show="tag.selection.isFree === false"
vn-three vn-three
url="{{$ctrl.sourceTables[itemTag.id].url}}" url="{{$ctrl.sourceTables[itemTag.id].url}}"
search-function="{name: {regexp: $search}}" search-function="{name: {like: '%'+ $search +'%'}}"
label="Value" label="Value"
field="itemTag.value" field="itemTag.value"
show-field="{{$ctrl.sourceTables[itemTag.id].field}}" show-field="{{$ctrl.sourceTables[itemTag.id].field}}"

2
modules/order/front/basic-data/index.html
View File

@ -12,7 +12,7 @@
vn-one vn-one
url="/api/Clients" url="/api/Clients"
label="Client" label="Client"
search-function="{or: [{id: {regexp: $search}}, {name: {regexp: $search}}]}" search-function="{or: [{id: $search}, {name: {regexp: $search}}]}"
show-field="name" show-field="name"
value-field="id" value-field="id"
field="$ctrl.order.clientFk" field="$ctrl.order.clientFk"

2
modules/order/front/create/card.html
View File

@ -3,7 +3,7 @@
vn-id="client" vn-id="client"
url="/api/Clients" url="/api/Clients"
label="Client" label="Client"
search-function="{or: [{id: {regexp: $search}}, {name: {regexp: $search}}]}" search-function="{or: [{id: $search}, {name: {like: '%'+ $search +'%'}}]}"
show-field="name" show-field="name"
value-field="id" value-field="id"
field="$ctrl.clientFk" field="$ctrl.clientFk"

2
modules/ticket/front/create/card.html
View File

@ -3,7 +3,7 @@
vn-id="client" vn-id="client"
url="/api/Clients" url="/api/Clients"
label="Client" label="Client"
search-function="{or: [{id: {regexp: $search}}, {name: {regexp: $search}}]}" search-function="{or: [{id: $search}, {name: {like: '%'+ $search +'%'}}]}"
show-field="name" show-field="name"
value-field="id" value-field="id"
field="$ctrl.clientFk" field="$ctrl.clientFk"

2
modules/ticket/front/package/index.html
View File

@ -21,7 +21,7 @@
label="Package" label="Package"
show-field="name" show-field="name"
value-field="packagingFk" value-field="packagingFk"
search-function="{or: [{itemFk: {like: '%'+ $search +'%'}}, {'name': {like: '%'+ $search +'%'}}]}" search-function="{or: [{itemFk: $search}, {'name': {like: '%'+ $search +'%'}}]}"
field="package.packagingFk"> field="package.packagingFk">
<tpl-item>{{itemFk}} : {{name}}</tpl-item> <tpl-item>{{itemFk}} : {{name}}</tpl-item>
</vn-autocomplete> </vn-autocomplete>

2
services/db/install/changes/1.2-CHECK/19-personDepartment.sql
View File

@ -5,7 +5,7 @@ CREATE
SQL SECURITY DEFINER SQL SECURITY DEFINER
VIEW `vn`.`personDepartment` AS VIEW `vn`.`personDepartment` AS
SELECT SELECT
`p`.`id_trabajador` AS `id_trabajador`, `p`.`id_trabajador` AS `workerFk`,
`p`.`name` AS `name`, `p`.`name` AS `name`,
`p`.`firstname` AS `firstname`, `p`.`firstname` AS `firstname`,
`d`.`name` AS `department` `d`.`name` AS `department`

229
version-notes.html
View File

@ -1,229 +0,0 @@
<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
<html>
<head>
<meta http-equiv="content-type" content="text/html; charset=windows-1252"/>
<title></title>
<meta name="generator" content="LibreOffice 6.0.1.1 (Windows)"/>
<meta name="created" content="00:00:00"/>
<meta name="changed" content="2018-04-18T12:46:42.134000000"/>
<style type="text/css">
body,div,table,thead,tbody,tfoot,tr,th,td,p { font-family:"Liberation Sans"; font-size:x-small }
a.comment-indicator:hover + comment { background:#ffd; position:absolute; display:block; border:1px solid black; padding:0.5em; }
a.comment-indicator { background:red; display:inline-block; border:1px solid black; width:0.5em; height:0.5em; }
comment { display:none; }
</style>
</head>
<body>
<table cellspacing="0" border="0">
<colgroup width="33"></colgroup>
<colgroup width="386"></colgroup>
<tr>
<td height="17" align="left">#</td>
<td align="left">Asunto</td>
</tr>
<tr>
<td height="17" align="right" sdval="290" sdnum="3082;">290</td>
<td align="left">Componentes de ticket muestra todos los componentes existentes.</td>
</tr>
<tr>
<td height="17" align="right" sdval="268" sdnum="3082;">268</td>
<td align="left">A&ntilde;adir componente de paginaci&oacute;n a rutas con filtros</td>
</tr>
<tr>
<td height="17" align="right" sdval="271" sdnum="3082;">271</td>
<td align="left">Atajo de teclado para botones +</td>
</tr>
<tr>
<td height="17" align="right" sdval="226" sdnum="3082;">226</td>
<td align="left">Traduccion de error ticket tracking + e2e</td>
</tr>
<tr>
<td height="17" align="right" sdval="269" sdnum="3082;">269</td>
<td align="left">Test unitario de createWithInsurance.js</td>
</tr>
<tr>
<td height="17" align="right" sdval="217" sdnum="3082;">217</td>
<td align="left">Seccion Configuracion paso 3</td>
</tr>
<tr>
<td height="17" align="right" sdval="289" sdnum="3082;">289</td>
<td align="left">Cuando se modifica el cr&eacute;dito mostrar alerta</td>
</tr>
<tr>
<td height="17" align="right" sdval="252" sdnum="3082;">252</td>
<td align="left">No modifica visualmente el campo Facturar por consignatario al modificar el Recargo en cualquiera de sus consignatarios</td>
</tr>
<tr>
<td height="17" align="right" sdval="284" sdnum="3082;">284</td>
<td align="left">Seccion ticket.lineas icono papelera para eliminar lineas</td>
</tr>
<tr>
<td height="17" align="right" sdval="253" sdnum="3082;">253</td>
<td align="left">Actualizar los estilos para que concuerden con la paleta de colores de Vernatura</td>
</tr>
<tr>
<td height="17" align="right" sdval="283" sdnum="3082;">283</td>
<td align="left">Modificar encabezado el client.summary</td>
</tr>
<tr>
<td height="17" align="right" sdval="277" sdnum="3082;">277</td>
<td align="left">Hacer que el descriptor de ticket se actualice cuando se modifica el estado</td>
</tr>
<tr>
<td height="17" align="right" sdval="278" sdnum="3082;">278</td>
<td align="left">Refactor descriptor item</td>
</tr>
<tr>
<td height="17" align="right" sdval="160" sdnum="3082;">160</td>
<td align="left">Limpiar tablas/vistas obsoletas del esquema salix</td>
</tr>
<tr>
<td height="17" align="right" sdval="285" sdnum="3082;">285</td>
<td align="left">Optimizar tarea de tocker y a&ntilde;adir funciones compiladas</td>
</tr>
<tr>
<td height="17" align="right" sdval="231" sdnum="3082;">231</td>
<td align="left">Importar de vn2008 a vn toda la funcionalidad necesaria para mostrar precio</td>
</tr>
<tr>
<td height="17" align="right" sdval="287" sdnum="3082;">287</td>
<td align="left">Si en client.fiscaldata el nif empieza por B</td>
</tr>
<tr>
<td height="17" align="right" sdval="265" sdnum="3082;">265</td>
<td align="left">A&ntilde;adir boton ok y estado</td>
</tr>
<tr>
<td height="17" align="right" sdval="260" sdnum="3082;">260</td>
<td align="left">Refactorizaci&oacute;n de rutas en back-end</td>
</tr>
<tr>
<td height="17" align="right" sdval="267" sdnum="3082;">267</td>
<td align="left">Preparar esqueleto para nueva entidad order</td>
</tr>
<tr>
<td height="17" align="right" sdval="292" sdnum="3082;">292</td>
<td align="left">En el descriptor de item.list no aparece toda la informacion que deberia</td>
</tr>
<tr>
<td height="17" align="right" sdval="270" sdnum="3082;">270</td>
<td align="left">Seccion Configuracion paso 2</td>
</tr>
<tr>
<td height="17" align="right" sdval="264" sdnum="3082;">264</td>
<td align="left">sumario ticket no respeta margenes</td>
</tr>
<tr>
<td height="17" align="right" sdval="281" sdnum="3082;">281</td>
<td align="left">ticket.lineas Mostrar boton editar </td>
</tr>
<tr>
<td height="17" align="right" sdval="266" sdnum="3082;">266</td>
<td align="left">Al hacer click en el ticket.lineas campo id articulo mostrar el descriptor de item</td>
</tr>
<tr>
<td height="17" align="right" sdval="166" sdnum="3082;">166</td>
<td align="left">refactorizar buscador avanzado de articulos</td>
</tr>
<tr>
<td height="17" align="right" sdval="171" sdnum="3082;">171</td>
<td align="left">A&ntilde;adir revision</td>
</tr>
<tr>
<td height="17" align="right" sdval="211" sdnum="3082;">211</td>
<td align="left">Forzar a ciertos tags</td>
</tr>
<tr>
<td height="17" align="right" sdval="213" sdnum="3082;">213</td>
<td align="left">Sumario Tickets</td>
</tr>
<tr>
<td height="17" align="right" sdval="216" sdnum="3082;">216</td>
<td align="left">Seccion Configuracion paso 2</td>
</tr>
<tr>
<td height="17" align="right" sdval="124" sdnum="3082;">124</td>
<td align="left">address observations validations</td>
</tr>
<tr>
<td height="17" align="right" sdval="199" sdnum="3082;">199</td>
<td align="left">A&ntilde;adir manejador de cliente que no existe</td>
</tr>
<tr>
<td height="17" align="right" sdval="138" sdnum="3082;">138</td>
<td align="left">Refactorizaci&oacute;n Popover</td>
</tr>
<tr>
<td height="17" align="right" sdval="172" sdnum="3082;">172</td>
<td align="left">E2E revision</td>
</tr>
<tr>
<td height="17" align="right" sdval="175" sdnum="3082;">175</td>
<td align="left">E2E embalajes</td>
</tr>
<tr>
<td height="17" align="right" sdval="177" sdnum="3082;">177</td>
<td align="left">Listar modelo saleChecked</td>
</tr>
<tr>
<td height="17" align="right" sdval="182" sdnum="3082;">182</td>
<td align="left">Listar volumen del ticket</td>
</tr>
<tr>
<td height="17" align="right" sdval="196" sdnum="3082;">196</td>
<td align="left">E2E listar lineas ticket</td>
</tr>
<tr>
<td height="17" align="right" sdval="198" sdnum="3082;">198</td>
<td align="left">refactorizar tag con nuevo + - </td>
</tr>
<tr>
<td height="17" align="right" sdval="201" sdnum="3082;">201</td>
<td align="left">Listar Mana del cliente</td>
</tr>
<tr>
<td height="17" align="right" sdval="202" sdnum="3082;">202</td>
<td align="left">A&ntilde;adir a Sumario Cliente una seccion financia</td>
</tr>
<tr>
<td height="17" align="right" sdval="209" sdnum="3082;">209</td>
<td align="left">Contratos de credito</td>
</tr>
<tr>
<td height="17" align="right" sdval="210" sdnum="3082;">210</td>
<td align="left">item tags</td>
</tr>
<tr>
<td height="17" align="right" sdval="212" sdnum="3082;">212</td>
<td align="left">Mostrar solo las agencias con el campo isActive(tpv) en TRUE</td>
</tr>
<tr>
<td height="17" align="right" sdval="215" sdnum="3082;">215</td>
<td align="left">Seccion Configuracion paso 1</td>
</tr>
<tr>
<td height="17" align="right" sdval="220" sdnum="3082;">220</td>
<td align="left">Al crear un consignatario mirar RE</td>
</tr>
<tr>
<td height="17" align="right" sdval="222" sdnum="3082;">222</td>
<td align="left">nuevo dni espa&ntilde;a</td>
</tr>
<tr>
<td height="17" align="right" sdval="223" sdnum="3082;">223</td>
<td align="left">Manejador de errores global</td>
</tr>
<tr>
<td height="17" align="right" sdval="227" sdnum="3082;">227</td>
<td align="left">traducciones pendientes</td>
</tr>
</table>
<!-- ************************************************************************** -->
</body>
</html>