diff --git a/src/Components/DashboardPage/Student/StudentTransactionListView.tsx b/src/Components/DashboardPage/Student/StudentTransactionListView.tsx index 07c1fd7..8444a7c 100644 --- a/src/Components/DashboardPage/Student/StudentTransactionListView.tsx +++ b/src/Components/DashboardPage/Student/StudentTransactionListView.tsx @@ -76,7 +76,8 @@ export default function StudentTransactionListView() { padding: "7px", margin: "0px", backgroundColor: colors.header_color, - width: 550, + width: "100%", + maxWidth: 550, alignSelf: "center", borderRadius: "0px 0px 7px 7px", diff --git a/src/Components/DashboardPage/Teacher/TeacherTransactionListView.tsx b/src/Components/DashboardPage/Teacher/TeacherTransactionListView.tsx index b7f5b08..d3c8b33 100644 --- a/src/Components/DashboardPage/Teacher/TeacherTransactionListView.tsx +++ b/src/Components/DashboardPage/Teacher/TeacherTransactionListView.tsx @@ -77,7 +77,8 @@ export default function TeacherTransactionListView() { padding: "7px", margin: "0px", backgroundColor: colors.header_color, - width: 550, + width: "100%", + maxWidth: 550, alignSelf: "center", borderRadius: "0px 0px 7px 7px", diff --git a/src/Components/DashboardPage/Technician/TechnicianEquipmentButtons.tsx b/src/Components/DashboardPage/Technician/TechnicianEquipmentButtons.tsx index 3e5ed98..ed33c37 100644 --- a/src/Components/DashboardPage/Technician/TechnicianEquipmentButtons.tsx +++ b/src/Components/DashboardPage/Technician/TechnicianEquipmentButtons.tsx @@ -8,7 +8,6 @@ import NoteIcon from "@mui/icons-material/Note"; import { colors } from "../../../styles"; import ScienceIcon from "@mui/icons-material/Science"; import ColorizeIcon from "@mui/icons-material/Colorize"; -import ArticleIcon from '@mui/icons-material/Article'; import Popup from "reactjs-popup"; import AddItemModal from "../../AddItemModal/AddItemModal"; import AddSKUModal from "../../AddSKUModal/AddSKUModal"; @@ -98,7 +97,7 @@ export default function TechnicianEquipmentButtons() { > Add Item

- + + -
- - +
- - + SetAddItemModalOpen(false)} modal diff --git a/src/Components/DashboardPage/Technician/TechnicianLogButtons.tsx b/src/Components/DashboardPage/Technician/TechnicianLogButtons.tsx index 1b782e1..2214e31 100644 --- a/src/Components/DashboardPage/Technician/TechnicianLogButtons.tsx +++ b/src/Components/DashboardPage/Technician/TechnicianLogButtons.tsx @@ -2,7 +2,6 @@ import { Button } from "@mui/material"; import { useNavigate } from "react-router-dom"; import ManageSearchIcon from "@mui/icons-material/ManageSearch"; import CountertopsIcon from "@mui/icons-material/Countertops"; -import AssessmentIcon from "@mui/icons-material/Assessment"; import styles from "../../../styles"; import { colors } from "../../../styles"; @@ -56,7 +55,7 @@ export default function TechnicianLogButtons() { ...styles.text_M, }} > - SKU Logs + SKU
History

- + ); diff --git a/src/Components/TransactionPDF/TransactionPDF.tsx b/src/Components/TransactionPDF/TransactionPDF.tsx index 767b66a..e8efb2c 100644 --- a/src/Components/TransactionPDF/TransactionPDF.tsx +++ b/src/Components/TransactionPDF/TransactionPDF.tsx @@ -52,16 +52,7 @@ export default function TransactionPDF(props: props) { /> - - Department of Chemistry (Laboratory) - + University of Science and Technology of Southern Philippines{" "} {"\n"} - Lapasan Cagayan de Oro City {"\n"} + Lapasan, Cagayan de Oro City {"\n"} + College of Science and Mathematics + - BORROWER'S SLIP + BORROWER'S SLIP diff --git a/src/Components/TransactionReportPDF/TransactionReportPDF.tsx b/src/Components/TransactionReportPDF/TransactionReportPDF.tsx index 2c6889c..e98df3a 100644 --- a/src/Components/TransactionReportPDF/TransactionReportPDF.tsx +++ b/src/Components/TransactionReportPDF/TransactionReportPDF.tsx @@ -1,4 +1,4 @@ -import { Document, Page, Text, View } from "@react-pdf/renderer"; +import { Document, Page, Text, View, Image } from "@react-pdf/renderer"; import { TransactionListType } from "../Types/Types"; import { colors } from "../../styles"; import count_transaction_equipments from "../../CountTransactionEquipments/CountTransactionEquipments"; @@ -6,6 +6,7 @@ import { filter_today, filter_thismonth, } from "../FilterTransaction/FilterTransaction"; +import ustplogo from "../../assets/ustp-logo.png"; type props = { transactions: TransactionListType | []; @@ -18,143 +19,245 @@ export default function TransactionReportPDF(props: props) { return ( - - Daily Transaction Report - + {/* Header */} - + + - Total Equipments Processed:{" "} - {count_transaction_equipments(transactions_today)} - - - Total Transactions: {transactions_today.length} - - - Rejected Transactions:{" "} - { - transactions_today.filter( - (transaction) => transaction.transaction_status == "Rejected" - ).length - } - - - Finalized Transactions:{" "} - { - transactions_today.filter( - (transaction) => transaction.transaction_status == "Finalized" - ).length - } - + + + Republic of the Philippines{"\n"} + + {" "} + UNIVERSITY OF SCIENCE and TECHNOLOGY OF SCIENCE AND TECHNOLOGY{" "} + + {"\n"} + College of Science and Mathematics + + + + {" "} + Department of Chemistry (Laboratory) + + + + - Monthly Transaction Report + + LABORATORY REPORTS + + - - Total Equipments Processed:{" "} - {count_transaction_equipments(transactions_thismonth)} - - + Transaction + + + - Total Transactions: {transactions_thismonth.length} - - Daily Transaction Report + + {" "} + • Total Equipments Processed:{" "} + {count_transaction_equipments(transactions_today)} + + + + {" "} + • Total Transactions: {transactions_today.length} + + + + {" "} + • Rejected Transactions:{" "} + { + transactions_today.filter( + (transaction) => transaction.transaction_status == "Rejected" + ).length + } + + + + {" "} + • Finalized Transactions:{" "} + { + transactions_today.filter( + (transaction) => transaction.transaction_status == "Finalized" + ).length + } + + + - Rejected Transactions:{" "} - { - transactions_thismonth.filter( - (transaction) => transaction.transaction_status == "Rejected" - ).length - } - - - Finalized Transactions:{" "} - { - transactions_thismonth.filter( - (transaction) => transaction.transaction_status == "Finalized" - ).length - } - + Monthly Transaction Report + + {" "} + • Total Equipments Processed:{" "} + {count_transaction_equipments(transactions_thismonth)} + + + + {" "} + • Total Transactions: {transactions_thismonth.length} + + + + {" "} + • Rejected Transactions:{" "} + { + transactions_thismonth.filter( + (transaction) => transaction.transaction_status == "Rejected" + ).length + } + + + + {" "} + • Finalized Transactions:{" "} + { + transactions_thismonth.filter( + (transaction) => transaction.transaction_status == "Finalized" + ).length + } + + diff --git a/src/Pages/EquipmentInstanceLogsPage/EquipmentInstanceLogsPage.tsx b/src/Pages/EquipmentInstanceLogsPage/EquipmentInstanceLogsPage.tsx index 80dd527..e78a342 100644 --- a/src/Pages/EquipmentInstanceLogsPage/EquipmentInstanceLogsPage.tsx +++ b/src/Pages/EquipmentInstanceLogsPage/EquipmentInstanceLogsPage.tsx @@ -58,6 +58,7 @@ export default function EquipmentInstanceLogsPage() { minHeight: "100%", minWidth: "100%", flexWrap: "wrap", + marginTop: "2rem", }} >
diff --git a/src/Pages/EquipmentInstancesListPage/EquipmentInstancesListPage.tsx b/src/Pages/EquipmentInstancesListPage/EquipmentInstancesListPage.tsx index d284330..ba6e394 100644 --- a/src/Pages/EquipmentInstancesListPage/EquipmentInstancesListPage.tsx +++ b/src/Pages/EquipmentInstancesListPage/EquipmentInstancesListPage.tsx @@ -73,7 +73,7 @@ export default function EquipmentInstancesListPage() { width: "100%", minHeight: "100%", minWidth: "100%", - marginTop: "100px" + marginTop: "7rem" }} > diff --git a/src/Pages/EquipmentTallyPage/EquipmentTallyPage.tsx b/src/Pages/EquipmentTallyPage/EquipmentTallyPage.tsx index 51101bc..14d2092 100644 --- a/src/Pages/EquipmentTallyPage/EquipmentTallyPage.tsx +++ b/src/Pages/EquipmentTallyPage/EquipmentTallyPage.tsx @@ -54,7 +54,7 @@ export default function EquipmentTallyPage() { } return (
-
+
-
- - - theme.palette.getContrastText(theme.palette.background.paper), - }, - }} - value={filter} - onChange={(_event, newValue) => { - setFilter(newValue); - }} - freeSolo - id="custom-input-demo" - options={["Glassware", "Miscellaneous"]} - renderInput={(params) => ( -
- -
- )} - /> -

- Results Found:{" "} - { - equipment_instances?.data?.filter((equipment) => - filter !== null - ? // If filter is not null, we filter if it matches any criteria - equipment.equipment_name - .toLowerCase() - .includes(filter.toLowerCase()) || - equipment.category - .toLowerCase() - .includes(filter.toLowerCase()) || - equipment.last_updated - .toLowerCase() - .includes(filter?.toLowerCase()) || - equipment.status.toLowerCase() == filter.toLowerCase() - : // If filter keyword is null then we just pass through everything as if we did not filter at all - true - ).length - } -

-
+
+
+
+ + + theme.palette.getContrastText( + theme.palette.background.paper + ), + }, + }} + value={filter} + onChange={(_event, newValue) => { + setFilter(newValue); + }} + freeSolo + id="custom-input-demo" + options={["Glassware", "Miscellaneous"]} + renderInput={(params) => ( +
+ +
+ )} + /> +
+
+

+ Results Found:{" "} + { + equipment_instances?.data?.filter((equipment) => + filter !== null + ? // If filter is not null, we filter if it matches any criteria + equipment.equipment_name + .toLowerCase() + .includes(filter.toLowerCase()) || + equipment.category + .toLowerCase() + .includes(filter.toLowerCase()) || + equipment.last_updated + .toLowerCase() + .includes(filter?.toLowerCase()) || + equipment.status.toLowerCase() == filter.toLowerCase() + : // If filter keyword is null then we just pass through everything as if we did not filter at all + true + ).length + } +

+
+
+ ID @@ -192,7 +206,7 @@ export default function EquipmentTallyPage() {

- Available: + Available: {"\n"} { equipment_instances.data?.filter( (equipment_instance) => @@ -203,7 +217,7 @@ export default function EquipmentTallyPage() { }

- Pending: + Pending: {"\n"} { equipment_instances.data?.filter( (equipment_instance) => @@ -214,7 +228,24 @@ export default function EquipmentTallyPage() { }

- Broken: + Borrowed: {"\n"} + { + equipment_instances.data?.filter( + (equipment_instance) => + equipment_instance.equipment_name == + equipment.name && + equipment_instance.status == "Borrowed" + ).length + } +

+

+ Broken: {"\n"} { equipment_instances.data?.filter( (equipment_instance) => @@ -224,6 +255,26 @@ export default function EquipmentTallyPage() { ).length }

+
+

+ Total: {"\n"} + { + equipment_instances.data?.filter( + (equipment_instance) => + equipment_instance.equipment_name === + equipment.name + ).length + } +

+
diff --git a/src/Pages/ManageEquipmentPage/ManageEquipmentPage.tsx b/src/Pages/ManageEquipmentPage/ManageEquipmentPage.tsx index 5bcabe9..f74146d 100644 --- a/src/Pages/ManageEquipmentPage/ManageEquipmentPage.tsx +++ b/src/Pages/ManageEquipmentPage/ManageEquipmentPage.tsx @@ -9,7 +9,7 @@ export default function ManageEquipmentPage() { return (
-
+
diff --git a/src/Pages/TransactionsListPage/TransactionsListPage.tsx b/src/Pages/TransactionsListPage/TransactionsListPage.tsx index db5da6e..ac285e2 100644 --- a/src/Pages/TransactionsListPage/TransactionsListPage.tsx +++ b/src/Pages/TransactionsListPage/TransactionsListPage.tsx @@ -186,7 +186,7 @@ export default function TransactionsListPage() { Additional Members - Additional Members + Equipments Actions @@ -461,6 +461,7 @@ export default function TransactionsListPage() { width: "auto", alignSelf: "center", borderRadius: "7px", + minWidth: "65px" }} onClick={() => { navigate(`/view/transaction/${transaction.id}`, { @@ -477,7 +478,7 @@ export default function TransactionsListPage() { }} > - Tap To View {"\n"} or Print + Tap To View {"\n"} or Print this slip.