HTWK/htwkalender-pwa
1
0
Fork 0
mirror of https://gitlab.dit.htwk-leipzig.de/htwk-software/htwkalender-pwa.git synced 2026-01-16 15:52:26 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'main' into 15-calendar-preview

Browse Source 
# Conflicts:
#	frontend/src/App.vue
#	frontend/src/view/AdditionalModules.vue
This commit is contained in:
masterelmar
2023-11-20 11:37:25 +01:00
parent bcd1dd714d ef9247c300
commit e8e7c6149a
59 changed files with 1539 additions and 811 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
frontend/src/components/editCalendar/EditModules.vue
View File

@@ -7,6 +7,7 @@ import { saveIndividualFeed } from "../../api/createFeed";
import tokenStore from "../../store/tokenStore";
import router from "../../router";
import ModuleTemplateDialog from "../ModuleTemplateDialog.vue";
import { onlyWhitespace } from "../../helpers/strings.ts";
const store = moduleStore();
const tableData = computed(() =>
@@ -90,7 +91,11 @@ async function finalStep() {
<!-- Text Body -->
<template #body="{ data, field }">
<template v-if="field === 'Module'">
{{ data[field].userDefinedName }}
{{
onlyWhitespace(data[field].userDefinedName)
? data[field].name
: data[field].userDefinedName
}}
</template>
<template v-else-if="field === 'Reminder'">
<Button
@@ -125,6 +130,9 @@ async function finalStep() {
@click="data.Module.reminder = !data.Module.reminder"
></Button>
</template>
<template v-else>
{{ data[field] }}
</template>
</template>
</Column>
<Column>