mirror of
https://github.com/FH-Complete/FHC-Core.git
synced 2026-06-27 17:09:37 +00:00
Merge branch 'cis40_2026-05_ma_rc' into demo-cis40
This commit is contained in:
@@ -694,13 +694,6 @@ class StundenplanLib
|
||||
{
|
||||
$ymd = date('Y-m-d', $current);
|
||||
|
||||
if ((int)date('w', $current) === 0)
|
||||
{
|
||||
$result[$ymd] = false;
|
||||
$current = $this->jump_day($current, 1);
|
||||
continue;
|
||||
}
|
||||
|
||||
$result[$ymd] = ($ymd >= $start_ymd_allowed && $ymd <= $end_ymd_allowed) ? true : false;
|
||||
|
||||
$current = $this->jump_day($current, 1);
|
||||
|
||||
@@ -43,6 +43,7 @@ export default {
|
||||
maxWidth: 40,
|
||||
headerClick: this.collapseFunction,
|
||||
visible: true,
|
||||
responsive: 0,
|
||||
},
|
||||
{
|
||||
title: Vue.computed(() => this.$p.t("ui/bezeichnung")),
|
||||
@@ -50,6 +51,7 @@ export default {
|
||||
headerFilter: true,
|
||||
minWidth: 200,
|
||||
visible: true,
|
||||
responsive: 0,
|
||||
},
|
||||
{
|
||||
title: Vue.computed(() =>
|
||||
@@ -59,6 +61,7 @@ export default {
|
||||
headerFilter: true,
|
||||
minWidth: 200,
|
||||
visible: true,
|
||||
responsive: 1,
|
||||
},
|
||||
{
|
||||
title: Vue.computed(() =>
|
||||
@@ -72,6 +75,7 @@ export default {
|
||||
visible: true,
|
||||
formatter: "datetime",
|
||||
formatterParams: this.datetimeFormatterParams(),
|
||||
responsive: 4,
|
||||
},
|
||||
{
|
||||
title: Vue.computed(() =>
|
||||
@@ -85,6 +89,7 @@ export default {
|
||||
visible: true,
|
||||
formatter: "datetime",
|
||||
formatterParams: this.datetimeFormatterParams(),
|
||||
responsive: 3,
|
||||
},
|
||||
{
|
||||
title: Vue.computed(() =>
|
||||
@@ -94,6 +99,7 @@ export default {
|
||||
headerFilter: true,
|
||||
minWidth: 200,
|
||||
visible: true,
|
||||
responsive: 2,
|
||||
},
|
||||
],
|
||||
},
|
||||
|
||||
@@ -176,7 +176,6 @@ export const Profil = {
|
||||
this.data = data.profil_data.data;
|
||||
this.calendarSyncUrls = data.calendar_sync_urls ?? [];
|
||||
this.authPermissions = data.permissions;
|
||||
console.log(data.profil_data);
|
||||
},
|
||||
zustellAdressenCount() {
|
||||
if (!this.data || !this.data.adressen) {
|
||||
|
||||
@@ -63,11 +63,6 @@ export default {
|
||||
isFutureEvent() {
|
||||
const eventStart = luxon.DateTime.fromISO(`${this.event.datum}T${this.event.beginn}`);
|
||||
return eventStart > luxon.DateTime.now();
|
||||
}
|
||||
},
|
||||
methods: {
|
||||
handleDelete() {
|
||||
this.$emit('delete-event', this.event);
|
||||
},
|
||||
timeSlotDisplayClasses() {
|
||||
switch (this.$props.timeSlotDisplayBehavior) {
|
||||
@@ -80,6 +75,11 @@ export default {
|
||||
}
|
||||
},
|
||||
},
|
||||
methods: {
|
||||
handleDelete() {
|
||||
this.$emit('delete-event', this.event);
|
||||
},
|
||||
},
|
||||
template: /* html */`
|
||||
<div
|
||||
class="cis-renderer-reservierungen-calendar-event calendar-event-default h-100 w-100 p-1 position-relative">
|
||||
|
||||
Reference in New Issue
Block a user