Allow assessments to be in the future

anet-dictionary.yml

@@ -142,6 +142,7 @@ fields:
         subTaskMonthly:
           label: Monthly assessment of effort
           recurrence: monthly
+          allowFutureAssessments: true
           questions:
             requiredButFilteredOutQuestion:
               test: $.subject[?(@property === "noSuchProperty" && @.match(/^willNeverMatch/i))]

client/src/components/assessments/instant/InstantAssessmentResultsTable.js

@@ -107,12 +107,7 @@ const InstantAssessmentResultsTable = ({
     return null
   }
   const { recurrence, numberOfPeriods } = periodsDetails
-  const periodsConfig = getPeriodsConfig(
-    recurrence,
-    numberOfPeriods,
-    offset,
-    true
-  )
+  const periodsConfig = getPeriodsConfig(recurrence, numberOfPeriods, offset)
   if (_isEmpty(periodsConfig?.periods)) {
     return null
   }

client/src/components/assessments/periodic/PeriodicAssessmentResultsTable.js

@@ -84,18 +84,19 @@ const PeriodicAssessmentResultsTable = ({
   if (!entity) {
     return null
   }
+  const entityPeriodicAssessmentConfig =
+    entity.getInstantAssessmentConfig(assessmentKey)
   const { recurrence, numberOfPeriods } = periodsDetails
   const periodsConfig = getPeriodsConfig(
     recurrence,
     numberOfPeriods,
     offset,
-    true
+    true,
+    entityPeriodicAssessmentConfig?.allowFutureAssessments
   )
   if (_isEmpty(periodsConfig?.periods)) {
     return null
   }
-  const entityPeriodicAssessmentConfig =
-    entity.getInstantAssessmentConfig(assessmentKey)
   const subEntitiesPeriodicAssessmentConfig = subEntities
     ?.map(s => s.getInstantAssessmentConfig(assessmentKey))
     .filter(mc => !_isEmpty(mc))

client/src/periodUtils.js

@@ -157,16 +157,20 @@ export const getPeriodsConfig = (
   recurrence,
   numberOfPeriods,
   offset,
-  forAssessments = false
+  forPeriodicAssessments = false,
+  allowFutureAssessments = false
 ) => {
   const now = moment()
   const periods = []
   for (let i = numberOfPeriods - 1; i >= 0; i--) {
     const periodDetails = PERIOD_FACTORIES[recurrence](now, offset + i)
-    if (forAssessments) {
-      // only allow assessments for past periods
-      periodDetails.allowNewAssessments = offset + i > 0
+
+    if (forPeriodicAssessments) {
+      // allow new assessments
+      periodDetails.allowNewAssessments =
+        allowFutureAssessments || offset + i > 0
     }
+
     periods.push(periodDetails)
   }
   return {

client/tests/webdriver/baseSpecs/assessmentsForTasks.spec.js

@@ -87,6 +87,37 @@ describe("For the periodic task assessments", () => {
         "monthly",
         ADVISOR_1_TASK_EDIT_DETAILS
       )
+    })
+
+    it("Should see an add button for subTaskMonthly assessments in the future", async() => {
+      await (
+        await ShowTask.getNextPeriodButton("subTaskMonthly", "monthly")
+      ).waitForExist()
+
+      await (
+        await ShowTask.getNextPeriodButton("subTaskMonthly", "monthly")
+      ).click()
+
+      await (
+        await ShowTask.getFutureAddAssessmentButton("subTaskMonthly", "monthly")
+      ).waitForExist()
+    })
+
+    it("Should not see an add button for subTaskWeekly assessments in the future", async() => {
+      await (
+        await ShowTask.getNextPeriodButton("subTaskWeekly", "weekly")
+      ).waitForExist()
+
+      await (
+        await ShowTask.getNextPeriodButton("subTaskWeekly", "weekly")
+      ).click()
+
+      expect(
+        await (
+          await ShowTask.getFutureAddAssessmentButton("subTaskWeekly", "weekly")
+        ).isExisting()
+      ).to.equal(false)
+
       await ShowTask.logout()
     })
   })

client/tests/webdriver/pages/showTask.page.js

@@ -52,6 +52,18 @@ class ShowTask extends Page {
     )
   }
 
+  async getNextPeriodButton(assessmentKey, recurrence) {
+    return (await this.getAssessmentResults(assessmentKey, recurrence)).$(
+      "button:last-child"
+    )
+  }
+
+  async getFutureAddAssessmentButton(assessmentKey, recurrence) {
+    return (await this.getAssessmentsTable(assessmentKey, recurrence)).$(
+      "tbody tr:last-child td:last-child button"
+    )
+  }
+
   async getEditAssessmentButton(assessmentKey, recurrence) {
     return (await this.getAssessmentsTable(assessmentKey, recurrence)).$(
       'div.card button[title="Edit assessment"]'
@@ -76,7 +88,7 @@ class ShowTask extends Page {
 
   async getShownAssessmentPanel(assessmentKey, recurrence) {
     return (await this.getAssessmentsTable(assessmentKey, recurrence)).$(
-      "tbody tr:last-child td:first-child .card"
+      "tbody tr:nth-child(2) td:first-child .card"
     )
   }
 

src/main/resources/anet-schema.yml

@@ -238,6 +238,11 @@ $defs:
         type: string
         enum: [once, daily, weekly, biweekly, semimonthly, monthly, quarterly, semiannually, annually, ondemand]
         default: once
+      allowFutureAssessments:
+        type: boolean
+        default: false
+        title: Allow assessments to be in the future
+        description: Allow assessment dates to be in the future for planning purposes.
       relatedObjectType:
         title: object type context in which the assessment will be made
         type: string

testDictionaries/no-custom-fields.yml

@@ -141,6 +141,7 @@ fields:
         subTaskMonthly:
           label: Monthly assessment of effort
           recurrence: monthly
+          allowFutureAssessments: true
           questions:
             requiredButFilteredOutQuestion:
               test: $.subject[?(@property === "noSuchProperty" && @.match(/^willNeverMatch/i))]