[#12494] Allow instructors to use start/end dates up to 12 months in future

src/main/java/teammates/common/util/FieldValidator.java

@@ -645,7 +645,7 @@ static String getValidityInfoForSizeCappedPossiblyEmptyString(String fieldName,
      * Checks if the {@code startTime} is valid to be used as a session start time.
      * Returns an empty string if it is valid, or an error message otherwise.
      *
-     * <p>The {@code startTime} is valid if it is after 2 hours before now, before 90 days from now
+     * <p>The {@code startTime} is valid if it is after 2 hours before now, before 12 months from now
      * and at exact hour mark.
      */
     public static String getInvalidityInfoForNewStartTime(Instant startTime, String timeZone) {
@@ -655,18 +655,20 @@ public static String getInvalidityInfoForNewStartTime(Instant startTime, String
                 "2 hours before now", SESSION_START_TIME_FIELD_NAME,
                 (firstTime, secondTime) -> firstTime.isBefore(secondTime) || firstTime.equals(secondTime),
                 "The %s for this %s cannot be earlier than %s.");
+
         if (!earlierThanThreeHoursBeforeNowError.isEmpty()) {
             return earlierThanThreeHoursBeforeNowError;
         }
 
-        Instant ninetyDaysFromNow = TimeHelper.getInstantDaysOffsetFromNow(90);
-        String laterThanNinetyDaysFromNowError = getInvalidityInfoForFirstTimeComparedToSecondTime(
-                ninetyDaysFromNow, startTime, SESSION_NAME,
-                "90 days from now", SESSION_START_TIME_FIELD_NAME,
+        Instant twelveMonthsFromNow = TimeHelper.getInstantMonthsOffsetFromNow(12, timeZone);
+        String laterThanTwelveMonthsFromNowError = getInvalidityInfoForFirstTimeComparedToSecondTime(
+                twelveMonthsFromNow, startTime, SESSION_NAME,
+                "12 months from now", SESSION_START_TIME_FIELD_NAME,
                 (firstTime, secondTime) -> firstTime.isAfter(secondTime) || firstTime.equals(secondTime),
                 "The %s for this %s cannot be later than %s.");
-        if (!laterThanNinetyDaysFromNowError.isEmpty()) {
-            return laterThanNinetyDaysFromNowError;
+
+        if (!laterThanTwelveMonthsFromNowError.isEmpty()) {
+            return laterThanTwelveMonthsFromNowError;
         }
 
         String notExactHourError = getInvalidityInfoForExactHourTime(startTime, timeZone, "start time");
@@ -681,7 +683,7 @@ public static String getInvalidityInfoForNewStartTime(Instant startTime, String
      * Checks if the {@code endTime} is valid to be used as a session end time.
      * Returns an empty string if it is valid, or an error message otherwise.
      *
-     * <p>The {@code endTime} is valid if it is after 1 hour before now, before 180 days from now
+     * <p>The {@code endTime} is valid if it is after 1 hour before now, before twelve days from now
      * and at exact hour mark.
      */
     public static String getInvalidityInfoForNewEndTime(Instant endTime, String timeZone) {
@@ -695,14 +697,14 @@ public static String getInvalidityInfoForNewEndTime(Instant endTime, String time
             return earlierThanThreeHoursBeforeNowError;
         }
 
-        Instant oneHundredEightyDaysFromNow = TimeHelper.getInstantDaysOffsetFromNow(180);
-        String laterThanOneHundredEightyDaysError = getInvalidityInfoForFirstTimeComparedToSecondTime(
-                oneHundredEightyDaysFromNow, endTime, SESSION_NAME,
-                "180 days from now", SESSION_END_TIME_FIELD_NAME,
+        Instant twelveMonthsFromNow = TimeHelper.getInstantMonthsOffsetFromNow(12, timeZone);
+        String laterThanTwelveMonthsError = getInvalidityInfoForFirstTimeComparedToSecondTime(
+                twelveMonthsFromNow, endTime, SESSION_NAME,
+                "twelve months from now", SESSION_END_TIME_FIELD_NAME,
                 (firstTime, secondTime) -> firstTime.isAfter(secondTime) || firstTime.equals(secondTime),
                 "The %s for this %s cannot be later than %s.");
-        if (!laterThanOneHundredEightyDaysError.isEmpty()) {
-            return laterThanOneHundredEightyDaysError;
+        if (!laterThanTwelveMonthsError.isEmpty()) {
+            return laterThanTwelveMonthsError;
         }
 
         String notExactHourError = getInvalidityInfoForExactHourTime(endTime, timeZone, "end time");

src/main/java/teammates/common/util/TimeHelper.java

@@ -39,6 +39,20 @@ public static Instant getInstantDaysOffsetFromNow(long offsetInDays) {
         return Instant.now().plus(Duration.ofDays(offsetInDays));
     }
 
+    /**
+     * Returns an Instant that is offset by a number of months from now.
+     *
+     * @param offsetInMonths integer number of months to offset by
+     * @param timeZone string representing the time zone to compute local datetime
+     * @return an Instant offset by {@code offsetInMonths} days
+     */
+    public static Instant getInstantMonthsOffsetFromNow(long offsetInMonths, String timeZone) {
+        Instant now = Instant.now();
+        ZonedDateTime zdt = now.atZone(ZoneId.of(timeZone));
+        ZonedDateTime offsetZdt = zdt.plusMonths(offsetInMonths);
+        return offsetZdt.toInstant();
+    }
+
     /**
      * Returns an Instant that is offset by a number of days before now.
      *

src/web/app/components/session-edit-form/session-edit-form.component.ts

@@ -175,17 +175,17 @@ export class SessionEditFormComponent {
   /**
    * Gets the maximum date for a session to be opened.
    *
-   * <p> The maximum session opening datetime is 90 days from now.
+   * <p> The maximum session opening datetime is 12 months from now.
    */
   get maxDateForSubmissionStart(): DateFormat {
-    const ninetyDaysFromNow = moment().tz(this.model.timeZone).add(90, 'days');
-    return this.datetimeService.getDateInstance(ninetyDaysFromNow);
+    const twelveMonthsFromNow = moment().tz(this.model.timeZone).add(12, 'months');
+    return this.datetimeService.getDateInstance(twelveMonthsFromNow);
   }
 
   /**
    * Gets the maximum time for a session to be opened.
    *
-   * <p> The maximum session opening datetime is 90 days from now.
+   * <p> The maximum session opening time is 23:59h.
    */
   get maxTimeForSubmissionStart(): TimeFormat {
     return getLatestTimeFormat();
@@ -232,17 +232,17 @@ export class SessionEditFormComponent {
   /**
    * Gets the maximum date for a session to be closed.
    *
-   * <p> The maximum session closing datetime is 180 days from now.
+   * <p> The maximum session closing datetime is 12 months from now.
    */
   get maxDateForSubmissionEnd(): DateFormat {
-    const oneHundredAndEightyDaysFromNow = moment().tz(this.model.timeZone).add(180, 'days');
+    const oneHundredAndEightyDaysFromNow = moment().tz(this.model.timeZone).add(12, 'months');
     return this.datetimeService.getDateInstance(oneHundredAndEightyDaysFromNow);
   }
 
   /**
    * Gets the maximum time for a session to be closed.
    *
-   * <p> The maximum session closing datetime is 180 days from now.
+   * <p> The maximum session closing time is 23:59H.
    */
   get maxTimeForSubmissionEnd(): TimeFormat {
     return getLatestTimeFormat();

src/web/app/pages-instructor/instructor-session-edit-page/instructor-session-edit-page.component.html

@@ -2,11 +2,11 @@
   (retryEvent)="loadFeedbackSession()">
   <tm-session-edit-form *tmIsLoading="isLoadingFeedbackSession" [formMode]="SessionEditFormMode.EDIT"
     [(model)]="sessionEditFormModel" (editExistingSessionEvent)="editExistingSessionHandler()"
+    (modelChange)="triggerModelChange($event)"
     (cancelEditingSessionEvent)="cancelEditingSessionHandler()"
     (deleteExistingSessionEvent)="deleteExistingSessionHandler()"
     (copyCurrentSessionEvent)="copyCurrentSession()"></tm-session-edit-form>
 </tm-loading-retry>
-
 <tm-loading-retry [shouldShowRetry]="hasLoadingFeedbackQuestionsFailed" [message]="'Failed to load feedback questions'"
   (retryEvent)="loadFeedbackQuestions()">
   <div *ngIf="!isLoadingFeedbackQuestions && questionEditFormModels.length" class="offset-md-10 margin-vertical-20px">

src/web/app/pages-instructor/instructor-session-edit-page/instructor-session-edit-page.component.ts

@@ -1212,4 +1212,28 @@ export class InstructorSessionEditPageComponent extends InstructorSessionBasePag
   scrollToTopOfPage(): void {
     window.scrollTo({ top: 0, behavior: 'smooth' });
   }
+
+  triggerModelChange(data: SessionEditFormModel): void {
+    const { submissionStartDate, submissionEndDate, submissionStartTime, submissionEndTime } = data;
+
+    const startDate = new Date(submissionStartDate.year, submissionStartDate.month, submissionStartDate.day);
+    const endDate = new Date(submissionEndDate.year, submissionEndDate.month, submissionEndDate.day);
+
+    if (startDate > endDate) {
+      this.sessionEditFormModel = {
+        ...data,
+        submissionEndDate: data.submissionStartDate,
+        submissionEndTime,
+      };
+    } else if (startDate.toISOString() === endDate.toISOString() && submissionStartTime.hour > submissionEndTime.hour) {
+      this.sessionEditFormModel = {
+        ...data,
+        submissionEndDate: data.submissionStartDate,
+        submissionEndTime: {
+          ...submissionStartTime,
+          hour: submissionStartTime.hour,
+        },
+      };
+    }
+  }
 }

src/web/app/pages-instructor/instructor-sessions-page/instructor-sessions-page.component.html

@@ -13,7 +13,7 @@
 <div id="add-session-section" class="margin-top-30px" *ngIf="isSessionEditFormExpanded && !isCoursesLoading"
   @collapseAnim>
   <div>
-    <tm-session-edit-form [formMode]="SessionEditFormMode.ADD" [(model)]="sessionEditFormModel"
+    <tm-session-edit-form [formMode]="SessionEditFormMode.ADD" [(model)]="sessionEditFormModel" (modelChange)="triggerModelChange($event)"
       [courseCandidates]="courseCandidates" [templateSessions]="templateSessions"
       [isCopyOtherSessionLoading]="isCopyOtherSessionLoading" (addNewSessionEvent)="addNewSessionHandler()"
       (copyOtherSessionsEvent)="copyFromOtherSessionsHandler()"

src/web/app/pages-instructor/instructor-sessions-page/instructor-sessions-page.component.ts

@@ -732,4 +732,28 @@ export class InstructorSessionsPageComponent extends InstructorSessionModalPageC
     this.sessionsTableRowModels = [];
     this.recycleBinFeedbackSessionRowModels = [];
   }
+
+  triggerModelChange(data: SessionEditFormModel): void {
+    const { submissionStartDate, submissionEndDate, submissionStartTime, submissionEndTime } = data;
+
+    const startDate = new Date(submissionStartDate.year, submissionStartDate.month, submissionStartDate.day);
+    const endDate = new Date(submissionEndDate.year, submissionEndDate.month, submissionEndDate.day);
+
+    if (startDate > endDate) {
+      this.sessionEditFormModel = {
+        ...data,
+        submissionEndDate: data.submissionStartDate,
+        submissionEndTime,
+      };
+    } else if (startDate.toISOString() === endDate.toISOString() && submissionStartTime.hour > submissionEndTime.hour) {
+      this.sessionEditFormModel = {
+        ...data,
+        submissionEndDate: data.submissionStartDate,
+        submissionEndTime: {
+          ...submissionStartTime,
+          hour: submissionStartTime.hour,
+        },
+      };
+    }
+  }
 }