Added holiday_method option

git-svn-id: svn://192.168.202.10@3810 3d104415-ff17-0410-8863-d5cf3c621b8a

agc_2-X/trunk/agi/agi-VDAD_ALL_inbound.agi

@@ -259,6 +259,7 @@
 # 231026-0917 - Fix for rare fronter/closer logging issue
 # 240219-1527 - Added daily_limit in-group  user parameter
 # 240223-0847 - Added INBOUND_DID populate option
+# 240227-1154 - Added holiday_method option
 #
 
 $script = 'agi-VDAD_ALL_inbound.agi';
@@ -1252,6 +1253,7 @@ if ( ($ct_day_start > 0) || ($ct_day_stop > 0) )
 	$ct_default_stop	=	$ct_day_stop;
 	}
 
+$holiday_ADDITION_REVERSE_trigger=0;
 if (length($ct_holidays) > 2)
 	{
 	$stmtA = "SELECT count(*) from vicidial_call_time_holidays where holiday_date='$YMD' and holiday_status='ACTIVE';";
@@ -1272,7 +1274,7 @@ if (length($ct_holidays) > 2)
 			{
 			if (length($holiday_rules[$b])>1)
 				{
-				$stmtA = "SELECT holiday_id,holiday_date,holiday_name,ct_default_start,ct_default_stop,default_afterhours_filename_override from vicidial_call_time_holidays where holiday_id='$holiday_rules[$b]' and holiday_status='ACTIVE' and holiday_date='$YMD';";
+				$stmtA = "SELECT holiday_id,holiday_date,holiday_name,ct_default_start,ct_default_stop,default_afterhours_filename_override,holiday_method from vicidial_call_time_holidays where holiday_id='$holiday_rules[$b]' and holiday_status='ACTIVE' and holiday_date='$YMD' order by ct_default_start desc;";
 				if ($DBX) {print "   |$stmtA|\n";}
 				$sthA = $dbhA->prepare($stmtA) or die "preparing: ",$dbhA->errstr;
 				$sthA->execute or die "executing: $stmtA ", $dbhA->errstr;
@@ -1283,12 +1285,32 @@ if (length($ct_holidays) > 2)
 					$holiday_id =								$aryA[0];
 					$holiday_date =								$aryA[1];
 					$holiday_name =								$aryA[2];
-					$ct_default_start =							$aryA[3];
+					$holiday_method =							$aryA[6];
-					$ct_default_stop =							$aryA[4];
-					$default_afterhours_filename_override =		$aryA[5];
-					$holiday_afterhours_filename_override =		$aryA[5];
 
-					if ($AGILOG) {$agi_string = "Active Holiday found!    |$holiday_id|$holiday_date|$holiday_name|$ct_default_start|$ct_default_stop|$default_afterhours_filename_override|";   &agi_output;}
+					if ($AGILOG) {$agi_string = "Active Holiday found!    |$holiday_id|$holiday_date|$holiday_name|$hm|$aryA[3]|$aryA[4]|$aryA[5]|$holiday_method|";   &agi_output;}
+
+					if ($holiday_method =~ /ADDITION_REVERSE/)
+						{
+						$temp_begin =	($ct_default_start + 0);	# ex: 1100
+						$temp_end =		($ct_default_stop + 0);		# ex: 2300
+						if ($AGILOG) {$agi_string = "Holiday ADDITION_REVERSE check:    |$holiday_id|$holiday_date|$holiday_name|($temp_begin <= $hm)|$temp_end >= $hm)|$aryA[5]|$holiday_method|";   &agi_output;}
+						if ( ($temp_begin <= $hm) && ($temp_end >= $hm) )
+							{
+							$default_afterhours_filename_override =		$aryA[5];
+							$holiday_afterhours_filename_override =		$aryA[5];
+
+							$holiday_ADDITION_REVERSE_trigger++;
+
+							if ($AGILOG) {$agi_string = "Holiday ADDITION_REVERSE match!    |$holiday_id|$holiday_ADDITION_REVERSE_trigger|";   &agi_output;}
+							}
+						}
+					else
+						{
+						$ct_default_start =							$aryA[3];
+						$ct_default_stop =							$aryA[4];
+						$default_afterhours_filename_override =		$aryA[5];
+						$holiday_afterhours_filename_override =		$aryA[5];
+						}
 					}
 				$sthA->finish();
 				}
@@ -1920,7 +1942,9 @@ if ( ($max_calls_method !~ /DISABLED/) && ($max_calls_count > 0) )
 $ct_stop_overflow=0;   # allow for overflow time, past midnight
 if ($ct_yest_stop > 2400)
 	{$ct_stop_overflow = ($ct_yest_stop - 2400);}
-if ( ( ( ( ($hm < $ct_default_start) || ($hm > $ct_default_stop) ) && ($hm >= $ct_stop_overflow) ) || ($MCafterhours_override > 0) ) && ($dial_ingroup_flag < 1) )
+if ($AGILOG) {$agi_string = "--  Checking for After Hours: |($hm < $ct_default_start)|($hm > $ct_default_stop)|$holiday_ADDITION_REVERSE_trigger|($hm >= $ct_stop_overflow) )|($MCafterhours_override > 0)|$dial_ingroup_flag|";   &agi_output;}
+
+if ( ( ( ( ($hm < $ct_default_start) || ($hm > $ct_default_stop) || ($holiday_ADDITION_REVERSE_trigger > 0) ) && ($hm >= $ct_stop_overflow) ) || ($MCafterhours_override > 0) ) && ($dial_ingroup_flag < 1) )
 	{
 	# set the log-user to the agentdirect destination user, if set
 	if ( ($channel_group =~ /AGENTDIRECT/i) && (length($agent_only) > 1) )

agc_2-X/trunk/agi/agi-VDAD_inbound_calltime_check.agi

@@ -32,7 +32,7 @@
 #exten => 1234,2,AGI(agi-VDAD_inbound_calltime_check.agi,INBOUND-----YES-----START-----24hours-----EXTENSION-----101-----default-----NO-----YES)
 #exten => 1234,3,Hangup
 #
-# Copyright (C) 2023  Matt Florell <vicidial@gmail.com>    LICENSE: AGPLv2
+# Copyright (C) 2024  Matt Florell <vicidial@gmail.com>    LICENSE: AGPLv2
 #
 # changes:
 # 80525-0144 - First Build
@@ -58,6 +58,7 @@
 # 200624-2302 - Added play sip-silence audio option
 # 201026-1501 - Fix for overwriting short CIDnum
 # 230118-1728 - Added response logging for manual dial outbound calls
+# 240227-1154 - Added holiday_method option
 #
 
 $script = 'agi-VDAD_inbound_calltime_check.agi';
@@ -480,6 +481,7 @@ if ($sthArows > 0)
 		}
 	}
 
+$holiday_ADDITION_REVERSE_trigger=0;
 if (length($ct_holidays) > 2)
 	{
 	$stmtA = "SELECT count(*) from vicidial_call_time_holidays where holiday_date='$YMD' and holiday_status='ACTIVE';";
@@ -500,7 +502,7 @@ if (length($ct_holidays) > 2)
 			{
 			if (length($holiday_rules[$b])>1)
 				{
-				$stmtA = "SELECT holiday_id,holiday_date,holiday_name,ct_default_start,ct_default_stop,default_afterhours_filename_override from vicidial_call_time_holidays where holiday_id='$holiday_rules[$b]' and holiday_status='ACTIVE' and holiday_date='$YMD';";
+				$stmtA = "SELECT holiday_id,holiday_date,holiday_name,ct_default_start,ct_default_stop,default_afterhours_filename_override,holiday_method from vicidial_call_time_holidays where holiday_id='$holiday_rules[$b]' and holiday_status='ACTIVE' and holiday_date='$YMD' order by ct_default_start desc;";
 				if ($DBX) {print "   |$stmtA|\n";}
 				$sthA = $dbhA->prepare($stmtA) or die "preparing: ",$dbhA->errstr;
 				$sthA->execute or die "executing: $stmtA ", $dbhA->errstr;
@@ -508,14 +510,32 @@ if (length($ct_holidays) > 2)
 				if ($sthArows > 0)
 					{
 					@aryA = $sthA->fetchrow_array;
-					$holiday_id =								$aryA[0];
+					$holiday_id =							$aryA[0];
-					$holiday_date =								$aryA[1];
+					$holiday_date =							$aryA[1];
-					$holiday_name =								$aryA[2];
+					$holiday_name =							$aryA[2];
-					$ct_default_start =							$aryA[3];
+					$holiday_method =						$aryA[6];
-					$ct_default_stop =							$aryA[4];
+					if ($AGILOG) {$agi_string = "Active Holiday found!    |$holiday_id|$holiday_date|$holiday_name|$hm|$aryA[3]|$aryA[4]|$aryA[5]|$holiday_method|";   &agi_output;}
-					$default_afterhours_filename_override =		$aryA[5];
 
-					if ($AGILOG) {$agi_string = "Active Holiday found!    |$holiday_id|$holiday_date|$holiday_name|$ct_default_start|$ct_default_stop|$default_afterhours_filename_override|";   &agi_output;}
+					if ($holiday_method =~ /ADDITION_REVERSE/)
+						{
+						$temp_begin =	($ct_default_start + 0);	# ex: 1100
+						$temp_end =		($ct_default_stop + 0);		# ex: 2300
+						if ($AGILOG) {$agi_string = "Holiday ADDITION_REVERSE check:    |$holiday_id|$holiday_date|$holiday_name|($temp_begin <= $hm)|$temp_end >= $hm)|$aryA[5]|$holiday_method|";   &agi_output;}
+						if ( ($temp_begin <= $hm) && ($temp_end >= $hm) )
+							{
+							$after_hours_message_filename =		$aryA[5];
+
+							$holiday_ADDITION_REVERSE_trigger++;
+
+							if ($AGILOG) {$agi_string = "Holiday ADDITION_REVERSE match!    |$holiday_id|$holiday_ADDITION_REVERSE_trigger|";   &agi_output;}
+							}
+						}
+					else
+						{
+						$ct_default_start =					$aryA[3];
+						$ct_default_stop =					$aryA[4];
+						$after_hours_message_filename =		$aryA[5];
+						}
 					}
 				$sthA->finish();
 				}
@@ -534,7 +554,7 @@ if ($sip_silence_playback =~ /YES/i)
 $ct_stop_overflow=0;   # allow for overflow time, past midnight
 if ($ct_yest_stop > 2400)
 	{$ct_stop_overflow = ($ct_yest_stop - 2400);}
-if ( ( ($hm < $ct_default_start) || ($hm > $ct_default_stop) ) && ($hm >= $ct_stop_overflow) )
+if ( ( ($hm < $ct_default_start) || ($hm > $ct_default_stop) || ($holiday_ADDITION_REVERSE_trigger > 0) ) && ($hm >= $ct_stop_overflow) )
 	{
 	$VHqueryCID = "VA$CIDdate$hour$min$sec$sec";
 

agc_2-X/trunk/extras/MySQL_AST_CREATE_tables.sql

@@ -3364,7 +3364,8 @@ holiday_status ENUM('ACTIVE','INACTIVE','EXPIRED') default 'INACTIVE',
 ct_default_start SMALLINT(4) unsigned NOT NULL default '900',
 ct_default_stop SMALLINT(4) unsigned NOT NULL default '2100',
 default_afterhours_filename_override VARCHAR(255) default '',
-user_group VARCHAR(20) default '---ALL---'
+user_group VARCHAR(20) default '---ALL---',
+holiday_method VARCHAR(40) default 'REPLACE'
 ) ENGINE=MyISAM;
 
 CREATE TABLE vicidial_email_list (
@@ -5631,4 +5632,4 @@ INSERT INTO `wallboard_reports` VALUES ('AGENTS_AND_QUEUES','Agents and Queues',
 
 UPDATE system_settings set vdc_agent_api_active='1';
 
-UPDATE system_settings SET db_schema_version='1709',db_schema_update_date=NOW(),reload_timestamp=NOW();
+UPDATE system_settings SET db_schema_version='1710',db_schema_update_date=NOW(),reload_timestamp=NOW();

agc_2-X/trunk/extras/upgrade_2.14.sql

@@ -2665,3 +2665,7 @@ UPDATE system_settings SET db_schema_version='1708',db_schema_update_date=NOW()
 ALTER TABLE vicidial_campaigns MODIFY hopper_hold_inserts ENUM('ENABLED','DISABLED','AUTONEXT') default 'DISABLED';
 
 UPDATE system_settings SET db_schema_version='1709',db_schema_update_date=NOW() where db_schema_version < 1709;
+
+ALTER TABLE vicidial_call_time_holidays ADD holiday_method VARCHAR(40) default 'REPLACE';
+
+UPDATE system_settings SET db_schema_version='1710',db_schema_update_date=NOW() where db_schema_version < 1710;

agc_2-X/trunk/www/vicidial/admin.php

@@ -2812,6 +2812,8 @@ if (isset($_GET["daily_phone_number_call_limit"]))			{$daily_phone_number_call_l
 	elseif (isset($_POST["daily_phone_number_call_limit"]))	{$daily_phone_number_call_limit=$_POST["daily_phone_number_call_limit"];}
 if (isset($_GET["state_descriptions"]))				{$state_descriptions=$_GET["state_descriptions"];}
 	elseif (isset($_POST["state_descriptions"]))	{$state_descriptions=$_POST["state_descriptions"];}
+if (isset($_GET["holiday_method"]))				{$holiday_method=$_GET["holiday_method"];}
+	elseif (isset($_POST["holiday_method"]))	{$holiday_method=$_POST["holiday_method"];}
 
 $DB=preg_replace("/[^0-9a-zA-Z]/","",$DB);
 
@@ -3561,6 +3563,7 @@ $force_per_call_notes = preg_replace('/[^-_0-9a-zA-Z]/','',$force_per_call_notes
 $third_alert_trigger = preg_replace('/[^-_0-9a-zA-Z]/','',$third_alert_trigger);
 $agent_search_ingroup_list = preg_replace('/[^-_0-9a-zA-Z]/','',$agent_search_ingroup_list);
 $hopper_hold_inserts = preg_replace('/[^-_0-9a-zA-Z]/','',$hopper_hold_inserts);
+$holiday_method = preg_replace('/[^-_0-9a-zA-Z]/','',$holiday_method);
 
 if ($non_latin < 1)
 	{
@@ -6133,12 +6136,13 @@ if ($SSscript_remove_js > 0)
 # 240223-0854 - Added INBOUND_DID In-Group populate option
 # 240225-0933 - Added the AUTONEXT hopper_hold_inserts campaign option
 # 240226-2128 - Fix for READ_ONLY settings container type
+# 240227-1127 - Added holiday_method option
 #
 
 # make sure you have added a user to the vicidial_users MySQL table with at least user_level 9 to access this page the first time
 
-$admin_version = '2.14-910a';
+$admin_version = '2.14-911a';
-$build = '240226-2128';
+$build = '240227-1127';
 
 $STARTtime = date("U");
 $SQLdate = date("Y-m-d H:i:s");
@@ -19383,7 +19387,7 @@ if ($ADD==4211111111)
 			{
 			$ct_default_start = preg_replace('/\D/', '', $ct_default_start);
 			$ct_default_stop = preg_replace('/\D/', '', $ct_default_stop);
-			$stmt="UPDATE vicidial_call_time_holidays set holiday_name='$holiday_name', holiday_comments='$holiday_comments', holiday_date='$holiday_date', holiday_status='$holiday_status', ct_default_start='$ct_default_start', ct_default_stop='$ct_default_stop',user_group='$user_group', default_afterhours_filename_override='$default_afterhours_filename_override' where holiday_id='$holiday_id';";
+			$stmt="UPDATE vicidial_call_time_holidays set holiday_name='$holiday_name', holiday_comments='$holiday_comments', holiday_date='$holiday_date', holiday_status='$holiday_status', ct_default_start='$ct_default_start', ct_default_stop='$ct_default_stop',user_group='$user_group', default_afterhours_filename_override='$default_afterhours_filename_override',holiday_method='$holiday_method' where holiday_id='$holiday_id';";
 			$rslt=mysql_to_mysqli($stmt, $link);
 
 			echo "<br><B>"._QXZ("HOLIDAY MODIFIED")."</B>\n";
@@ -40101,13 +40105,15 @@ if ($ADD==311111111)
 			{
 			$hrs_SQL = "$hrs_SQL''";
 			$hrs_holiday_SQL = "$hrs_holiday_SQL''";
-			$hrs_SQL = "where holiday_id NOT IN($hrs_SQL) and holiday_date NOT IN($hrs_holiday_SQL) $LOGadmin_viewable_groupsSQL";
+		#	$hrs_SQL = "where holiday_id NOT IN($hrs_SQL) and holiday_date NOT IN($hrs_holiday_SQL) $LOGadmin_viewable_groupsSQL";
+			$hrs_SQL = "where holiday_id NOT IN($hrs_SQL) $LOGadmin_viewable_groupsSQL";
 			}
 		else
 			{$hrs_SQL="$whereLOGadmin_viewable_groupsSQL";}
 		$stmt="SELECT holiday_id,holiday_date from vicidial_call_time_holidays $hrs_SQL order by holiday_date;";
 		$rslt=mysql_to_mysqli($stmt, $link);
 		$hct_to_print = mysqli_num_rows($rslt);
+		if ($DB > 0) {echo "|$hct_to_print|$stmt|";}
 		$hct_list='';
 
 		$o=0;
@@ -40379,7 +40385,7 @@ if ($ADD==3211111111)
 		echo "<TABLE><TR><TD>\n";
 		echo "<FONT FACE=\"ARIAL,HELVETICA\" COLOR=BLACK SIZE=2>";
 
-		$stmt="SELECT holiday_id,holiday_date,holiday_name,holiday_comments,holiday_status,ct_default_start,ct_default_stop,user_group,default_afterhours_filename_override from vicidial_call_time_holidays where holiday_id='$holiday_id' $LOGadmin_viewable_groupsSQL;";
+		$stmt="SELECT holiday_id,holiday_date,holiday_name,holiday_comments,holiday_status,ct_default_start,ct_default_stop,user_group,default_afterhours_filename_override,holiday_method from vicidial_call_time_holidays where holiday_id='$holiday_id' $LOGadmin_viewable_groupsSQL;";
 		$rslt=mysql_to_mysqli($stmt, $link);
 		$row=mysqli_fetch_row($rslt);
 		$holiday_date =							$row[1];
@@ -40390,6 +40396,7 @@ if ($ADD==3211111111)
 		$ct_default_stop =						$row[6];
 		$user_group =							$row[7];
 		$default_afterhours_filename_override =	$row[8];
+		$holiday_method =						$row[9];
 
 		echo "<FONT FACE=\"ARIAL,HELVETICA\" COLOR=BLACK SIZE=2>";
 
@@ -40421,7 +40428,9 @@ if ($ADD==3211111111)
 		echo "// o_cal.a_tpl.weekstart = 1; // Monday week start\n";
 		echo "</script> $NWB#call_times-holiday_date$NWE</td></tr>\n";
 
-		echo "<tr bgcolor=#$SSstd_row4_background><td align=right>"._QXZ("Holiday Status").": </td><td align=left colspan=3><select size=1 name=holiday_status><option value='ACTIVE' SELECTED>"._QXZ("ACTIVE")."</option><option value='INACTIVE'>"._QXZ("INACTIVE")."</option><option value='EXPIRED'>"._QXZ("EXPIRED")."</option><option value='$holiday_status' SELECTED>"._QXZ("$holiday_status")."</option></select>$NWB#call_times-holiday_status$NWE</td></tr>\n";
+		echo "<tr bgcolor=#$SSstd_row4_background><td align=right>"._QXZ("Holiday Status").": </td><td align=left colspan=3><select size=1 name=holiday_status><option value='ACTIVE'>"._QXZ("ACTIVE")."</option><option value='INACTIVE'>"._QXZ("INACTIVE")."</option><option value='EXPIRED'>"._QXZ("EXPIRED")."</option><option value='$holiday_status' SELECTED>"._QXZ("$holiday_status")."</option></select>$NWB#call_times-holiday_status$NWE</td></tr>\n";
+
+		echo "<tr bgcolor=#$SSstd_row4_background><td align=right>"._QXZ("Holiday Inbound Method").": </td><td align=left colspan=3><select size=1 name=holiday_method><option value='REPLACE'>"._QXZ("REPLACE")."</option><option value='ADDITION_REVERSE'>"._QXZ("ADDITION_REVERSE")."</option><option value='$holiday_method' SELECTED>"._QXZ("$holiday_method")."</option></select>$NWB#call_times-holiday_method$NWE</td></tr>\n";
 
 		echo "<tr bgcolor=#$SSstd_row4_background><td align=center colspan=4><input style='background-color:#$SSbutton_color' type=submit name=SUBMIT value='"._QXZ("SUBMIT")."'></td></tr>\n";
 		echo "</TABLE><BR><BR>\n";

agc_2-X/trunk/www/vicidial/help_documentation.txt

@@ -1,4 +1,4 @@
-# version: 20240225093101
+# version: 20240227113201
 users-user	User ID	<QXZ>This field is where you put the users ID number, can be up to 20 digits in length, Must be at least 2 characters in length. We strongly recommend not reusing user accounts for different users, for reporting accuracy. To disable a user account, set the Active option to -N-.</QXZ>
 users-pass	Password	<QXZ>This field is where you put the users password. Must be at least 2 characters in length, unless the User Password Minimum Length system setting is enabled, which will require a longer password. Only letters and numbers are allowed in user passwords. A medium strength user password will be at least 10 characters in length, and a strong user password will be at least 20 characters in length and have letters as well as at least one number. It is recommended that you use a longer password if possible, stringing together several unrelated words with no spaces, and a number somewhere in the string. The maximum size of a password is 100 characters.</QXZ>
 users-force_change_password	Force Change Password	<QXZ>If this option is set to Y then the user will be prompted to change their password the next time they log in to the administration webpage or the agent screen. Default is N.</QXZ>
@@ -855,6 +855,7 @@ call_times-holiday_name	Holiday Name	<QXZ>This is a more descriptive name of the
 call_times-holiday_comments	Holiday Comments	<QXZ>This is where you can place comments for a Holiday Definition such as -10am to 4pm boxing day restrictions-.  max 255 characters.</QXZ>
 call_times-holiday_date	Holiday Date	<QXZ>This is the date of the holiday.</QXZ>
 call_times-holiday_status	Holiday Status	<QXZ>This is the status of the holiday entry. ACTIVE status means that the holiday will be enabled on the holiday date. INACTIVE status means that the holiday will be ignored even on the holiday date. EXPIRED means that the holiday has passed its holiday date. Default is INACTIVE.</QXZ>
+call_times-holiday_method	Holiday Inbound Method	<QXZ>For inbound call handling only, this option allows you to override the default of REPLACE, where the Holiday Start and Stop times will simply replace the start and stop times of the active Call Time. The ADDITION_REVERSE option will still enforce the active Call Time, but it will also look at all active Holidays for the current day and if the time is within the Start and Stop times of the Holiday, it will trigger the After Hours action. When using the ADDITION_REVERSE method and multiple Holidays match, the holiday with the start time closer to the current time will be used.</QXZ>
 phones-agent_park_on_extension	Agent Park Exten	<QXZ>This is the default Parking extension for the client apps. Verify that a different one works before you change this.</QXZ>
 shifts-shift_id	Shift ID	<QXZ>This is the short name of a system Shift Definition. This needs to be a unique identifier. Do not use any spaces or punctuation for this field. max 20 characters, minimum of 2 characters.</QXZ>
 shifts-shift_name	Shift Name	<QXZ>This is a more descriptive name of the Shift Definition. This is a short summary of the Shift definition. max 50 characters, minimum of 2 characters.</QXZ>