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

feat: refs #6401 Added QR and CIF in the CMR report #2111

Merged
guillermo merged 2 commits from 6401-cmrQr into dev 2024-03-01 06:29:47 +00:00
Conversation 0 Commits 2 Files Changed 4 +76 -39
guillermo commented 2024-02-29 07:11:29 +00:00
Member
Copy Link
No description provided.
guillermo added 1 commit 2024-02-29 07:11:29 +00:00
gitea/salix/pipeline/pr-dev This commit looks good Details
feeb9eece7 feat: refs #6401 Added QR and CIF in the CMR report
guillermo requested review from jgallego 2024-02-29 07:11:39 +00:00
guillermo added 1 commit 2024-02-29 07:15:05 +00:00
gitea/salix/pipeline/pr-dev This commit looks good Details
3736d0708b feat: refs #6401 Minor change
jgallego approved these changes 2024-02-29 11:37:09 +00:00
jgallego requested review from alexm 2024-02-29 11:37:15 +00:00
alexm approved these changes 2024-03-01 06:23:50 +00:00
print/templates/reports/cmr/cmr.html
@ -33,2 +33,2 @@
{{data.carrierStreet}}<br>
{{data.carrierPostalCode}} {{data.carrierCity}} {{(data.carrierCountry) ? `(${data.carrierCountry})` : null}}
{{data.carrierStreet}} {{data.carrierPostalCode}}
{{data.carrierCity}} {{(data.carrierCountry)
alexm commented 2024-03-01 06:16:44 +00:00
Member
Copy Link

Esta ultima part:
{(data.carrierCountry) ? (${data.carrierCountry}): null}}
No te val fica soles {{data.carrierCountry}} ?

I també podries fer {{ data.carrierCountry ?? null }} si fera falta q fora null i no undefined

Esta ultima part: `{(data.carrierCountry) ? (${data.carrierCountry}): null}}` No te val fica soles `{{data.carrierCountry}}` ? I també podries fer `{{ data.carrierCountry ?? null }}` si fera falta q fora `null` i no `undefined`
guillermo commented 2024-03-01 06:30:57 +00:00
Author
Member
Copy Link

Crec que ho vaig ficar aixina perque si era undefined me retornaba error el report

Crec que ho vaig ficar aixina perque si era undefined me retornaba error el report
guillermo marked this conversation as resolved
print/templates/reports/cmr/cmr.html
@ -76,0 +81,4 @@
</td>
<td id="qrSection">
<img id="truckPlateQr" v-bind:src="truckPlateQr"/>
<br>
alexm commented 2024-03-01 06:22:48 +00:00
Member
Copy Link

Crec que es mala practica gastar els
de esta manera.
En teoria soles se deuen gastar per a separar parrafos en un

per exemple (https://desarrolloweb-apuntes.blogspot.com/2017/11/errores-o-malas-practicas-en-html.html#:~:text=El%20elemento%20no%20se,decir%2C%20como%20dos%20p%C3%A1rrafos%20independientes.)

Per exemple, jo habria fet que el fora flex column i ja teu fica en una columna. i si volvera separacio ficaria margin fora sols un element o gap si foren varios.

Pero teu dic per a un futur

Crec que es mala practica gastar els <br> de esta manera. En teoria soles se deuen gastar per a separar parrafos en un <p> per exemple (https://desarrolloweb-apuntes.blogspot.com/2017/11/errores-o-malas-practicas-en-html.html#:~:text=El%20elemento%20no%20se,decir%2C%20como%20dos%20p%C3%A1rrafos%20independientes.) Per exemple, jo habria fet que el <td> fora flex column i ja teu fica en una columna. i si volvera separacio ficaria margin fora sols un element o gap si foren varios. Pero teu dic per a un futur
guillermo marked this conversation as resolved
guillermo merged commit ac2fb1e17f into dev 2024-03-01 06:29:47 +00:00
guillermo deleted branch 6401-cmrQr 2024-03-01 06:29:48 +00:00
Sign in to join this conversation.
Reviewers
No reviewers
jgallego
alexm
Labels
Clear labels   
CR / Tests passed

Unit tests and e2e passed

  
e2e

Implement e2e

  
Missing tests

Missing tests

  
Needs refactor

   
Simple

Simple check / No CR needed

No Label
CR / Tests passed
e2e
Missing tests
Needs refactor
Simple
Milestone
Clear milestone
No items
No Milestone
Assignees
Clear assignees
No Assignees
3 Participants
Notifications
Due Date
The due date is invalid or out of range. Please use the format 'yyyy-mm-dd'.

No due date set.

Dependencies

No dependencies set.

Reference: verdnatura/salix#2111
No description provided.
Delete Branch "6401-cmrQr"

Deleting a branch is permanent. Although the deleted branch may continue to exist for a short time before it actually gets removed, it CANNOT be undone in most cases. Continue?