diff --git a/frontend/src/api/getUserQuestions.ts b/frontend/src/api/getUserQuestions.ts new file mode 100644 index 0000000..91b7bfe --- /dev/null +++ b/frontend/src/api/getUserQuestions.ts @@ -0,0 +1,43 @@ +interface Question { + QuestionID: number; + QuestionText: string; +} + +interface Answer { + AnswerID: number; + QuestionID: number; + IsChatGPT: boolean; + AnswerText: string; +} + +interface QuestionAnswerPair { + Question: Question; + Answers: Answer[]; +} + +interface QAData { + questions: QuestionAnswerPair[]; +} + +export const getUserQuestions = (respondentID: number): Promise => { + let url = `http://localhost:8080/userquestions?respondentID=${respondentID}`; + + const response = fetch(url, { + method: "GET", + }) + .then((response) => { + if (!response.ok) { + throw new Error(`HTTP error! Status: ${response.status}`); + } + return response.json(); + }) + .then((data) => { + console.log(data); + localStorage.setItem("userQuestions", JSON.stringify(data)); + return data; + }) + .catch((error) => { + console.log(error); + }); + return response; +}; diff --git a/frontend/src/api/postUserformData.ts b/frontend/src/api/postUserformData.ts index ef78c03..3adc5bf 100644 --- a/frontend/src/api/postUserformData.ts +++ b/frontend/src/api/postUserformData.ts @@ -7,7 +7,7 @@ export const postUserformData = ( education: string, healthcare_personnel: string, gender: string -): postUserformDataReponse => { +): Promise => { let url = "http://localhost:8080/submitform"; let personnel = healthcare_personnel == "Ja" ? true : false; diff --git a/frontend/src/components/form/answerbox/AnswerBox.svelte b/frontend/src/components/form/answerbox/AnswerBox.svelte index 4cf1680..b6925a0 100644 --- a/frontend/src/components/form/answerbox/AnswerBox.svelte +++ b/frontend/src/components/form/answerbox/AnswerBox.svelte @@ -1,13 +1,15 @@ -

Svar 2:

- Hei, - Nye symptomer som utslett etter påbegynt skabbehandling er ikke uvanlig og betyr ikke nødvendigvis at behandlingen har feilet. Dette skyldes ofte kroppens reaksjon på skabbmiddene og behandlingen. Det er viktig å gjennomføre den andre kuren som planlagt. Vær oppmerksom på at kløe og utslett kan vedvare i opptil fire uker etter siste behandling, selv når behandlingen har vært effektiv. Hvis du opplever nye utslett mer enn fire uker etter behandlingens slutt, anbefales det å kontakte lege for en videre vurdering. + {answerText}
diff --git a/frontend/src/components/form/header/FormHeader.svelte b/frontend/src/components/form/header/FormHeader.svelte index 561bdf7..d23610b 100644 --- a/frontend/src/components/form/header/FormHeader.svelte +++ b/frontend/src/components/form/header/FormHeader.svelte @@ -1,5 +1,7 @@ -
@@ -7,7 +9,7 @@

Spørsmål 3

-

Hvis man begynner skabbehandling før man har fått symptomer, men får symptomer iløpet av den uka før man skal smøre seg igjen etter 7 dager, har da ikke første smøringen virket?

+

{formQuestion}

- + + +
diff --git a/frontend/src/routes/form/+page.server.ts b/frontend/src/routes/form/+page.server.ts deleted file mode 100644 index d90d75a..0000000 --- a/frontend/src/routes/form/+page.server.ts +++ /dev/null @@ -1,12 +0,0 @@ -import { error } from '@sveltejs/kit'; - -/** @type {import('./$types').PageServerLoad} */ -export async function load({ params }) { - const post = await getPostFromDatabase(params.slug); - - if (post) { - return post; - } - - error(404, 'Not found'); -} \ No newline at end of file diff --git a/frontend/src/routes/form/+page.svelte b/frontend/src/routes/form/+page.svelte deleted file mode 100644 index 5e6f17a..0000000 --- a/frontend/src/routes/form/+page.svelte +++ /dev/null @@ -1,24 +0,0 @@ - - -
- -
- - -
-
-
- - \ No newline at end of file diff --git a/frontend/src/routes/form/[slug]/+page.server.ts b/frontend/src/routes/form/[slug]/+page.server.ts new file mode 100644 index 0000000..7a6a844 --- /dev/null +++ b/frontend/src/routes/form/[slug]/+page.server.ts @@ -0,0 +1,10 @@ +import { error } from "@sveltejs/kit"; + +/** @type {import('./$types').PageServerLoad} */ +export async function load({ params }) { + let questionNumber = params; + + if (questionNumber) return questionNumber; + + error(404, "Not found"); +} diff --git a/frontend/src/routes/form/[slug]/+page.svelte b/frontend/src/routes/form/[slug]/+page.svelte new file mode 100644 index 0000000..1b41a85 --- /dev/null +++ b/frontend/src/routes/form/[slug]/+page.svelte @@ -0,0 +1,40 @@ + + +
+ +
+ + +
+
+
+ + \ No newline at end of file diff --git a/frontend/src/routes/userform/+page.svelte b/frontend/src/routes/userform/+page.svelte index 9bc70a5..c93cbdc 100644 --- a/frontend/src/routes/userform/+page.svelte +++ b/frontend/src/routes/userform/+page.svelte @@ -3,16 +3,22 @@ import ArrowBack from "../../components/svg/ArrowBack.svelte"; import ButtonComponent from "../../components/userform/inputs/ButtonComponent.svelte"; import { postUserformData } from "../../api/postUserformData"; + import { getUserQuestions } from "../../api/getUserQuestions"; + import { goto } from "$app/navigation"; + let age: string = "18-20" let education: string = "PhD" let healthcare_personnel: string = "Ja" let gender: string = "Mann" + let firstUserQuestion: number = 0 + const handleUserformSubmit = async (age: string, education: string, healthcare_personnel: string, gender: string) => { const response = await postUserformData(age, education, healthcare_personnel, gender) + const userQuestions = await getUserQuestions(response.respondentID) - await getUserQuestions(response.respondentID) + goto("form/0") } @@ -34,7 +40,7 @@
- handleUserformSubmit(age, education, healthcare_personnel, gender)} /> + handleUserformSubmit(age, education, healthcare_personnel, gender)} />