diff --git a/src/pages/Bills.tsx b/src/pages/Bills.tsx index 45f36cd5cecf5ca3a1c67ec9870003b965e83c5e..bcfcb5514cc60250ffb819d3a420b74ff998d6c0 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 5fc1d2ca1c7fac76ee396c25e8b363a0faedc537..bf1adcf7e2b08a1fd76e6c81f7fa7e23248a5ccb 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/InternalTransfer.tsx b/src/pages/InternalTransfer.tsx index ff4363f81f53e1b8c7060f242cb369b5cc14d7cf..b4533a3bbeb9c772d38902b19521782f4c5e1f82 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 073dc868e59785ec7ec219ea2db7e2702b9061a9..7869b6566ab80f3774f5c5add97ba4e3843caa08 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 bf4b9f5dc2358dff2c10279dd422fa5296eed195..529fbcf24328950a3b7a407888fb56aea8bafbc2 100644 --- a/src/pages/OwnList.tsx +++ b/src/pages/OwnList.tsx @@ -58,9 +58,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 bc8532e011f319b106998cf34d55d8c2ca51b76b..084e6713fa70fa8fb2e8d3529b58da798983f623 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 d68f319aaf544a60b65654d55c9516c319c4e4c8..7b7dc8655ea773c58e028e55e18ea839bb9149bb 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 { @@ -67,12 +68,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 6bfa001c2cd3c587e51c37b219acc97b6132165b..f29f0d4874064d0dbe395561fdcab5a46364fd9a 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" }}> diff --git a/src/pages/qtool-admin/GenerateKst.tsx b/src/pages/qtool-admin/GenerateKst.tsx index e1d6e5bc2f53a7a3408bbbe953eb6a94d979a594..4b01b87eb7d153b1191fae5d9ea1addb1aaf7832 100644 --- a/src/pages/qtool-admin/GenerateKst.tsx +++ b/src/pages/qtool-admin/GenerateKst.tsx @@ -50,7 +50,7 @@ export default function GenerateKst(propIdString = "") { <Container> <ObjectEditor fieldConfigs={fieldConfig} - header="Add Kst" + header="Add Cost Center" submitter={submitter} initial={initialElement} /> diff --git a/src/pages/root.tsx b/src/pages/root.tsx index 1d9197e97e93b9cf1d6b2866428b6a51fa00d48e..623ee97bdf0e2749f53676fddf4a30eb3053ddf5 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 />, }, ],