TT#56159 Customer wants to see alternative name

Change-Id: Iaf10dde82d7219e55e4715615282719d2016e13e
changes/67/29667/2
Robert Axelsen 6 years ago
parent fe50cda4ee
commit 7783fd2361

@ -15,7 +15,7 @@
class="csc-item-title" class="csc-item-title"
label label
> >
{{ group.display_name }} {{ groupName(group.id) }}
</q-item-tile> </q-item-tile>
<q-item-tile <q-item-tile
v-if="!expanded" v-if="!expanded"
@ -50,7 +50,7 @@
<span <span
class="csc-item-value" class="csc-item-value"
v-for="seat in group.seats" v-for="seat in group.seats"
>{{ seat.display_name }} >{{ seatName(seat.id) }}
</span> </span>
</div> </div>
</q-item-tile> </q-item-tile>
@ -227,7 +227,9 @@
'huntPolicyOptions', 'huntPolicyOptions',
'aliasNumberOptions', 'aliasNumberOptions',
'seatOptions', 'seatOptions',
'loading' 'loading',
'groupName',
'seatName'
], ],
data () { data () {
return { return {

@ -63,6 +63,8 @@
:seat-options="seatOptions" :seat-options="seatOptions"
:hunt-policy-options="huntPolicyOptions" :hunt-policy-options="huntPolicyOptions"
:loading="isItemLoading(group.id)" :loading="isItemLoading(group.id)"
:group-name="groupName"
:seat-name="seatName"
@remove="removeGroupDialog" @remove="removeGroupDialog"
@save-name="setGroupName" @save-name="setGroupName"
@save-extension="setGroupExtension" @save-extension="setGroupExtension"
@ -220,7 +222,9 @@
'lastRemovedGroup', 'lastRemovedGroup',
'lastUpdatedField', 'lastUpdatedField',
'updateAliasNumbersState', 'updateAliasNumbersState',
'updateGroupsAndSeatsState' 'updateGroupsAndSeatsState',
'groupName',
'seatName'
]), ]),
isMobile() { isMobile() {
return Platform.is.mobile; return Platform.is.mobile;

@ -15,7 +15,7 @@
class="csc-item-title" class="csc-item-title"
label label
> >
{{ seat.display_name }} {{ seatName(seat.id) }}
</q-item-tile> </q-item-tile>
<q-item-tile <q-item-tile
v-if="!expanded" v-if="!expanded"
@ -50,7 +50,7 @@
class="csc-item-value" class="csc-item-value"
v-for="group in seat.groups" v-for="group in seat.groups"
> >
{{ group.display_name }} {{ groupName(group.id) }}
</span> </span>
</div> </div>
</q-item-tile> </q-item-tile>
@ -201,7 +201,9 @@
'aliasNumberOptions', 'aliasNumberOptions',
'groupOptions', 'groupOptions',
'loading', 'loading',
'callQueue' 'callQueue',
'seatName',
'groupName'
], ],
data () { data () {
return { return {

@ -63,6 +63,8 @@
:group-options="groupOptions" :group-options="groupOptions"
@remove="removeSeatDialog" @remove="removeSeatDialog"
:loading="isItemLoading(seat.id)" :loading="isItemLoading(seat.id)"
:seat-name="seatName"
:group-name="groupName"
@save-name="setSeatName" @save-name="setSeatName"
@save-extension="setSeatExtension" @save-extension="setSeatExtension"
@save-alias-numbers="updateAliasNumbers" @save-alias-numbers="updateAliasNumbers"
@ -185,7 +187,9 @@
'lastUpdatedField', 'lastUpdatedField',
'updateAliasNumbersState', 'updateAliasNumbersState',
'updateGroupsAndSeatsState', 'updateGroupsAndSeatsState',
'updateState' 'updateState',
'seatName',
'groupName'
]), ]),
groupOptions() { groupOptions() {
let groups = []; let groups = [];

@ -407,5 +407,19 @@ export default {
return (handle) => { return (handle) => {
return state.uploadSoundFileProgresses[handle] || 0; return state.uploadSoundFileProgresses[handle] || 0;
} }
},
seatName(state) {
return (id) => {
let display_name = state.seats[id].display_name;
let webusername = state.seats[id].webusername;
return display_name ? display_name : webusername;
}
},
groupName(state) {
return (id) => {
let display_name = state.groups[id].display_name;
let webusername = state.groups[id].webusername;
return display_name ? display_name : webusername;
}
} }
} }

Loading…
Cancel
Save