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/EquipmentInstancesListPage/EquipmentInstancesListPage.tsx b/src/Pages/EquipmentInstancesListPage/EquipmentInstancesListPage.tsx
index d284330..6076761 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: "0px"
}}
>