keannu125/Borrowing-TrackerFrontend
1
0
Fork 0
mirror of https://github.com/lemeow125/Borrowing-TrackerFrontend.git synced 2025-06-29 00:45:49 +08:00
Code Issues Projects Releases Packages Wiki Activity Actions

Added consumables to transaction and improved transaction entry viewing and pdf generation. Also added transactions this day and this month in technician dashboard

Browse source
This commit is contained in:
Keannu Christian Bernasol 2024-01-05 19:06:04 +08:00
parent eea2b590d2
commit ad9981ae44
8 changed files with 197 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

16
src/Pages/AddTransactionPage/AddTransactionPage.tsx
View file

@ -32,6 +32,7 @@ export default function AddTransactionPage() {
const [selectedteacher, SetSelectedTeacher] = useState<number>(0);
const [subject, SetSubject] = useState("");
const [remarks, SetRemarks] = useState("");
const [consumables, SetConsumables] = useState("");
const [error, setError] = useState("");
const equipments = useQuery({
@ -167,6 +168,20 @@ export default function AddTransactionPage() {
placeholder={"Optionally add a brief description of the request"}
/>
</FormControl>
<FormControl style={{ marginTop: "8px" }}>
<FormLabel style={styles.text_dark}>Consumables</FormLabel>
<TextField
multiline
style={styles.input_form}
onChange={(e: React.ChangeEvent<HTMLInputElement>) => {
SetConsumables(e.target.value);
setError("");
}}
label={"Consumables"}
value={consumables}
placeholder={"Write down any consumables here"}
/>
</FormControl>
</div>
<p style={{ ...styles.text_dark, ...styles.text_M }}>{error}</p>
<div
@ -189,6 +204,7 @@ export default function AddTransactionPage() {
subject: subject,
remarks: remarks || " ",
transaction_status: "Pending Approval",
consumables: consumables || "",
borrower: user.data?.id || 0,
});
if (data[0]) {

25
src/Pages/TransactionsListPage/TransactionsListPage.tsx
View file

@ -172,6 +172,9 @@ export default function TransactionsListPage() {
<TableCell align="center" style={styles.text_light}>
Remarks
</TableCell>
<TableCell align="center" style={styles.text_light}>
Consumables
</TableCell>
<TableCell align="center" style={styles.text_light}>
Equipments
</TableCell>
@ -288,6 +291,28 @@ export default function TransactionsListPage() {
>
{transaction.remarks}
</TableCell>
<TableCell
align="center"
component="th"
scope="row"
style={{ ...styles.text_S }}
sx={{
maxWidth: "64px",
flexWrap: "wrap",
wordWrap: "break-word",
}}
onClick={() => {
if (
transaction.transaction_status != "Finalized" &&
transaction.transaction_status != "Rejected"
) {
SetSelectedTransaction(transaction.id);
SetEditTransactionOpen(true);
}
}}
>
{transaction.consumable}
</TableCell>
<TableCell align="center">
<p style={{ ...styles.text_M, ...styles.text_dark }}>
Involved Items: {transaction.equipments.length}