Jingga/oms-Calendar
1
0
Fork 0
mirror of https://github.com/Karaka-Management/oms-Calendar.git synced 2026-02-08 20:48:40 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

fix bugs

Browse Source
This commit is contained in:
Dennis Eichhorn 2021-11-29 20:08:13 +01:00
parent d819d37abb
commit 12aa50a37e
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Controller/BackendController.php
View File

@ -58,7 +58,7 @@ final class BackendController extends Controller implements DashboardElementInte
/** @var \Modules\Calendar\Models\Calendar $calendar */
$calendar = CalendarMapper::get(1);
$calendar->setDate(new SmartDateTime((string) ($request->getData('date') ?? 'now')));
$calendar->date = new SmartDateTime((string) ($request->getData('date') ?? 'now'));
$view->addData('calendar', $calendar);
$calendarEventPopup = new \Modules\Calendar\Theme\Backend\Components\Event\BaseView($this->app->l11nManager, $request, $response);
@ -86,7 +86,7 @@ final class BackendController extends Controller implements DashboardElementInte
/** @var \Modules\Calendar\Models\Calendar $calendar */
$calendar = CalendarMapper::get(1);
$calendar->setDate(new SmartDateTime((string) ($request->getData('date') ?? 'now')));
$calendar->date = new SmartDateTime((string) ($request->getData('date') ?? 'now'));
$view->addData('cal', $calendar);
return $view;

8
Theme/Backend/calendar-dashboard.tpl.php
View File

@ -6,8 +6,8 @@ $calendar = $this->getData('calendar');
<div class="col-xs-12 col-md-9">
<div class="box wf-100">
<ul class="btns floatLeft">
<li><a href="<?= $this->printHtml(\phpOMS\Uri\UriFactory::build('{/prefix}calendar/dashboard?date=' . $calendar->getDate()->createModify(0, -1, 0)->format('Y-m-d'))); ?>"><i class="fa fa-arrow-left"></i></a>
<li><a href="<?= $this->printHtml(\phpOMS\Uri\UriFactory::build('{/prefix}calendar/dashboard?date=' . $calendar->getDate()->createModify(0, 1, 0)->format('Y-m-d'))); ?>"><i class="fa fa-arrow-right"></i></a>
<li><a href="<?= $this->printHtml(\phpOMS\Uri\UriFactory::build('{/prefix}calendar/dashboard?date=' . $calendar->date->createModify(0, -1, 0)->format('Y-m-d'))); ?>"><i class="fa fa-arrow-left"></i></a>
<li><a href="<?= $this->printHtml(\phpOMS\Uri\UriFactory::build('{/prefix}calendar/dashboard?date=' . $calendar->date->createModify(0, 1, 0)->format('Y-m-d'))); ?>"><i class="fa fa-arrow-right"></i></a>
</ul>
<ul class="btns floatRight">
<li><a href=""><?= $this->getHtml('Day'); ?></a>
@ -33,7 +33,7 @@ $calendar = $this->getData('calendar');
<li><?= $this->getHtml('Friday'); ?>
<li><?= $this->getHtml('Saturday'); ?>
</ul>
<?php $current = $calendar->getDate()->getMonthCalendar(0); $isActiveMonth = false;
<?php $current = $calendar->date->getMonthCalendar(0); $isActiveMonth = false;
for ($i = 0; $i < 6; ++$i) : ?>
<ul class="days">
<?php for ($j = 0; $j < 7; ++$j) :
@ -47,7 +47,7 @@ $calendar = $this->getData('calendar');
<div class="date"><?= $current[$i * 7 + $j]->format('d'); ?></div>
<?php endif; ?>
<?php
$events = $calendar->getEventByDate($current[$i * 7 + $j]);
$events = $calendar->getEventsOnDate($current[$i * 7 + $j]);
foreach ($events as $event) : ?>
<div id="event-tag-<?= $event->getId(); ?>" class="event">
<div class="event-desc"><?= $this->printHtml($event->getName()); ?></div>