简柏林 / thingskit · Commits

Commit 8f8613db99c26f639f011e672fc11e23257375e5

Authored by Vladyslav_Prykhodko
1 parent 0ebbee02

UI: Refactoring; Add current hour

Inline Side-by-side
Showing 3 changed files with 28 additions and 17 deletions
@@ -50,7 +50,7 @@ export class QuickTimeIntervalComponent implements OnInit, ControlValueAccessor @@ -50,7 +50,7 @@ export class QuickTimeIntervalComponent implements OnInit, ControlValueAccessor
50 50
51 get intervals() { 51 get intervals() {
52 if (this.onlyCurrentInterval) { 52 if (this.onlyCurrentInterval) {
53 - return this.allIntervals.filter(interval => interval.startsWith('TODAY') || interval.startsWith('CURRENT_')); 53 + return this.allIntervals.filter(interval => interval.startsWith('CURRENT_'));
54 } 54 }
55 return this.allIntervals; 55 return this.allIntervals;
56 } 56 }
@@ -131,8 +131,9 @@ export enum QuickTimeInterval { @@ -131,8 +131,9 @@ export enum QuickTimeInterval {
131 PREVIOUS_WEEK = 'PREVIOUS_WEEK', 131 PREVIOUS_WEEK = 'PREVIOUS_WEEK',
132 PREVIOUS_MONTH = 'PREVIOUS_MONTH', 132 PREVIOUS_MONTH = 'PREVIOUS_MONTH',
133 PREVIOUS_YEAR = 'PREVIOUS_YEAR', 133 PREVIOUS_YEAR = 'PREVIOUS_YEAR',
134 - TODAY = 'TODAY',  
135 - TODAY_SO_FAR = 'TODAY_SO_FAR', 134 + CURRENT_HOUR = 'CURRENT_HOUR',
  135 + CURRENT_DAY = 'CURRENT_DAY',
  136 + CURRENT_DAY_SO_FAR = 'CURRENT_DAY_SO_FAR',
136 CURRENT_WEEK = 'CURRENT_WEEK', 137 CURRENT_WEEK = 'CURRENT_WEEK',
137 CURRENT_WEEK_SO_FAR = 'CURRENT_WEEK_SO_WAR', 138 CURRENT_WEEK_SO_FAR = 'CURRENT_WEEK_SO_WAR',
138 CURRENT_MONTH = 'CURRENT_MONTH', 139 CURRENT_MONTH = 'CURRENT_MONTH',
@@ -148,8 +149,9 @@ export const QuickTimeIntervalTranslationMap = new Map<QuickTimeInterval, string @@ -148,8 +149,9 @@ export const QuickTimeIntervalTranslationMap = new Map<QuickTimeInterval, string
148 [QuickTimeInterval.PREVIOUS_WEEK, 'timeinterval.predefined.previous-week'], 149 [QuickTimeInterval.PREVIOUS_WEEK, 'timeinterval.predefined.previous-week'],
149 [QuickTimeInterval.PREVIOUS_MONTH, 'timeinterval.predefined.previous-month'], 150 [QuickTimeInterval.PREVIOUS_MONTH, 'timeinterval.predefined.previous-month'],
150 [QuickTimeInterval.PREVIOUS_YEAR, 'timeinterval.predefined.previous-year'], 151 [QuickTimeInterval.PREVIOUS_YEAR, 'timeinterval.predefined.previous-year'],
151 - [QuickTimeInterval.TODAY, 'timeinterval.predefined.today'],  
152 - [QuickTimeInterval.TODAY_SO_FAR, 'timeinterval.predefined.today-so-far'], 152 + [QuickTimeInterval.CURRENT_HOUR, 'timeinterval.predefined.current-hour'],
  153 + [QuickTimeInterval.CURRENT_DAY, 'timeinterval.predefined.current-day'],
  154 + [QuickTimeInterval.CURRENT_DAY_SO_FAR, 'timeinterval.predefined.current-day-so-far'],
153 [QuickTimeInterval.CURRENT_WEEK, 'timeinterval.predefined.current-week'], 155 [QuickTimeInterval.CURRENT_WEEK, 'timeinterval.predefined.current-week'],
154 [QuickTimeInterval.CURRENT_WEEK_SO_FAR, 'timeinterval.predefined.current-week-so-far'], 156 [QuickTimeInterval.CURRENT_WEEK_SO_FAR, 'timeinterval.predefined.current-week-so-far'],
155 [QuickTimeInterval.CURRENT_MONTH, 'timeinterval.predefined.current-month'], 157 [QuickTimeInterval.CURRENT_MONTH, 'timeinterval.predefined.current-month'],
@@ -181,7 +183,7 @@ export function defaultTimewindow(timeService: TimeService): Timewindow { @@ -181,7 +183,7 @@ export function defaultTimewindow(timeService: TimeService): Timewindow {
181 realtimeType: RealtimeWindowType.LAST_INTERVAL, 183 realtimeType: RealtimeWindowType.LAST_INTERVAL,
182 interval: SECOND, 184 interval: SECOND,
183 timewindowMs: MINUTE, 185 timewindowMs: MINUTE,
184 - quickInterval: QuickTimeInterval.TODAY 186 + quickInterval: QuickTimeInterval.CURRENT_DAY
185 }, 187 },
186 history: { 188 history: {
187 historyType: HistoryWindowType.LAST_INTERVAL, 189 historyType: HistoryWindowType.LAST_INTERVAL,
@@ -191,7 +193,7 @@ export function defaultTimewindow(timeService: TimeService): Timewindow { @@ -191,7 +193,7 @@ export function defaultTimewindow(timeService: TimeService): Timewindow {
191 startTimeMs: currentTime - DAY, 193 startTimeMs: currentTime - DAY,
192 endTimeMs: currentTime 194 endTimeMs: currentTime
193 }, 195 },
194 - quickInterval: QuickTimeInterval.TODAY 196 + quickInterval: QuickTimeInterval.CURRENT_DAY
195 }, 197 },
196 aggregation: { 198 aggregation: {
197 type: AggregationType.AVG, 199 type: AggregationType.AVG,
@@ -405,8 +407,10 @@ export function createSubscriptionTimewindow(timewindow: Timewindow, stDiff: num @@ -405,8 +407,10 @@ export function createSubscriptionTimewindow(timewindow: Timewindow, stDiff: num
405 function getSubscriptionRealtimeWindowFromTimeInterval(interval: QuickTimeInterval): number { 407 function getSubscriptionRealtimeWindowFromTimeInterval(interval: QuickTimeInterval): number {
406 const currentDate = moment(); 408 const currentDate = moment();
407 switch (interval) { 409 switch (interval) {
408 - case QuickTimeInterval.TODAY:  
409 - case QuickTimeInterval.TODAY_SO_FAR: 410 + case QuickTimeInterval.CURRENT_HOUR:
  411 + return currentDate.diff(currentDate.clone().startOf('hour'))
  412 + case QuickTimeInterval.CURRENT_DAY:
  413 + case QuickTimeInterval.CURRENT_DAY_SO_FAR:
410 return currentDate.diff(currentDate.clone().startOf('day')); 414 return currentDate.diff(currentDate.clone().startOf('day'));
411 case QuickTimeInterval.CURRENT_WEEK: 415 case QuickTimeInterval.CURRENT_WEEK:
412 case QuickTimeInterval.CURRENT_WEEK_SO_FAR: 416 case QuickTimeInterval.CURRENT_WEEK_SO_FAR:
@@ -441,7 +445,9 @@ export function calculateIntervalEndTime(interval: QuickTimeInterval, endTs = 0, @@ -441,7 +445,9 @@ export function calculateIntervalEndTime(interval: QuickTimeInterval, endTs = 0,
441 case QuickTimeInterval.PREVIOUS_YEAR: 445 case QuickTimeInterval.PREVIOUS_YEAR:
442 currentDate.subtract(1, 'years'); 446 currentDate.subtract(1, 'years');
443 return currentDate.endOf('year').valueOf(); 447 return currentDate.endOf('year').valueOf();
444 - case QuickTimeInterval.TODAY: 448 + case QuickTimeInterval.CURRENT_HOUR:
  449 + return currentDate.endOf('hour').valueOf();
  450 + case QuickTimeInterval.CURRENT_DAY:
445 return currentDate.endOf('day').valueOf(); 451 return currentDate.endOf('day').valueOf();
446 case QuickTimeInterval.CURRENT_WEEK: 452 case QuickTimeInterval.CURRENT_WEEK:
447 return currentDate.endOf('week').valueOf(); 453 return currentDate.endOf('week').valueOf();
@@ -449,7 +455,7 @@ export function calculateIntervalEndTime(interval: QuickTimeInterval, endTs = 0, @@ -449,7 +455,7 @@ export function calculateIntervalEndTime(interval: QuickTimeInterval, endTs = 0,
449 return currentDate.endOf('month').valueOf(); 455 return currentDate.endOf('month').valueOf();
450 case QuickTimeInterval.CURRENT_YEAR: 456 case QuickTimeInterval.CURRENT_YEAR:
451 return currentDate.endOf('year').valueOf(); 457 return currentDate.endOf('year').valueOf();
452 - case QuickTimeInterval.TODAY_SO_FAR: 458 + case QuickTimeInterval.CURRENT_DAY_SO_FAR:
453 case QuickTimeInterval.CURRENT_WEEK_SO_FAR: 459 case QuickTimeInterval.CURRENT_WEEK_SO_FAR:
454 case QuickTimeInterval.CURRENT_MONTH_SO_FAR: 460 case QuickTimeInterval.CURRENT_MONTH_SO_FAR:
455 case QuickTimeInterval.CURRENT_YEAR_SO_FAR: 461 case QuickTimeInterval.CURRENT_YEAR_SO_FAR:
@@ -480,8 +486,10 @@ export function calculateIntervalStartTime(interval: QuickTimeInterval, startTS @@ -480,8 +486,10 @@ export function calculateIntervalStartTime(interval: QuickTimeInterval, startTS
480 case QuickTimeInterval.PREVIOUS_YEAR: 486 case QuickTimeInterval.PREVIOUS_YEAR:
481 currentDate.subtract(1, 'years'); 487 currentDate.subtract(1, 'years');
482 return currentDate.startOf('year').valueOf(); 488 return currentDate.startOf('year').valueOf();
483 - case QuickTimeInterval.TODAY:  
484 - case QuickTimeInterval.TODAY_SO_FAR: 489 + case QuickTimeInterval.CURRENT_HOUR:
  490 + return currentDate.startOf('hour').valueOf();
  491 + case QuickTimeInterval.CURRENT_DAY:
  492 + case QuickTimeInterval.CURRENT_DAY_SO_FAR:
485 return currentDate.startOf('day').valueOf(); 493 return currentDate.startOf('day').valueOf();
486 case QuickTimeInterval.CURRENT_WEEK: 494 case QuickTimeInterval.CURRENT_WEEK:
487 case QuickTimeInterval.CURRENT_WEEK_SO_FAR: 495 case QuickTimeInterval.CURRENT_WEEK_SO_FAR:
@@ -499,11 +507,13 @@ export function calculateIntervalStartTime(interval: QuickTimeInterval, startTS @@ -499,11 +507,13 @@ export function calculateIntervalStartTime(interval: QuickTimeInterval, startTS
499 507
500 export function quickTimeIntervalPeriod(interval: QuickTimeInterval): number { 508 export function quickTimeIntervalPeriod(interval: QuickTimeInterval): number {
501 switch (interval) { 509 switch (interval) {
  510 + case QuickTimeInterval.CURRENT_HOUR:
  511 + return HOUR;
502 case QuickTimeInterval.YESTERDAY: 512 case QuickTimeInterval.YESTERDAY:
503 case QuickTimeInterval.DAY_BEFORE_YESTERDAY: 513 case QuickTimeInterval.DAY_BEFORE_YESTERDAY:
504 case QuickTimeInterval.THIS_DAY_LAST_WEEK: 514 case QuickTimeInterval.THIS_DAY_LAST_WEEK:
505 - case QuickTimeInterval.TODAY:  
506 - case QuickTimeInterval.TODAY_SO_FAR: 515 + case QuickTimeInterval.CURRENT_DAY:
  516 + case QuickTimeInterval.CURRENT_DAY_SO_FAR:
507 return DAY; 517 return DAY;
508 case QuickTimeInterval.PREVIOUS_WEEK: 518 case QuickTimeInterval.PREVIOUS_WEEK:
509 case QuickTimeInterval.CURRENT_WEEK: 519 case QuickTimeInterval.CURRENT_WEEK:
@@ -2119,8 +2119,9 @@ @@ -2119,8 +2119,9 @@
2119 "previous-week": "Previous week", 2119 "previous-week": "Previous week",
2120 "previous-month": "Previous month", 2120 "previous-month": "Previous month",
2121 "previous-year": "Previous year", 2121 "previous-year": "Previous year",
2122 - "today": "Today",  
2123 - "today-so-far": "Today so far", 2122 + "current-hour": "Current hour",
  2123 + "current-day": "Current day",
  2124 + "current-day-so-far": "Current day so far",
2124 "current-week": "Current week", 2125 "current-week": "Current week",
2125 "current-week-so-far": "Current week so far", 2126 "current-week-so-far": "Current week so far",
2126 "current-month": "Current month", 2127 "current-month": "Current month",