This repository was archived by the owner on Nov 9, 2021. It is now read-only.
File tree Expand file tree Collapse file tree
Expand file tree Collapse file tree Original file line number Diff line number Diff line change @@ -180,7 +180,7 @@ class JiraWorklogs {
180180 fetchUpdatedTasks ( startAt ) {
181181 return new Promise ( ( resolve , reject ) => {
182182 this . sendRequest ( '/search' , 'POST' , {
183- jql : `worklogAuthor = ${ this . userKey } && worklogDate >= startOfWeek() ` ,
183+ jql : `worklogAuthor = ${ this . userKey } && worklogDate >= -1w ` ,
184184 maxResults : 100 ,
185185 fields : [ 'key' , 'summary' , 'project' ]
186186 } )
Original file line number Diff line number Diff line change @@ -155,38 +155,44 @@ class WorklogContainer extends Component {
155155 < TimerContainer />
156156
157157 < Worklogs >
158- { DayList . length !== 0 && (
158+ { this . props . worklogs . length === 0 ? (
159+ < HeadingBar > No worklogs yet</ HeadingBar >
160+ ) : (
159161 < Fragment >
160- < HeadingBar borderBottom >
161- Today
162- </ HeadingBar >
163- < div >
164- { DayList }
165- </ div >
162+ { DayList . length !== 0 && (
163+ < Fragment >
164+ < HeadingBar borderBottom >
165+ Today
166+ </ HeadingBar >
167+ < div >
168+ { DayList }
169+ </ div >
170+ </ Fragment >
171+ ) }
172+
173+ { YesterdayList . length !== 0 && (
174+ < Fragment >
175+ < HeadingBar borderBottom borderTop >
176+ Yesterday
177+ </ HeadingBar >
178+ < div >
179+ { YesterdayList }
180+ </ div >
181+ </ Fragment >
182+ ) }
183+
184+ { WeekList . map ( weekDay => (
185+ < div key = { weekDay . weekIndex } >
186+ < HeadingBar borderBottom borderTop >
187+ { weekDay . label }
188+ </ HeadingBar >
189+ < div >
190+ { weekDay . tasks }
191+ </ div >
192+ </ div >
193+ ) ) }
166194 </ Fragment >
167195 ) }
168-
169- { YesterdayList . length !== 0 && (
170- < Fragment >
171- < HeadingBar borderBottom borderTop >
172- Yesterday
173- </ HeadingBar >
174- < div >
175- { YesterdayList }
176- </ div >
177- </ Fragment >
178- ) }
179-
180- { WeekList . map ( weekDay => (
181- < div key = { weekDay . weekIndex } >
182- < HeadingBar borderBottom borderTop >
183- { weekDay . label }
184- </ HeadingBar >
185- < div >
186- { weekDay . tasks }
187- </ div >
188- </ div >
189- ) ) }
190196 </ Worklogs >
191197
192198 < FooterContainer >
You can’t perform that action at this time.
0 commit comments