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

Bugfixes for my optimizations 

* Fixed saving not working in the user settings page
* Fixed first day of week not loading correctly in week view
* Fixed timezone handling in functions off of EventPreloadAction
* Fixed show instance "percent filled" not being embedded in our JSON
  response correctly if you started on the month view.
This commit is contained in:
Albert Santoni 2015-04-16 14:58:28 -04:00
parent 8449194ca1
commit dc20b5c252
2 changed files with 36 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
airtime_mvc/application/controllers/UserController.php
View File

@ -118,7 +118,8 @@ class UserController extends Zend_Controller_Action
} }
public function editUserAction() public function editUserAction()
{ {
session_start(); //Reopen session for writing.
$request = $this->getRequest(); $request = $this->getRequest();
$form = new Application_Form_EditUser(); $form = new Application_Form_EditUser();
if ($request->isPost()) { if ($request->isPost()) {

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

@ -974,10 +974,7 @@ SQL;
foreach ($shows as &$show) { foreach ($shows as &$show) {
$options = array(); $options = array();
//only bother calculating percent for week or day view. $options["percent"] = Application_Model_Show::getPercentScheduled($show["starts"], $show["ends"], $show["time_filled"]);
if (intval($days) <= 7) {
$options["percent"] = Application_Model_Show::getPercentScheduled($show["starts"], $show["ends"], $show["time_filled"]);
}
if (isset($show["parent_starts"])) { if (isset($show["parent_starts"])) {
$parentStartsDT = new DateTime($show["parent_starts"], $utcTimezone); $parentStartsDT = new DateTime($show["parent_starts"], $utcTimezone);
@ -1432,39 +1429,52 @@ SQL;
} }
public static function getStartEndCurrentMonthView() { public static function getStartEndCurrentMonthView() {
$first_day_of_calendar_month_view = mktime(0, 0, 0, date("n"), 1);
$weekStart = Application_Model_Preference::GetWeekStartDay();
while (date('w', $first_day_of_calendar_month_view) != $weekStart) {
$first_day_of_calendar_month_view -= 60*60*24;
}
$last_day_of_calendar_view = $first_day_of_calendar_month_view + 3600*24*42;
$start = new DateTime("@".$first_day_of_calendar_month_view); $utcTimeZone = new DateTimeZone("UTC");
$end = new DateTime("@".$last_day_of_calendar_view);
//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.
$monthInterval = new DateInterval("P1M");
$end = clone($start);
$end->add($monthInterval);
return array($start, $end); return array($start, $end);
} }
public static function getStartEndCurrentWeekView() { public static function getStartEndCurrentWeekView() {
$first_day_of_calendar_week_view = mktime(0, 0, 0, gmdate("n"), gmdate("j"));
$weekStart = Application_Model_Preference::GetWeekStartDay(); $weekStartDayNum = Application_Model_Preference::GetWeekStartDay();
while (gmdate('w', $first_day_of_calendar_week_view) != $weekStart) { $utcTimeZone = new DateTimeZone("UTC");
$first_day_of_calendar_week_view -= 60*60*24;
//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);
} }
$last_day_of_calendar_view = $first_day_of_calendar_week_view + 3600*24*7;
$start = new DateTime("@".$first_day_of_calendar_week_view);
$end = new DateTime("@".$last_day_of_calendar_view);
$start->setTimezone($utcTimeZone); //Covert it to UTC.
$weekInterval = new DateInterval("P1W");
$end = clone($start);
$end->add($weekInterval);
return array($start, $end); return array($start, $end);
} }
public static function getStartEndCurrentDayView() { public static function getStartEndCurrentDayView() {
$today = mktime(0, 0, 0, gmdate("n"), gmdate("j")); $utcTimeZone = new DateTimeZone("UTC");
$tomorrow = $today + 3600*24;
$start = new DateTime("@".$today); //We have to get the start of the day in the user's timezone, and then convert that to UTC.
$end = new DateTime("@".$tomorrow); $start = new DateTime("today", new DateTimeZone(Application_Model_Preference::GetUserTimezone()));
$start->setTimezone($utcTimeZone); //Covert it to UTC.
$dayInterval = new DateInterval("P1D");
$end = clone($start);
$end->add($dayInterval);
return array($start, $end); return array($start, $end);
} }