-
+
this is a slot placeholder
-
+
this is a slot placeholder
@@ -401,8 +426,8 @@ export default {
-
-
+
+
this is a slot placeholder
diff --git a/public/js/components/Calendar/Week/Page.js b/public/js/components/Calendar/Week/Page.js
index 504293d07..37cd47be8 100644
--- a/public/js/components/Calendar/Week/Page.js
+++ b/public/js/components/Calendar/Week/Page.js
@@ -365,11 +365,11 @@ export default {
-
+
diff --git a/public/js/components/Cis/Mylv/LvInfo.js b/public/js/components/Cis/Mylv/LvInfo.js
index df82f5cca..cfddc2c6a 100644
--- a/public/js/components/Cis/Mylv/LvInfo.js
+++ b/public/js/components/Cis/Mylv/LvInfo.js
@@ -1,6 +1,5 @@
import { numberPadding, formatDate } from "../../../helpers/DateHelpers.js"
-
export default {
props: {
event: Object,
@@ -11,17 +10,23 @@ export default {
}
},
computed: {
- lektorenLinks: function(){
+ LV_TYPES: function () {
+ return {
+ lehreinheit: "lehreinheit",
+ reservierung: "reservierung",
+ moodle: "moodle",
+ };
+ },
+ lektorenLinks: function () {
if (!this.event || !Array.isArray(this.event.lektor) || !this.event.lektor.length) return "a";
- let lektorenLinks ={};
- this.event.lektor.forEach((lektor)=>{
+ let lektorenLinks = {};
+ this.event.lektor.forEach((lektor) => {
lektorenLinks[lektor.kurzbz] = FHC_JS_DATA_STORAGE_OBJECT.app_root + FHC_JS_DATA_STORAGE_OBJECT.ci_router + `/Cis/Profil/View/${lektor.mitarbeiter_uid}`;
})
return lektorenLinks;
},
- getOrtContentLink: function()
- {
+ getOrtContentLink: function () {
if (!this.event || !this.event.ort_content_id) return "a";
return FHC_JS_DATA_STORAGE_OBJECT.app_root + FHC_JS_DATA_STORAGE_OBJECT.ci_router + `/CisVue/Cms/content/${this.event.ort_content_id}`
@@ -61,52 +66,74 @@ export default {
| {{methodFormatDate(event.datum)}} |
- | {{
- $p.t('global','raum')?
- $p.t('global','raum')+':'
- :''
- }} |
-
-
- {{event.ort_kurzbz}}
- |
+
+ {{$p.t('global','aktivitaet')}}: |
+ {{event?.assignment}} |
+
+
+ {{
+ $p.t('global','raum')?
+ $p.t('global','raum')+':'
+ :''
+ }} |
+
+
+ {{event.ort_kurzbz}}
+ |
+
+
+
+
+ | {{
+ $p.t('lehre','lehrveranstaltung')?
+ $p.t('lehre','lehrveranstaltung')+':'
+ :''
+ }} |
+ {{'('+event.lehrform+') ' + event.lehrfach_bez}} |
+
+
+
+
+ | {{
+ $p.t('lehre','lektor')?
+ $p.t('lehre','lektor')+':'
+ :''
+ }} |
+
+
+ |
+
+
+
+
+ | {{$p.t('global','typ')}}: |
+ {{event?.purpose}} |
+
+
+ {{
+ $p.t('ui','zeitraum')?
+ $p.t('ui','zeitraum')+':'
+ :''
+ }} |
+ {{start_time + ' - ' + end_time}} |
+
- | {{
- $p.t('lehre','lehrveranstaltung')?
- $p.t('lehre','lehrveranstaltung')+':'
- :''
- }} |
- {{'('+event.lehrform+') ' + event.lehrfach_bez}} |
-
-
- | {{
- $p.t('lehre','lektor')?
- $p.t('lehre','lektor')+':'
- :''
- }} |
-
-
- |
-
-
- | {{
- $p.t('ui','zeitraum')?
- $p.t('ui','zeitraum')+':'
- :''
- }} |
- {{start_time + ' - ' + end_time}} |
-
-
- | {{
- $p.t('lehre','organisationseinheit')?
- $p.t('lehre','organisationseinheit')+':'
- :''
- }} |
- {{event.organisationseinheit}} |
+
+ {{$p.t('fristenmanagement','frist')}}: |
+ {{start_time}} |
+
+
+ {{
+ $p.t('lehre','organisationseinheit')?
+ $p.t('lehre','organisationseinheit')+':'
+ :''
+ }} |
+ {{event.organisationseinheit}} |
+
diff --git a/public/js/components/Cis/Mylv/LvModal.js b/public/js/components/Cis/Mylv/LvModal.js
index acb2a7693..4be4e5c79 100644
--- a/public/js/components/Cis/Mylv/LvModal.js
+++ b/public/js/components/Cis/Mylv/LvModal.js
@@ -70,11 +70,19 @@ export default {
template: /*html*/ `
- {{ event.titel + ' - ' + event.lehrfach_bez + ' [' + event.ort_kurzbz+']'}}
+ {{event.titel}}
+ {{ event.titel + ' - ' + event.lehrfach_bez + ' [' + event.ort_kurzbz+']'}}
{{ event.lehrfach_bez + ' [' + event.ort_kurzbz+']'}}
- {{$p.t('lvinfo','lehrveranstaltungsinformationen')}}
+
+
+ {{$p.t('lvinfo','Moodleinformationen')}}
+
+
+ {{$p.t('lvinfo','lehrveranstaltungsinformationen')}}
+
+
Lehrveranstaltungs Menu
diff --git a/public/js/components/Cis/Stundenplan/Stundenplan.js b/public/js/components/Cis/Stundenplan/Stundenplan.js
index 4a751a637..af19e218b 100644
--- a/public/js/components/Cis/Stundenplan/Stundenplan.js
+++ b/public/js/components/Cis/Stundenplan/Stundenplan.js
@@ -154,23 +154,28 @@ export const Stundenplan = {
let date_end = Math.floor(new Date(end_date).getTime() / 1000);
return this.$fhcApi.factory.stundenplan.getMoodleEventsByUserid('io23m005', date_start, date_end).then((response) => response.events).then(events => {
let data =events.map(event =>{
- const start_date = new Date(event.timestart * 1000);
- const formatted_year = Intl.DateTimeFormat(this.$p.user_locale, { year: 'numeric' }).format(start_date);
- const formatted_month = Intl.DateTimeFormat(this.$p.user_locale, { month: '2-digit' }).format(start_date);
- const formatted_day = Intl.DateTimeFormat(this.$p.user_locale, { year: '2-digit' }).format(start_date);
- const formatted_date = `${formatted_year}-${formatted_month}-${formatted_day}`;
+ const event_start_date = new Date(Number(event.timestart) * 1000);
+ const event_end_date = new Date(((Number(event.timestart) + Number(event.timeduration)) * 1000));
+ const formatted_date = `${event_start_date.getFullYear()}-${event_start_date.getMonth()+1}-${event_start_date.getDate()}`;
+ // to get the same date and time as in moodle, we use the default UTC time zone
+ const formatted_start_time = event_start_date.toLocaleTimeString(this.$p.user_locale, {hour:'2-digit',minute:'2-digit', second:'2-digit',hour12:false, timeZone:'UTC'});
+ const formatted_end_time = event_end_date.toLocaleTimeString(this.$p.user_locale, { hour: '2-digit', minute: '2-digit', second: '2-digit', hour12: false, timeZone: 'UTC' });
+
return {
type:'moodle',
- beginn: "14:00:00",
- ende: "15:00:00",
+ beginn: formatted_start_time,
+ ende: formatted_end_time,
allDayEvent: true,
datum: formatted_date,
- topic: event.activityname,
+ purpose: event.purpose,
+ assignment: event.activityname,
+ topic: event.activitystr,
lektor:[],
gruppe:[],
ort_kurzbz: event.location,
- lehreinheit_id:0,
- titel: event.activitystr,
+ //moodle idnumber entspricht der course id number die man den Kurs in Moodle vergeben kann
+ lehreinheit_id:event.lehreinheitsNummber??null,
+ titel: event.course.fullname,
lehrfach:'',
lehrform:'',
lehrfach_bez:'',
@@ -233,7 +238,7 @@ export const Stundenplan = {
moodle:
- {{event.titel}}
+ {{event.topic}}
{{event.topic}}
@@ -243,34 +248,46 @@ export const Stundenplan = {
-
-
-
-
{{convertTime(event.orig.beginn.split(":"))}}
-
{{convertTime(event.orig.ende.split(":"))}}
+
+
+
+ moodle:
+ {{event.topic}}
-
-
-
Lehrveranstaltung:
-
{{event?.orig.topic}}
-
-
-
Lektor:
-
{{lektor.kurzbz}}
-
-
-
Ort:
-
{{event?.orig.ort_kurzbz}}
-
+
+
+
+
+
+ {{convertTime(event.beginn.split(":"))}}
+ {{convertTime(event.ende.split(":"))}}
+
+
+
+
Lehrveranstaltung:
+
{{event?.topic}}
+
+
+
Lektor:
+
{{lektor.kurzbz}}
+
+
+
Ort:
+
{{event?.ort_kurzbz}}
+
+
+
-
+
{{$p.t('lvinfo','lehrveranstaltungsinformationen')}}
-
+
- Lehrveranstaltungs Menu
-
+
+ Lehrveranstaltungs Menu
+
+
Keine Lehrveranstaltungen
diff --git a/system/phrasesupdate.php b/system/phrasesupdate.php
index d841acc85..f55698ec3 100644
--- a/system/phrasesupdate.php
+++ b/system/phrasesupdate.php
@@ -20164,6 +20164,26 @@ array(
)
)
),
+ array(
+ 'app' => 'core',
+ 'category' => 'lvinfo',
+ 'phrase' => 'Moodleinformationen',
+ 'insertvon' => 'system',
+ 'phrases' => array(
+ array(
+ 'sprache' => 'German',
+ 'text' => "Moodle Informationen",
+ 'description' => '',
+ 'insertvon' => 'system'
+ ),
+ array(
+ 'sprache' => 'English',
+ 'text' => "Moodle Information",
+ 'description' => '',
+ 'insertvon' => 'system'
+ )
+ )
+ ),
array(
'app' => 'core',
'category' => 'lehre',