Skip to content
Snippets Groups Projects
Commit da9e7058 authored by Moritz Strohm's avatar Moritz Strohm
Browse files

use current date when creating calendar dates

parent 4f847abc
No related branches found
No related tags found
No related merge requests found
...@@ -39,7 +39,7 @@ class Calendar_CalendarController extends AuthenticatedController ...@@ -39,7 +39,7 @@ class Calendar_CalendarController extends AuthenticatedController
_('Termin anlegen'), _('Termin anlegen'),
$this->url_for('calendar/date/add', $params), $this->url_for('calendar/date/add', $params),
Icon::create('add'), Icon::create('add'),
['data-dialog' => 'size=auto'] ['data-dialog' => 'size=auto', 'class' => 'calendar-action']
); );
} }
...@@ -446,7 +446,7 @@ class Calendar_CalendarController extends AuthenticatedController ...@@ -446,7 +446,7 @@ class Calendar_CalendarController extends AuthenticatedController
_('Termin anlegen'), _('Termin anlegen'),
$this->url_for('calendar/date/add/course_' . $course->id), $this->url_for('calendar/date/add/course_' . $course->id),
Icon::create('add'), Icon::create('add'),
['data-dialog' => 'size=default'] ['data-dialog' => 'size=default', 'class' => 'calendar-action']
); );
$actions->addLink( $actions->addLink(
_('Drucken'), _('Drucken'),
......
...@@ -232,6 +232,14 @@ class Calendar_DateController extends AuthenticatedController ...@@ -232,6 +232,14 @@ class Calendar_DateController extends AuthenticatedController
$this->date->repetition_end = $this->date->end; $this->date->repetition_end = $this->date->end;
} else { } else {
$time = new DateTime(); $time = new DateTime();
if (Request::submitted('timestamp')) {
$time->setTimestamp(Request::int('timestamp'));
} elseif (Request::submitted('defaultDate')) {
$date_parts = explode('-', Request::get('defaultDate'));
if (count($date_parts) === 3) {
$time->setDate(intval($date_parts[0]), intval($date_parts[1]), intval($date_parts[2]));
}
}
$time = $time->add(new DateInterval('PT1H')); $time = $time->add(new DateInterval('PT1H'));
$time->setTime(intval($time->format('H')), 0, 0); $time->setTime(intval($time->format('H')), 0, 0);
$this->date->begin = $time->getTimestamp(); $this->date->begin = $time->getTimestamp();
......
...@@ -731,9 +731,9 @@ class Fullcalendar ...@@ -731,9 +731,9 @@ class Fullcalendar
//Get the timestamp: //Get the timestamp:
let timestamp = changedMoment.getTime() / 1000; let timestamp = changedMoment.getTime() / 1000;
jQuery('a.resource-bookings-actions').each(function () { jQuery('a.resource-bookings-actions, a.calendar-action').each(function () {
const url = new URL(this.href); const url = new URL(this.href);
url.searchParams.set('timestamp', timestamp) url.searchParams.set('timestamp', timestamp.toString())
url.searchParams.set('defaultDate', changed_date) url.searchParams.set('defaultDate', changed_date)
this.href = url.toString(); this.href = url.toString();
}); });
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment