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

Merge pull request '2588 - No ellipsize on summary notes or address' (#467) from 2588-summaries_refactor into dev
gitea/salix/pipeline/head This commit looks good Details 

Reviewed-on: #467
Reviewed-by: Bernat Exposito <bernat@verdnatura.es>
This commit is contained in:
Bernat Exposito 2020-11-25 07:12:25 +00:00
parent 200e0acdfd 5ff364dcf0
commit 34c1115954
10 changed files with 36 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
README.md
View File

@ -8,7 +8,7 @@ Salix is also the scientific name of a beautifull tree! :)
Required applications.
* Node.js = 12.17.0 LTS
* Node.js = 14.15.1 LTS
* Docker
You will need to install globally the following items.

4
e2e/helpers/selectors.js
View File

@ -636,7 +636,7 @@ export default {
orderSummary: {
id: 'vn-order-summary vn-one:nth-child(1) > vn-label-value:nth-child(1) span',
alias: 'vn-order-summary vn-one:nth-child(1) > vn-label-value:nth-child(2) span',
consignee: 'vn-order-summary vn-one:nth-child(2) > vn-label-value:nth-child(4) span',
consignee: 'vn-order-summary vn-one:nth-child(2) > vn-label-value:nth-child(6) span',
subtotal: 'vn-order-summary vn-one.taxes > p:nth-child(1)',
vat: 'vn-order-summary vn-one.taxes > p:nth-child(2)',
total: 'vn-order-summary vn-one.taxes > p:nth-child(3)',
@ -663,7 +663,7 @@ export default {
client: 'vn-autocomplete[label="Client"]',
address: 'vn-autocomplete[label="Address"]',
agency: 'vn-autocomplete[label="Agency"]',
observation: 'vn-textarea[label="Observation"]',
observation: 'vn-textarea[label="Notes"]',
saveButton: `button[type=submit]`,
acceptButton: '.vn-confirm.shown button[response="accept"]'
},

7
front/core/components/label-value/style.scss
View File

@ -6,4 +6,11 @@ vn-label-value > section {
color: $color-font-secondary;
font-size: 1.2rem
}
}
vn-label-value[no-ellipsize] > section,
vn-label-value.no-ellipsize > section {
text-overflow: '';
white-space: normal;
overflow: auto;
}

14
modules/client/front/summary/index.html
View File

@ -28,7 +28,7 @@
<vn-label-value label="Mobile"
value="{{$ctrl.summary.mobile}}">
</vn-label-value>
<vn-label-value label="Email" ellipsize="false"
<vn-label-value label="Email" no-ellipsize
value="{{$ctrl.summary.email}}">
</vn-label-value>
<vn-label-value label="Sales person">
@ -50,9 +50,6 @@
<vn-label-value label="NIF / CIF"
value="{{$ctrl.summary.fi}}">
</vn-label-value>
<vn-label-value label="Street" ellipsize="false"
value="{{$ctrl.summary.street}}">
</vn-label-value>
<vn-label-value label="City"
value="{{$ctrl.summary.city}}">
</vn-label-value>
@ -65,6 +62,9 @@
<vn-label-value label="Country"
value="{{$ctrl.summary.country.country}}">
</vn-label-value>
<vn-label-value label="Street" no-ellipsize
value="{{$ctrl.summary.street}}">
</vn-label-value>
</vn-one>
<vn-one>
<h4 translate>Fiscal data</h4>
@ -140,12 +140,12 @@
<vn-label-value label="Name"
value="{{$ctrl.summary.defaultAddress.nickname}}">
</vn-label-value>
<vn-label-value label="Street" ellipsize="false"
value="{{$ctrl.summary.defaultAddress.street}}">
</vn-label-value>
<vn-label-value label="City"
value="{{$ctrl.summary.defaultAddress.city}}">
</vn-label-value>
<vn-label-value label="Street" no-ellipsize
value="{{$ctrl.summary.defaultAddress.street}}">
</vn-label-value>
</vn-one>
<vn-one>
<h4 translate>Web access</h4>

2
modules/invoiceOut/front/summary/index.html
View File

@ -74,7 +74,7 @@
{{ticket.nickname}}
</span>
</vn-td>
<vn-td expand>{{ticket.shipped | date: 'dd/MM/yyyy' | dashIfEmpty}</vn-td>
<vn-td expand>{{ticket.shipped | date: 'dd/MM/yyyy' | dashIfEmpty}}</vn-td>
<vn-td number>{{ticket.total | currency: 'EUR': 2}}</vn-td>
</vn-tr>
</vn-tbody>

2
modules/order/front/basic-data/index.html
View File

@ -59,7 +59,7 @@
<vn-horizontal>
<vn-textarea
vn-one
label="Observation"
label="Notes"
ng-model="$ctrl.order.note"
rule>
</vn-textarea>

16
modules/order/front/summary/index.html
View File

@ -31,12 +31,12 @@
{{$ctrl.summary.address.nickname}}
</span>
</vn-label-value>
<vn-check label="Confirmed" disabled="true"
ng-model="$ctrl.summary.isConfirmed">
</vn-check>
<vn-label-value label="Company"
value="{{$ctrl.summary.address.companyFk}}">
</vn-label-value>
<vn-check label="Confirmed" disabled="true"
ng-model="$ctrl.summary.isConfirmed">
</vn-check>
</vn-one>
<vn-one>
<vn-label-value label="Created"
@ -48,18 +48,18 @@
<vn-label-value label="Landed"
value="{{$ctrl.summary.landed | date: 'dd/MM/yyyy HH:mm'}}">
</vn-label-value>
<vn-label-value label="Address"
value="{{$ctrl.formattedAddress}}">
</vn-label-value>
<vn-label-value label="Phone"
value="{{$ctrl.summary.address.phone}}">
value="{{$ctrl.summary.address.phone}}">
</vn-label-value>
<vn-label-value label="Created from"
value="{{$ctrl.summary.sourceApp}}">
</vn-label-value>
<vn-label-value label="Address" no-ellipsize
value="{{$ctrl.formattedAddress}}">
</vn-label-value>
</vn-one>
<vn-one>
<vn-label-value label="{{'Notes'}}"
<vn-label-value label="Notes" no-ellipsize
value="{{$ctrl.summary.note}}">
</vn-label-value>
</vn-one>

8
modules/supplier/front/summary/index.html
View File

@ -20,6 +20,10 @@
label="Alias"
value="{{::$ctrl.summary.nickname}}">
</vn-label-value>
<vn-label-value no-ellipsize
label="Notes"
value="{{::$ctrl.summary.note}}">
</vn-label-value>
<vn-check
label="Verified"
ng-model="$ctrl.summary.isSerious"
@ -30,10 +34,6 @@
ng-model="$ctrl.summary.isActive"
disabled="true">
</vn-check>
<vn-label-value
label="Notes"
value="{{::$ctrl.summary.note}}">
</vn-label-value>
</vn-vertical>
</vn-one>
<vn-one>

8
modules/ticket/front/summary/index.html
View File

@ -70,9 +70,6 @@
<vn-label-value label="Package size"
value="{{$ctrl.summary.packages}}">
</vn-label-value>
<vn-label-value label="Address"
value="{{$ctrl.formattedAddress}}">
</vn-label-value>
<vn-label-value label="Address phone"
ng-if="$ctrl.summary.address.phone != null"
value="{{$ctrl.summary.address.phone}}">
@ -89,9 +86,12 @@
ng-if="$ctrl.summary.client.mobile != null"
value="{{$ctrl.summary.client.mobile}}">
</vn-label-value>
<vn-label-value label="Address" no-ellipsize
value="{{$ctrl.formattedAddress}}">
</vn-label-value>
</vn-two>
<vn-one class="notes">
<vn-label-value
<vn-label-value no-ellipsize
label="{{note.observationType.description}}"
ng-repeat="note in $ctrl.summary.notes track by note.id"
value="{{note.description}}">

2
modules/worker/front/summary/index.html
View File

@ -14,7 +14,7 @@
<vn-label-value label="Id"
value="{{worker.id}}">
</vn-label-value>
<vn-label-value label="Email"
<vn-label-value label="Email" no-ellipsize
value="{{worker.user.emailUser.email}}">
</vn-label-value>
<vn-label-value label="Department"