updates from comments

department-of-veterans-affairs · Sep 6, 2024 · 492e6c6 · 492e6c6
1 parent 6b0184e
commit 492e6c6
Show file tree

Hide file tree

Showing 2 changed files with 33 additions and 8 deletions.
diff --git a/src/applications/discharge-wizard/constants/display-conditions.js b/src/applications/discharge-wizard/constants/display-conditions.js
@@ -1,4 +1,5 @@
 import { range } from 'lodash';
+import { months } from 'platform/static-data/options-for-select';
 import { RESPONSES } from './question-data-map';
 
 const get15YearsPast = () => `${new Date().getFullYear() - 15}`;
@@ -12,9 +13,19 @@ const yearResponses = range(currentYear - 1992).map(i => {
 yearResponses.push('Before 1992');
 
 const validYearsForNonOldDischarge = yearResponses.filter(year => {
-  return currentYear - year <= 15;
+  return currentYear - year < 15;
 });
 
+const determineMonths = months.reduce((newArray, month) => {
+  const currentMonth = new Date().getMonth() + 1;
+  if (currentMonth <= month.value) {
+    newArray.push(month.value.toString());
+  }
+  return newArray;
+}, []);
+
+const year15Yearsago = (new Date().getFullYear() - 15).toString();
+
 const {
   ARMY,
   NAVY,
@@ -171,10 +182,21 @@ export const DISPLAY_CONDITIONS = Object.freeze({
     },
   },
   FAILURE_TO_EXHAUST: {
-    DISCHARGE_YEAR: [...validYearsForNonOldDischarge],
-    COURT_MARTIAL: [COURT_MARTIAL_NO, NOT_SURE],
-    INTENTION: [INTENTION_NO],
-    PREV_APPLICATION_TYPE: [PREV_APPLICATION_BCMR, PREV_APPLICATION_BCNR],
+    FORK: {
+      0: {
+        DISCHARGE_YEAR: [...validYearsForNonOldDischarge],
+        COURT_MARTIAL: [COURT_MARTIAL_NO, NOT_SURE],
+        INTENTION: [INTENTION_NO],
+        PREV_APPLICATION_TYPE: [PREV_APPLICATION_BCMR, PREV_APPLICATION_BCNR],
+      },
+      1: {
+        DISCHARGE_YEAR: [year15Yearsago],
+        DISCHARGE_MONTH: [...determineMonths],
+        COURT_MARTIAL: [COURT_MARTIAL_NO, NOT_SURE],
+        INTENTION: [INTENTION_NO],
+        PREV_APPLICATION_TYPE: [PREV_APPLICATION_BCMR, PREV_APPLICATION_BCNR],
+      },
+    },
   },
   PRIOR_SERVICE: {
     FORK: {

diff --git a/src/applications/discharge-wizard/constants/index.js b/src/applications/discharge-wizard/constants/index.js
@@ -161,7 +161,7 @@ export const questionsToClearMap = Object.freeze({
     SHORT_NAME_MAP.DISCHARGE_MONTH,
     SHORT_NAME_MAP.FAILURE_TO_EXHAUST,
   ],
-  DISCHARGE_MONTH: [],
+  DISCHARGE_MONTH: [SHORT_NAME_MAP.FAILURE_TO_EXHAUST],
   REASON: [
     SHORT_NAME_MAP.DISCHARGE_TYPE,
     SHORT_NAME_MAP.COURT_MARTIAL,
@@ -172,8 +172,8 @@ export const questionsToClearMap = Object.freeze({
     SHORT_NAME_MAP.PRIOR_SERVICE,
     SHORT_NAME_MAP.FAILURE_TO_EXHAUST,
   ],
-  DISCHARGE_TYPE: [],
-  COURT_MARTIAL: [],
+  DISCHARGE_TYPE: [SHORT_NAME_MAP.PRIOR_SERVICE],
+  COURT_MARTIAL: [SHORT_NAME_MAP.FAILURE_TO_EXHAUST],
   INTENTION: [],
   PREV_APPLICATION: [
     SHORT_NAME_MAP.PREV_APPLICATION_TYPE,
@@ -196,7 +196,10 @@ export const questionsToClearMap = Object.freeze({
 
 export const forkableQuestions = [
   SHORT_NAME_MAP.DISCHARGE_YEAR,
+  SHORT_NAME_MAP.DISCHARGE_MONTH,
   SHORT_NAME_MAP.REASON,
+  SHORT_NAME_MAP.COURT_MARTIAL,
+  SHORT_NAME_MAP.DISCHARGE_TYPE,
   SHORT_NAME_MAP.PREV_APPLICATION,
   SHORT_NAME_MAP.PREV_APPLICATION_TYPE,
   SHORT_NAME_MAP.PREV_APPLICATION_YEAR,