diff --git a/android/app/src/main/AndroidManifest.xml b/android/app/src/main/AndroidManifest.xml index 989436b41..a0ed22aa0 100644 --- a/android/app/src/main/AndroidManifest.xml +++ b/android/app/src/main/AndroidManifest.xml @@ -1,43 +1,16 @@ - - - - - - - + + + + - - - - + + - - - - + diff --git a/src/app/models/beast-orm.ts b/src/app/models/beast-orm.ts index 2aa6e8069..7ed0f9c1c 100644 --- a/src/app/models/beast-orm.ts +++ b/src/app/models/beast-orm.ts @@ -40,7 +40,7 @@ export class DeleteMessageModel extends models.Model { } models.register({ - databaseName: 'chat-storage'+environment.version.lastCommitNumber, + databaseName: 'chat-storage'+environment.version.lastCommitNumber + environment.id, type: 'indexedDB', version: 11, models: [MessageModel, DeleteMessageModel, attachments] diff --git a/src/app/models/envarioment.ts b/src/app/models/envarioment.ts new file mode 100644 index 000000000..f4b4b609f --- /dev/null +++ b/src/app/models/envarioment.ts @@ -0,0 +1,30 @@ +export interface Environment { + id: string; + apiURL: string; + apiChatUrl: string; + apiWsChatUrl: string; + logoLabel: string; + production: boolean; + domain: string; + defaultuser: string; + defaultuserpwd: string; + chatOffline: boolean; + presidencial: boolean; + version: version; + sentryUrl: string; + despachoLabel: string +} + + +export interface version { + shortSHA: string; + SHA: string; + branch: string; + lastCommitAuthor: string; + lastCommitTime: string; + lastCommitMessage: string; + lastCommitNumber: string; + change: string; + changeStatus: string; + changeAuthor: string; +} \ No newline at end of file diff --git a/src/app/pages/gabinete-digital/gabinete-digital.page.html b/src/app/pages/gabinete-digital/gabinete-digital.page.html index ac8fb2155..eae8b344b 100644 --- a/src/app/pages/gabinete-digital/gabinete-digital.page.html +++ b/src/app/pages/gabinete-digital/gabinete-digital.page.html @@ -229,7 +229,7 @@
-

Despacho do Titular

+

Despacho do {{ environment.despachoLabel }}

Despachos criados por mim

{{ despachoprstore.count }} Documentos

@@ -246,6 +246,17 @@

Diplomas por Assinar

{{ deplomasStore.deplomasReviewCount }} Documentos

+ +
+
+ + + +
+

Diplomas assinados PR

+

Diplomas

+

{{ deplomasStore.countDiplomasAssinadoListCount }} Documentos

+
@@ -260,17 +271,6 @@

{{ deplomasStore.DiplomaGerarList.length }} Documentos

- -
-
- - - -
-

Diplomas assinados PR

-

Diplomas

-

{{ deplomasStore.countDiplomasAssinadoListCount }} Documentos

-
diff --git a/src/app/pages/gabinete-digital/gabinete-digital.page.ts b/src/app/pages/gabinete-digital/gabinete-digital.page.ts index 1d21c855d..b488a22b0 100644 --- a/src/app/pages/gabinete-digital/gabinete-digital.page.ts +++ b/src/app/pages/gabinete-digital/gabinete-digital.page.ts @@ -32,6 +32,7 @@ import { Storage } from '@ionic/storage'; import { ExpedienteTaskPipe } from 'src/app/pipes/expediente-task.pipe'; import { SessionStore } from 'src/app/store/session.service'; import { NotificationsService } from 'src/app/services/notifications.service' +import { environment } from 'src/environments/environment'; @Component({ selector: 'app-gabinete-digital', templateUrl: './gabinete-digital.page.html', @@ -107,7 +108,7 @@ export class GabineteDigitalPage implements OnInit { AllProcess = [] // workerList : Worker - + environment = environment @ViewChild(ExpedientsPage) expedientesPage: ExpedientsPage; @ViewChild(PendentesPage) pendentesListPage: PendentesPage; @ViewChild(EventsToApprovePage) eventsToApprove: EventsToApprovePage; diff --git a/src/app/services/permission.service.ts b/src/app/services/permission.service.ts index 464841a07..71d144a56 100644 --- a/src/app/services/permission.service.ts +++ b/src/app/services/permission.service.ts @@ -18,7 +18,14 @@ export class PermissionService { args = [args] } - return args.includes(this.SessionStore.user.Profile) + + for(const arg of args) { + if(arg == this.SessionStore.user.Profile) { + return true + } + } + + return false } userPermission(args) { diff --git a/src/app/shared/header/header.page.html b/src/app/shared/header/header.page.html index 7e0cad845..40f801f40 100644 --- a/src/app/shared/header/header.page.html +++ b/src/app/shared/header/header.page.html @@ -19,7 +19,7 @@
-

doneIT

+

{{ environment.logoLabel }}

GABINETE DIGITAL

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

doneIT

+

{{ environment.logoLabel }}

GABINETE DIGITAL

@@ -55,15 +55,15 @@
-

Calendário Partilhado

-

doneIT

+ +

{{ environment.logoLabel }}

-

GABINETE DIGITAL

+

GABINETE DIGITAL

-

Calendário Partilhado

-

GABINETE DIGITAL

+ +

GABINETE DIGITAL

diff --git a/src/app/store/localstore.service.ts b/src/app/store/localstore.service.ts index d103f5dcf..9ee134904 100644 --- a/src/app/store/localstore.service.ts +++ b/src/app/store/localstore.service.ts @@ -7,7 +7,7 @@ import { environment } from 'src/environments/environment'; }) export class LocalstoreService { - private prefix = environment.version.lastCommitNumber+"-"; + private prefix = environment.version.lastCommitNumber + environment.id+"-"; private previewPrefix = 'v17-'; callbacks: {[key: string]: { diff --git a/src/app/store/session.service.ts b/src/app/store/session.service.ts index 2697b4d85..cf33bdcfb 100644 --- a/src/app/store/session.service.ts +++ b/src/app/store/session.service.ts @@ -16,6 +16,30 @@ class SessionService { forceToLoginWithForceToLogInWithPassword = false + permission = { + Agenda: { + access: false + }, + Gabinete: { + access: false, + pr_tasks: false, + md_tasks: false, + aprove_event: false + }, + Actions: { + access : false, + create : false, + delete : false, + edit : false, + createPost : false, + deletePost : false, + editPost : false + }, + Chat: { + access: false + } + } + constructor() { this.keyName = (SHA1("SessionService")).toString() diff --git a/src/environments/environment.prod.ts b/src/environments/environment.prod.ts index b5c1d7510..53f31b337 100644 --- a/src/environments/environment.prod.ts +++ b/src/environments/environment.prod.ts @@ -1,25 +1,6 @@ -import { versionData } from '../../version/git-version' +import { Environment } from './../app/models/envarioment' +import { oaprProd } from './suport/oapr' +import { doneITProd } from './suport/doneIt' -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://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://gdchat-dev.dyndns.info/api/v1/', - // apiWsChatUrl: 'wss://gdchat-dev.dyndns.info/websocket', - production: true, - 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, - sentryUrl: 'https://9920cc36f1d740b987426ee8d80cf588@o4504340905525248.ingest.sentry.io/4504340946419712' -}; \ No newline at end of file + +export const environment: Environment = oaprProd; \ No newline at end of file diff --git a/src/environments/environment.ts b/src/environments/environment.ts index 3512c071c..10909d23b 100644 --- a/src/environments/environment.ts +++ b/src/environments/environment.ts @@ -1,24 +1,6 @@ -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://API.DONEIT.CO.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://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', */ - production: false, - domain: 'equilibrium.co.ao', - defaultuser: 'evandre.dasilva@equilibrium.co.ao',//evandre.dasilva@equilibrium.co.ao - defaultuserpwd: 'Luand@1219', //Luand@1219, - chatOffline: true, - presidencia: false, - version: versionData, - sentryUrl: 'https://9920cc36f1d740b987426ee8d80cf588@o4504340905525248.ingest.sentry.io/4504340946419712' -}; \ No newline at end of file +import { Environment } from './../app/models/envarioment' +import { oaprDev } from './suport/oapr' +import { doneITDev } from './suport/doneIt' + + +export const environment: Environment = oaprDev; \ No newline at end of file diff --git a/src/environments/suport/doneIt.ts b/src/environments/suport/doneIt.ts new file mode 100644 index 000000000..c072682d7 --- /dev/null +++ b/src/environments/suport/doneIt.ts @@ -0,0 +1,36 @@ +import { versionData } from '../../../version/git-version' +import { Environment } from './../../app/models/envarioment' + +export const doneITProd: Environment = { + id:'1', + apiURL: 'https://API.DONEIT.CO.AO/api/', + apiChatUrl: 'https://CHAT.DONEIT.CO.AO/api/v1/', + apiWsChatUrl: 'wss://CHAT.DONEIT.CO.AO/websocket', + production: true, + domain: 'equilibrium.co.ao', + defaultuser: '', + defaultuserpwd: '', + chatOffline: true, + presidencial: false, + version: versionData, + sentryUrl: 'https://9920cc36f1d740b987426ee8d80cf588@o4504340905525248.ingest.sentry.io/4504340946419712', + logoLabel: 'doneIT', + despachoLabel: 'Titular', +}; + +export const doneITDev: Environment = { + id:'1', + apiURL: 'https://API.DONEIT.CO.AO/api/', + apiChatUrl: 'https://CHAT.DONEIT.CO.AO/api/v1/', + apiWsChatUrl: 'wss://CHAT.DONEIT.CO.AO/websocket', + production: true, + domain: 'equilibrium.co.ao', + defaultuser: 'evandre.dasilva@equilibrium.co.ao', + defaultuserpwd: 'Luand@1219', + chatOffline: true, + presidencial: false, + version: versionData, + sentryUrl: 'https://9920cc36f1d740b987426ee8d80cf588@o4504340905525248.ingest.sentry.io/4504340946419712', + logoLabel: 'doneIT', + despachoLabel: 'Titular', +}; \ No newline at end of file diff --git a/src/environments/suport/oapr.ts b/src/environments/suport/oapr.ts new file mode 100644 index 000000000..b70ae5731 --- /dev/null +++ b/src/environments/suport/oapr.ts @@ -0,0 +1,37 @@ +import { versionData } from '../../../version/git-version' +import { Environment } from './../../app/models/envarioment' + + +export const oaprProd: Environment = { + id: '0', + apiURL: 'https://gd-api.oapr.gov.ao/api/', + apiChatUrl: 'https://gd-chat.oapr.gov.ao/api/v1/', + apiWsChatUrl: 'wss://gd-chat.oapr.gov.ao/websocket', + logoLabel: 'Presidente da República', + despachoLabel: 'Presidente da República', + production: false, + domain: 'oapr.gov.ao', + defaultuser: '', + defaultuserpwd: '', + chatOffline: true, + presidencial: true, + version: versionData, + sentryUrl: 'https://9920cc36f1d740b987426ee8d80cf588@o4504340905525248.ingest.sentry.io/4504340946419712' +}; + +export const oaprDev: Environment = { + id: '0', + apiURL: 'https://gd-api.oapr.gov.ao/api/', + apiChatUrl: 'https://gd-chat.oapr.gov.ao/api/v1/', + apiWsChatUrl: 'wss://gd-chat.oapr.gov.ao/websocket', + logoLabel: 'Presidente da República', + despachoLabel: 'Presidente da República', + production: false, + domain: 'oapr.gov.ao', + defaultuser: 'gmanuel@oapr.gov.ao', + defaultuserpwd: 'Tabteste@006', + chatOffline: true, + presidencial: true, + version: versionData, + sentryUrl: 'https://9920cc36f1d740b987426ee8d80cf588@o4504340905525248.ingest.sentry.io/4504340946419712', +}; \ No newline at end of file diff --git a/version/git-version.ts b/version/git-version.ts index 01683ae4f..4af8c064b 100644 --- a/version/git-version.ts +++ b/version/git-version.ts @@ -1,12 +1,12 @@ export let versionData = { - "shortSHA": "652cc0146", - "SHA": "652cc014602759f5120049b3ceb27413a24a8737", + "shortSHA": "f44505082", + "SHA": "f44505082108e12aa7ab360be9af64b347b61803", "branch": "feature_build_ios_v1_3", "lastCommitAuthor": "'Peter Maquiran'", - "lastCommitTime": "'Wed Jan 25 10:21:28 2023 +0100'", - "lastCommitMessage": "improve", - "lastCommitNumber": "4687", + "lastCommitTime": "'Wed Jan 25 10:28:55 2023 +0100'", + "lastCommitMessage": "save", + "lastCommitNumber": "4688", "change": "", - "changeStatus": "On branch feature_build_ios_v1_3\nYour branch and 'origin/feature_build_ios_v1_3' have diverged,\nand have 59 and 1 different commits each, respectively.\n (use \"git pull\" to merge the remote branch into yours)\n\nChanges to be committed:\n (use \"git restore --staged ...\" to unstage)\n\tmodified: src/app/shared/header-pr/header-pr.page.ts\n\tmodified: src/environments/environment.ts", + "changeStatus": "On branch feature_build_ios_v1_3\nYour branch and 'origin/feature_build_ios_v1_3' have diverged,\nand have 60 and 1 different commits each, respectively.\n (use \"git pull\" to merge the remote branch into yours)\n\nChanges to be committed:\n (use \"git restore --staged ...\" to unstage)\n\tmodified: android/app/src/main/AndroidManifest.xml\n\tmodified: src/app/models/beast-orm.ts\n\tnew file: src/app/models/envarioment.ts\n\tmodified: src/app/pages/gabinete-digital/gabinete-digital.page.html\n\tmodified: src/app/pages/gabinete-digital/gabinete-digital.page.ts\n\tmodified: src/app/services/permission.service.ts\n\tmodified: src/app/shared/header/header.page.html\n\tmodified: src/app/store/localstore.service.ts\n\tmodified: src/app/store/session.service.ts\n\tmodified: src/environments/environment.prod.ts\n\tmodified: src/environments/environment.ts\n\tnew file: src/environments/suport/doneIt.ts\n\tnew file: src/environments/suport/oapr.ts\n\tmodified: version/git-version.ts", "changeAuthor": "peter.maquiran" } \ No newline at end of file