Merge pull request #1948 from OneCommunityGlobal/Diya_Fix_Reply+WeeklyHours

Diya 🔥 (multiple): ReplyTo on BS assignment & WeeklyHours Display

Author: one-community

src/helpers/reporthelper.js

@@ -170,10 +170,17 @@ const reporthelper = function () {
       result.totalSeconds = [0, 0, 0, 0];
 
       if (!result.timeEntries || result.timeEntries.length === 0) return;
-
+      const isSingleWeekRequest = startWeekIndex === endWeekIndex;
       result.timeEntries.forEach((entry) => {
-        const index =
-          startWeekIndex === endWeekIndex ? 0 : absoluteDifferenceInWeeks(entry.dateOfWork, pstEnd);
+        let index;
+
+        if (isSingleWeekRequest) index = startWeekIndex;
+        else {
+          index =
+            startWeekIndex === endWeekIndex
+              ? 0
+              : absoluteDifferenceInWeeks(entry.dateOfWork, pstEnd);
+        }
 
         if (index >= 0 && index < 4) {
           result.totalSeconds[index] =

src/helpers/userHelper.js

@@ -1341,7 +1341,7 @@ const userHelper = function () {
         ),
         null,
         combinedCCList,
-        DEFAULT_REPLY_TO[0],
+        emailAddress,
         combinedBCCList,
         { type: 'blue_square_assignment' },
       );