Merge pull request #4211 from webkom/change-default-survey-activation…

…-time
webkom · Oct 19, 2023 · 186f0a6 · 186f0a6
2 parents a33a654 + 728f777
commit 186f0a6
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 5 deletions.
diff --git a/app/routes/surveys/AddSurveyRoute.ts b/app/routes/surveys/AddSurveyRoute.ts
@@ -14,7 +14,7 @@ import withPreparedDispatch from 'app/utils/withPreparedDispatch';
 import SurveyEditor, {
   initialQuestion,
 } from './components/SurveyEditor/SurveyEditor';
-import { defaultActiveFrom } from './utils';
+import { getActiveFrom } from './utils';
 import type { DeepPartial } from 'utility-types';
 
 const loadData = (props, dispatch) => {
@@ -54,7 +54,7 @@ const mapStateToProps = (state, props) => {
         label: fullEvent.title,
       }
     : undefined;
-  const activeFrom = fullEvent ? fullEvent.endTime : defaultActiveFrom(12, 0);
+  const activeFrom = getActiveFrom(fullEvent?.endTime, 14, 30);
   const title = fullEvent ? `Spørreundersøkelse for ${fullEvent.title}` : '';
   let initialValues: DeepPartial<FormSurvey> | null = null;
 

diff --git a/app/routes/surveys/utils.tsx b/app/routes/surveys/utils.tsx
@@ -3,7 +3,7 @@ import Icon from 'app/components/Icon';
 import NavigationTab from 'app/components/NavigationTab';
 import NavigationLink from 'app/components/NavigationTab/NavigationLink';
 import config from 'app/config';
-import type { ActionGrant } from 'app/models';
+import type { ActionGrant, Dateish } from 'app/models';
 import type { ID } from 'app/store/models';
 import styles from './components/surveys.css';
 import type { ReactNode } from 'react';
@@ -76,8 +76,15 @@ export const TokenNavigation = ({
     )}
   </NavigationTab>
 );
-export const defaultActiveFrom = (hours: number, minutes: number) =>
-  moment().startOf('day').add({ day: 1, hours, minutes }).toISOString();
+export const getActiveFrom = (
+  eventEndTime: Dateish,
+  hours: number,
+  minutes: number
+) =>
+  moment(eventEndTime)
+    .startOf('day')
+    .add({ days: 1, hours, minutes })
+    .toISOString();
 
 export const getCsvUrl = (surveyId: ID) =>
   `${config.serverUrl}/surveys/${surveyId}/csv/`;