diff --git a/src/app/pages/events/events.page.ts b/src/app/pages/events/events.page.ts index 518af1ec0..a2dd565a2 100644 --- a/src/app/pages/events/events.page.ts +++ b/src/app/pages/events/events.page.ts @@ -233,11 +233,13 @@ export class EventsPage implements OnInit { if (this.platform.is('desktop') || this.platform.is('mobileweb')) { this.storage.get('events').then((events: any[] = []) => { // - let todayEvents = new Array() - this.listToPresent = events - this.totalEvent = this.listToPresent.length - this.currentEvent = this.listToPresent[0].Subject - this.currentHoursMinutes = this.listToPresent[0].StartDate + + if(Array.isArray(events)) { + this.listToPresent = events + this.totalEvent = this.listToPresent.length + this.currentEvent = this.listToPresent[0].Subject + this.currentHoursMinutes = this.listToPresent[0].StartDate + } // }) diff --git a/src/app/pages/search/search.page.html b/src/app/pages/search/search.page.html index 6617d4ee9..c6e78e75d 100644 --- a/src/app/pages/search/search.page.html +++ b/src/app/pages/search/search.page.html @@ -1,7 +1,6 @@ -
diff --git a/src/app/pages/search/search.page.ts b/src/app/pages/search/search.page.ts index 438106d26..b06bcb2c8 100644 --- a/src/app/pages/search/search.page.ts +++ b/src/app/pages/search/search.page.ts @@ -154,7 +154,7 @@ export class SearchPage implements OnInit { this.windowWidth = window.innerWidth - window['dynamicSearch'] = (search:string) =>{ + window['dynamicSearch'] = (search:string) => { this.searchSubject = search; } @@ -168,7 +168,7 @@ export class SearchPage implements OnInit { this.search.mostSeachWord("15").subscribe(res=>{ - const container = document.querySelector('.seach-wrapper'); + console.log('LOAD LIST'); const highest= res[0].Hits; const lowest = res[res.length-1].Hits; @@ -191,12 +191,11 @@ export class SearchPage implements OnInit { }); this.list = list - - + console.log('set list') const elem = document.documentElement.querySelector('.most-searched-word-container'); - setTimeout(()=>{ + setTimeout(() => { WordCloud( elem, { @@ -205,7 +204,8 @@ export class SearchPage implements OnInit { gridSize: 15 }, ); - },300) + console.log('set visualy') + }, 300) }); } diff --git a/src/app/shared/header/header.page.ts b/src/app/shared/header/header.page.ts index 89a71c923..2307cbf54 100644 --- a/src/app/shared/header/header.page.ts +++ b/src/app/shared/header/header.page.ts @@ -208,7 +208,7 @@ export class HeaderPage implements OnInit { async dynamicSearch() { if(window['dynamicSearch']) { - window['dynamicSearch']() + window['dynamicSearch'](this.searchSubject) } else { setTimeout(()=>{ this.dynamicSearch() diff --git a/src/environments/environment.ts b/src/environments/environment.ts index f0b161ab1..c4386ce08 100644 --- a/src/environments/environment.ts +++ b/src/environments/environment.ts @@ -1,15 +1,15 @@ import { versionData } from '../../version/git-version' export const environment = { //apiURL: 'https://gabinetedigital.dyndns.info/GabineteDigital.Services/V5/api/', - //apiURL: 'https://gd-api.oapr.gov.ao/api/', - apiURL: 'https://gdapi-dev.dyndns.info/GabineteDigital.Services/V5/api/', + apiURL: 'https://gd-api.oapr.gov.ao/api/', + //apiURL: 'https://gdapi-dev.dyndns.info/GabineteDigital.Services/V5/api/', // apiURL: 'http://gpr-dev-01.gabinetedigital.local/GabineteDigital.Services/V5/api/', // apiChatUrl: 'http://192.168.0.29:3000/api/v1/', // apiWsChatUrl: 'wss://192.168.0.29:3000/websocket', - //apiChatUrl: 'https://gd-chat.oapr.gov.ao/api/v1/', - //apiWsChatUrl: 'wss://gd-chat.oapr.gov.ao/websocket', - apiChatUrl: 'https://gdchat-dev.dyndns.info/api/v1/', - apiWsChatUrl: 'wss://gdchat-dev.dyndns.info/websocket', + apiChatUrl: 'https://gd-chat.oapr.gov.ao/api/v1/', + apiWsChatUrl: 'wss://gd-chat.oapr.gov.ao/websocket', + //apiChatUrl: 'https://gdchat-dev.dyndns.info/api/v1/', + //apiWsChatUrl: 'wss://gdchat-dev.dyndns.info/websocket', production: true, domain: 'paulo.pinto@gabinetedigital.local', defaultuser: 'paulo.pinto@gabinetedigital.local',//paulo.pinto@gabinetedigital.local diff --git a/version/git-version.ts b/version/git-version.ts index f9bb70f2a..6dbbe7d81 100644 --- a/version/git-version.ts +++ b/version/git-version.ts @@ -1,12 +1,12 @@ export let versionData = { - "shortSHA": "fcc8bc6b7", - "SHA": "fcc8bc6b74ab3eca00dc78400c7bb2d1a8ab40bd", + "shortSHA": "0e5b739df", + "SHA": "0e5b739df5ede20a0b22df48ec861ec4c2921f6b", "branch": "develop_bitOut-fix", "lastCommitAuthor": "'Peter Maquiran'", - "lastCommitTime": "'Tue Jan 3 21:08:49 2023 +0100'", - "lastCommitMessage": "improve", - "lastCommitNumber": "4607", + "lastCommitTime": "'Tue Jan 3 22:04:33 2023 +0100'", + "lastCommitMessage": "src/app/guards/auth.guard.ts", + "lastCommitNumber": "4608", "change": "", - "changeStatus": "On branch develop_bitOut-fix\nChanges to be committed:\n (use \"git restore --staged ...\" to unstage)\n\tmodified: src/app/guards/auth.guard.ts\n\tmodified: src/app/services/chat/message.service.ts\n\tmodified: src/environments/environment.ts", + "changeStatus": "On branch develop_bitOut-fix\nChanges to be committed:\n (use \"git restore --staged ...\" to unstage)\n\tmodified: src/app/pages/events/events.page.ts\n\tmodified: src/app/pages/search/search.page.html\n\tmodified: src/app/pages/search/search.page.ts\n\tmodified: src/app/shared/header/header.page.ts\n\tmodified: src/environments/environment.ts", "changeAuthor": "peter.maquiran" } \ No newline at end of file