From 4f3ba91eb4083221141ce839b174ecf4da54009b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Eudes=20In=C3=A1cio?= Date: Tue, 23 Nov 2021 13:55:43 +0100 Subject: [PATCH 1/5] Offline background color bug fix on init app --- src/app/app.component.ts | 20 ++++++++++---------- src/app/services/background.service.ts | 7 ++++++- 2 files changed, 16 insertions(+), 11 deletions(-) diff --git a/src/app/app.component.ts b/src/app/app.component.ts index 9e8e8372a..446c2fd4e 100644 --- a/src/app/app.component.ts +++ b/src/app/app.component.ts @@ -11,6 +11,7 @@ import { NGX_MAT_DATE_FORMATS } from '@angular-material-components/datetime-pick import { SqliteService } from 'src/app/services/sqlite.service'; import { BackgroundService } from 'src/app/services/background.service'; import { ScreenOrientation } from '@ionic-native/screen-orientation/ngx'; +import { StorageService } from 'src/app/services/storage.service'; const CUSTOM_DATE_FORMATS: NgxMatDateFormats = { @@ -41,7 +42,8 @@ export class AppComponent { private statusBar: StatusBar, private screenOrientation: ScreenOrientation, private sqliteservice: SqliteService, - private backgroundservice: BackgroundService + private backgroundservice: BackgroundService, + private storageservice: StorageService ) { this.initializeApp(); } @@ -68,17 +70,15 @@ export class AppComponent { } } - window.addEventListener('online', () => { - console.log('Became online') - this.backgroundservice.online() - if (this.platform.is('desktop') || this.platform.is('mobileweb')) { + this.storageservice.get('networkCheckStore').then((network) => { + if(network === 'online') { + console.log('Network app componente check', network) + this.backgroundservice.online() } else { + console.log('Network app componente check', network) + this.backgroundservice.offline(); } - }); - window.addEventListener('offline', () => { - console.log('Became offline') - this.backgroundservice.offline() - }); + }) }); } diff --git a/src/app/services/background.service.ts b/src/app/services/background.service.ts index e1670c200..acd6153ec 100644 --- a/src/app/services/background.service.ts +++ b/src/app/services/background.service.ts @@ -1,5 +1,6 @@ import { Injectable } from '@angular/core'; import { ThemeService } from 'src/app/services/theme.service'; +import { StorageService} from 'src/app/services/storage.service'; @Injectable({ providedIn: 'root' @@ -13,7 +14,8 @@ export class BackgroundService { }[] = [] constructor( - private themeservice: ThemeService + private themeservice: ThemeService, + private storageservice: StorageService ) { } online() { @@ -24,6 +26,7 @@ export class BackgroundService { document.body.style.setProperty(`--color3`, "#d9d9d9"); document.body.style.setProperty(`--color4`, "#d9d9d9ee"); document.body.style.setProperty(`--color5`, "#ececec"); + this.storageservice.store('networkCheckStore','online'); } else { document.body.style.setProperty(`--color`, "#0782C9"); @@ -31,6 +34,7 @@ export class BackgroundService { document.body.style.setProperty(`--color3`, "#0782C9"); document.body.style.setProperty(`--color4`, "#0782c9f0"); document.body.style.setProperty(`--color5`, "#45BAFF"); + this.storageservice.store('networkCheckStore','online'); } this.callBacks.forEach((e) => { @@ -46,6 +50,7 @@ export class BackgroundService { document.body.style.setProperty(`--color3`, "#ffb703"); document.body.style.setProperty(`--color4`, "#ffb703"); document.body.style.setProperty(`--color5`, "#ffb703"); + this.storageservice.store('networkCheckStore','offline'); this.callBacks.forEach((e) => { if (e.type == 'Offline') { e.funx() From 3512e44a977d82146b8e828693a2adab746e0bdf Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Eudes=20In=C3=A1cio?= Date: Tue, 23 Nov 2021 13:56:41 +0100 Subject: [PATCH 2/5] Bug fix na agenda presenting events --- src/app/pages/agenda/agenda.page.ts | 39 ++++++++++++++++++++++------- 1 file changed, 30 insertions(+), 9 deletions(-) diff --git a/src/app/pages/agenda/agenda.page.ts b/src/app/pages/agenda/agenda.page.ts index 07ae8a76f..5bf088374 100644 --- a/src/app/pages/agenda/agenda.page.ts +++ b/src/app/pages/agenda/agenda.page.ts @@ -161,6 +161,7 @@ export class AgendaPage implements OnInit { dropdownScrollWeal = false CalendarStore = CalendarStore listToPresent + array = [] constructor( private alertCtrl: AlertController, @@ -232,6 +233,8 @@ export class AgendaPage implements OnInit { ngOnInit() { + this.getFromDB(); + const pathname = window.location.pathname let realoadCounter = 0 this.router.events.forEach((event) => { @@ -240,14 +243,14 @@ export class AgendaPage implements OnInit { this.segment = "Combinado"; } if (realoadCounter != 0) { - this.loadRangeEvents(this.rangeStartDate, this.rangeEndDate); + //this.loadRangeEvents(this.rangeStartDate, this.rangeEndDate); } realoadCounter++; } }); this.backgroundservice.registerBackService('Online', () => { - this.loadRangeEvents(this.rangeStartDate, this.rangeEndDate); + //this.loadRangeEvents(this.rangeStartDate, this.rangeEndDate); }); window.onresize = (event) => { @@ -514,6 +517,7 @@ export class AgendaPage implements OnInit { this.TimelineMDList = this.listBoxService.list(this.listToPresent, 'md', this.rangeStartDate, this.rangeEndDate, { segment: this.segment, selectedDate: this.eventSelectedDate }) + console.log('check list to present data', this.listToPresent); this.myCal.update(); this.myCal.loadEvents(); @@ -540,13 +544,17 @@ export class AgendaPage implements OnInit { this.TimelineMDList = this.listBoxService.list(this.listToPresent, 'pr', this.rangeStartDate, this.rangeEndDate, { segment: this.segment, selectedDate: this.eventSelectedDate }) + console.log('check list to present data', this.listToPresent); this.myCal.update(); this.myCal.loadEvents(); this.showLoader = false; this.showTimeline = true; - }).finally(() => { + }).catch((error) => { + this.getFromDB() + }) + .finally(() => { this.showLoader = false; }) @@ -567,6 +575,7 @@ export class AgendaPage implements OnInit { this.TimelineMDList = this.listBoxService.list(this.listToPresent, 'pr', this.rangeStartDate, this.rangeEndDate, { segment: this.segment, selectedDate: this.eventSelectedDate }) + console.log('check list to present data', this.listToPresent); this.myCal.update(); this.myCal.loadEvents(); @@ -603,6 +612,7 @@ export class AgendaPage implements OnInit { this.TimelineMDList = this.listBoxService.list(this.listToPresent, 'md', this.rangeStartDate, this.rangeEndDate, { segment: this.segment, selectedDate: this.eventSelectedDate }) + console.log('check list to present data', this.listToPresent); this.myCal.update(); this.myCal.loadEvents(); @@ -614,7 +624,10 @@ export class AgendaPage implements OnInit { } - }).finally(() => { + }).catch((error) => { + this.getFromDB() + }) + .finally(() => { counter++; if (counter == 2) { this.showLoader = false; @@ -633,6 +646,8 @@ export class AgendaPage implements OnInit { this.TimelinePRList = this.listBoxService.list(this.listToPresent, 'pr', this.rangeStartDate, this.rangeEndDate, { segment: this.segment, selectedDate: this.eventSelectedDate }) + console.log('check list to present data', this.listToPresent); + this.myCal.update(); this.myCal.loadEvents(); @@ -644,7 +659,10 @@ export class AgendaPage implements OnInit { this.showLoader = false; } - }).finally(() => { + }).catch((error) => { + this.getFromDB() + }) + .finally(() => { counter++; if (counter == 2) { this.showLoader = false; @@ -674,6 +692,7 @@ export class AgendaPage implements OnInit { this.TimelinePRList = this.listBoxService.list(this.listToPresent, 'pr', this.rangeStartDate, this.rangeEndDate, { segment: this.segment, selectedDate: this.eventSelectedDate }) + console.log('check list to present data', this.listToPresent); this.myCal.update(); this.myCal.loadEvents(); @@ -685,7 +704,10 @@ export class AgendaPage implements OnInit { this.showLoader = false; } - }).finally(() => { + }).catch((error) => { + this.getFromDB() + }) + .finally(() => { if (counter == 1 || this.loggeduser.Profile == 'PR') { this.showLoader = false; } @@ -697,7 +719,6 @@ export class AgendaPage implements OnInit { } trasnformData(response,profile) { - let array = [] response.forEach(element => { let event = { startTime: new Date(element.StartDate), @@ -708,10 +729,10 @@ export class AgendaPage implements OnInit { profile: profile, id: element.EventId, } - array.push(event) + this.array.push(event) }); - this.listToPresent = array; + this.listToPresent = this.array; console.log('LIST TO PRESET', this.listToPresent) } From e7e2942bda07097a14629dea1685a492df82df14 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Eudes=20In=C3=A1cio?= Date: Tue, 23 Nov 2021 13:57:32 +0100 Subject: [PATCH 3/5] bug fix on list-box service --- src/app/services/agenda/list-box.service.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/app/services/agenda/list-box.service.ts b/src/app/services/agenda/list-box.service.ts index c1e6c663c..ed18982c3 100644 --- a/src/app/services/agenda/list-box.service.ts +++ b/src/app/services/agenda/list-box.service.ts @@ -12,7 +12,7 @@ export class ListBoxService { ){} - filterProfile(eventSource: EventListStore[], profile: 'md' | 'pr' | 'all') { + filterProfile(eventSource: EventListStore[] = [], profile: 'md' | 'pr' | 'all') { return eventSource.filter((e) => e.profile == profile) } From 9962e22d25d35874dd7fb469440ce0a021179360 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Eudes=20In=C3=A1cio?= Date: Wed, 24 Nov 2021 11:21:11 +0100 Subject: [PATCH 4/5] Fix bug on agenda of duplicate events --- src/app/pages/agenda/agenda.page.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/app/pages/agenda/agenda.page.ts b/src/app/pages/agenda/agenda.page.ts index 5bf088374..e47b34adf 100644 --- a/src/app/pages/agenda/agenda.page.ts +++ b/src/app/pages/agenda/agenda.page.ts @@ -490,6 +490,7 @@ export class AgendaPage implements OnInit { } loadRangeEvents(startTime: Date, endTime: Date) { + this.array = []; this.rangeStartDate = startTime this.rangeEndDate = endTime @@ -731,7 +732,6 @@ export class AgendaPage implements OnInit { } this.array.push(event) }); - this.listToPresent = this.array; console.log('LIST TO PRESET', this.listToPresent) } From 33962d8ca379e4dd021e76915ced74e42fd743dd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Eudes=20In=C3=A1cio?= Date: Wed, 24 Nov 2021 14:53:36 +0100 Subject: [PATCH 5/5] Remove sqlite method from app component --- src/app/app.component.ts | 10 ---------- 1 file changed, 10 deletions(-) diff --git a/src/app/app.component.ts b/src/app/app.component.ts index 446c2fd4e..556bf0c3d 100644 --- a/src/app/app.component.ts +++ b/src/app/app.component.ts @@ -60,16 +60,6 @@ export class AppComponent { console.log('Orientation locked') } - if (this.platform.is('desktop') || this.platform.is('mobileweb')) { - - } else { - try { - this.sqliteservice.databaseConn(); - } catch (error) { - console.log("Error creating local database: ", error) - } - } - this.storageservice.get('networkCheckStore').then((network) => { if(network === 'online') { console.log('Network app componente check', network)