diff --git a/application/config/javascript.php b/application/config/javascript.php index 5e9aa270a..f3237fde3 100644 --- a/application/config/javascript.php +++ b/application/config/javascript.php @@ -4,4 +4,6 @@ if (! defined('BASEPATH')) exit('No direct script access allowed'); // use vuejs dev version $config['use_vuejs_dev_version'] = false; // use bundled javascript -$config['use_bundled_javascript'] = false; \ No newline at end of file +$config['use_bundled_javascript'] = false; +// systemerror_mailto use in FHC-Alert Plugin - if empty Link will not be rendered +$config['systemerror_mailto'] = ''; \ No newline at end of file diff --git a/application/controllers/api/frontend/v1/Stundenplan.php b/application/controllers/api/frontend/v1/Stundenplan.php index 4e1ed5778..11a8a7034 100644 --- a/application/controllers/api/frontend/v1/Stundenplan.php +++ b/application/controllers/api/frontend/v1/Stundenplan.php @@ -87,47 +87,19 @@ class Stundenplan extends FHCAPI_Controller $stundenplan_events = array(); } // fetching moodle events - $moodle_start_date = new DateTime($start_date); - $moodle_start_date = $moodle_start_date->getTimestamp(); - $moodle_end_date = new DateTime($end_date); - $moodle_end_date = $moodle_end_date->getTimestamp(); $moodle_events = []; - Events::trigger('moodleCalendarEvents', - function & () use (&$moodle_events) { - return $moodle_events; - }, - ['timestart'=>$moodle_start_date,'timeend'=>$moodle_end_date, 'username'=>getAuthUID()] + Events::trigger( + 'moodleCalendarEvents', + function & () use (&$moodle_events) + { + return $moodle_events; + }, + [ + 'start_date' => $start_date, + 'end_date' => $end_date, + 'username' => getAuthUID() + ] ); - $moodle_events = array_map(function($event){ - $moodle_event_timestart = new DateTime($event->timestart); - $moodle_event_timeend = new DateTime($event->timeend); - $convertedEvent = new stdClass(); - $convertedEvent->type = 'moodle'; - $convertedEvent->beginn = $moodle_event_timestart->format('H:i:s'); - $convertedEvent->ende = $moodle_event_timeend->format('H:i:s'); - $convertedEvent->allDayEvent = true; - $convertedEvent->datum = $moodle_event_timestart->format('Y-n-j'); - $convertedEvent->purpose = $event->purpose; - $convertedEvent->assignment = $event->activityname; - $convertedEvent->topic = $event->activitystr; - $convertedEvent->lektor = []; - $convertedEvent->gruppe = []; - $convertedEvent->ort_kurzbz = $event->location; - $convertedEvent->lehreinheit_id = $event->lehreinheitsNummber ?? null; - $convertedEvent->titel = isset($event->course->fullname)? $event->course->fullname:null; - $convertedEvent->lehrfach = ''; - $convertedEvent->lehrform = ''; - $convertedEvent->lehrfach_bez = ''; - $convertedEvent->organisationseinheit = ''; - $convertedEvent->farbe = '00689E'; - $convertedEvent->lehrveranstaltung_id = 0; - $convertedEvent->ort_content_id = 0; - $convertedEvent->url = $event->url; - $convertedEvent->activityIcon = isset($event->icon->iconurl)? $event->icon->iconurl:null; - $convertedEvent->actionname = isset($event->action->name)?$event->action->name:null; - $convertedEvent->overdue = !empty($event->overdue); - return $convertedEvent; - },$moodle_events); $result = array_merge($stundenplan_events,$moodle_events); // sort array with moodle events first diff --git a/application/helpers/hlp_header_helper.php b/application/helpers/hlp_header_helper.php index af8a32807..3825acc75 100644 --- a/application/helpers/hlp_header_helper.php +++ b/application/helpers/hlp_header_helper.php @@ -95,6 +95,9 @@ function generateJSDataStorageObject($indexPage, $calledPath, $calledMethod) }, $server_language); $user_language = getUserLanguage(); + $ci->load->config('javascript'); + $systemerror_mailto = $ci->config->item('systemerror_mailto'); + $FHC_JS_DATA_STORAGE_OBJECT = array( 'app_root' => APP_ROOT, 'ci_router' => $indexPage, @@ -103,6 +106,7 @@ function generateJSDataStorageObject($indexPage, $calledPath, $calledMethod) 'server_languages' => $server_language, 'user_language' => $user_language, 'timezone' => date_default_timezone_get(), + 'systemerror_mailto' => $systemerror_mailto, ); $toPrint = "\n"; diff --git a/cis/testtool/frage.php b/cis/testtool/frage.php index 0aa37b299..c38229cdf 100644 --- a/cis/testtool/frage.php +++ b/cis/testtool/frage.php @@ -148,7 +148,7 @@ echo ' alert(t("testtool/alleFragenBeantwortet")."'"?>); return true; } - + $(document).ready(function () { $(document).bind('cut copy paste', function(e) { @@ -717,7 +717,7 @@ if($frage->frage_id!='') if(!$demo) { - echo ''; + echo ''; } else { diff --git a/public/css/components/calendar.css b/public/css/components/calendar.css index ddf35e3e7..1de5e575b 100644 --- a/public/css/components/calendar.css +++ b/public/css/components/calendar.css @@ -73,9 +73,10 @@ box-shadow: 1px 1px 0 #dee2e6; } -.fhc-calendar-week-page .all-day-event{ +.fhc-calendar-week-page .all-day-event { max-height: 75px; - overflow:auto; + overflow: auto; + overscroll-behavior: none; } .fhc-calendar-week-page .all-day-event-container{ diff --git a/public/js/components/Cis/Mylv/LvInfo.js b/public/js/components/Cis/Mylv/LvInfo.js index e248f523f..474ec635a 100644 --- a/public/js/components/Cis/Mylv/LvInfo.js +++ b/public/js/components/Cis/Mylv/LvInfo.js @@ -68,7 +68,7 @@ export default { {{$p.t('global','aktivitaet')}}: - {{event?.assignment}} + {{$p.t('global','typ')}}: diff --git a/public/js/components/Cis/Mylv/LvModal.js b/public/js/components/Cis/Mylv/LvModal.js index 4e4f30aea..435caa97c 100644 --- a/public/js/components/Cis/Mylv/LvModal.js +++ b/public/js/components/Cis/Mylv/LvModal.js @@ -76,7 +76,7 @@ export default { template: /*html*/ ` diff --git a/public/js/components/Cis/Stundenplan/Stundenplan.js b/public/js/components/Cis/Stundenplan/Stundenplan.js index bf646d5e4..efb8c06ea 100644 --- a/public/js/components/Cis/Stundenplan/Stundenplan.js +++ b/public/js/components/Cis/Stundenplan/Stundenplan.js @@ -288,7 +288,7 @@ const Stundenplan = {
- {{event.topic}} + - {{event.topic}}
@@ -308,7 +308,7 @@ const Stundenplan = {
- {{event.topic}} + - {{event.topic}}
{{event.topic}} @@ -322,7 +322,7 @@ const Stundenplan = {