verdnatura/salix
verdnatura
/
salix
3
5
Fork 2
Code Issues Pull Requests 66 Releases Wiki Activity

2588 - No ellipsize on summary notes or address
gitea/salix/pipeline/head This commit looks good Details

This commit is contained in:
Joan Sanchez 2020-11-24 14:56:10 +01:00
parent 2a2104936c
commit 8eb14a8bdc
8 changed files with 35 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

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

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

@ -74,7 +74,7 @@
{{ticket.nickname}} {{ticket.nickname}}
</span> </span>
</vn-td> </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-td number>{{ticket.total | currency: 'EUR': 2}}</vn-td>
</vn-tr> </vn-tr>
</vn-tbody> </vn-tbody>

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

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

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

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

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

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

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

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

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

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