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

Default username property
gitea/salix/pipeline/head This commit looks good Details

This commit is contained in:
Joan Sanchez 2023-04-18 13:16:25 +02:00
parent 1d7c1f8d41
commit 90b38d02a0
2 changed files with 44 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
print/templates/reports/expedition-pallet-label/expedition-pallet-label.html
View File

@ -1,5 +1,6 @@
<!DOCTYPE html>
<html>
<body>
<table class="mainTable">
<tbody>
@ -30,12 +31,16 @@
<img :src="QR" id="QR" />
<div id="right">
<div id="additionalInfo" class="ellipsize"><b>Pallet: </b>{{id}}</div>
<div id="additionalInfo" class="ellipsize"><b>User: </b> {{username ? username.name : '---'}}</div>
<div id="additionalInfo" class="ellipsize"><b>Day: </b>{{labelData.dayName.toUpperCase() || '---'}}</div>
<div id="additionalInfo" class="ellipsize"><b>User: </b>
{{ (username ? username.name : '---')}}
</div>
<div id="additionalInfo" class="ellipsize"><b>Day: </b>{{labelData.dayName.toUpperCase() ||
'---'}}</div>
</div>
</td>
</tr>
</tbody>
</table>
</body>
</html>

1
print/templates/reports/expedition-pallet-label/expedition-pallet-label.js
View File

@ -18,6 +18,7 @@ module.exports = {
}
},
async serverPrefetch() {
this.username = null;
this.labelsData = await this.rawSqlFromDef('labelData', this.id);
if (this.userFk) this.username = await this.findOneFromDef('username', this.userFk);
this.labelData = this.labelsData[0];