Merge pull request #1563 from RADAR-base/release-2.6.2-alpha

Release 2.6.2-alpha

config.xml

@@ -1,5 +1,5 @@
 <?xml version='1.0' encoding='utf-8'?>
-<widget android-versionCode="571" id="org.phidatalab.radar_armt" ios-CFBundleIdentifier="org.phidatalab.radar-armt" ios-CFBundleVersion="1" version="2.6.1-alpha" xmlns:android="http://schemas.android.com/apk/res/android">
+<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">
     <name>RADAR Questionnaire</name>
     <description>An application that collects active data for research.</description>
     <author email="[email protected]" href="http://radar-base.org/">RADAR-Base</author>
@@ -60,7 +60,7 @@
         </feature>
         <preference name="WKWebViewOnly" value="true" />
         <preference name="CordovaWebViewEngine" value="CDVWKWebViewEngine" />
-        <preference name="AllowsInlineMediaPlayback" value="true" />
+        <preference name="AllowInlineMediaPlayback" value="true" />
         <edit-config file="*-Info.plist" mode="merge" target="NSCameraUsageDescription">
             <string>The app would like to use the camera to scan QR codes.</string>
         </edit-config>

src/app/core/services/config/config.service.ts

@@ -206,6 +206,7 @@ export class ConfigService {
   }
 
   updateConfigStateOnProtocolChange(protocol) {
+    this.questionnaire.reset()
     const assessments = protocol.protocols
     this.logger.log(assessments)
     return this.questionnaire

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

@@ -79,12 +79,15 @@
 
   <div #taskCalendar class="taskCalendar" [@displayCalendar]="showCalendar">
     <task-calendar
-      *ngIf="(sortedTasks | async)?.size"
+      *ngIf="
+        (sortedTasks | async)?.size &&
+        (isTaskCalendarTaskNameShown | async) !== null
+      "
       [show]="showCalendar"
       (task)="startQuestionnaire($event)"
       [tasks]="sortedTasks | async"
       [currentDate]="currentDate.getTime()"
-      [isTaskNameShown]="isTaskNameShown"
+      [isTaskNameShown]="isTaskCalendarTaskNameShown | async"
     >
     </task-calendar>
   </div>

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

@@ -42,7 +42,7 @@ export class HomePageComponent implements OnDestroy {
   taskIsNow = false
   checkTaskInterval
   showMiscTasksButton: Promise<boolean>
-  isTaskCalendarTaskNameShown = false
+  isTaskCalendarTaskNameShown: Promise<boolean>
 
   APP_CREDITS = '&#169; RADAR-Base'
   HTML_BREAK = '<br>'
@@ -62,7 +62,6 @@ export class HomePageComponent implements OnDestroy {
         this.navCtrl.setRoot(HomePageComponent)
       }
     )
-    this.getisTaskCalendarTaskNameShown()
   }
 
   getIsLoadingSpinnerShown() {
@@ -72,12 +71,6 @@ export class HomePageComponent implements OnDestroy {
     )
   }
 
-  getisTaskCalendarTaskNameShown() {
-    this.tasksService
-      .getIsTaskCalendarTaskNameShown()
-      .then(res => (this.isTaskCalendarTaskNameShown = res))
-  }
-
   getIsStartButtonShown() {
     return (
       this.taskIsNow &&
@@ -114,6 +107,7 @@ export class HomePageComponent implements OnDestroy {
     this.hasOnDemandTasks = this.tasksService.getHasOnDemandTasks()
     this.hasClinicalTasks = this.tasksService.getHasClinicalTasks()
     this.title = this.tasksService.getPlatformInstanceName()
+    this.isTaskCalendarTaskNameShown = this.tasksService.getIsTaskCalendarTaskNameShown()
     this.onDemandIcon = this.tasksService.getOnDemandAssessmentIcon()
     this.showMiscTasksButton = this.getShowMiscTasksButton()
   }

src/app/pages/questions/components/toolbar/toolbar.component.html

@@ -3,7 +3,7 @@
     <div class="toolbar-progress-bar" [style.width]="progress + '%'"></div>
   </div>
   <ion-title *ngIf="isProgressCountShown" text-center color="light">
-    {{ currentQuestionId + '/' + totalQuestions }}
+    {{ currentQuestionId + 1 + '/' + totalQuestions }}
   </ion-title>
   <ion-buttons left>
     <button

src/app/pages/questions/containers/questions-page.component.html

@@ -74,6 +74,6 @@
     [isRightButtonDisabled]="isRightButtonDisabled"
     [currentQuestionId]="currentQuestionGroupId"
     [totalQuestions]="groupedQuestions?.size"
-    [isProgressCountShown]="showProgressCount"
+    [isProgressCountShown]="showProgressCount | async"
   ></toolbar>
 </ion-footer>

src/app/pages/questions/containers/questions-page.component.spec.ts

@@ -40,6 +40,10 @@ export class QuestionsServiceMock {
     return Promise.resolve({})
   }
 
+  initRemoteConfigParams() {
+    return Promise.resolve({})
+  }
+
   getIsProgressCountShown() {
     return false
   }

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

@@ -64,7 +64,7 @@ export class QuestionsPageComponent implements OnInit {
     ShowIntroductionType.ONCE
   ])
   MATRIX_FIELD_NAME = 'matrix'
-  showProgressCount = false
+  showProgressCount: Promise<boolean>
 
   constructor(
     public navCtrl: NavController,
@@ -100,7 +100,8 @@ export class QuestionsPageComponent implements OnInit {
     this.task = this.navParams.data
     this.showProgressCount = this.questionsService.getIsProgressCountShown()
     return this.questionsService
-      .getQuestionnairePayload(this.task)
+      .initRemoteConfigParams()
+      .then(() => this.questionsService.getQuestionnairePayload(this.task))
       .then(res => {
         this.initQuestionnaire(res)
         return this.updateToolbarButtons()
@@ -206,16 +207,15 @@ export class QuestionsPageComponent implements OnInit {
   }
 
   nextAction(event) {
-    if (event == NextButtonEventType.AUTO) return this.nextQuestion()
+    if (event == NextButtonEventType.AUTO)
+      return setTimeout(() => this.nextQuestion(), 100)
     if (event == NextButtonEventType.ENABLE)
       return setTimeout(() => this.updateToolbarButtons(), 100)
     if (event == NextButtonEventType.DISABLE)
       return (this.isRightButtonDisabled = true)
   }
 
   nextQuestion() {
-    if (this.isRightButtonDisabled) return
-
     const questionPosition = this.questionsService.getNextQuestion(
       this.groupedQuestions,
       this.currentQuestionGroupId

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

@@ -45,11 +45,9 @@ export class QuestionsService {
     private finish: FinishTaskService,
     private remoteConfig: RemoteConfigService,
     private util: Utility
-  ) {
-    this.init()
-  }
+  ) {}
 
-  init() {
+  initRemoteConfigParams() {
     return this.remoteConfig
       .read()
       .then(config =>
@@ -61,16 +59,10 @@ export class QuestionsService {
           config.getOrDefault(
             ConfigKeys.SKIPPABLE_QUESTIONNAIRE_TYPES,
             DefaultSkippableQuestionnaireTypes.toString()
-          ),
-          config.getOrDefault(
-            ConfigKeys.SHOW_TASK_PROGRESS_COUNT,
-            DefaultShowTaskProgressCount.toString()
           )
         ])
       )
-      .then(([autoNextSet, skippableSet, showTaskProgressCount]) => {
-        if (showTaskProgressCount.length)
-          this.isProgressCountShown = JSON.parse(showTaskProgressCount)
+      .then(([autoNextSet, skippableSet]) => {
         if (autoNextSet.length)
           this.NEXT_BUTTON_AUTOMATIC_SET = new Set(
             this.stringToArray(autoNextSet, this.DELIMITER)
@@ -270,6 +262,14 @@ export class QuestionsService {
   }
 
   getIsProgressCountShown() {
-    return this.isProgressCountShown
+    return this.remoteConfig
+      .read()
+      .then(config =>
+        config.getOrDefault(
+          ConfigKeys.SHOW_TASK_PROGRESS_COUNT,
+          DefaultShowTaskProgressCount
+        )
+      )
+      .then(res => JSON.parse(res))
   }
 }