Going to use rrule.js instead
This commit is contained in:
parent
4959ccb815
commit
78cb2de9b6
@ -18,4 +18,6 @@ class CalendarEvent extends AbstractEvent {
|
|||||||
public $reminderValue;
|
public $reminderValue;
|
||||||
|
|
||||||
public $reminderUnits;
|
public $reminderUnits;
|
||||||
|
|
||||||
|
public $recurringRule;
|
||||||
}
|
}
|
@ -15,6 +15,7 @@ use BusinessLogic\Security\UserPrivilege;
|
|||||||
use BusinessLogic\ValidationModel;
|
use BusinessLogic\ValidationModel;
|
||||||
use Controllers\JsonRetriever;
|
use Controllers\JsonRetriever;
|
||||||
use DataAccess\Settings\ModsForHeskSettingsGateway;
|
use DataAccess\Settings\ModsForHeskSettingsGateway;
|
||||||
|
use RRule\RRule;
|
||||||
|
|
||||||
class CalendarController extends \BaseClass {
|
class CalendarController extends \BaseClass {
|
||||||
function get() {
|
function get() {
|
||||||
@ -117,6 +118,7 @@ class CalendarController extends \BaseClass {
|
|||||||
$event->categoryId = Helpers::safeArrayGet($json, 'categoryId');
|
$event->categoryId = Helpers::safeArrayGet($json, 'categoryId');
|
||||||
$event->reminderValue = Helpers::safeArrayGet($json, 'reminderValue');
|
$event->reminderValue = Helpers::safeArrayGet($json, 'reminderValue');
|
||||||
$event->reminderUnits = ReminderUnit::getByName(Helpers::safeArrayGet($json, 'reminderUnits'));
|
$event->reminderUnits = ReminderUnit::getByName(Helpers::safeArrayGet($json, 'reminderUnits'));
|
||||||
|
$event->recurringRule = Helpers::safeArrayGet($json, 'recurringRule');
|
||||||
|
|
||||||
return $event;
|
return $event;
|
||||||
}
|
}
|
||||||
|
@ -17,7 +17,6 @@
|
|||||||
"phpmailer/phpmailer": "^5.2",
|
"phpmailer/phpmailer": "^5.2",
|
||||||
"mailgun/mailgun-php": "1.7.2",
|
"mailgun/mailgun-php": "1.7.2",
|
||||||
"mike-koch/php-di": "4.4.11",
|
"mike-koch/php-di": "4.4.11",
|
||||||
"doctrine/annotations": "1.2",
|
"doctrine/annotations": "1.2"
|
||||||
"rlanvin/php-rrule": "1.6.0"
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
46
api/composer.lock
generated
46
api/composer.lock
generated
@ -4,7 +4,7 @@
|
|||||||
"Read more about it at https://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file",
|
"Read more about it at https://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file",
|
||||||
"This file is @generated automatically"
|
"This file is @generated automatically"
|
||||||
],
|
],
|
||||||
"content-hash": "271633d6be53dff4f327e318b49a049f",
|
"content-hash": "cba4f6a9b461d9050bd4095da7c79aea",
|
||||||
"packages": [
|
"packages": [
|
||||||
{
|
{
|
||||||
"name": "container-interop/container-interop",
|
"name": "container-interop/container-interop",
|
||||||
@ -690,50 +690,6 @@
|
|||||||
],
|
],
|
||||||
"time": "2017-02-14T16:28:37+00:00"
|
"time": "2017-02-14T16:28:37+00:00"
|
||||||
},
|
},
|
||||||
{
|
|
||||||
"name": "rlanvin/php-rrule",
|
|
||||||
"version": "v1.6.0",
|
|
||||||
"source": {
|
|
||||||
"type": "git",
|
|
||||||
"url": "https://github.com/rlanvin/php-rrule.git",
|
|
||||||
"reference": "c543bda87d2f8b6c490210f1a6e2bf0d79162a4a"
|
|
||||||
},
|
|
||||||
"dist": {
|
|
||||||
"type": "zip",
|
|
||||||
"url": "https://api.github.com/repos/rlanvin/php-rrule/zipball/c543bda87d2f8b6c490210f1a6e2bf0d79162a4a",
|
|
||||||
"reference": "c543bda87d2f8b6c490210f1a6e2bf0d79162a4a",
|
|
||||||
"shasum": ""
|
|
||||||
},
|
|
||||||
"require": {
|
|
||||||
"php": ">=5.3.0"
|
|
||||||
},
|
|
||||||
"require-dev": {
|
|
||||||
"phpunit/phpunit": "<6"
|
|
||||||
},
|
|
||||||
"suggest": {
|
|
||||||
"ext-intl": "Intl extension is needed for humanReadable()"
|
|
||||||
},
|
|
||||||
"type": "library",
|
|
||||||
"autoload": {
|
|
||||||
"psr-4": {
|
|
||||||
"RRule\\": "src/"
|
|
||||||
}
|
|
||||||
},
|
|
||||||
"notification-url": "https://packagist.org/downloads/",
|
|
||||||
"license": [
|
|
||||||
"MIT"
|
|
||||||
],
|
|
||||||
"description": "Lightweight and fast recurrence rules for PHP (RFC 5545)",
|
|
||||||
"homepage": "https://github.com/rlanvin/php-rrule",
|
|
||||||
"keywords": [
|
|
||||||
"date",
|
|
||||||
"ical",
|
|
||||||
"recurrence",
|
|
||||||
"recurring",
|
|
||||||
"rrule"
|
|
||||||
],
|
|
||||||
"time": "2017-10-11T12:23:40+00:00"
|
|
||||||
},
|
|
||||||
{
|
{
|
||||||
"name": "symfony/event-dispatcher",
|
"name": "symfony/event-dispatcher",
|
||||||
"version": "v2.8.33",
|
"version": "v2.8.33",
|
||||||
|
Loading…
x
Reference in New Issue
Block a user