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

feat:#11 merge conflicts

Browse Source
This commit is contained in:
survellow
2023-10-25 21:45:11 +02:00
parent 0467ad3c3a 97722ba7d2
commit 96ec58be23
17 changed files with 224 additions and 187 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
frontend/src/api/fetchCourse.ts
View File

@@ -27,6 +27,7 @@ export async function fetchModulesByCourseAndSemester(
modulesResponse.forEach((module: Module) =>
modules.push(
new Module(
module.uuid,
module.name,
course,
module.name,
@@ -50,6 +51,7 @@ export async function fetchAllModules(): Promise<Module[]> {
responseModules.forEach((module: Module) => {
modules.push(
new Module(
module.uuid,
module.name,
module.course,
module.name,

1
frontend/src/api/fetchModule.ts
View File

@@ -16,6 +16,7 @@ export async function fetchModule(name: string): Promise<Module> {
.then(
(module: Module) =>
new Module(
module.uuid,
module.name,
module.course,
module.name,

2
frontend/src/components/AdditionalModules.vue
View File

@@ -39,7 +39,7 @@ const ModuleInformation = defineAsyncComponent(
);
async function showInfo(moduleName: string) {
const module: Ref<Module> = ref(new Module("", "", "", "", "", []));
const module: Ref<Module> = ref(new Module("", "", "", "", "", "", []));
await fetchModule(moduleName).then((data) => {
module.value = data;
});

2
frontend/src/components/editCalendar/EditAdditionalModules.vue
View File

@@ -37,7 +37,7 @@ const ModuleInformation = defineAsyncComponent(
);
async function showInfo(moduleName: string) {
const module: Ref<Module> = ref(new Module("", "", "", "", "", []));
const module: Ref<Module> = ref(new Module("", "", "", "", "", "", []));
await fetchModule(moduleName).then((data) => {
module.value = data;
});

1
frontend/src/model/module.ts
View File

@@ -2,6 +2,7 @@ import { Event } from "./event";
export class Module {
constructor(
public uuid: string,
public name: string,
public course: string,
public userDefinedName: string,