dendi-wang/thingsboard
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #8834 from ChantsovaEkaterina/bug/widget-data-not-loading-for-particular-timewindow-intervals

Browse Source 
Fixed loading widget data for 'previous quarter' and 'previous half year' timewindow intervals
This commit is contained in:
Igor Kulikov 2023-06-28 13:21:03 +03:00 committed by GitHub
commit c1b83cb276
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 9 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
ui-ngx/src/app/shared/models/time/time.models.ts
View File

@ -452,6 +452,15 @@ export const calculateIntervalStartTime = (interval: QuickTimeInterval, currentD
case QuickTimeInterval.PREVIOUS_MONTH: case QuickTimeInterval.PREVIOUS_MONTH:
currentDate.subtract(1, 'months'); currentDate.subtract(1, 'months');
return currentDate.startOf('month'); return currentDate.startOf('month');
case QuickTimeInterval.PREVIOUS_QUARTER:
currentDate.subtract(1, 'quarter');
return currentDate.startOf('quarter');
case QuickTimeInterval.PREVIOUS_HALF_YEAR:
if (currentDate.get('quarter') < 3) {
return currentDate.startOf('year').subtract(2, 'quarters');
} else {
return currentDate.startOf('year');
}
case QuickTimeInterval.PREVIOUS_YEAR: case QuickTimeInterval.PREVIOUS_YEAR:
currentDate.subtract(1, 'years'); currentDate.subtract(1, 'years');
return currentDate.startOf('year'); return currentDate.startOf('year');