MT#62359 Improve "After Ring Timeout" Settings

UI modified to clearly show the "After Ring
Timeout" as unique parameter that is
editable in one place only.

Change-Id: Ieadc2c255ad8977664c2288269cef6c1a8da5b72
master
Debora Crescenzo 3 weeks ago
parent 30d4b44aea
commit 6bd7d4710c

@ -0,0 +1,75 @@
<template>
<q-list class="q-mb-md">
<q-item>
<q-item-section side>
<q-icon
:name="icon"
:color="color"
/>
</q-item-section>
<q-item-section>
<q-item-label clickable>
<span>{{ $t('After Ring Timeout') }} : </span>
<span
class="q-pl-xs q-pr-xs text-primary text-weight-bold cursor-pointer"
>
{{ ringTimeout }} {{ $t('seconds') }}
<q-popup-edit
v-slot="scope"
v-model="timeout"
buttons
@before-show="$store.commit('callForwarding/popupShow','after-ring-timeout')"
@save="updateRingTimeoutEvent($event)"
>
<csc-input
v-model="scope.value"
type="number"
dense
autofocus
>
<template #prepend>
<q-icon name="access_time" />
</template>
</csc-input>
</q-popup-edit>
</span>
</q-item-label>
<q-item-label caption>
{{ $t('Forward call after this timeout (applies only when user is available).') }}
</q-item-label>
</q-item-section>
</q-item>
</q-list>
</template>
<script>
import CscInput from 'components/form/CscInput'
import { mapActions } from 'vuex'
export default {
name: 'CscPopupMenuRingTimeout',
components: { CscInput },
props: {
ringTimeout: {
type: Number,
required: true
}
},
data () {
return {
timeout: this.ringTimeout,
icon: 'access_time',
color: 'primary'
}
},
methods: {
...mapActions('callForwarding', [
'updateRingTimeout'
]),
async updateRingTimeoutEvent (event) {
this.$wait.start('csc-cf-mappings-full')
await this.updateRingTimeout({ ringTimeout: event, subscriberId: this.subscriberId })
this.$wait.end('csc-cf-mappings-full')
}
}
}
</script>

@ -13,10 +13,7 @@
<script>
import _ from 'lodash'
import { v4 } from 'uuid'
import {
mapMutations,
mapState
} from 'vuex'
import { mapMutations, mapState } from 'vuex'
export default {
name: 'CscCfConditionPopup',
emits: ['open', 'close'],

@ -29,27 +29,7 @@
/>
{{ ringTimeout }}
{{ $t('seconds') }}
<q-popup-edit
v-slot="scope"
v-model="changedDestinationTimeout"
buttons
@before-show="$store.commit('callForwarding/popupShow', null)"
@save="updateRingTimeoutEvent($event)"
>
<csc-input
v-model="scope.value"
type="number"
dense
>
<template
#prepend
>
<q-icon
name="access_time"
/>
</template>
</csc-input>
</q-popup-edit>
<q-tooltip class="text-dark">{{ $t('This setting is synced with "After Ring Timeout", which can be edited above.') }}</q-tooltip>
</span>
{{ $t('forwarded to') }}
</template>
@ -152,10 +132,7 @@ import CscInput from 'components/form/CscInput'
import _ from 'lodash'
import { showGlobalError } from 'src/helpers/ui'
import destination from 'src/mixins/destination'
import {
mapActions,
mapGetters
} from 'vuex'
import { mapActions, mapGetters } from 'vuex'
export default {
name: 'CscCfGroupItem',
components: { CscCfDestinationNumber, CscCfDestinationCustomAnnouncement, CscCfDestination, CscSpinner, CscInput, CscPopupMenuItemDelete, CscMoreMenu },
@ -218,8 +195,12 @@ export default {
}
},
async mounted () {
// For the first destination in a call forwarding with timeout
// use the global ringTimeout value.
if (this.mapping.type === 'cft' && this.destinationIndex === 0) {
this.changedDestinationTimeout = this.ringTimeout
// For subsequent destinations, use the timeout
// from the previous destination in the chain.
} else if (this.destinationPrevious) {
this.changedDestinationTimeout = this.destinationPrevious.timeout
}

@ -67,6 +67,10 @@
:primary-number-source="getPrimaryNumberSource"
/>
</q-list>
<csc-popup-menu-ring-timeout
v-if="isRingTimeoutVisible"
:ring-timeout="ringTimeout"
/>
<div
v-for="group in groups"
:key="group.cfm_id"
@ -90,6 +94,7 @@
<script>
import CscPopupMenu from 'components/CscPopupMenu'
import CscPopupMenuItem from 'components/CscPopupMenuItem'
import CscPopupMenuRingTimeout from 'components/CscPopupMenuRingTimeout'
import CscSpinner from 'components/CscSpinner'
import CscCfGroup from 'components/call-forwarding/CscCfGroup'
import CscCfGroupItemPrimaryNumber from 'components/call-forwarding/CscCfGroupItemPrimaryNumber'
@ -99,6 +104,7 @@ export default {
components: {
CscPopupMenu,
CscPopupMenuItem,
CscPopupMenuRingTimeout,
CscCfGroup,
CscCfGroupItemPrimaryNumber,
CscSpinner
@ -127,7 +133,8 @@ export default {
'hasSubscriberProfileAttributes'
]),
...mapGetters('callForwarding', [
'groups'
'groups',
'ringTimeout'
]),
...mapState('callForwarding', [
'bNumberSetMap',
@ -142,6 +149,9 @@ export default {
return this.seatSelected
}
return null
},
isRingTimeoutVisible () {
return this.ringTimeout && this.groups.some((group) => group.type === 'cft')
}
},
async mounted () {

@ -26,6 +26,7 @@
"Added seat {seat}": "Nebenstelle {seat} hinzugefügt",
"Admin name": "Admin name",
"After": "Nach",
"After Ring Timeout": "Timeout nach dem Klingeln",
"Alias Number": "Alias-Nummer",
"Alias Numbers": "Alias-Nummern",
"All": "Alle",
@ -45,6 +46,7 @@
"An error occured while trying to load the speed dials. Please try again": "Kurzwahlliste konnte nicht geladen werden. Bitte erneut versuchen",
"An error occured while trying to send the fax. Please try again": "Fax konnte nicht gesendet werden. Bitte erneut versuchen",
"An error occured while trying to unassign the speed dial slot. Please try again": "Kurzwahl-Eintrag konnte nicht geändert werden. Bitte erneut versuchen",
"An error occurred:": "Ein Fehler ist aufgetreten:",
"Application": "Anwendung",
"Apps": "Apps",
"April": "April",
@ -192,7 +194,6 @@
"Expires": "Läuft aus",
"Extension": "Durchwahl",
"Extension Settings": "Erweiterungseinstellungen",
"Firmware Upgrade disable": "Firmware upgrade deaktivieren",
"Fax": "Fax",
"Fax Settings": "Faxeinstellungen",
"Fax to mail and sendfax": "„Fax to Mail“ und „Sendfax“",
@ -206,11 +207,13 @@
"Filter devices": "Geräte filtern",
"Filter groups": "Filtergruppen",
"Fine": "Mittel",
"Firmware Upgrade disable": "Firmware upgrade deaktivieren",
"Folder : ": "Ordner : ",
"Force CLI": "Force CLI",
"Forgot password?": "Passwort vergessen?",
"Format": "Format",
"Forward": "Weiterleitung",
"Forward call after this timeout (applies only when user is available).": "Anruf nach diesem Timeout weiterleiten (gilt nur, wenn der Benutzer verfügbar ist).",
"Forward to Auto Attendant": "Weiterleitung an das Anrufmenü",
"Forward to Call Through": "Weiterleiten zu Call Through",
"Forward to Calling Card": "Weiterleitung an Calling Card",
@ -530,9 +533,11 @@
"The Destination Email is already used": "Die Ziel-E-Mail-Adresse wird bereits verwendet",
"The Notify Email is already used": "Diese E-Mail-Adresse wird bereits zur Benachrichtigung verwendet",
"There are no ACLs yet": "Es wurden noch keine ACLs erstellt",
"There are no Key Renew Notify Emails yet": "Es gibt noch keine Benachrichtigungs-E-Mails zur Schlüsselerneuerung",
"There is a problem with your account, please contact support": "Es gibt ein Problem mit Ihrem Konto, bitte kontaktieren Sie den Support",
"There was an error, please retry later": "Es ist ein Fehler aufgetreten. Bitte versuchen Sie es später erneut",
"This number is already in use.": "This number is already in use.",
"This setting is synced with \"After Ring Timeout\", which can be edited above.": "Diese Einstellung ist mit \"Timeout nach dem Klingeln\", synchronisiert und kann oben bearbeitet werden.",
"Thursday": "Donnerstag",
"Time": "Zeit",
"Time is invalid": "Zeit ist ungültig",

@ -26,6 +26,7 @@
"Added seat {seat}": "Added seat {seat}",
"Admin name": "Admin name",
"After": "After",
"After Ring Timeout": "After Ring Timeout",
"Alias Number": "Alias Number",
"Alias Numbers": "Alias Numbers",
"All": "All",
@ -45,6 +46,7 @@
"An error occured while trying to load the speed dials. Please try again": "An error occured while trying to load the speed dials. Please try again",
"An error occured while trying to send the fax. Please try again": "An error occured while trying to send the fax. Please try again",
"An error occured while trying to unassign the speed dial slot. Please try again": "An error occured while trying to unassign the speed dial slot. Please try again",
"An error occurred:": "An error occurred:",
"Apps": "Apps",
"April": "April",
"Assigned slot {slot}": "Assigned slot {slot}",
@ -189,7 +191,6 @@
"Expires": "Expires",
"Extension": "Extension",
"Extension Settings": "Extension Settings",
"Firmware Upgrade disable": "Firmware Upgrade disable",
"Fax": "Fax",
"Fax Settings": "Fax Settings",
"Fax to mail and sendfax": "Fax to Mail and Sendfax",
@ -203,11 +204,13 @@
"Filter devices": "Filter devices",
"Filter groups": "Filter groups",
"Fine": "Fine",
"Firmware Upgrade disable": "Firmware Upgrade disable",
"Folder : ": "Folder : ",
"Force CLI": "Force CLI",
"Forgot password?": "Forgot password?",
"Format": "Format",
"Forward": "Forward",
"Forward call after this timeout (applies only when user is available).": "Forward call after this timeout (applies only when user is available).",
"Forward to Auto Attendant": "Forward to Auto Attendant",
"Forward to Call Through": "Forward to Call Through",
"Forward to Calling Card": "Forward to Calling Card",
@ -517,6 +520,7 @@
"There is a problem with your account, please contact support": "There is a problem with your account, please contact support",
"There was an error, please retry later": "There was an error, please retry later",
"This number is already in use.": "This number is already in use.",
"This setting is synced with \"After Ring Timeout\", which can be edited above.": "This setting is synced with \"After Ring Timeout\", which can be edited above.",
"Thursday": "Thursday",
"Time": "Time",
"Time is invalid": "Time is invalid",

@ -26,6 +26,7 @@
"Added seat {seat}": "Asiento agregado {seat}",
"Admin name": "Admin name",
"After": "después de",
"After Ring Timeout": "Tiempo de espera tras el timbre",
"Alias Number": "Número de alias",
"Alias Numbers": "Números de alias",
"All": "Todos",
@ -45,6 +46,7 @@
"An error occured while trying to load the speed dials. Please try again": "Se produjo un error al intentar cargar las marcaciones rápidas. Por favor, inténtelo nuevamente.",
"An error occured while trying to send the fax. Please try again": "Se produjo un error al intentar enviar el fax. Por favor, inténtelo nuevamente.",
"An error occured while trying to unassign the speed dial slot. Please try again": "Se produjo un error al intentar remover la ranura de marcación rápida. Por favor, inténtelo nuevamente.",
"An error occurred:": "Ocurrió un error:",
"Application": "Aplicación",
"Apps": "Aplicaciones",
"April": "Abril",
@ -192,7 +194,6 @@
"Expires": "Expira",
"Extension": "Extensión",
"Extension Settings": "Configuración de la extensión",
"Firmware Upgrade disable": "Actualización de firmware deshabilitada",
"Fax": "Fax",
"Fax Settings": "Ajustes de Fax",
"Fax to mail and sendfax": "Fax a Correo y Envío de Fax",
@ -206,11 +207,13 @@
"Filter devices": "Filtrar Dispositivos",
"Filter groups": "Filtrar grupos",
"Fine": "Bien",
"Firmware Upgrade disable": "Actualización de firmware deshabilitada",
"Folder : ": "Folder : ",
"Force CLI": "Force CLI",
"Forgot password?": "¿Ha olvidado su contraseña?",
"Format": "Formato",
"Forward": "Forward",
"Forward call after this timeout (applies only when user is available).": "Reenviar la llamada después de este tiempo de espera (solo se aplica si el usuario está disponible).",
"Forward to Auto Attendant": "Reenviar al Asistente Automático",
"Forward to Call Through": "Reenviar a Call Through",
"Forward to Calling Card": "Reenviar a Calling Card",
@ -535,6 +538,7 @@
"There is a problem with your account, please contact support": "Hay un problema con tu cuenta, por favor contacta con el soporte",
"There was an error, please retry later": "Se ha producido un error, por favor vuelva a intentarlo más tarde",
"This number is already in use.": "This number is already in use.",
"This setting is synced with \"After Ring Timeout\", which can be edited above.": "Esta configuración está sincronizada con \"Tiempo de espera tras el timbre\", que se puede editar arriba.",
"Thursday": "Jueves",
"Time": "Tiempo",
"Time is invalid": "El tiempo no es válido",

@ -26,6 +26,7 @@
"Added seat {seat}": "Siège {seat} ajouté",
"Admin name": "Nom de l'administrateur",
"After": "Après",
"After Ring Timeout": "Délai après la sonnerie",
"Alias Number": "Numéro d'alias",
"Alias Numbers": "Numéros associés",
"All": "Tous",
@ -45,6 +46,7 @@
"An error occured while trying to load the speed dials. Please try again": "Une erreur s'est produite lors du chargement des numéros abrégés. Veuillez réessayer",
"An error occured while trying to send the fax. Please try again": "Une erreur est survenue lors de lenvoi du Fax. Veuillez réessayer",
"An error occured while trying to unassign the speed dial slot. Please try again": "Une erreur est survenue lors de la séassignation de l'emplacement de numérotation abrégée. Veuillez réessayer",
"An error occurred:": "Une erreur sest produite:",
"Application": "Application",
"Apps": "Apps",
"April": "Avril",
@ -192,7 +194,6 @@
"Expires": "Expire",
"Extension": "Extension",
"Extension Settings": "Paramètres des extensions",
"Firmware Upgrade disable": "Firmware Mise à niveau désactivée",
"Fax": "Fax",
"Fax Settings": "Paramètres du fax",
"Fax to mail and sendfax": "Fax à E-mail et Sendfax",
@ -206,11 +207,13 @@
"Filter devices": "Filtrer les postes",
"Filter groups": "Groupes de filtres",
"Fine": "Fin",
"Firmware Upgrade disable": "Firmware Mise à niveau désactivée",
"Folder : ": "Folder : ",
"Force CLI": "Force CLI",
"Forgot password?": "Mot de passe oublié ?",
"Format": "Format",
"Forward": "Forward",
"Forward call after this timeout (applies only when user is available).": "Transférer l'appel après ce délai (s'applique uniquement si l'utilisateur est disponible).",
"Forward to Auto Attendant": "Forward to Auto Attendant",
"Forward to Call Through": "Forward to Call Through",
"Forward to Calling Card": "Forward to Calling Card",
@ -534,6 +537,7 @@
"There is a problem with your account, please contact support": "Il y a un problème avec votre compte, veuillez contacter le support",
"There was an error, please retry later": "Il y a eu une erreur, veuillez réessayer plus tard",
"This number is already in use.": "Ce numéro est déjà utilisé.",
"This setting is synced with \"After Ring Timeout\", which can be edited above.": "Ce paramètre est synchronisé avec \"Délai après la sonnerie\", qui peut être modifié ci-dessus.",
"Thursday": "Jeudi",
"Time": "Temps",
"Time is invalid": "L'heure n'est pas valide",

@ -26,6 +26,7 @@
"Added seat {seat}": "Aggiunta postazione {seat}",
"Admin name": "Nome dell'amministratore",
"After": "After",
"After Ring Timeout": "Timeout dopo lo squillo",
"Alias Number": "Numero Alias",
"Alias Numbers": "Numeri Alias",
"All": "Tutto",
@ -44,6 +45,7 @@
"An error occured while trying to load the speed dials. Please try again": "Si è verificato un errore durante il caricamento delle chiamate rapide. Si prega di riprovare",
"An error occured while trying to send the fax. Please try again": "Si è verificato un errore durante l'invio del fax. Si prega di riprovare",
"An error occured while trying to unassign the speed dial slot. Please try again": "Si è verificato un errore nella cancellazione della selezione rapida. Si prega di riprovare",
"An error occurred:": "Si è verificato un errore:",
"Apps": "Apps",
"April": "Aprile",
"Assigned slot {slot}": "Slot assegnato: {slot}",
@ -189,7 +191,6 @@
"Expires": "Scade",
"Extension": "Interno",
"Extension Settings": "Impostazioni dell'Estensione",
"Firmware Upgrade disable": "Aggiornamento del firmware disabilitato",
"Fax": "Fax",
"Fax Settings": "Imposazioni Fax",
"Fax to mail and sendfax": "Fax to mail and sendfax",
@ -203,11 +204,13 @@
"Filter devices": "Filtra dispositivi",
"Filter groups": "Filtra grouppi",
"Fine": "Fine",
"Firmware Upgrade disable": "Aggiornamento del firmware disabilitato",
"Folder : ": "Folder : ",
"Force CLI": "Forza CLI",
"Forgot password?": "Password dimenticata?",
"Format": "Format",
"Forward": "Forward",
"Forward call after this timeout (applies only when user is available).": "Inoltra la chiamata dopo questo timeout (si applica solo se l'utente è disponibile).",
"Forward to Auto Attendant": "Inoltra all'Operatore Automatico",
"Forward to Call Through": "Inoltra al Call Through",
"Forward to Calling Card": "Inoltra al Calling Card",
@ -525,6 +528,7 @@
"There is a problem with your account, please contact support": "C'è un problema con il tuo account, contatta l'assistenza",
"There was an error, please retry later": "There was an error, please retry later",
"This number is already in use.": "Questo numero è già in uso.",
"This setting is synced with \"After Ring Timeout\", which can be edited above.": "Questa impostazione è sincronizzata con \"Timeout dopo lo squillo\", che può essere modificato sopra.",
"Thursday": "Giovedì",
"Time": "Orario",
"Time is invalid": "Orario non valido",

@ -71,6 +71,10 @@
</q-item>
<csc-cf-group-item-primary-number />
</q-list>
<csc-popup-menu-ring-timeout
v-if="isRingTimeoutVisible"
:ring-timeout="ringTimeout"
/>
<div
v-for="group in groups"
:key="group.cfm_id"
@ -93,6 +97,7 @@
import CscPageSticky from 'components/CscPageSticky'
import CscPopupMenu from 'components/CscPopupMenu'
import CscPopupMenuItem from 'components/CscPopupMenuItem'
import CscPopupMenuRingTimeout from 'components/CscPopupMenuRingTimeout'
import CscSpinner from 'components/CscSpinner'
import CscCfGroup from 'components/call-forwarding/CscCfGroup'
import CscCfGroupItemPrimaryNumber from 'components/call-forwarding/CscCfGroupItemPrimaryNumber'
@ -105,6 +110,7 @@ export default {
CscSpinner,
CscPopupMenu,
CscPopupMenuItem,
CscPopupMenuRingTimeout,
CscCfGroup
},
computed: {
@ -116,12 +122,16 @@ export default {
'timeSetMap'
]),
...mapGetters('callForwarding', [
'groups'
'groups',
'ringTimeout'
]),
...mapGetters('user', [
'hasSubscriberProfileAttribute',
'hasSubscriberProfileAttributes'
])
]),
isRingTimeoutVisible () {
return this.ringTimeout && this.groups.some((group) => group.type === 'cft')
}
},
async mounted () {
await this.loadAnnouncements()

Loading…
Cancel
Save