|
|
@ -132,9 +132,7 @@ export class GfActivitiesPageComponent implements OnDestroy, OnInit { |
|
|
public fetchActivities() { |
|
|
public fetchActivities() { |
|
|
const dateRange = this.user?.settings?.dateRange; |
|
|
const dateRange = this.user?.settings?.dateRange; |
|
|
|
|
|
|
|
|
const range = this.isCalendarYear(this.user?.settings?.dateRange) |
|
|
const range = this.isCalendarYear(dateRange) ? dateRange : undefined; |
|
|
? dateRange |
|
|
|
|
|
: undefined; |
|
|
|
|
|
|
|
|
|
|
|
this.dataService |
|
|
this.dataService |
|
|
.fetchActivities({ |
|
|
.fetchActivities({ |
|
|
@ -360,12 +358,12 @@ export class GfActivitiesPageComponent implements OnDestroy, OnInit { |
|
|
this.unsubscribeSubject.complete(); |
|
|
this.unsubscribeSubject.complete(); |
|
|
} |
|
|
} |
|
|
|
|
|
|
|
|
private isCalendarYear(range: DateRange) { |
|
|
private isCalendarYear(dateRange: DateRange) { |
|
|
if (!range) { |
|
|
if (!dateRange) { |
|
|
return false; |
|
|
return false; |
|
|
} |
|
|
} |
|
|
|
|
|
|
|
|
return /^\d{4}$/.test(range); |
|
|
return /^\d{4}$/.test(dateRange); |
|
|
} |
|
|
} |
|
|
|
|
|
|
|
|
private openCreateActivityDialog(aActivity?: Activity) { |
|
|
private openCreateActivityDialog(aActivity?: Activity) { |
|
|
|