From d61f5b20455f8ba00f3168825e60fb7d16c8e696 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Eudes=20In=C3=A1cio?= Date: Thu, 25 May 2023 11:12:10 +0100 Subject: [PATCH 1/4] comment MiniSearch --- .../all-processes/all-processes.page.ts | 6 +++--- version/git-version.ts | 14 +++++++------- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/src/app/shared/gabinete-digital/all-processes/all-processes.page.ts b/src/app/shared/gabinete-digital/all-processes/all-processes.page.ts index c5641fa9e..496c46b4a 100644 --- a/src/app/shared/gabinete-digital/all-processes/all-processes.page.ts +++ b/src/app/shared/gabinete-digital/all-processes/all-processes.page.ts @@ -4,7 +4,7 @@ import { LoginUserRespose } from 'src/app/models/user.model'; import { ThemeService } from 'src/app/services/theme.service' import { SessionStore } from 'src/app/store/session.service'; import { TaskService } from 'src/app/services/task.service' -import MiniSearch from 'minisearch' +/* import MiniSearch from 'minisearch' */ @Component({ selector: 'app-all-processes', @@ -21,10 +21,10 @@ export class AllProcessesPage implements OnInit { filterName: 'Para hoje' | 'Novos'| 'Lidos'| 'Não lidos'| 'OverdueTasks' | 'Todos' = 'Todos' - miniSearch = new MiniSearch({ + /* miniSearch = new MiniSearch({ fields: ['Folio', 'Senders'], // fields to index for full-text search idField: 'DocId' - }) + }) */ AllProcess = [] diff --git a/version/git-version.ts b/version/git-version.ts index 232213037..60ead7b48 100644 --- a/version/git-version.ts +++ b/version/git-version.ts @@ -1,12 +1,12 @@ export let versionData = { - "shortSHA": "ef882e8ff", - "SHA": "ef882e8ff15e33bf250aceb4f21876f626391d1b", + "shortSHA": "a526b9153", + "SHA": "a526b9153217d80d3d345ee51e91347f7e0fe21d", "branch": "feature/gabinete-search", "lastCommitAuthor": "'Peter Maquiran'", - "lastCommitTime": "'Mon May 8 10:52:54 2023 +0100'", - "lastCommitMessage": "fix", - "lastCommitNumber": "4935", + "lastCommitTime": "'Thu May 18 17:40:52 2023 +0100'", + "lastCommitMessage": "fix box sixing", + "lastCommitNumber": "4936", "change": "", - "changeStatus": "On branch feature/gabinete-search\nChanges to be committed:\n (use \"git restore --staged ...\" to unstage)\n\tmodified: readme.md\n\tmodified: src/app/modals/document-set-up-meeting/document-set-up-meeting.page.ts\n\tmodified: src/app/models/user.model.ts\n\tmodified: src/app/pages/agenda/agenda.page.ts\n\tmodified: src/app/pages/events/events.page.html\n\tmodified: src/app/pages/events/events.page.scss\n\tmodified: src/app/pages/gabinete-digital/despachos-pr/despacho-pr/despacho-pr.page.ts\n\tmodified: src/app/pages/gabinete-digital/despachos/despacho/despacho.page.ts\n\tmodified: src/app/pages/gabinete-digital/despachos/despachos.page.html\n\tmodified: src/app/pages/gabinete-digital/despachos/despachos.page.ts\n\tmodified: src/app/pages/gabinete-digital/diplomas-assinar/diploma-assinar/diploma-assinar.page.ts\n\tmodified: src/app/pages/gabinete-digital/diplomas-gerar/diplomas-gerar/diplomas-gerar.page.ts\n\tmodified: src/app/pages/gabinete-digital/diplomas/diploma/diploma.page.ts\n\tmodified: src/app/pages/gabinete-digital/diplomas/diplomas.page.html\n\tmodified: src/app/pages/gabinete-digital/diplomas/diplomas.page.ts\n\tmodified: src/app/pages/gabinete-digital/event-list/approve-event-modal/approve-event-modal.page.ts\n\tmodified: src/app/pages/gabinete-digital/event-list/approve-event/approve-event.page.ts\n\tmodified: src/app/pages/gabinete-digital/expediente/expediente-detail/expediente-detail.page.ts\n\tmodified: src/app/pages/gabinete-digital/expediente/expediente.page.ts\n\tmodified: src/app/pages/gabinete-digital/expedientes-pr/expediente-pr/expediente-pr.page.ts\n\tmodified: src/app/pages/gabinete-digital/gabinete-digital.page.html\n\tmodified: src/app/pages/gabinete-digital/pedidos/pedido/pedido.page.ts\n\tmodified: src/app/services/auth.service.ts\n\tmodified: src/app/services/task.service.ts\n\tmodified: src/app/shared/agenda/approve-event/approve-event.page.ts\n\tmodified: src/app/shared/gabinete-digital/despachos-pr/despachos-pr.page.html\n\tmodified: src/app/shared/gabinete-digital/despachos/despachos.page.html\n\tmodified: src/app/shared/gabinete-digital/diplomas-assinar/diplomas-assinar.page.html\n\tmodified: src/app/shared/gabinete-digital/diplomas/diplomas.page.html\n\tmodified: src/app/shared/gabinete-digital/events-to-approve/events-to-approve.page.html\n\tmodified: src/app/shared/gabinete-digital/expedientes-pr/expedientes-pr.page.html\n\tmodified: src/app/shared/gabinete-digital/expedients/expedients.page.html\n\tmodified: src/app/shared/gabinete-digital/pedidos/pedidos.page.html\n\tmodified: src/app/shared/gabinete-digital/pendentes/pendentes.page.html\n\tmodified: src/environments/suport/doneIt.ts\n\tmodified: version/git-version.ts", - "changeAuthor": "peter.maquiran" + "changeStatus": "On branch feature/gabinete-search\nYour branch is behind 'origin/feature/gabinete-search' by 5 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\tmodified: src/app/shared/gabinete-digital/all-processes/all-processes.page.ts", + "changeAuthor": "eudes.inacio" } \ No newline at end of file From b6443b797e6ad266651d4755995c1d39e1f9c194 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Eudes=20In=C3=A1cio?= Date: Fri, 26 May 2023 14:33:28 +0100 Subject: [PATCH 2/4] envirement change --- src/environments/environment.prod.ts | 2 +- src/environments/environment.ts | 2 +- version/git-version.ts | 12 ++++++------ 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/src/environments/environment.prod.ts b/src/environments/environment.prod.ts index 38a854fa6..53f31b337 100644 --- a/src/environments/environment.prod.ts +++ b/src/environments/environment.prod.ts @@ -3,4 +3,4 @@ import { oaprProd } from './suport/oapr' import { doneITProd } from './suport/doneIt' -export const environment: Environment = doneITProd; \ 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 ee55c1414..e2d79dff9 100644 --- a/src/environments/environment.ts +++ b/src/environments/environment.ts @@ -4,4 +4,4 @@ import { doneITDev } from './suport/doneIt' import { DevDev } from './suport/dev' -export const environment: Environment = doneITDev \ No newline at end of file +export const environment: Environment = oaprDev \ No newline at end of file diff --git a/version/git-version.ts b/version/git-version.ts index 592f8fbb4..884f17fe8 100644 --- a/version/git-version.ts +++ b/version/git-version.ts @@ -1,12 +1,12 @@ export let versionData = { - "shortSHA": "451718422", - "SHA": "451718422ae2a7af56811aae07842f491b0444c3", + "shortSHA": "6f2f77db6", + "SHA": "6f2f77db65811c219106a717aaf5f88d5c1f0c11", "branch": "feature/gabinete-search", "lastCommitAuthor": "'Eudes Inácio'", - "lastCommitTime": "'Thu May 25 16:41:39 2023 +0100'", - "lastCommitMessage": "changes", - "lastCommitNumber": "4943", + "lastCommitTime": "'Fri May 26 10:24:58 2023 +0100'", + "lastCommitMessage": "expediente bug solved by peter", + "lastCommitNumber": "4945", "change": "", - "changeStatus": "On branch feature/gabinete-search\nYour branch and 'origin/feature/gabinete-search' 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/pages/events/events.page.html\n\tmodified: src/app/pages/events/events.page.ts\n\tmodified: src/app/pages/gabinete-digital/despachos-pr/despachos-pr.page.html\n\tmodified: src/app/pages/gabinete-digital/diplomas/diplomas.page.html\n\tmodified: src/app/pages/gabinete-digital/expediente/expediente.module.ts\n\tmodified: src/app/pages/gabinete-digital/expediente/expediente.page.html\n\tmodified: src/app/pages/gabinete-digital/expediente/expediente.page.ts\n\tmodified: src/app/pages/gabinete-digital/expedientes-pr/expedientes-pr.page.html\n\tmodified: src/app/pages/gabinete-digital/expedientes-pr/expedientes-pr.page.ts\n\tmodified: src/app/services/events.service.ts", + "changeStatus": "On branch feature/gabinete-search\nYour branch is ahead of 'origin/feature/gabinete-search' by 3 commits.\n (use \"git push\" to publish your local commits)\n\nChanges to be committed:\n (use \"git restore --staged ...\" to unstage)\n\tmodified: src/environments/environment.prod.ts\n\tmodified: src/environments/environment.ts", "changeAuthor": "eudes.inacio" } \ No newline at end of file From 2e88ed2902f0acd0958bc1075bddc28ef60b2edd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Eudes=20In=C3=A1cio?= Date: Wed, 7 Jun 2023 16:18:36 +0100 Subject: [PATCH 3/4] envirement change to oapr --- src/environments/environment.prod.ts | 2 +- src/environments/environment.ts | 2 +- src/environments/suport/dev.ts | 6 +++--- version/git-version.ts | 12 ++++++------ 4 files changed, 11 insertions(+), 11 deletions(-) diff --git a/src/environments/environment.prod.ts b/src/environments/environment.prod.ts index 38a854fa6..53f31b337 100644 --- a/src/environments/environment.prod.ts +++ b/src/environments/environment.prod.ts @@ -3,4 +3,4 @@ import { oaprProd } from './suport/oapr' import { doneITProd } from './suport/doneIt' -export const environment: Environment = doneITProd; \ 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 ee55c1414..e2d79dff9 100644 --- a/src/environments/environment.ts +++ b/src/environments/environment.ts @@ -4,4 +4,4 @@ import { doneITDev } from './suport/doneIt' import { DevDev } from './suport/dev' -export const environment: Environment = doneITDev \ No newline at end of file +export const environment: Environment = oaprDev \ No newline at end of file diff --git a/src/environments/suport/dev.ts b/src/environments/suport/dev.ts index b70957006..b28ff83ae 100644 --- a/src/environments/suport/dev.ts +++ b/src/environments/suport/dev.ts @@ -26,9 +26,9 @@ export const DevProd: Environment = { export const DevDev: Environment = { id:'3', - apiURL: 'https://gdapi-dev.dyndns.info/GabineteDigital.Services/V5/api/', - apiChatUrl: 'https://gdchat-dev.dyndns.info/api/v1/', - apiWsChatUrl: 'wss://gdchat-dev.dyndns.info/websocket', + apiURL: 'http://gpr-dev-01.gabinetedigital.local/GabineteDigital.Services/V5/api/', + apiChatUrl: 'https://chat.doneit.co.ao/api/v1/', + apiWsChatUrl: 'wss://chat.doneit.co.ao/websocket', production: true, domain: 'gabinetedigital.local', defaultuser: 'paulo.pinto@gabinetedigital.local', diff --git a/version/git-version.ts b/version/git-version.ts index 7ce55086c..59177755a 100644 --- a/version/git-version.ts +++ b/version/git-version.ts @@ -1,12 +1,12 @@ export let versionData = { - "shortSHA": "06583abd2", - "SHA": "06583abd285d7c16db59d878736eecc02240d689", + "shortSHA": "affb73a60", + "SHA": "affb73a6072d318e3f7e3fca5c5e48cf86cee3fa", "branch": "feature/gabinete-search", "lastCommitAuthor": "'Eudes Inácio'", - "lastCommitTime": "'Mon Jun 5 11:15:30 2023 +0100'", - "lastCommitMessage": "changes Peter", - "lastCommitNumber": "4956", + "lastCommitTime": "'Mon Jun 5 11:35:04 2023 +0100'", + "lastCommitMessage": "Peter changes 05/06", + "lastCommitNumber": "4959", "change": "", - "changeStatus": "On branch feature/gabinete-search\nYour branch and 'origin/feature/gabinete-search' have diverged,\nand have 7 and 2 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: jest-puppeteer.config.js\n\tmodified: package-lock.json\n\tmodified: package.json\n\tmodified: src/app/pages/events/events.page.ts\n\tmodified: src/app/pages/gabinete-digital/expediente/book-meeting-modal/book-meeting-modal.page.ts\n\tmodified: src/app/services/aesencrypt.service.ts\n\tmodified: src/app/services/auth.service.ts\n\tmodified: src/app/shared/gabinete-digital/despachos-pr/despachos-pr.page.ts\n\tmodified: src/app/shared/gabinete-digital/despachos/despachos.page.ts\n\tmodified: src/app/shared/gabinete-digital/diplomas-assinar/diplomas-assinar.page.ts\n\tmodified: src/app/shared/gabinete-digital/diplomas-gerar/diplomas-gerar.page.ts\n\tmodified: src/app/shared/gabinete-digital/diplomas/diplomas.page.ts\n\tmodified: src/app/shared/gabinete-digital/events-to-approve/events-to-approve.page.ts\n\tmodified: src/app/shared/gabinete-digital/expedientes-pr/expedientes-pr.page.ts\n\tmodified: src/app/shared/gabinete-digital/expedients/expedients.page.ts\n\tmodified: src/environments/suport/doneIt.ts", + "changeStatus": "On branch feature/gabinete-search\nYour branch and 'origin/feature/gabinete-search' have diverged,\nand have 8 and 2 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/environments/environment.prod.ts\n\tmodified: src/environments/environment.ts\n\tmodified: src/environments/suport/dev.ts", "changeAuthor": "eudes.inacio" } \ No newline at end of file From 54182e77a2b35126beeae9be43209ac330e91dd5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Eudes=20In=C3=A1cio?= Date: Sun, 11 Jun 2023 20:15:32 +0100 Subject: [PATCH 4/4] remove text adicionar on efetuar depacho modal --- .../modals/create-process/create-process.page.html | 2 +- .../expedient-task-modal.page.html | 2 +- src/app/services/notifications.service.ts | 4 ++-- src/environments/environment.ts | 2 +- version/git-version.ts | 12 ++++++------ 5 files changed, 11 insertions(+), 11 deletions(-) diff --git a/src/app/modals/create-process/create-process.page.html b/src/app/modals/create-process/create-process.page.html index 6a79f0892..a779a8964 100644 --- a/src/app/modals/create-process/create-process.page.html +++ b/src/app/modals/create-process/create-process.page.html @@ -186,7 +186,7 @@
- +
diff --git a/src/app/pages/gabinete-digital/expediente/expedient-task-modal/expedient-task-modal.page.html b/src/app/pages/gabinete-digital/expediente/expedient-task-modal/expedient-task-modal.page.html index 7ef9a962e..164c28b59 100644 --- a/src/app/pages/gabinete-digital/expediente/expedient-task-modal/expedient-task-modal.page.html +++ b/src/app/pages/gabinete-digital/expediente/expedient-task-modal/expedient-task-modal.page.html @@ -235,6 +235,6 @@
- +
diff --git a/src/app/services/notifications.service.ts b/src/app/services/notifications.service.ts index 0a66f8135..60bbec2e0 100644 --- a/src/app/services/notifications.service.ts +++ b/src/app/services/notifications.service.ts @@ -151,9 +151,9 @@ export class NotificationsService { (notification: PushNotificationSchema) => { this.active = true - + console.log(notification) this.storageService.get("Notifications").then((store) => { - console.log(notification) + store.push(notification) this.storageService.store("Notifications", store) }).catch((error) => { diff --git a/src/environments/environment.ts b/src/environments/environment.ts index 16a865ce9..e2d79dff9 100644 --- a/src/environments/environment.ts +++ b/src/environments/environment.ts @@ -4,4 +4,4 @@ import { doneITDev } from './suport/doneIt' import { DevDev } from './suport/dev' -export const environment: Environment = DevDev \ No newline at end of file +export const environment: Environment = oaprDev \ No newline at end of file diff --git a/version/git-version.ts b/version/git-version.ts index d35d1070e..fd7c44c85 100644 --- a/version/git-version.ts +++ b/version/git-version.ts @@ -1,12 +1,12 @@ export let versionData = { - "shortSHA": "1a64e616a", - "SHA": "1a64e616a34824029b032a69c1fd1145a6567d3b", + "shortSHA": "b6ef9e191", + "SHA": "b6ef9e191c44527ca7a7a04e94055893daac4e97", "branch": "feature/gabinete-search", "lastCommitAuthor": "'Eudes Inácio'", - "lastCommitTime": "'Sun Jun 11 12:23:21 2023 +0100'", - "lastCommitMessage": "solved", - "lastCommitNumber": "4991", + "lastCommitTime": "'Sun Jun 11 13:54:53 2023 +0100'", + "lastCommitMessage": "new route on notificatiwon serice", + "lastCommitNumber": "4993", "change": "", - "changeStatus": "On branch feature/gabinete-search\nYour branch and 'origin/feature/gabinete-search' have diverged,\nand have 19 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/pages/gabinete-digital/gabinete-digital.page.ts\n\tmodified: src/app/services/notifications.service.ts", + "changeStatus": "On branch feature/gabinete-search\nYour branch is ahead of 'origin/feature/gabinete-search' by 20 commits.\n (use \"git push\" to publish your local commits)\n\nChanges to be committed:\n (use \"git restore --staged ...\" to unstage)\n\tmodified: src/app/modals/create-process/create-process.page.html\n\tmodified: src/app/pages/gabinete-digital/expediente/expedient-task-modal/expedient-task-modal.page.html\n\tmodified: src/app/services/notifications.service.ts\n\tmodified: src/environments/environment.ts", "changeAuthor": "eudes.inacio" } \ No newline at end of file