From c02a0592edfbaced22ce0091ddd21122b0283e55 Mon Sep 17 00:00:00 2001 From: AlexE030 Date: Tue, 13 Jun 2023 19:28:32 +0200 Subject: [PATCH] Added Submitbutton --- anwendung/src/components/SubmitButton.jsx | 21 +++++++ anwendung/src/components/SubmitWarning.jsx | 56 +++++++++++++++++++ anwendung/src/pages/createSemester.js | 1 - anwendung/src/pages/planning.js | 2 + .../src/pages/semesteroverviewLecturer.js | 5 +- anwendung/src/pages/submit.js | 19 +++++++ .../anwprj/controller/ModuleController.java | 2 +- 7 files changed, 100 insertions(+), 6 deletions(-) create mode 100644 anwendung/src/components/SubmitButton.jsx create mode 100644 anwendung/src/components/SubmitWarning.jsx create mode 100644 anwendung/src/pages/submit.js diff --git a/anwendung/src/components/SubmitButton.jsx b/anwendung/src/components/SubmitButton.jsx new file mode 100644 index 0000000..25157bc --- /dev/null +++ b/anwendung/src/components/SubmitButton.jsx @@ -0,0 +1,21 @@ +import Button from "@/components/Button"; +import { baseURL } from "@/components/Constants"; +import {useRouter} from "next/router"; + +export default function SubmitButton() { + + const router = useRouter(); + + return ( +
+
+ ); +} diff --git a/anwendung/src/components/SubmitWarning.jsx b/anwendung/src/components/SubmitWarning.jsx new file mode 100644 index 0000000..c296614 --- /dev/null +++ b/anwendung/src/components/SubmitWarning.jsx @@ -0,0 +1,56 @@ +import {baseURL} from "@/components/Constants"; +import Button from "@/components/Button"; + +export default function SubmitWarning(p){ + + async function submit() { + let url = baseURL + "/module?sessionid=" + localStorage.getItem("sessionid"); + + let json1 = { + "id": 0, + "userid": localStorage.getItem("userid"), + "semesterid": localStorage.getItem("currentsid"), + "name": localStorage.getItem("currentmodulename"), + "activated": 0 + } + + await fetch(url, { + method: "PUT", + headers: {"Content-Type": "application/json"}, + body: JSON.stringify(json1) + }) + + p.onClick(); + p.onClick(); + + } + + return ( +
+

Möchten Sie wirklich abgeben?

+

Danach können Sie keine Änderungen mehr vornehmen!

+
+
+
+ ) +} \ No newline at end of file diff --git a/anwendung/src/pages/createSemester.js b/anwendung/src/pages/createSemester.js index 6b7ff19..324adbf 100644 --- a/anwendung/src/pages/createSemester.js +++ b/anwendung/src/pages/createSemester.js @@ -1,7 +1,6 @@ import InputForm from "@/components/InputForm"; import {useRouter} from "next/router"; import Logout from "@/components/Logout"; -import {useEffect} from "react"; export default function CreateSemester() { diff --git a/anwendung/src/pages/planning.js b/anwendung/src/pages/planning.js index b597071..acd4ac9 100644 --- a/anwendung/src/pages/planning.js +++ b/anwendung/src/pages/planning.js @@ -5,6 +5,7 @@ import Back from "@/components/Back"; import BasicDateCalendar from "@/components/CalendarSideBar"; import {useRouter} from "next/router"; import HelpButton from "@/components/HelpButton"; +import SubmitButton from "@/components/SubmitButton"; export default function planning(p) @@ -18,6 +19,7 @@ export default function planning(p) + ) } \ No newline at end of file diff --git a/anwendung/src/pages/semesteroverviewLecturer.js b/anwendung/src/pages/semesteroverviewLecturer.js index c675ef1..89df192 100644 --- a/anwendung/src/pages/semesteroverviewLecturer.js +++ b/anwendung/src/pages/semesteroverviewLecturer.js @@ -1,13 +1,9 @@ -import Button from "@/components/Button"; import React, {useEffect, useState} from "react"; import SemesterTile from "@/components/SemesterTile"; -import InputForm from "@/components/InputForm"; import {useRouter} from "next/router"; -import PopUp from "@/components/PopUp"; import Background from "@/components/Background"; import Logout from "@/components/Logout"; import {baseURL} from "@/components/Constants" -import Back from "@/components/Back"; import HelpButton from "@/components/HelpButton"; import StatusBar from "@/components/StatusBar"; @@ -42,6 +38,7 @@ export default function SemesteroverviewLecturer(p) { if (m.target === m.currentTarget) { localStorage.setItem("currentsid", e.semesterid) localStorage.setItem("currentmodulename", e.name) + localStorage.setItem("moduleid", e.id) router.push("/planning") } } diff --git a/anwendung/src/pages/submit.js b/anwendung/src/pages/submit.js new file mode 100644 index 0000000..d2fc866 --- /dev/null +++ b/anwendung/src/pages/submit.js @@ -0,0 +1,19 @@ +import Logout from "@/components/Logout"; +import SubmitWarning from "@/components/SubmitWarning"; +import Back from "@/components/Back"; +import {useRouter} from "next/router"; +import Background from "@/components/Background"; + +export default function Submit(){ + + const router = useRouter(); + + return( +
+ + + router.back()}/> + router.back()}/> +
+ ) +} \ No newline at end of file diff --git a/backend/src/main/java/com/example/backend/anwprj/controller/ModuleController.java b/backend/src/main/java/com/example/backend/anwprj/controller/ModuleController.java index db78652..0002a3d 100644 --- a/backend/src/main/java/com/example/backend/anwprj/controller/ModuleController.java +++ b/backend/src/main/java/com/example/backend/anwprj/controller/ModuleController.java @@ -142,7 +142,7 @@ public class ModuleController { User u = UserSessionIDHandler.getUserBySessionID(sessionID); - if (u != null && u.getPermissions() == UserPermissions.admin.getValue()) + if (u != null) { Module m = db.updateModule(module);