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

Merge pull request '2385 - Replaced worker nickname' (#367) from 2385-worker_descriptor_refactor into dev
gitea/salix/pipeline/head This commit looks good Details 

Reviewed-on: #367
Reviewed-by: Carlos Jimenez <carlosjr@verdnatura.es>
This commit is contained in:
Carlos Jimenez Ruiz 2020-09-09 09:24:19 +00:00
parent 99b32ab3ad d0ac1b621c
commit b625ea0eb8
39 changed files with 174 additions and 65 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
e2e/helpers/selectors.js
View File

@ -199,7 +199,7 @@ export default {
}, },
dms: { dms: {
deleteFileButton: 'vn-client-dms-index vn-tr:nth-child(1) vn-icon-button[icon="delete"]', deleteFileButton: 'vn-client-dms-index vn-tr:nth-child(1) vn-icon-button[icon="delete"]',
firstDocWorker: 'vn-client-dms-index vn-td:nth-child(7) > span', firstDocWorker: 'vn-client-dms-index vn-td:nth-child(8) > span',
firstDocWorkerDescriptor: '.vn-popover.shown vn-worker-descriptor' firstDocWorkerDescriptor: '.vn-popover.shown vn-worker-descriptor'
}, },
clientContacts: { clientContacts: {

2
modules/claim/back/methods/claim/filter.js
View File

@ -106,7 +106,7 @@ module.exports = Self => {
let stmt; let stmt;
stmt = new ParameterizedSQL( stmt = new ParameterizedSQL(
`SELECT cl.id, c.name, cl.clientFk, cl.workerFk, u.nickName, cs.description, cl.created `SELECT cl.id, c.name, cl.clientFk, cl.workerFk, u.name AS userName, cs.description, cl.created
FROM claim cl FROM claim cl
LEFT JOIN client c ON c.id = cl.clientFk LEFT JOIN client c ON c.id = cl.clientFk
LEFT JOIN worker w ON w.id = cl.workerFk LEFT JOIN worker w ON w.id = cl.workerFk

2
modules/claim/front/card/index.js
View File

@ -12,7 +12,7 @@ class Controller extends ModuleCard {
include: { include: {
relation: 'user', relation: 'user',
scope: { scope: {
fields: ['nickname'] fields: ['name']
} }
} }
} }

32
modules/claim/front/descriptor/index.html
View File

@ -32,20 +32,32 @@
value="{{$ctrl.claim.created | date: 'dd/MM/yyyy HH:mm'}}"> value="{{$ctrl.claim.created | date: 'dd/MM/yyyy HH:mm'}}">
</vn-label-value> </vn-label-value>
<vn-label-value <vn-label-value
label="Salesperson" label="Salesperson">
value="{{$ctrl.claim.client.salesPersonUser.nickname}}"> <span
ng-click="workerDescriptor.show($event, $ctrl.claim.client.salesPersonFk)"
class="link">
{{$ctrl.claim.client.salesPersonUser.name}}
</span>
</vn-label-value> </vn-label-value>
<vn-label-value <vn-label-value
label="Attended by" label="Attended by">
value="{{$ctrl.claim.worker.user.nickname}}"> <span
ng-click="workerDescriptor.show($event, $ctrl.claim.worker.userFk)"
class="link">
{{$ctrl.claim.worker.user.name}}
</span>
</vn-label-value> </vn-label-value>
<vn-label-value <vn-label-value
label="Agency" label="Agency"
value="{{$ctrl.claim.ticket.agencyMode.name}}"> value="{{$ctrl.claim.ticket.agencyMode.name}}">
</vn-label-value> </vn-label-value>
<vn-label-value <vn-label-value
label="Ticket" label="Ticket">
value="{{$ctrl.claim.ticketFk}}"> <span
ng-click="ticketDescriptor.show($event, $ctrl.claim.ticketFk)"
class="link">
{{$ctrl.claim.ticketFk}}
</span>
</vn-label-value> </vn-label-value>
</div> </div>
<div class="quicklinks"> <div class="quicklinks">
@ -78,4 +90,10 @@
on-accept="$ctrl.deleteClaim()" on-accept="$ctrl.deleteClaim()"
question="Delete claim" question="Delete claim"
message="Are you sure you want to delete this claim?"> message="Are you sure you want to delete this claim?">
</vn-confirm> </vn-confirm>
<vn-worker-descriptor-popover
vn-id="workerDescriptor">
</vn-worker-descriptor-popover>
<vn-ticket-descriptor-popover
vn-id="ticketDescriptor">
</vn-ticket-descriptor-popover>

2
modules/claim/front/index/index.html
View File

@ -34,7 +34,7 @@
<span <span
vn-click-stop="workerDescriptor.show($event, claim.workerFk)" vn-click-stop="workerDescriptor.show($event, claim.workerFk)"
class="link" > class="link" >
{{::claim.nickName}} {{::claim.userName}}
</span> </span>
</vn-td> </vn-td>
<vn-td> <vn-td>

2
modules/client/back/methods/client/summary.js
View File

@ -48,7 +48,7 @@ module.exports = Self => {
include: { include: {
relation: 'user', relation: 'user',
scope: { scope: {
fields: ['nickname'] fields: ['name']
} }
} }
} }

11
modules/client/front/credit/index/index.html
View File

@ -23,7 +23,13 @@
<vn-tbody> <vn-tbody>
<vn-tr ng-repeat="credit in credits track by credit.id"> <vn-tr ng-repeat="credit in credits track by credit.id">
<vn-td>{{::credit.created | date:'dd/MM/yyyy HH:mm'}}</vn-td> <vn-td>{{::credit.created | date:'dd/MM/yyyy HH:mm'}}</vn-td>
<vn-td>{{::credit.worker.user.nickname}}</vn-td> <vn-td>
<span
ng-click="workerDescriptor.show($event, credit.worker.userFk)"
class="link">
{{::credit.worker.user.name}}
</span>
</vn-td>
<vn-td number>{{::credit.amount | currency:'EUR':2}}</vn-td> <vn-td number>{{::credit.amount | currency:'EUR':2}}</vn-td>
</vn-tr> </vn-tr>
</vn-tbody> </vn-tbody>
@ -39,3 +45,6 @@
vn-bind="+" vn-bind="+"
fixed-bottom-right> fixed-bottom-right>
</vn-float-button> </vn-float-button>
<vn-worker-descriptor-popover
vn-id="workerDescriptor">
</vn-worker-descriptor-popover>

2
modules/client/front/credit/index/index.js
View File

@ -13,7 +13,7 @@ class Controller extends Section {
include: { include: {
relation: 'user', relation: 'user',
scope: { scope: {
fields: ['nickname'] fields: ['name']
} }
} }
} }

13
modules/client/front/descriptor/index.html
View File

@ -35,8 +35,12 @@
info="Invoices minus payments plus orders not yet invoiced"> info="Invoices minus payments plus orders not yet invoiced">
</vn-label-value> </vn-label-value>
<vn-label-value <vn-label-value
label="Sales person" label="Sales person">
value="{{$ctrl.client.salesPerson.user.nickname}}"> <span
ng-click="workerDescriptor.show($event, $ctrl.client.salesPersonFk)"
class="link">
{{$ctrl.client.salesPerson.user.name}}
</span>
</vn-label-value> </vn-label-value>
</div> </div>
<div class="icons"> <div class="icons">
@ -89,4 +93,7 @@
<vn-client-sms <vn-client-sms
vn-id="sms" vn-id="sms"
sms="$ctrl.newSMS"> sms="$ctrl.newSMS">
</vn-client-sms> </vn-client-sms>
<vn-worker-descriptor-popover
vn-id="workerDescriptor">
</vn-worker-descriptor-popover>

8
modules/client/front/dms/index/index.html
View File

@ -53,6 +53,12 @@
{{::document.dms.description}} {{::document.dms.description}}
</span> </span>
</vn-td> </vn-td>
<vn-td shrink>
<vn-check
ng-model="document.dms.hasFile"
disabled="true">
</vn-check>
</vn-td>
<vn-td shrink> <vn-td shrink>
<span title="{{'Download file' | translate}}" class="link" <span title="{{'Download file' | translate}}" class="link"
ng-click="$ctrl.downloadFile(document.dmsFk)"> ng-click="$ctrl.downloadFile(document.dmsFk)">
@ -62,7 +68,7 @@
<vn-td shrink> <vn-td shrink>
<span class="link" <span class="link"
ng-click="workerDescriptor.show($event, document.dms.workerFk)"> ng-click="workerDescriptor.show($event, document.dms.workerFk)">
{{::document.dms.worker.user.nickname | dashIfEmpty}} {{::document.dms.worker.user.name | dashIfEmpty}}
</span></vn-td> </span></vn-td>
<vn-td> <vn-td>
{{::document.dms.created | date:'dd/MM/yyyy HH:mm'}} {{::document.dms.created | date:'dd/MM/yyyy HH:mm'}}

2
modules/client/front/dms/index/index.js
View File

@ -32,7 +32,7 @@ class Controller extends Section {
include: { include: {
relation: 'user', relation: 'user',
scope: { scope: {
fields: ['nickname'] fields: ['name']
} }
}, },
} }

2
modules/client/front/sample/index/index.html
View File

@ -32,7 +32,7 @@
<span <span
ng-click="workerDescriptor.show($event, sample.worker.id)" ng-click="workerDescriptor.show($event, sample.worker.id)"
class="link"> class="link">
{{::sample.worker.user.nickname}} {{::sample.worker.user.name}}
</span> </span>
</vn-td> </vn-td>
<vn-td>{{::sample.company.code}}</vn-td> <vn-td>{{::sample.company.code}}</vn-td>

2
modules/client/front/sample/index/index.js
View File

@ -18,7 +18,7 @@ class Controller extends Section {
include: { include: {
relation: 'user', relation: 'user',
scope: { scope: {
fields: ['nickname'] fields: ['name']
} }
} }
} }

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

@ -21,8 +21,12 @@
<vn-label-value label="Email" ellipsize="false" <vn-label-value label="Email" ellipsize="false"
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">
value="{{$ctrl.summary.salesPerson.user.nickname}}"> <span
ng-click="workerDescriptor.show($event, $ctrl.summary.salesPersonFk)"
class="link">
{{$ctrl.summary.salesPerson.user.name}}
</span>
</vn-label-value> </vn-label-value>
<vn-label-value label="Channel" <vn-label-value label="Channel"
value="{{$ctrl.summary.contactChannel.name}}"> value="{{$ctrl.summary.contactChannel.name}}">
@ -197,4 +201,7 @@
</vn-vertical> </vn-vertical>
</vn-one> </vn-one>
</vn-horizontal> </vn-horizontal>
</vn-card> </vn-card>
<vn-worker-descriptor-popover
vn-id="workerDescriptor">
</vn-worker-descriptor-popover>

13
modules/invoiceOut/front/descriptor/index.html
View File

@ -37,8 +37,12 @@
value="{{$ctrl.invoiceOut.amount | currency: 'EUR': 2}}"> value="{{$ctrl.invoiceOut.amount | currency: 'EUR': 2}}">
</vn-label-value> </vn-label-value>
<vn-label-value <vn-label-value
label="Client" label="Client">
value="{{$ctrl.invoiceOut.client.name}}"> <span
ng-click="clientDescriptor.show($event, $ctrl.invoiceOut.client.id)"
class="link">
{{$ctrl.invoiceOut.client.name}}
</span>
</vn-label-value> </vn-label-value>
<vn-label-value <vn-label-value
label="Company" label="Company"
@ -74,4 +78,7 @@
vn-id="bookConfirmation" vn-id="bookConfirmation"
on-accept="$ctrl.bookInvoiceOut()" on-accept="$ctrl.bookInvoiceOut()"
question="Are you sure you want to book this invoice?"> question="Are you sure you want to book this invoice?">
</vn-confirm> </vn-confirm>
<vn-client-descriptor-popover
vn-id="clientDescriptor">
</vn-client-descriptor-popover>

2
modules/item/back/methods/item/filter.js
View File

@ -113,7 +113,7 @@ module.exports = Self => {
i.isActive, i.isActive,
t.name type, t.name type,
t.workerFk buyerFk, t.workerFk buyerFk,
u.nickname userNickname, u.name userName,
intr.description AS intrastat, intr.description AS intrastat,
i.stems, i.stems,
ori.code AS origin, ori.code AS origin,

2
modules/item/back/methods/item/getCard.js
View File

@ -37,7 +37,7 @@ module.exports = Self => {
include: { include: {
relation: 'user', relation: 'user',
scope: { scope: {
fields: ['nickname'] fields: ['name']
} }
} }
} }

2
modules/item/back/methods/item/getSummary.js
View File

@ -38,7 +38,7 @@ module.exports = Self => {
include: { include: {
relation: 'user', relation: 'user',
scope: { scope: {
fields: ['nickname'] fields: ['name']
} }
} }
} }

11
modules/item/front/descriptor/index.html
View File

@ -44,8 +44,12 @@
<slot-body> <slot-body>
<div class="attributes"> <div class="attributes">
<vn-label-value <vn-label-value
label="Buyer" label="Buyer">
value="{{$ctrl.item.itemType.worker.user.nickname}}"> <span
ng-click="workerDescriptor.show($event, $ctrl.item.itemType.worker.userFk)"
class="link">
{{$ctrl.item.itemType.worker.user.name}}
</span>
</vn-label-value> </vn-label-value>
<vn-label-value <vn-label-value
ng-repeat="tag in $ctrl.item.tags | limitTo:4" ng-repeat="tag in $ctrl.item.tags | limitTo:4"
@ -96,3 +100,6 @@
question="Do you want to clone this item?" question="Do you want to clone this item?"
message="All it's properties will be copied"> message="All it's properties will be copied">
</vn-confirm> </vn-confirm>
<vn-worker-descriptor-popover
vn-id="workerDescriptor">
</vn-worker-descriptor-popover>

4
modules/item/front/index/index.html
View File

@ -70,11 +70,11 @@
{{::item.intrastat}} {{::item.intrastat}}
</vn-td> </vn-td>
<vn-td shrink>{{::item.origin}}</vn-td> <vn-td shrink>{{::item.origin}}</vn-td>
<vn-td shrink title="{{::item.userNickname}}"> <vn-td shrink title="{{::item.userName}}">
<span <span
class="link" class="link"
vn-click-stop="workerDescriptor.show($event, item.buyerFk)"> vn-click-stop="workerDescriptor.show($event, item.buyerFk)">
{{::item.userNickname}} {{::item.userName}}
</span> </span>
</vn-td> </vn-td>
<vn-td shrink>{{::item.density}}</vn-td> <vn-td shrink>{{::item.density}}</vn-td>

13
modules/item/front/summary/index.html
View File

@ -36,8 +36,12 @@
<vn-label-value label="stems" <vn-label-value label="stems"
value="{{$ctrl.summary.item.stems}}"> value="{{$ctrl.summary.item.stems}}">
</vn-label-value> </vn-label-value>
<vn-label-value label="Buyer" <vn-label-value label="Buyer">
value="{{$ctrl.summary.item.itemType.worker.user.nickname}}"> <span
ng-click="workerDescriptor.show($event, $ctrl.summary.item.itemType.worker.userFk)"
class="link">
{{$ctrl.summary.item.itemType.worker.user.name}}
</span>
</vn-label-value> </vn-label-value>
</vn-one> </vn-one>
<vn-one name="otherData"> <vn-one name="otherData">
@ -105,4 +109,7 @@
</p> </p>
</vn-one> </vn-one>
</vn-horizontal> </vn-horizontal>
</vn-card> </vn-card>
<vn-worker-descriptor-popover
vn-id="workerDescriptor">
</vn-worker-descriptor-popover>

2
modules/order/front/card/index.js
View File

@ -37,7 +37,7 @@ class Controller extends ModuleCard {
include: { include: {
relation: 'user', relation: 'user',
scope: { scope: {
fields: ['nickname'] fields: ['name']
} }
} }
} }

13
modules/order/front/descriptor/index.html
View File

@ -15,8 +15,12 @@
value="{{$ctrl.$t($ctrl.order.isConfirmed ? 'Confirmed' : 'Not confirmed')}}"> value="{{$ctrl.$t($ctrl.order.isConfirmed ? 'Confirmed' : 'Not confirmed')}}">
</vn-label-value> </vn-label-value>
<vn-label-value <vn-label-value
label="Sales person" label="Sales person">
value="{{$ctrl.order.client.salesPerson.user.nickname}}"> <span
ng-click="workerDescriptor.show($event, $ctrl.order.client.salesPersonFk)"
class="link">
{{$ctrl.order.client.salesPerson.user.name}}
</span>
</vn-label-value> </vn-label-value>
<vn-label-value <vn-label-value
label="Landed" label="Landed"
@ -64,4 +68,7 @@
on-accept="$ctrl.deleteOrder()" on-accept="$ctrl.deleteOrder()"
message="You are going to delete this order" message="You are going to delete this order"
question="continue anyway?"> question="continue anyway?">
</vn-confirm> </vn-confirm>
<vn-worker-descriptor-popover
vn-id="workerDescriptor">
</vn-worker-descriptor-popover>

3
modules/route/back/methods/route/filter.js
View File

@ -119,7 +119,7 @@ module.exports = Self => {
r.m3, r.m3,
r.description, r.description,
am.name agencyName, am.name agencyName,
u.nickname AS workerNickname, u.name AS workerUserName,
v.numberPlate AS vehiclePlateNumber v.numberPlate AS vehiclePlateNumber
FROM route r FROM route r
LEFT JOIN agencyMode am ON am.id = r.agencyModeFk LEFT JOIN agencyMode am ON am.id = r.agencyModeFk
@ -128,7 +128,6 @@ module.exports = Self => {
LEFT JOIN account.user u ON u.id = w.userFk` LEFT JOIN account.user u ON u.id = w.userFk`
); );
stmt.merge(conn.makeSuffix(filter)); stmt.merge(conn.makeSuffix(filter));
let itemsIndex = stmts.push(stmt) - 1; let itemsIndex = stmts.push(stmt) - 1;

2
modules/route/back/methods/route/specs/summary.spec.js
View File

@ -25,7 +25,7 @@ describe('route summary()', () => {
const result = await app.models.Route.summary(1); const result = await app.models.Route.summary(1);
const worker = result.route.worker().user(); const worker = result.route.worker().user();
expect(worker.nickname).toEqual('deliveryNick'); expect(worker.name).toEqual('delivery');
}); });
it(`should return a summary object containing data from the tickets`, async() => { it(`should return a summary object containing data from the tickets`, async() => {

2
modules/route/back/methods/route/summary.js
View File

@ -38,7 +38,7 @@ module.exports = Self => {
{ {
relation: 'user', relation: 'user',
scope: { scope: {
fields: ['id', 'nickname'] fields: ['id', 'name']
} }
} }
] ]

2
modules/route/front/index/index.html
View File

@ -38,7 +38,7 @@
<span <span
class="link" class="link"
vn-click-stop="workerDescriptor.show($event, route.workerFk)"> vn-click-stop="workerDescriptor.show($event, route.workerFk)">
{{::route.workerNickname}} {{::route.workerUserName}}
</span> </span>
</vn-td> </vn-td>
<vn-td>{{::route.agencyName | dashIfEmpty}}</vn-td> <vn-td>{{::route.agencyName | dashIfEmpty}}</vn-td>

11
modules/route/front/summary/index.html
View File

@ -14,8 +14,12 @@
<vn-label-value label="Vehicle" <vn-label-value label="Vehicle"
value="{{$ctrl.summary.route.vehicle.numberPlate}}"> value="{{$ctrl.summary.route.vehicle.numberPlate}}">
</vn-label-value> </vn-label-value>
<vn-label-value label="Driver" <vn-label-value label="Driver">
value="{{$ctrl.summary.route.worker.user.nickname}}"> <span
ng-click="workerDescriptor.show($event, $ctrl.summary.route.workerFk)"
class="link">
{{$ctrl.summary.route.worker.user.name}}
</span>
</vn-label-value> </vn-label-value>
<vn-label-value label="Cost" <vn-label-value label="Cost"
value="{{$ctrl.summary.route.cost | currency: 'EUR':2}}"> value="{{$ctrl.summary.route.cost | currency: 'EUR':2}}">
@ -106,3 +110,6 @@
<vn-client-descriptor-popover <vn-client-descriptor-popover
vn-id="clientDescriptor"> vn-id="clientDescriptor">
</vn-client-descriptor-popover> </vn-client-descriptor-popover>
<vn-worker-descriptor-popover
vn-id="workerDescriptor">
</vn-worker-descriptor-popover>

2
modules/ticket/back/methods/ticket/summary.js
View File

@ -63,7 +63,7 @@ module.exports = Self => {
include: { include: {
relation: 'user', relation: 'user',
scope: { scope: {
fields: ['nickname'] fields: ['name']
} }
} }
} }

2
modules/ticket/front/card/index.js
View File

@ -44,7 +44,7 @@ class Controller extends ModuleCard {
include: { include: {
relation: 'user', relation: 'user',
scope: { scope: {
fields: ['nickname'] fields: ['name']
} }
} }
} }

13
modules/ticket/front/descriptor/index.html
View File

@ -90,8 +90,12 @@
value="{{$ctrl.ticket.ticketState.state.name}}"> value="{{$ctrl.ticket.ticketState.state.name}}">
</vn-label-value> </vn-label-value>
<vn-label-value <vn-label-value
label="Sales person" label="Sales person">
value="{{$ctrl.ticket.client.salesPerson.user.nickname}}"> <span
ng-click="workerDescriptor.show($event, $ctrl.ticket.client.salesPersonFk)"
class="link">
{{$ctrl.ticket.client.salesPerson.user.name}}
</span>
</vn-label-value> </vn-label-value>
<vn-label-value <vn-label-value
label="Shipped" label="Shipped"
@ -295,4 +299,7 @@
<input type="button" response="cancel" translate-attr="{value: 'Cancel'}"/> <input type="button" response="cancel" translate-attr="{value: 'Cancel'}"/>
<button response="accept" translate>Save</button> <button response="accept" translate>Save</button>
</tpl-buttons> </tpl-buttons>
</vn-dialog> </vn-dialog>
<vn-worker-descriptor-popover
vn-id="workerDescriptor">
</vn-worker-descriptor-popover>

2
modules/ticket/front/descriptor/index.js
View File

@ -210,7 +210,7 @@ class Controller extends Descriptor {
include: { include: {
relation: 'user', relation: 'user',
scope: { scope: {
fields: ['nickname'] fields: ['name']
} }
} }
} }

11
modules/ticket/front/dms/index/index.html
View File

@ -51,6 +51,12 @@
{{::document.dms.description}} {{::document.dms.description}}
</span> </span>
</vn-td> </vn-td>
<vn-td shrink>
<vn-check
ng-model="document.dms.hasFile"
disabled="true">
</vn-check>
</vn-td>
<vn-td shrink> <vn-td shrink>
<span title="{{'Download file' | translate}}" class="link" <span title="{{'Download file' | translate}}" class="link"
ng-click="$ctrl.downloadFile(document.dmsFk)"> ng-click="$ctrl.downloadFile(document.dmsFk)">
@ -60,8 +66,9 @@
<vn-td shrink> <vn-td shrink>
<span class="link" <span class="link"
ng-click="workerDescriptor.show($event, document.dms.workerFk)"> ng-click="workerDescriptor.show($event, document.dms.workerFk)">
{{::document.dms.worker.user.nickname | dashIfEmpty}} {{::document.dms.worker.user.name | dashIfEmpty}}
</span></vn-td> </span>
</vn-td>
<vn-td> <vn-td>
{{::document.dms.created | date:'dd/MM/yyyy HH:mm'}} {{::document.dms.created | date:'dd/MM/yyyy HH:mm'}}
</vn-td> </vn-td>

2
modules/ticket/front/dms/index/index.js
View File

@ -33,7 +33,7 @@ class Controller extends Section {
include: { include: {
relation: 'user', relation: 'user',
scope: { scope: {
fields: ['nickname'] fields: ['name']
} }
}, },
} }

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

@ -18,8 +18,12 @@
<vn-label-value label="State" <vn-label-value label="State"
value="{{$ctrl.summary.ticketState.state.name}}"> value="{{$ctrl.summary.ticketState.state.name}}">
</vn-label-value> </vn-label-value>
<vn-label-value label="Salesperson" <vn-label-value label="Salesperson">
value="{{$ctrl.summary.client.salesPerson.user.nickname}}"> <span
ng-click="workerDescriptor.show($event, $ctrl.summary.client.salesPersonFk)"
class="link">
{{$ctrl.summary.client.salesPerson.user.name}}
</span>
</vn-label-value> </vn-label-value>
<vn-label-value label="Agency" <vn-label-value label="Agency"
value="{{$ctrl.summary.agencyMode.name}}"> value="{{$ctrl.summary.agencyMode.name}}">
@ -239,4 +243,7 @@
</vn-item-descriptor-popover> </vn-item-descriptor-popover>
<vn-invoice-out-descriptor-popover <vn-invoice-out-descriptor-popover
vn-id="invoice-out-descriptor"> vn-id="invoice-out-descriptor">
</vn-invoice-out-descriptor-popover> </vn-invoice-out-descriptor-popover>
<vn-worker-descriptor-popover
vn-id="workerDescriptor">
</vn-worker-descriptor-popover>

2
modules/ticket/front/tracking/index/index.html
View File

@ -25,7 +25,7 @@
<span <span
class="link" class="link"
ng-click="workerDescriptor.show($event, tracking.worker.user.id)"> ng-click="workerDescriptor.show($event, tracking.worker.user.id)">
{{::tracking.worker.user.nickname | dashIfEmpty}} {{::tracking.worker.user.name | dashIfEmpty}}
</span> </span>
</vn-td> </vn-td>
<vn-td>{{::tracking.created | date:'dd/MM/yyyy HH:mm'}}</vn-td> <vn-td>{{::tracking.created | date:'dd/MM/yyyy HH:mm'}}</vn-td>

2
modules/ticket/front/tracking/index/index.js
View File

@ -13,7 +13,7 @@ class Controller extends Section {
include: { include: {
relation: 'user', relation: 'user',
scope: { scope: {
fields: ['nickname'] fields: ['name']
} }
} }
} }

4
modules/travel/front/descriptor/locale/es.yml
View File

@ -1,6 +1,6 @@
Reference: Referencia Reference: Referencia
Wh. In: Warehouse entrada Wh. In: Almacén entrada
Wh. Out: Warehouse salida Wh. Out: Almacén salida
Shipped: F. envío Shipped: F. envío
Landed: F. entrega Landed: F. entrega
Total entries: Entradas totales Total entries: Entradas totales

9
modules/worker/front/dms/index/index.html
View File

@ -18,6 +18,7 @@
<vn-th field="reference" shrink>Reference</vn-th> <vn-th field="reference" shrink>Reference</vn-th>
<vn-th expand>Description</vn-th> <vn-th expand>Description</vn-th>
<vn-th field="hasFile" shrink>Original</vn-th> <vn-th field="hasFile" shrink>Original</vn-th>
<vn-th shrink>File</vn-th>
<vn-th field="created">Created</vn-th> <vn-th field="created">Created</vn-th>
<vn-th shrink></vn-th> <vn-th shrink></vn-th>
<vn-th shrink></vn-th> <vn-th shrink></vn-th>
@ -36,7 +37,13 @@
<span title="{{::document.description}}"> <span title="{{::document.description}}">
{{::document.description}} {{::document.description}}
</span> </span>
</vn-td > </vn-td>
<vn-td shrink>
<vn-check
ng-model="document.dms.hasFile"
disabled="true">
</vn-check>
</vn-td>
<vn-td shrink> <vn-td shrink>
<span title="{{'Download file' | translate}}" class="link" <span title="{{'Download file' | translate}}" class="link"
ng-click="$ctrl.downloadFile(document.dmsFk)"> ng-click="$ctrl.downloadFile(document.dmsFk)">