diff --git a/android/app/google-services.json b/android/app/google-services.json deleted file mode 100644 index 0a455bcff..000000000 --- a/android/app/google-services.json +++ /dev/null @@ -1,40 +0,0 @@ -{ - "project_info": { - "project_number": "800733765231", - "firebase_url": "https://gabinete-digital-2020.firebaseio.com", - "project_id": "gabinete-digital-2020", - "storage_bucket": "gabinete-digital-2020.appspot.com" - }, - "client": [ - { - "client_info": { - "mobilesdk_app_id": "1:800733765231:android:e7ffc0b310037d9f13779a", - "android_client_info": { - "package_name": "com.gpr.gabinetedigital" - } - }, - "oauth_client": [ - { - "client_id": "800733765231-92oa7ib62ob0pkouphb5i5sp01vkalid.apps.googleusercontent.com", - "client_type": 3 - } - ], - "api_key": [ - { - "current_key": "AIzaSyD0pfW45DLoW6mqvZRklJdbfSTskW22Fok" - } - ], - "services": { - "appinvite_service": { - "other_platform_oauth_client": [ - { - "client_id": "800733765231-92oa7ib62ob0pkouphb5i5sp01vkalid.apps.googleusercontent.com", - "client_type": 3 - } - ] - } - } - } - ], - "configuration_version": "1" -} \ No newline at end of file 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/profile.page.html b/src/app/modals/profile/profile.page.html index 6de0842de..46efdb983 100644 --- a/src/app/modals/profile/profile.page.html +++ b/src/app/modals/profile/profile.page.html @@ -8,7 +8,7 @@
-

doneIT

+

Presidente da República

GABINETE DIGITAL

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

doneIT

+

Presidente da República

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 6c6e6ea80..01699d8d1 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 Titular + Agenda {{task.Agenda || task.workflowInstanceDataFields.Agenda}} do Presidente da República A sua agenda {{task.Agenda || task.workflowInstanceDataFields.Agenda}} @@ -229,7 +229,7 @@
-

Despacho do Titular

+

Despacho do Presidente da República

Despachos criados por mim

{{ despachoprstore.count }} Documentos

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 9d63acd23..31bd6517c 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 Titular + Agenda {{task.Agenda}} do Presidente da República A sua agenda {{task.Agenda}} diff --git a/src/app/shared/header/header.page.html b/src/app/shared/header/header.page.html index b6c75ca89..0187c4f53 100644 --- a/src/app/shared/header/header.page.html +++ b/src/app/shared/header/header.page.html @@ -19,7 +19,7 @@
-

doneIT

+

Presidente da República

GABINETE DIGITAL

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

doneIT

+

Presidente da República

GABINETE DIGITAL

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

Calendário Partilhado

-

doneIT

+

Presidente da República

GABINETE DIGITAL

diff --git a/src/environments/environment.prod.ts b/src/environments/environment.prod.ts index 21dab8dae..95b8f7ebe 100644 --- a/src/environments/environment.prod.ts +++ b/src/environments/environment.prod.ts @@ -15,7 +15,7 @@ export const environment = { // apiChatUrl: 'https://gdchat-dev.dyndns.info/api/v1/', // apiWsChatUrl: 'wss://gdchat-dev.dyndns.info/websocket', production: true, - domain: 'equilibrium.co.ao', //equilibrium.ao.ao + domain: 'equilibrium.co.ao', defaultuser: '',//paulo.pinto@gabinetedigital.local defaultuserpwd: '', //tabteste@006,06, chatOffline: true, diff --git a/src/environments/environment.ts b/src/environments/environment.ts index b868f0e40..f5d27fc98 100644 --- a/src/environments/environment.ts +++ b/src/environments/environment.ts @@ -15,8 +15,8 @@ export const environment = { apiWsChatUrl: 'wss://gd-chat.oapr.gov.ao/websocket', */ production: false, domain: 'equilibrium.co.ao', - defaultuser: 'evandre.dasilva@equilibrium.co.ao',//evandre.dasilva@equilibrium.co.ao - defaultuserpwd: 'Luand@1219', //Luand@1219, + defaultuser: '',//evandre.dasilva@equilibrium.co.ao + defaultuserpwd: '', //Luand@1219, chatOffline: true, presidencia: false, version: versionData, diff --git a/version/git-version.ts b/version/git-version.ts index 05f3dfd66..9f4874229 100644 --- a/version/git-version.ts +++ b/version/git-version.ts @@ -1,12 +1,12 @@ export let versionData = { - "shortSHA": "96de420e0", - "SHA": "96de420e0b4cdd6325203eb92fce0f408e7e350b", + "shortSHA": "90c9fc1c9", + "SHA": "90c9fc1c9e3545f7f47fbc0e1b2ae39b82eb0c88", "branch": "no_bug_movemente", "lastCommitAuthor": "'Eudes Inácio'", - "lastCommitTime": "'Fri Jan 20 16:06:29 2023 +0100'", - "lastCommitMessage": "some changes", - "lastCommitNumber": "4672", + "lastCommitTime": "'Fri Jan 20 16:07:39 2023 +0100'", + "lastCommitMessage": "verion do peter changes", + "lastCommitNumber": "4674", "change": "", - "changeStatus": "On branch no_bug_movemente\nYour branch and 'origin/no_bug_movemente' have diverged,\nand have 2 and 1 different commits each, respectively.\n (use \"git pull\" to merge the remote branch into yours)\n\nAll conflicts fixed but you are still merging.\n (use \"git commit\" to conclude merge)\n\nChanges to be committed:\n\tmodified: src/app/app-routing.module.ts\n\tmodified: src/app/modals/document-set-up-meeting/document-set-up-meeting.page.html\n\tmodified: src/app/modals/document-set-up-meeting/document-set-up-meeting.page.ts\n\tmodified: src/app/pages/gabinete-digital/expediente/book-meeting-modal/book-meeting-modal.page.html\n\tmodified: src/app/pages/gabinete-digital/expediente/book-meeting-modal/book-meeting-modal.page.ts\n\tmodified: src/app/pages/publications/edit-action/edit-action.page.ts\n\tmodified: src/app/pages/publications/new-action/new-action.page.html\n\tmodified: src/app/pages/publications/new-action/new-action.page.ts\n\tmodified: src/app/pages/publications/new-publication/new-publication.page.ts\n\tmodified: src/app/pages/search/search.page.html\n\tmodified: src/app/pages/search/search.page.ts\n\tmodified: src/app/services/chat/chat-system.service.ts\n\tmodified: src/app/services/chat/rochet-chat-connector.service.ts\n\tmodified: src/app/shared/agenda/edit-event-to-approve/edit-event-to-approve.page.ts\n\tmodified: src/app/shared/gabinete-digital/edit-event-to-approve/edit-event.page.ts\n\tmodified: src/app/shared/popover/chat-options-popover/chat-options-popover.page.html\n\tmodified: src/app/shared/publication/edit-action/edit-action.page.ts\n\tmodified: src/app/shared/publication/new-action/new-action.page.html\n\tmodified: src/app/shared/publication/new-action/new-action.page.ts\n\tnew file: src/assets/images/theme/blue/search.svg\n\tnew file: src/assets/images/theme/gov/search.svg\n\tnew file: src/assets/images/theme/tribunal/search.svg\n\tmodified: src/global.scss", + "changeStatus": "On branch no_bug_movemente\nYour branch is behind 'origin/no_bug_movemente' by 6 commits, and can be fast-forwarded.\n (use \"git pull\" to update your local branch)\n\nChanges to be committed:\n (use \"git restore --staged ...\" to unstage)\n\tdeleted: android/app/google-services.json\n\tmodified: package-lock.json\n\tmodified: package.json\n\tmodified: src/app/modals/profile/profile.page.html\n\tmodified: src/app/pages/gabinete-digital/gabinete-digital.page.html\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\n\tmodified: src/environments/environment.ts", "changeAuthor": "eudes.inacio" } \ No newline at end of file