@@ -21,7 +21,6 @@ function allIncluded(outputTarget = 'email') {
21
21
var showOpenLabel = true ;
22
22
var showClosedLabel = true ;
23
23
var userReason = '' ;
24
- var gsoc = 0 ; //0 means codeheat. 1 means gsoc
25
24
26
25
var pr_merged_button =
27
26
'<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') {
47
46
'lastWeekContribution' ,
48
47
'yesterday' ,
49
48
'userReason' ,
50
- 'gsoc' ,
51
49
] ,
52
50
( items ) => {
53
- if ( items . gsoc ) {
54
- //gsoc
55
- gsoc = 1 ;
56
- } else {
57
- gsoc = 0 ; //codeheat
58
- }
59
51
if ( items . lastWeekContribution ) {
60
52
lastWeekContribution = true ;
61
53
handleLastWeekContributionChange ( ) ;
@@ -123,8 +115,7 @@ function allIncluded(outputTarget = 'email') {
123
115
}
124
116
function getLastWeek ( ) {
125
117
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 ) ;
128
119
var lastWeekMonth = lastWeek . getMonth ( ) + 1 ;
129
120
var lastWeekDay = lastWeek . getDate ( ) ;
130
121
var lastWeekYear = lastWeek . getFullYear ( ) ;
@@ -152,8 +143,7 @@ function allIncluded(outputTarget = 'email') {
152
143
}
153
144
function getYesterday ( ) {
154
145
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 ) ;
157
147
var yesterdayMonth = yesterday . getMonth ( ) + 1 ;
158
148
var yesterdayDay = yesterday . getDate ( ) ;
159
149
var yesterdayYear = yesterday . getFullYear ( ) ;
@@ -249,8 +239,15 @@ function allIncluded(outputTarget = 'email') {
249
239
for ( i = 0 ; i < nextWeekArray . length ; i ++ ) nextWeekUl += nextWeekArray [ i ] ;
250
240
nextWeekUl += '</ul>' ;
251
241
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
+ }
254
251
255
252
// Create the complete content
256
253
let content ;
0 commit comments