Skip to content

Commit f12bb20

Browse files
vedansh-5vedansh-5
committed
rebase
Signed-off-by: Vedansh Saini <[email protected]>
1 parent da7d687 commit f12bb20

File tree

2 files changed

+98
-96
lines changed

2 files changed

+98
-96
lines changed

‎src/scripts/main.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -87,7 +87,7 @@ document.getElementById('refreshCache').addEventListener('click', async (e) => {
8787
// Reload the active tab to re-inject content
8888
chrome.tabs.reload(tabs[0].id);
8989

90-
M.toast({html: 'Data refreshed successfully!', classes: 'green'});
90+
Materialize.toast({html: 'Data refreshed successfully!', classes: 'green'});
9191
} catch (err) {
9292
console.error('Refresh failed:', err);
9393
M.toast({html: 'Failed to refresh data', classes: 'red'});

‎src/scripts/scrumHelper.js

Lines changed: 97 additions & 95 deletions
Original file line numberDiff line numberDiff line change
@@ -49,56 +49,56 @@ function allIncluded(outputTarget = 'email') {
4949
'lastWeekContribution',
5050
'yesterdayContribution',
5151
'userReason',
52-
'githubCache',
52+
'githubCache',
5353
],
5454
(items) => {
55-
console.log("Storage items received:", items);
56-
57-
if (items.lastWeekContribution) {
58-
lastWeekContribution = true;
59-
handleLastWeekContributionChange();
60-
}
61-
if (items.yesterdayContribution) {
62-
yesterdayContribution = true;
63-
handleYesterdayContributionChange();
64-
}
65-
if (!items.enableToggle) {
66-
enableToggle = items.enableToggle;
67-
}
68-
if (items.endingDate && !lastWeekContribution) {
69-
endingDate = items.endingDate;
70-
}
71-
if (items.startingDate && !lastWeekContribution) {
72-
startingDate = items.startingDate;
73-
}
74-
if (items.endingDate && !yesterdayContribution){
75-
endingDate = items.endingDate;
76-
}
77-
if (items.startingDate && !yesterdayContribution){
78-
startingDate = items.startingDate;
79-
}
80-
if (items.githubUsername) {
81-
githubUsername = items.githubUsername;
82-
console.log("About to fetch GitHub data for:", githubUsername);
83-
fetchGithubData();
84-
} else {
85-
if (outputTarget === 'popup') {
86-
console.log("No username found - popup context");
87-
// Show error in popup
88-
const generateBtn = document.getElementById('generateReport');
89-
if (generateBtn) {
90-
generateBtn.innerHTML = '<i class="fa fa-refresh"></i> Generate Report';
91-
generateBtn.disabled = false;
92-
}
93-
Materialize.toast('Please enter your GitHub username', 3000);
94-
} else {
95-
console.log("No username found - email context");
96-
console.warn('No GitHub username found in storage');
97-
}
98-
}
99-
if (items.projectName) {
100-
projectName = items.projectName;
101-
}
55+
console.log("Storage items received:", items);
56+
57+
if (items.lastWeekContribution) {
58+
lastWeekContribution = true;
59+
handleLastWeekContributionChange();
60+
}
61+
if (items.yesterdayContribution) {
62+
yesterdayContribution = true;
63+
handleYesterdayContributionChange();
64+
}
65+
if (!items.enableToggle) {
66+
enableToggle = items.enableToggle;
67+
}
68+
if (items.endingDate && !lastWeekContribution) {
69+
endingDate = items.endingDate;
70+
}
71+
if (items.startingDate && !lastWeekContribution) {
72+
startingDate = items.startingDate;
73+
}
74+
if (items.endingDate && !yesterdayContribution){
75+
endingDate = items.endingDate;
76+
}
77+
if (items.startingDate && !yesterdayContribution){
78+
startingDate = items.startingDate;
79+
}
80+
if (items.githubUsername) {
81+
githubUsername = items.githubUsername;
82+
console.log("About to fetch GitHub data for:", githubUsername);
83+
fetchGithubData();
84+
} else {
85+
if (outputTarget === 'popup') {
86+
console.log("No username found - popup context");
87+
// Show error in popup
88+
const generateBtn = document.getElementById('generateReport');
89+
if (generateBtn) {
90+
generateBtn.innerHTML = '<i class="fa fa-refresh"></i> Generate Report';
91+
generateBtn.disabled = false;
92+
}
93+
Materialize.toast('Please enter your GitHub username', 3000);
94+
} else {
95+
console.log("No username found - email context");
96+
console.warn('No GitHub username found in storage');
97+
}
98+
}
99+
if (items.projectName) {
100+
projectName = items.projectName;
101+
}
102102
if (!items.showOpenLabel) {
103103
showOpenLabel = false;
104104
pr_unmerged_button = '';
@@ -130,14 +130,13 @@ function allIncluded(outputTarget = 'email') {
130130
endingDate = getToday();
131131
startingDate = getLastWeek();
132132
}
133-
function handleYesterdayContributionChange() {
134-
endingDate = getToday();
135-
startingDate = getYesterday();
136-
}
133+
function handleYesterdayContributionChange() {
134+
endingDate = getToday();
135+
startingDate = getYesterday();
136+
}
137137
function getLastWeek() {
138138
let today = new Date();
139-
let noDays_to_goback = gsoc == 0 ? 7 : 1;
140-
let lastWeek = new Date(today.getFullYear(), today.getMonth(), today.getDate() - noDays_to_goback);
139+
let lastWeek = new Date(today.getFullYear(), today.getMonth(), today.getDate() - 7);
141140
let lastWeekMonth = lastWeek.getMonth() + 1;
142141
let lastWeekDay = lastWeek.getDate();
143142
let lastWeekYear = lastWeek.getFullYear();
@@ -149,20 +148,20 @@ function allIncluded(outputTarget = 'email') {
149148
('00' + lastWeekDay.toString()).slice(-2);
150149
return lastWeekDisplayPadded;
151150
}
152-
function getYesterday() {
153-
let today = new Date();
154-
let yesterday = new Date(today.getFullYear(), today.getMonth(), today.getDate() - 1);
155-
let yesterdayMonth = yesterday.getMonth() + 1;
156-
let yesterdayWeekDay = yesterday.getDate();
157-
let yesterdayYear = yesterday.getFullYear();
158-
let yesterdayPadded =
159-
('0000' + yesterdayYear.toString()).slice(-4) +
160-
'-' +
161-
('00' + yesterdayMonth.toString()).slice(-2) +
162-
'-' +
163-
('00' + yesterdayWeekDay.toString()).slice(-2);
164-
return yesterdayPadded;
165-
}
151+
function getYesterday() {
152+
let today = new Date();
153+
let yesterday = new Date(today.getFullYear(), today.getMonth(), today.getDate() - 1);
154+
let yesterdayMonth = yesterday.getMonth() + 1;
155+
let yesterdayDay = yesterday.getDate();
156+
let yesterdayYear = yesterday.getFullYear();
157+
let yesterdayPadded =
158+
('0000' + yesterdayYear.toString()).slice(-4) +
159+
'-' +
160+
('00' + yesterdayMonth.toString()).slice(-2) +
161+
'-' +
162+
('00' + yesterdayDay.toString()).slice(-2);
163+
return yesterdayPadded;
164+
}
166165
function getToday() {
167166
let today = new Date();
168167
let Week = new Date(today.getFullYear(), today.getMonth(), today.getDate());
@@ -261,8 +260,8 @@ function allIncluded(outputTarget = 'email') {
261260
scrumSubject.dispatchEvent(new Event('input', { bubbles: true }));
262261
}
263262
resolve(true);
264-
})
265-
})
263+
});
264+
});
266265
}
267266

268267
async function fetchGithubData() {
@@ -429,7 +428,7 @@ function allIncluded(outputTarget = 'email') {
429428
lastWeekArray = [];
430429
nextWeekArray = [];
431430
reviewedPrsArray = [];
432-
githubPrsReviewDataProccessed = {};
431+
githubPrsReviewDataProcessed = {};
433432

434433
// Update subject
435434
if(!githubCache.subject && scrumSubject) {
@@ -457,24 +456,25 @@ function allIncluded(outputTarget = 'email') {
457456
return;
458457
}
459458
}
460-
setTimeout(() => {
459+
460+
setTimeout(() => {
461461
// Generate content first
462-
let lastWeekUl = '<ul>';
463-
let i;
462+
var lastWeekUl = '<ul>';
463+
var i;
464464
for (i = 0; i < lastWeekArray.length; i++) lastWeekUl += lastWeekArray[i];
465465
for (i = 0; i < reviewedPrsArray.length; i++) lastWeekUl += reviewedPrsArray[i];
466466
lastWeekUl += '</ul>';
467467

468-
let nextWeekUl = '<ul>';
468+
var nextWeekUl = '<ul>';
469469
for (i = 0; i < nextWeekArray.length; i++) nextWeekUl += nextWeekArray[i];
470470
nextWeekUl += '</ul>';
471471

472-
let weekOrDay = gsoc == 1 ? 'yesterday' : 'last week';
473-
let weekOrDay2 = gsoc == 1 ? 'today' : 'this week';
472+
var weekOrDay = lastWeekContribution ? 'last week' : (yesterdayContribution ? 'yesterday' : 'the period');
473+
var weekOrDay2 = lastWeekContribution ? 'this week' : 'today';
474474

475475
// Create the complete content
476476
let content;
477-
if (lastWeekContribution == true || yesterdayContribution == true ) {
477+
if (lastWeekContribution == true || yesterdayContribution == true ) {
478478
content = `<b>1. What did I do ${weekOrDay}?</b><br>
479479
${lastWeekUl}<br>
480480
<b>2. What do I plan to do ${weekOrDay2}?</b><br>
@@ -488,7 +488,8 @@ ${lastWeekUl}<br>
488488
${nextWeekUl}<br>
489489
<b>3. What is blocking me from making progress?</b><br>
490490
${userReason}`;
491-
}
491+
}
492+
492493

493494
if (outputTarget === 'popup') {
494495
const scrumReport = document.getElementById('scrumReport');
@@ -563,8 +564,8 @@ ${userReason}`;
563564
logError('No Github PR review data available');
564565
return;
565566
}
566-
reviewedPrsArray = [];
567-
githubPrsReviewDataProccessed = {};
567+
// reviewedPrsArray = [];
568+
// githubPrsReviewDataProcessed = {};
568569
let i;
569570
for (i = 0; i < items.length; i++) {
570571
let item = items[i];
@@ -574,31 +575,31 @@ ${userReason}`;
574575
let title = item.title;
575576
let number = item.number;
576577
let html_url = item.html_url;
577-
if (!githubPrsReviewDataProccessed[project]) {
578+
if (!githubPrsReviewDataProcessed[project]) {
578579
// first pr in this repo
579-
githubPrsReviewDataProccessed[project] = [];
580+
githubPrsReviewDataProcessed[project] = [];
580581
}
581582
let obj = {
582583
number: number,
583584
html_url: html_url,
584585
title: title,
585586
state: item.state,
586587
};
587-
githubPrsReviewDataProccessed[project].push(obj);
588+
githubPrsReviewDataProcessed[project].push(obj);
588589
}
589-
for (let repo in githubPrsReviewDataProccessed) {
590+
for (let repo in githubPrsReviewDataProcessed) {
590591
let repoLi =
591592
'<li> \
592593
<i>(' +
593594
repo +
594595
')</i> - Reviewed ';
595-
if (githubPrsReviewDataProccessed[repo].length > 1) repoLi += 'PRs - ';
596+
if (githubPrsReviewDataProcessed[repo].length > 1) repoLi += 'PRs - ';
596597
else {
597598
repoLi += 'PR - ';
598599
}
599-
if (githubPrsReviewDataProccessed[repo].length <= 1) {
600-
for (let pr in githubPrsReviewDataProccessed[repo]) {
601-
let pr_arr = githubPrsReviewDataProccessed[repo][pr];
600+
if (githubPrsReviewDataProcessed[repo].length <= 1) {
601+
for (let pr in githubPrsReviewDataProcessed[repo]) {
602+
let pr_arr = githubPrsReviewDataProcessed[repo][pr];
602603
let prText = '';
603604
prText +=
604605
"<a href='" + pr_arr.html_url + "' target='_blank'>#" + pr_arr.number + '</a> (' + pr_arr.title + ') ';
@@ -610,8 +611,8 @@ ${userReason}`;
610611
}
611612
} else {
612613
repoLi += '<ul>';
613-
for (let pr1 in githubPrsReviewDataProccessed[repo]) {
614-
let pr_arr1 = githubPrsReviewDataProccessed[repo][pr1];
614+
for (let pr1 in githubPrsReviewDataProcessed[repo]) {
615+
let pr_arr1 = githubPrsReviewDataProcessed[repo][pr1];
615616
let prText1 = '';
616617
prText1 +=
617618
"<li><a href='" +
@@ -636,11 +637,12 @@ ${userReason}`;
636637
writeScrumBody();
637638
}
638639
function writeGithubIssuesPrs() {
639-
let items = githubIssuesData.items;
640-
lastWeekArray = [];
641-
nextWeekArray = [];
640+
let items = githubIssuesData.items;
641+
lastWeekArray = [];
642+
nextWeekArray = [];
642643
if(!items){
643644
logError('No Github issues data available');
645+
return;
644646
}
645647
for (let i = 0; i < items.length; i++) {
646648
let item = items[i];
@@ -659,7 +661,7 @@ ${userReason}`;
659661
}
660662
} else {
661663
// is a issue
662-
if (item.state === 'open' && item.body.toUpperCase().indexOf('YES') > 0) {
664+
if (item.state === 'open' && item.body?.toUpperCase().indexOf('YES') > 0) {
663665
//probably the author wants to work on this issue!
664666
let li2 =
665667
'<li><i>(' +

0 commit comments

Comments
 (0)