verdnatura/salix
verdnatura
/
salix
3
5
Fork 0
Code Issues Pull Requests 65 Releases Wiki Activity

3771-ticket.expedition #970

Merged
joan merged 7 commits from 3771-ticket.expedition into dev 2022-05-13 13:38:38 +00:00
Conversation 0 Commits 7 Files Changed 12 +5 -5
3 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 6441393249 - Show all commits

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

@ -29,7 +29,7 @@ module.exports = Self => {
Object.assign(myOptions, options);
const stmt = new ParameterizedSQL(
`SELECT es.created, u.name, u.id workerFk, est.description
`SELECT es.created, u.name, u.id workerFk, est.description state
FROM vn.expeditionState es
JOIN vn.expeditionStateType est ON est.id = es.typeFk
JOIN account.user u ON u.id = es.userFk

2
modules/ticket/back/methods/expedition/filter.js
View File

@ -48,7 +48,7 @@ module.exports = Self => {
es.workerFk expeditionScanWorkerFk,
su.name scannerUserName,
es.scanned,
est.description
est.description state
vicent marked this conversation as resolved Outdated
carlosjr commented 2022-05-11 14:10:36 +00:00
Outdated
Review
Copy Link

this is defined as description but used as state at front, should be renamed to match the context using alias

this is defined as description but used as state at front, should be renamed to match the context using alias
FROM vn.expedition e
LEFT JOIN vn.expeditionStateType est ON est.id = e.stateTypeFk
LEFT JOIN vn.item i2 ON i2.id = e.itemFk

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

@ -20,7 +20,7 @@
<vn-th field="counter" number>Counter</vn-th>
<vn-th field="externalId" number>externalId</vn-th>
<vn-th field="created" expand>Created</vn-th>
<vn-th field="description" expand>State</vn-th>
<vn-th field="state" expand>State</vn-th>
<vn-th></vn-th>
</vn-tr>
</vn-thead>
@ -45,7 +45,7 @@
<vn-td number>{{::expedition.counter}}</vn-td>
<vn-td expand>{{::expedition.externalId}}</vn-td>
<vn-td shrink-datetime>{{::expedition.created | date:'dd/MM/yyyy HH:mm'}}</vn-td>
<vn-td>{{::expedition.description}}</vn-td>
<vn-td>{{::expedition.state}}</vn-td>
<vn-td>
<vn-icon-button
vn-click-stop="$ctrl.showLog(expedition)"
@ -94,7 +94,7 @@
</vn-thead>
<vn-tbody>
<vn-tr ng-repeat="expeditionState in expeditionStates">
<vn-td>{{::expeditionState.description}}</vn-td>
<vn-td>{{::expeditionState.state}}</vn-td>
<vn-td expand>
<span
ng-class="{'link': expeditionState.workerFk}"