Skip to content

[MAINTENANCE] Adjust date displaying in calendar #1704

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
sebastian-meyer merged 1 commit into from
Aug 27, 2025
Merged

[MAINTENANCE] Adjust date displaying in calendar #1704

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
22 changes: 11 additions & 11 deletions Classes/Controller/CalendarController.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -115,7 +115,7 @@ public function calendarAction(): ResponseInterface
// Prepare list as alternative view.
$issueData = [];
foreach ($this->allIssues as $dayTimestamp => $issues) {
$issueData[$dayTimestamp]['dateString'] = strftime('%A, %x', $dayTimestamp);
$issueData[$dayTimestamp]['dateString'] = date('l, Y-m-d', $dayTimestamp);
$issueData[$dayTimestamp]['items'] = [];
foreach ($issues as $issue) {
$issueData[$dayTimestamp]['items'][] = $issue;
Expand Down Expand Up @@ -242,14 +242,14 @@ protected function getCalendarYear(array &$calendarData, array $calendarIssuesBy
$key = $year . '-' . $i;

$calendarData[$key] = [
'DAYMON_NAME' => strftime('%a', strtotime('last Monday')),
'DAYTUE_NAME' => strftime('%a', strtotime('last Tuesday')),
'DAYWED_NAME' => strftime('%a', strtotime('last Wednesday')),
'DAYTHU_NAME' => strftime('%a', strtotime('last Thursday')),
'DAYFRI_NAME' => strftime('%a', strtotime('last Friday')),
'DAYSAT_NAME' => strftime('%a', strtotime('last Saturday')),
'DAYSUN_NAME' => strftime('%a', strtotime('last Sunday')),
'MONTHNAME' => strftime('%B', strtotime($year . '-' . $i . '-1')) . ' ' . $year,
'DAYMON_NAME' => date('D', strtotime('last Monday')),
'DAYTUE_NAME' => date('D', strtotime('last Tuesday')),
'DAYWED_NAME' => date('D', strtotime('last Wednesday')),
'DAYTHU_NAME' => date('D', strtotime('last Thursday')),
'DAYFRI_NAME' => date('D', strtotime('last Friday')),
'DAYSAT_NAME' => date('D', strtotime('last Saturday')),
'DAYSUN_NAME' => date('D', strtotime('last Sunday')),
'MONTHNAME' => date('F', strtotime($year . '-' . $i . '-1')) . ' ' . $year,
'CALYEAR' => ($i == $firstMonth) ? $year : ''
];

Expand Down Expand Up @@ -310,7 +310,7 @@ private function getDayLinksText(array $day, int $currentDayTime): array
{
$dayLinksText = [];
foreach ($day as $issue) {
$dayLinkLabel = empty($issue['title']) ? strftime('%x', $currentDayTime) : $issue['title'];
$dayLinkLabel = empty($issue['title']) ? date('Y-m-d', $currentDayTime) : $issue['title'];

$dayLinksText[] = [
'documentId' => $issue['uid'],
Expand Down Expand Up @@ -370,7 +370,7 @@ private function fillCalendar(array &$calendarData, int $currentDayTime, string
*/
private function fillDay(array &$calendarData, int $currentDayTime, string $day, string $dayLinks, array $dayLinkDiv): void
{
$calendarData[$day]['dayValue'] = strftime('%d', $currentDayTime);
$calendarData[$day]['dayValue'] = date('d', $currentDayTime);
if ((int) $dayLinks === (int) date('j', $currentDayTime)) {
$calendarData[$day]['issues'] = $dayLinkDiv;
}
Expand Down