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

Merge pull request 'fix bugs in ticket weekly' (#328) from 2338-ticket_weekly into dev
gitea/salix/pipeline/head There was a failure building this commit Details 

Reviewed-on: #328
Reviewed-by: Joan Sanchez <joan@verdnatura.es>
This commit is contained in:
Joan Sanchez 2020-07-09 06:14:21 +00:00
parent b00f6e6d04 c04d9b0854
commit 1fa2bd1e1d
3 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
modules/ticket/back/methods/ticket-weekly/filter.js
View File

@ -51,7 +51,7 @@ module.exports = Self => {
stmt = new ParameterizedSQL( stmt = new ParameterizedSQL(
`SELECT t.id AS ticketFk, c.id AS clientFk, c.name AS clientName, tw.weekDay, `SELECT t.id AS ticketFk, c.id AS clientFk, c.name AS clientName, tw.weekDay,
wh.name AS warehouseName, u.id AS workerFk, u.nickName, tw.agencyModeFk wh.name AS warehouseName, u.id AS workerFk, u.name AS userName, u.nickName, tw.agencyModeFk
FROM ticketWeekly tw FROM ticketWeekly tw
JOIN ticket t ON t.id = tw.ticketFk JOIN ticket t ON t.id = tw.ticketFk
JOIN client c ON c.id = t.clientFk JOIN client c ON c.id = t.clientFk

6
modules/ticket/front/weekly/index.html
View File

@ -18,13 +18,13 @@
</vn-portal> </vn-portal>
<vn-data-viewer <vn-data-viewer
model="model" model="model"
class="vn-w-md vn-mb-xl"> class="vn-w-xl">
<vn-card> <vn-card>
<vn-table model="model"> <vn-table model="model">
<vn-thead> <vn-thead>
<vn-tr> <vn-tr>
<vn-th field="ticketFk" number>Ticket ID</vn-th> <vn-th field="ticketFk" number>Ticket ID</vn-th>
<vn-th field="weekDay">Client</vn-th> <vn-th field="clientName">Client</vn-th>
<vn-th>Weekday</vn-th> <vn-th>Weekday</vn-th>
<vn-th>Agency</vn-th> <vn-th>Agency</vn-th>
<vn-th>Warehouse</vn-th> <vn-th>Warehouse</vn-th>
@ -82,7 +82,7 @@
<span <span
vn-click-stop="workerDescriptor.show($event, weekly.workerFk)" vn-click-stop="workerDescriptor.show($event, weekly.workerFk)"
class="link" > class="link" >
{{::weekly.nickName}} {{::weekly.userName}}
</span> </span>
</vn-td> </vn-td>
<vn-td shrink> <vn-td shrink>

1
modules/ticket/front/weekly/locale/es.yml
View File

@ -4,3 +4,4 @@ You are going to delete this weekly ticket: Vas a eliminar este ticket programad
This ticket will be removed from weekly tickets! Continue anyway?: Este ticket se eliminará de tickets programados! ¿Continuar de todas formas? This ticket will be removed from weekly tickets! Continue anyway?: Este ticket se eliminará de tickets programados! ¿Continuar de todas formas?
Search weekly ticket by id or client id: Busca tickets programados por el identificador o el identificador del cliente Search weekly ticket by id or client id: Busca tickets programados por el identificador o el identificador del cliente
Search by weekly ticket: Buscar por tickets programados Search by weekly ticket: Buscar por tickets programados
weekDay: Dia