- {individualStaffManhoursSpentSelect === "Daily" && (
- <>
-
-
-
-
- )}
- {individualStaffManhoursSpentSelect === "Weekly" && (
- <>
-
-
-
-
- )}
- {individualStaffManhoursSpentSelect === "Monthly" && (
- <>
-
-
-
-
- )}
-
-
+
+
+
+ {individualStaffManhoursSpentSelect === "Daily" && (
+ <>
+
+
+
+
+ )}
+ {individualStaffManhoursSpentSelect === "Weekly" && (
+ <>
+
+
+
+
+ )}
+ {individualStaffManhoursSpentSelect === "Monthly" && (
+ <>
+
+
+
+
+ )}
+
+
+
+
-
-
-
-
-
-
-
-
- {/*
-
-
-
-
-
-
-
- Total Normal Hours Spent
- 40.00
-
-
- Total Leave Hours
- 0.00
-
-
-
-
- Total Other Hours Spent
- 7.00
-
-
- Remaining Hours
- 0.00
-
+
+
-
-
-
+
+
+
+
+ Total Normal Hours Spent
+
+
+ 40.00
+
+
+
+
+ Total Leave Hours
+
+
+ 0.00
+
+
+
+
+
+
+ Total Other Hours Spent
+
+
+ 7.00
+
+
+
+
+ Remaining Hours
+
+
+ 0.00
+
+
+
+
+
+
+
+
);
};
diff --git a/src/components/Swal/CustomAlerts.js b/src/components/Swal/CustomAlerts.js
index d8d5cdd..62c853d 100644
--- a/src/components/Swal/CustomAlerts.js
+++ b/src/components/Swal/CustomAlerts.js
@@ -1,23 +1,22 @@
import Swal from "sweetalert2";
-
export const msg = (text) => {
- Swal.mixin({
- toast: true,
- position: "bottom-end",
- showConfirmButton: false,
- timer: 3000,
- timerProgressBar: true,
- didOpen: (toast) => {
- toast.onmouseenter = Swal.stopTimer;
- toast.onmouseleave = Swal.resumeTimer;
- }
- }).fire({
- icon: "Success",
- title: text
- });
-}
+ Swal.mixin({
+ toast: true,
+ position: "bottom-end",
+ showConfirmButton: false,
+ timer: 3000,
+ timerProgressBar: true,
+ didOpen: (toast) => {
+ toast.onmouseenter = Swal.stopTimer;
+ toast.onmouseleave = Swal.resumeTimer;
+ },
+ }).fire({
+ icon: "Success",
+ title: text,
+ });
+};
export const popup = (text) => {
- Swal.fire(text);
-}
\ No newline at end of file
+ Swal.fire(text);
+};
diff --git a/src/components/UserWorkspacePage/ProjectGrid.tsx b/src/components/UserWorkspacePage/ProjectGrid.tsx
index c0b140f..8cc37d5 100644
--- a/src/components/UserWorkspacePage/ProjectGrid.tsx
+++ b/src/components/UserWorkspacePage/ProjectGrid.tsx
@@ -1,44 +1,78 @@
"use client";
import * as React from "react";
import Grid from "@mui/material/Grid";
-import { useEffect, useState } from 'react'
-import { TFunction } from "i18next";
-import { useTranslation } from "react-i18next";
-import {Card,CardContent,CardHeader} from '@mui/material';
-import CustomCardGrid from '../CustomCardGrid/CustomCardGrid';
-import '../../app/global.css';
+import { useEffect } from "react";
+import { Card, CardContent, CardHeader } from "@mui/material";
+import CustomCardGrid from "../CustomCardGrid/CustomCardGrid";
+import "../../app/global.css";
import { PROJECT_CARD_STYLE } from "@/theme/colorConst";
interface ProjectGridProps {
tab: number;
}
+const cards = [
+ {
+ code: "M1001 (C)",
+ name: "Consultancy Project A",
+ hr_spent: 12.75,
+ hr_spent_normal: 0.0,
+ hr_alloc: 150.0,
+ hr_alloc_normal: 30.0,
+ },
+ {
+ code: "M1301 (C)",
+ name: "Consultancy Project AAA",
+ hr_spent: 4.25,
+ hr_spent_normal: 0.25,
+ hr_alloc: 30.0,
+ hr_alloc_normal: 0.0,
+ },
+ {
+ code: "M1354 (C)",
+ name: "Consultancy Project BBB",
+ hr_spent: 57.0,
+ hr_spent_normal: 6.5,
+ hr_alloc: 100.0,
+ hr_alloc_normal: 20.0,
+ },
+ {
+ code: "M1973 (C)",
+ name: "Construction Project CCC",
+ hr_spent: 12.75,
+ hr_spent_normal: 0.0,
+ hr_alloc: 150.0,
+ hr_alloc_normal: 30.0,
+ },
+ {
+ code: "M2014 (T)",
+ name: "Consultancy Project DDD",
+ hr_spent: 1.0,
+ hr_spent_normal: 0.0,
+ hr_alloc: 10.0,
+ hr_alloc_normal: 0.0,
+ },
+];
const ProjectGrid: React.FC
= (props) => {
- const [items, setItems] = React.useState([])
-
+ const [items, setItems] = React.useState([]);
+
useEffect(() => {
if (props.tab == 0) {
- setItems(cards)
- }
- else {
- const filteredItems = cards;//cards.filter(item => (item.track == props.tab));
+ setItems(cards);
+ } else {
+ const filteredItems = cards; //cards.filter(item => (item.track == props.tab));
setItems(filteredItems);
}
}, [props.tab]);
-
- const cards = [
- {code: 'M1001 (C)', name: 'Consultancy Project A', hr_spent: 12.75, hr_spent_normal: 0.00, hr_alloc: 150.00, hr_alloc_normal: 30.00},
- {code: 'M1301 (C)', name: 'Consultancy Project AAA', hr_spent: 4.25, hr_spent_normal: 0.25, hr_alloc: 30.00, hr_alloc_normal: 0.00},
- {code: 'M1354 (C)', name: 'Consultancy Project BBB', hr_spent: 57.00, hr_spent_normal: 6.50, hr_alloc: 100.00, hr_alloc_normal: 20.00},
- {code: 'M1973 (C)', name: 'Construction Project CCC', hr_spent: 12.75, hr_spent_normal: 0.00, hr_alloc: 150.00, hr_alloc_normal: 30.00},
- {code: 'M2014 (T)', name: 'Consultancy Project DDD', hr_spent: 1.00, hr_spent_normal: 0.00, hr_alloc: 10.00, hr_alloc_normal: 0.00},
- ];
-
+
const cardLayout = (item: Record) => {
return (
-
+
Hours Spent: {item.hr_spent}
Normal (Others): {item.hr_spent_normal}
@@ -47,15 +81,19 @@ const ProjectGrid: React.FC = (props) => {
);
- }
+ };
// Apply the preset style to the cards in child, if not specified //
return (
- {/* */}
- {/* item count = {items?.length??"idk"} , track/tab = {props.tab} */}
-
- {/* */}
-
+ {/* */}
+ {/* item count = {items?.length??"idk"} , track/tab = {props.tab} */}
+
+ {/* */}
+
);
};
diff --git a/src/components/UserWorkspacePage/UserWorkspacePage.tsx b/src/components/UserWorkspacePage/UserWorkspacePage.tsx
index 19cd266..e0f6072 100644
--- a/src/components/UserWorkspacePage/UserWorkspacePage.tsx
+++ b/src/components/UserWorkspacePage/UserWorkspacePage.tsx
@@ -8,9 +8,9 @@ import PageTitle from "../PageTitle/PageTitle";
import { Suspense } from "react";
import Button from "@mui/material/Button";
import Stack from "@mui/material/Stack";
-import { Add } from '@mui/icons-material';
+import { Add } from "@mui/icons-material";
import Link from "next/link";
-import { t } from 'i18next';
+import { t } from "i18next";
import { Modal } from "@mui/material";
import CustomModal from "../CustomModal/CustomModal";
import EnterTimesheetModal from "../EnterTimesheet/EnterTimesheetModal";
@@ -18,7 +18,6 @@ import EnterTimesheetModal from "../EnterTimesheet/EnterTimesheetModal";
const UserWorkspacePage: React.FC = () => {
const [isModalVisible, setModalVisible] = useState(false);
const { t } = useTranslation("home");
-
const handleButtonClick = () => {
setModalVisible(true);
@@ -29,38 +28,36 @@ const UserWorkspacePage: React.FC = () => {
};
return (
-
+
-
-
- }
- onClick={handleButtonClick}
- sx={{marginRight:"2rem"}}
- >
- Enter Timesheet
-
- }
- sx={{marginRight:"2rem"}}
- LinkComponent={Link}
- href="/projects/create"
- >
- Record Leave
-
-
-
{/*fallback={}>*/}
-
-
-
-
-
+
+
+
+ }
+ onClick={handleButtonClick}
+ sx={{ marginRight: "2rem" }}
+ >
+ Enter Timesheet
+
+ }
+ sx={{ marginRight: "2rem" }}
+ LinkComponent={Link}
+ href="/projects/create"
+ >
+ Record Leave
+
+
+
{/*fallback={}>*/}
+