From 4ef7602ecf0954bcac5a287500a2a9393383a30e Mon Sep 17 00:00:00 2001
From: Jacob <jacob@jacobdaniel.co.uk>
Date: Wed, 2 Oct 2024 15:43:28 +0100
Subject: [PATCH] Added fullDay default duration for events

---
 admin/src/pages/settings.js    | 6 ++++++
 admin/src/translations/de.json | 1 +
 admin/src/translations/en.json | 1 +
 admin/src/translations/es.json | 1 +
 server/services/service.js     | 4 +++-
 5 files changed, 12 insertions(+), 1 deletion(-)

diff --git a/admin/src/pages/settings.js b/admin/src/pages/settings.js
index 06079f3..fdb632a 100644
--- 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
index ac083a1..5c71315 100644
--- 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
index 189eb21..dab29c2 100644
--- 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
index e8a9403..de2f5da 100644
--- 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
index acea753..002a07f 100644
--- 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,
     }));
   },