diff --git a/agc_2-X/trunk/www/agc/vdc_script_display.php b/agc_2-X/trunk/www/agc/vdc_script_display.php index 52a603c5..6c66ae16 100644 --- a/agc_2-X/trunk/www/agc/vdc_script_display.php +++ b/agc_2-X/trunk/www/agc/vdc_script_display.php @@ -24,10 +24,11 @@ # 130802-1035 - Changed to PHP mysqli functions # 140429-2034 - Added TABLEper_call_notes display script variable # 140623-2114 - Added script_override variable +# 140630-1023 - Added full_script_height script variable # -$version = '2.10-18'; -$build = '140623-2114'; +$version = '2.10-19'; +$build = '140630-1023'; require_once("dbconnect_mysqli.php"); require_once("functions.php"); @@ -222,6 +223,7 @@ $ENTRYdate = date("YmdHis"); $MT[0]=''; $agents='@agents'; $script_height = ($script_height - 20); +$full_script_height = ($script_height + 200); $IFRAME=0; @@ -470,6 +472,7 @@ $script_text = preg_replace('/--A--camp_script--B--/i',"$camp_script",$script_te $script_text = preg_replace('/--A--in_script--B--/i',"$in_script",$script_text); $script_text = preg_replace('/--A--script_width--B--/i',"$script_width",$script_text); $script_text = preg_replace('/--A--script_height--B--/i',"$script_height",$script_text); +$script_text = preg_replace('/--A--full_script_height--B--/i',"$full_script_height",$script_text); $script_text = preg_replace('/--A--fullname--B--/i',"$fullname",$script_text); $script_text = preg_replace('/--A--recording_filename--B--/i',"$recording_filename",$script_text); $script_text = preg_replace('/--A--recording_id--B--/i',"$recording_id",$script_text); @@ -697,10 +700,18 @@ $script_text = stripslashes($script_text); echo "\n"; echo "\n"; -echo "
\n"; if ( ( ($IFRAME < 1) and ($ScrollDIV > 0) ) or (preg_match("/IGNORENOSCROLL/i",$script_text)) ) - {echo "
";} -echo "
$script_name
\n"; + { + echo "
"; + echo "
"; + } +else + { + echo "
"; + } + +if (strlen($script_override)< 1) + {echo "
$script_name
\n";} echo "$script_text\n"; if ( ( ($IFRAME < 1) and ($ScrollDIV > 0) ) or (preg_match("/IGNORENOSCROLL/i",$script_text)) ) {echo "";} diff --git a/agc_2-X/trunk/www/agc/vicidial.php b/agc_2-X/trunk/www/agc/vicidial.php index 3f0bd888..84d796e9 100644 --- a/agc_2-X/trunk/www/agc/vicidial.php +++ b/agc_2-X/trunk/www/agc/vicidial.php @@ -437,10 +437,11 @@ # 140621-1557 - Added update_settings call to grab selected user and campaign settings more frequently # 140623-1710 - Added wrapup_bypass setting # 140626-0757 - Added wrapup_after_hotkey setting +# 140630-0921 - Added the FSCREEN option to Wrapup message to allow for message only display # -$version = '2.10-408c'; -$build = '140626-0757'; +$version = '2.10-409c'; +$build = '140630-0921'; $mel=1; # Mysql Error Log enabled = 1 $mysql_log_count=80; $one_mysql_log=0; @@ -3167,7 +3168,7 @@ $CLwidth = ($MASTERwidth - 120); # 310 - Calls in queue link $GHheight = ($MASTERheight + 1260);# 1560 - Gender Hide span $DBheight = ($MASTERheight + 260); # 560 - Debug span -$WRheight = ($MASTERheight + 160); # 460 - Warning boxes +$WRheight = ($MASTERheight + 210); # 510 - Warning boxes $CQheight = ($MASTERheight + 140); # 440 - Calls in queue section $SLheight = ($MASTERheight + 122); # 422 - SideBar link, Agents view link $QLheight = ($MASTERheight + 112); # 412 - Calls in queue link @@ -3893,6 +3894,10 @@ if ($enable_fast_refresh < 1) {echo "\tvar refresh_interval = 1000;\n";} var UpdatESettingSChecK=0; var manual_dial_search_checkbox=''; var hide_call_log_info=''; + var regWFS = new RegExp("FSCREEN","g"); + var regWMS = new RegExp("WUSCRIPT","g"); + var FSCREENup=0; + var HKFSCREENup=0; var DiaLControl_auto_HTML = "\"\"Resume\""; var DiaLControl_auto_HTML_ready = "\"\"Resume\""; var DiaLControl_auto_HTML_OFF = "\"\"Resume\""; @@ -11091,15 +11096,21 @@ function set_length(SLnumber,SLlength_goal,SLdirection) else {document.getElementById("WrapupBypass").innerHTML = '';} - var regWMS = new RegExp("WUSCRIPT","g"); + var wrapup_message_script = wrapup_message.replace(regWFS, ''); + wrapup_message_script = wrapup_message_script.replace(regWMS, ''); if (wrapup_message.match(regWMS)) { - var wrapup_message_script = wrapup_message.replace(regWMS, ''); - load_script_contents('WrapupMessage',wrapup_message_script) + if (wrapup_message.match(regWFS)) + {load_script_contents('FSCREENWrapupMessage',wrapup_message_script);} + else + {load_script_contents('WrapupMessage',wrapup_message_script);} } else { - document.getElementById("WrapupMessage").innerHTML = wrapup_message; + if (wrapup_message.match(regWFS)) + {document.getElementById("FSCREENWrapupMessage").innerHTML = "
" + wrapup_message_script + "
";} + else + {document.getElementById("WrapupMessage").innerHTML = wrapup_message_script;} } } } @@ -11857,7 +11868,15 @@ if ($useIE > 0) document.getElementById("HotKeyActionBox").style.top = '1px'; document.getElementById("HotKeyActionBox").style.left = '1px'; document.getElementById("HKWrapupTimer").innerHTML = "
Call Wrapup: " + HKdispo_display + " seconds remaining in wrapup"; - document.getElementById("HKWrapupMessage").innerHTML = "

" + document.getElementById("WrapupMessage").innerHTML + "
 
"; + if (wrapup_message.match(regWFS)) + { + // document.getElementById("FSCREENWrapupMessage").innerHTML = document.getElementById("WrapupMessage").innerHTML; + } + else + { + document.getElementById("HKWrapupMessage").innerHTML = "

" + document.getElementById("WrapupMessage").innerHTML + "
 
"; + } + if (wrapup_bypass == 'ENABLED') { document.getElementById("HKWrapupBypass").innerHTML = "         Finish Wrapup and Move On"; @@ -11879,7 +11898,10 @@ if ($useIE > 0) alt_dial_active = 0; alt_dial_status_display = 0; document.getElementById("HotKeyDispo").innerHTML = HKdispo_ary[0] + " - " + HKdispo_ary[1]; - showDiv('HotKeyActionBox'); + if ( ( (wrapup_after_hotkey == 'ENABLED') && (wrapup_seconds > 0) ) && (wrapup_message.match(regWFS)) ) + {showDiv('FSCREENWrapupBox'); HKFSCREENup=1;} + else + {showDiv('HotKeyActionBox');} hideDiv('HotKeyEntriesBox'); document.vicidial_form.DispoSelection.value = HKdispo_ary[0]; dialedcall_send_hangup('NO', 'YES', HKdispo_ary[0]); @@ -11948,7 +11970,15 @@ else document.getElementById("HotKeyActionBox").style.top = '1px'; document.getElementById("HotKeyActionBox").style.left = '1px'; document.getElementById("HKWrapupTimer").innerHTML = "
Call Wrapup: " + HKdispo_display + " seconds remaining in wrapup"; - document.getElementById("HKWrapupMessage").innerHTML = "

" + document.getElementById("WrapupMessage").innerHTML + "
 
"; + if (wrapup_message.match(regWFS)) + { + // document.getElementById("FSCREENWrapupMessage").innerHTML = document.getElementById("WrapupMessage").innerHTML; + } + else + { + document.getElementById("HKWrapupMessage").innerHTML = "

" + document.getElementById("WrapupMessage").innerHTML + "
 
"; + } + if (wrapup_bypass == 'ENABLED') { document.getElementById("HKWrapupBypass").innerHTML = "         Finish Wrapup and Move On"; @@ -11967,7 +11997,10 @@ else HKdispo_submit = HKdispo_display; HKfinish=1; document.getElementById("HotKeyDispo").innerHTML = HKdispo_ary[0] + " - " + HKdispo_ary[1]; - showDiv('HotKeyActionBox'); + if ( ( (wrapup_after_hotkey == 'ENABLED') && (wrapup_seconds > 0) ) && (wrapup_message.match(regWFS)) ) + {showDiv('FSCREENWrapupBox'); HKFSCREENup=1;} + else + {showDiv('HotKeyActionBox');} hideDiv('HotKeyEntriesBox'); document.vicidial_form.DispoSelection.value = HKdispo_ary[0]; alt_phone_dialing=starting_alt_phone_dialing; @@ -13777,6 +13810,7 @@ function phone_number_format(formatphone) { hideDiv('CustomerGoneBox'); hideDiv('NoneInSessionBox'); hideDiv('WrapupBox'); + hideDiv('FSCREENWrapupBox'); hideDiv('TransferMain'); hideDiv('WelcomeBoxA'); hideDiv('CallBackSelectBox'); @@ -13968,7 +14002,10 @@ function phone_number_format(formatphone) { wrapup_counter=0; if (wrapup_seconds > 0) { - showDiv('WrapupBox'); + if (wrapup_message.match(regWFS)) + {showDiv('FSCREENWrapupBox'); FSCREENup=1;} + else + {showDiv('WrapupBox');} document.getElementById("WrapupTimer").innerHTML = wrapup_seconds; wrapup_waiting=1; } @@ -14201,7 +14238,10 @@ function phone_number_format(formatphone) { { if (hot_keys_active==1) {showDiv('HotKeyEntriesBox');} - hideDiv('HotKeyActionBox'); + if (HKFSCREENup > 0) + {hideDiv('FSCREENWrapupBox'); HKFSCREENup=0;} + else + {hideDiv('HotKeyActionBox');} } HKdispo_display--; if ( (wrapup_after_hotkey == 'ENABLED') && (wrapup_seconds > 0) ) @@ -14279,10 +14319,13 @@ function phone_number_format(formatphone) { { document.getElementById("WrapupTimer").innerHTML = (wrapup_seconds - wrapup_counter); wrapup_counter++; - if ( (wrapup_counter > wrapup_seconds) && (document.getElementById("WrapupBox").style.visibility == 'visible') ) + if ( (wrapup_counter > wrapup_seconds) && ( (document.getElementById("WrapupBox").style.visibility == 'visible') || (FSCREENup > 0) ) ) { wrapup_waiting=0; - hideDiv('WrapupBox'); + if (FSCREENup > 0) + {hideDiv('FSCREENWrapupBox'); FSCREENup=0;} + else + {hideDiv('WrapupBox');} if (document.vicidial_form.DispoSelectStop.checked==true) { if (auto_dial_level != '0') @@ -15645,6 +15688,8 @@ class="cust_form_text" value="">;" id="FSCREENWrapupBox">
+