diff --git a/config.xml b/config.xml index dd3233eef..f783b068f 100755 --- a/config.xml +++ b/config.xml @@ -1,5 +1,5 @@ - + RADAR Questionnaire An application that collects active data for research. RADAR-Base @@ -60,7 +60,7 @@ - + The app would like to use the camera to scan QR codes. diff --git a/src/app/core/services/config/config.service.ts b/src/app/core/services/config/config.service.ts index 810980585..4d7a46aae 100755 --- a/src/app/core/services/config/config.service.ts +++ b/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 diff --git a/src/app/pages/home/containers/home-page.component.html b/src/app/pages/home/containers/home-page.component.html index 0b2ef6607..a96191f13 100755 --- a/src/app/pages/home/containers/home-page.component.html +++ b/src/app/pages/home/containers/home-page.component.html @@ -79,12 +79,15 @@
diff --git a/src/app/pages/home/containers/home-page.component.ts b/src/app/pages/home/containers/home-page.component.ts index d00ced3d6..7eace3e06 100755 --- a/src/app/pages/home/containers/home-page.component.ts +++ b/src/app/pages/home/containers/home-page.component.ts @@ -42,7 +42,7 @@ export class HomePageComponent implements OnDestroy { taskIsNow = false checkTaskInterval showMiscTasksButton: Promise - isTaskCalendarTaskNameShown = false + isTaskCalendarTaskNameShown: Promise APP_CREDITS = '© RADAR-Base' HTML_BREAK = '
' @@ -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() } diff --git a/src/app/pages/questions/components/toolbar/toolbar.component.html b/src/app/pages/questions/components/toolbar/toolbar.component.html index f1176bf4e..36a0fb96f 100644 --- a/src/app/pages/questions/components/toolbar/toolbar.component.html +++ b/src/app/pages/questions/components/toolbar/toolbar.component.html @@ -3,7 +3,7 @@
- {{ currentQuestionId + '/' + totalQuestions }} + {{ currentQuestionId + 1 + '/' + totalQuestions }}