Remove unnecessary checkboxes for repeated opening hours

Instead, we give the label a more descriptive title.
danskernesdigitalebibliotek · Apr 25, 2024 · 6731c8d · 6731c8d
1 parent 6a0e261
commit 6731c8d
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 35 deletions.
diff --git a/src/apps/opening-hours-editor/EventForm.tsx b/src/apps/opening-hours-editor/EventForm.tsx
@@ -180,37 +180,14 @@ const EventForm: React.FC<EventFormProps> = ({
                 htmlFor="event-form-repeated"
               >
                 {t("openingHoursEventFormRepeatedText", {
-                  placeholders: { "@startDate": startDateString }
+                  placeholders: {
+                    "@startDate": startDateString,
+                    "@weekDayName": weekDayName
+                  }
                 })}
               </label>
             </div>
 
-            <div className="opening-hours-editor-form__checkbox">
-              <input
-                id="event-form-weekly"
-                data-cy="opening-hours-editor-form-week-day"
-                type="checkbox"
-                checked={isRepeated}
-                disabled={!isRepeated}
-              />
-              <label className="" htmlFor="event-form-weekly">
-                {t("openingHoursEventFormWeklyText")}
-              </label>
-            </div>
-
-            <div className="opening-hours-editor-form__checkbox">
-              <input
-                id="event-form-week-day"
-                data-cy="opening-hours-editor-form-week-day"
-                type="checkbox"
-                checked={isRepeated}
-                disabled={!isRepeated}
-              />
-              <label className="" htmlFor="event-form-week-day">
-                {weekDayName}
-              </label>
-            </div>
-
             <label
               className="opening-hours-editor-form__label"
               htmlFor="event-form-end-date"

diff --git a/src/apps/opening-hours-editor/OpeningHoursEditor.dev.tsx b/src/apps/opening-hours-editor/OpeningHoursEditor.dev.tsx
@@ -57,15 +57,10 @@ export default {
     },
     openingHoursEventFormRepeatedText: {
       name: "Opening hours event form repeated",
-      defaultValue: "Repeat opening hour from @startDate",
-      control: { type: "text" }
-    },
-    openingHoursEventFormWeklyText: {
-      name: "Opening hours event form weekly",
-      defaultValue: "Weekly",
+      defaultValue:
+        "Repeat opening hour weekly every @weekDayName from @startDate",
       control: { type: "text" }
     },
-
     openingHoursEventFormEndDateText: {
       name: "Opening hours event to end date",
       defaultValue: "End date",

diff --git a/src/apps/opening-hours-editor/OpeningHoursEditor.entry.tsx b/src/apps/opening-hours-editor/OpeningHoursEditor.entry.tsx
@@ -14,7 +14,6 @@ interface OpeningHoursEditorEntryTextProps {
   openingHoursEventFormEndTimeText: string;
   openingHoursEventFormSubmitText: string;
   openingHoursEventFormRepeatedText: string;
-  openingHoursEventFormWeklyText: string;
   openingHoursEventFormEndDateText: string;
   openingHoursEventFormEveryWeekdayText: string;
   openingHoursEventFormStartDateText: string;