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

refs #6119 microsip link added #1729

Merged
jorgep merged 23 commits from 6119-addMicrosipLink into dev 2023-10-13 11:15:49 +00:00
Conversation 0 Commits 23 Files Changed 14 +96 -156
17 changed files with 96 additions and 156 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit c2a54b8c65 - Show all commits

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';

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

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

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

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

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;
}
}

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

@ -46,25 +46,15 @@
value="{{$ctrl.summary.contact}}">
</vn-label-value>
<vn-label-value label="Phone">
{{$ctrl.summary.phone}}
<a href="tel:{{$ctrl.summary.phone}}">
<vn-icon
class="tel"
icon="call"
translate-attr="{title: 'Microsip'}"
>
</vn-icon>
</a>
<vn-link-phone
phone-number="$ctrl.summary.phone"
></vn-link-phone>
jorgep marked this conversation as resolved
juan commented 2023-09-11 07:03:10 +00:00
Review
Copy Link

Porqué se repite dos veces el valor del teléfono? Cual es la funcion del componente vnLinkPhone?

Porqué se repite dos veces el valor del teléfono? Cual es la funcion del componente vnLinkPhone?
jorgep commented 2023-09-18 06:12:01 +00:00
Review
Copy Link

Antes quería mostrar el número y un icono, pero , ahora solo se mostrará el icono del teléfono.

Antes quería mostrar el número y un icono, pero , ahora solo se mostrará el icono del teléfono.
</vn-label-value>
<vn-label-value label="Mobile">
{{$ctrl.summary.mobile}}
<a href="tel:{{$ctrl.summary.mobile}}">
<vn-icon
class="tel"
icon="smartphone"
translate-attr="{title: 'Microsip'}"
></vn-icon>
</a>
<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)}}">

4
modules/client/front/summary/style.scss
View File

@ -11,8 +11,4 @@ vn-client-summary .summary {
font-family: 'salixfont' !important;
content: "\e965";
}
vn-icon.tel {
font-size: 1.1em;
vertical-align: bottom;
}
}

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

@ -48,17 +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"
>
{{$ctrl.summary.address.phone}}
<a href="tel:{{$ctrl.summary.address.phone}}">
<vn-icon
class="tel"
icon="smartphone"
translate-attr="{title:'Microsip'}"
>
</vn-icon>
</a>
<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}}">

4
modules/order/front/summary/style.scss
View File

@ -17,8 +17,4 @@ vn-order-summary .summary{
}
}
}
vn-icon.tel {
font-size: 1.1em;
vertical-align: bottom;
}
}

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

@ -26,15 +26,9 @@
<vn-label-value
label="Phone"
>
{{summary.phone}}
<a href="tel:{{summary.phone}}" class="tel">
<vn-icon
class="tel"
icon="call"
translate-attr="{title: 'Microsip'}"
>
</vn-icon>
</a>
<vn-link-phone
phone-number="summary.phone"
></vn-link-phone>
</vn-label-value>
<vn-label-value
label="Worker"

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

@ -1,14 +1,9 @@
@import "variables";
vn-roadmap-summary .summary {
a:not(.tel) {
a:not(vn-link-phone a) {
display: flex;
align-items: center;
height: 18.328px;
}
vn-icon.tel {
font-size: 1.1em;
vertical-align: bottom;
}
}

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

@ -84,48 +84,28 @@
<vn-label-value label="Address phone"
ng-if="$ctrl.summary.address.phone != null"
>
{{$ctrl.summary.address.phone}}
<a href="sip:{{$ctrl.summary.address.phone}}">
<vn-icon
class="tel"
icon="call"
translate-attr="{title: 'Microsip'}"
>
</vn-icon>
</a>
<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"
>
{{$ctrl.summary.address.mobile}}
<a href="sip:{{$ctrl.summary.address.mobile}}">
<vn-icon
class="tel"
icon="smartphone"
translate-attr="{title: 'Microsip'}"
>
</vn-icon>
</a>
<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">
{{$ctrl.summary.client.phone}}
<a href="sip:{{$ctrl.summary.client.phone}}">
<vn-icon
class="tel"
icon="phone"
translate-attr="{title: 'Microsip'}"></vn-icon>
</a>
<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">
{{$ctrl.summary.client.mobile}}
<a href="sip:{{$ctrl.summary.client.mobile}}">
<vn-icon
class="tel"
icon="smartphone"
translate-attr="{title: 'Microsip'}"></vn-icon>
</a>
<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}}">

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

@ -36,34 +36,18 @@
value="{{$ctrl.worker.department.department.name}}">
</vn-label-value>
<vn-label-value
label="Phone">
<span ng-if="!$ctrl.worker.phone">-</span>
<span ng-if="$ctrl.worker.phone">
{{$ctrl.worker.phone}}
<a
href="tel:{{$ctrl.worker.phone}}">
<vn-icon
class="tel"
icon="phone"
translate-attr="{title: 'Microsip'}"
></vn-icon>
</a>
</span>
label="Phone"
>
<vn-link-phone
phone-number=":$ctrl.worker.phone"
></vn-link-phone>
</vn-label-value>
<vn-label-value
label="Extension">
<span ng-if="!$ctrl.worker.sip.extension">-</span>
<span ng-if="$ctrl.worker.sip.extension">
{{$ctrl.worker.sip.extension}}
<a
href="tel:{{$ctrl.worker.sip.extension}}">
<vn-icon
class="tel"
icon="phone"
translate-attr="{title: 'Microsip'}"
></vn-icon>
</a>
</span>
label="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';
import './style.scss';
class Controller extends Descriptor {
constructor($element, $, $rootScope) {
super($element, $);

6
modules/worker/front/descriptor/style.scss
View File

@ -1,6 +0,0 @@
vn-worker-descriptor {
vn-icon.tel {
font-size: 1.1em;
vertical-align: bottom;
}
}

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

@ -43,44 +43,20 @@
</span>
</vn-label-value>
<vn-label-value label="Mobile extension">
<span ng-show="!worker.mobileExtension">-</span>
<span ng-show="worker.mobileExtension">
{{worker.mobileExtension}}
<a href="tel:{{worker.mobileExtension}}">
<vn-icon
class="tel"
icon="smartphone"
translate-attr="{title: 'Microsip'}"
></vn-icon>
</a>
</span>
<vn-link-phone
phone-number="worker.mobileExtension"
></vn-link-phone>
</vn-label-value>
<vn-label-value label="Business phone">
<span ng-show="!worker.phone">-</span>
<span ng-show="worker.phone">
{{worker.phone}}
<a href="tel:{{worker.phone}}">
<vn-icon
class="tel"
icon="smartphone"
translate-attr="{title: 'Microsip'}"
></vn-icon>
</a>
</span>
<vn-link-phone
phone-number="worker.phone"
></vn-link-phone>
</vn-label-value>
<vn-label-value label="Personal phone"
>
<span ng-show="!worker.client.phone">-</span>
<span ng-show="worker.client.phone">
{{worker.client.phone}}
<a href="tel:{{worker.client.phone}}">
<vn-icon
class="tel"
icon="smartphone"
translate-attr="{title: 'Microsip'}"
></vn-icon>
</a>
</span>
<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';
import './style.scss';
class Controller extends Summary {
get worker() {
return this._worker;

6
modules/worker/front/summary/style.scss
View File

@ -1,6 +0,0 @@
vn-worker-summary {
vn-icon.tel {
font-size: 1.1em;
vertical-align: bottom;
}
}