Merge branch 'master' into issue-label

Author: Preeti9764

src/scripts/scrumHelper.js

@@ -937,7 +937,7 @@ ${userReason}`;
                     let prText = '';
                     prText +=
                         "<a href='" + pr_arr.html_url + "' target='_blank'>#" + pr_arr.number + '</a> (' + pr_arr.title + ') ';
-                    if (pr_arr.state === 'open') prText += issue_opened_button;
+                    if (showOpenLabel && pr_arr.state === 'open') prText += issue_opened_button;
                     // Do not show closed label for reviewed PRs
                     prText += '&nbsp;&nbsp;';
                     repoLi += prText;
@@ -955,7 +955,7 @@ ${userReason}`;
                         '</a> (' +
                         pr_arr1.title +
                         ') ';
-                    if (pr_arr1.state === 'open') prText1 += issue_opened_button;
+                    if (showOpenLabel && pr_arr1.state === 'open') prText1 += issue_opened_button;
                     // Do not show closed label for reviewed PRs
                     prText1 += '&nbsp;&nbsp;</li>';
                     repoLi += prText1;
@@ -1087,9 +1087,9 @@ ${userReason}`;
                 } else { }
                 const prAction = isNewPR ? 'Made PR' : 'Existing PR';
                 if (isDraft) {
-                    li = `<li><i>(${project})</i> - Made PR (#${number}) - <a href='${html_url}'>${title}</a> ${pr_draft_button}</li>`;
+                    li = `<li><i>(${project})</i> - Made PR (#${number}) - <a href='${html_url}'>${title}</a>${showOpenLabel ? ' ' + pr_draft_button : ''}</li>`;
                 } else if (item.state === 'open') {
-                    li = `<li><i>(${project})</i> - ${prAction} (#${number}) - <a href='${html_url}'>${title}</a> ${pr_open_button}`;
+                    li = `<li><i>(${project})</i> - ${prAction} (#${number}) - <a href='${html_url}'>${title}</a>${showOpenLabel ? ' ' + pr_open_button : ''}`;
                     if (showCommits && item._allCommits && item._allCommits.length && !isNewPR) {
                         log(`[PR DEBUG] Rendering commits for existing PR #${number}:`, item._allCommits);
                         item._allCommits.forEach(commit => {
@@ -1106,9 +1106,9 @@ ${userReason}`;
                         merged = mergedStatusResults[`${owner}/${repo}#${number}`];
                     }
                     if (merged === true) {
-                        li = `<li><i>(${project})</i> - Made PR (#${number}) - <a href='${html_url}'>${title}</a> ${pr_merged_button}</li>`;
+                        li = `<li><i>(${project})</i> - Made PR (#${number}) - <a href='${html_url}'>${title}</a>${showOpenLabel ? ' ' + pr_merged_button : ''}</li>`;
                     } else {
-                        li = `<li><i>(${project})</i> - Made PR (#${number}) - <a href='${html_url}'>${title}</a> ${pr_closed_button}</li>`;
+                        li = `<li><i>(${project})</i> - Made PR (#${number}) - <a href='${html_url}'>${title}</a>${showOpenLabel ? ' ' + pr_closed_button : ''}</li>`;
                     }
                 }
                 lastWeekArray.push(li);
@@ -1125,15 +1125,15 @@ ${userReason}`;
                         html_url +
                         "' target='_blank'>" +
                         title +
-                        '</a> ' +
-                        issue_opened_button +
+                        '</a>' + (showOpenLabel ? ' ' + issue_opened_button : '') +
                         '&nbsp;&nbsp;</li>';
                     nextWeekArray.push(li2);
                 }
                 if (item.state === 'open') {
-                    li = `<li><i>(${project})</i> - Opened Issue(#${number}) - <a href='${html_url}'>${title}</a> ${issue_opened_button}</li>`;
+                    li = `<li><i>(${project})</i> - Opened Issue(#${number}) - <a href='${html_url}'>${title}</a>${showOpenLabel ? ' ' + issue_opened_button : ''}</li>`;
                 } else if (item.state === 'closed') {
 
+
                     // Use state_reason to distinguish closure reason
                     if (item.state_reason === 'completed') {
                         li = `<li><i>(${project})</i> - Opened Issue(#${number}) - <a href='${html_url}'>${title}</a> ${issue_closed_completed_button}</li>`;
@@ -1143,6 +1143,7 @@ ${userReason}`;
                         li = `<li><i>(${project})</i> - Opened Issue(#${number}) - <a href='${html_url}'>${title}</a> ${issue_closed_button}</li>`;
                     }
 
+
                 } else {
                     li =
                         '<li><i>(' +