fix: form access and summary page confirm

armada-ths · Aug 5, 2024 · e5c3041 · e5c3041
1 parent 1bb2c7c
commit e5c3041
Show file tree

Hide file tree

Showing 2 changed files with 23 additions and 4 deletions.
diff --git a/apps/dashboard/src/forms/form_access.ts b/apps/dashboard/src/forms/form_access.ts
@@ -25,9 +25,7 @@ export const FORM_ACCESS: FormAccessDeclaration = {
         "complete_registration:::unsigned_ir:::*": CardStatus.Shown
     },
     ir_additional_info: {
-        "before_initial_registration:::*:::*": CardStatus.HiddenLocked,
-        "*:::unsigned_ir:::*": CardStatus.HiddenLocked,
-        "*:::*:::!rejected": CardStatus.Shown
+        "initial_registration:::!unsigned_ir:::*": CardStatus.Shown
     },
     exhibitor_catalog: {
         "initial_registration:::!unsigned_ir:::*": CardStatus.Shown,

diff --git a/apps/dashboard/src/forms/fr_accounting/summary.page.tsx b/apps/dashboard/src/forms/fr_accounting/summary.page.tsx
@@ -29,6 +29,7 @@ export function SummaryFormPage() {
     const [confirmTerms, setConfirmTerms] = useState<boolean>(false)
     const [confirmBinding, setConfirmBinding] = useState(false)
     const [confirmEligibility, setConfirmEligibility] = useState(false)
+    const [allowLateConfirmation, setAllowLateConfirmation] = useState(false)
 
     const { data } = useDashboard()
     const { data: orders, isLoading: isLoadingOrders } = useOrders()
@@ -39,7 +40,11 @@ export function SummaryFormPage() {
 
     const unfilledFields: Array<unknown> = []
 
-    const readyToSign = confirmTerms && confirmBinding && confirmEligibility
+    const readyToSign =
+        confirmTerms &&
+        confirmBinding &&
+        confirmEligibility &&
+        allowLateConfirmation
 
     async function submitRegistration() {
         const response = await fetch(`${HOST}/api/dashboard/submit`, {
@@ -138,6 +143,22 @@ export function SummaryFormPage() {
                         Tekniska Högskolans Studentkår, org. nr. 802005-9153
                     </Label>
                 </div>
+                <div className="mt-2 flex items-center space-x-4">
+                    <Checkbox
+                        id="allow_late_confirmation"
+                        checked={allowLateConfirmation}
+                        onCheckedChange={x =>
+                            x != "indeterminate" && setAllowLateConfirmation(x)
+                        }
+                    />
+                    <Label
+                        htmlFor="allow_late_confirmation"
+                        className="text-sm font-medium leading-5 peer-disabled:cursor-not-allowed peer-disabled:opacity-70"
+                    >
+                        I understand that the event may be full and that THS
+                        Armada will confirm my spot as soon as possible.
+                    </Label>
+                </div>
 
                 <div className="flex items-center gap-x-5">
                     <Checkbox