Account for a PDL being different in the past from the current PDL.

Author: ocielliottc

web-ui/src/components/reports-section/checkin-report/TeamMemberMap.jsx

@@ -11,11 +11,11 @@ import {
 import ExpandMoreIcon from '@mui/icons-material/ExpandMore';
 import { getAvatarURL } from '../../../api/api.js';
 import { AppContext } from '../../../context/AppContext.jsx';
+import { selectCheckinsForMember } from '../../../context/selectors.js';
 import {
-  selectCheckinsForMember,
-  pastCheckin,
-} from '../../../context/selectors.js';
-import {
+  isPastCheckin,
+  getCheckinDate,
+  getQuarterBeginEndWithGrace,
   getCheckinDateForPeriod,
   getLastCheckinDate,
   statusForPeriodByMemberScheduling
@@ -72,12 +72,30 @@ const TeamMemberMap = ({ members, closed, planned, reportDate }) => {
       </Box>
       {
         members.map(member => {
-          const pdl = pdls[member.pdlId];
+          let pdl = pdls[member.pdlId];
           const checkins = selectCheckinsForMember(
             state,
             member.id,
           ).filter(checkin => closed || !checkin.completed)
-           .filter(checkin => planned || pastCheckin(checkin));
+           .filter(checkin => planned || isPastCheckin(checkin));
+
+          // If there are checkins, we're going to sort them with the latest
+          // first.  Since the member's PDL could have changed since the last
+          // checkin, we are going to use the PDL id of the checkin instead
+          // of the current PDL.  They may be the same, but again they may not.
+          if (checkins.length > 0) {
+            checkins.sort((a, b) => getCheckinDate(b) - getCheckinDate(a));
+            const latest = checkins[0];
+            const { startOfQuarter, endOfQuarter } =
+                                      getQuarterBeginEndWithGrace(reportDate);
+            const checkinDate = getCheckinDate(latest);
+            if (checkinDate >= startOfQuarter && checkinDate <= endOfQuarter) {
+              console.log(member.firstName);
+              console.log("Current PDL: " + JSON.stringify(pdl));
+              pdl = pdls[checkins[0].pdlId];
+              console.log("PDL at the time: " + JSON.stringify(pdl));
+            }
+          }
 
           return (
             <Accordion

web-ui/src/components/reports-section/checkin-report/checkin-utils.js

@@ -28,6 +28,21 @@ export const getLastCheckinDate = checkins => {
   }, new Date(0));
 };
 
+/**
+ * Get the dates the reporting period including a grace period.
+ * @param {Date} reportDate - The date of the report.
+ * @returns {{ startOfQuarter: Date, endOfQuarter: Date }} The start and end dates of the quarter pluas a grace period.
+ */
+export const getQuarterBeginEndWithGrace = (reportDate) => {
+  const { startOfQuarter, endOfQuarter } = getQuarterBeginEnd(reportDate);
+  const endOfQuarterWithGrace = new Date(endOfQuarter);
+  endOfQuarterWithGrace.setDate(endOfQuarter.getDate() + 30);
+  return {
+    startOfQuarter: startOfQuarter,
+    endOfQuarter: endOfQuarterWithGrace
+  };
+};
+
 /**
  * Get the date of the last scheduled check-in for the reporting period.
  * Include the grace period for the end of the quarter.
@@ -36,13 +51,11 @@ export const getLastCheckinDate = checkins => {
  * @returns {Date} The date of the last scheduled check-in.
  */
 export const getCheckinDateForPeriod = (checkins, reportDate) => {
-  const { startOfQuarter, endOfQuarter } = getQuarterBeginEnd(reportDate);
-  const endOfQuarterWithGrace = new Date(endOfQuarter);
-  endOfQuarterWithGrace.setDate(endOfQuarter.getDate() + 30);
+  const { startOfQuarter, endOfQuarter } = getQuarterBeginEndWithGrace(reportDate);
   const scheduled = checkins.filter(checkin => {
     const checkinDate = getCheckinDate(checkin);
     return (
-      checkinDate >= startOfQuarter && checkinDate <= endOfQuarterWithGrace // Include grace period
+      checkinDate >= startOfQuarter && checkinDate <= endOfQuarter // Include grace period
     );
   });
   return getLastCheckinDate(scheduled);
@@ -74,3 +87,11 @@ export const statusForPeriodByMemberScheduling = (
   if (completed.length === scheduled.length) return 'Completed';
   return 'Scheduled';
 };
+
+/**
+ * Returns true if the checkin was in the past.
+ * @param {Checkin} checkin - A check-in.
+ * @returns {bool} Status of boolean check.
+ */
+export const isPastCheckin = (checkin) => Date.now() >= getCheckinDate(checkin).getTime();
+

web-ui/src/context/selectors.js

@@ -610,7 +610,7 @@ const getCheckinDate = checkin => {
   return new Date(year, month - 1, day, hour, minute, 0);
 };
 
-export const pastCheckin = checkin => Date.now() >= getCheckinDate(checkin).getTime();
+const pastCheckin = checkin => Date.now() >= getCheckinDate(checkin).getTime();
 
 export const selectFilteredCheckinsForTeamMemberAndPDL = createSelector(
   selectCheckinsForTeamMemberAndPDL,