Merge pull request #940 from OneCommunityGlobal/development

Backend Release to Main [1.72]
OneCommunityGlobal · May 6, 2024 · 36b3d8c · 36b3d8c
2 parents 04c98fa + 471882e
commit 36b3d8c
Showing 1 changed file with 12 additions and 5 deletions.
diff --git a/src/helpers/userHelper.js b/src/helpers/userHelper.js
@@ -121,11 +121,15 @@ const userHelper = function () {
     // bold description for 'not submitting a weekly summary' and logged hrs
     let emailDescription = requestForTimeOffEmailBody;
     if (!requestForTimeOffEmailBody && infringement.description) {
-      emailDescription = infringement.description.replace(
-        /(not submitting a weekly summary)/gi,
-        '<b>$1</b>',
-      );
-      emailDescription = emailDescription.replace(/(\d+\.\d{2})\s*hours/i, '<b>$1 hours</b>');
+      if (infringement.description.includes('not submitting a weekly summary')) {
+        emailDescription = infringement.description.replace(
+          /(not submitting a weekly summary)/gi,
+          '<b>$1</b>',
+        );
+        emailDescription = emailDescription.replace(/(\d+\.\d{2})\s*hours/i, '<b>$1 hours</b>');
+      } else {
+        emailDescription = `<b>${infringement.description}<b>`;
+      }
     }
     // add administrative content
     const text = `Dear <b>${firstName} ${lastName}</b>,
@@ -1030,6 +1034,9 @@ const userHelper = function () {
           lastName,
           element,
           totalInfringements,
+          undefined,
+          undefined,
+          undefined,
           administrativeContent,
         ),
         null,