HTWK/htwkalender
1
1
Fork 0
mirror of https://gitlab.dit.htwk-leipzig.de/htwk-software/htwkalender.git synced 2025-08-10 13:43:49 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'main' into 24-improve-animations-page-design-and-theme-2

Browse Source 
# Conflicts:
#	frontend/src/view/DynamicPage.vue
This commit is contained in:
Elmar Kresse
2024-01-18 22:04:49 +01:00
parent 5dd8ecd5a1 cfa788b20f
commit 32b8b7de65
5 changed files with 61 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
frontend/src/view/AdditionalModules.vue
View File

@@ -1,12 +1,9 @@
<script lang="ts" setup>
import { defineAsyncComponent } from "vue";
import moduleStore from "../store/moduleStore";
import router from "../router";
import AdditionalModuleTable from "../components/AdditionalModuleTable.vue";
const store = moduleStore();
const AdditionalModuleTable = defineAsyncComponent(
() => import("../components/AdditionalModuleTable.vue"),
);
async function nextStep() {
await router.push("/rename-modules");

20
frontend/src/view/editCalendar/EditModules.vue
View File

@@ -1,16 +1,13 @@
<script lang="ts" setup>
import { computed, inject, Ref, ref } from "vue";
import { Module } from "../../model/module.ts";
import { Module } from "@/model/module.ts";
import moduleStore from "../../store/moduleStore";
import { fetchAllModules } from "../../api/fetchCourse.ts";
import {
deleteIndividualFeed,
saveIndividualFeed,
} from "../../api/createFeed.ts";
import { fetchAllModules } from "@/api/fetchCourse.ts";
import { deleteIndividualFeed, saveIndividualFeed } from "@/api/createFeed.ts";
import tokenStore from "../../store/tokenStore";
import router from "../../router";
import router from "@/router";
import ModuleTemplateDialog from "../../components/ModuleTemplateDialog.vue";
import { onlyWhitespace } from "../../helpers/strings.ts";
import { onlyWhitespace } from "@/helpers/strings.ts";
import { useI18n } from "vue-i18n";
import { useToast } from "primevue/usetoast";
const { t } = useI18n({ useScope: "global" });
@@ -18,6 +15,13 @@ const { t } = useI18n({ useScope: "global" });
const toast = useToast();
const visible = ref(false);
defineProps({
class: {
type: String,
default: "",
},
});
const store = moduleStore();
const tableData = computed(() =>