From 4cabd508a83d7d48229fbf710ce2c9d2c4fe7594 Mon Sep 17 00:00:00 2001 From: konstroyer <kmiola@ethz.ch> Date: Wed, 15 Jan 2025 18:52:53 +0000 Subject: [PATCH 1/2] add some information to pages, rename some tables --- src/pages/Bills.tsx | 14 +++++++++++++- src/pages/CreditPayment.tsx | 9 +++++++++ src/pages/GenerateKst.tsx | 2 +- src/pages/GenerateLedger.tsx | 2 +- src/pages/InternalTransfer.tsx | 3 +++ src/pages/KstEval.tsx | 17 +++++++++++------ src/pages/OwnList.tsx | 4 ++-- src/pages/Reimbursement.tsx | 3 +++ src/pages/ResponsibleList.tsx | 10 ++++++++-- src/pages/index.tsx | 12 ++++++------ src/pages/root.tsx | 2 +- 11 files changed, 58 insertions(+), 20 deletions(-) diff --git a/src/pages/Bills.tsx b/src/pages/Bills.tsx index 45f36cd..bcfcb55 100644 --- a/src/pages/Bills.tsx +++ b/src/pages/Bills.tsx @@ -80,13 +80,19 @@ export function generateFieldConfigs( label: "Country", type: FieldType.STRING, }, + { + name: "textcomment", + label: "text comment", + type: FieldType.COMMENT, + comment: "These fields are optional for now but make sure that the qr code in the receipt can be correctly read by a camera:", + }, { name: "reference", label: "(QR-) Reference", type: FieldType.STRING, }, { name: "iban", label: "Iban", type: FieldType.STRING }, - { name: "receipt", label: "receipt", type: FieldType.FILE }, + { name: "receipt", label: "receipt (mandatory)", type: FieldType.FILE }, { name: "comment", label: "comment", type: FieldType.STRING }, ...qfields, ]; @@ -140,6 +146,12 @@ export default function GenerateBill() { return ( <Container> + <p> + If you have a large bill for an upcoming event, use this form. AMIV will then pay the bill as soon as possible. + </p> + <p> + Enter all required information below. Please note that a seperate request must be submitted for each receipt. Grouping receipts is not permitted. + </p> <ObjectEditor fieldConfigs={fieldConfig} header="Enter Bill" diff --git a/src/pages/CreditPayment.tsx b/src/pages/CreditPayment.tsx index 5fc1d2c..bf1adcf 100644 --- a/src/pages/CreditPayment.tsx +++ b/src/pages/CreditPayment.tsx @@ -63,6 +63,12 @@ export function generateFieldConfigs( value: l.id ? l.id : "", })), }, + { + name: "textcomment", + label: "text comment", + type: FieldType.COMMENT, + comment: "Choose the credit card you used. Each credit card is labeled at the back.", + }, { name: "card", label: "Creditcard", @@ -116,6 +122,9 @@ export default function GenerateCreditPayment() { return ( <Container> + <p> + Enter all required information below. Please note that a separate request must be submitted for each receipt. Grouping receipts is not permitted. + </p> <ObjectEditor fieldConfigs={fieldConfig} header="Add Credit Card Receipt" diff --git a/src/pages/GenerateKst.tsx b/src/pages/GenerateKst.tsx index 894e2d1..be58d50 100644 --- a/src/pages/GenerateKst.tsx +++ b/src/pages/GenerateKst.tsx @@ -50,7 +50,7 @@ export default function GenerateKst() { <Container> <ObjectEditor fieldConfigs={fieldConfig} - header="Add Item" + header="Add Cost Center" submitter={submitter} initial={initialElement} /> diff --git a/src/pages/GenerateLedger.tsx b/src/pages/GenerateLedger.tsx index 34ae980..48267c4 100644 --- a/src/pages/GenerateLedger.tsx +++ b/src/pages/GenerateLedger.tsx @@ -50,7 +50,7 @@ export default function GenerateLedger() { <Container> <ObjectEditor fieldConfigs={fieldConfig} - header="Add Item" + header="Add Ledger" submitter={submitter} initial={initialElement} /> diff --git a/src/pages/InternalTransfer.tsx b/src/pages/InternalTransfer.tsx index ff4363f..b4533a3 100644 --- a/src/pages/InternalTransfer.tsx +++ b/src/pages/InternalTransfer.tsx @@ -123,6 +123,9 @@ export default function GenerateInternalTransfer() { return ( <Container> + <p> + This form can be used to transfer money between cost centers. DO NOT USE IT UNLESS YOU WERE EXPLICITLY INSTRUCTED TO DO SO. + </p> <ObjectEditor fieldConfigs={fieldConfig} header="Add Internal Transfer" diff --git a/src/pages/KstEval.tsx b/src/pages/KstEval.tsx index 073dc86..7869b65 100644 --- a/src/pages/KstEval.tsx +++ b/src/pages/KstEval.tsx @@ -9,7 +9,7 @@ import { } from "../client/services.gen"; import { BasicUser, Kst, Ledger } from "../client/types.gen"; import GenericDataTable from "../components/GenericDataTable"; -import { Button } from "@mui/material"; +import { Button, Container } from "@mui/material"; export async function addLoader() { const kstList = await kstsReadKsts({}); @@ -81,11 +81,16 @@ const KstEvalList: React.FC = () => { }; return ( - <GenericDataTable - title="KST Evaluation" - columns={columns} - fetchData={fetchKstEval} - /> + <Container> + <p> + Here you can see the current status of each cost center in the AMIV budget. Please note that, at the moment, only debits and invoices issued by AMIV are displayed. Credits in the form of event payments or direct transfers to the AMIV account are not shown. The official document remains the KST evaluation which can be found in the "KST Auswertung" drive. + </p> + <GenericDataTable + title="KST Evaluation" + columns={columns} + fetchData={fetchKstEval} + /> + </Container> ); }; diff --git a/src/pages/OwnList.tsx b/src/pages/OwnList.tsx index 8710fa8..b981c97 100644 --- a/src/pages/OwnList.tsx +++ b/src/pages/OwnList.tsx @@ -56,9 +56,9 @@ const OwnList: React.FC = () => { return ( <Container> <Typography variant="h4" component="h1" gutterBottom> - My Requests + My Requests and Payments </Typography> - + In this list, you can find all the requests you have submitted, including reimbursements, credit card receipts, bills, and internal transfers. You can filter the list, edit requests that have not yet been approved, export the requests, and download your receipts. Additionally, the status of each request is displayed. <GenericEditableTable title="My Requests" fetchFunction={fetchCombinedPayments} diff --git a/src/pages/Reimbursement.tsx b/src/pages/Reimbursement.tsx index bc8532e..084e671 100644 --- a/src/pages/Reimbursement.tsx +++ b/src/pages/Reimbursement.tsx @@ -127,6 +127,9 @@ export default function GenerateReimbursement() { return ( <Container> + <p> + Enter all required information below. Please note that a separate request must be submitted for each receipt. Grouping receipts is not permitted. + </p> <ObjectEditor fieldConfigs={fieldConfig} header="Request Reimbursement" diff --git a/src/pages/ResponsibleList.tsx b/src/pages/ResponsibleList.tsx index 0d51b39..5cd19e2 100644 --- a/src/pages/ResponsibleList.tsx +++ b/src/pages/ResponsibleList.tsx @@ -7,6 +7,7 @@ import { } from "../client/services.gen"; import GenericEditableTable from "../components/GenericEditableTable"; import { CombinedCreditor } from "../client/types.gen"; +import {Container} from "@mui/material" const ResponsibleList: React.FC = () => { const { kst, ledger, user } = useLoaderData() as { @@ -66,12 +67,17 @@ const ResponsibleList: React.FC = () => { }; return ( - <GenericEditableTable - title="Responsibel KST List" + <Container> + <p> + If you are a member of the AMIV board or a commission board, you can view all submitted requests related to the cost center you are responsible for. + </p> + <GenericEditableTable + title="All Requests Regarding Your Cost Center(s)" fetchFunction={fetchCombinedPayments} kst={kst} ledger={ledger} /> + </Container> ); }; diff --git a/src/pages/index.tsx b/src/pages/index.tsx index 6bfa001..efa1806 100644 --- a/src/pages/index.tsx +++ b/src/pages/index.tsx @@ -108,7 +108,7 @@ export default function WelcomeToQTool() { <Box sx={{ width: "100%", maxWidth: "600px", marginBottom: 4 }}> <Grid container spacing={2} justifyContent="center"> <Grid item xs={6}> - <Link href="/Belegformular" underline="none"> + <Link href="/Reimbursement" underline="none"> <Button variant="contained" size="large" @@ -123,7 +123,7 @@ export default function WelcomeToQTool() { </Link> </Grid> <Grid item xs={6}> - <Link href="/Belegformular" underline="none"> + <Link href="/CreditPayment" underline="none"> <Button variant="contained" size="large" @@ -138,7 +138,7 @@ export default function WelcomeToQTool() { </Link> </Grid> <Grid item xs={6}> - <Link href="/CombinedList" underline="none"> + <Link href="/OwnList" underline="none"> <Button variant="contained" size="large" @@ -153,7 +153,7 @@ export default function WelcomeToQTool() { </Link> </Grid> <Grid item xs={6}> - <Link href="/support" underline="none"> + <Link href="/Onboarding" underline="none"> <Button variant="contained" size="large" @@ -235,7 +235,7 @@ export default function WelcomeToQTool() { <> <Box> <Typography variant="h4" sx={{ fontWeight: "bold" }}> - Welcome to QTool! + Welcome to the new QTool of AMIV! </Typography> </Box> <Box sx={{ textAlign: "center" }}> @@ -243,7 +243,7 @@ export default function WelcomeToQTool() { Please log in to access your dashboard. If this is your first time using QTool, please complete the onboarding process after logging in. The onboarding process is mandatory and will unlock the full - functionality of QTool. + functionality of QTool.3 </Typography> <Link href={import.meta.env.VITE_API_BASE_URL + "api/login"} diff --git a/src/pages/root.tsx b/src/pages/root.tsx index 75ce7a6..829222c 100644 --- a/src/pages/root.tsx +++ b/src/pages/root.tsx @@ -144,7 +144,7 @@ const sections = [ items: [ { path: "/Onboarding", - name: "Onboarding", + name: "My Profile", icon: <School />, }, ], -- GitLab From bc2ae711ca390f9a0619b0892a2660a795a9500f Mon Sep 17 00:00:00 2001 From: cwalter <cwalter@student.ethz.ch> Date: Sat, 18 Jan 2025 09:10:01 +0000 Subject: [PATCH 2/2] fix typo --- src/pages/index.tsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/pages/index.tsx b/src/pages/index.tsx index efa1806..f29f0d4 100644 --- a/src/pages/index.tsx +++ b/src/pages/index.tsx @@ -243,7 +243,7 @@ export default function WelcomeToQTool() { Please log in to access your dashboard. If this is your first time using QTool, please complete the onboarding process after logging in. The onboarding process is mandatory and will unlock the full - functionality of QTool.3 + functionality of QTool. </Typography> <Link href={import.meta.env.VITE_API_BASE_URL + "api/login"} -- GitLab