[TC-924] fix recommitment program on member profile and dashboard banner

backend/src/database/entities/emcr/emcr-personnel.entity.ts

@@ -164,7 +164,8 @@ export class EmcrPersonnelEntity {
       status: this.status,
       travelPreference: this.travelPreference,
       newMember:
-        Status.ACTIVE && differenceInDays(new Date(), this.dateApproved) < 6,
+        this.status === Status.ACTIVE &&
+        differenceInDays(new Date(), this.dateApproved) < 6,
       icsTraining:
         this.trainings?.some((t) => t.name === ICS_TRAINING_NAME) || false,
       experiences:

backend/src/personnel/personnel.service.ts

@@ -451,6 +451,7 @@ export class PersonnelService {
         queryBuilder.addOrderBy('personnel.lastName', 'ASC');
         queryBuilder.addOrderBy('personnel.firstName', 'ASC');
       } else if (status === Status.ACTIVE) {
+        //TODO - Fix this (not sure if the order by is being added here)
         queryBuilder.addSelect(
           `CASE WHEN emcr_personnel.dateApproved > current_date - interval '5' day THEN emcr_personnel.dateApproved ELSE null END`,
           'new_member',

docker-compose.yml

@@ -91,10 +91,11 @@ services:
       DB_PASSWORD: ${DB_PASSWORD}
       MODE: ${MODE}
       END_RECOMMITMENT_SCHEDULE: ${END_RECOMMITMENT_SCHEDULE}
-      TEST_EMAIL: ${TEST_EMAIL}
       CHOKIDAR_USEPOLLING: true
       ALLOW_EMPTY_PASSWORD: "yes"
       ENV: ${ENV}
+      TEST_EMAIL: ${TEST_EMAIL}
+      TEST_RUN: ${TEST_RUN}
     networks:
       - tc
   keycloak:
@@ -128,8 +129,6 @@ services:
       HEALTH_ENABLED: "true"
       HTTP_ENABLED: "true"
       METRICS_ENABLED: "true"
-      TEST_EMAIL: ${TEST_EMAIL}
-      TEST_RUN: ${TEST_RUN}
     depends_on:
       - db
     ports:

frontend/src/components/profile/banners/RecommitmentDashBanner.tsx

@@ -3,6 +3,7 @@ import { Banner } from '@/components/ui/Banner';
 import type { RecommitmentCycle } from '@/common';
 import { Transition } from '@headlessui/react';
 import { useState } from 'react';
+import { format } from 'date-fns';
 
 // TODO - make me look nice
 export const RecommitmentDashBanner = ({
@@ -34,13 +35,7 @@ export const RecommitmentDashBanner = ({
           onClick={hideBanner}
           content={
             <p>
-              <span className="font-bold">
-                {recommitment.year} CORE recommitment reminders have been sent to
-                members and supervisors.{' '}
-              </span>
-              Returning members with supervisor approval will be marked as
-              Recommitted: {recommitment.year} in the coming weeks. Please monitor
-              their status for any needed follow-up and ParQ review.
+              {`The ${new Date(recommitment.endDate)?.getFullYear()} CORE recommitment period has begun and will end on ${format(new Date(recommitment?.endDate), 'MMMM do, yyyy') ?? ''}. Email reminders have been sent to active members and their supervisors. Returning members with supervisor approval will be marked as "Recommitted" in the coming weeks. Please monitor their status in case further communication is needed.`}
             </p>
           }
           onClose={hideBanner}

frontend/src/components/recommitment/InitialRecommitmentDropdown.tsx

@@ -7,7 +7,7 @@ export const InitialRecommitmentDropdown = ({
   handleChange,
 }: {
   initialValue?: string;
-  program: Program;
+  program?: Program;
   handleChange: (v: string | undefined) => void;
 }) => {
   const getText = () => {

frontend/src/components/recommitment/RecommitmentFormBase.tsx

@@ -23,7 +23,7 @@
 }
 
 interface RecommitmentFormProps {
-  program: Program.BCWS | Program.EMCR | Program.ALL;
+  program?: Program;
   personnel: MemberProfile;
   onClose: () => void;
 }
@@ -248,11 +248,6 @@
             onUpdate={setUnableToJoinReasons}
             key="unable"
           />,
-          <Assertions
-            program={Program.ALL}
-            onUpdate={setAssertionsChecked}
-            key="assertions"
-          />,
         ];
       default:
         return [
@@ -274,7 +269,7 @@
   }, [recommitmentAnswer]);
 
   const handleSubmitRecommitment = async () => {
     const selectedReasons = unableToJoinReasons.selectedReasons.map(
       (r) => reasonDefinitions[r as keyof typeof reasonDefinitions],
     );
     const reasons = [...selectedReasons, unableToJoinReasons.otherReason].join(', ');
@@ -345,7 +340,10 @@
       }
     }
 
-    if (currentComponentType === Assertions) {
+    if (
+      currentComponentType === Assertions ||
+      currentComponentType === UnableToJoin && recommitmentAnswer === 'no'
+    ) {
       setButtonLoading(true);
       handleSubmitRecommitment();
     }
@@ -460,7 +458,10 @@
 
   const getButtonText = () => {
     const currentComponentType = currentComponent.type;
-    if (currentComponentType === Assertions) {
+    if (
+      currentComponentType === Assertions ||
+      currentComponentType === UnableToJoin && recommitmentAnswer === 'no'
+    ) {
       return 'Submit Decision';
     }
     if (currentComponentType === ParQBase && currentParQStep === 3) {

frontend/src/components/recommitment/SupervisorForm.tsx

@@ -5,13 +5,13 @@ interface SupervisorFormProps {
     firstName: string;
     lastName: string;
     email: string;
-    phone: string;
+    phone?: string;
   };
   onUpdate: (data: {
     firstName: string;
     lastName: string;
     email: string;
-    phone: string;
+    phone?: string;
   }) => void;
 }
 

frontend/src/components/table/body/TableBodyCell.tsx

@@ -72,6 +72,7 @@ export const TableBodyCell = ({
   recommitmentStatus?: RecommitmentStatus;
   isRecommitmentCycleOpen?: boolean;
 }) => {
+
   switch (cell.columnName) {
     case DashboardColumns.NAME:
       return (
@@ -84,13 +85,11 @@ export const TableBodyCell = ({
           >
             {cell.value}
           </Link>
-          {status && status === Status.NEW && (
+          {status && status === Status.NEW ? (
             <span className="bg-warningBannerLight px-2 rounded-full ml-2">
               {StatusNames.NEW}
-            </span>
-          )}
-          {/* Only show Active Persons recommitment status during recommitment period */}
-          {isRecommitmentCycleOpen &&
+            </span>) : 
+          isRecommitmentCycleOpen &&
             recommitmentStatus &&
             status === Status.ACTIVE &&
             renderRecommitmentStatus(recommitmentStatus, isRecommitmentCycleOpen)}

frontend/src/hooks/useMemberProfile.tsx

@@ -1,5 +1,5 @@
 import { useEffect, useState } from 'react';
-import type { MemberProfile, Personnel } from '@/common';
+import type { MemberProfile, Personnel, Recommitment } from '@/common';
 import type { FormikValues } from 'formik';
 import { useAxios } from './useAxios';
 import { Program } from '@/common';
@@ -11,25 +11,39 @@
   updatePersonnel: (person: FormikValues | Personnel) => Promise<void>;
   loading: boolean;
   program?: Program;
+  recommitmentProgram?: Program;
 } => {
   const [personnel, setPersonnel] = useState<MemberProfile>();
   const { AxiosPrivate } = useAxios();
   const [refetch, setRefetch] = useState(false);
   const [loading, setIsLoading] = useState(false);
   const [program, setProgram] = useState<Program>();
+  const [recommitmentProgram, setRecommitmentProgram] = useState<Program>();  
   const [openRecommitmentForm, setOpenRecommitmentForm] = useState(false);
+
   const getProfileDetails = async () => {
     setIsLoading(true);
     try {
       const response = await AxiosPrivate.get(`/personnel`);
       response && setPersonnel({ ...response.data });
+      // set program of personnel for personal data
       if (response?.data?.bcws && response?.data?.emcr) {
         setProgram(Program.ALL);
       } else if (response?.data?.emcr && !response?.data?.bcws) {
         setProgram(Program.EMCR);
       } else if (response?.data?.bcws && !response?.data?.emcr) {
         setProgram(Program.BCWS);
       }
+      const bcwsRecommitment = response?.data?.recommitment?.find((itm: Recommitment) => itm.program === Program.BCWS);
+      const emcrRecommitment = response?.data?.recommitment?.find((itm: Recommitment) => itm.program === Program.EMCR); 
+      // set program of recommitment for recommitment data
+      if (bcwsRecommitment && emcrRecommitment) {
+        setRecommitmentProgram(Program.ALL);
+      } else if (emcrRecommitment && !response?.data?.recommitment.bcws) {
+        setRecommitmentProgram(Program.EMCR);
+      } else if (bcwsRecommitment && !emcrRecommitment) {
+        setRecommitmentProgram(Program.BCWS);
+      }
     } catch (e) {
       console.log(e);
     } finally {
@@ -43,7 +57,7 @@
 
   const updatePersonnel = async (personnel: FormikValues | MemberProfile) => {
     try {
       await AxiosPrivate.patch(encodeURI(`/personnel`), personnel);
 
       setRefetch(!refetch);
     } catch (e) {
@@ -62,6 +76,7 @@
     loading,
     updatePersonnel,
     program,
+    recommitmentProgram
   };
 };
 

frontend/src/pages/profile/MemberProfile.tsx

@@ -18,6 +18,7 @@ const MemberProfile = () => {
   const {
     personnel,
     program,
+    recommitmentProgram,
     loading,
     updatePersonnel,
     openRecommitmentForm,
@@ -120,11 +121,11 @@ const MemberProfile = () => {
           open={openRecommitmentForm}
           onClose={updatePersonnel}
           handleOpen={handleOpenRecommitmentForm}
-          title={`Confirm Recommitment Status for ${program === Program.ALL ? 'BCWS and EMCR' : program.toUpperCase()}`}
+          title={`Confirm Recommitment Status for ${recommitmentProgram === Program.ALL ? 'BCWS and EMCR' : recommitmentProgram?.toUpperCase()}`}
           style={'lg:w-2/3 xl:w-1/2'}
         >
           <RecommitmentFormBase
-            program={program}
+            program={recommitmentProgram}
             personnel={personnel}
             onClose={handleOpenRecommitmentForm}
           />