From be3a887ba78a18bf2471911eebf7ce1a45cc4573 Mon Sep 17 00:00:00 2001 From: Dennis Eichhorn Date: Sat, 13 Aug 2016 14:13:07 +0200 Subject: [PATCH 1/9] Test fixes --- Models/NullSchedule.php | 31 +++++++++++++++++++++++++++++++ 1 file changed, 31 insertions(+) create mode 100644 Models/NullSchedule.php diff --git a/Models/NullSchedule.php b/Models/NullSchedule.php new file mode 100644 index 0000000..0b5c795 --- /dev/null +++ b/Models/NullSchedule.php @@ -0,0 +1,31 @@ + + * @author Dennis Eichhorn + * @copyright 2013 Dennis Eichhorn + * @license OMS License 1.0 + * @version 1.0.0 + * @link http://orange-management.com + */ +namespace Modules\Calendar\Models; + +/** + * Schedule class. + * + * @category Calendar + * @package Modules + * @author OMS Development Team + * @author Dennis Eichhorn + * @license OMS License 1.0 + * @link http://orange-management.com + * @since 1.0.0 + */ +class NullSchedule extends Schedule +{ +} From 3e930aa9e786107a5af0765683a86f7d28e765a3 Mon Sep 17 00:00:00 2001 From: Dennis Eichhorn Date: Sun, 2 Oct 2016 12:07:05 +0200 Subject: [PATCH 2/9] Core adjustments for pending issues --- Models/CalendarMapper.php | 1 - Models/EventMapper.php | 2 +- 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/Models/CalendarMapper.php b/Models/CalendarMapper.php index 1cced5f..fa10104 100644 --- a/Models/CalendarMapper.php +++ b/Models/CalendarMapper.php @@ -65,7 +65,6 @@ class CalendarMapper extends DataMapperAbstract protected static $hasMany = [ 'events' => [ 'mapper' => EventMapper::class, - 'relationmapper' => EventMapper::class, 'table' => 'calendar_event', 'dst' => 'calendar_event_calendar', 'src' => null, diff --git a/Models/EventMapper.php b/Models/EventMapper.php index 109721d..00a512e 100644 --- a/Models/EventMapper.php +++ b/Models/EventMapper.php @@ -59,7 +59,7 @@ class EventMapper extends DataMapperAbstract * @var array * @since 1.0.0 */ - protected static $hasOne = [ + protected static $ownsOne = [ 'schedule' => [ 'mapper' => ScheduleMapper::class, 'src' => 'calendar_event_schedule', From 7f2b41a5b07d1c55a2cba59b9564c8c74f83966c Mon Sep 17 00:00:00 2001 From: Dennis Eichhorn Date: Sun, 9 Oct 2016 20:07:30 +0200 Subject: [PATCH 3/9] Fix install --- Admin/Install/Navigation.php | 2 +- Admin/Installer.php | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Admin/Install/Navigation.php b/Admin/Install/Navigation.php index 28fa19a..00927ea 100644 --- a/Admin/Install/Navigation.php +++ b/Admin/Install/Navigation.php @@ -29,7 +29,7 @@ use phpOMS\DataStorage\Database\Pool; */ class Navigation { - public static function install(Pool $dbPool) + public static function install(string $path, Pool $dbPool) { $navData = json_decode(file_get_contents(__DIR__ . '/Navigation.install.json'), true); diff --git a/Admin/Installer.php b/Admin/Installer.php index 9631cb2..63d5abf 100644 --- a/Admin/Installer.php +++ b/Admin/Installer.php @@ -37,9 +37,9 @@ class Installer extends InstallerAbstract /** * {@inheritdoc} */ - public static function install(Pool $dbPool, InfoManager $info) + public static function install(string $path, Pool $dbPool, InfoManager $info) { - parent::install($dbPool, $info); + parent::install($path, $dbPool, $info); switch ($dbPool->get('core')->getType()) { case DatabaseType::MYSQL: From 1234eba29de718ce17c0f226b4bccef97b783132 Mon Sep 17 00:00:00 2001 From: Dennis Eichhorn Date: Sat, 29 Oct 2016 20:44:52 +0200 Subject: [PATCH 4/9] Adjust database pool name --- Admin/Activate.php | 4 ++-- Admin/Deactivate.php | 4 ++-- Admin/Install/Navigation.php | 4 ++-- Admin/Installer.php | 4 ++-- Admin/Uninstall.php | 4 ++-- Admin/Update.php | 4 ++-- 6 files changed, 12 insertions(+), 12 deletions(-) diff --git a/Admin/Activate.php b/Admin/Activate.php index 9b4ac8f..8da8114 100644 --- a/Admin/Activate.php +++ b/Admin/Activate.php @@ -16,7 +16,7 @@ namespace Modules\Calendar\Admin; -use phpOMS\DataStorage\Database\Pool; +use phpOMS\DataStorage\Database\DatabasePool; use phpOMS\Module\ActivateAbstract; use phpOMS\Module\InfoManager; @@ -37,7 +37,7 @@ class Activate extends ActivateAbstract /** * {@inheritdoc} */ - public static function activate(Pool $dbPool, InfoManager $info) + public static function activate(DatabasePool $dbPool, InfoManager $info) { parent::activate($dbPool, $info); } diff --git a/Admin/Deactivate.php b/Admin/Deactivate.php index fce4fa9..e00e6ce 100644 --- a/Admin/Deactivate.php +++ b/Admin/Deactivate.php @@ -16,7 +16,7 @@ namespace Modules\Calendar\Admin; -use phpOMS\DataStorage\Database\Pool; +use phpOMS\DataStorage\Database\DatabasePool; use phpOMS\Module\DeactivateAbstract; use phpOMS\Module\InfoManager; @@ -37,7 +37,7 @@ class Deactivate extends DeactivateAbstract /** * {@inheritdoc} */ - public static function deactivate(Pool $dbPool, InfoManager $info) + public static function deactivate(DatabasePool $dbPool, InfoManager $info) { parent::deactivate($dbPool, $info); } diff --git a/Admin/Install/Navigation.php b/Admin/Install/Navigation.php index 00927ea..a39a1c0 100644 --- a/Admin/Install/Navigation.php +++ b/Admin/Install/Navigation.php @@ -14,7 +14,7 @@ * @link http://orange-management.com */ namespace Modules\Calendar\Admin\Install; -use phpOMS\DataStorage\Database\Pool; +use phpOMS\DataStorage\Database\DatabasePool; /** * Navigation class. @@ -29,7 +29,7 @@ use phpOMS\DataStorage\Database\Pool; */ class Navigation { - public static function install(string $path, Pool $dbPool) + public static function install(string $path, DatabasePool $dbPool) { $navData = json_decode(file_get_contents(__DIR__ . '/Navigation.install.json'), true); diff --git a/Admin/Installer.php b/Admin/Installer.php index 63d5abf..c47f398 100644 --- a/Admin/Installer.php +++ b/Admin/Installer.php @@ -16,7 +16,7 @@ namespace Modules\Calendar\Admin; use phpOMS\DataStorage\Database\DatabaseType; -use phpOMS\DataStorage\Database\Pool; +use phpOMS\DataStorage\Database\DatabasePool; use phpOMS\Module\InfoManager; use phpOMS\Module\InstallerAbstract; @@ -37,7 +37,7 @@ class Installer extends InstallerAbstract /** * {@inheritdoc} */ - public static function install(string $path, Pool $dbPool, InfoManager $info) + public static function install(string $path, DatabasePool $dbPool, InfoManager $info) { parent::install($path, $dbPool, $info); diff --git a/Admin/Uninstall.php b/Admin/Uninstall.php index ff7b949..0fa314a 100644 --- a/Admin/Uninstall.php +++ b/Admin/Uninstall.php @@ -16,7 +16,7 @@ namespace Modules\Calendar\Admin; -use phpOMS\DataStorage\Database\Pool; +use phpOMS\DataStorage\Database\DatabasePool; use phpOMS\DataStorage\Database\Schema\Builder; use phpOMS\Module\UninstallAbstract; @@ -37,7 +37,7 @@ class Uninstall extends UninstallAbstract /** * {@inheritdoc} */ - public static function uninstall(Pool $dbPool, InfoManager $info) + public static function uninstall(DatabasePool $dbPool, InfoManager $info) { parent::uninstall($dbPool, $info); diff --git a/Admin/Update.php b/Admin/Update.php index 1be45e5..27ad086 100644 --- a/Admin/Update.php +++ b/Admin/Update.php @@ -16,7 +16,7 @@ namespace Modules\Calendar\Admin; -use phpOMS\DataStorage\Database\Pool; +use phpOMS\DataStorage\Database\DatabasePool; use phpOMS\Module\UpdateAbstract; use phpOMS\System\File\Directory; @@ -37,7 +37,7 @@ class Update extends UpdateAbstract /** * {@inheritdoc} */ - public static function update(Pool $dbPool, array $info) + public static function update(DatabasePool $dbPool, array $info) { Directory::deletePath(__DIR__ . '/Update'); mkdir('Update'); From c81e5f70f9ecf304c7c9f12c9aca86865957203c Mon Sep 17 00:00:00 2001 From: Dennis Eichhorn Date: Sat, 5 Nov 2016 21:47:51 +0100 Subject: [PATCH 5/9] Fix relation --- Admin/Installer.php | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/Admin/Installer.php b/Admin/Installer.php index c47f398..fe4cb53 100644 --- a/Admin/Installer.php +++ b/Admin/Installer.php @@ -75,7 +75,7 @@ class Installer extends InstallerAbstract $dbPool->get('core')->con->prepare( 'ALTER TABLE `' . $dbPool->get('core')->prefix . 'calendar_permission` - ADD CONSTRAINT `' . $dbPool->get('core')->prefix . 'calendar_permission_ibfk_2` FOREIGN KEY (`calendar_permission_calendar`) REFERENCES `' . $dbPool->get('core')->prefix . 'calendar` (`calendar_id`);' + ADD CONSTRAINT `' . $dbPool->get('core')->prefix . 'calendar_permission_ibfk_1` FOREIGN KEY (`calendar_permission_calendar`) REFERENCES `' . $dbPool->get('core')->prefix . 'calendar` (`calendar_id`);' )->execute(); $dbPool->get('core')->con->prepare( @@ -93,10 +93,16 @@ class Installer extends InstallerAbstract `schedule_end` datetime DEFAULT NULL, `schedule_created_at` datetime NOT NULL, `schedule_created_by` int(11) NOT NULL, - PRIMARY KEY (`schedule_id`) + PRIMARY KEY (`schedule_id`), + KEY `schedule_created_by` (`schedule_created_by`) )ENGINE=InnoDB DEFAULT CHARSET=utf8 AUTO_INCREMENT=1;' )->execute(); + $dbPool->get('core')->con->prepare( + 'ALTER TABLE `' . $dbPool->get('core')->prefix . 'schedule` + ADD CONSTRAINT `' . $dbPool->get('core')->prefix . 'schedule_ibfk_1` FOREIGN KEY (`schedule_created_by`) REFERENCES `' . $dbPool->get('core')->prefix . 'account` (`account_id`);' + )->execute(); + $dbPool->get('core')->con->prepare( 'CREATE TABLE if NOT EXISTS `' . $dbPool->get('core')->prefix . 'calendar_event` ( `calendar_event_id` int(11) NOT NULL AUTO_INCREMENT, From f99f74ed245c8b52e0cc844ace00c9edf7e7d078 Mon Sep 17 00:00:00 2001 From: Dennis Eichhorn Date: Sun, 6 Nov 2016 22:22:07 +0100 Subject: [PATCH 6/9] Fixing doc blocks --- Models/CalendarMapper.php | 8 ++++---- Models/EventMapper.php | 4 ++-- Models/ScheduleMapper.php | 2 +- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/Models/CalendarMapper.php b/Models/CalendarMapper.php index fa10104..17a4aa3 100644 --- a/Models/CalendarMapper.php +++ b/Models/CalendarMapper.php @@ -34,9 +34,9 @@ use phpOMS\DataStorage\Database\RelationType; class CalendarMapper extends DataMapperAbstract { /** - * Class name for . + * Class name. * - * @var array + * @var string * @since 1.0.0 */ protected static $CLASS = __CLASS__; @@ -44,7 +44,7 @@ class CalendarMapper extends DataMapperAbstract /** * Columns. * - * @var array + * @var array * @since 1.0.0 */ protected static $columns = [ @@ -59,7 +59,7 @@ class CalendarMapper extends DataMapperAbstract /** * Has many relation. * - * @var array + * @var array * @since 1.0.0 */ protected static $hasMany = [ diff --git a/Models/EventMapper.php b/Models/EventMapper.php index 00a512e..52a6e46 100644 --- a/Models/EventMapper.php +++ b/Models/EventMapper.php @@ -37,7 +37,7 @@ class EventMapper extends DataMapperAbstract /** * Columns. * - * @var array + * @var array * @since 1.0.0 */ protected static $columns = [ @@ -56,7 +56,7 @@ class EventMapper extends DataMapperAbstract /** * Has one relation. * - * @var array + * @var array * @since 1.0.0 */ protected static $ownsOne = [ diff --git a/Models/ScheduleMapper.php b/Models/ScheduleMapper.php index 43111e3..41a8909 100644 --- a/Models/ScheduleMapper.php +++ b/Models/ScheduleMapper.php @@ -37,7 +37,7 @@ class ScheduleMapper extends DataMapperAbstract /** * Columns. * - * @var array + * @var array * @since 1.0.0 */ protected static $columns = [ From a58bc999646568cf4863c5208ea6cfb1a43d6225 Mon Sep 17 00:00:00 2001 From: Dennis Eichhorn Date: Wed, 7 Dec 2016 20:23:04 +0100 Subject: [PATCH 7/9] Prepare const visibility --- Controller.php | 6 +++--- Models/AcceptStatus.php | 4 ++-- Models/AvailableStatus.php | 6 +++--- Models/EventStatus.php | 2 +- Models/EventType.php | 4 ++-- Models/FrequencyInterval.php | 20 ++++++++++---------- Models/FrequencyRelative.php | 10 +++++----- Models/FrequencyType.php | 10 +++++----- Models/IntervalType.php | 4 ++-- Models/ScheduleStatus.php | 4 ++-- 10 files changed, 35 insertions(+), 35 deletions(-) diff --git a/Controller.php b/Controller.php index d4fccba..d3714e4 100644 --- a/Controller.php +++ b/Controller.php @@ -47,7 +47,7 @@ class Controller extends ModuleAbstract implements WebInterface * @var string * @since 1.0.0 */ - const MODULE_PATH = __DIR__; + /* public */ const MODULE_PATH = __DIR__; /** * Module version. @@ -55,7 +55,7 @@ class Controller extends ModuleAbstract implements WebInterface * @var string * @since 1.0.0 */ - const MODULE_VERSION = '1.0.0'; + /* public */ const MODULE_VERSION = '1.0.0'; /** * Module name. @@ -63,7 +63,7 @@ class Controller extends ModuleAbstract implements WebInterface * @var string * @since 1.0.0 */ - const MODULE_NAME = 'Calendar'; + /* public */ const MODULE_NAME = 'Calendar'; /** * Providing. diff --git a/Models/AcceptStatus.php b/Models/AcceptStatus.php index 83be751..1ae390c 100644 --- a/Models/AcceptStatus.php +++ b/Models/AcceptStatus.php @@ -30,7 +30,7 @@ use phpOMS\Datatypes\Enum; */ abstract class AcceptStatus extends Enum { - const ACCEPTED = 0; + /* public */ const ACCEPTED = 0; - const DENIED = 1; + /* public */ const DENIED = 1; } diff --git a/Models/AvailableStatus.php b/Models/AvailableStatus.php index ea57588..efa7c60 100644 --- a/Models/AvailableStatus.php +++ b/Models/AvailableStatus.php @@ -30,9 +30,9 @@ use phpOMS\Datatypes\Enum; */ abstract class AvailableStatus extends Enum { - const AVAILABLE = 0; + /* public */ const AVAILABLE = 0; - const BUSY = 1; + /* public */ const BUSY = 1; - const AWAY = 2; + /* public */ const AWAY = 2; } diff --git a/Models/EventStatus.php b/Models/EventStatus.php index 2e0c097..1c07c6f 100644 --- a/Models/EventStatus.php +++ b/Models/EventStatus.php @@ -30,5 +30,5 @@ use phpOMS\Datatypes\Enum; */ abstract class EventStatus extends Enum { - const ACTIVE = 1; + /* public */ const ACTIVE = 1; } diff --git a/Models/EventType.php b/Models/EventType.php index bccbf4f..1bead30 100644 --- a/Models/EventType.php +++ b/Models/EventType.php @@ -30,7 +30,7 @@ use phpOMS\Datatypes\Enum; */ abstract class EventType extends Enum { - const TEMPLATE = 1; + /* public */ const TEMPLATE = 1; - const SINGLE = 2; + /* public */ const SINGLE = 2; } diff --git a/Models/FrequencyInterval.php b/Models/FrequencyInterval.php index 8d14a5e..74a161a 100644 --- a/Models/FrequencyInterval.php +++ b/Models/FrequencyInterval.php @@ -30,14 +30,14 @@ use phpOMS\Datatypes\Enum; */ abstract class FrequencyInterval extends Enum { - const SUNDAY = 1; - const MONDAY = 2; - const TUESDAY = 4; - const WEDNESDAY = 8; - const THURSDAY = 16; - const FRIDAY = 32; - const SATURDAY = 64; - const DAY = 128; - const WEEKDAY = 256; - const WEEKENDDAY = 512; + /* public */ const SUNDAY = 1; + /* public */ const MONDAY = 2; + /* public */ const TUESDAY = 4; + /* public */ const WEDNESDAY = 8; + /* public */ const THURSDAY = 16; + /* public */ const FRIDAY = 32; + /* public */ const SATURDAY = 64; + /* public */ const DAY = 128; + /* public */ const WEEKDAY = 256; + /* public */ const WEEKENDDAY = 512; } diff --git a/Models/FrequencyRelative.php b/Models/FrequencyRelative.php index 40e590b..8ddf0c8 100644 --- a/Models/FrequencyRelative.php +++ b/Models/FrequencyRelative.php @@ -30,13 +30,13 @@ use phpOMS\Datatypes\Enum; */ abstract class FrequencyRelative extends Enum { - const FIRST = 1; + /* public */ const FIRST = 1; - const SECOND = 2; + /* public */ const SECOND = 2; - const THIRD = 4; + /* public */ const THIRD = 4; - const FOURTH = 8; + /* public */ const FOURTH = 8; - const LAST = 64; + /* public */ const LAST = 64; } diff --git a/Models/FrequencyType.php b/Models/FrequencyType.php index c5db122..fab27aa 100644 --- a/Models/FrequencyType.php +++ b/Models/FrequencyType.php @@ -30,13 +30,13 @@ use phpOMS\Datatypes\Enum; */ abstract class FrequencyType extends Enum { - const ONCE = 1; + /* public */ const ONCE = 1; - const DAILY = 2; + /* public */ const DAILY = 2; - const WEEKLY = 4; + /* public */ const WEEKLY = 4; - const MONTHLY = 8; + /* public */ const MONTHLY = 8; - const YEARLY = 16; + /* public */ const YEARLY = 16; } diff --git a/Models/IntervalType.php b/Models/IntervalType.php index 633c032..1dec3fa 100644 --- a/Models/IntervalType.php +++ b/Models/IntervalType.php @@ -30,7 +30,7 @@ use phpOMS\Datatypes\Enum; */ abstract class IntervalType extends Enum { - const ABSOLUTE = 1; + /* public */ const ABSOLUTE = 1; - const RELATIVE = 2; + /* public */ const RELATIVE = 2; } diff --git a/Models/ScheduleStatus.php b/Models/ScheduleStatus.php index 3ea08a2..32bd60d 100644 --- a/Models/ScheduleStatus.php +++ b/Models/ScheduleStatus.php @@ -30,6 +30,6 @@ use phpOMS\Datatypes\Enum; */ abstract class ScheduleStatus extends Enum { - const ACTIVE = 1; - const INACTIVE = 1; + /* public */ const ACTIVE = 1; + /* public */ const INACTIVE = 1; } From e0858798519ff2beb9e74ca4887740ad7ef88a71 Mon Sep 17 00:00:00 2001 From: Dennis Eichhorn Date: Wed, 7 Dec 2016 20:56:15 +0100 Subject: [PATCH 8/9] Increase php version requirement --- Admin/Activate.php | 2 +- Admin/Deactivate.php | 2 +- Admin/Install/Navigation.php | 2 +- Admin/Installer.php | 2 +- Admin/Uninstall.php | 2 +- Admin/Update.php | 2 +- Controller.php | 2 +- Models/AcceptStatus.php | 2 +- Models/AvailableStatus.php | 2 +- Models/Calendar.php | 2 +- Models/CalendarMapper.php | 2 +- Models/Event.php | 2 +- Models/EventMapper.php | 2 +- Models/EventStatus.php | 2 +- Models/EventTemplate.php | 2 +- Models/EventType.php | 2 +- Models/FrequencyInterval.php | 2 +- Models/FrequencyRelative.php | 2 +- Models/FrequencyType.php | 2 +- Models/IntervalType.php | 2 +- Models/NullCalendar.php | 2 +- Models/NullEvent.php | 2 +- Models/NullSchedule.php | 2 +- Models/Schedule.php | 2 +- Models/ScheduleMapper.php | 2 +- Models/ScheduleStatus.php | 2 +- Theme/Backend/Lang/Navigation.en.lang.php | 2 +- Theme/Backend/Lang/api.en.lang.php | 2 +- Theme/Backend/Lang/en.lang.php | 2 +- Theme/backend/Lang/Navigation.en.lang.php | 2 +- Theme/backend/Lang/api.en.lang.php | 2 +- Theme/backend/Lang/en.lang.php | 2 +- 32 files changed, 32 insertions(+), 32 deletions(-) diff --git a/Admin/Activate.php b/Admin/Activate.php index 8da8114..29e7a0d 100644 --- a/Admin/Activate.php +++ b/Admin/Activate.php @@ -2,7 +2,7 @@ /** * Orange Management * - * PHP Version 7.0 + * PHP Version 7.1 * * @category TBD * @package TBD diff --git a/Admin/Deactivate.php b/Admin/Deactivate.php index e00e6ce..7ae03d3 100644 --- a/Admin/Deactivate.php +++ b/Admin/Deactivate.php @@ -2,7 +2,7 @@ /** * Orange Management * - * PHP Version 7.0 + * PHP Version 7.1 * * @category TBD * @package TBD diff --git a/Admin/Install/Navigation.php b/Admin/Install/Navigation.php index a39a1c0..33dbcd4 100644 --- a/Admin/Install/Navigation.php +++ b/Admin/Install/Navigation.php @@ -2,7 +2,7 @@ /** * Orange Management * - * PHP Version 7.0 + * PHP Version 7.1 * * @category TBD * @package TBD diff --git a/Admin/Installer.php b/Admin/Installer.php index fe4cb53..5be41a1 100644 --- a/Admin/Installer.php +++ b/Admin/Installer.php @@ -2,7 +2,7 @@ /** * Orange Management * - * PHP Version 7.0 + * PHP Version 7.1 * * @category TBD * @package TBD diff --git a/Admin/Uninstall.php b/Admin/Uninstall.php index 0fa314a..37213e2 100644 --- a/Admin/Uninstall.php +++ b/Admin/Uninstall.php @@ -2,7 +2,7 @@ /** * Orange Management * - * PHP Version 7.0 + * PHP Version 7.1 * * @category TBD * @package TBD diff --git a/Admin/Update.php b/Admin/Update.php index 27ad086..a22a893 100644 --- a/Admin/Update.php +++ b/Admin/Update.php @@ -2,7 +2,7 @@ /** * Orange Management * - * PHP Version 7.0 + * PHP Version 7.1 * * @category TBD * @package TBD diff --git a/Controller.php b/Controller.php index d3714e4..c93ea18 100644 --- a/Controller.php +++ b/Controller.php @@ -2,7 +2,7 @@ /** * Orange Management * - * PHP Version 7.0 + * PHP Version 7.1 * * @category TBD * @package TBD diff --git a/Models/AcceptStatus.php b/Models/AcceptStatus.php index 1ae390c..28c86b4 100644 --- a/Models/AcceptStatus.php +++ b/Models/AcceptStatus.php @@ -2,7 +2,7 @@ /** * Orange Management * - * PHP Version 7.0 + * PHP Version 7.1 * * @category TBD * @package TBD diff --git a/Models/AvailableStatus.php b/Models/AvailableStatus.php index efa7c60..2bdff49 100644 --- a/Models/AvailableStatus.php +++ b/Models/AvailableStatus.php @@ -2,7 +2,7 @@ /** * Orange Management * - * PHP Version 7.0 + * PHP Version 7.1 * * @category TBD * @package TBD diff --git a/Models/Calendar.php b/Models/Calendar.php index 506dc5e..efca628 100644 --- a/Models/Calendar.php +++ b/Models/Calendar.php @@ -2,7 +2,7 @@ /** * Orange Management * - * PHP Version 7.0 + * PHP Version 7.1 * * @category TBD * @package TBD diff --git a/Models/CalendarMapper.php b/Models/CalendarMapper.php index 17a4aa3..ac4fae4 100644 --- a/Models/CalendarMapper.php +++ b/Models/CalendarMapper.php @@ -2,7 +2,7 @@ /** * Orange Management * - * PHP Version 7.0 + * PHP Version 7.1 * * @category TBD * @package TBD diff --git a/Models/Event.php b/Models/Event.php index 2a014cc..b858ebc 100644 --- a/Models/Event.php +++ b/Models/Event.php @@ -2,7 +2,7 @@ /** * Orange Management * - * PHP Version 7.0 + * PHP Version 7.1 * * @category TBD * @package TBD diff --git a/Models/EventMapper.php b/Models/EventMapper.php index 52a6e46..eac0b8a 100644 --- a/Models/EventMapper.php +++ b/Models/EventMapper.php @@ -2,7 +2,7 @@ /** * Orange Management * - * PHP Version 7.0 + * PHP Version 7.1 * * @category TBD * @package TBD diff --git a/Models/EventStatus.php b/Models/EventStatus.php index 1c07c6f..e67ee18 100644 --- a/Models/EventStatus.php +++ b/Models/EventStatus.php @@ -2,7 +2,7 @@ /** * Orange Management * - * PHP Version 7.0 + * PHP Version 7.1 * * @category TBD * @package TBD diff --git a/Models/EventTemplate.php b/Models/EventTemplate.php index 64837f4..19f15b4 100644 --- a/Models/EventTemplate.php +++ b/Models/EventTemplate.php @@ -2,7 +2,7 @@ /** * Orange Management * - * PHP Version 7.0 + * PHP Version 7.1 * * @category TBD * @package TBD diff --git a/Models/EventType.php b/Models/EventType.php index 1bead30..40a759e 100644 --- a/Models/EventType.php +++ b/Models/EventType.php @@ -2,7 +2,7 @@ /** * Orange Management * - * PHP Version 7.0 + * PHP Version 7.1 * * @category TBD * @package TBD diff --git a/Models/FrequencyInterval.php b/Models/FrequencyInterval.php index 74a161a..19b5255 100644 --- a/Models/FrequencyInterval.php +++ b/Models/FrequencyInterval.php @@ -2,7 +2,7 @@ /** * Orange Management * - * PHP Version 7.0 + * PHP Version 7.1 * * @category TBD * @package TBD diff --git a/Models/FrequencyRelative.php b/Models/FrequencyRelative.php index 8ddf0c8..ea36b5d 100644 --- a/Models/FrequencyRelative.php +++ b/Models/FrequencyRelative.php @@ -2,7 +2,7 @@ /** * Orange Management * - * PHP Version 7.0 + * PHP Version 7.1 * * @category TBD * @package TBD diff --git a/Models/FrequencyType.php b/Models/FrequencyType.php index fab27aa..93ba3ba 100644 --- a/Models/FrequencyType.php +++ b/Models/FrequencyType.php @@ -2,7 +2,7 @@ /** * Orange Management * - * PHP Version 7.0 + * PHP Version 7.1 * * @category TBD * @package TBD diff --git a/Models/IntervalType.php b/Models/IntervalType.php index 1dec3fa..b5e4361 100644 --- a/Models/IntervalType.php +++ b/Models/IntervalType.php @@ -2,7 +2,7 @@ /** * Orange Management * - * PHP Version 7.0 + * PHP Version 7.1 * * @category TBD * @package TBD diff --git a/Models/NullCalendar.php b/Models/NullCalendar.php index b54ea97..0821916 100644 --- a/Models/NullCalendar.php +++ b/Models/NullCalendar.php @@ -2,7 +2,7 @@ /** * Orange Management * - * PHP Version 7.0 + * PHP Version 7.1 * * @category TBD * @package TBD diff --git a/Models/NullEvent.php b/Models/NullEvent.php index 1c9352e..9098ab8 100644 --- a/Models/NullEvent.php +++ b/Models/NullEvent.php @@ -2,7 +2,7 @@ /** * Orange Management * - * PHP Version 7.0 + * PHP Version 7.1 * * @category TBD * @package TBD diff --git a/Models/NullSchedule.php b/Models/NullSchedule.php index 0b5c795..3bf1d01 100644 --- a/Models/NullSchedule.php +++ b/Models/NullSchedule.php @@ -2,7 +2,7 @@ /** * Orange Management * - * PHP Version 7.0 + * PHP Version 7.1 * * @category TBD * @package TBD diff --git a/Models/Schedule.php b/Models/Schedule.php index 470ccfd..5a7fa79 100644 --- a/Models/Schedule.php +++ b/Models/Schedule.php @@ -2,7 +2,7 @@ /** * Orange Management * - * PHP Version 7.0 + * PHP Version 7.1 * * @category TBD * @package TBD diff --git a/Models/ScheduleMapper.php b/Models/ScheduleMapper.php index 41a8909..6a37e11 100644 --- a/Models/ScheduleMapper.php +++ b/Models/ScheduleMapper.php @@ -2,7 +2,7 @@ /** * Orange Management * - * PHP Version 7.0 + * PHP Version 7.1 * * @category TBD * @package TBD diff --git a/Models/ScheduleStatus.php b/Models/ScheduleStatus.php index 32bd60d..309c5d1 100644 --- a/Models/ScheduleStatus.php +++ b/Models/ScheduleStatus.php @@ -2,7 +2,7 @@ /** * Orange Management * - * PHP Version 7.0 + * PHP Version 7.1 * * @category TBD * @package TBD diff --git a/Theme/Backend/Lang/Navigation.en.lang.php b/Theme/Backend/Lang/Navigation.en.lang.php index 6cbf583..4e06d98 100644 --- a/Theme/Backend/Lang/Navigation.en.lang.php +++ b/Theme/Backend/Lang/Navigation.en.lang.php @@ -2,7 +2,7 @@ /** * Orange Management * - * PHP Version 7.0 + * PHP Version 7.1 * * @category TBD * @package TBD diff --git a/Theme/Backend/Lang/api.en.lang.php b/Theme/Backend/Lang/api.en.lang.php index eea62f6..7b5ae90 100644 --- a/Theme/Backend/Lang/api.en.lang.php +++ b/Theme/Backend/Lang/api.en.lang.php @@ -2,7 +2,7 @@ /** * Orange Management * - * PHP Version 7.0 + * PHP Version 7.1 * * @category TBD * @package TBD diff --git a/Theme/Backend/Lang/en.lang.php b/Theme/Backend/Lang/en.lang.php index cd66407..041be02 100644 --- a/Theme/Backend/Lang/en.lang.php +++ b/Theme/Backend/Lang/en.lang.php @@ -2,7 +2,7 @@ /** * Orange Management * - * PHP Version 7.0 + * PHP Version 7.1 * * @category TBD * @package TBD diff --git a/Theme/backend/Lang/Navigation.en.lang.php b/Theme/backend/Lang/Navigation.en.lang.php index 6cbf583..4e06d98 100644 --- a/Theme/backend/Lang/Navigation.en.lang.php +++ b/Theme/backend/Lang/Navigation.en.lang.php @@ -2,7 +2,7 @@ /** * Orange Management * - * PHP Version 7.0 + * PHP Version 7.1 * * @category TBD * @package TBD diff --git a/Theme/backend/Lang/api.en.lang.php b/Theme/backend/Lang/api.en.lang.php index eea62f6..7b5ae90 100644 --- a/Theme/backend/Lang/api.en.lang.php +++ b/Theme/backend/Lang/api.en.lang.php @@ -2,7 +2,7 @@ /** * Orange Management * - * PHP Version 7.0 + * PHP Version 7.1 * * @category TBD * @package TBD diff --git a/Theme/backend/Lang/en.lang.php b/Theme/backend/Lang/en.lang.php index cd66407..041be02 100644 --- a/Theme/backend/Lang/en.lang.php +++ b/Theme/backend/Lang/en.lang.php @@ -2,7 +2,7 @@ /** * Orange Management * - * PHP Version 7.0 + * PHP Version 7.1 * * @category TBD * @package TBD From a299f0521d906bcc876e9ea02e73afd5cb538794 Mon Sep 17 00:00:00 2001 From: Dennis Eichhorn Date: Sun, 22 Jan 2017 21:08:46 +0100 Subject: [PATCH 9/9] Fixing json serialization and reporter --- Theme/Backend/calendar-dashboard.tpl.php | 2 +- Theme/backend/calendar-dashboard.tpl.php | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Theme/Backend/calendar-dashboard.tpl.php b/Theme/Backend/calendar-dashboard.tpl.php index 2c21033..3f4ad3b 100644 --- a/Theme/Backend/calendar-dashboard.tpl.php +++ b/Theme/Backend/calendar-dashboard.tpl.php @@ -23,7 +23,7 @@ $calendar = $this->getData('calendar'); getDate()->getFirstDayOfMonth() <= $i*7+$j+1 && $calendar->getDate()->getDaysOfMonth() >= $i*7+$j+1) { echo ($i*7+$j+1) . ' ' . jddayofweek($j, 1); } else { - echo (($i*7+$j+1)-$calendar->getDate()->getDaysOfMonth()) . ' ' . jddayofweek($j, 1); + echo $current->createModify(0, 0, -2)->format('d') . ' ' . jddayofweek($j, 1); } ?>
    getData('calendar'); getDate()->getFirstDayOfMonth() <= $i*7+$j+1 && $calendar->getDate()->getDaysOfMonth() >= $i*7+$j+1) { echo ($i*7+$j+1) . ' ' . jddayofweek($j, 1); } else { - echo (($i*7+$j+1)-$calendar->getDate()->getDaysOfMonth()) . ' ' . jddayofweek($j, 1); + echo $current->createModify(0, 0, -2)->format('d') . ' ' . jddayofweek($j, 1); } ?>