Skip to content

Commit 8232103

Browse files
committed
removed gsoc selector
Signed-off-by: Vedansh Saini <[email protected]>
1 parent 979f817 commit 8232103

File tree

2 files changed

+17
-23
lines changed

2 files changed

+17
-23
lines changed

src/scripts/popup.js

Lines changed: 6 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -51,20 +51,17 @@ document.addEventListener('DOMContentLoaded', function() {
5151
})
5252
})
5353

54-
let selectedRadio = null;
5554
function toggleRadio(radio){
5655
const startDateInput = document.getElementById('startingDate');
5756
const endDateInput = document.getElementById('endingDate');
5857

5958

60-
if(selectedRadio === radio) {
61-
radio.checked = false;
62-
selectedRadio = null;
63-
startDateInput.disabled = false;
64-
endDateInput.disabled = false;
59+
if(radio.id === 'lastWeekContribution'){
60+
startDateInput.value = getLastWeek();
61+
endDateInput.value = getToday();
6562
} else {
66-
selectedRadio = radio;
67-
startDateInput.disabled = true;
68-
endDateInput.disabled = true;
63+
startDateInput.value = getYesterday();
64+
endDateInput.value = getToday();
6965
}
66+
startDateInput.disabled = endDateInput.disabled = true;
7067
}

src/scripts/scrumHelper.js

Lines changed: 11 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,6 @@ function allIncluded(outputTarget = 'email') {
2121
var showOpenLabel = true;
2222
var showClosedLabel = true;
2323
var userReason = '';
24-
var gsoc = 0; //0 means codeheat. 1 means gsoc
2524

2625
var pr_merged_button =
2726
'<div style="vertical-align:middle;display: inline-block;padding: 0px 4px;font-size:9px;font-weight: 600;color: #fff;text-align: center;background-color: #6f42c1;border-radius: 3px;line-height: 12px;margin-bottom: 2px;" class="State State--purple">closed</div>';
@@ -47,15 +46,8 @@ function allIncluded(outputTarget = 'email') {
4746
'lastWeekContribution',
4847
'yesterday',
4948
'userReason',
50-
'gsoc',
5149
],
5250
(items) => {
53-
if (items.gsoc) {
54-
//gsoc
55-
gsoc = 1;
56-
} else {
57-
gsoc = 0; //codeheat
58-
}
5951
if (items.lastWeekContribution) {
6052
lastWeekContribution = true;
6153
handleLastWeekContributionChange();
@@ -123,8 +115,7 @@ function allIncluded(outputTarget = 'email') {
123115
}
124116
function getLastWeek() {
125117
var today = new Date();
126-
var noDays_to_goback = gsoc == 0 ? 7 : 1;
127-
var lastWeek = new Date(today.getFullYear(), today.getMonth(), today.getDate() - noDays_to_goback);
118+
var lastWeek = new Date(today.getFullYear(), today.getMonth(), today.getDate() - 7);
128119
var lastWeekMonth = lastWeek.getMonth() + 1;
129120
var lastWeekDay = lastWeek.getDate();
130121
var lastWeekYear = lastWeek.getFullYear();
@@ -152,8 +143,7 @@ function allIncluded(outputTarget = 'email') {
152143
}
153144
function getYesterday() {
154145
var today = new Date();
155-
var noDays_to_goback = 1;
156-
var yesterday = new Date(today.getFullYear(), today.getMonth(), today.getDate() - noDays_to_goback);
146+
var yesterday = new Date(today.getFullYear(), today.getMonth(), today.getDate() - 1);
157147
var yesterdayMonth = yesterday.getMonth() + 1;
158148
var yesterdayDay = yesterday.getDate();
159149
var yesterdayYear = yesterday.getFullYear();
@@ -249,8 +239,15 @@ function allIncluded(outputTarget = 'email') {
249239
for (i = 0; i < nextWeekArray.length; i++) nextWeekUl += nextWeekArray[i];
250240
nextWeekUl += '</ul>';
251241

252-
var weekOrDay = gsoc == 1 ? 'yesterday' : 'last week';
253-
var weekOrDay2 = gsoc == 1 ? 'today' : 'this week';
242+
var weekOrDay;
243+
var weekOrDay2;
244+
if(document.getElementById('lastWeekContribution').checked){
245+
weekOrDay = 'last week';
246+
weekOrDay2 = 'this week'
247+
} else if(document.getElementById('yesterday').checked) {
248+
weekOrDay = 'yesterday'
249+
weekOrDay2 = 'today'
250+
}
254251

255252
// Create the complete content
256253
let content;

0 commit comments

Comments
 (0)