Handle sorting by PDL when the PDL for the report period is not the current PDL.

Author: ocielliottc

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

@@ -49,7 +49,38 @@ const TeamMemberMap = ({ members, closed, planned, reportDate }) => {
     }
   };
 
-  const sortByPDLName = (a, b) => sortByName(pdls[a.pdlId], pdls[b.pdlId]);
+  const sortByPDLName = (a, b) =>
+          sortByName(pdls[a.reportDatePDLId], pdls[b.reportDatePDLId]);
+
+  // We're going to cache the checkins into the member data structures so that
+  // we can properly sort by PDL when the PDL, in the past, is different than
+  // the current PDL.
+  const { startOfQuarter, endOfQuarter } = getQuarterBeginEndWithGrace(reportDate);
+  members.map(member => {
+    const checkins = selectCheckinsForMember(
+      state,
+      member.id,
+    ).filter(checkin => closed || !checkin.completed)
+     .filter(checkin => planned || isPastCheckin(checkin));
+    member.checkins = checkins;
+
+    // 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.
+    member.reportDatePDLId = member.pdlId;
+    if (checkins.length > 0) {
+      checkins.sort((a, b) => getCheckinDate(b) - getCheckinDate(a));
+
+      for(let checkin of checkins) {
+        const checkinDate = getCheckinDate(checkin);
+        if (checkinDate >= startOfQuarter && checkinDate <= endOfQuarter) {
+          member.reportDatePDLId = checkin.pdlId;
+          break;
+        }
+      }
+    }
+  });
 
   members.sort(sortBy == SortOption.BY_MEMBER ? sortByName : sortByPDLName);
 
@@ -72,30 +103,8 @@ const TeamMemberMap = ({ members, closed, planned, reportDate }) => {
       </Box>
       {
         members.map(member => {
-          let pdl = pdls[member.pdlId];
-          const checkins = selectCheckinsForMember(
-            state,
-            member.id,
-          ).filter(checkin => closed || !checkin.completed)
-           .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));
-            }
-          }
+          const pdl = pdls[member.reportDatePDLId];
+          const checkins = member.checkins;
 
           return (
             <Accordion