new release: v0.1.0

LuisRodriguezLD · LuisRodriguezLD · commit 97a42e4f0c85 · 2023-10-17T20:08:26.000-05:00
diff --git a/admin/src/pages/index.js b/admin/src/pages/index.js
@@ -131,8 +131,9 @@ function HomePage() {
     );
   }
 
-  const { monthView, weekView, dayView } = settings;
-  const multipleViews = (monthView && weekView) || (monthView && dayView) || (weekView && dayView);
+  const { monthView, weekView, workWeekView, dayView } = settings;
+  const viewCount = +monthView + +weekView + +dayView + +workWeekView;
+  const multipleViews = viewCount >= 2;
   const primaryAction = settings.createButton ? (
     <LinkButton
       startIcon={<Plus />}
@@ -250,6 +251,14 @@ function HomePage() {
                       })}
                     </Option>
                   )}
+                  {settings.workWeekView && (
+                    <Option value="Work-Week">
+                      {formatMessage({
+                        id: getTrad('view.calendar.action.work-week'),
+                        defaultMessage: 'Work Week',
+                      })}
+                    </Option>
+                  )}
                   {settings.dayView && (
                     <Option value="Day">
                       {formatMessage({
@@ -286,6 +295,7 @@ function HomePage() {
             />
             <MonthView />
             <WeekView startDayHour={settings.startHour} endDayHour={settings.endHour} />
+            <WeekView name={'Work-Week'} excludedDays={[0,6]} startDayHour={settings.startHour} endDayHour={settings.endHour} />
             <DayView startDayHour={settings.startHour} endDayHour={settings.endHour} />
             <Appointments appointmentComponent={Appointment} />
           </Scheduler>
diff --git a/admin/src/pages/settings.js b/admin/src/pages/settings.js
@@ -67,6 +67,7 @@ function Settings() {
     defaultView: 'Month',
     monthView: true,
     weekView: false,
+    workWeekView: false,
     dayView: false,
     todayButton: true,
     createButton: true,
@@ -135,6 +136,15 @@ function Settings() {
         }),
       });
     }
+    if (settings.defaultView === 'Work-Week' && !settings.workWeekView) {
+      return toggleNotification({
+        type: 'warning',
+        message: formatMessage({
+          id: getTrad('warning.missing.work-week-view'),
+          defaultMessage: 'Work Week view must be enabled',
+        }),
+      });
+    }
     if (settings.defaultView === 'Day' && !settings.dayView) {
       return toggleNotification({
         type: 'warning',
@@ -144,7 +154,7 @@ function Settings() {
         }),
       });
     }
-    if (!settings.monthView && !settings.weekView && !settings.dayView) {
+    if (!settings.monthView && !settings.weekView && !settings.workWeekView && !settings.dayView) {
       return toggleNotification({
         type: 'warning',
         message: formatMessage({
@@ -501,37 +511,43 @@ function Settings() {
                       defaultMessage: 'Week View',
                     })}
                   </Option>
+                  <Option value="Work-Week">
+                    {formatMessage({
+                      id: getTrad('view.settings.section.calendar.view.work-week'),
+                      defaultMessage: 'Work Week View',
+                    })}
+                  </Option>
                   <Option value="Day">
                     {formatMessage({
                       id: getTrad('view.settings.section.calendar.view.day'),
                       defaultMessage: 'Day View',
                     })}
                   </Option>
                 </Select>
-                <Box paddingTop={3}>
-                  <ToggleInput
-                    label={formatMessage({
-                      id: getTrad('view.settings.section.calendar.button.create.label'),
-                      defaultMessage: 'Create Button',
-                    })}
-                    checked={settings.createButton}
-                    offLabel={formatMessage({
-                      id: getTrad('view.settings.section.calendar.button.off'),
-                      defaultMessage: 'Disabled',
-                    })}
-                    onLabel={formatMessage({
-                      id: getTrad('view.settings.section.calendar.button.on'),
-                      defaultMessage: 'Enabled',
-                    })}
-                    onChange={(e) => {
-                      setSettings((s) => ({
-                        ...s,
-                        createButton: e.target.checked,
-                      }));
-                    }}
-                  />
-                </Box>
                 <Grid paddingTop={3}>
+                  <GridItem col={6} s={12}>
+                    <ToggleInput
+                      label={formatMessage({
+                        id: getTrad('view.settings.section.calendar.button.create.label'),
+                        defaultMessage: 'Create Button',
+                      })}
+                      checked={settings.createButton}
+                      offLabel={formatMessage({
+                        id: getTrad('view.settings.section.calendar.button.off'),
+                        defaultMessage: 'Disabled',
+                      })}
+                      onLabel={formatMessage({
+                        id: getTrad('view.settings.section.calendar.button.on'),
+                        defaultMessage: 'Enabled',
+                      })}
+                      onChange={(e) => {
+                        setSettings((s) => ({
+                          ...s,
+                          createButton: e.target.checked,
+                        }));
+                      }}
+                    />
+                  </GridItem>
                   <GridItem col={6} s={12}>
                     <ToggleInput
                       label={formatMessage({
@@ -555,6 +571,8 @@ function Settings() {
                       }}
                     />
                   </GridItem>
+                </Grid>
+                <Grid paddingTop={3}>
                   <GridItem col={6} s={12}>
                     <ToggleInput
                       label={formatMessage({
@@ -578,8 +596,6 @@ function Settings() {
                       }}
                     />
                   </GridItem>
-                </Grid>
-                <Grid paddingTop={3}>
                   <GridItem col={6} s={12}>
                     <ToggleInput
                       label={formatMessage({
@@ -603,6 +619,31 @@ function Settings() {
                       }}
                     />
                   </GridItem>
+                </Grid>
+                <Grid paddingTop={3}>
+                  <GridItem col={6} s={12}>
+                    <ToggleInput
+                      label={formatMessage({
+                        id: getTrad('view.settings.section.calendar.view.work-week'),
+                        defaultMessage: 'Work Week',
+                      })}
+                      checked={settings.workWeekView}
+                      offLabel={formatMessage({
+                        id: getTrad('view.settings.section.calendar.view.off'),
+                        defaultMessage: 'Disabled',
+                      })}
+                      onLabel={formatMessage({
+                        id: getTrad('view.settings.section.calendar.view.on'),
+                        defaultMessage: 'Enabled',
+                      })}
+                      onChange={(e) => {
+                        setSettings((s) => ({
+                          ...s,
+                          workWeekView: e.target.checked,
+                        }));
+                      }}
+                    />
+                  </GridItem>
                   <GridItem col={6} s={12}>
                     <ToggleInput
                       label={formatMessage({
diff --git a/admin/src/translations/de.json b/admin/src/translations/de.json
@@ -8,6 +8,7 @@
   "view.calendar.action.today": "Heute",
   "view.calendar.action.month": "Monat",
   "view.calendar.action.week": "Woche",
+  "view.calendar.action.work-week": "Arbeitswoche",
   "view.calendar.action.day": "Tag",
   "view.calendar.locale": "de-DE",
   "view.calendar.first-day-of-week": "1",
@@ -46,9 +47,11 @@
   "view.settings.section.calendar.view.month": "Monats-Ansicht",
   "view.settings.section.calendar.view.week": "Wochen-Ansicht",
   "view.settings.section.calendar.view.day": "Tages-Ansicht",
+  "view.settings.section.calendar.view.work-week": "Arbeitswochenansicht",
   "warning.missing.month-view": "Monatsansicht muss aktiviert sein",
   "warning.missing.week-view": "Wochenansicht muss aktiviert sein",
   "warning.missing.day-view": "Tagesansicht muss aktiviert sein",
+  "warning.missing.work-week-view": "Arbeitswochenansicht muss aktiviert sein",
   "warning.missing.view": "Mindestens eine Ansicht muss aktiviert sein",
   "success.update": "Einstellungen erfolgreich aktualisiert"
 }
diff --git a/admin/src/translations/en.json b/admin/src/translations/en.json
@@ -8,6 +8,7 @@
   "view.calendar.action.today": "Today",
   "view.calendar.action.month": "Month",
   "view.calendar.action.week": "Week",
+  "view.calendar.action.work-week": "Work Week",
   "view.calendar.action.day": "Day",
   "view.calendar.locale": "en-US",
   "view.calendar.first-day-of-week": "0",
@@ -46,9 +47,11 @@
   "view.settings.section.calendar.view.on": "Enabled",
   "view.settings.section.calendar.view.month": "Month View",
   "view.settings.section.calendar.view.week": "Week View",
+  "view.settings.section.calendar.view.work-week": "Work Week View",
   "view.settings.section.calendar.view.day": "Day View",
   "warning.missing.month-view": "Month view must be enabled",
   "warning.missing.week-view": "Week view must be enabled",
+  "warning.missing.work-week-view": "Work week view must be enabled",
   "warning.missing.day-view": "Day view must be enabled",
   "warning.missing.view": "At least one view must be enabled",
   "success.update": "Settings successfully updated"
diff --git a/admin/src/translations/es.json b/admin/src/translations/es.json
@@ -8,6 +8,7 @@
   "view.calendar.action.today": "Hoy",
   "view.calendar.action.month": "Mes",
   "view.calendar.action.week": "Semana",
+  "view.calendar.action.work-week": "Semana laboral",
   "view.calendar.action.day": "Día",
   "view.calendar.locale": "es-ES",
   "view.calendar.first-day-of-week": "0",
@@ -46,9 +47,11 @@
   "view.settings.section.calendar.view.on": "Activado",
   "view.settings.section.calendar.view.month": "Vista de mes",
   "view.settings.section.calendar.view.week": "Vista de semana",
+  "view.settings.section.calendar.view.work-week": "Vista de semana laboral",
   "view.settings.section.calendar.view.day": "Vista de día",
   "warning.missing.month-view": "Vista mensual debe estar activada",
   "warning.missing.week-view": "Vista semanal debe estar activada",
+  "warning.missing.work-week-view": "Vista de semana laboral debe estar activada",
   "warning.missing.day-view": "Vista diaria debe estar activada",
   "warning.missing.view": "Al menos una vista debe estar activada",
   "success.update": "Configuración actualizada"
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@offset-dev/strapi-calendar",
-  "version": "0.0.10",
+  "version": "0.1.0",
   "description": "Visual calendar for Strapi",
   "strapi": {
     "name": "calendar",

Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`{`
`2`	`2`	`"name": "@offset-dev/strapi-calendar",`
`3`		`- "version": "0.0.10",`
	`3`	`+ "version": "0.1.0",`
`4`	`4`	`"description": "Visual calendar for Strapi",`
`5`	`5`	`"strapi": {`
`6`	`6`	`"name": "calendar",`