revi-archive/phorge-phorge
1
0
Fork 0
mirror of https://we.phorge.it/source/phorge.git synced 2024-12-20 20:40:56 +01:00
Code Issues Releases Wiki Activity

Refactor logic for getting next/prev month and day on month and day views, respectively

Browse source 
Summary: Ref T4393, Refactor logic for getting next/prev month and day on month and day views, respectively

Test Plan: Open Calendar search, search using month view, scroll next/prev months to observe correct navigation, repeat with day view.

Reviewers: #blessed_reviewers, epriestley

Reviewed By: #blessed_reviewers, epriestley

Subscribers: Korvin, epriestley

Maniphest Tasks: T4393

Differential Revision: https://secure.phabricator.com/D12723
This commit is contained in:
lkassianik 2015-05-05 13:43:18 -07:00
parent 336ccfeea1
commit 7e4d5f76c0
2 changed files with 37 additions and 103 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

95
src/view/phui/calendar/PHUICalendarDayView.php
View file

@ -253,95 +253,28 @@ final class PHUICalendarDayView extends AphrontView {
return $included_datetimes;
}
private function getNumberOfDaysInMonth($month, $year) {
$user = $this->user;
$timezone = new DateTimeZone($user->getTimezoneIdentifier());
list($next_year, $next_month) = $this->getNextYearAndMonth($month, $year);
$end_date = new DateTime("{$next_year}-{$next_month}-01", $timezone);
$end_epoch = $end_date->format('U');
$days = 0;
for ($day = 1; $day <= 31; $day++) {
$day_date = new DateTime("{$year}-{$month}-{$day}", $timezone);
$day_epoch = $day_date->format('U');
if ($day_epoch >= $end_epoch) {
break;
} else {
$days++;
}
}
return $days;
}
private function getPrevDay() {
$day = $this->day;
$month = $this->month;
$year = $this->year;
$prev_year = $year;
$prev_month = $month;
$prev_day = $day - 1;
if ($prev_day == 0) {
$prev_month--;
if ($prev_month == 0) {
$prev_year--;
$prev_month = 12;
}
$prev_day = $this->getNumberOfDaysInMonth($prev_month, $prev_year);
}
return array($prev_year, $prev_month, $prev_day);
$prev = $this->getDateTime();
$prev->modify('-1 day');
return array(
$prev->format('Y'),
$prev->format('m'),
$prev->format('d'),
);
}
private function getNextDay() {
$day = $this->day;
$month = $this->month;
$year = $this->year;
$next_year = $year;
$next_month = $month;
$next_day = $day + 1;
$days_in_month = $this->getNumberOfDaysInMonth($month, $year);
if ($next_day > $days_in_month) {
$next_day = 1;
$next_month++;
}
if ($next_month == 13) {
$next_year++;
$next_month = 1;
}
return array($next_year, $next_month, $next_day);
}
private function getNextYearAndMonth($month, $year) {
$next_year = $year;
$next_month = $month + 1;
if ($next_month == 13) {
$next_year = $year + 1;
$next_month = 1;
}
return array($next_year, $next_month);
}
private function getPrevYearAndMonth($month, $year) {
$prev_year = $year;
$prev_month = $month - 1;
if ($prev_month == 0) {
$prev_year = $year - 1;
$prev_month = 12;
}
return array($prev_year, $prev_month);
$next = $this->getDateTime();
$next->modify('+1 day');
return array(
$next->format('Y'),
$next->format('m'),
$next->format('d'),
);
}
private function getDateTime() {
$user = $this->user;
$timezone = new DateTimeZone($user->getTimezoneIdentifier());
$day = $this->day;

45
src/view/phui/calendar/PHUICalendarMonthView.php
View file

@ -251,31 +251,21 @@ final class PHUICalendarMonthView extends AphrontView {
}
private function getNextYearAndMonth() {
$month = $this->month;
$year = $this->year;
$next_year = $year;
$next_month = $month + 1;
if ($next_month == 13) {
$next_year = $year + 1;
$next_month = 1;
}
return array($next_year, $next_month);
$next = $this->getDateTime();
$next->modify('+1 month');
return array(
$next->format('Y'),
$next->format('m'),
);
}
private function getPrevYearAndMonth() {
$month = $this->month;
$year = $this->year;
$prev_year = $year;
$prev_month = $month - 1;
if ($prev_month == 0) {
$prev_year = $year - 1;
$prev_month = 12;
}
return array($prev_year, $prev_month);
$prev = $this->getDateTime();
$prev->modify('-1 month');
return array(
$prev->format('Y'),
$prev->format('m'),
);
}
/**
@ -313,4 +303,15 @@ final class PHUICalendarMonthView extends AphrontView {
return $days;
}
private function getDateTime() {
$user = $this->user;
$timezone = new DateTimeZone($user->getTimezoneIdentifier());
$month = $this->month;
$year = $this->year;
$date = new DateTime("{$year}-{$month}-01 ", $timezone);
return $date;
}
}