diff --git a/src/app/app.component.ts b/src/app/app.component.ts
index 127ce8ee6..ce0ad7dbd 100644
--- a/src/app/app.component.ts
+++ b/src/app/app.component.ts
@@ -1,17 +1,10 @@
-import { Component, Inject } from '@angular/core';
+import { Component } from '@angular/core';
import { Platform } from '@ionic/angular';
import { StatusBar } from '@ionic-native/status-bar/ngx';
-import * as _moment from 'moment';
-import * as _rollupMoment from 'moment';
import { NgxMatDateFormats } from '@angular-material-components/datetime-picker';
-const moment = _rollupMoment || _moment;
import { NGX_MAT_DATE_FORMATS } from '@angular-material-components/datetime-picker';
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';
-import { MessageModel } from './models/beast-orm';
import { InativityService } from "src/app/services/inativity.service";
import { ThemeService } from 'src/app/services/theme.service';
import { environment } from 'src/environments/environment';
@@ -41,30 +34,16 @@ const CUSTOM_DATE_FORMATS: NgxMatDateFormats = {
export class AppComponent {
constructor(
private platform: Platform,
- /* private splashScreen: SplashScreen, */
private statusBar: StatusBar,
- private screenOrientation: ScreenOrientation,
private sqliteservice: SqliteService,
- private backgroundservice: BackgroundService,
- private storageservice: StorageService,
private InativityService: InativityService,
public ThemeService: ThemeService,
private storage: Storage,
) {
- // this.createCacheFolder()
this.initializeApp();
- console.log('version: '+ environment.version)
-
this.storage.set('version', environment.version).then(() => {})
}
- // async createCacheFolder(){
- // await Filesystem.mkdir({
- // directory: Directory.Cache,
- // path: `CACHED-IMG`
- // })
- // }
-
initializeApp() {
this.platform.ready().then(() => {
this.statusBar.styleDefault();
@@ -87,18 +66,6 @@ export class AppComponent {
}
}
- /* 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();
- }
- }).catch((error) => {
- console.error('storage initialize: ',error)
- }) */
-
});
}
}
diff --git a/src/app/home/home.page.html b/src/app/home/home.page.html
index 0caf5aeba..508ad8347 100644
--- a/src/app/home/home.page.html
+++ b/src/app/home/home.page.html
@@ -7,7 +7,6 @@
-
Início
@@ -22,8 +21,6 @@
-
Gabinete
diff --git a/src/app/home/home.page.ts b/src/app/home/home.page.ts
index ec7211e0b..f6dbe7daf 100644
--- a/src/app/home/home.page.ts
+++ b/src/app/home/home.page.ts
@@ -163,7 +163,7 @@ export class HomePage implements OnInit {
}
- clearTabButtonSelection(){
+ clearTabButtonSelection() {
this.tabButton.home = false;
this.tabButton.agenda = false;
this.tabButton.gabinete = false;
@@ -179,13 +179,13 @@ export class HomePage implements OnInit {
else if(url == '/home/agenda'){
this.tabButton.agenda = true;
}
- else if(url =='/home/gabinete-digital'){
+ else if(url =='/home/gabinete-digital') {
this.tabButton.gabinete = true;
}
- else if(url =='/home/publications'){
+ else if(url =='/home/publications') {
this.tabButton.actions = true;
}
- else if(url == '/home/chat'){
+ else if(url == '/home/chat') {
this.tabButton.chat = true;
}
else{
@@ -193,17 +193,12 @@ export class HomePage implements OnInit {
}
}
- logDeviceInfo = async () => {
+ logDeviceInfo = async () => {
const info = await Device.getInfo();
-
- };
-
- get pathname(){
- return window.location.pathname
}
- get color() {
- return '#797979'
+ get pathname() {
+ return window.location.pathname
}
updateList() {
@@ -266,5 +261,4 @@ export class HomePage implements OnInit {
this.sqliteservice.deleteAllTables();
}
-}
-
+}
\ No newline at end of file
diff --git a/src/app/home/sharedWorker.js b/src/app/home/sharedWorker.js
new file mode 100644
index 000000000..7ad88bc12
--- /dev/null
+++ b/src/app/home/sharedWorker.js
@@ -0,0 +1,14 @@
+onconnect = (ev) => {
+ const [port] = ev.ports;
+ port.onmessage = e => {
+ const [first, second] = e.data;
+ let sum = +first + +second;
+ if (isNaN(sum)) {
+ port.postMessage("Both inputs should be numbers");
+ }
+ else {
+ const workerResult = `Result: ${sum} `;
+ port.postMessage(workerResult);
+ }
+ };
+};
\ No newline at end of file
diff --git a/src/app/pages/publications/publications.page.ts b/src/app/pages/publications/publications.page.ts
index 15c4b244b..6762f50a2 100644
--- a/src/app/pages/publications/publications.page.ts
+++ b/src/app/pages/publications/publications.page.ts
@@ -89,6 +89,7 @@ export class PublicationsPage implements OnInit {
}
});
this.hideRefreshButton();
+ this.getFromDB()
}
@@ -144,7 +145,6 @@ export class PublicationsPage implements OnInit {
this.loadList = true
this.showLoader = true;
this.skeletonLoader = true;
- this.getFromDB()
this.publications.GetPublicationFolderList().subscribe(async res => {
const folders: PublicationFolder[] = this.getPublicationFolderMap(res)
@@ -155,9 +155,10 @@ export class PublicationsPage implements OnInit {
if (this.platform.is('desktop') || this.platform.is('mobileweb')) {
await this.storage.set('actionsEvents', this.publicationsEventFolderList);
await this.storage.set('actionsViagens', this.publicationsTravelFolderList);
- this.getFromDB()
} else {
- this.getFromDB()
+ folders.forEach((folder)=> {
+ this.addActionToDB(folder);
+ })
}
this.showLoader = false;
diff --git a/src/environments/environment.prod.ts b/src/environments/environment.prod.ts
index e3161d1fe..4d6b1b510 100644
--- a/src/environments/environment.prod.ts
+++ b/src/environments/environment.prod.ts
@@ -1,17 +1,17 @@
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://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',
+ //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: 'gabinetedigital.local',
defaultuser: 'eqformacao@oapr.gov.ao',//paulo.pinto@gabinetedigital.local
diff --git a/version/git-version.ts b/version/git-version.ts
index af52911d7..9c83cd872 100644
--- a/version/git-version.ts
+++ b/version/git-version.ts
@@ -1,12 +1,12 @@
export let versionData = {
- "shortSHA": "f640ac7e3",
- "SHA": "f640ac7e332684911ede3391b0f07b35dd00252f",
+ "shortSHA": "3e110c9e9",
+ "SHA": "3e110c9e93c95abc7bf1fd73a6ca264587505821",
"branch": "develop_bitOut-fix",
"lastCommitAuthor": "'Peter Maquiran'",
- "lastCommitTime": "'Fri Dec 30 15:39:42 2022 +0100'",
- "lastCommitMessage": "merge",
- "lastCommitNumber": "4604",
- "change": "",
- "changeStatus": "On branch develop_bitOut-fix\nChanges to be committed:\n (use \"git restore --staged ...\" to unstage)\n\tmodified: src/app/home/home.page.ts\n\tmodified: src/app/services/inativity.service.ts\n\tdeleted: src/assets/images/theme/gov/icons-userprofile.svg",
+ "lastCommitTime": "'Mon Jan 2 14:36:57 2023 +0100'",
+ "lastCommitMessage": "remote inactivity",
+ "lastCommitNumber": "4605",
+ "change": "diff --git a/src/app/app.component.ts b/src/app/app.component.ts\nindex 127ce8ee6..ce0ad7dbd 100644\n--- a/src/app/app.component.ts\n+++ b/src/app/app.component.ts\n@@ -1,17 +1,10 @@\n-import { Component, Inject } from '@angular/core';\n+import { Component } from '@angular/core';\n \n import { Platform } from '@ionic/angular';\n import { StatusBar } from '@ionic-native/status-bar/ngx';\n-import * as _moment from 'moment';\n-import * as _rollupMoment from 'moment';\n import { NgxMatDateFormats } from '@angular-material-components/datetime-picker';\n-const moment = _rollupMoment || _moment;\n import { NGX_MAT_DATE_FORMATS } from '@angular-material-components/datetime-picker';\n import { SqliteService } from 'src/app/services/sqlite.service';\n-import { BackgroundService } from 'src/app/services/background.service';\n-import { ScreenOrientation } from '@ionic-native/screen-orientation/ngx';\n-import { StorageService } from 'src/app/services/storage.service';\n-import { MessageModel } from './models/beast-orm';\n import { InativityService } from \"src/app/services/inativity.service\";\n import { ThemeService } from 'src/app/services/theme.service';\n import { environment } from 'src/environments/environment';\n@@ -41,30 +34,16 @@ const CUSTOM_DATE_FORMATS: NgxMatDateFormats = {\n export class AppComponent {\n constructor(\n private platform: Platform,\n- /* private splashScreen: SplashScreen, */\n private statusBar: StatusBar,\n- private screenOrientation: ScreenOrientation,\n private sqliteservice: SqliteService,\n- private backgroundservice: BackgroundService,\n- private storageservice: StorageService,\n private InativityService: InativityService,\n public ThemeService: ThemeService,\n private storage: Storage,\n ) {\n- // this.createCacheFolder()\n this.initializeApp();\n- console.log('version: '+ environment.version)\n-\n this.storage.set('version', environment.version).then(() => {})\n }\n \n- // async createCacheFolder(){\n- // await Filesystem.mkdir({\n- // directory: Directory.Cache,\n- // path: `CACHED-IMG`\n- // })\n- // }\n-\n initializeApp() {\n this.platform.ready().then(() => {\n this.statusBar.styleDefault();\n@@ -87,18 +66,6 @@ export class AppComponent {\n }\n }\n \n- /* this.storageservice.get('networkCheckStore').then((network) => {\n- if(network === 'online') {\n- console.log('Network app componente check', network)\n- this.backgroundservice.online()\n- } else {\n- console.log('Network app componente check', network)\n- this.backgroundservice.offline();\n- }\n- }).catch((error) => {\n- console.error('storage initialize: ',error)\n- }) */\n-\n });\n }\n }\ndiff --git a/src/app/home/home.page.html b/src/app/home/home.page.html\nindex 0caf5aeba..508ad8347 100644\n--- a/src/app/home/home.page.html\n+++ b/src/app/home/home.page.html\n@@ -7,7 +7,6 @@\n \n \n \n- \n Início\n \n \n@@ -22,8 +21,6 @@\n \n \n \n- \n Gabinete\n \n \ndiff --git a/src/app/home/home.page.ts b/src/app/home/home.page.ts\nindex ec7211e0b..f6dbe7daf 100644\n--- a/src/app/home/home.page.ts\n+++ b/src/app/home/home.page.ts\n@@ -163,7 +163,7 @@ export class HomePage implements OnInit {\n \n }\n \n- clearTabButtonSelection(){\n+ clearTabButtonSelection() {\n this.tabButton.home = false;\n this.tabButton.agenda = false;\n this.tabButton.gabinete = false;\n@@ -179,13 +179,13 @@ export class HomePage implements OnInit {\n else if(url == '/home/agenda'){\n this.tabButton.agenda = true;\n }\n- else if(url =='/home/gabinete-digital'){\n+ else if(url =='/home/gabinete-digital') {\n this.tabButton.gabinete = true;\n }\n- else if(url =='/home/publications'){\n+ else if(url =='/home/publications') {\n this.tabButton.actions = true;\n }\n- else if(url == '/home/chat'){\n+ else if(url == '/home/chat') {\n this.tabButton.chat = true;\n }\n else{\n@@ -193,17 +193,12 @@ export class HomePage implements OnInit {\n }\n }\n \n- logDeviceInfo = async () => {\n+ logDeviceInfo = async () => {\n const info = await Device.getInfo();\n-\n- };\n-\n- get pathname(){\n- return window.location.pathname\n }\n \n- get color() {\n- return '#797979'\n+ get pathname() {\n+ return window.location.pathname\n }\n \n updateList() {\n@@ -266,5 +261,4 @@ export class HomePage implements OnInit {\n this.sqliteservice.deleteAllTables();\n }\n \n-}\n-\n+}\n\\ No newline at end of file\ndiff --git a/src/environments/environment.prod.ts b/src/environments/environment.prod.ts\nindex e3161d1fe..4d6b1b510 100644\n--- a/src/environments/environment.prod.ts\n+++ b/src/environments/environment.prod.ts\n@@ -1,17 +1,17 @@\n import { versionData } from '../../version/git-version'\n export const environment = {\n // apiURL: 'https://gabinetedigital.dyndns.info/GabineteDigital.Services/V5/api/',\n- apiURL: 'https://gd-api.oapr.gov.ao/api/',\n- //apiURL: 'https://gdapi-dev.dyndns.info/GabineteDigital.Services/V5/api/',\n+ //apiURL: 'https://gd-api.oapr.gov.ao/api/',\n+ apiURL: 'https://gdapi-dev.dyndns.info/GabineteDigital.Services/V5/api/',\n // apiURL: 'http://gpr-dev-01.gabinetedigital.local/GabineteDigital.Services/V5/api/',\n // apiChatUrl: 'http://192.168.0.29:3000/api/v1/',\n // apiWsChatUrl: 'wss://192.168.0.29:3000/websocket',\n //apiChatUrl: 'https://gdchat-dev.dyndns.info/api/v1/',\n //apiWsChatUrl: 'wss://gdchat-dev.dyndns.info/websocket',\n- apiChatUrl: 'https://gd-chat.oapr.gov.ao/api/v1/',\n- apiWsChatUrl: 'wss://gd-chat.oapr.gov.ao/websocket',\n- // apiChatUrl: 'https://gdchat-dev.dyndns.info/api/v1/',\n- // apiWsChatUrl: 'wss://gdchat-dev.dyndns.info/websocket',\n+ //apiChatUrl: 'https://gd-chat.oapr.gov.ao/api/v1/',\n+ //apiWsChatUrl: 'wss://gd-chat.oapr.gov.ao/websocket',\n+ apiChatUrl: 'https://gdchat-dev.dyndns.info/api/v1/',\n+ apiWsChatUrl: 'wss://gdchat-dev.dyndns.info/websocket',\n production: true,\n domain: 'gabinetedigital.local',\n defaultuser: 'eqformacao@oapr.gov.ao',//paulo.pinto@gabinetedigital.local",
+ "changeStatus": "On branch develop_bitOut-fix\nChanges to be committed:\n (use \"git restore --staged ...\" to unstage)\n\tmodified: src/app/pages/publications/publications.page.ts\n\nChanges not staged for commit:\n (use \"git add ...\" to update what will be committed)\n (use \"git restore ...\" to discard changes in working directory)\n\tmodified: src/app/app.component.ts\n\tmodified: src/app/home/home.page.html\n\tmodified: src/app/home/home.page.ts\n\tmodified: src/environments/environment.prod.ts\n\nUntracked files:\n (use \"git add ...\" to include in what will be committed)\n\tsrc/app/home/sharedWorker.js",
"changeAuthor": "peter.maquiran"
}
\ No newline at end of file