diff --git a/package-lock.json b/package-lock.json index fc33943ba..53edb4520 100644 --- a/package-lock.json +++ b/package-lock.json @@ -30,7 +30,7 @@ "@awesome-cordova-plugins/file": "^5.41.0", "@awesome-cordova-plugins/file-opener": "^5.41.0", "@awesome-cordova-plugins/multiple-document-picker": "^5.40.0", - "@capacitor/android": "^4.6.1", + "@capacitor/android": "^4.6.2", "@capacitor/app": "^4.1.1", "@capacitor/browser": "^4.1.0", "@capacitor/camera": "^4.1.4", @@ -3254,9 +3254,9 @@ "license": "MIT" }, "node_modules/@capacitor/android": { - "version": "4.6.1", - "resolved": "https://registry.npmjs.org/@capacitor/android/-/android-4.6.1.tgz", - "integrity": "sha512-Hnh1tmUr1SP67U6D6ry5I5BEBSN/1nkBAIjQIqf5tF82WNxKbpbC6GfkHE4hMJZinRTrCf36LkrdP8srh7SxoA==", + "version": "4.6.2", + "resolved": "https://registry.npmjs.org/@capacitor/android/-/android-4.6.2.tgz", + "integrity": "sha512-PQpOJnMi0i/d4UrT8bPdfkwlKAlQLgsyo2YKj+iUYjEIu8sKQvqDirLYnpeKhj4cflIG2u9mh/eFncooA+u2gw==", "peerDependencies": { "@capacitor/core": "^4.6.0" } @@ -40525,9 +40525,9 @@ "version": "0.2.3" }, "@capacitor/android": { - "version": "4.6.1", - "resolved": "https://registry.npmjs.org/@capacitor/android/-/android-4.6.1.tgz", - "integrity": "sha512-Hnh1tmUr1SP67U6D6ry5I5BEBSN/1nkBAIjQIqf5tF82WNxKbpbC6GfkHE4hMJZinRTrCf36LkrdP8srh7SxoA==", + "version": "4.6.2", + "resolved": "https://registry.npmjs.org/@capacitor/android/-/android-4.6.2.tgz", + "integrity": "sha512-PQpOJnMi0i/d4UrT8bPdfkwlKAlQLgsyo2YKj+iUYjEIu8sKQvqDirLYnpeKhj4cflIG2u9mh/eFncooA+u2gw==", "requires": {} }, "@capacitor/app": { diff --git a/package.json b/package.json index abe37d011..d79a7d7fa 100644 --- a/package.json +++ b/package.json @@ -40,7 +40,7 @@ "@awesome-cordova-plugins/file": "^5.41.0", "@awesome-cordova-plugins/file-opener": "^5.41.0", "@awesome-cordova-plugins/multiple-document-picker": "^5.40.0", - "@capacitor/android": "^4.6.1", + "@capacitor/android": "^4.6.2", "@capacitor/app": "^4.1.1", "@capacitor/browser": "^4.1.0", "@capacitor/camera": "^4.1.4", diff --git a/src/app/modals/profile/edit-profile/edit-profile.page.html b/src/app/modals/profile/edit-profile/edit-profile.page.html index 8e90c20f6..a48593245 100644 --- a/src/app/modals/profile/edit-profile/edit-profile.page.html +++ b/src/app/modals/profile/edit-profile/edit-profile.page.html @@ -10,7 +10,7 @@
-

Presidente da República

+

doneIT

GABINETE DIGITAL

@@ -18,7 +18,7 @@
-

Presidente da República

+

doneIT

GABINETE DIGITAL

diff --git a/src/app/modals/profile/profile.page.html b/src/app/modals/profile/profile.page.html index 46efdb983..6de0842de 100644 --- a/src/app/modals/profile/profile.page.html +++ b/src/app/modals/profile/profile.page.html @@ -8,7 +8,7 @@
-

Presidente da República

+

doneIT

GABINETE DIGITAL

@@ -16,7 +16,7 @@
-

Presidente da República

+

doneIT

GABINETE DIGITAL

diff --git a/src/app/pages/gabinete-digital/gabinete-digital.page.html b/src/app/pages/gabinete-digital/gabinete-digital.page.html index 01699d8d1..6c6e6ea80 100644 --- a/src/app/pages/gabinete-digital/gabinete-digital.page.html +++ b/src/app/pages/gabinete-digital/gabinete-digital.page.html @@ -72,7 +72,7 @@
- Agenda {{task.Agenda || task.workflowInstanceDataFields.Agenda}} do Presidente da República + Agenda {{task.Agenda || task.workflowInstanceDataFields.Agenda}} do Titular A sua agenda {{task.Agenda || task.workflowInstanceDataFields.Agenda}} @@ -229,7 +229,7 @@
-

Despacho do Presidente da República

+

Despacho do Titular

Despachos criados por mim

{{ despachoprstore.count }} Documentos

diff --git a/src/app/services/notifications.service.ts b/src/app/services/notifications.service.ts index ea866e684..0cadbc568 100644 --- a/src/app/services/notifications.service.ts +++ b/src/app/services/notifications.service.ts @@ -100,16 +100,9 @@ export class NotificationsService { const geturl = environment.apiURL + 'notifications/token'; PushNotifications.addListener('registration', (token: Token) => { - - - this.storageService.store(username, token.value); - this.storageService.get(username).then(value => { - - this.storageService.get(AuthConnstants.USER).then(res => { - const headers = { 'Authorization': SessionStore.user.BasicAuthKey }; const body = { - UserId: res.UserId, + UserId: SessionStore.user.UserId, TokenId: token.value, Status: 1, Service: 1 @@ -117,17 +110,10 @@ export class NotificationsService { this.http.post(`${geturl}`, body, { headers }).subscribe(data => { this.active = true - //console.log(data) + console.log(data) }, (error) => { - //console.log(error) + console.log(error) }) - }).catch((error) => { - console.error('storage authorization', error) - });; - - }).catch((error) => { - console.error('storage getAndPostToken', error) - }); } ); } diff --git a/src/app/shared/gabinete-digital/all-processes/all-processes.page.html b/src/app/shared/gabinete-digital/all-processes/all-processes.page.html index 31bd6517c..9d63acd23 100644 --- a/src/app/shared/gabinete-digital/all-processes/all-processes.page.html +++ b/src/app/shared/gabinete-digital/all-processes/all-processes.page.html @@ -62,7 +62,7 @@
- Agenda {{task.Agenda}} do Presidente da República + Agenda {{task.Agenda}} do Titular A sua agenda {{task.Agenda}} diff --git a/src/app/shared/header/header.page.html b/src/app/shared/header/header.page.html index 429ee8f1f..7e0cad845 100644 --- a/src/app/shared/header/header.page.html +++ b/src/app/shared/header/header.page.html @@ -19,7 +19,7 @@
-

Presidente da República

+

doneIT

GABINETE DIGITAL

@@ -27,7 +27,7 @@
-

Presidente da República

+

doneIT

GABINETE DIGITAL

@@ -56,7 +56,7 @@

Calendário Partilhado

-

Presidente da República

+

doneIT

GABINETE DIGITAL

diff --git a/src/environments/environment.prod.ts b/src/environments/environment.prod.ts index 9697adcac..b5c1d7510 100644 --- a/src/environments/environment.prod.ts +++ b/src/environments/environment.prod.ts @@ -2,22 +2,22 @@ import { versionData } from '../../version/git-version' export const environment = { // apiURL: 'https://gabinetedigital.dyndns.info/GabineteDigital.Services/V5/api/', - //apiURL: 'https://API.DONEIT.CO.AO/api/', - apiURL: 'https://gd-api.oapr.gov.ao/api/', + apiURL: 'https://API.DONEIT.CO.AO/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: 'https://gdchat-dev.dyndns.info/api/v1/', //apiWsChatUrl: 'wss://gdchat-dev.dyndns.info/websocket', - //apiChatUrl: 'https://CHAT.DONEIT.CO.AO/api/v1/', - //apiWsChatUrl: 'wss://CHAT.DONEIT.CO.AO/websocket', - apiChatUrl: 'https://gd-chat.oapr.gov.ao/api/v1/', - apiWsChatUrl: 'wss://gd-chat.oapr.gov.ao/websocket', + apiChatUrl: 'https://CHAT.DONEIT.CO.AO/api/v1/', + apiWsChatUrl: 'wss://CHAT.DONEIT.CO.AO/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: 'oapr.gov.ao', //equilibrium.ao.ao - defaultuser: '',//paulo.pinto@gabinetedigital.local - defaultuserpwd: '', //tabteste@006,06, + domain: 'equilibrium.co.ao', + defaultuser: 'evandre.dasilva@equilibrium.co.ao',//paulo.pinto@gabinetedigital.local + defaultuserpwd: 'Luand@1219', //tabteste@006,06, chatOffline: true, presidencia: false, version: versionData, diff --git a/version/git-version.ts b/version/git-version.ts index 22209f478..b56b4349b 100644 --- a/version/git-version.ts +++ b/version/git-version.ts @@ -1,12 +1,12 @@ export let versionData = { - "shortSHA": "16e908709", - "SHA": "16e90870988f16410f86e49b4783850132982004", + "shortSHA": "5733874d5", + "SHA": "5733874d5fb6301eedde143e28a046e3810c2317", "branch": "no_bug_movemente", "lastCommitAuthor": "'Peter Maquiran'", - "lastCommitTime": "'Mon Jan 23 15:24:35 2023 +0100'", - "lastCommitMessage": "hot fix", - "lastCommitNumber": "4680", + "lastCommitTime": "'Tue Jan 24 14:31:05 2023 +0100'", + "lastCommitMessage": "fixe", + "lastCommitNumber": "4681", "change": "", - "changeStatus": "On branch no_bug_movemente\nChanges to be committed:\n (use \"git restore --staged ...\" to unstage)\n\tmodified: src/app/pages/search/search.page.html\n\tmodified: src/app/pages/search/search.page.ts\n\tmodified: src/app/services/search.service.ts\n\tmodified: src/app/shared/header/header.page.html", + "changeStatus": "On branch no_bug_movemente\nAll conflicts fixed but you are still merging.\n (use \"git commit\" to conclude merge)\n\nChanges to be committed:\n\tmodified: package-lock.json\n\tmodified: package.json\n\tmodified: src/app/modals/profile/edit-profile/edit-profile.page.html\n\tmodified: src/app/modals/profile/profile.page.html\n\tmodified: src/app/pages/gabinete-digital/gabinete-digital.page.html\n\tmodified: src/app/services/notifications.service.ts\n\tmodified: src/app/shared/gabinete-digital/all-processes/all-processes.page.html\n\tmodified: src/app/shared/header/header.page.html\n\tmodified: src/environments/environment.prod.ts", "changeAuthor": "peter.maquiran" } \ No newline at end of file