Merge pull request 'refs #6119 microsip link added' (!1729) from 6119-addMicrosipLink into dev
gitea/salix/pipeline/head There was a failure building this commit
Details
gitea/salix/pipeline/head There was a failure building this commit
Details
Reviewed-on: #1729 Reviewed-by: Javi Gallego <jgallego@verdnatura.es>
This commit is contained in:
commit
16f22c4d39
|
@ -39,6 +39,7 @@ import './range';
|
||||||
import './input-time';
|
import './input-time';
|
||||||
import './input-file';
|
import './input-file';
|
||||||
import './label';
|
import './label';
|
||||||
|
import './link-phone';
|
||||||
import './list';
|
import './list';
|
||||||
import './popover';
|
import './popover';
|
||||||
import './popup';
|
import './popup';
|
||||||
|
|
|
@ -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>
|
|
@ -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: '<',
|
||||||
|
}
|
||||||
|
});
|
|
@ -0,0 +1,7 @@
|
||||||
|
vn-link-phone {
|
||||||
|
vn-icon {
|
||||||
|
font-size: 1.1em;
|
||||||
|
vertical-align: bottom;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
|
@ -45,11 +45,18 @@
|
||||||
<vn-label-value label="Contact"
|
<vn-label-value label="Contact"
|
||||||
value="{{$ctrl.summary.contact}}">
|
value="{{$ctrl.summary.contact}}">
|
||||||
</vn-label-value>
|
</vn-label-value>
|
||||||
<vn-label-value label="Phone"
|
<vn-label-value label="Phone">
|
||||||
value="{{$ctrl.summary.phone}}">
|
|
||||||
|
<vn-link-phone
|
||||||
|
phone-number="$ctrl.summary.phone"
|
||||||
|
></vn-link-phone>
|
||||||
|
|
||||||
</vn-label-value>
|
</vn-label-value>
|
||||||
<vn-label-value label="Mobile"
|
<vn-label-value label="Mobile">
|
||||||
value="{{$ctrl.summary.mobile}}">
|
|
||||||
|
<vn-link-phone
|
||||||
|
phone-number="$ctrl.summary.mobile"
|
||||||
|
></vn-link-phone>
|
||||||
</vn-label-value>
|
</vn-label-value>
|
||||||
<vn-label-value label="Email" no-ellipsize
|
<vn-label-value label="Email" no-ellipsize
|
||||||
value="{{$ctrl.listEmails($ctrl.summary.email)}}">
|
value="{{$ctrl.listEmails($ctrl.summary.email)}}">
|
||||||
|
|
|
@ -48,8 +48,10 @@
|
||||||
<vn-label-value label="Landed"
|
<vn-label-value label="Landed"
|
||||||
value="{{$ctrl.summary.landed | date: 'dd/MM/yyyy HH:mm'}}">
|
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}}">
|
<vn-link-phone
|
||||||
|
phone-number="$ctrl.summary.address.phone"
|
||||||
|
></vn-link-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}}">
|
||||||
|
|
|
@ -25,7 +25,10 @@
|
||||||
<vn-one>
|
<vn-one>
|
||||||
<vn-label-value
|
<vn-label-value
|
||||||
label="Phone"
|
label="Phone"
|
||||||
value="{{summary.phone}}">
|
>
|
||||||
|
<vn-link-phone
|
||||||
|
phone-number="summary.phone"
|
||||||
|
></vn-link-phone>
|
||||||
</vn-label-value>
|
</vn-label-value>
|
||||||
<vn-label-value
|
<vn-label-value
|
||||||
label="Worker"
|
label="Worker"
|
||||||
|
|
|
@ -1,10 +1,9 @@
|
||||||
@import "variables";
|
@import "variables";
|
||||||
|
|
||||||
vn-roadmap-summary .summary {
|
vn-roadmap-summary .summary {
|
||||||
a {
|
a:not(vn-link-phone a) {
|
||||||
display: flex;
|
display: flex;
|
||||||
align-items: center;
|
align-items: center;
|
||||||
height: 18.328px;
|
height: 18.328px;
|
||||||
}
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
|
@ -83,19 +83,29 @@
|
||||||
</vn-label-value>
|
</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}}">
|
>
|
||||||
|
<vn-link-phone
|
||||||
|
phone-number="$ctrl.summary.address.phone"
|
||||||
|
></vn-link-phone>
|
||||||
</vn-label-value>
|
</vn-label-value>
|
||||||
<vn-label-value label="Address mobile"
|
<vn-label-value label="Address mobile"
|
||||||
ng-if="$ctrl.summary.address.mobile != null"
|
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>
|
||||||
<vn-label-value label="Client phone"
|
<vn-label-value label="Client phone"
|
||||||
ng-if="$ctrl.summary.client.phone != null"
|
ng-if="$ctrl.summary.client.phone != null">
|
||||||
value="{{$ctrl.summary.client.phone}}">
|
<vn-link-phone
|
||||||
|
phone-number="$ctrl.summary.client.phone"
|
||||||
|
></vn-link-phone>
|
||||||
</vn-label-value>
|
</vn-label-value>
|
||||||
<vn-label-value label="Client mobile"
|
<vn-label-value label="Client mobile"
|
||||||
ng-if="$ctrl.summary.client.mobile != null"
|
ng-if="$ctrl.summary.client.mobile != null">
|
||||||
value="{{$ctrl.summary.client.mobile}}">
|
<vn-link-phone
|
||||||
|
phone-number="$ctrl.summary.client.mobile"
|
||||||
|
></vn-link-phone>
|
||||||
</vn-label-value>
|
</vn-label-value>
|
||||||
<vn-label-value label="Address" no-ellipsize
|
<vn-label-value label="Address" no-ellipsize
|
||||||
value="{{$ctrl.formattedAddress}}">
|
value="{{$ctrl.formattedAddress}}">
|
||||||
|
|
|
@ -47,4 +47,9 @@ vn-ticket-summary .summary {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
vn-icon.tel {
|
||||||
|
font-size: 1.1em;
|
||||||
|
vertical-align: bottom;
|
||||||
|
}
|
||||||
}
|
}
|
|
@ -28,11 +28,17 @@
|
||||||
</vn-label-value>
|
</vn-label-value>
|
||||||
<vn-label-value
|
<vn-label-value
|
||||||
label="Phone"
|
label="Phone"
|
||||||
value="{{$ctrl.worker.phone}}">
|
>
|
||||||
|
<vn-link-phone
|
||||||
|
phone-number="$ctrl.worker.phone"
|
||||||
|
></vn-link-phone>
|
||||||
</vn-label-value>
|
</vn-label-value>
|
||||||
<vn-label-value
|
<vn-label-value
|
||||||
label="Extension"
|
label="Extension"
|
||||||
value="{{$ctrl.worker.sip.extension}}">
|
>
|
||||||
|
<vn-link-phone
|
||||||
|
phone-number="$ctrl.worker.sip.extension"
|
||||||
|
></vn-link-phone>
|
||||||
</vn-label-value>
|
</vn-label-value>
|
||||||
</div>
|
</div>
|
||||||
<div class="icons">
|
<div class="icons">
|
||||||
|
|
|
@ -1,6 +1,5 @@
|
||||||
import ngModule from '../module';
|
import ngModule from '../module';
|
||||||
import Descriptor from 'salix/components/descriptor';
|
import Descriptor from 'salix/components/descriptor';
|
||||||
|
|
||||||
class Controller extends Descriptor {
|
class Controller extends Descriptor {
|
||||||
constructor($element, $, $rootScope) {
|
constructor($element, $, $rootScope) {
|
||||||
super($element, $);
|
super($element, $);
|
||||||
|
|
|
@ -42,14 +42,21 @@
|
||||||
{{::worker.boss.name}}
|
{{::worker.boss.name}}
|
||||||
</span>
|
</span>
|
||||||
</vn-label-value>
|
</vn-label-value>
|
||||||
<vn-label-value label="Mobile extension"
|
<vn-label-value label="Mobile extension">
|
||||||
value="{{worker.mobileExtension}}">
|
<vn-link-phone
|
||||||
|
phone-number="worker.mobileExtension"
|
||||||
|
></vn-link-phone>
|
||||||
</vn-label-value>
|
</vn-label-value>
|
||||||
<vn-label-value label="Business phone"
|
<vn-label-value label="Business phone">
|
||||||
value="{{worker.phone}}">
|
<vn-link-phone
|
||||||
|
phone-number="worker.phone"
|
||||||
|
></vn-link-phone>
|
||||||
</vn-label-value>
|
</vn-label-value>
|
||||||
<vn-label-value label="Personal phone"
|
<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>
|
||||||
<vn-label-value label="Locker"
|
<vn-label-value label="Locker"
|
||||||
value="{{worker.locker}}">
|
value="{{worker.locker}}">
|
||||||
|
|
|
@ -1,6 +1,5 @@
|
||||||
import ngModule from '../module';
|
import ngModule from '../module';
|
||||||
import Summary from 'salix/components/summary';
|
import Summary from 'salix/components/summary';
|
||||||
|
|
||||||
class Controller extends Summary {
|
class Controller extends Summary {
|
||||||
get worker() {
|
get worker() {
|
||||||
return this._worker;
|
return this._worker;
|
||||||
|
|
Loading…
Reference in New Issue