Skip to content

Commit e0b80f8

Browse files
committed
fixed twice activities
1 parent dcf9a1a commit e0b80f8

File tree

1 file changed

+36
-33
lines changed

1 file changed

+36
-33
lines changed

src/scripts/scrumHelper.js

Lines changed: 36 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -904,6 +904,7 @@ ${userReason}`;
904904
isDraft = item.draft;
905905
}
906906
if (item.pull_request) {
907+
// Only add PRs, skip issue logic
907908
if (isDraft) {
908909
li = `<li><i>(${project})</i> - Made PR (#${number}) - <a href='${html_url}'>${title}</a> ${pr_draft_button}</li>`;
909910
} else if (item.state === 'open') {
@@ -924,42 +925,44 @@ ${userReason}`;
924925
}
925926
}
926927
lastWeekArray.push(li);
927-
continue; // Prevent issue logic from overwriting PR li
928+
continue; // Prevent issue logic from running for PRs
928929
}
929930
// Only process as issue if not a PR
930-
if (item.state === 'open' && item.body?.toUpperCase().indexOf('YES') > 0) {
931-
let li2 =
932-
'<li><i>(' +
933-
project +
934-
')</i> - Work on Issue(#' +
935-
number +
936-
") - <a href='" +
937-
html_url +
938-
"' target='_blank'>" +
939-
title +
940-
'</a> ' +
941-
issue_opened_button +
942-
'&nbsp;&nbsp;</li>';
943-
nextWeekArray.push(li2);
944-
}
945-
if (item.state === 'open') {
946-
li = `<li><i>(${project})</i> - Opened Issue(#${number}) - <a href='${html_url}'>${title}</a> ${issue_opened_button}</li>`;
947-
} else if (item.state === 'closed') {
948-
// Always show closed label for closed issues
949-
li = `<li><i>(${project})</i> - Opened Issue(#${number}) - <a href='${html_url}'>${title}</a> ${issue_closed_button}</li>`;
950-
} else {
951-
li =
952-
'<li><i>(' +
953-
project +
954-
')</i> - Opened Issue(#' +
955-
number +
956-
") - <a href='" +
957-
html_url +
958-
"' target='_blank'>" +
959-
title +
960-
'</a> </li>';
931+
if (!item.pull_request) {
932+
if (item.state === 'open' && item.body?.toUpperCase().indexOf('YES') > 0) {
933+
let li2 =
934+
'<li><i>(' +
935+
project +
936+
')</i> - Work on Issue(#' +
937+
number +
938+
") - <a href='" +
939+
html_url +
940+
"' target='_blank'>" +
941+
title +
942+
'</a> ' +
943+
issue_opened_button +
944+
'&nbsp;&nbsp;</li>';
945+
nextWeekArray.push(li2);
946+
}
947+
if (item.state === 'open') {
948+
li = `<li><i>(${project})</i> - Opened Issue(#${number}) - <a href='${html_url}'>${title}</a> ${issue_opened_button}</li>`;
949+
} else if (item.state === 'closed') {
950+
// Always show closed label for closed issues
951+
li = `<li><i>(${project})</i> - Opened Issue(#${number}) - <a href='${html_url}'>${title}</a> ${issue_closed_button}</li>`;
952+
} else {
953+
li =
954+
'<li><i>(' +
955+
project +
956+
')</i> - Opened Issue(#' +
957+
number +
958+
") - <a href='" +
959+
html_url +
960+
"' target='_blank'>" +
961+
title +
962+
'</a> </li>';
963+
}
964+
lastWeekArray.push(li);
961965
}
962-
lastWeekArray.push(li);
963966
}
964967
issuesDataProcessed = true;
965968
triggerScrumGeneration();

0 commit comments

Comments
 (0)