mirror of
https://github.com/Karaka-Management/oms-Calendar.git
synced 2026-02-16 08:28:42 +00:00
Fix if for foreach while spacing
This commit is contained in:
parent
d639d981eb
commit
fcc3aa845b
|
|
@ -11,7 +11,7 @@
|
||||||
* @version 1.0.0
|
* @version 1.0.0
|
||||||
* @link http://orange-management.com
|
* @link http://orange-management.com
|
||||||
*/
|
*/
|
||||||
declare(strict_types=1);
|
declare(strict_types = 1);
|
||||||
namespace Modules\Calendar\Admin;
|
namespace Modules\Calendar\Admin;
|
||||||
|
|
||||||
use phpOMS\DataStorage\Database\DatabasePool;
|
use phpOMS\DataStorage\Database\DatabasePool;
|
||||||
|
|
|
||||||
|
|
@ -11,7 +11,7 @@
|
||||||
* @version 1.0.0
|
* @version 1.0.0
|
||||||
* @link http://orange-management.com
|
* @link http://orange-management.com
|
||||||
*/
|
*/
|
||||||
declare(strict_types=1);
|
declare(strict_types = 1);
|
||||||
namespace Modules\Calendar\Admin;
|
namespace Modules\Calendar\Admin;
|
||||||
|
|
||||||
use phpOMS\DataStorage\Database\DatabasePool;
|
use phpOMS\DataStorage\Database\DatabasePool;
|
||||||
|
|
|
||||||
|
|
@ -11,7 +11,7 @@
|
||||||
* @version 1.0.0
|
* @version 1.0.0
|
||||||
* @link http://orange-management.com
|
* @link http://orange-management.com
|
||||||
*/
|
*/
|
||||||
declare(strict_types=1);
|
declare(strict_types = 1);
|
||||||
namespace Modules\Calendar\Admin\Install;
|
namespace Modules\Calendar\Admin\Install;
|
||||||
use phpOMS\DataStorage\Database\DatabasePool;
|
use phpOMS\DataStorage\Database\DatabasePool;
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -11,7 +11,7 @@
|
||||||
* @version 1.0.0
|
* @version 1.0.0
|
||||||
* @link http://orange-management.com
|
* @link http://orange-management.com
|
||||||
*/
|
*/
|
||||||
declare(strict_types=1);
|
declare(strict_types = 1);
|
||||||
namespace Modules\Calendar\Admin;
|
namespace Modules\Calendar\Admin;
|
||||||
|
|
||||||
use phpOMS\DataStorage\Database\DatabaseType;
|
use phpOMS\DataStorage\Database\DatabaseType;
|
||||||
|
|
|
||||||
|
|
@ -11,7 +11,7 @@
|
||||||
* @version 1.0.0
|
* @version 1.0.0
|
||||||
* @link http://orange-management.com
|
* @link http://orange-management.com
|
||||||
*/
|
*/
|
||||||
declare(strict_types=1);
|
declare(strict_types = 1);
|
||||||
namespace Modules\Calendar\Admin;
|
namespace Modules\Calendar\Admin;
|
||||||
|
|
||||||
use phpOMS\DataStorage\Database\DatabasePool;
|
use phpOMS\DataStorage\Database\DatabasePool;
|
||||||
|
|
|
||||||
|
|
@ -11,7 +11,7 @@
|
||||||
* @version 1.0.0
|
* @version 1.0.0
|
||||||
* @link http://orange-management.com
|
* @link http://orange-management.com
|
||||||
*/
|
*/
|
||||||
declare(strict_types=1);
|
declare(strict_types = 1);
|
||||||
namespace Modules\Calendar\Admin;
|
namespace Modules\Calendar\Admin;
|
||||||
|
|
||||||
use phpOMS\DataStorage\Database\DatabasePool;
|
use phpOMS\DataStorage\Database\DatabasePool;
|
||||||
|
|
|
||||||
|
|
@ -11,7 +11,7 @@
|
||||||
* @version 1.0.0
|
* @version 1.0.0
|
||||||
* @link http://orange-management.com
|
* @link http://orange-management.com
|
||||||
*/
|
*/
|
||||||
declare(strict_types=1);
|
declare(strict_types = 1);
|
||||||
namespace Modules\Calendar;
|
namespace Modules\Calendar;
|
||||||
|
|
||||||
use Modules\Calendar\Models\CalendarMapper;
|
use Modules\Calendar\Models\CalendarMapper;
|
||||||
|
|
|
||||||
|
|
@ -11,7 +11,7 @@
|
||||||
* @version 1.0.0
|
* @version 1.0.0
|
||||||
* @link http://orange-management.com
|
* @link http://orange-management.com
|
||||||
*/
|
*/
|
||||||
declare(strict_types=1);
|
declare(strict_types = 1);
|
||||||
namespace Modules\Calendar\Models;
|
namespace Modules\Calendar\Models;
|
||||||
|
|
||||||
use phpOMS\Stdlib\Base\Enum;
|
use phpOMS\Stdlib\Base\Enum;
|
||||||
|
|
|
||||||
|
|
@ -11,7 +11,7 @@
|
||||||
* @version 1.0.0
|
* @version 1.0.0
|
||||||
* @link http://orange-management.com
|
* @link http://orange-management.com
|
||||||
*/
|
*/
|
||||||
declare(strict_types=1);
|
declare(strict_types = 1);
|
||||||
namespace Modules\Calendar\Models;
|
namespace Modules\Calendar\Models;
|
||||||
|
|
||||||
use phpOMS\Stdlib\Base\Enum;
|
use phpOMS\Stdlib\Base\Enum;
|
||||||
|
|
|
||||||
|
|
@ -11,7 +11,7 @@
|
||||||
* @version 1.0.0
|
* @version 1.0.0
|
||||||
* @link http://orange-management.com
|
* @link http://orange-management.com
|
||||||
*/
|
*/
|
||||||
declare(strict_types=1);
|
declare(strict_types = 1);
|
||||||
namespace Modules\Calendar\Models;
|
namespace Modules\Calendar\Models;
|
||||||
|
|
||||||
use phpOMS\Stdlib\Base\SmartDateTime;
|
use phpOMS\Stdlib\Base\SmartDateTime;
|
||||||
|
|
|
||||||
|
|
@ -12,7 +12,7 @@
|
||||||
* @link http://orange-management.com
|
* @link http://orange-management.com
|
||||||
* @todo only load events of 3 month or 1 year?!
|
* @todo only load events of 3 month or 1 year?!
|
||||||
*/
|
*/
|
||||||
declare(strict_types=1);
|
declare(strict_types = 1);
|
||||||
namespace Modules\Calendar\Models;
|
namespace Modules\Calendar\Models;
|
||||||
|
|
||||||
use phpOMS\DataStorage\Database\DataMapperAbstract;
|
use phpOMS\DataStorage\Database\DataMapperAbstract;
|
||||||
|
|
@ -107,7 +107,7 @@ class CalendarMapper extends DataMapperAbstract
|
||||||
try {
|
try {
|
||||||
$objId = parent::create($obj, $relations);
|
$objId = parent::create($obj, $relations);
|
||||||
|
|
||||||
if($objId === null || !is_scalar($objId)) {
|
if ($objId === null || !is_scalar($objId)) {
|
||||||
return $objId;
|
return $objId;
|
||||||
}
|
}
|
||||||
} catch (\Exception $e) {
|
} catch (\Exception $e) {
|
||||||
|
|
|
||||||
|
|
@ -11,7 +11,7 @@
|
||||||
* @version 1.0.0
|
* @version 1.0.0
|
||||||
* @link http://orange-management.com
|
* @link http://orange-management.com
|
||||||
*/
|
*/
|
||||||
declare(strict_types=1);
|
declare(strict_types = 1);
|
||||||
namespace Modules\Calendar\Models;
|
namespace Modules\Calendar\Models;
|
||||||
|
|
||||||
use phpOMS\Account\Account;
|
use phpOMS\Account\Account;
|
||||||
|
|
|
||||||
|
|
@ -11,7 +11,7 @@
|
||||||
* @version 1.0.0
|
* @version 1.0.0
|
||||||
* @link http://orange-management.com
|
* @link http://orange-management.com
|
||||||
*/
|
*/
|
||||||
declare(strict_types=1);
|
declare(strict_types = 1);
|
||||||
namespace Modules\Calendar\Models;
|
namespace Modules\Calendar\Models;
|
||||||
|
|
||||||
use phpOMS\DataStorage\Database\DataMapperAbstract;
|
use phpOMS\DataStorage\Database\DataMapperAbstract;
|
||||||
|
|
@ -102,7 +102,7 @@ class EventMapper extends DataMapperAbstract
|
||||||
try {
|
try {
|
||||||
$objId = parent::create($obj, $relations);
|
$objId = parent::create($obj, $relations);
|
||||||
|
|
||||||
if($objId === null || !is_scalar($objId)) {
|
if ($objId === null || !is_scalar($objId)) {
|
||||||
return $objId;
|
return $objId;
|
||||||
}
|
}
|
||||||
} catch (\Exception $e) {
|
} catch (\Exception $e) {
|
||||||
|
|
|
||||||
|
|
@ -11,7 +11,7 @@
|
||||||
* @version 1.0.0
|
* @version 1.0.0
|
||||||
* @link http://orange-management.com
|
* @link http://orange-management.com
|
||||||
*/
|
*/
|
||||||
declare(strict_types=1);
|
declare(strict_types = 1);
|
||||||
namespace Modules\Calendar\Models;
|
namespace Modules\Calendar\Models;
|
||||||
|
|
||||||
use phpOMS\Stdlib\Base\Enum;
|
use phpOMS\Stdlib\Base\Enum;
|
||||||
|
|
|
||||||
|
|
@ -11,7 +11,7 @@
|
||||||
* @version 1.0.0
|
* @version 1.0.0
|
||||||
* @link http://orange-management.com
|
* @link http://orange-management.com
|
||||||
*/
|
*/
|
||||||
declare(strict_types=1);
|
declare(strict_types = 1);
|
||||||
namespace Modules\Calendar\Models;
|
namespace Modules\Calendar\Models;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
|
|
||||||
|
|
@ -11,7 +11,7 @@
|
||||||
* @version 1.0.0
|
* @version 1.0.0
|
||||||
* @link http://orange-management.com
|
* @link http://orange-management.com
|
||||||
*/
|
*/
|
||||||
declare(strict_types=1);
|
declare(strict_types = 1);
|
||||||
namespace Modules\Calendar\Models;
|
namespace Modules\Calendar\Models;
|
||||||
|
|
||||||
use phpOMS\Stdlib\Base\Enum;
|
use phpOMS\Stdlib\Base\Enum;
|
||||||
|
|
|
||||||
|
|
@ -11,7 +11,7 @@
|
||||||
* @version 1.0.0
|
* @version 1.0.0
|
||||||
* @link http://orange-management.com
|
* @link http://orange-management.com
|
||||||
*/
|
*/
|
||||||
declare(strict_types=1);
|
declare(strict_types = 1);
|
||||||
namespace Modules\Calendar\Models;
|
namespace Modules\Calendar\Models;
|
||||||
|
|
||||||
use phpOMS\Stdlib\Base\Enum;
|
use phpOMS\Stdlib\Base\Enum;
|
||||||
|
|
|
||||||
|
|
@ -11,7 +11,7 @@
|
||||||
* @version 1.0.0
|
* @version 1.0.0
|
||||||
* @link http://orange-management.com
|
* @link http://orange-management.com
|
||||||
*/
|
*/
|
||||||
declare(strict_types=1);
|
declare(strict_types = 1);
|
||||||
namespace Modules\Calendar\Models;
|
namespace Modules\Calendar\Models;
|
||||||
|
|
||||||
use phpOMS\Stdlib\Base\Enum;
|
use phpOMS\Stdlib\Base\Enum;
|
||||||
|
|
|
||||||
|
|
@ -11,7 +11,7 @@
|
||||||
* @version 1.0.0
|
* @version 1.0.0
|
||||||
* @link http://orange-management.com
|
* @link http://orange-management.com
|
||||||
*/
|
*/
|
||||||
declare(strict_types=1);
|
declare(strict_types = 1);
|
||||||
namespace Modules\Calendar\Models;
|
namespace Modules\Calendar\Models;
|
||||||
|
|
||||||
use phpOMS\Stdlib\Base\Enum;
|
use phpOMS\Stdlib\Base\Enum;
|
||||||
|
|
|
||||||
|
|
@ -11,7 +11,7 @@
|
||||||
* @version 1.0.0
|
* @version 1.0.0
|
||||||
* @link http://orange-management.com
|
* @link http://orange-management.com
|
||||||
*/
|
*/
|
||||||
declare(strict_types=1);
|
declare(strict_types = 1);
|
||||||
namespace Modules\Calendar\Models;
|
namespace Modules\Calendar\Models;
|
||||||
|
|
||||||
use phpOMS\Stdlib\Base\Enum;
|
use phpOMS\Stdlib\Base\Enum;
|
||||||
|
|
|
||||||
|
|
@ -11,7 +11,7 @@
|
||||||
* @version 1.0.0
|
* @version 1.0.0
|
||||||
* @link http://orange-management.com
|
* @link http://orange-management.com
|
||||||
*/
|
*/
|
||||||
declare(strict_types=1);
|
declare(strict_types = 1);
|
||||||
namespace Modules\Calendar\Models;
|
namespace Modules\Calendar\Models;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
|
|
||||||
|
|
@ -11,7 +11,7 @@
|
||||||
* @version 1.0.0
|
* @version 1.0.0
|
||||||
* @link http://orange-management.com
|
* @link http://orange-management.com
|
||||||
*/
|
*/
|
||||||
declare(strict_types=1);
|
declare(strict_types = 1);
|
||||||
namespace Modules\Calendar\Models;
|
namespace Modules\Calendar\Models;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
|
|
||||||
|
|
@ -11,7 +11,7 @@
|
||||||
* @version 1.0.0
|
* @version 1.0.0
|
||||||
* @link http://orange-management.com
|
* @link http://orange-management.com
|
||||||
*/
|
*/
|
||||||
declare(strict_types=1);
|
declare(strict_types = 1);
|
||||||
namespace Modules\Calendar\Models;
|
namespace Modules\Calendar\Models;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
|
|
||||||
|
|
@ -11,7 +11,7 @@
|
||||||
* @version 1.0.0
|
* @version 1.0.0
|
||||||
* @link http://orange-management.com
|
* @link http://orange-management.com
|
||||||
*/
|
*/
|
||||||
declare(strict_types=1);
|
declare(strict_types = 1);
|
||||||
|
|
||||||
namespace Modules\Calendar\Models;
|
namespace Modules\Calendar\Models;
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -11,7 +11,7 @@
|
||||||
* @version 1.0.0
|
* @version 1.0.0
|
||||||
* @link http://orange-management.com
|
* @link http://orange-management.com
|
||||||
*/
|
*/
|
||||||
declare(strict_types=1);
|
declare(strict_types = 1);
|
||||||
namespace Modules\Calendar\Models;
|
namespace Modules\Calendar\Models;
|
||||||
|
|
||||||
use phpOMS\Stdlib\Base\Exception\InvalidEnumValue;
|
use phpOMS\Stdlib\Base\Exception\InvalidEnumValue;
|
||||||
|
|
|
||||||
|
|
@ -11,7 +11,7 @@
|
||||||
* @version 1.0.0
|
* @version 1.0.0
|
||||||
* @link http://orange-management.com
|
* @link http://orange-management.com
|
||||||
*/
|
*/
|
||||||
declare(strict_types=1);
|
declare(strict_types = 1);
|
||||||
namespace Modules\Calendar\Models;
|
namespace Modules\Calendar\Models;
|
||||||
|
|
||||||
use phpOMS\DataStorage\Database\DataMapperAbstract;
|
use phpOMS\DataStorage\Database\DataMapperAbstract;
|
||||||
|
|
@ -92,7 +92,7 @@ class ScheduleMapper extends DataMapperAbstract
|
||||||
try {
|
try {
|
||||||
$objId = parent::create($obj, $relations);
|
$objId = parent::create($obj, $relations);
|
||||||
|
|
||||||
if($objId === null || !is_scalar($objId)) {
|
if ($objId === null || !is_scalar($objId)) {
|
||||||
return $objId;
|
return $objId;
|
||||||
}
|
}
|
||||||
} catch (\Exception $e) {
|
} catch (\Exception $e) {
|
||||||
|
|
|
||||||
|
|
@ -11,7 +11,7 @@
|
||||||
* @version 1.0.0
|
* @version 1.0.0
|
||||||
* @link http://orange-management.com
|
* @link http://orange-management.com
|
||||||
*/
|
*/
|
||||||
declare(strict_types=1);
|
declare(strict_types = 1);
|
||||||
namespace Modules\Calendar\Models;
|
namespace Modules\Calendar\Models;
|
||||||
|
|
||||||
use phpOMS\Stdlib\Base\Enum;
|
use phpOMS\Stdlib\Base\Enum;
|
||||||
|
|
|
||||||
|
|
@ -11,7 +11,7 @@
|
||||||
* @version 1.0.0
|
* @version 1.0.0
|
||||||
* @link http://orange-management.com
|
* @link http://orange-management.com
|
||||||
*/
|
*/
|
||||||
declare(strict_types=1);
|
declare(strict_types = 1);
|
||||||
|
|
||||||
namespace Modules\Calendar\Theme\Backend\Components\Calendar;
|
namespace Modules\Calendar\Theme\Backend\Components\Calendar;
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -21,7 +21,7 @@
|
||||||
<?php for($j = 0; $j < 7; $j++) :
|
<?php for($j = 0; $j < 7; $j++) :
|
||||||
$isActiveMonth = ((int) $current[$i*7+$j]->format('d') === 1) ? !$isActiveMonth : $isActiveMonth;
|
$isActiveMonth = ((int) $current[$i*7+$j]->format('d') === 1) ? !$isActiveMonth : $isActiveMonth;
|
||||||
?>
|
?>
|
||||||
<?php if($isActiveMonth) :?>
|
<?php if ($isActiveMonth) :?>
|
||||||
<li class="day<?= $this->calendar->hasEventOnDate($current[$i*7+$j]) ? ' has-event' : '';?>">
|
<li class="day<?= $this->calendar->hasEventOnDate($current[$i*7+$j]) ? ' has-event' : '';?>">
|
||||||
<div class="date"><?= $current[$i*7+$j]->format('d'); ?></div>
|
<div class="date"><?= $current[$i*7+$j]->format('d'); ?></div>
|
||||||
<?php else: ?>
|
<?php else: ?>
|
||||||
|
|
|
||||||
|
|
@ -11,7 +11,7 @@
|
||||||
* @version 1.0.0
|
* @version 1.0.0
|
||||||
* @link http://orange-management.com
|
* @link http://orange-management.com
|
||||||
*/
|
*/
|
||||||
declare(strict_types=1);
|
declare(strict_types = 1);
|
||||||
|
|
||||||
namespace Modules\Calendar\Theme\Backend\Components\Event;
|
namespace Modules\Calendar\Theme\Backend\Components\Event;
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -38,7 +38,7 @@ $calendar = $this->getData('calendar');
|
||||||
<?php for($j = 0; $j < 7; $j++) :
|
<?php for($j = 0; $j < 7; $j++) :
|
||||||
$isActiveMonth = ((int) $current[$i*7+$j]->format('d') === 1) ? !$isActiveMonth : $isActiveMonth;
|
$isActiveMonth = ((int) $current[$i*7+$j]->format('d') === 1) ? !$isActiveMonth : $isActiveMonth;
|
||||||
?>
|
?>
|
||||||
<?php if($isActiveMonth) :?>
|
<?php if ($isActiveMonth) :?>
|
||||||
<li class="day">
|
<li class="day">
|
||||||
<div class="date"><?= $current[$i*7+$j]->format('d'); ?></div>
|
<div class="date"><?= $current[$i*7+$j]->format('d'); ?></div>
|
||||||
<?php else: ?>
|
<?php else: ?>
|
||||||
|
|
@ -47,7 +47,7 @@ $calendar = $this->getData('calendar');
|
||||||
<?php endif; ?>
|
<?php endif; ?>
|
||||||
<?php
|
<?php
|
||||||
$events = $calendar->getEventByDate($current[$i*7+$j]);
|
$events = $calendar->getEventByDate($current[$i*7+$j]);
|
||||||
foreach($events as $event) : ?>
|
foreach ($events as $event) : ?>
|
||||||
<div id="event-tag-<?= $this->printHtml($event->getId()); ?>" class="event">
|
<div id="event-tag-<?= $this->printHtml($event->getId()); ?>" class="event">
|
||||||
<div class="event-desc"><?= $this->printHtml($event->getName()); ?></div>
|
<div class="event-desc"><?= $this->printHtml($event->getName()); ?></div>
|
||||||
<div class="event-time">2:00pm to 5:00pm</div>
|
<div class="event-time">2:00pm to 5:00pm</div>
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue
Block a user