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

fix bugs in ticket weekly #328

Merged
joan merged 3 commits from 2338-ticket_weekly into dev 2020-07-09 06:14:45 +00:00
Conversation 0 Commits 3 Files Changed 3 +7 -6
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

8
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>
@ -53,7 +53,7 @@
</span> </span>
</vn-td> </vn-td>
<vn-td vn-click-stop> <vn-td vn-click-stop>
<vn-autocomplete <vn-autocomplete
vn-id="weekday" vn-id="weekday"
ng-model="weekly.weekDay" ng-model="weekly.weekDay"
data="$ctrl.weekdays" data="$ctrl.weekdays"
@ -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>

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

@ -3,4 +3,5 @@ Weekly tickets: Tickets programados
You are going to delete this weekly ticket: Vas a eliminar este ticket programado You are going to delete this weekly ticket: Vas a eliminar este ticket programado
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