Congegni
/
sintonia
7
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fixed month view not displaying a full 42 days

This commit is contained in:
Albert Santoni 2015-04-16 16:30:12 -04:00
parent d20c8e8df4
commit acbaac0bc5
2 changed files with 27 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
airtime_mvc/application/controllers/ScheduleController.php
View File

@ -151,7 +151,7 @@ class ScheduleController extends Zend_Controller_Action
} else if ($calendar_interval == "agendaWeek") {
list($start, $end) = Application_Model_Show::getStartEndCurrentWeekView();
} else if ($calendar_interval == "month") {
list($start, $end) = Application_Model_Show::getStartEndCurrentMonthView();
list($start, $end) = Application_Model_Show::getStartEndCurrentMonthPlusView();
} else {
Logging::error("Invalid Calendar Interval '$calendar_interval'");
}

34
airtime_mvc/application/models/Show.php
View File

@ -1443,20 +1443,38 @@ SQL;
return array($start, $end);
}
/** Returns the start and end date that FullCalendar will display for today's month.
*
* FullCalendar displays 6 weeks, starting on a Sunday, for a total of 42 days. This function returns 42 days worth
* of data (a few days before, and a few days after.)
*/
public static function getStartEndCurrentMonthPlusView() {
$utcTimeZone = new DateTimeZone("UTC");
//We have to get the start of the day in the user's timezone, and then convert that to UTC.
$start = new DateTime("first day of this month", new DateTimeZone(Application_Model_Preference::GetUserTimezone()));
$start->setTimezone($utcTimeZone); //Covert it to UTC.
$dayOfWeekNumeric = $start->format('w') + 1;
$start->sub(new DateInterval("P{$dayOfWeekNumeric}D")); //Subtract the index of the day of the week the month starts on. (adds this many days from the previous month)
$fullCalendarMonthInterval = new DateInterval("P42D"); //42 days
$end = clone($start);
$end->add($fullCalendarMonthInterval);
return array($start, $end);
}
public static function getStartEndCurrentWeekView() {
$weekStartDayNum = Application_Model_Preference::GetWeekStartDay();
$utcTimeZone = new DateTimeZone("UTC");
//We have to get the start of the week in the user's timezone, and then convert that to UTC.
if ($weekStartDayNum == "0") {
$start = new DateTime("Sunday last week", new DateTimeZone(Application_Model_Preference::GetUserTimezone()));
} else if ($weekStartDayNum == "1") {
$start = new DateTime("Monday this week", new DateTimeZone(Application_Model_Preference::GetUserTimezone()));
} else {
$weekStartDayNum = "0";
Logging::warn("Unhandled week start day: " . $weekStartDayNum);
}
$start = new DateTime("Sunday last week", new DateTimeZone(Application_Model_Preference::GetUserTimezone()));
$start->add(new DateInterval("P{$weekStartDayNum}D")); //Shift the start date to the station's "Week Starts on Day"
$start->setTimezone($utcTimeZone); //Covert it to UTC.
$weekInterval = new DateInterval("P1W");