-
-
@@ -54,6 +58,7 @@
-
+
+
+
{{ current }}
diff --git a/src/app/pages/home/components/task-progress/task-progress.component.ts b/src/app/pages/home/components/task-progress/task-progress.component.ts
index e35f75733..e9bac1d88 100755
--- a/src/app/pages/home/components/task-progress/task-progress.component.ts
+++ b/src/app/pages/home/components/task-progress/task-progress.component.ts
@@ -1,19 +1,24 @@
-import {
- Component,
- ElementRef,
- EventEmitter,
- Input,
- OnChanges,
- Output,
- ViewChild
-} from '@angular/core'
+import { animate, state, style, transition, trigger } from '@angular/animations'
+import { Component, Input, OnChanges } from '@angular/core'
import { TasksProgress } from '../../../../shared/models/task'
-import { TasksService } from '../../services/tasks.service'
@Component({
selector: 'task-progress',
- templateUrl: 'task-progress.component.html'
+ templateUrl: 'task-progress.component.html',
+ animations: [
+ trigger('enterAnimation', [
+ transition(':enter', [
+ style({ transform: 'translateX(100%)', opacity: 0 }),
+ animate('500ms', style({ transform: 'translateX(0)', opacity: 1 }))
+ ])
+ ]),
+ trigger('translateY', [
+ state('true', style({ transform: 'translateY(32vh)', opacity: 1 })),
+ state('false', style({ transform: 'translateY(0)', opacity: 1 })),
+ transition('true <=> false', animate('1s linear'))
+ ])
+ ]
})
export class TaskProgressComponent implements OnChanges {
@Input()
@@ -22,65 +27,27 @@ export class TaskProgressComponent implements OnChanges {
forceComplete: boolean = false
@Input()
noTasksToday: boolean = false
- @Output()
- completed: EventEmitter = new EventEmitter()
- text: string
max: number = 1
current: number = 0
stroke = 22
animation = 'easeInOutQuart'
- complete: boolean = false
+ complete = false
showFireworks: boolean = false
- @ViewChild('progressActive')
- elActive: ElementRef
- @ViewChild('progressComplete')
- elComplete: ElementRef
- @ViewChild('checkmark')
- elCheckmark: ElementRef
- @ViewChild('counter')
- elCounter: ElementRef
-
- constructor(private tasksService: TasksService) {}
-
ngOnChanges() {
+ this.current = this.progress.completedTasks
+ this.max = this.progress.numberOfTasks
this.updateProgress()
}
updateProgress() {
- if (this.progress) {
- this.max = this.progress.numberOfTasks
- this.current = this.progress.completedTasks
- }
- if (this.current >= this.max) {
+ if (this.forceComplete || this.current >= this.max) {
this.complete = true
this.displayFireworks(800, 980)
} else {
this.complete = false
}
- if (this.forceComplete) {
- this.complete = true
- }
- this.transitionToComplete()
- this.completed.emit(this.complete)
- }
-
- transitionToComplete() {
- if (this.complete) {
- this.elActive.nativeElement.style.transform =
- 'translate3d(-100%,0,0) scale(0.1)'
- this.elComplete.nativeElement.style.transform =
- 'translate3d(-100%,0,0) scale(1)'
- this.elCheckmark.nativeElement.style.transform = 'scale(1)'
- if (this.elCounter)
- this.elCounter.nativeElement.style.transform = 'translate3d(0,250px,0)'
- } else {
- this.elActive.nativeElement.style.transform =
- 'translate3d(0,0,0) scale(1)'
- if (this.elCounter)
- this.elCounter.nativeElement.style.transform = 'translate3d(0,0,0)'
- }
}
displayFireworks(milliDelay, milliDisplay) {
@@ -94,7 +61,7 @@ export class TaskProgressComponent implements OnChanges {
easterEggFireworks() {
if (this.current >= this.max) {
- this.displayFireworks(1, 980)
+ this.displayFireworks(800, 980)
}
}
}
From f142176127b8aefa62728eda4ed3dc079e90e5f5 Mon Sep 17 00:00:00 2001
From: pauline <16977973+mpgxvii@users.noreply.github.com>
Date: Thu, 13 Dec 2018 23:16:11 +0000
Subject: [PATCH 09/29] fix task info and home page animations
---
.../task-info/task-info.component.html | 13 +-
.../task-info/task-info.component.ts | 155 +++---------------
.../home/containers/home-page.component.html | 13 +-
.../home/containers/home-page.component.scss | 10 +-
.../home/containers/home-page.component.ts | 89 ++--------
5 files changed, 53 insertions(+), 227 deletions(-)
diff --git a/src/app/pages/home/components/task-info/task-info.component.html b/src/app/pages/home/components/task-info/task-info.component.html
index 41f6a1afb..f5381e5e4 100755
--- a/src/app/pages/home/components/task-info/task-info.component.html
+++ b/src/app/pages/home/components/task-info/task-info.component.html
@@ -1,6 +1,5 @@
@@ -13,7 +12,7 @@
![]()
{{ "STATUS_NOW" | translate }}
@@ -65,10 +64,10 @@
@@ -79,7 +78,7 @@
![]()
out', animate('400ms ease')),
- transition('out => in', animate('400ms ease'))
+ state('false', style({ opacity: '0' })),
+ state('true', style({ opacity: '1.0' })),
+ transition('* => *', animate('400ms ease'))
]),
trigger('scaleMinutes', [
state(
- 'min',
- style({
- transform: 'translate3d(-25%, -15%, 0) scale(0.45)'
- })
+ 'false',
+ style({ transform: 'translate3d(-25%, -15%, 0) scale(0.45)' })
),
- state(
- 'max',
- style({
- transform: 'translate3d(0, 0, 0) scale(1)'
- })
- ),
- transition('max => min', animate('400ms ease')),
- transition('min => max', animate('400ms ease'))
+ state('true', style({ transform: 'translate3d(0, 0, 0) scale(1)' })),
+ transition('* => *', animate('400ms ease'))
]),
trigger('alignCenterRightExtraInfo', [
- state(
- 'right',
- style({
- transform: 'translate3d(15%, 0, 0)'
- })
- ),
- state(
- 'center',
- style({
- transform: 'translate3d(0, 0, 0)'
- })
- ),
- transition('center => right', animate('400ms ease')),
- transition('right => center', animate('400ms ease'))
+ state('false', style({ transform: 'translate3d(15%, 0, 0)' })),
+ state('true', style({ transform: 'translate3d(0, 0, 0)' })),
+ transition('* => *', animate('400ms ease'))
]),
trigger('alignCenterRightTime', [
- state(
- 'right',
- style({
- transform: 'translate3d(15%, 0, 0) scale(0.8)'
- })
- ),
- state(
- 'center',
- style({
- transform: 'translate3d(0, 0, 0)'
- })
- ),
- transition('center => right', animate('400ms ease')),
- transition('right => center', animate('400ms ease'))
+ state('false', style({ transform: 'translate3d(15%, 0, 0) scale(0.8)' })),
+ state('true', style({ transform: 'translate3d(0, 0, 0)' })),
+ transition('* => *', animate('400ms ease'))
]),
trigger('moveInProgress', [
state(
- 'out',
- style({
- display: 'none',
- transform: 'translate3d(-150%, 0, 0)'
- })
+ 'true',
+ style({ display: 'none', transform: 'translate3d(-150%, 0, 0)' })
),
state(
- 'in',
- style({
- display: 'block',
- transform: 'translate3d(0, 0, 0)'
- })
+ 'false',
+ style({ display: 'block', transform: 'translate3d(0, 0, 0)' })
),
- transition('out => in', animate('400ms ease')),
- transition('in => out', animate('400ms ease'))
+ transition('* => *', animate('400ms ease'))
]),
trigger('alignCenterRightMetrics', [
- state(
- 'right',
- style({
- transform: 'translate3d(120%, 0, 0)'
- })
- ),
- state(
- 'center',
- style({
- transform: 'translate3d(0, 0, 0)'
- })
- ),
- transition('center => right', animate('400ms ease')),
- transition('right => center', animate('400ms ease'))
+ state('false', style({ transform: 'translate3d(120%, 0, 0)' })),
+ state('true', style({ transform: 'translate3d(0, 0, 0)' })),
+ transition('* => *', animate('400ms ease'))
])
]
})
@@ -130,15 +63,12 @@ export class TaskInfoComponent implements OnChanges {
isNow = false
@Input()
progress: TasksProgress
+ @Input()
+ expanded = true
@Output()
collapse: EventEmitter = new EventEmitter()
- expanded: Boolean = true
hasExtraInfo: Boolean = false
displayTask: Boolean = false
- animateFade: String
- animateMove: String
- animateScale: String
- animateCenterRight: String
private language: string
private extraTaskInfo: string
@@ -148,20 +78,7 @@ export class TaskInfoComponent implements OnChanges {
radius: number = 35
stroke: number = 8
- animationKeys = {
- MIN: 'min',
- MAX: 'max',
- IN: 'in',
- OUT: 'out',
- CENTER: 'center',
- RIGHT: 'right'
- }
-
- constructor(
- private tasksService: TasksService,
- public storage: StorageService
- ) {
- this.applyAnimationKeys()
+ constructor(public storage: StorageService) {
this.storage.get(StorageKeys.LANGUAGE).then(resLang => {
this.language = resLang.value
})
@@ -170,6 +87,7 @@ export class TaskInfoComponent implements OnChanges {
ngOnChanges() {
this.checkDisplayTask()
this.checkHasExtraInfo()
+ this.updateProgress()
}
checkDisplayTask() {
@@ -192,15 +110,6 @@ export class TaskInfoComponent implements OnChanges {
}
}
- expand() {
- if (this.task.name !== 'ESM') {
- this.collapse.emit(this.expanded)
- this.expanded = !this.expanded
- this.applyAnimationKeys()
- this.updateProgress()
- }
- }
-
updateProgress() {
if (this.progress) {
this.current = this.progress.completedTasks
@@ -208,20 +117,6 @@ export class TaskInfoComponent implements OnChanges {
}
}
- applyAnimationKeys() {
- if (this.expanded) {
- this.animateFade = this.animationKeys.IN
- this.animateMove = this.animationKeys.OUT
- this.animateScale = this.animationKeys.MAX
- this.animateCenterRight = this.animationKeys.CENTER
- } else {
- this.animateFade = this.animationKeys.OUT
- this.animateMove = this.animationKeys.IN
- this.animateScale = this.animationKeys.MIN
- this.animateCenterRight = this.animationKeys.RIGHT
- }
- }
-
getHour() {
const date = new Date()
date.setTime(this.task['timestamp'])
diff --git a/src/app/pages/home/containers/home-page.component.html b/src/app/pages/home/containers/home-page.component.html
index 2db073d7f..0dc3127f2 100755
--- a/src/app/pages/home/containers/home-page.component.html
+++ b/src/app/pages/home/containers/home-page.component.html
@@ -34,7 +34,7 @@
[progress]="tasksProgress"
[forceComplete]="showCompleted"
[noTasksToday]="showNoTasksToday"
- *ngIf="!hasOnlyESMs"
+ *ngIf="tasksProgress && !hasOnlyESMs && !showCalendar"
>
-
From ee28cc370cba0274c5e3fa5eabf1fdd94ba64d61 Mon Sep 17 00:00:00 2001
From: pauline <16977973+mpgxvii@users.noreply.github.com>
Date: Tue, 8 Jan 2019 12:33:18 +0000
Subject: [PATCH 16/29] fix status bar and progress
---
src/app/core/containers/app.component.ts | 2 +-
.../components/task-progress/task-progress.component.ts | 8 ++------
2 files changed, 3 insertions(+), 7 deletions(-)
diff --git a/src/app/core/containers/app.component.ts b/src/app/core/containers/app.component.ts
index e8f92b338..9376d3c45 100755
--- a/src/app/core/containers/app.component.ts
+++ b/src/app/core/containers/app.component.ts
@@ -22,7 +22,7 @@ export class AppComponent {
private notificationService: NotificationService
) {
this.platform.ready().then(() => {
- this.statusBar.styleDefault()
+ this.statusBar.hide()
this.splashScreen.hide()
this.configService.fetchConfigState(false)
this.configService.migrateToLatestVersion()
diff --git a/src/app/pages/home/components/task-progress/task-progress.component.ts b/src/app/pages/home/components/task-progress/task-progress.component.ts
index e9bac1d88..3f330dafd 100755
--- a/src/app/pages/home/components/task-progress/task-progress.component.ts
+++ b/src/app/pages/home/components/task-progress/task-progress.component.ts
@@ -42,12 +42,8 @@ export class TaskProgressComponent implements OnChanges {
}
updateProgress() {
- if (this.forceComplete || this.current >= this.max) {
- this.complete = true
- this.displayFireworks(800, 980)
- } else {
- this.complete = false
- }
+ this.complete = this.forceComplete || this.current >= this.max
+ if (this.complete) this.displayFireworks(800, 980)
}
displayFireworks(milliDelay, milliDisplay) {
From 748994fe91ad32ef78e91ab6a54a8ad9ddd5a5d1 Mon Sep 17 00:00:00 2001
From: pauline <16977973+mpgxvii@users.noreply.github.com>
Date: Tue, 8 Jan 2019 17:19:14 +0000
Subject: [PATCH 17/29] fix finish page and splash page
---
src/app/pages/finish/containers/finish-page.component.ts | 9 ++-------
src/app/pages/splash/containers/splash-page.component.ts | 7 ++-----
2 files changed, 4 insertions(+), 12 deletions(-)
diff --git a/src/app/pages/finish/containers/finish-page.component.ts b/src/app/pages/finish/containers/finish-page.component.ts
index e0a82fa7c..07df91126 100755
--- a/src/app/pages/finish/containers/finish-page.component.ts
+++ b/src/app/pages/finish/containers/finish-page.component.ts
@@ -35,7 +35,7 @@ export class FinishPageComponent {
ionViewDidLoad() {
this.associatedTask = this.navParams.data.associatedTask
this.content = this.navParams.data.endText
- const questionnaireName: string = this.navParams.data.associatedTask.name
+ const questionnaireName = this.navParams.data.associatedTask.name
if (!questionnaireName.includes('DEMO')) {
try {
if (
@@ -53,7 +53,6 @@ export class FinishPageComponent {
)
.then(
data => {
- this.finishTaskService.updateTaskToComplete(this.associatedTask)
this.sendToKafka(
this.associatedTask,
data,
@@ -64,12 +63,8 @@ export class FinishPageComponent {
console.log(JSON.stringify(error))
}
)
- } else {
- // This is a Demo Questionnaire. Just update to complete and do nothing else
- this.finishTaskService.updateTaskToComplete(
- this.navParams.data.associatedTask
- )
}
+ this.finishTaskService.updateTaskToComplete(this.associatedTask)
this.displayNextTaskReminder =
!this.navParams.data.isLastTask && !this.isClinicalTask
}
diff --git a/src/app/pages/splash/containers/splash-page.component.ts b/src/app/pages/splash/containers/splash-page.component.ts
index 55f7415f7..53e6491fe 100644
--- a/src/app/pages/splash/containers/splash-page.component.ts
+++ b/src/app/pages/splash/containers/splash-page.component.ts
@@ -91,15 +91,12 @@ export class SplashPageComponent {
!lastUpdate
) {
console.log('[SPLASH] Scheduling Notifications.')
- return this.notificationService.setNextXNotifications(
- DefaultNumberOfNotificationsToSchedule
- )
+ return this.configService.rescheduleNotifications()
} else {
console.log(
'Not Scheduling Notifications as ' +
timeElapsed +
- 'ms from last refresh is not greater' +
- 'than the default Refresh interval of ' +
+ 'ms from last refresh is not greater than the default Refresh interval of ' +
DefaultNotificationRefreshTime
)
}
From a3806430c61aceb4cb941e3230be79e820d11c17 Mon Sep 17 00:00:00 2001
From: pauline <16977973+mpgxvii@users.noreply.github.com>
Date: Wed, 9 Jan 2019 16:47:14 +0000
Subject: [PATCH 18/29] refactor finish page and splash page and fix css
---
.../containers/enrolment-page.component.scss | 5 -
.../containers/finish-page.component.ts | 74 ++++---
.../finish/services/prepare-data.service.ts | 2 +-
.../task-calendar.component.html | 2 +-
.../task-calendar/task-calendar.component.ts | 10 +-
.../home/containers/home-page.component.ts | 1 -
.../containers/splash-page.component.ts | 181 +++++++-----------
7 files changed, 113 insertions(+), 162 deletions(-)
diff --git a/src/app/pages/auth/containers/enrolment-page.component.scss b/src/app/pages/auth/containers/enrolment-page.component.scss
index a3f0ebc2e..95fed1fed 100755
--- a/src/app/pages/auth/containers/enrolment-page.component.scss
+++ b/src/app/pages/auth/containers/enrolment-page.component.scss
@@ -110,9 +110,4 @@ page-enrolment {
width: 320px;
border-bottom: 1px solid white;
}
-
- .scroll-content {
- margin-bottom: 0 !important;
- padding-bottom: 0 !important;
- }
}
diff --git a/src/app/pages/finish/containers/finish-page.component.ts b/src/app/pages/finish/containers/finish-page.component.ts
index 07df91126..d29a5f2de 100755
--- a/src/app/pages/finish/containers/finish-page.component.ts
+++ b/src/app/pages/finish/containers/finish-page.component.ts
@@ -16,12 +16,14 @@ import { PrepareDataService } from '../services/prepare-data.service'
templateUrl: 'finish-page.component.html'
})
export class FinishPageComponent {
- content: string = ''
- isClinicalTask: boolean = false
- completedInClinic: boolean = false
- displayNextTaskReminder: boolean = true
- hasClickedDoneButton: boolean = false
+ content = ''
+ isClinicalTask = false
+ completedInClinic = false
+ displayNextTaskReminder = true
+ hasClickedDoneButton = false
associatedTask
+ questionnaireData
+
constructor(
public navCtrl: NavController,
public navParams: NavParams,
@@ -33,50 +35,45 @@ export class FinishPageComponent {
) {}
ionViewDidLoad() {
- this.associatedTask = this.navParams.data.associatedTask
- this.content = this.navParams.data.endText
- const questionnaireName = this.navParams.data.associatedTask.name
- if (!questionnaireName.includes('DEMO')) {
- try {
- if (
- this.navParams.data['associatedTask']['protocol']['clinicalProtocol']
- ) {
- this.isClinicalTask = true
- }
- } catch (TypeError) {
- console.log('INFO: Not in clinic task/questionnaire.')
- }
- this.prepareDataService
- .process_QuestionnaireData(
- this.navParams.data.answers,
- this.navParams.data.timestamps
- )
- .then(
- data => {
- this.sendToKafka(
- this.associatedTask,
- data,
- this.navParams.data.questions
- )
- },
- error => {
- console.log(JSON.stringify(error))
- }
- )
- }
+ this.questionnaireData = this.navParams.data
+ this.associatedTask = this.questionnaireData.associatedTask
+ this.content = this.questionnaireData.endText
+ this.isClinicalTask = this.associatedTask.isClinical
+ const questionnaireName = this.associatedTask.name
this.finishTaskService.updateTaskToComplete(this.associatedTask)
this.displayNextTaskReminder =
- !this.navParams.data.isLastTask && !this.isClinicalTask
+ !this.questionnaireData.isLastTask && !this.isClinicalTask
+ !questionnaireName.includes('DEMO') && this.processDataAndSend()
+ }
+
+ processDataAndSend() {
+ return this.prepareDataService
+ .processQuestionnaireData(
+ this.questionnaireData.answers,
+ this.questionnaireData.timestamps
+ )
+ .then(
+ data => {
+ this.sendToKafka(
+ this.associatedTask,
+ data,
+ this.questionnaireData.questions
+ )
+ },
+ error => {
+ console.log(JSON.stringify(error))
+ }
+ )
}
sendToKafka(task: Task, questionnaireData, questions) {
+ // NOTE: Submit data to kafka
this.kafkaService.prepareTimeZoneKafkaObjectAndSend()
this.kafkaService.prepareAnswerKafkaObjectAndSend(
task,
questionnaireData,
questions
)
- // NOTE: Submit data to kafka
}
handleClosePage() {
@@ -98,6 +95,7 @@ export class FinishPageComponent {
}
generateClinicalTasks(tasks) {
+ // TODO: To be refactored and moved in next PR.
let clinicalTasks = []
if (tasks) {
clinicalTasks = tasks
diff --git a/src/app/pages/finish/services/prepare-data.service.ts b/src/app/pages/finish/services/prepare-data.service.ts
index ef31f8540..001647fa9 100755
--- a/src/app/pages/finish/services/prepare-data.service.ts
+++ b/src/app/pages/finish/services/prepare-data.service.ts
@@ -11,7 +11,7 @@ import { StorageKeys } from '../../../shared/enums/storage'
export class PrepareDataService {
constructor(public storage: StorageService) {}
- process_QuestionnaireData(answers, timestamps): Promise {
+ processQuestionnaireData(answers, timestamps): Promise {
console.log(answers)
return new Promise((resolve, reject) => {
// NOTE: Fetches config version and Patient ID
diff --git a/src/app/pages/home/components/task-calendar/task-calendar.component.html b/src/app/pages/home/components/task-calendar/task-calendar.component.html
index 19c5754ee..3bc238b8f 100755
--- a/src/app/pages/home/components/task-calendar/task-calendar.component.html
+++ b/src/app/pages/home/components/task-calendar/task-calendar.component.html
@@ -3,7 +3,7 @@
- :
+ :
{{ getMinutes() }}
*', animate('300ms ease'))
+ ])
+ ]
})
export class HomePageComponent {
@ViewChild('content')
@@ -82,7 +90,7 @@ export class HomePageComponent {
)
this.getElementsAttributes()
this.elProgressHeight += this.elProgressOffset
- this.applyTransformations()
+ // this.applyTransformations()
this.showNoTasksToday = false
this.startingQuestionnaire = false
}
@@ -114,7 +122,6 @@ export class HomePageComponent {
if (task && task.isClinical == false) {
this.nextTask = task
this.displayCompleted(false)
- this.displayEvalTransformations(false)
this.taskIsNow = checkTaskIsNow(this.nextTask.timestamp)
} else {
this.tasksService.areAllTasksComplete().then(completed => {
@@ -126,7 +133,6 @@ export class HomePageComponent {
}
} else {
this.nextTask = DefaultTask
- this.displayEvalTransformations(true)
}
})
}
@@ -152,10 +158,9 @@ export class HomePageComponent {
})
}
- displayEvalTransformations(requestDisplay: boolean) {
- this.showCalendar = requestDisplay
- this.getElementsAttributes()
- this.applyTransformations()
+ displayTaskCalendar() {
+ this.showCalendar = !this.showCalendar
+ this.setCalendarScrollHeight(this.showCalendar)
}
displayCompleted(requestDisplay: boolean) {
@@ -176,74 +181,6 @@ export class HomePageComponent {
this.elFooterHeight = this.elFooter.nativeElement.offsetHeight
}
- applyTransformations() {
- if (this.showCalendar) {
- this.elProgress.nativeElement.style.transform = `translateY(-${
- this.elProgressHeight
- }px) scale(1)`
- this.elTicker.nativeElement.style.transform = `translateY(-${
- this.elProgressHeight
- }px)`
- this.elInfo.nativeElement.style.transform = `translateY(-${
- this.elProgressHeight
- }px)`
- this.elFooter.nativeElement.style.transform = `translateY(${
- this.elFooterHeight
- }px) scale(0)`
- this.elCalendar.nativeElement.style.transform = `translateY(-${
- this.elProgressHeight
- }px)`
- this.elCalendar.nativeElement.style.opacity = 1
- } else {
- if (this.elProgress)
- this.elProgress.nativeElement.style.transform =
- 'translateY(0px) scale(1)'
- if (this.elTicker)
- this.elTicker.nativeElement.style.transform = 'translateY(0px)'
- if (this.elInfo)
- this.elInfo.nativeElement.style.transform = 'translateY(0px)'
- if (this.elFooter)
- this.elFooter.nativeElement.style.transform = 'translateY(0px) scale(1)'
- if (this.elCalendar) {
- this.elCalendar.nativeElement.style.transform = 'translateY(0px)'
- this.elCalendar.nativeElement.style.opacity = 0
- }
- }
- this.setCalendarScrollHeight(this.showCalendar)
- }
-
- // TODO: Rename to something appropriate
- isNextTaskESMandNotNow() {
- const now = new Date().getTime()
- if (!this.showCalendar) {
- if (this.nextTask.name === 'ESM' && this.nextTask.timestamp > now) {
- this.elProgress.nativeElement.style.transform = `translateY(${
- this.elFooterHeight
- }px)`
- this.elInfo.nativeElement.style.transform = `translateY(${
- this.elFooterHeight
- }px)`
- this.elFooter.nativeElement.style.transform = `translateY(${
- this.elFooterHeight
- }px) scale(0)`
- this.elCalendar.nativeElement.style.transform = 'translateY(0px)'
- this.elCalendar.nativeElement.style.opacity = 0
- } else {
- this.elProgress.nativeElement.style.transform = `translateY(${
- this.elFooterHeight
- }px)`
- this.elInfo.nativeElement.style.transform = `translateY(${
- this.elFooterHeight
- }px)`
- this.elFooter.nativeElement.style.transform = `translateY(${
- this.elFooterHeight
- }px) scale(0)`
- this.elCalendar.nativeElement.style.transform = 'translateY(0px)'
- this.elCalendar.nativeElement.style.opacity = 0
- }
- }
- }
-
setCalendarScrollHeight(show: boolean) {
if (show) {
this.calendarScrollHeight =
From 0ae17596edb6ae18d5538ae54cc0c68c2de6ab96 Mon Sep 17 00:00:00 2001
From: pauline <16977973+mpgxvii@users.noreply.github.com>
Date: Wed, 12 Dec 2018 22:08:05 +0000
Subject: [PATCH 10/29] remove elementRef animations
---
.../task-calendar.component.html | 2 +-
.../task-calendar/task-calendar.component.ts | 4 +-
.../task-info/task-info.component.html | 24 +++---
.../task-info/task-info.component.scss | 3 +-
.../ticker-bar/ticker-bar.component.scss | 1 +
.../home/containers/home-page.component.html | 7 +-
.../home/containers/home-page.component.scss | 1 -
.../home/containers/home-page.component.ts | 84 ++-----------------
8 files changed, 27 insertions(+), 99 deletions(-)
diff --git a/src/app/pages/home/components/task-calendar/task-calendar.component.html b/src/app/pages/home/components/task-calendar/task-calendar.component.html
index 3eae1f5b8..19c5754ee 100755
--- a/src/app/pages/home/components/task-calendar/task-calendar.component.html
+++ b/src/app/pages/home/components/task-calendar/task-calendar.component.html
@@ -3,7 +3,7 @@
@@ -121,10 +119,9 @@
-
-
![]()
Date: Thu, 13 Dec 2018 23:02:04 +0000
Subject: [PATCH 12/29] cleanup
---
src/app/pages/home/components/task-info/task-info.component.ts | 2 --
src/app/pages/home/containers/home-page.component.html | 2 +-
2 files changed, 1 insertion(+), 3 deletions(-)
diff --git a/src/app/pages/home/components/task-info/task-info.component.ts b/src/app/pages/home/components/task-info/task-info.component.ts
index cfede6801..18de3c6e6 100755
--- a/src/app/pages/home/components/task-info/task-info.component.ts
+++ b/src/app/pages/home/components/task-info/task-info.component.ts
@@ -65,8 +65,6 @@ export class TaskInfoComponent implements OnChanges {
progress: TasksProgress
@Input()
expanded = true
- @Output()
- collapse: EventEmitter = new EventEmitter()
hasExtraInfo: Boolean = false
displayTask: Boolean = false
diff --git a/src/app/pages/home/containers/home-page.component.html b/src/app/pages/home/containers/home-page.component.html
index b8a5532de..c8a64c734 100755
--- a/src/app/pages/home/containers/home-page.component.html
+++ b/src/app/pages/home/containers/home-page.component.html
@@ -81,7 +81,7 @@
[isNow]="taskIsNow"
[progress]="tasksProgress"
[expanded]="!showCalendar"
- (click)="displayTaskCalendar($event)"
+ (click)="displayTaskCalendar()"
>
From c92fcb32096142273bbac012061534f8a6faf53c Mon Sep 17 00:00:00 2001
From: pauline <16977973+mpgxvii@users.noreply.github.com>
Date: Thu, 13 Dec 2018 21:09:19 +0000
Subject: [PATCH 13/29] fix clinical icon
---
.../components/ticker-bar/ticker-bar.component.ts | 2 ++
.../pages/home/containers/home-page.component.html | 10 ++++++----
.../pages/home/containers/home-page.component.scss | 14 ++++++++------
.../pages/home/containers/home-page.component.ts | 3 ++-
4 files changed, 18 insertions(+), 11 deletions(-)
diff --git a/src/app/pages/home/components/ticker-bar/ticker-bar.component.ts b/src/app/pages/home/components/ticker-bar/ticker-bar.component.ts
index 52beaaebc..6dfa1ea6c 100755
--- a/src/app/pages/home/components/ticker-bar/ticker-bar.component.ts
+++ b/src/app/pages/home/components/ticker-bar/ticker-bar.component.ts
@@ -17,6 +17,8 @@ export class TickerBarComponent implements OnChanges {
@Input()
task: Task
@Input()
+ isNow
+ @Input()
items: TickerItem[] = []
@Input()
showAffirmation: boolean = false
diff --git a/src/app/pages/home/containers/home-page.component.html b/src/app/pages/home/containers/home-page.component.html
index c8a64c734..09ed1e5e5 100755
--- a/src/app/pages/home/containers/home-page.component.html
+++ b/src/app/pages/home/containers/home-page.component.html
@@ -49,10 +49,12 @@
![]()
= new EventEmitter()
@Input()
@@ -27,6 +27,7 @@ export class TaskCalendarComponent implements OnChanges {
currentTime
timeIndex: Promise
+ height
constructor(
private tasksService: TasksService,
@@ -37,6 +38,7 @@ export class TaskCalendarComponent implements OnChanges {
ngOnChanges() {
this.setCurrentTime()
+ this.height = this.show ? 100 : 0
}
getStartTime(task: Task) {
diff --git a/src/app/pages/home/components/task-info/task-info.component.html b/src/app/pages/home/components/task-info/task-info.component.html
index f5381e5e4..6229dc28f 100755
--- a/src/app/pages/home/components/task-info/task-info.component.html
+++ b/src/app/pages/home/components/task-info/task-info.component.html
@@ -14,17 +14,19 @@
id="questionnaire-progress"
[@moveInProgress]="expanded"
>
-
+
{{ current }}
+ {{ current }}
+
- 
-
-
-
-
- :
- {{ getMinutes() }}
-
+ : {{ getMinutes() }}
- height
constructor(
- private tasksService: TasksService,
private alertCtrl: AlertController,
- private translate: TranslatePipe,
- private platform: Platform
+ private translate: TranslatePipe
) {}
ngOnChanges() {
this.setCurrentTime()
- this.height = this.show ? 100 : 0
}
getStartTime(task: Task) {
diff --git a/src/app/pages/home/containers/home-page.component.ts b/src/app/pages/home/containers/home-page.component.ts
index ccf2ec88c..e9d3d9329 100755
--- a/src/app/pages/home/containers/home-page.component.ts
+++ b/src/app/pages/home/containers/home-page.component.ts
@@ -81,7 +81,6 @@ export class HomePageComponent {
}
updateCurrentTask() {
- this.showCompleted
this.checkForNextTask()
this.taskIsNow = checkTaskIsNow(this.nextTask.timestamp)
}
diff --git a/src/app/pages/splash/containers/splash-page.component.ts b/src/app/pages/splash/containers/splash-page.component.ts
index 53e6491fe..753d6f0f0 100644
--- a/src/app/pages/splash/containers/splash-page.component.ts
+++ b/src/app/pages/splash/containers/splash-page.component.ts
@@ -2,13 +2,9 @@ import { Component } from '@angular/core'
import { Globalization } from '@ionic-native/globalization'
import { NavController, NavParams } from 'ionic-angular'
-import {
- DefaultNotificationRefreshTime,
- DefaultNumberOfNotificationsToSchedule
-} from '../../../../assets/data/defaultConfig'
+import { DefaultNotificationRefreshTime } from '../../../../assets/data/defaultConfig'
import { ConfigService } from '../../../core/services/config.service'
import { KafkaService } from '../../../core/services/kafka.service'
-import { NotificationService } from '../../../core/services/notification.service'
import { StorageService } from '../../../core/services/storage.service'
import { StorageKeys } from '../../../shared/enums/storage'
import { EnrolmentPageComponent } from '../../auth/containers/enrolment-page.component'
@@ -21,123 +17,92 @@ import { SplashService } from '../services/splash.service'
})
export class SplashPageComponent {
status = 'Checking enrolment...'
- forceLocalStorageLookUp = true
- hasParentPage = false
constructor(
public navCtrl: NavController,
public navParams: NavParams,
public storage: StorageService,
private splashService: SplashService,
- private notificationService: NotificationService,
private globalization: Globalization,
private kafka: KafkaService,
private configService: ConfigService
) {
- const parentPage = this.navParams.data.parentPage
- if (parentPage) {
- console.log(`VIEW ${parentPage}`)
- this.hasParentPage = true
- }
+ this.splashService
+ .evalEnrolment()
+ .then(
+ participant =>
+ participant
+ ? this.onStart()
+ : this.navCtrl.setRoot(EnrolmentPageComponent)
+ )
+ }
- this.splashService.evalEnrolment().then(participant => {
- if (!participant) {
- this.navCtrl.setRoot(EnrolmentPageComponent)
- } else {
- this.status = 'Updating notifications...'
- Promise.all([
- this.storage.get(StorageKeys.TIME_ZONE),
- this.storage.get(StorageKeys.UTC_OFFSET)
- ])
- .then(([timeZone, utcOffset]) => {
- return this.globalization
- .getDatePattern({
- formatLength: 'short',
- selector: 'date and time'
- })
- .then(res => {
- const offset = new Date().getTimezoneOffset()
- // NOTE: Cancels all notifications and reschedule tasks if timezone has changed
- if (timeZone !== res.timezone || utcOffset !== offset) {
- console.log(
- '[SPLASH] Timezone has changed to ' +
- res.timezone +
- '. Cancelling notifications! Rescheduling tasks! Scheduling new notifications!'
- )
- return this.storage
- .set(StorageKeys.TIME_ZONE, res.timezone)
- .then(() =>
- this.storage.set(StorageKeys.UTC_OFFSET, offset)
- )
- .then(() =>
- this.storage.set(StorageKeys.UTC_OFFSET_PREV, utcOffset)
- )
- .then(() =>
- this.configService.updateConfigStateOnTimezoneChange()
- )
- } else {
- console.log('[SPLASH] Current Timezone is ' + timeZone)
- }
- })
- })
- .then(() => {
- // NOTE: Only run this if not run in last DefaultNotificationRefreshTime
- this.storage
- .get(StorageKeys.LAST_NOTIFICATION_UPDATE)
- .then(lastUpdate => {
- const timeElapsed = Date.now() - lastUpdate
- if (
- timeElapsed > DefaultNotificationRefreshTime ||
- !lastUpdate
- ) {
- console.log('[SPLASH] Scheduling Notifications.')
- return this.configService.rescheduleNotifications()
- } else {
- console.log(
- 'Not Scheduling Notifications as ' +
- timeElapsed +
- 'ms from last refresh is not greater than the default Refresh interval of ' +
- DefaultNotificationRefreshTime
- )
- }
- })
- })
- .catch(error => {
- console.error(error)
- console.log('[SPLASH] Notifications error.')
- })
- .then(() => {
- this.status = 'Sending cached answers...'
- return this.kafka.sendAllAnswersInCache()
- })
- .then(() => {
- this.status = 'Retrieving storage...'
+ onStart() {
+ this.status = 'Updating notifications...'
+ return this.checkTimezoneChange()
+ .then(() => this.notificationsRefresh())
+ .catch(error => {
+ console.error(error)
+ console.log('[SPLASH] Notifications error.')
+ })
+ .then(() => {
+ this.status = 'Sending cached answers...'
+ return this.kafka.sendAllAnswersInCache()
+ })
+ .catch(e => console.log('Error sending cache'))
+ .then(() => this.navCtrl.setRoot(HomePageComponent))
+ }
- if (this.hasParentPage) {
- return Promise.resolve(false)
- }
- })
- .then(() => {
- let isFirstIonDidViewLoad = true
- if (this.hasParentPage) {
- isFirstIonDidViewLoad = false
- }
- this.navCtrl.setRoot(HomePageComponent, {
- isFirstIonDidViewLoad: isFirstIonDidViewLoad
- })
- })
- .catch(error => {
- console.log('[SPLASH] Error while sending cache.')
- const isFirstIonDidViewLoad = false
- this.navCtrl.setRoot(HomePageComponent, {
- isFirstIonDidViewLoad: isFirstIonDidViewLoad
- })
- })
- }
+ checkTimezoneChange() {
+ return Promise.all([
+ this.storage.get(StorageKeys.TIME_ZONE),
+ this.storage.get(StorageKeys.UTC_OFFSET)
+ ]).then(([timezone, prevUtcOffset]) => {
+ return this.globalization
+ .getDatePattern({
+ formatLength: 'short',
+ selector: 'date and time'
+ })
+ .then(res => {
+ const utcOffset = new Date().getTimezoneOffset()
+ // NOTE: Cancels all notifications and reschedule tasks if timezone has changed
+ if (timezone !== res.timezone || prevUtcOffset !== utcOffset) {
+ console.log(
+ '[SPLASH] Timezone has changed to ' +
+ res.timezone +
+ '. Cancelling notifications! Rescheduling tasks! Scheduling new notifications!'
+ )
+ return Promise.all([
+ this.storage.set(StorageKeys.TIME_ZONE, res.timezone),
+ this.storage.set(StorageKeys.UTC_OFFSET, utcOffset),
+ this.storage.set(StorageKeys.UTC_OFFSET_PREV, prevUtcOffset)
+ ]).then(() =>
+ this.configService.updateConfigStateOnTimezoneChange()
+ )
+ } else {
+ console.log('[SPLASH] Current Timezone is ' + timezone)
+ }
+ })
})
}
- ionViewDidLoad() {
- console.log('ionViewDidLoad SplashPage')
+ notificationsRefresh() {
+ // NOTE: Only run this if not run in last DefaultNotificationRefreshTime
+ return this.storage
+ .get(StorageKeys.LAST_NOTIFICATION_UPDATE)
+ .then(lastUpdate => {
+ const timeElapsed = Date.now() - lastUpdate
+ if (timeElapsed > DefaultNotificationRefreshTime || !lastUpdate) {
+ console.log('[SPLASH] Scheduling Notifications.')
+ return this.configService.rescheduleNotifications()
+ } else {
+ console.log(
+ 'Not Scheduling Notifications as ' +
+ timeElapsed +
+ 'ms from last refresh is not greater than the default Refresh interval of ' +
+ DefaultNotificationRefreshTime
+ )
+ }
+ })
}
}
From 40a171aae6a93c8e301be602dd87224a8e4be606 Mon Sep 17 00:00:00 2001
From: pauline <16977973+mpgxvii@users.noreply.github.com>
Date: Thu, 10 Jan 2019 20:06:47 +0000
Subject: [PATCH 19/29] fix ticker bar component and splash page
---
.../ticker-bar/ticker-bar.component.html | 12 +-
.../ticker-bar/ticker-bar.component.ts | 147 ++++++------------
.../containers/splash-page.component.ts | 11 +-
3 files changed, 57 insertions(+), 113 deletions(-)
diff --git a/src/app/pages/home/components/ticker-bar/ticker-bar.component.html b/src/app/pages/home/components/ticker-bar/ticker-bar.component.html
index 22f7c1d8f..5e0f78898 100755
--- a/src/app/pages/home/components/ticker-bar/ticker-bar.component.html
+++ b/src/app/pages/home/components/ticker-bar/ticker-bar.component.html
@@ -1,13 +1,5 @@
-
-
diff --git a/src/app/pages/home/components/ticker-bar/ticker-bar.component.ts b/src/app/pages/home/components/ticker-bar/ticker-bar.component.ts
index 6dfa1ea6c..abd50f89c 100755
--- a/src/app/pages/home/components/ticker-bar/ticker-bar.component.ts
+++ b/src/app/pages/home/components/ticker-bar/ticker-bar.component.ts
@@ -1,4 +1,4 @@
-import { Component, Input, OnChanges } from '@angular/core'
+import { Component, Input, OnChanges, OnInit } from '@angular/core'
import { NavController } from 'ionic-angular'
import { SchedulingService } from '../../../../core/services/scheduling.service'
@@ -19,53 +19,23 @@ export class TickerBarComponent implements OnChanges {
@Input()
isNow
@Input()
- items: TickerItem[] = []
- @Input()
- showAffirmation: boolean = false
- tickerItems: TickerItem[]
- tickerIndex: number = 0
+ showAffirmation = false
+ tickerText: string
report: ReportScheduling
- hasTask: boolean = true
- tickerWeeklyReport: string
- newWeeklyReport: boolean = false
-
constructor(
private schedule: SchedulingService,
private navCtrl: NavController,
private translate: TranslatePipe
- ) {
- // NOTE: Gets ReportScheduling and adds to tickerItems
- /*this.schedule.getCurrentReport().then((report) => {
- this.report = report
- })*/
- }
-
- ngOnChanges(changes) {
- this.updateTickerItems()
- if (this.tickerItems.length > 2) {
- setInterval(() => {
- this.iterateIndex()
- }, 7500)
- }
- }
-
- showNextTickerItem() {
- const style = `translateX(-${this.tickerIndex * 100}%)`
- return style
- }
+ ) {}
- iterateIndex() {
- this.tickerIndex += 1
- if (this.tickerIndex === this.tickerItems.length) {
- this.tickerIndex = 0
- this.updateTickerItems()
- }
+ ngOnChanges() {
+ this.updateTickerItem()
}
openReport() {
this.updateReport()
- this.updateTickerItems()
+ this.updateTickerItem()
this.navCtrl.push(ReportPageComponent)
}
@@ -78,86 +48,71 @@ export class TickerBarComponent implements OnChanges {
}
}
- updateTickerItems() {
- this.tickerItems = []
- if (this.report) {
- this.addReportAvailable()
+ updateTickerItem() {
+ if (!this.tickerText) {
+ return this.addTasksNone()
}
if (this.showAffirmation) {
- this.addAffirmation()
+ return this.addAffirmation()
}
- if (this.task['timestamp'] > 0) {
- this.addTask()
+ if (this.task) {
+ return this.addTask()
}
- if (this.tickerItems.length === 0) {
- this.addTasksNone()
+ if (this.report) {
+ return this.addReportAvailable()
}
- this.tickerItems = this.tickerItems.concat(this.items)
- this.tickerItems.push(this.tickerItems[0])
}
addReportAvailable() {
if (this.report) {
if (this.report['viewed'] === false) {
- const item = this.generateTickerItem(
- 'report',
- '',
- 'Report available! ',
- 'Click to view.'
- )
- this.tickerItems.push(item)
+ this.tickerText = 'Report available! Click to view.'
}
}
}
addTask() {
- const now = new Date()
- const timeToNext = this.getTimeToNext(now.getTime(), this.task.timestamp)
- let item = this.generateTickerItem(
- 'task',
- this.translate.transform(LocKeys.TASK_BAR_NEXT_TASK.toString()),
- timeToNext,
- '.'
- )
- if (timeToNext.includes('-')) {
- item = this.generateTickerItem(
- 'task',
- this.translate.transform(LocKeys.TASK_BAR_NOW_TASK.toString()),
- this.translate.transform(LocKeys.STATUS_NOW.toString()),
- '.'
- )
- } else if (this.task.name === 'ESM') {
- item = this.generateTickerItem(
- 'task',
- this.translate.transform(LocKeys.TASK_BAR_NOW_TASK.toString()),
- this.translate.transform(LocKeys.TASK_BAR_NEXT_TASK_SOON.toString()),
- '.'
- )
+ if (this.isNow) {
+ this.tickerText =
+ this.translate.transform(LocKeys.TASK_BAR_NOW_TASK.toString()) +
+ '' +
+ this.translate.transform(LocKeys.STATUS_NOW.toString()) +
+ '.'
+ } else {
+ if (this.task.name === 'ESM') {
+ this.tickerText =
+ this.translate.transform(LocKeys.TASK_BAR_NOW_TASK.toString()) +
+ '' +
+ this.translate.transform(LocKeys.TASK_BAR_NEXT_TASK_SOON.toString()) +
+ '.'
+ } else {
+ this.tickerText =
+ this.translate.transform(LocKeys.TASK_BAR_NEXT_TASK.toString()) +
+ '' +
+ this.getTimeToNext(this.task.timestamp) +
+ '.'
+ }
}
- this.tickerItems.push(item)
}
addAffirmation() {
- const item = this.generateTickerItem(
- 'affirmation',
- '',
- this.translate.transform(LocKeys.TASK_BAR_AFFIRMATION_1.toString()),
+ this.tickerText =
+ '' +
+ this.translate.transform(LocKeys.TASK_BAR_AFFIRMATION_1.toString()) +
+ '' +
this.translate.transform(LocKeys.TASK_BAR_AFFIRMATION_2.toString())
- )
- this.tickerItems.push(item)
}
addTasksNone() {
- const item = this.generateTickerItem(
- 'tasks-none',
- '',
- this.translate.transform(LocKeys.TASK_BAR_TASK_LEFT_1.toString()),
+ this.tickerText =
+ '' +
+ this.translate.transform(LocKeys.TASK_BAR_TASK_LEFT_1.toString()) +
+ '' +
this.translate.transform(LocKeys.TASK_BAR_TASK_LEFT_2.toString())
- )
- this.tickerItems.push(item)
}
- getTimeToNext(now, next) {
+ getTimeToNext(next) {
+ const now = new Date().getTime()
let deltaStr = ''
const deltaMin = Math.round((next - now) / 60000)
const deltaHour = Math.round(deltaMin / 60)
@@ -182,14 +137,4 @@ export class TickerBarComponent implements OnChanges {
}
return deltaStr
}
-
- generateTickerItem(id, t1, t2, t3): TickerItem {
- const item = {
- id: String(id),
- tickerText1: String(t1),
- tickerText2: String(t2),
- tickerText3: String(t3)
- }
- return item
- }
}
diff --git a/src/app/pages/splash/containers/splash-page.component.ts b/src/app/pages/splash/containers/splash-page.component.ts
index 753d6f0f0..ad6f2c43d 100644
--- a/src/app/pages/splash/containers/splash-page.component.ts
+++ b/src/app/pages/splash/containers/splash-page.component.ts
@@ -2,9 +2,13 @@ import { Component } from '@angular/core'
import { Globalization } from '@ionic-native/globalization'
import { NavController, NavParams } from 'ionic-angular'
-import { DefaultNotificationRefreshTime } from '../../../../assets/data/defaultConfig'
+import {
+ DefaultNotificationRefreshTime,
+ DefaultNumberOfNotificationsToSchedule
+} from '../../../../assets/data/defaultConfig'
import { ConfigService } from '../../../core/services/config.service'
import { KafkaService } from '../../../core/services/kafka.service'
+import { NotificationService } from '../../../core/services/notification.service'
import { StorageService } from '../../../core/services/storage.service'
import { StorageKeys } from '../../../shared/enums/storage'
import { EnrolmentPageComponent } from '../../auth/containers/enrolment-page.component'
@@ -23,6 +27,7 @@ export class SplashPageComponent {
public navParams: NavParams,
public storage: StorageService,
private splashService: SplashService,
+ private notificationService: NotificationService,
private globalization: Globalization,
private kafka: KafkaService,
private configService: ConfigService
@@ -94,7 +99,9 @@ export class SplashPageComponent {
const timeElapsed = Date.now() - lastUpdate
if (timeElapsed > DefaultNotificationRefreshTime || !lastUpdate) {
console.log('[SPLASH] Scheduling Notifications.')
- return this.configService.rescheduleNotifications()
+ return this.notificationService.setNextXNotifications(
+ DefaultNumberOfNotificationsToSchedule
+ )
} else {
console.log(
'Not Scheduling Notifications as ' +
From 5e889d6b75a14e11122876b2c59cf60f3c306e9e Mon Sep 17 00:00:00 2001
From: pauline <16977973+mpgxvii@users.noreply.github.com>
Date: Thu, 10 Jan 2019 17:21:21 +0000
Subject: [PATCH 20/29] fix task info and add meridien
---
.../task-info/task-info.component.html | 55 +++++++++++--------
.../task-info/task-info.component.scss | 25 +++++++--
.../task-info/task-info.component.ts | 41 +++-----------
3 files changed, 59 insertions(+), 62 deletions(-)
diff --git a/src/app/pages/home/components/task-info/task-info.component.html b/src/app/pages/home/components/task-info/task-info.component.html
index e7cc98f9c..8f5f8f703 100755
--- a/src/app/pages/home/components/task-info/task-info.component.html
+++ b/src/app/pages/home/components/task-info/task-info.component.html
@@ -1,7 +1,4 @@
-
- {{ item.tickerText1 }}
- {{ item.tickerText2 }}
- {{ item.tickerText3 }}
-
+
+
+
min
-
- {{ "STATUS_NOW" | translate }}
+
+
+ {{ "STATUS_NOW" | translate }}
+
-
-
diff --git a/src/app/pages/home/components/task-info/task-info.component.scss b/src/app/pages/home/components/task-info/task-info.component.scss
index 5a8528b2e..2747ad13c 100755
--- a/src/app/pages/home/components/task-info/task-info.component.scss
+++ b/src/app/pages/home/components/task-info/task-info.component.scss
@@ -36,7 +36,11 @@ task-info {
}
.time-expanded {
- margin-right: -40px;
+ margin-right: -12vw;
+ }
+
+ .time {
+ margin-right: -5vw;
}
.text-lg {
@@ -48,7 +52,6 @@ task-info {
.text-md {
float: left;
margin-top: -2vw;
- padding-right: 3vw;
font-size: 14vw;
}
@@ -66,11 +69,11 @@ task-info {
.extra-info {
margin-top: -7px;
text-align: center;
- font-size: 18px;
+ font-size: 2vh;
}
.extra-info-icon {
- height: 15px;
+ height: 1.5vh;
}
.icon-padding {
@@ -80,4 +83,18 @@ task-info {
.icon-sm {
height: 18px;
}
+
+ .meridiem {
+ margin-top: 6px;
+ margin-left: -4vw;
+ writing-mode: vertical-rl;
+ font-size: 2.5vh;
+ text-orientation: upright;
+ }
+
+ .min-merid {
+ margin-top: -5vw;
+ margin-bottom: -14vw;
+ width: 30vw;
+ }
}
diff --git a/src/app/pages/home/components/task-info/task-info.component.ts b/src/app/pages/home/components/task-info/task-info.component.ts
index 18de3c6e6..97c2fc05b 100755
--- a/src/app/pages/home/components/task-info/task-info.component.ts
+++ b/src/app/pages/home/components/task-info/task-info.component.ts
@@ -1,11 +1,5 @@
import { animate, state, style, transition, trigger } from '@angular/animations'
-import {
- Component,
- EventEmitter,
- Input,
- OnChanges,
- Output
-} from '@angular/core'
+import { Component, Input, OnChanges } from '@angular/core'
import { StorageService } from '../../../../core/services/storage.service'
import { StorageKeys } from '../../../../shared/enums/storage'
@@ -23,7 +17,7 @@ import { Task, TasksProgress } from '../../../../shared/models/task'
trigger('scaleMinutes', [
state(
'false',
- style({ transform: 'translate3d(-25%, -15%, 0) scale(0.45)' })
+ style({ transform: 'translate3d(-25%, -15%, 0) scale(0.4)' })
),
state('true', style({ transform: 'translate3d(0, 0, 0) scale(1)' })),
transition('* => *', animate('400ms ease'))
@@ -34,7 +28,7 @@ import { Task, TasksProgress } from '../../../../shared/models/task'
transition('* => *', animate('400ms ease'))
]),
trigger('alignCenterRightTime', [
- state('false', style({ transform: 'translate3d(15%, 0, 0) scale(0.8)' })),
+ state('false', style({ transform: 'translate3d(8%, 0, 0) scale(0.8)' })),
state('true', style({ transform: 'translate3d(0, 0, 0)' })),
transition('* => *', animate('400ms ease'))
]),
@@ -65,11 +59,10 @@ export class TaskInfoComponent implements OnChanges {
progress: TasksProgress
@Input()
expanded = true
- hasExtraInfo: Boolean = false
- displayTask: Boolean = false
+ hasExtraInfo: boolean
+ extraTaskInfo: string
private language: string
- private extraTaskInfo: string
max: number = 1
current: number = 0
@@ -83,29 +76,13 @@ export class TaskInfoComponent implements OnChanges {
}
ngOnChanges() {
- this.checkDisplayTask()
this.checkHasExtraInfo()
this.updateProgress()
}
- checkDisplayTask() {
- if (this.task['timestamp'] > 0) {
- this.displayTask = true
- } else {
- this.displayTask = false
- }
- }
-
checkHasExtraInfo() {
- if (this.task['warning'] !== '') {
- this.hasExtraInfo = true
- if (this.language) {
- this.extraTaskInfo = this.task.warning[this.language]
- this.hasExtraInfo = this.extraTaskInfo ? true : false
- }
- } else {
- this.hasExtraInfo = false
- }
+ this.hasExtraInfo = !!this.task.warning[this.language]
+ this.extraTaskInfo = this.task.warning[this.language]
}
updateProgress() {
@@ -145,8 +122,4 @@ export class TaskInfoComponent implements OnChanges {
: String(numberToFormat)
return format
}
-
- getExtraInfo() {
- return this.extraTaskInfo
- }
}
From 0782ad77c107db9c01f08b02454f8f572d43c229 Mon Sep 17 00:00:00 2001
From: pauline <16977973+mpgxvii@users.noreply.github.com>
Date: Thu, 10 Jan 2019 17:22:10 +0000
Subject: [PATCH 21/29] move notaskstoday to task progress component and fix
fireworks
---
.../task-progress.component.html | 89 ++++++++++---------
.../task-progress.component.scss | 14 +--
.../task-progress/task-progress.component.ts | 10 +--
3 files changed, 56 insertions(+), 57 deletions(-)
diff --git a/src/app/pages/home/components/task-progress/task-progress.component.html b/src/app/pages/home/components/task-progress/task-progress.component.html
index c49b68293..92a9ab792 100755
--- a/src/app/pages/home/components/task-progress/task-progress.component.html
+++ b/src/app/pages/home/components/task-progress/task-progress.component.html
@@ -1,60 +1,61 @@
-
- {{ getHour() }}
-
+ 
- {{ getExtraInfo() }}
+ {{ extraTaskInfo }}
+
@@ -80,10 +87,10 @@
[@alignCenterRightExtraInfo]="expanded"
>
+
{{ "TASK_BAR_NEXT_TASK_SOON" | translate }}
-
-
: {{ getMinutes() }}
+
+
+ {{ getHour() }}
+
+ :{{ getMinutes() }}
+ {{ getMeridiem() }}
+
+
- {{ getExtraInfo() }}
+ {{ extraTaskInfo }}
-
+
+ 
-
-
-
-
-
-
+
+
-
![]()
@@ -79,6 +71,7 @@
class="size-static"
>
- nextTask: Task = DefaultTask
- showCalendar: boolean = false
- showCompleted: boolean = false
- showNoTasksToday: boolean = false
- tasksProgress: TasksProgress
- startingQuestionnaire: boolean = false
+ nextTask: Task
+ showCalendar = false
+ showCompleted = false
+ showNoTasksToday = false
+ tasksProgress: TasksProgress = { numberOfTasks: 1, completedTasks: 0 }
+ startingQuestionnaire = false
hasClinicalTasks = false
- hasOnlyESMs = false
taskIsNow = false
- nextTaskIsLoading = true
+ checkTaskInterval
constructor(
public navCtrl: NavController,
@@ -58,73 +57,46 @@ export class HomePageComponent {
) {
this.platform.resume.subscribe(e => {
this.kafka.sendAllAnswersInCache()
- this.updateCurrentTask()
+ this.checkForNextTask()
})
}
- ionViewWillEnter() {
+ ionViewDidLoad() {
this.tasks = this.tasksService.getTasksOfToday()
- this.tasks.then(
- tasks => (this.tasksProgress = this.tasksService.getTaskProgress(tasks))
- )
- this.showNoTasksToday = false
+ this.tasks.then(tasks => {
+ this.checkTaskInterval = setInterval(() => {
+ this.checkForNextTask()
+ }, 1000)
+ this.tasksProgress = this.tasksService.getTaskProgress(tasks)
+ this.showNoTasksToday = this.tasksProgress.numberOfTasks == 0
+ })
this.startingQuestionnaire = false
- }
-
- ionViewDidLoad() {
- setInterval(() => {
- this.updateCurrentTask()
- }, 1000)
this.evalHasClinicalTasks()
- this.checkIfOnlyESM()
this.tasksService.sendNonReportedTaskCompletion()
}
- updateCurrentTask() {
- this.checkForNextTask()
- this.taskIsNow = checkTaskIsNow(this.nextTask.timestamp)
- }
-
checkForNextTask() {
- if (!this.showCalendar) {
- this.nextTaskIsLoading = true
- this.tasks.then(tasks =>
- this.checkForNextTaskGeneric(this.tasksService.getNextTask(tasks))
- )
- }
+ this.tasks.then(tasks =>
+ this.checkForNextTaskGeneric(this.tasksService.getNextTask(tasks))
+ )
}
checkForNextTaskGeneric(task) {
if (task && task.isClinical == false) {
this.nextTask = task
this.taskIsNow = checkTaskIsNow(this.nextTask.timestamp)
+ this.showCompleted = !this.nextTask
} else {
- this.tasksService.areAllTasksComplete().then(completed => {
- if (completed) {
- this.nextTask = DefaultTask
- this.showCompleted = true
- if (!this.tasksProgress) {
- this.showNoTasksToday = true
- }
- } else {
- this.nextTask = DefaultTask
+ this.taskIsNow = false
+ this.nextTask = null
+ this.tasks.then(tasks => {
+ this.showCompleted = this.tasksService.areAllTasksComplete(tasks)
+ if (this.showCompleted) {
+ clearInterval(this.checkTaskInterval)
+ this.showCalendar = false
}
})
}
- this.nextTaskIsLoading = false
- }
-
- checkIfOnlyESM() {
- this.tasks.then(tasks => {
- let tmpHasOnlyESMs = true
- for (let i = 0; i < tasks.length; i++) {
- if (tasks[i].name !== 'ESM') {
- tmpHasOnlyESMs = false
- break
- }
- }
- this.hasOnlyESMs = tmpHasOnlyESMs
- })
}
evalHasClinicalTasks() {
@@ -134,7 +106,7 @@ export class HomePageComponent {
}
displayTaskCalendar() {
- if (this.nextTask.name !== 'ESM') this.showCalendar = !this.showCalendar
+ this.showCalendar = !this.showCalendar
}
openSettingsPage() {
diff --git a/src/app/pages/home/services/tasks.service.ts b/src/app/pages/home/services/tasks.service.ts
index 5928d90e2..5791f0043 100644
--- a/src/app/pages/home/services/tasks.service.ts
+++ b/src/app/pages/home/services/tasks.service.ts
@@ -42,23 +42,17 @@ export class TasksService {
}
}
- getNextTask(tasks) {
- return this.retrieveNextTask(tasks)
- }
-
- areAllTasksComplete() {
- return this.getTasksOfToday().then((tasks: Task[]) => {
- if (tasks) {
- for (let i = 0; i < tasks.length; i++) {
- if (tasks[i].name !== 'ESM' && tasks[i].isClinical == false) {
- if (tasks[i].completed === false) {
- return false
- }
+ areAllTasksComplete(tasks) {
+ if (tasks) {
+ for (let i = 0; i < tasks.length; i++) {
+ if (tasks[i].name !== 'ESM' && tasks[i].isClinical == false) {
+ if (tasks[i].completed === false) {
+ return false
}
}
}
- return true
- })
+ }
+ return true
}
isLastTask(task, todaysTasks) {
@@ -82,7 +76,7 @@ export class TasksService {
* @returns {@link Task} : The next incomplete task from the list. This essentially
* translates to which questionnaire the `START` button on home page corresponds to.
*/
- retrieveNextTask(tasks: Task[]): Task {
+ getNextTask(tasks: Task[]): Task {
if (tasks) {
const now = new Date()
const offsetTimeESM = 1000 * 60 * 10 // 10 min
From 4a9e145b9fa17ea19ea26174cdf92f5e02040649 Mon Sep 17 00:00:00 2001
From: pauline <16977973+mpgxvii@users.noreply.github.com>
Date: Fri, 11 Jan 2019 12:39:26 +0000
Subject: [PATCH 24/29] fix home page animation easing
---
src/app/pages/home/containers/home-page.component.ts | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/app/pages/home/containers/home-page.component.ts b/src/app/pages/home/containers/home-page.component.ts
index 63d5e5168..c365db7e2 100755
--- a/src/app/pages/home/containers/home-page.component.ts
+++ b/src/app/pages/home/containers/home-page.component.ts
@@ -29,7 +29,7 @@ import { TasksService } from '../services/tasks.service'
trigger('displayCalendar', [
state('true', style({ transform: 'translateY(0%)' })),
state('false', style({ transform: 'translateY(100%)' })),
- transition('*=>*', animate('300ms'))
+ transition('*=>*', animate('300ms ease-out'))
])
]
})
From de52db5a05c21dc6266117969f018741c891f5d9 Mon Sep 17 00:00:00 2001
From: pauline <16977973+mpgxvii@users.noreply.github.com>
Date: Mon, 14 Jan 2019 17:09:58 +0000
Subject: [PATCH 25/29] fix: update version and minor fix
---
config.xml | 188 +++++++++---------
.../home/containers/home-page.component.ts | 5 +-
2 files changed, 97 insertions(+), 96 deletions(-)
diff --git a/config.xml b/config.xml
index c1821a81c..6f08d617b 100755
--- a/config.xml
+++ b/config.xml
@@ -1,97 +1,95 @@
-
- RADAR Questionnaire
- An application that collects active data for research.
- RADAR-CNS
-
-
-
-
-
+ RADAR Questionnaire
+ An application that collects active data for research.
+ RADAR-CNS
+
+
+
+
+
diff --git a/src/app/pages/home/containers/home-page.component.ts b/src/app/pages/home/containers/home-page.component.ts
index c365db7e2..2cb3eedbf 100755
--- a/src/app/pages/home/containers/home-page.component.ts
+++ b/src/app/pages/home/containers/home-page.component.ts
@@ -61,6 +61,10 @@ export class HomePageComponent {
})
}
+ ionViewWillEnter() {
+ this.startingQuestionnaire = false
+ }
+
ionViewDidLoad() {
this.tasks = this.tasksService.getTasksOfToday()
this.tasks.then(tasks => {
@@ -70,7 +74,6 @@ export class HomePageComponent {
this.tasksProgress = this.tasksService.getTaskProgress(tasks)
this.showNoTasksToday = this.tasksProgress.numberOfTasks == 0
})
- this.startingQuestionnaire = false
this.evalHasClinicalTasks()
this.tasksService.sendNonReportedTaskCompletion()
}
From aa09299a59657dba9476b297380c8964ad23d794 Mon Sep 17 00:00:00 2001
From: pauline <16977973+mpgxvii@users.noreply.github.com>
Date: Mon, 14 Jan 2019 17:36:42 +0000
Subject: [PATCH 26/29] fix translation
---
src/assets/data/localisations.ts | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/src/assets/data/localisations.ts b/src/assets/data/localisations.ts
index 1ee85df8c..788fd2df0 100644
--- a/src/assets/data/localisations.ts
+++ b/src/assets/data/localisations.ts
@@ -441,8 +441,8 @@ export const Localisations = {
BTN_FINISH: {
da: 'Afslut',
de: 'Fertig',
- en: 'Finalizado',
- es: 'Terminar',
+ en: 'Finish',
+ es: 'Finalizado',
it: 'Fine',
nl: 'Voltooid'
},
From e424d2a9fec12d4f657649b0a9213f4579e56496 Mon Sep 17 00:00:00 2001
From: pauline <16977973+mpgxvii@users.noreply.github.com>
Date: Mon, 14 Jan 2019 23:10:17 +0000
Subject: [PATCH 27/29] fix animations and answerService reset
---
.../components/task-progress/task-progress.component.scss | 1 -
.../pages/home/components/ticker-bar/ticker-bar.component.ts | 2 +-
src/app/pages/home/containers/home-page.component.html | 1 +
src/app/pages/home/containers/home-page.component.scss | 1 -
src/app/pages/home/containers/home-page.component.ts | 5 +++++
.../pages/questions/containers/questions-page.component.ts | 4 ++--
6 files changed, 9 insertions(+), 5 deletions(-)
diff --git a/src/app/pages/home/components/task-progress/task-progress.component.scss b/src/app/pages/home/components/task-progress/task-progress.component.scss
index 22c6043c0..744b455cb 100755
--- a/src/app/pages/home/components/task-progress/task-progress.component.scss
+++ b/src/app/pages/home/components/task-progress/task-progress.component.scss
@@ -182,7 +182,6 @@ task-progress {
.counter {
margin-top: -34vw;
text-align: center;
- transition: transform 0.4s ease-in-out;
}
.large {
diff --git a/src/app/pages/home/components/ticker-bar/ticker-bar.component.ts b/src/app/pages/home/components/ticker-bar/ticker-bar.component.ts
index 552fe52eb..662af4ec1 100755
--- a/src/app/pages/home/components/ticker-bar/ticker-bar.component.ts
+++ b/src/app/pages/home/components/ticker-bar/ticker-bar.component.ts
@@ -93,7 +93,7 @@ export class TickerBarComponent implements OnChanges {
this.tickerText =
'' +
this.translate.transform(LocKeys.TASK_BAR_AFFIRMATION_1.toString()) +
- '' +
+ ' ' +
this.translate.transform(LocKeys.TASK_BAR_AFFIRMATION_2.toString())
}
diff --git a/src/app/pages/home/containers/home-page.component.html b/src/app/pages/home/containers/home-page.component.html
index 3614d8a43..b39d837d1 100755
--- a/src/app/pages/home/containers/home-page.component.html
+++ b/src/app/pages/home/containers/home-page.component.html
@@ -29,6 +29,7 @@
*', animate('300ms ease-out'))
+ ]),
+ trigger('moveProgress', [
+ state('true', style({ transform: 'translateY(-100%)' })),
+ state('false', style({ transform: 'translateY(0%)' })),
+ transition('*=>*', animate('300ms ease-out'))
])
]
})
diff --git a/src/app/pages/questions/containers/questions-page.component.ts b/src/app/pages/questions/containers/questions-page.component.ts
index df14e21d7..0474d3ed3 100755
--- a/src/app/pages/questions/containers/questions-page.component.ts
+++ b/src/app/pages/questions/containers/questions-page.component.ts
@@ -81,6 +81,8 @@ export class QuestionsPageComponent {
this.associatedTask = this.navParams.data.associatedTask
this.endText = this.navParams.data.endText
this.isLastTask = this.navParams.data.isLastTask
+ this.answerService.reset()
+ this.timestampService.reset()
}
evalIfFirstQuestionnaireToSkipESMSleepQuestion() {
@@ -198,8 +200,6 @@ export class QuestionsPageComponent {
navigateToFinishPage() {
this.answers = this.answerService.answers
this.timestamps = this.timestampService.timestamps
- this.answerService.reset()
- this.timestampService.reset()
this.navCtrl.push(FinishPageComponent, {
endText: this.endText,
From 9ce716fe36408f03bd77564872d29e15c7125de8 Mon Sep 17 00:00:00 2001
From: pauline <16977973+mpgxvii@users.noreply.github.com>
Date: Tue, 15 Jan 2019 12:55:18 +0000
Subject: [PATCH 28/29] fix: cache
---
src/app/core/services/kafka.service.ts | 1 +
1 file changed, 1 insertion(+)
diff --git a/src/app/core/services/kafka.service.ts b/src/app/core/services/kafka.service.ts
index 71b8e682b..62483d5cc 100755
--- a/src/app/core/services/kafka.service.ts
+++ b/src/app/core/services/kafka.service.ts
@@ -210,6 +210,7 @@ export class KafkaService {
cacheAnswers(specs) {
const kafkaObject = specs.kafkaObject
this.storage.get(StorageKeys.CACHE_ANSWERS).then(cache => {
+ if (!cache) cache = {}
console.log('KAFKA-SERVICE: Caching answers.')
cache[kafkaObject.value.time] = specs
this.storage.set(StorageKeys.CACHE_ANSWERS, cache)
From 74939fb703add15035153851934f34ee23d1a50d Mon Sep 17 00:00:00 2001
From: pauline <16977973+mpgxvii@users.noreply.github.com>
Date: Wed, 16 Jan 2019 18:16:04 +0300
Subject: [PATCH 29/29] fix: cache and timezone
---
src/app/core/services/kafka.service.ts | 33 ++++++-------
src/app/core/services/storage.service.ts | 11 ++++-
.../containers/splash-page.component.ts | 49 +++++++------------
3 files changed, 42 insertions(+), 51 deletions(-)
diff --git a/src/app/core/services/kafka.service.ts b/src/app/core/services/kafka.service.ts
index 62483d5cc..5fb075eb7 100755
--- a/src/app/core/services/kafka.service.ts
+++ b/src/app/core/services/kafka.service.ts
@@ -210,7 +210,6 @@ export class KafkaService {
cacheAnswers(specs) {
const kafkaObject = specs.kafkaObject
this.storage.get(StorageKeys.CACHE_ANSWERS).then(cache => {
- if (!cache) cache = {}
console.log('KAFKA-SERVICE: Caching answers.')
cache[kafkaObject.value.time] = specs
this.storage.set(StorageKeys.CACHE_ANSWERS, cache)
@@ -221,33 +220,29 @@ export class KafkaService {
if (!this.cacheSending) {
this.cacheSending = !this.cacheSending
this.sendToKafkaFromCache()
- .then(() => (this.cacheSending = !this.cacheSending))
.catch(e => console.log('Cache could not be sent.'))
+ .then(() => (this.cacheSending = !this.cacheSending))
}
}
sendToKafkaFromCache() {
return this.storage.get(StorageKeys.CACHE_ANSWERS).then(cache => {
- if (!cache) {
- return this.storage.set(StorageKeys.CACHE_ANSWERS, {})
- } else {
- const promises = []
- let noOfTasks = 0
- for (const answerKey in cache) {
- if (answerKey) {
- const cacheObject = cache[answerKey]
- promises.push(this.createPayloadAndSend(cacheObject))
- noOfTasks += 1
- if (noOfTasks === 20) {
- break
- }
+ const promises = []
+ let noOfTasks = 0
+ for (const answerKey in cache) {
+ if (answerKey) {
+ const cacheObject = cache[answerKey]
+ promises.push(this.createPayloadAndSend(cacheObject))
+ noOfTasks += 1
+ if (noOfTasks === 20) {
+ break
}
}
- return Promise.all(promises).then(res => {
- console.log(res)
- return Promise.resolve(res)
- })
}
+ return Promise.all(promises).then(res => {
+ console.log(res)
+ return Promise.resolve(res)
+ })
})
}
diff --git a/src/app/core/services/storage.service.ts b/src/app/core/services/storage.service.ts
index 048a02caf..8ce969c80 100755
--- a/src/app/core/services/storage.service.ts
+++ b/src/app/core/services/storage.service.ts
@@ -74,6 +74,11 @@ export class StorageService {
StorageKeys.SCHEDULE_VERSION,
DefaultScheduleVersion
)
+ const utc = this.set(
+ StorageKeys.UTC_OFFSET,
+ new Date().getTimezoneOffset()
+ )
+ const cache = this.set(StorageKeys.CACHE_ANSWERS, {})
return Promise.all([
pId,
@@ -84,7 +89,11 @@ export class StorageService {
notif,
report,
langs,
- version
+ version,
+ utc,
+ cache,
+ enrolmentDate,
+ referenceDate
])
}
})
diff --git a/src/app/pages/splash/containers/splash-page.component.ts b/src/app/pages/splash/containers/splash-page.component.ts
index ad6f2c43d..f45bcb325 100644
--- a/src/app/pages/splash/containers/splash-page.component.ts
+++ b/src/app/pages/splash/containers/splash-page.component.ts
@@ -1,5 +1,4 @@
import { Component } from '@angular/core'
-import { Globalization } from '@ionic-native/globalization'
import { NavController, NavParams } from 'ionic-angular'
import {
@@ -28,7 +27,6 @@ export class SplashPageComponent {
public storage: StorageService,
private splashService: SplashService,
private notificationService: NotificationService,
- private globalization: Globalization,
private kafka: KafkaService,
private configService: ConfigService
) {
@@ -59,35 +57,24 @@ export class SplashPageComponent {
}
checkTimezoneChange() {
- return Promise.all([
- this.storage.get(StorageKeys.TIME_ZONE),
- this.storage.get(StorageKeys.UTC_OFFSET)
- ]).then(([timezone, prevUtcOffset]) => {
- return this.globalization
- .getDatePattern({
- formatLength: 'short',
- selector: 'date and time'
- })
- .then(res => {
- const utcOffset = new Date().getTimezoneOffset()
- // NOTE: Cancels all notifications and reschedule tasks if timezone has changed
- if (timezone !== res.timezone || prevUtcOffset !== utcOffset) {
- console.log(
- '[SPLASH] Timezone has changed to ' +
- res.timezone +
- '. Cancelling notifications! Rescheduling tasks! Scheduling new notifications!'
- )
- return Promise.all([
- this.storage.set(StorageKeys.TIME_ZONE, res.timezone),
- this.storage.set(StorageKeys.UTC_OFFSET, utcOffset),
- this.storage.set(StorageKeys.UTC_OFFSET_PREV, prevUtcOffset)
- ]).then(() =>
- this.configService.updateConfigStateOnTimezoneChange()
- )
- } else {
- console.log('[SPLASH] Current Timezone is ' + timezone)
- }
- })
+ return this.storage.get(StorageKeys.UTC_OFFSET).then(prevUtcOffset => {
+ const utcOffset = new Date().getTimezoneOffset()
+ // NOTE: Cancels all notifications and reschedule tasks if timezone has changed
+ if (prevUtcOffset !== utcOffset) {
+ console.log(
+ '[SPLASH] Timezone has changed to ' +
+ utcOffset +
+ '. Cancelling notifications! Rescheduling tasks! Scheduling new notifications!'
+ )
+ return this.storage
+ .set(StorageKeys.UTC_OFFSET, utcOffset)
+ .then(() =>
+ this.storage.set(StorageKeys.UTC_OFFSET_PREV, prevUtcOffset)
+ )
+ .then(() => this.configService.updateConfigStateOnTimezoneChange())
+ } else {
+ console.log('[SPLASH] Current Timezone is ' + utcOffset)
+ }
})
}
-
+
-
-
-
-
+
+
+
+
= this.max) {
- this.displayFireworks(800, 980)
- }
- }
}
From f897c245f7c1d7e67c08ec451f43cb0a67476ccd Mon Sep 17 00:00:00 2001
From: pauline <16977973+mpgxvii@users.noreply.github.com>
Date: Thu, 10 Jan 2019 17:22:33 +0000
Subject: [PATCH 22/29] add notaskstoday info to tickerbar
---
.../ticker-bar/ticker-bar.component.ts | 32 ++++++++++---------
1 file changed, 17 insertions(+), 15 deletions(-)
diff --git a/src/app/pages/home/components/ticker-bar/ticker-bar.component.ts b/src/app/pages/home/components/ticker-bar/ticker-bar.component.ts
index abd50f89c..552fe52eb 100755
--- a/src/app/pages/home/components/ticker-bar/ticker-bar.component.ts
+++ b/src/app/pages/home/components/ticker-bar/ticker-bar.component.ts
@@ -1,11 +1,10 @@
-import { Component, Input, OnChanges, OnInit } from '@angular/core'
+import { Component, Input, OnChanges } from '@angular/core'
import { NavController } from 'ionic-angular'
import { SchedulingService } from '../../../../core/services/scheduling.service'
import { LocKeys } from '../../../../shared/enums/localisations'
import { ReportScheduling } from '../../../../shared/models/report'
import { Task } from '../../../../shared/models/task'
-import { TickerItem } from '../../../../shared/models/ticker'
import { TranslatePipe } from '../../../../shared/pipes/translate/translate'
import { ReportPageComponent } from '../../../report/containers/report-page.component'
@@ -20,6 +19,8 @@ export class TickerBarComponent implements OnChanges {
isNow
@Input()
showAffirmation = false
+ @Input()
+ noTasksToday = false
tickerText: string
report: ReportScheduling
@@ -49,18 +50,11 @@ export class TickerBarComponent implements OnChanges {
}
updateTickerItem() {
- if (!this.tickerText) {
- return this.addTasksNone()
- }
- if (this.showAffirmation) {
- return this.addAffirmation()
- }
- if (this.task) {
- return this.addTask()
- }
- if (this.report) {
- return this.addReportAvailable()
- }
+ if (!this.tickerText) return this.addTasksRemaining()
+ if (this.noTasksToday) return this.addTasksNone()
+ if (this.showAffirmation) return this.addAffirmation()
+ if (this.task) return this.addTask()
+ if (this.report) return this.addReportAvailable()
}
addReportAvailable() {
@@ -103,7 +97,7 @@ export class TickerBarComponent implements OnChanges {
this.translate.transform(LocKeys.TASK_BAR_AFFIRMATION_2.toString())
}
- addTasksNone() {
+ addTasksRemaining() {
this.tickerText =
'' +
this.translate.transform(LocKeys.TASK_BAR_TASK_LEFT_1.toString()) +
@@ -111,6 +105,14 @@ export class TickerBarComponent implements OnChanges {
this.translate.transform(LocKeys.TASK_BAR_TASK_LEFT_2.toString())
}
+ addTasksNone() {
+ this.tickerText =
+ '' +
+ this.translate.transform(LocKeys.TASK_BAR_NO_TASK_1.toString()) +
+ ' ' +
+ this.translate.transform(LocKeys.TASK_BAR_NO_TASK_2.toString())
+ }
+
getTimeToNext(next) {
const now = new Date().getTime()
let deltaStr = ''
From 67f9adffdb241fdb4e551ead00fe41abef05446f Mon Sep 17 00:00:00 2001
From: pauline <16977973+mpgxvii@users.noreply.github.com>
Date: Thu, 10 Jan 2019 17:23:35 +0000
Subject: [PATCH 23/29] fix home page component data functions
---
.../home/containers/home-page.component.html | 19 ++---
.../home/containers/home-page.component.scss | 9 --
.../home/containers/home-page.component.ts | 84 +++++++------------
src/app/pages/home/services/tasks.service.ts | 24 ++----
4 files changed, 43 insertions(+), 93 deletions(-)
diff --git a/src/app/pages/home/containers/home-page.component.html b/src/app/pages/home/containers/home-page.component.html
index 09ed1e5e5..3614d8a43 100755
--- a/src/app/pages/home/containers/home-page.component.html
+++ b/src/app/pages/home/containers/home-page.component.html
@@ -34,18 +34,9 @@
[progress]="tasksProgress"
[forceComplete]="showCompleted"
[noTasksToday]="showNoTasksToday"
- *ngIf="tasksProgress && !hasOnlyESMs && !showCalendar"
+ *ngIf="tasksProgress && !showCalendar"
>
-
-
-
-