Added fullDay default duration for events

offset-dev · Oct 2, 2024 · 4ef7602 · 4ef7602
1 parent 34894d2
commit 4ef7602
Show file tree

Hide file tree

Showing 5 changed files with 12 additions and 1 deletion.
diff --git a/admin/src/pages/settings.js b/admin/src/pages/settings.js
@@ -298,6 +298,12 @@ function Settings() {
                         defaultMessage: '2 Hours',
                       })}
                     </Option>
+					<Option value={1440}>
+					  {formatMessage({
+					    id: getTrad('view.settings.section.general.default-duration.fullday'),
+					    defaultMessage: 'Full Day',
+					  })}
+					</Option>                    
                   </Select>
                 </GridItem>
               </Grid>

diff --git a/admin/src/translations/de.json b/admin/src/translations/de.json
@@ -25,6 +25,7 @@
   "view.settings.section.general.default-duration.1h": "1 Stunde",
   "view.settings.section.general.default-duration.1.5h": "1,5 Stunden",
   "view.settings.section.general.default-duration.2h": "2 Stunden",
+  "view.settings.section.general.default-duration.fullDay": "Ganztägig",  
   "view.settings.section.general.start.label": "Start-Feld auswählen",
   "view.settings.section.general.end.label": "Ende-Feld auswählen",
   "view.settings.section.general.end.none": "Kein Ende-Feld",

diff --git a/admin/src/translations/en.json b/admin/src/translations/en.json
@@ -26,6 +26,7 @@
   "view.settings.section.general.default-duration.1h": "1 Hour",
   "view.settings.section.general.default-duration.1.5h": "1.5 Hours",
   "view.settings.section.general.default-duration.2h": "2 Hours",
+  "view.settings.section.general.default-duration.fullDay": "Full Day",
   "view.settings.section.general.start.label": "Choose your start field",
   "view.settings.section.general.end.label": "Choose your end field",
   "view.settings.section.general.end.none": "No end field",

diff --git a/admin/src/translations/es.json b/admin/src/translations/es.json
@@ -26,6 +26,7 @@
   "view.settings.section.general.default-duration.1h": "1 hora",
   "view.settings.section.general.default-duration.1.5h": "1,5 horas",
   "view.settings.section.general.default-duration.2h": "2 horas",
+  "view.settings.section.general.default-duration.fullDay": "Todo el día",  
   "view.settings.section.general.start.label": "Elija su campo de comienzo",
   "view.settings.section.general.end.label": "Elija su campo de finalización",
   "view.settings.section.general.end.none": "Sin campo de finalización",

diff --git a/server/services/service.js b/server/services/service.js
@@ -81,7 +81,9 @@ module.exports = () => ({
       startDate: x[config.startField],
       endDate: config.endField
         ? x[config.endField]
-        : moment(x[config.startField]).add(config.defaultDuration, 'minutes'),
+        : config.defaultDuration === 'fullDay' 
+ 			? moment(x[config.startField]).endOf('day')         
+        	: moment(x[config.startField]).add(config.defaultDuration, 'minutes'),
       color: config.colorField ? x[config.colorField] : null,
     }));
   },