Merge pull request #918 from RADAR-base/release-0.7.4

Release 0.7.4
RADAR-base · Jan 27, 2020 · d6bc5f2 · d6bc5f2
2 parents c2bdce5 + 5a60b31
commit d6bc5f2
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 10 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -14,12 +14,9 @@ android:
     - android-28
     - extra
 addons:
+  chrome: stable
   apt:
-    sources:
-      - google-chrome
     packages:
-      - dpkg
-      - google-chrome-stable
       - xvfb
 cache:
   yarn: true

diff --git a/config.xml b/config.xml
@@ -1,5 +1,5 @@
 <?xml version='1.0' encoding='utf-8'?>
-<widget android-versionCode="541" id="org.phidatalab.radar_armt" ios-CFBundleIdentifier="org.phidatalab.radar-armt" ios-CFBundleVersion="5" version="0.7.3" xmlns:android="http://schemas.android.com/apk/res/android">
+<widget android-versionCode="542" id="org.phidatalab.radar_armt" ios-CFBundleIdentifier="org.phidatalab.radar-armt" ios-CFBundleVersion="1" version="0.7.4" 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>

diff --git a/src/app/pages/questions/services/questions.service.ts b/src/app/pages/questions/services/questions.service.ts
@@ -78,7 +78,8 @@ export class QuestionsService {
   }
 
   processQuestions(title, questions: any[]) {
-    if (title.includes('ESM')) if (new Date().getHours() > 10) questions.shift()
+    if (title.includes('ESM28Q'))
+      if (new Date().getHours() > 10) return Promise.resolve(questions.slice(1))
 
     return Promise.resolve(questions)
   }
@@ -155,9 +156,10 @@ export class QuestionsService {
     return this.questionnaire
       .getAssessment(type, task)
       .then(assessment =>
-        this.processQuestions(assessment.name, assessment.questions).then(
-          questions => [assessment, questions]
-        )
+        this.processQuestions(
+          assessment.name,
+          assessment.questions
+        ).then(questions => [assessment, questions])
       )
       .then(([assessment, questions]) => {
         return {

diff --git a/src/assets/data/defaultConfig.ts b/src/assets/data/defaultConfig.ts
@@ -13,7 +13,7 @@ import { DefaultSourceProducerAndSecretExport } from './secret'
 export const DefaultPlatformInstance = 'RADAR-CNS'
 
 // *Default app version
-export const DefaultAppVersion = '0.7.3'
+export const DefaultAppVersion = '0.7.4'
 
 // *Default Android package name
 export const DefaultPackageName = 'org.phidatalab.radar_armt'