Merge pull request #1576 from RADAR-base/release-2.6.3-alpha

Release 2.6.3-alpha

config.xml

@@ -1,5 +1,5 @@
 <?xml version='1.0' encoding='utf-8'?>
-<widget android-versionCode="572" id="org.phidatalab.radar_armt" ios-CFBundleIdentifier="org.phidatalab.radar-armt" ios-CFBundleVersion="1" version="2.6.2-alpha" xmlns:android="http://schemas.android.com/apk/res/android">
+<widget android-versionCode="573" id="org.phidatalab.radar_armt" ios-CFBundleIdentifier="org.phidatalab.radar-armt" ios-CFBundleVersion="1" version="2.6.3-alpha" xmlns:android="http://schemas.android.com/apk/res/android">
     <name>RADAR Questionnaire</name>
     <description>An application that collects active data for research.</description>
     <author email="radar-base@kcl.ac.uk" href="http://radar-base.org/">RADAR-Base</author>

src/app/core/services/schedule/schedule-factory.service.ts

@@ -23,7 +23,6 @@ export class ScheduleFactoryService extends ScheduleService {
     logger: LogService
   ) {
     super(store, logger)
-    this.init()
   }
 
   init() {

src/app/pages/home/containers/home-page.component.ts

@@ -26,12 +26,12 @@ export class HomePageComponent implements OnDestroy {
   title: Promise<string>
   sortedTasks: Promise<Map<any, any>>
   tasks: Promise<Task[]>
-  currentDate: Date
   nextTask: Task
   timeToNextTask: number
   tasksProgress: Promise<TasksProgress>
   resumeListener: Subscription = new Subscription()
   changeDetectionListener: Subscription = new Subscription()
+  lastTaskRefreshTime = Date.now()
 
   showCalendar = false
   showCompleted = false
@@ -46,6 +46,8 @@ export class HomePageComponent implements OnDestroy {
 
   APP_CREDITS = '&#169; RADAR-Base'
   HTML_BREAK = '<br>'
+  // How long to wait before refreshing tasks
+  TASK_REFRESH_MILLIS = 600_000
 
   constructor(
     public navCtrl: NavController,
@@ -97,7 +99,6 @@ export class HomePageComponent implements OnDestroy {
   init() {
     this.sortedTasks = this.tasksService.getValidTasksMap()
     this.tasks = this.tasksService.getTasksOfToday()
-    this.currentDate = this.tasksService.getCurrentDateMidnight()
     this.tasksProgress = this.tasksService.getTaskProgress()
     this.tasks.then(tasks => {
       this.checkTaskInterval = setInterval(() => {
@@ -119,8 +120,8 @@ export class HomePageComponent implements OnDestroy {
   }
 
   checkForNewDate() {
-    if (new Date().getDate() !== this.currentDate.getDate()) {
-      this.currentDate = this.tasksService.getCurrentDateMidnight()
+    if (Date.now() - this.lastTaskRefreshTime > this.TASK_REFRESH_MILLIS) {
+      this.lastTaskRefreshTime = Date.now()
       this.navCtrl.setRoot(SplashPageComponent)
     }
   }

src/app/pages/splash/services/splash.service.ts

@@ -42,6 +42,7 @@ export class SplashService {
       .refresh()
       .then(() => this.notificationService.init())
       .then(() => this.notificationService.permissionCheck())
+      .then(() => this.schedule.init())
       .then(() => this.config.fetchConfigState())
   }
 

src/assets/data/defaultConfig.ts

@@ -16,7 +16,7 @@ import { Localisations } from './localisations'
 export const DefaultPlatformInstance = 'RADAR-CNS'
 
 // *Default app version
-export const DefaultAppVersion = '2.6.1-alpha'
+export const DefaultAppVersion = '2.6.3-alpha'
 
 // *Default Android package name
 export const DefaultPackageName = 'org.phidatalab.radar_armt'