diff --git a/src/apps/callcenter/app.js b/src/apps/callcenter/app.js index a2fa423..10ece56 100644 --- a/src/apps/callcenter/app.js +++ b/src/apps/callcenter/app.js @@ -1214,15 +1214,39 @@ var app = { $parent.find(selector).each(function(i, el){ var $el = $(el); var name = $el.attr('name'); + var nameArr = name.split("."); //for subobjects, like 'announcements' + var subObject = {}; + if (nameArr.length > 1) { + subKey = nameArr[0]; + name = nameArr[1]; + } if(el.tagName === 'INPUT') { if($el.attr('type') === 'checkbox') { - result[name] = !!$el.is(':checked'); + checkboxValue = !!$el.is(':checked'); + if (nameArr.length > 1) { + if (result[subKey]) { + subObject = result[subKey]; + } + subObject[name] = checkboxValue; + result[subKey] = subObject; + } else { + result[name] = checkboxValue; + } return; } if(!!$el.val()) { - result[name] = $el.val(); + var itemValue = $el.val(); + if (nameArr.length > 1) { + if (result[subKey]) { + subObject = result[subKey]; + } + subObject[name] = itemValue; + result[subKey] = subObject; + } else { + result[name] = itemValue; + } return; } } diff --git a/src/apps/callcenter/i18n/de-DE.json b/src/apps/callcenter/i18n/de-DE.json index d89f6c3..f03d3a1 100644 --- a/src/apps/callcenter/i18n/de-DE.json +++ b/src/apps/callcenter/i18n/de-DE.json @@ -58,6 +58,8 @@ "maxNumberCallsHelpText": "How many callers are allowed to wait on hold in the queue (0 for no limit).", "maxHoldTimeLabel": "Max Hold Time (s)", "maxHoldTimeHelpText": "In seconds, how long to try to connect the caller before progressing past the queue callflow action (0 for no limit).", + "positionAnnouncementsLabel": "Position Announcements", + "waitTimeAnnouncementsLabel": "Wait Time Announcements", "enterWhenEmptyLabel": "Allows a caller to enter this queue when no agents are available." }, "notificationsPanel": { diff --git a/src/apps/callcenter/i18n/dk-DK.json b/src/apps/callcenter/i18n/dk-DK.json index 4274c27..63416ec 100644 --- a/src/apps/callcenter/i18n/dk-DK.json +++ b/src/apps/callcenter/i18n/dk-DK.json @@ -59,6 +59,8 @@ "maxNumberCallsHelpText": "How many callers are allowed to wait on hold in the queue (0 for no limit).", "maxHoldTimeLabel": "Max Hold Time (s)", "maxHoldTimeHelpText": "In seconds, how long to try to connect the caller before progressing past the queue callflow action (0 for no limit).", + "positionAnnouncementsLabel": "Position Announcements", + "waitTimeAnnouncementsLabel": "Wait Time Announcements", "enterWhenEmptyLabel": "Allows a caller to enter this queue when no agents are available." }, "notificationsPanel": { diff --git a/src/apps/callcenter/i18n/en-NZ.json b/src/apps/callcenter/i18n/en-NZ.json index 4274c27..63416ec 100644 --- a/src/apps/callcenter/i18n/en-NZ.json +++ b/src/apps/callcenter/i18n/en-NZ.json @@ -59,6 +59,8 @@ "maxNumberCallsHelpText": "How many callers are allowed to wait on hold in the queue (0 for no limit).", "maxHoldTimeLabel": "Max Hold Time (s)", "maxHoldTimeHelpText": "In seconds, how long to try to connect the caller before progressing past the queue callflow action (0 for no limit).", + "positionAnnouncementsLabel": "Position Announcements", + "waitTimeAnnouncementsLabel": "Wait Time Announcements", "enterWhenEmptyLabel": "Allows a caller to enter this queue when no agents are available." }, "notificationsPanel": { diff --git a/src/apps/callcenter/i18n/en-US.json b/src/apps/callcenter/i18n/en-US.json index 4274c27..63416ec 100644 --- a/src/apps/callcenter/i18n/en-US.json +++ b/src/apps/callcenter/i18n/en-US.json @@ -59,6 +59,8 @@ "maxNumberCallsHelpText": "How many callers are allowed to wait on hold in the queue (0 for no limit).", "maxHoldTimeLabel": "Max Hold Time (s)", "maxHoldTimeHelpText": "In seconds, how long to try to connect the caller before progressing past the queue callflow action (0 for no limit).", + "positionAnnouncementsLabel": "Position Announcements", + "waitTimeAnnouncementsLabel": "Wait Time Announcements", "enterWhenEmptyLabel": "Allows a caller to enter this queue when no agents are available." }, "notificationsPanel": { diff --git a/src/apps/callcenter/i18n/es-ES.json b/src/apps/callcenter/i18n/es-ES.json index fdcc4f7..74fffb9 100644 --- a/src/apps/callcenter/i18n/es-ES.json +++ b/src/apps/callcenter/i18n/es-ES.json @@ -58,6 +58,8 @@ "maxNumberCallsHelpText": "How many callers are allowed to wait on hold in the queue (0 for no limit).", "maxHoldTimeLabel": "Max Hold Time (s)", "maxHoldTimeHelpText": "In seconds, how long to try to connect the caller before progressing past the queue callflow action (0 for no limit).", + "positionAnnouncementsLabel": "Position Announcements", + "waitTimeAnnouncementsLabel": "Wait Time Announcements", "enterWhenEmptyLabel": "Allows a caller to enter this queue when no agents are available." }, "notificationsPanel": { diff --git a/src/apps/callcenter/i18n/fr-FR.json b/src/apps/callcenter/i18n/fr-FR.json index 1665f7d..2fa6876 100644 --- a/src/apps/callcenter/i18n/fr-FR.json +++ b/src/apps/callcenter/i18n/fr-FR.json @@ -57,6 +57,8 @@ "maxNumberCallsHelpText": "How many callers are allowed to wait on hold in the queue (0 for no limit).", "maxHoldTimeLabel": "Max Hold Time (s)", "maxHoldTimeHelpText": "In seconds, how long to try to connect the caller before progressing past the queue callflow action (0 for no limit).", + "positionAnnouncementsLabel": "Position Announcements", + "waitTimeAnnouncementsLabel": "Wait Time Announcements", "enterWhenEmptyLabel": "Allows a caller to enter this queue when no agents are available." }, "notificationsPanel": { diff --git a/src/apps/callcenter/i18n/it-IT.json b/src/apps/callcenter/i18n/it-IT.json index 1665f7d..2fa6876 100644 --- a/src/apps/callcenter/i18n/it-IT.json +++ b/src/apps/callcenter/i18n/it-IT.json @@ -57,6 +57,8 @@ "maxNumberCallsHelpText": "How many callers are allowed to wait on hold in the queue (0 for no limit).", "maxHoldTimeLabel": "Max Hold Time (s)", "maxHoldTimeHelpText": "In seconds, how long to try to connect the caller before progressing past the queue callflow action (0 for no limit).", + "positionAnnouncementsLabel": "Position Announcements", + "waitTimeAnnouncementsLabel": "Wait Time Announcements", "enterWhenEmptyLabel": "Allows a caller to enter this queue when no agents are available." }, "notificationsPanel": { diff --git a/src/apps/callcenter/i18n/nl-NL.json b/src/apps/callcenter/i18n/nl-NL.json index 7c3e691..54a0fd4 100644 --- a/src/apps/callcenter/i18n/nl-NL.json +++ b/src/apps/callcenter/i18n/nl-NL.json @@ -57,6 +57,8 @@ "maxNumberCallsHelpText": "How many callers are allowed to wait on hold in the queue (0 for no limit).", "maxHoldTimeLabel": "Max Hold Time (s)", "maxHoldTimeHelpText": "In seconds, how long to try to connect the caller before progressing past the queue callflow action (0 for no limit).", + "positionAnnouncementsLabel": "Position Announcements", + "waitTimeAnnouncementsLabel": "Wait Time Announcements", "enterWhenEmptyLabel": "Allows a caller to enter this queue when no agents are available." }, "notificationsPanel": { @@ -87,4 +89,4 @@ "manageQueues": "Manage Queues" } } -} \ No newline at end of file +} diff --git a/src/apps/callcenter/i18n/pt-PT.json b/src/apps/callcenter/i18n/pt-PT.json index 4274c27..63416ec 100644 --- a/src/apps/callcenter/i18n/pt-PT.json +++ b/src/apps/callcenter/i18n/pt-PT.json @@ -59,6 +59,8 @@ "maxNumberCallsHelpText": "How many callers are allowed to wait on hold in the queue (0 for no limit).", "maxHoldTimeLabel": "Max Hold Time (s)", "maxHoldTimeHelpText": "In seconds, how long to try to connect the caller before progressing past the queue callflow action (0 for no limit).", + "positionAnnouncementsLabel": "Position Announcements", + "waitTimeAnnouncementsLabel": "Wait Time Announcements", "enterWhenEmptyLabel": "Allows a caller to enter this queue when no agents are available." }, "notificationsPanel": { diff --git a/src/apps/callcenter/i18n/ro-RO.json b/src/apps/callcenter/i18n/ro-RO.json index f8c3b99..0d23524 100644 --- a/src/apps/callcenter/i18n/ro-RO.json +++ b/src/apps/callcenter/i18n/ro-RO.json @@ -60,6 +60,8 @@ "maxNumberCallsHelpText": "How many callers are allowed to wait on hold in the queue (0 for no limit).", "maxHoldTimeLabel": "Max Hold Time (s)", "maxHoldTimeHelpText": "In seconds, how long to try to connect the caller before progressing past the queue callflow action (0 for no limit).", + "positionAnnouncementsLabel": "Position Announcements", + "waitTimeAnnouncementsLabel": "Wait Time Announcements", "enterWhenEmptyLabel": "Allows a caller to enter this queue when no agents are available." }, "notificationsPanel": { diff --git a/src/apps/callcenter/i18n/ru-RU.json b/src/apps/callcenter/i18n/ru-RU.json index 0cc2662..7e04b11 100644 --- a/src/apps/callcenter/i18n/ru-RU.json +++ b/src/apps/callcenter/i18n/ru-RU.json @@ -57,6 +57,8 @@ "maxNumberCallsHelpText": "Сколько абонентов могут ждать в очереди в очереди (0 - без ограничений)", "maxHoldTimeLabel": "Максимальное время удержания (в секундах)", "maxHoldTimeHelpText": "В секундах, как долго пытаться подключить вызывающего абонента до того, как он перейдёт к следующим действиям очереди (0 - без ограничений).", + "positionAnnouncementsLabel": "Position Announcements", + "waitTimeAnnouncementsLabel": "Wait Time Announcements", "enterWhenEmptyLabel": "Позволить вызывающему абоненту войти в эту очередь, когда агенты недоступны." }, diff --git a/src/apps/callcenter/i18n/zh-CN.json b/src/apps/callcenter/i18n/zh-CN.json index db34322..e0af39f 100644 --- a/src/apps/callcenter/i18n/zh-CN.json +++ b/src/apps/callcenter/i18n/zh-CN.json @@ -57,6 +57,8 @@ "maxNumberCallsHelpText": "How many callers are allowed to wait on hold in the queue (0 for no limit).", "maxHoldTimeLabel": "Max Hold Time (s)", "maxHoldTimeHelpText": "In seconds, how long to try to connect the caller before progressing past the queue callflow action (0 for no limit).", + "positionAnnouncementsLabel": "Position Announcements", + "waitTimeAnnouncementsLabel": "Wait Time Announcements", "enterWhenEmptyLabel": "Allows a caller to enter this queue when no agents are available." }, "notificationsPanel": { @@ -87,4 +89,4 @@ "manageQueues": "Manage Queues" } } -} \ No newline at end of file +} diff --git a/src/apps/callcenter/views/settings_queue_form.html b/src/apps/callcenter/views/settings_queue_form.html index f6df78b..989431c 100644 --- a/src/apps/callcenter/views/settings_queue_form.html +++ b/src/apps/callcenter/views/settings_queue_form.html @@ -122,6 +122,32 @@ +
+ +
+
+ +
+
+
+ +
+ +
+
+ +
+
+
+
@@ -197,4 +223,4 @@ {{/if}}
- \ No newline at end of file +