Merge remote-tracking branch 'origin/gruppDM' into BumBranch

frontend/src/Pages/ProjectManagerPages/PMOtherUsersTR.tsx

@@ -1,8 +1,13 @@
 import BasicWindow from "../../Components/BasicWindow";
 import BackButton from "../../Components/BackButton";
+import AllTimeReportsInProjectOtherUser from "../../Components/AllTimeReportsInProjectOtherUser";
 
 function PMOtherUsersTR(): JSX.Element {
-  const content = <></>;
+  const content = (
+    <>
+      <AllTimeReportsInProjectOtherUser />
+    </>
+  );
 
   const buttons = (
     <>

frontend/src/Pages/ProjectManagerPages/PMProjectMembers.tsx

@@ -8,16 +8,13 @@ function PMProjectMembers(): JSX.Element {
   const { projectName } = useParams();
   const content = (
     <>
-      <h1 className="font-bold text-[30px] mb-[20px]">
-        All Members In: {projectName}{" "}
-      </h1>
       <ProjectMembers />
     </>
   );
 
   const buttons = (
     <>
-      <Link to="/PM-time-activity">
+      <Link to={`/PMtimeactivity/${projectName}`}>
         <Button
           text="Time / Activity"
           onClick={(): void => {
@@ -26,15 +23,6 @@ function PMProjectMembers(): JSX.Element {
           type={"button"}
         />
       </Link>
-      <Link to="/PM-time-role">
-        <Button
-          text="Time / Role"
-          onClick={(): void => {
-            return;
-          }}
-          type={"button"}
-        />
-      </Link>
       <BackButton />
     </>
   );

frontend/src/Pages/ProjectManagerPages/PMTotalTimeActivity.tsx

@@ -1,14 +1,11 @@
 import BackButton from "../../Components/BackButton";
 import BasicWindow from "../../Components/BasicWindow";
-import TimeReport from "../../Components/NewWeeklyReport";
+import TimePerActivity from "../../Components/TimePerActivity";
 
 function PMTotalTimeActivity(): JSX.Element {
   const content = (
     <>
-      <h1 className="font-bold text-[30px] mb-[20px]">
-        Total Time Per Activity
-      </h1>
-      <TimeReport />
+      <TimePerActivity />
     </>
   );
 

frontend/src/Pages/ProjectManagerPages/PMTotalTimeRole.tsx

@@ -1,8 +1,13 @@
 import BasicWindow from "../../Components/BasicWindow";
 import BackButton from "../../Components/BackButton";
+import TimePerRole from "../../Components/TimePerRole";
 
 function PMTotalTimeRole(): JSX.Element {
-  const content = <></>;
+  const content = (
+    <>
+      <TimePerRole />
+    </>
+  );
 
   const buttons = (
     <>

frontend/src/Pages/ProjectManagerPages/PMUnsignedReports.tsx

@@ -1,8 +1,13 @@
 import BasicWindow from "../../Components/BasicWindow";
 import BackButton from "../../Components/BackButton";
+import DisplayUnsignedReports from "../../Components/DisplayUnsignedReports";
 
 function PMUnsignedReports(): JSX.Element {
-  const content = <></>;
+  const content = (
+    <>
+      <DisplayUnsignedReports />
+    </>
+  );
 
   const buttons = (
     <>

frontend/src/Pages/ProjectManagerPages/PMViewOtherUsersTR.tsx

@@ -0,0 +1,20 @@
+import BasicWindow from "../../Components/BasicWindow";
+import BackButton from "../../Components/BackButton";
+import OtherUsersTR from "../../Components/OtherUsersTR";
+
+function PMViewOtherUsersTR(): JSX.Element {
+  const content = (
+    <>
+      <OtherUsersTR />
+    </>
+  );
+
+  const buttons = (
+    <>
+      <BackButton />
+    </>
+  );
+
+  return <BasicWindow content={content} buttons={buttons} />;
+}
+export default PMViewOtherUsersTR;

frontend/src/Pages/ProjectManagerPages/PMViewUnsignedReport.tsx

@@ -1,34 +1,16 @@
 import BackButton from "../../Components/BackButton";
 import BasicWindow from "../../Components/BasicWindow";
-import Button from "../../Components/Button";
-import TimeReport from "../../Components/NewWeeklyReport";
+import ViewOtherTimeReport from "../../Components/ViewOtherTimeReport";
 
 function PMViewUnsignedReport(): JSX.Element {
   const content = (
     <>
-      <h1 className="font-bold text-[30px] mb-[20px]">
-        Username&apos;s Time Report
-      </h1>
-      <TimeReport />
+      <ViewOtherTimeReport />
     </>
   );
 
   const buttons = (
     <>
-      <Button
-        text="Sign"
-        onClick={(): void => {
-          return;
-        }}
-        type="button"
-      />
-      <Button
-        text="Save"
-        onClick={(): void => {
-          return;
-        }}
-        type="button"
-      />
       <BackButton />
     </>
   );

frontend/src/Pages/UserPages/UserEditTimeReportPage.tsx

@@ -5,7 +5,6 @@ import EditWeeklyReport from "../../Components/EditWeeklyReport";
 function UserEditTimeReportPage(): JSX.Element {
   const content = (
     <>
-      <h1 className="font-bold text-[30px] mb-[20px]">Edit Time Report</h1>
       <EditWeeklyReport />
     </>
   );