@@ -144,6 +144,12 @@ function allIncluded(){
144
144
} ) ;
145
145
}
146
146
147
+ function formatDate ( dateString ) {
148
+ const date = new Date ( dateString ) ;
149
+ const options = { day : '2-digit' , month : 'short' , year : 'numeric' } ;
150
+ return date . toLocaleDateString ( 'en-US' , options ) ;
151
+ }
152
+
147
153
//load initial text in scrum body
148
154
function writeScrumBody ( ) {
149
155
if ( ! enableToggle )
@@ -163,12 +169,22 @@ function allIncluded(){
163
169
nextWeekUl += "</ul>" ;
164
170
var weekOrDay = gsoc == 1 ?"yesterday" :"last week" ;
165
171
var weekOrDay2 = gsoc == 1 ?"today" :"this week" ;
166
- scrumBody . innerHTML = "<b>1. What did I do " + weekOrDay + "?</b>\
172
+ if ( lastWeekContribution == true ) {
173
+ scrumBody . innerHTML = "<b>1. What did I do " + weekOrDay + "?</b>\
174
+ <br>" + lastWeekUl + "<br><br>\
175
+ <b>2. What I plan to do " + weekOrDay2 + "?</b>\
176
+ <br>" + nextWeekUl + "<br><br>\
177
+ <b>3. What is stopping me from doing my work?</b>\
178
+ <p> " + userReason + "</p>" ;
179
+ }
180
+ else {
181
+ scrumBody . innerHTML = "<b>1. What did I do from " + formatDate ( startingDate ) + " to " + formatDate ( endingDate ) + "?</b>\
167
182
<br>" + lastWeekUl + "<br><br>\
168
183
<b>2. What I plan to do " + weekOrDay2 + "?</b>\
169
184
<br>" + nextWeekUl + "<br><br>\
170
185
<b>3. What is stopping me from doing my work?</b>\
171
186
<p> " + userReason + "</p>" ;
187
+ }
172
188
scrumBody . dispatchEvent ( new Event ( "paste" , { bubbles : true } ) ) ;
173
189
} ) ;
174
190
}
0 commit comments