From 41e1c32ee0a460b1c89c4969b8f9a499218e75b6 Mon Sep 17 00:00:00 2001 From: Davenludd Date: Thu, 14 Mar 2024 15:17:15 +0100 Subject: [PATCH] Added time report component to various pages --- .../Components/{NewTImeReport.tsx => TimeReport.tsx} | 1 - .../Pages/ProjectManagerPages/PMTotalTimeActivity.tsx | 10 +++++++++- .../Pages/ProjectManagerPages/PMViewUnsignedReport.tsx | 10 +++++++++- .../src/Pages/UserPages/UserEditTimeReportPage.tsx | 8 +++++++- frontend/src/Pages/UserPages/UserNewTimeReportPage.tsx | 3 ++- 5 files changed, 27 insertions(+), 5 deletions(-) rename frontend/src/Components/{NewTImeReport.tsx => TimeReport.tsx} (96%) diff --git a/frontend/src/Components/NewTImeReport.tsx b/frontend/src/Components/TimeReport.tsx similarity index 96% rename from frontend/src/Components/NewTImeReport.tsx rename to frontend/src/Components/TimeReport.tsx index 3c0e49d..c4ddc38 100644 --- a/frontend/src/Components/NewTImeReport.tsx +++ b/frontend/src/Components/TimeReport.tsx @@ -10,7 +10,6 @@ function NewTimeReport(): JSX.Element { return ( <> -

New Time Report

; + const content = ( + <> +

+ Total Time Per Activity +

+ + + ); const buttons = ( <> diff --git a/frontend/src/Pages/ProjectManagerPages/PMViewUnsignedReport.tsx b/frontend/src/Pages/ProjectManagerPages/PMViewUnsignedReport.tsx index cbd3b53..923548f 100644 --- a/frontend/src/Pages/ProjectManagerPages/PMViewUnsignedReport.tsx +++ b/frontend/src/Pages/ProjectManagerPages/PMViewUnsignedReport.tsx @@ -1,8 +1,16 @@ import BasicWindow from "../../Components/BasicWindow"; import Button from "../../Components/Button"; +import TimeReport from "../../Components/TimeReport"; function PMViewUnsignedReport(): JSX.Element { - const content = <>; + const content = ( + <> +

+ Username's Time Report +

+ + + ); const buttons = ( <> diff --git a/frontend/src/Pages/UserPages/UserEditTimeReportPage.tsx b/frontend/src/Pages/UserPages/UserEditTimeReportPage.tsx index a8cca94..de1699b 100644 --- a/frontend/src/Pages/UserPages/UserEditTimeReportPage.tsx +++ b/frontend/src/Pages/UserPages/UserEditTimeReportPage.tsx @@ -1,8 +1,14 @@ import BasicWindow from "../../Components/BasicWindow"; import Button from "../../Components/Button"; +import NewTimeReport from "../../Components/TimeReport"; function UserEditTimeReportPage(): JSX.Element { - const content = <>; + const content = ( + <> +

Edit Time Report

+ + + ); const buttons = ( <> diff --git a/frontend/src/Pages/UserPages/UserNewTimeReportPage.tsx b/frontend/src/Pages/UserPages/UserNewTimeReportPage.tsx index d432817..bbd767a 100644 --- a/frontend/src/Pages/UserPages/UserNewTimeReportPage.tsx +++ b/frontend/src/Pages/UserPages/UserNewTimeReportPage.tsx @@ -1,10 +1,11 @@ import BasicWindow from "../../Components/BasicWindow"; import Button from "../../Components/Button"; -import NewTimeReport from "../../Components/NewTImeReport"; +import NewTimeReport from "../../Components/TimeReport"; function UserNewTimeReportPage(): JSX.Element { const content = ( <> +

New Time Report

);