Update handleUpdateWeeklyReport function and fix input validation

This commit is contained in:
Mattias 2024-04-02 15:43:12 +02:00
parent b3e363f391
commit 6c2213b488

View file

@ -1,5 +1,5 @@
import { useState, useEffect } from "react"; import { useState, useEffect } from "react";
import { WeeklyReport, NewWeeklyReport } from "../Types/goTypes"; import { WeeklyReport, UpdateWeeklyReport } from "../Types/goTypes";
import { api } from "../API/API"; import { api } from "../API/API";
import { useNavigate, useParams } from "react-router-dom"; import { useNavigate, useParams } from "react-router-dom";
import Button from "./Button"; import Button from "./Button";
@ -60,8 +60,9 @@ export default function GetWeeklyReport(): JSX.Element {
void fetchWeeklyReport(); void fetchWeeklyReport();
}, [projectName, fetchedWeek, token]); }, [projectName, fetchedWeek, token]);
const handleNewWeeklyReport = async (): Promise<void> => { const handleUpdateWeeklyReport = async (): Promise<void> => {
const newWeeklyReport: NewWeeklyReport = { const updateWeeklyReport: UpdateWeeklyReport = {
userName: "user2",
projectName: projectName ?? "", projectName: projectName ?? "",
week, week,
developmentTime, developmentTime,
@ -72,7 +73,7 @@ export default function GetWeeklyReport(): JSX.Element {
testingTime, testingTime,
}; };
await api.submitWeeklyReport(newWeeklyReport, token); await api.updateWeeklyReport(updateWeeklyReport, token);
}; };
const navigate = useNavigate(); const navigate = useNavigate();
@ -89,7 +90,8 @@ export default function GetWeeklyReport(): JSX.Element {
return; return;
} }
e.preventDefault(); e.preventDefault();
void handleNewWeeklyReport(); void handleUpdateWeeklyReport();
alert("Changes submitted");
navigate(-1); navigate(-1);
}} }}
> >
@ -128,7 +130,12 @@ export default function GetWeeklyReport(): JSX.Element {
}} }}
onKeyDown={(event) => { onKeyDown={(event) => {
const keyValue = event.key; const keyValue = event.key;
if (!/\d/.test(keyValue) && keyValue !== "Backspace") if (
!/\d/.test(keyValue) &&
keyValue !== "Backspace" &&
keyValue !== "ArrowLeft" &&
keyValue !== "ArrowRight"
)
event.preventDefault(); event.preventDefault();
}} }}
/> />
@ -152,7 +159,12 @@ export default function GetWeeklyReport(): JSX.Element {
}} }}
onKeyDown={(event) => { onKeyDown={(event) => {
const keyValue = event.key; const keyValue = event.key;
if (!/\d/.test(keyValue) && keyValue !== "Backspace") if (
!/\d/.test(keyValue) &&
keyValue !== "Backspace" &&
keyValue !== "ArrowLeft" &&
keyValue !== "ArrowRight"
)
event.preventDefault(); event.preventDefault();
}} }}
/> />
@ -176,7 +188,12 @@ export default function GetWeeklyReport(): JSX.Element {
}} }}
onKeyDown={(event) => { onKeyDown={(event) => {
const keyValue = event.key; const keyValue = event.key;
if (!/\d/.test(keyValue) && keyValue !== "Backspace") if (
!/\d/.test(keyValue) &&
keyValue !== "Backspace" &&
keyValue !== "ArrowLeft" &&
keyValue !== "ArrowRight"
)
event.preventDefault(); event.preventDefault();
}} }}
/> />
@ -200,7 +217,12 @@ export default function GetWeeklyReport(): JSX.Element {
}} }}
onKeyDown={(event) => { onKeyDown={(event) => {
const keyValue = event.key; const keyValue = event.key;
if (!/\d/.test(keyValue) && keyValue !== "Backspace") if (
!/\d/.test(keyValue) &&
keyValue !== "Backspace" &&
keyValue !== "ArrowLeft" &&
keyValue !== "ArrowRight"
)
event.preventDefault(); event.preventDefault();
}} }}
/> />
@ -224,7 +246,12 @@ export default function GetWeeklyReport(): JSX.Element {
}} }}
onKeyDown={(event) => { onKeyDown={(event) => {
const keyValue = event.key; const keyValue = event.key;
if (!/\d/.test(keyValue) && keyValue !== "Backspace") if (
!/\d/.test(keyValue) &&
keyValue !== "Backspace" &&
keyValue !== "ArrowLeft" &&
keyValue !== "ArrowRight"
)
event.preventDefault(); event.preventDefault();
}} }}
/> />
@ -248,7 +275,12 @@ export default function GetWeeklyReport(): JSX.Element {
}} }}
onKeyDown={(event) => { onKeyDown={(event) => {
const keyValue = event.key; const keyValue = event.key;
if (!/\d/.test(keyValue) && keyValue !== "Backspace") if (
!/\d/.test(keyValue) &&
keyValue !== "Backspace" &&
keyValue !== "ArrowLeft" &&
keyValue !== "ArrowRight"
)
event.preventDefault(); event.preventDefault();
}} }}
/> />