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

Merge branch 'dev' into 5914-transferInvoiceOut

This commit is contained in:
Jorge Penadés 2023-10-13 11:17:12 +00:00
parent 6b8a6c7a69 16f22c4d39
commit 9ba3c9c8bc
14 changed files with 98 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
front/core/components/index.js
View File

@ -39,6 +39,7 @@ import './range';
import './input-time';
import './input-file';
import './label';
import './link-phone';
import './list';
import './popover';
import './popup';

14
front/core/components/link-phone/index.html Normal file
View File

@ -0,0 +1,14 @@
<span ng-if="$ctrl.phoneNumber">
{{$ctrl.phoneNumber}}
<a href="tel:{{$ctrl.phoneNumber}}">
<vn-icon
flat
round
icon="phone"
title="MicroSIP"
ng-click="$event.stopPropagation();"
>
</vn-icon>
</a>
</span>
<span ng-if="!$ctrl.phoneNumber">-</span>

15
front/core/components/link-phone/index.js Normal file
View File

@ -0,0 +1,15 @@
import ngModule from '../../module';
import './style.scss';
class Controller {
constructor() {
this.phoneNumber = null;
}
}
ngModule.vnComponent('vnLinkPhone', {
template: require('./index.html'),
controller: Controller,
bindings: {
phoneNumber: '<',
}
});

7
front/core/components/link-phone/style.scss Normal file
View File

@ -0,0 +1,7 @@
vn-link-phone {
vn-icon {
font-size: 1.1em;
vertical-align: bottom;
}
}

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

@ -45,11 +45,18 @@
<vn-label-value label="Contact"
value="{{$ctrl.summary.contact}}">
</vn-label-value>
<vn-label-value label="Phone"
value="{{$ctrl.summary.phone}}">
<vn-label-value label="Phone">
<vn-link-phone
phone-number="$ctrl.summary.phone"
></vn-link-phone>
</vn-label-value>
<vn-label-value label="Mobile"
value="{{$ctrl.summary.mobile}}">
<vn-label-value label="Mobile">
<vn-link-phone
phone-number="$ctrl.summary.mobile"
></vn-link-phone>
</vn-label-value>
<vn-label-value label="Email" no-ellipsize
value="{{$ctrl.listEmails($ctrl.summary.email)}}">

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

@ -48,8 +48,10 @@
<vn-label-value label="Landed"
value="{{$ctrl.summary.landed | date: 'dd/MM/yyyy HH:mm'}}">
</vn-label-value>
<vn-label-value label="Phone"
value="{{$ctrl.summary.address.phone}}">
<vn-label-value label="Phone">
<vn-link-phone
phone-number="$ctrl.summary.address.phone"
></vn-link-phone>
</vn-label-value>
<vn-label-value label="Created from"
value="{{$ctrl.summary.sourceApp}}">

5
modules/route/front/roadmap/summary/index.html
View File

@ -25,7 +25,10 @@
<vn-one>
<vn-label-value
label="Phone"
value="{{summary.phone}}">
>
<vn-link-phone
phone-number="summary.phone"
></vn-link-phone>
</vn-label-value>
<vn-label-value
label="Worker"

3
modules/route/front/roadmap/summary/style.scss
View File

@ -1,10 +1,9 @@
@import "variables";
vn-roadmap-summary .summary {
a {
a:not(vn-link-phone a) {
display: flex;
align-items: center;
height: 18.328px;
}
}

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

@ -83,19 +83,29 @@
</vn-label-value>
<vn-label-value label="Address phone"
ng-if="$ctrl.summary.address.phone != null"
value="{{$ctrl.summary.address.phone}}">
>
<vn-link-phone
phone-number="$ctrl.summary.address.phone"
></vn-link-phone>
</vn-label-value>
<vn-label-value label="Address mobile"
ng-if="$ctrl.summary.address.mobile != null"
value="{{$ctrl.summary.address.mobile}}">
>
<vn-link-phone
phone-number="$ctrl.summary.address.mobile"
></vn-link-phone>
</vn-label-value>
<vn-label-value label="Client phone"
ng-if="$ctrl.summary.client.phone != null"
value="{{$ctrl.summary.client.phone}}">
ng-if="$ctrl.summary.client.phone != null">
<vn-link-phone
phone-number="$ctrl.summary.client.phone"
></vn-link-phone>
</vn-label-value>
<vn-label-value label="Client mobile"
ng-if="$ctrl.summary.client.mobile != null"
value="{{$ctrl.summary.client.mobile}}">
ng-if="$ctrl.summary.client.mobile != null">
<vn-link-phone
phone-number="$ctrl.summary.client.mobile"
></vn-link-phone>
</vn-label-value>
<vn-label-value label="Address" no-ellipsize
value="{{$ctrl.formattedAddress}}">

5
modules/ticket/front/summary/style.scss
View File

@ -47,4 +47,9 @@ vn-ticket-summary .summary {
}
}
}
vn-icon.tel {
font-size: 1.1em;
vertical-align: bottom;
}
}

10
modules/worker/front/descriptor/index.html
View File

@ -28,11 +28,17 @@
</vn-label-value>
<vn-label-value
label="Phone"
value="{{$ctrl.worker.phone}}">
>
<vn-link-phone
phone-number="$ctrl.worker.phone"
></vn-link-phone>
</vn-label-value>
<vn-label-value
label="Extension"
value="{{$ctrl.worker.sip.extension}}">
>
<vn-link-phone
phone-number="$ctrl.worker.sip.extension"
></vn-link-phone>
</vn-label-value>
</div>
<div class="icons">

1
modules/worker/front/descriptor/index.js
View File

@ -1,6 +1,5 @@
import ngModule from '../module';
import Descriptor from 'salix/components/descriptor';
class Controller extends Descriptor {
constructor($element, $, $rootScope) {
super($element, $);

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

@ -42,14 +42,21 @@
{{::worker.boss.name}}
</span>
</vn-label-value>
<vn-label-value label="Mobile extension"
value="{{worker.mobileExtension}}">
<vn-label-value label="Mobile extension">
<vn-link-phone
phone-number="worker.mobileExtension"
></vn-link-phone>
</vn-label-value>
<vn-label-value label="Business phone"
value="{{worker.phone}}">
<vn-label-value label="Business phone">
<vn-link-phone
phone-number="worker.phone"
></vn-link-phone>
</vn-label-value>
<vn-label-value label="Personal phone"
value="{{worker.client.phone}}">
>
<vn-link-phone
phone-number="worker.client.phone"
></vn-link-phone>
</vn-label-value>
<vn-label-value label="Locker"
value="{{worker.locker}}">

1
modules/worker/front/summary/index.js
View File

@ -1,6 +1,5 @@
import ngModule from '../module';
import Summary from 'salix/components/summary';
class Controller extends Summary {
get worker() {
return this._worker;