diff options
| -rw-r--r-- | RecurringType.php | 6 | ||||
| -rwxr-xr-x | SchedulerHelper.php | 4 |
2 files changed, 8 insertions, 2 deletions
diff --git a/RecurringType.php b/RecurringType.php index 138d2d6..e8193ed 100644 --- a/RecurringType.php +++ b/RecurringType.php @@ -32,6 +32,8 @@ class RecurringType { private $_fields_values = array(); private $_recurring_start_date_stamp; private $_recurring_end_date_stamp; + + public static $start_on_monday = true; public function __construct($recurringType, $recurringStartDateStamp, $recurringEndDateStamp) { @@ -303,8 +305,10 @@ class RecurringType { private function _getRecurringDayStep($dateStamp, $recurringWeekDay) { $weekDay = SchedulerHelperDate::getDayOfWeek($dateStamp); + if(self::$start_on_monday) { + $recurringWeekDay = $recurringWeekDay == 0 ? 7 : $recurringWeekDay; + } $dayStep = $recurringWeekDay - $weekDay; - $dayStep = ($dayStep < 0) ? (SchedulerHelperDate::DAYS_IN_WEEK - (-$dayStep)) : $dayStep; return $dayStep; } diff --git a/SchedulerHelper.php b/SchedulerHelper.php index 0d74cb2..4fe93e0 100755 --- a/SchedulerHelper.php +++ b/SchedulerHelper.php @@ -32,7 +32,8 @@ abstract class DHelper extends SchedulerHelperConnector public $config = array( "debug" => true, - "server_date" => false + "server_date" => false, + "start_on_monay" => true ); protected $_mapped_fields = array(); @@ -365,6 +366,7 @@ class Helper extends DHelper implements IHelper $startField = $this->getStartDateFieldName(); $endField = $this->getEndDateFieldName(); + RecurringType::$start_on_monday = $this->config["start_on_monay"]; $recCount = count($recurringEvents); for($i = 0; $i < $recCount; $i++) { $eventData = $recurringEvents[$i]; |