Merge pull request #690 from NBISweden/hotfix/yearly-report-blocker

hotfix: do not allow a user to report a rabbit on the same day
NBISweden · Dec 20, 2023 · b45a09c · b45a09c
2 parents 0e2f997 + a6185ed
commit b45a09c
Showing 1 changed file with 8 additions and 3 deletions.
diff --git a/frontend/src/individual_report.tsx b/frontend/src/individual_report.tsx
@@ -159,7 +159,7 @@ export function IndividualReport({ individual }: { individual: Individual }) {
                 className={style.datePicker}
                 disableFuture
                 minDate={minDate}
-                minDateMessage="Datumet måste ligga efter senaste rapporteringsdatum."
+                minDateMessage="Datumet måste ligga efter senaste rapporteringsdatum. Förmodligen har du redan årsrapporterad denna kanin idag"
                 variant="inline"
                 inputVariant="outlined"
                 label="Datum för årsrapporten"
@@ -175,7 +175,7 @@ export function IndividualReport({ individual }: { individual: Individual }) {
             </MuiPickersUtilsProvider>
             <FormControl
               component="fieldset"
-              disabled={!reportDate}
+              disabled={reportDate <= minDate}
               error={error}
               className={style.checkContainer}
             >
@@ -223,7 +223,12 @@ export function IndividualReport({ individual }: { individual: Individual }) {
             </Button>
           </div>
           <div className={style.buttonContainer}>
-            <Button variant="contained" color="primary" onClick={onSave}>
+            <Button
+              variant="contained"
+              color="primary"
+              onClick={onSave}
+              disabled={!isStillOwner || reportDate <= minDate}
+            >
               Skicka
             </Button>
           </div>{" "}