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

2265 Changes to filter
gitea/salix/pipeline/head This commit looks good Details

This commit is contained in:
Joan Sanchez 2020-05-26 08:08:09 +02:00
parent d02655d4d3
commit 4d2d57d646
2 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
modules/item/front/request/index.html
View File

@ -3,7 +3,7 @@
url="TicketRequests/filter" url="TicketRequests/filter"
limit="20" limit="20"
data="requests" data="requests"
order="shipped DESC, isOk ASC" order="shipped DESC, isOk DESC"
auto-load="true"> auto-load="true">
</vn-crud-model> </vn-crud-model>
<vn-portal slot="topbar"> <vn-portal slot="topbar">
@ -11,6 +11,7 @@
panel="vn-request-search-panel" panel="vn-request-search-panel"
suggested-filter="$ctrl.filter.where" suggested-filter="$ctrl.filter.where"
info="Search request by id or alias" info="Search request by id or alias"
filter="$ctrl.filter"
model="model" model="model"
auto-state="false"> auto-state="false">
</vn-searchbar> </vn-searchbar>
@ -21,8 +22,8 @@
<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="shipped">Shipped</vn-th> <vn-th field="shipped" expand>Shipped</vn-th>
<vn-th field="description">Description</vn-th> <vn-th field="description" expand>Description</vn-th>
<vn-th field="quantity" number editable>Requested</vn-th> <vn-th field="quantity" number editable>Requested</vn-th>
<vn-th field="price" number>Price</vn-th> <vn-th field="price" number>Price</vn-th>
<vn-th field="atenderNickname">Atender</vn-th> <vn-th field="atenderNickname">Atender</vn-th>
@ -40,7 +41,7 @@
{{request.ticketFk}} {{request.ticketFk}}
</span> </span>
</vn-td> </vn-td>
<vn-td> <vn-td expand>
<span title="{{::request.shipped | date: 'dd/MM/yyyy'}}" <span title="{{::request.shipped | date: 'dd/MM/yyyy'}}"
class="chip {{$ctrl.compareDate(request.shipped)}}"> class="chip {{$ctrl.compareDate(request.shipped)}}">
{{::request.shipped | date: 'dd/MM/yyyy'}} {{::request.shipped | date: 'dd/MM/yyyy'}}
@ -53,7 +54,7 @@
<span <span
class="link" class="link"
ng-click="workerDescriptor.show($event, request.attenderFk)"> ng-click="workerDescriptor.show($event, request.attenderFk)">
{{::request.atenderNickname}} {{::request.attenderName}}
</span> </span>
</vn-td> </vn-td>
<vn-td-editable disabled="request.isOk != null" number> <vn-td-editable disabled="request.isOk != null" number>
@ -81,7 +82,7 @@
{{request.itemDescription}} {{request.itemDescription}}
</span> </span>
</vn-td> </vn-td>
<vn-td>{{$ctrl.getState(request.isOk)}}</vn-td> <vn-td>{{$ctrl.getState(request.isOk)}} {{request.isOk}}</vn-td>
<vn-td> <vn-td>
<vn-icon <vn-icon
ng-if="request.response.length" ng-if="request.response.length"

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

@ -120,7 +120,7 @@ module.exports = Self => {
t.clientFk, t.clientFk,
w.name AS warehouse, w.name AS warehouse,
u.nickname AS salesPersonNickname, u.nickname AS salesPersonNickname,
ua.nickname AS atenderNickname, ua.name AS attenderName,
c.salesPersonFk c.salesPersonFk
FROM ticketRequest tr FROM ticketRequest tr
LEFT JOIN ticketWeekly tw on tw.ticketFk = tr.ticketFk LEFT JOIN ticketWeekly tw on tw.ticketFk = tr.ticketFk