From e24f4010e0b8d94a232bf8d2f5ba88c6fe8d6256 Mon Sep 17 00:00:00 2001 From: Peter Maquiran Date: Mon, 16 Jan 2023 12:08:38 +0100 Subject: [PATCH 01/42] fix notification --- .gitignore | 1 + android/app/google-services.json | 40 ++++++++++++++++++++++++++++++++ version/git-version.ts | 14 +++++------ 3 files changed, 48 insertions(+), 7 deletions(-) create mode 100644 android/app/google-services.json diff --git a/.gitignore b/.gitignore index 99de21535..dc12bb2b1 100644 --- a/.gitignore +++ b/.gitignore @@ -59,6 +59,7 @@ android/** !android/app/ android/app/** !android/app/src +!android/app/google-services.json android/app/src/** !android/app/src/build.gradle !android/app/src/main diff --git a/android/app/google-services.json b/android/app/google-services.json new file mode 100644 index 000000000..0a455bcff --- /dev/null +++ b/android/app/google-services.json @@ -0,0 +1,40 @@ +{ + "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/version/git-version.ts b/version/git-version.ts index 403496fa6..e9e3a9064 100644 --- a/version/git-version.ts +++ b/version/git-version.ts @@ -1,12 +1,12 @@ export let versionData = { - "shortSHA": "9493179ef", - "SHA": "9493179efd417b23a44287121490522196f5e105", - "branch": "no_bug_movemente", + "shortSHA": "7fbe4abdd", + "SHA": "7fbe4abddf5aadf72d781e9c140f6364b5f164e3", + "branch": "feature/ios-ui-fix", "lastCommitAuthor": "'Peter Maquiran'", - "lastCommitTime": "'Thu Jan 12 15:27:09 2023 +0100'", - "lastCommitMessage": "save all", - "lastCommitNumber": "4625", + "lastCommitTime": "'Mon Jan 16 09:06:12 2023 +0100'", + "lastCommitMessage": "save", + "lastCommitNumber": "4626", "change": "", - "changeStatus": "On branch no_bug_movemente\nChanges to be committed:\n (use \"git restore --staged ...\" to unstage)\n\tmodified: .gitignore\n\tmodified: android/app/src/main/AndroidManifest.xml\n\tdeleted: android/app/src/main/res/drawable-land-ldpi/splash.png\n\tdeleted: android/app/src/main/res/drawable-port-ldpi/splash.png\n\tmodified: readme.md\n\tmodified: src/app/pages/gabinete-digital/gabinete-digital.page.ts\n\tmodified: src/app/pages/login/login.page.ts\n\tmodified: src/app/services/chat/room.service.ts\n\tmodified: src/app/services/sqlite.service.ts", + "changeStatus": "On branch feature/ios-ui-fix\nChanges to be committed:\n (use \"git restore --staged ...\" to unstage)\n\tmodified: .gitignore\n\tnew file: android/app/google-services.json", "changeAuthor": "peter.maquiran" } \ No newline at end of file From d43ce7fe0986edf85f256ec8b18c1a077f4cdbe7 Mon Sep 17 00:00:00 2001 From: Peter Maquiran Date: Mon, 16 Jan 2023 14:17:06 +0100 Subject: [PATCH 02/42] add event driven --- package.json | 3 ++- src/app/models/notifications.ts | 3 ++- src/app/services/notifications.service.ts | 29 ++++++++++++++++++++--- version/git-version.ts | 12 +++++----- 4 files changed, 36 insertions(+), 11 deletions(-) diff --git a/package.json b/package.json index 25991aade..0b4d7ada1 100644 --- a/package.json +++ b/package.json @@ -14,7 +14,8 @@ "dev:share": "lite-server --baseDir=share", "install:chromium": "node node_modules/puppeteer/install.js", "build:version": "node ./version/git-version.js", - "ionic-build": "ionic cap run android --prod" + "ionic-build": "ionic cap run android --prod", + "prepare": "husky install" }, "private": true, "dependencies": { diff --git a/src/app/models/notifications.ts b/src/app/models/notifications.ts index 769a2ad5c..97c38a9dd 100644 --- a/src/app/models/notifications.ts +++ b/src/app/models/notifications.ts @@ -13,6 +13,7 @@ const object = [ 'diplomas', 'expedientes-pr', 'despachos', + '*', ] as const; -export type IdObject = typeof object[number]; \ No newline at end of file +export type notificationObject = typeof object[number]; \ No newline at end of file diff --git a/src/app/services/notifications.service.ts b/src/app/services/notifications.service.ts index b069c6961..f6d7b6238 100644 --- a/src/app/services/notifications.service.ts +++ b/src/app/services/notifications.service.ts @@ -15,7 +15,7 @@ import { v4 as uuidv4 } from 'uuid'; import { EventTrigger } from '../services/eventTrigger.service'; import { SessionStore } from '../store/session.service'; import { ActionPerformed, PushNotificationSchema, PushNotifications, Token, } from '@capacitor/push-notifications'; -import { IdObject } from '../models/notifications'; +import { notificationObject } from '../models/notifications'; /* import { Events } from 'ionic-angular' */ @Injectable({ @@ -28,7 +28,7 @@ export class NotificationsService { DataArray = new Array(); callbacks: { - type: string, + type: notificationObject, funx: Function id: string }[] = [] @@ -52,7 +52,7 @@ export class NotificationsService { /* private fcm: FCM */) { } - registerCallback(type: IdObject, funx: Function, object: any = {}) { + registerCallback(type: notificationObject, funx: Function, object: any = {}) { const id = uuidv4() this.callbacks.push({ type, funx, id }) @@ -63,6 +63,27 @@ export class NotificationsService { return id; } + // registerCallback({type, funx, id = uuidv4()}:{ + // type: notificationObject, + // funx: Function + // id?: string + // }) { + + // this.callbacks.push({ type, funx, id }) + + // return id; + // } + + private runNotificationCallback(notification) { + this.callbacks.forEach((data) => { + if(data.type == notification.data.IdObject) { + data.funx({notification}) + } else if (data.type == '*') { + + } + }) + } + deleteCallback(id) { this.callbacks.forEach((e, index) => { if (e.id == id) { @@ -155,6 +176,7 @@ export class NotificationsService { } }) + this.runNotificationCallback(notification) /* this.eventTriger.publish('notificatioRecive') */ this.eventtrigger.publishSomeData({ notification: "recive" @@ -174,6 +196,7 @@ export class NotificationsService { notification: "recive" }) */ this.notificatinsRoutes(notification) + this.runNotificationCallback(notification) } ); } diff --git a/version/git-version.ts b/version/git-version.ts index e9e3a9064..e8e644bff 100644 --- a/version/git-version.ts +++ b/version/git-version.ts @@ -1,12 +1,12 @@ export let versionData = { - "shortSHA": "7fbe4abdd", - "SHA": "7fbe4abddf5aadf72d781e9c140f6364b5f164e3", + "shortSHA": "e24f4010e", + "SHA": "e24f4010e0b8d94a232bf8d2f5ba88c6fe8d6256", "branch": "feature/ios-ui-fix", "lastCommitAuthor": "'Peter Maquiran'", - "lastCommitTime": "'Mon Jan 16 09:06:12 2023 +0100'", - "lastCommitMessage": "save", - "lastCommitNumber": "4626", + "lastCommitTime": "'Mon Jan 16 12:08:38 2023 +0100'", + "lastCommitMessage": "fix notification", + "lastCommitNumber": "4627", "change": "", - "changeStatus": "On branch feature/ios-ui-fix\nChanges to be committed:\n (use \"git restore --staged ...\" to unstage)\n\tmodified: .gitignore\n\tnew file: android/app/google-services.json", + "changeStatus": "On branch feature/ios-ui-fix\nChanges to be committed:\n (use \"git restore --staged ...\" to unstage)\n\tmodified: package.json\n\tmodified: src/app/models/notifications.ts\n\tmodified: src/app/services/notifications.service.ts", "changeAuthor": "peter.maquiran" } \ No newline at end of file From 12612a360050a996f4b8067694513685280caeac Mon Sep 17 00:00:00 2001 From: Peter Maquiran Date: Mon, 16 Jan 2023 15:45:08 +0100 Subject: [PATCH 03/42] fix ui --- .gitignore | 3 ++- src/app/shared/header/header.page.html | 4 ++-- version/git-version.ts | 12 ++++++------ 3 files changed, 10 insertions(+), 9 deletions(-) diff --git a/.gitignore b/.gitignore index 99de21535..2afc5ea1a 100644 --- a/.gitignore +++ b/.gitignore @@ -74,4 +74,5 @@ ___android/ _android/ _www/ www2020 -android copy/ \ No newline at end of file +android copy/ +report.* \ No newline at end of file diff --git a/src/app/shared/header/header.page.html b/src/app/shared/header/header.page.html index 4dbf7f3aa..5f20920ed 100644 --- a/src/app/shared/header/header.page.html +++ b/src/app/shared/header/header.page.html @@ -5,9 +5,9 @@
- +
diff --git a/version/git-version.ts b/version/git-version.ts index 403496fa6..deac3c192 100644 --- a/version/git-version.ts +++ b/version/git-version.ts @@ -1,12 +1,12 @@ export let versionData = { - "shortSHA": "9493179ef", - "SHA": "9493179efd417b23a44287121490522196f5e105", + "shortSHA": "7fbe4abdd", + "SHA": "7fbe4abddf5aadf72d781e9c140f6364b5f164e3", "branch": "no_bug_movemente", "lastCommitAuthor": "'Peter Maquiran'", - "lastCommitTime": "'Thu Jan 12 15:27:09 2023 +0100'", - "lastCommitMessage": "save all", - "lastCommitNumber": "4625", + "lastCommitTime": "'Mon Jan 16 09:06:12 2023 +0100'", + "lastCommitMessage": "save", + "lastCommitNumber": "4626", "change": "", - "changeStatus": "On branch no_bug_movemente\nChanges to be committed:\n (use \"git restore --staged ...\" to unstage)\n\tmodified: .gitignore\n\tmodified: android/app/src/main/AndroidManifest.xml\n\tdeleted: android/app/src/main/res/drawable-land-ldpi/splash.png\n\tdeleted: android/app/src/main/res/drawable-port-ldpi/splash.png\n\tmodified: readme.md\n\tmodified: src/app/pages/gabinete-digital/gabinete-digital.page.ts\n\tmodified: src/app/pages/login/login.page.ts\n\tmodified: src/app/services/chat/room.service.ts\n\tmodified: src/app/services/sqlite.service.ts", + "changeStatus": "On branch no_bug_movemente\nChanges to be committed:\n (use \"git restore --staged ...\" to unstage)\n\tmodified: .gitignore\n\tmodified: src/app/shared/header/header.page.html", "changeAuthor": "peter.maquiran" } \ No newline at end of file From d2478bf311a985605138bfe510f5d2c64a7950a9 Mon Sep 17 00:00:00 2001 From: Peter Maquiran Date: Tue, 17 Jan 2023 10:45:20 +0100 Subject: [PATCH 04/42] return icons --- .../profile/edit-profile/edit-profile.page.html | 8 ++++---- src/app/modals/profile/profile.page.html | 4 ++-- src/app/modals/profile/profile.page.ts | 12 +++++++----- src/app/pages/inactivity/inactivity.page.html | 4 ++-- src/app/pages/login/login.page.html | 4 ++-- src/app/shared/header/header.page.html | 8 ++++---- src/environments/environment.ts | 2 +- src/index.html | 2 +- src/main.ts | 7 ------- version/git-version.ts | 12 ++++++------ 10 files changed, 29 insertions(+), 34 deletions(-) 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 26565e73d..91d29a539 100644 --- a/src/app/modals/profile/edit-profile/edit-profile.page.html +++ b/src/app/modals/profile/edit-profile/edit-profile.page.html @@ -3,9 +3,9 @@
diff --git a/src/app/modals/profile/profile.page.html b/src/app/modals/profile/profile.page.html index b8c07fc59..18f0967c8 100644 --- a/src/app/modals/profile/profile.page.html +++ b/src/app/modals/profile/profile.page.html @@ -2,9 +2,9 @@
diff --git a/version/git-version.ts b/version/git-version.ts index 445ef0ea3..183b53d04 100644 --- a/version/git-version.ts +++ b/version/git-version.ts @@ -1,12 +1,12 @@ export let versionData = { - "shortSHA": "1800b5b4a", - "SHA": "1800b5b4a96b7cbc94fd7aa9a624c140d2f78135", + "shortSHA": "9c6f92038", + "SHA": "9c6f92038e6e7c00dfb6e2bd21bfd833120d7a99", "branch": "no_bug_movemente", "lastCommitAuthor": "'Peter Maquiran'", - "lastCommitTime": "'Thu Jan 19 12:48:51 2023 +0100'", - "lastCommitMessage": "merge", - "lastCommitNumber": "4668", + "lastCommitTime": "'Thu Jan 19 13:03:28 2023 +0100'", + "lastCommitMessage": "improve", + "lastCommitNumber": "4669", "change": "", - "changeStatus": "On branch no_bug_movemente\nChanges to be committed:\n (use \"git restore --staged ...\" to unstage)\n\tmodified: src/app/modals/profile/edit-profile/edit-profile.page.html\n\tmodified: src/app/pages/publications/publications.page.html\n\tmodified: src/app/pages/publications/publications.page.ts\n\tmodified: src/environments/environment.ts", + "changeStatus": "On branch no_bug_movemente\nChanges to be committed:\n (use \"git restore --staged ...\" to unstage)\n\tmodified: src/app/pages/chat/group-messages/group-messages.page.html\n\tmodified: src/app/pages/chat/messages/messages.page.html\n\tmodified: src/app/shared/chat/group-messages/group-messages.page.html\n\tmodified: src/app/shared/chat/messages/messages.page.html", "changeAuthor": "peter.maquiran" } \ No newline at end of file From 2c97264f56e6fc130a559901b134a6d1de92e8ed Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Eudes=20In=C3=A1cio?= Date: Thu, 19 Jan 2023 14:38:10 +0100 Subject: [PATCH 34/42] Envirement changed --- src/environments/environment.prod.ts | 2 +- version/git-version.ts | 12 ++++++------ 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/src/environments/environment.prod.ts b/src/environments/environment.prod.ts index 1420e1e74..21dab8dae 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: 'oapr.gov.ao', //equilibrium.ao.ao + domain: 'equilibrium.co.ao', //equilibrium.ao.ao defaultuser: '',//paulo.pinto@gabinetedigital.local defaultuserpwd: '', //tabteste@006,06, chatOffline: true, diff --git a/version/git-version.ts b/version/git-version.ts index cfce24cf5..d219ccc10 100644 --- a/version/git-version.ts +++ b/version/git-version.ts @@ -1,12 +1,12 @@ export let versionData = { - "shortSHA": "7b97a79e3", - "SHA": "7b97a79e3c16ea1794a9cb22c8c74f9d95affda8", + "shortSHA": "706729155", + "SHA": "706729155ce64fdc379cb6fed746a4cd2104760a", "branch": "no_bug_movemente", "lastCommitAuthor": "'Eudes Inácio'", - "lastCommitTime": "'Thu Jan 19 10:24:18 2023 +0100'", - "lastCommitMessage": "pull of peter changes 2", - "lastCommitNumber": "4660", + "lastCommitTime": "'Thu Jan 19 10:29:34 2023 +0100'", + "lastCommitMessage": "pull of peter changes 3", + "lastCommitNumber": "4663", "change": "", - "changeStatus": "On branch no_bug_movemente\nYour branch and 'origin/no_bug_movemente' have diverged,\nand have 4 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: src/app/guards/login.guard.ts\n\tmodified: src/app/pages/gabinete-digital/gabinete-digital.page.ts\n\tmodified: src/app/services/notifications.service.ts\n\tmodified: src/app/shared/gabinete-digital/all-processes/all-processes.page.ts\n\tnew file: tsconfig.worker.json", + "changeStatus": "On branch no_bug_movemente\nYour branch is up to date with 'origin/no_bug_movemente'.\n\nChanges to be committed:\n (use \"git restore --staged ...\" to unstage)\n\tmodified: src/environments/environment.prod.ts", "changeAuthor": "eudes.inacio" } \ No newline at end of file From a203566b3e1a48383393458c7f804d59762d0dbf Mon Sep 17 00:00:00 2001 From: Peter Maquiran Date: Fri, 20 Jan 2023 14:57:50 +0100 Subject: [PATCH 35/42] improve --- src/app/app-routing.module.ts | 549 +++++++++--------- .../document-set-up-meeting.page.html | 4 +- .../document-set-up-meeting.page.ts | 48 +- .../book-meeting-modal.page.html | 4 +- .../book-meeting-modal.page.ts | 44 +- .../edit-action/edit-action.page.ts | 2 +- .../new-action/new-action.page.html | 4 +- .../new-action/new-action.page.ts | 40 +- .../new-publication/new-publication.page.ts | 2 +- src/app/pages/search/search.page.html | 17 +- src/app/pages/search/search.page.ts | 22 + src/app/services/chat/chat-system.service.ts | 10 +- .../chat/rochet-chat-connector.service.ts | 28 + .../edit-event-to-approve.page.ts | 2 +- .../edit-event-to-approve/edit-event.page.ts | 2 +- .../chat-options-popover.page.html | 3 +- .../edit-action/edit-action.page.ts | 2 +- .../new-action/new-action.page.html | 4 +- .../publication/new-action/new-action.page.ts | 43 +- src/assets/images/theme/blue/search.svg | 1 + src/assets/images/theme/gov/search.svg | 1 + src/assets/images/theme/tribunal/search.svg | 1 + src/global.scss | 8 + version/git-version.ts | 12 +- 24 files changed, 545 insertions(+), 308 deletions(-) create mode 100644 src/assets/images/theme/blue/search.svg create mode 100644 src/assets/images/theme/gov/search.svg create mode 100644 src/assets/images/theme/tribunal/search.svg diff --git a/src/app/app-routing.module.ts b/src/app/app-routing.module.ts index b9e22b1b0..8bb4acc3d 100644 --- a/src/app/app-routing.module.ts +++ b/src/app/app-routing.module.ts @@ -1,255 +1,256 @@ -import { NgModule } from '@angular/core'; -import { PreloadAllModules, RouterModule, Routes } from '@angular/router'; - -const routes = [ - { - path: '', - loadChildren: () => import('./index/index.module').then(m => m.IndexPageModule) - }, - { - path: '', - loadChildren: () => import('./home/home.module').then( m => m.HomePageModule) - }, - { - path: 'empty-chat', - loadChildren: () => import('./shared/chat/empty-chat/empty-chat.module').then( m => m.EmptyChatPageModule) - }, - { - path: 'empty-container', - loadChildren: () => import('./shared/empty-container/empty-container.module').then( m => m.EmptyContainerPageModule) - }, - { - path: 'events-to-approve', - loadChildren: () => import('./shared/gabinete-digital/events-to-approve/events-to-approve.module').then( m => m.EventsToApprovePageModule) - }, - { - path: 'expedients', - loadChildren: () => import('./shared/gabinete-digital/expedients/expedients.module').then( m => m.ExpedientsPageModule) - }, - { - path: 'document-detail', - loadChildren: () => import('./modals/document-detail/document-detail.module').then( m => m.DocumentDetailPageModule) - }, - { - path: 'edit-group', - loadChildren: () => import('./shared/chat/edit-group/edit-group.module').then( m => m.EditGroupPageModule) - }, - { - path: 'pedidos', - loadChildren: () => import('./shared/gabinete-digital/pedidos/pedidos.module').then( m => m.PedidosPageModule) - }, - { - path: 'event-list', - loadChildren: () => import('./pages/gabinete-digital/event-list/event-list.module').then(m =>m.EventListPageModule) - }, - { - path: 'despachos', - loadChildren: () => import('./shared/gabinete-digital/despachos/despachos.module').then( m => m.DespachosPageModule) - }, - { - path: 'create-process', - loadChildren: () => import('./modals/create-process/create-process.module').then( m => m.CreateProcessPageModule) - }, - { - path: 'pendentes', - loadChildren: () => import('./shared/gabinete-digital/pendentes/pendentes.module').then( m => m.PendentesPageModule) - }, - { - path: 'delegar', - loadChildren: () => import('./modals/delegar/delegar.module').then( m => m.DelegarPageModule) - }, - { - path: 'add-note', - loadChildren: () => import('./modals/add-note/add-note.module').then( m => m.AddNotePageModule) - }, - { - path: 'dar-parecer', - loadChildren: () => import('./modals/dar-parecer/dar-parecer.module').then( m => m.DarParecerPageModule) - }, - { - path: 'opts-expediente', - loadChildren: () => import('./shared/popover/opts-expediente/opts-expediente.module').then( m => m.OptsExpedientePageModule) - }, - { - path: 'despachos-pr', - loadChildren: () => import('./shared/gabinete-digital/despachos-pr/despachos-pr.module').then( m => m.DespachosPrPageModule) - }, - { - path: 'diplomas', - loadChildren: () => import('./shared/gabinete-digital/diplomas/diplomas.module').then( m => m.DiplomasPageModule) - }, - { - path: 'expedientes-pr', - loadChildren: () => import('./shared/gabinete-digital/expedientes-pr/expedientes-pr.module').then( m => m.ExpedientesPrPageModule) - }, - { - path: 'diplomas-assinar', - loadChildren: () => import('./shared/gabinete-digital/diplomas-assinar/diplomas-assinar.module').then( m => m.DiplomasAssinarPageModule) - }, - { - path: 'opts-expediente-pr', - loadChildren: () => import('./shared/popover/opts-expediente-pr/opts-expediente-pr.module').then( m => m.OptsExpedientePrPageModule) - }, - { - path: 'despachos-options', - loadChildren: () => import('./shared/popover/despachos-options/despachos-options.module').then( m => m.DespachosOptionsPageModule) - }, - { - path: 'despachos-pr-options', - loadChildren: () => import('./shared/popover/despachos-pr-options/despachos-pr-options.module').then( m => m.DespachosPrOptionsPageModule) - }, - { - path: 'deploma-options', - loadChildren: () => import('./shared/popover/deploma-options/deploma-options.module').then( m => m.DeplomaOptionsPageModule) - }, - { - path: 'pin', - loadChildren: () => import('./shared/pin/pin.module').then( m => m.PinPageModule) - }, - { - path: 'fingerprint', - loadChildren: () => import('./shared/fingerprint/fingerprint.module').then( m => m.FingerprintPageModule) - }, - { - path: 'new-event', - loadChildren: () => import('./shared/agenda/new-event/new-event.module').then( m => m.NewEventPageModule) - }, - { - path: 'event-list', - loadChildren: () => import('./shared/agenda/event-list/event-list.module').then( m => m.EventListPageModule) - }, - { - path: 'approve-event', - loadChildren: () => import('./shared/agenda/approve-event/approve-event.module').then( m => m.ApproveEventPageModule) - }, - { - path: 'bad-request', - loadChildren: () => import('./shared/popover/bad-request/bad-request.module').then( m => m.BadRequestPageModule) - }, - { - path: 'success-message', - loadChildren: () => import('./shared/popover/success-message/success-message.module').then( m => m.SuccessMessagePageModule) - }, - { - path: 'forward', - loadChildren: () => import('./modals/forward/forward.module').then( m => m.ForwardPageModule) - }, - { - path: 'edit-event-to-approve', - loadChildren: () => import('./shared/agenda/edit-event-to-approve/edit-event-to-approve.module').then( m => m.EditEventToApprovePageModule) - }, - { - path: 'actions-options', - loadChildren: () => import('./shared/popover/actions-options/actions-options.module').then( m => m.ActionsOptionsPageModule) - }, - { - path: 'edit-action', - loadChildren: () => import('./shared/publication/edit-action/edit-action.module').then( m => m.EditActionPageModule) - }, - { - path: 'eliminate-event', - loadChildren: () => import('./modals/eliminate-event/eliminate-event.module').then( m => m.EliminateEventPageModule) - }, - { - path: 'inactivity', - loadChildren: () => import('./pages/inactivity/inactivity.module').then( m => m.InactivityPageModule) - }, - { - path: 'document-set-up-meeting', - loadChildren: () => import('./modals/document-set-up-meeting/document-set-up-meeting.module').then( m => m.DocumentSetUpMeetingPageModule) - }, - { - path: 'profile', - loadChildren: () => import('./modals/profile/profile.module').then( m => m.ProfilePageModule) - }, - { - path: 'all-processes', - loadChildren: () => import('./shared/gabinete-digital/all-processes/all-processes.module').then( m => m.AllProcessesPageModule) - }, - { - path: 'searched-document-options', - loadChildren: () => import('./shared/popover/searched-document-options/searched-document-options.module').then( m => m.SearchedDocumentOptionsPageModule) - }, - { - path: 'task-list', - loadChildren: () => import('./shared/gabinete-digital/generic/task-list/task-list.module').then( m => m.TaskListPageModule) - }, - { - path: 'task-list', - loadChildren: () => import('./shared/gabinete-digital/generic/task-list/task-list.module').then( m => m.TaskListPageModule) - }, - { - path: 'task-detailde', - loadChildren: () => import('./shared/gabinete-digital/generic/task-detailde/task-detailde.module').then( m => m.TaskDetaildePageModule) - }, - { - path: 'task-details', - loadChildren: () => import('./shared/gabinete-digital/generic/task-details/task-details.module').then( m => m.TaskDetailsPageModule) - }, - { - path: 'chat-options-features', - loadChildren: () => import('./modals/chat-options-features/chat-options-features.module').then( m => m.ChatOptionsFeaturesPageModule) - }, - { - path: 'document-viewer', - loadChildren: () => import('./modals/document-viewer/document-viewer.module').then( m => m.DocumentViewerPageModule) - }, - { - path: 'view-document', - loadChildren: () => import('./modals/view-document/view-document.module').then( m => m.ViewDocumentPageModule) - }, - { - path: 'event-details-documents-options', - loadChildren: () => import('./shared/popover/event-details-documents-options/event-details-documents-options.module').then( m => m.EventDetailsDocumentsOptionsPageModule) - }, - { - path: 'preview-camera', - loadChildren: () => import('./modals/preview-camera/preview-camera.module').then( m => m.PreviewCameraPageModule) - }, - { - path: 'group-icons', - loadChildren: () => import('./modals/group-icons/group-icons.module').then( m => m.GroupIconsPageModule) - }, - { - path: 'video-allowed', - loadChildren: () => import('./modals/video-allowed/video-allowed.module').then( m => m.VideoAllowedPageModule) - }, - { - path: 'preview-photo', - loadChildren: () => import('./modals/preview-photo/preview-photo.module').then( m => m.PreviewPhotoPageModule) - }, - { - path: 'custom-image-cache', - loadChildren: () => import('./services/file/custom-image-cache/custom-image-cache.module').then( m => m.CustomImageCachePageModule) - }, - { - path: 'view-media', - loadChildren: () => import('./modals/view-media/view-media.module').then( m => m.ViewMediaPageModule) - }, - { - path: 'view-event', - loadChildren: () => import('./modals/view-event/view-event.module').then( m => m.ViewEventPageModule) - }, - { - path: 'previewer', - loadChildren: () => import('./modals/previewer/previewer.module').then( m => m.PreviewerPageModule) - }, - { - path: 'set-room-owner', - loadChildren: () => import('./modals/set-room-owner/set-room-owner.module').then( m => m.SetRoomOwnerPageModule) - }, - { - path: 'diplomas-gerar', - loadChildren: () => import('./shared/gabinete-digital/diplomas-gerar/diplomas-gerar.module').then( m => m.DiplomasGerarPageModule) - }, - { - path: 'diplomas-gerar-options', - loadChildren: () => import('./shared/popover/diplomas-gerar-options/diplomas-gerar-options.module').then( m => m.DiplomasGerarOptionsPageModule) - }, - { - path: 'chat-debugging', - loadChildren: () => import('./shared/popover/chat-debugging/chat-debugging.module').then( m => m.ChatDebuggingPageModule) - }, { +import { NgModule } from '@angular/core'; +import { PreloadAllModules, RouterModule, Routes } from '@angular/router'; + +const routes = [ + { + path: '', + loadChildren: () => import('./index/index.module').then(m => m.IndexPageModule) + }, + { + path: '', + loadChildren: () => import('./home/home.module').then( m => m.HomePageModule) + }, + { + path: 'empty-chat', + loadChildren: () => import('./shared/chat/empty-chat/empty-chat.module').then( m => m.EmptyChatPageModule) + }, + { + path: 'empty-container', + loadChildren: () => import('./shared/empty-container/empty-container.module').then( m => m.EmptyContainerPageModule) + }, + { + path: 'events-to-approve', + loadChildren: () => import('./shared/gabinete-digital/events-to-approve/events-to-approve.module').then( m => m.EventsToApprovePageModule) + }, + { + path: 'expedients', + loadChildren: () => import('./shared/gabinete-digital/expedients/expedients.module').then( m => m.ExpedientsPageModule) + }, + { + path: 'document-detail', + loadChildren: () => import('./modals/document-detail/document-detail.module').then( m => m.DocumentDetailPageModule) + }, + { + path: 'edit-group', + loadChildren: () => import('./shared/chat/edit-group/edit-group.module').then( m => m.EditGroupPageModule) + }, + { + path: 'pedidos', + loadChildren: () => import('./shared/gabinete-digital/pedidos/pedidos.module').then( m => m.PedidosPageModule) + }, + { + path: 'event-list', + loadChildren: () => import('./pages/gabinete-digital/event-list/event-list.module').then(m =>m.EventListPageModule) + }, + { + path: 'despachos', + loadChildren: () => import('./shared/gabinete-digital/despachos/despachos.module').then( m => m.DespachosPageModule) + }, + { + path: 'create-process', + loadChildren: () => import('./modals/create-process/create-process.module').then( m => m.CreateProcessPageModule) + }, + { + path: 'pendentes', + loadChildren: () => import('./shared/gabinete-digital/pendentes/pendentes.module').then( m => m.PendentesPageModule) + }, + { + path: 'delegar', + loadChildren: () => import('./modals/delegar/delegar.module').then( m => m.DelegarPageModule) + }, + { + path: 'add-note', + loadChildren: () => import('./modals/add-note/add-note.module').then( m => m.AddNotePageModule) + }, + { + path: 'dar-parecer', + loadChildren: () => import('./modals/dar-parecer/dar-parecer.module').then( m => m.DarParecerPageModule) + }, + { + path: 'opts-expediente', + loadChildren: () => import('./shared/popover/opts-expediente/opts-expediente.module').then( m => m.OptsExpedientePageModule) + }, + { + path: 'despachos-pr', + loadChildren: () => import('./shared/gabinete-digital/despachos-pr/despachos-pr.module').then( m => m.DespachosPrPageModule) + }, + { + path: 'diplomas', + loadChildren: () => import('./shared/gabinete-digital/diplomas/diplomas.module').then( m => m.DiplomasPageModule) + }, + { + path: 'expedientes-pr', + loadChildren: () => import('./shared/gabinete-digital/expedientes-pr/expedientes-pr.module').then( m => m.ExpedientesPrPageModule) + }, + { + path: 'diplomas-assinar', + loadChildren: () => import('./shared/gabinete-digital/diplomas-assinar/diplomas-assinar.module').then( m => m.DiplomasAssinarPageModule) + }, + { + path: 'opts-expediente-pr', + loadChildren: () => import('./shared/popover/opts-expediente-pr/opts-expediente-pr.module').then( m => m.OptsExpedientePrPageModule) + }, + { + path: 'despachos-options', + loadChildren: () => import('./shared/popover/despachos-options/despachos-options.module').then( m => m.DespachosOptionsPageModule) + }, + { + path: 'despachos-pr-options', + loadChildren: () => import('./shared/popover/despachos-pr-options/despachos-pr-options.module').then( m => m.DespachosPrOptionsPageModule) + }, + { + path: 'deploma-options', + loadChildren: () => import('./shared/popover/deploma-options/deploma-options.module').then( m => m.DeplomaOptionsPageModule) + }, + { + path: 'pin', + loadChildren: () => import('./shared/pin/pin.module').then( m => m.PinPageModule) + }, + { + path: 'fingerprint', + loadChildren: () => import('./shared/fingerprint/fingerprint.module').then( m => m.FingerprintPageModule) + }, + { + path: 'new-event', + loadChildren: () => import('./shared/agenda/new-event/new-event.module').then( m => m.NewEventPageModule) + }, + { + path: 'event-list', + loadChildren: () => import('./shared/agenda/event-list/event-list.module').then( m => m.EventListPageModule) + }, + { + path: 'approve-event', + loadChildren: () => import('./shared/agenda/approve-event/approve-event.module').then( m => m.ApproveEventPageModule) + }, + { + path: 'bad-request', + loadChildren: () => import('./shared/popover/bad-request/bad-request.module').then( m => m.BadRequestPageModule) + }, + { + path: 'success-message', + loadChildren: () => import('./shared/popover/success-message/success-message.module').then( m => m.SuccessMessagePageModule) + }, + { + path: 'forward', + loadChildren: () => import('./modals/forward/forward.module').then( m => m.ForwardPageModule) + }, + { + path: 'edit-event-to-approve', + loadChildren: () => import('./shared/agenda/edit-event-to-approve/edit-event-to-approve.module').then( m => m.EditEventToApprovePageModule) + }, + { + path: 'actions-options', + loadChildren: () => import('./shared/popover/actions-options/actions-options.module').then( m => m.ActionsOptionsPageModule) + }, + { + path: 'edit-action', + loadChildren: () => import('./shared/publication/edit-action/edit-action.module').then( m => m.EditActionPageModule) + }, + { + path: 'eliminate-event', + loadChildren: () => import('./modals/eliminate-event/eliminate-event.module').then( m => m.EliminateEventPageModule) + }, + { + path: 'inactivity', + loadChildren: () => import('./pages/inactivity/inactivity.module').then( m => m.InactivityPageModule) + }, + { + path: 'document-set-up-meeting', + loadChildren: () => import('./modals/document-set-up-meeting/document-set-up-meeting.module').then( m => m.DocumentSetUpMeetingPageModule) + }, + { + path: 'profile', + loadChildren: () => import('./modals/profile/profile.module').then( m => m.ProfilePageModule) + }, + { + path: 'all-processes', + loadChildren: () => import('./shared/gabinete-digital/all-processes/all-processes.module').then( m => m.AllProcessesPageModule) + }, + { + path: 'searched-document-options', + loadChildren: () => import('./shared/popover/searched-document-options/searched-document-options.module').then( m => m.SearchedDocumentOptionsPageModule) + }, + { + path: 'task-list', + loadChildren: () => import('./shared/gabinete-digital/generic/task-list/task-list.module').then( m => m.TaskListPageModule) + }, + { + path: 'task-list', + loadChildren: () => import('./shared/gabinete-digital/generic/task-list/task-list.module').then( m => m.TaskListPageModule) + }, + { + path: 'task-detailde', + loadChildren: () => import('./shared/gabinete-digital/generic/task-detailde/task-detailde.module').then( m => m.TaskDetaildePageModule) + }, + { + path: 'task-details', + loadChildren: () => import('./shared/gabinete-digital/generic/task-details/task-details.module').then( m => m.TaskDetailsPageModule) + }, + { + path: 'chat-options-features', + loadChildren: () => import('./modals/chat-options-features/chat-options-features.module').then( m => m.ChatOptionsFeaturesPageModule) + }, + { + path: 'document-viewer', + loadChildren: () => import('./modals/document-viewer/document-viewer.module').then( m => m.DocumentViewerPageModule) + }, + { + path: 'view-document', + loadChildren: () => import('./modals/view-document/view-document.module').then( m => m.ViewDocumentPageModule) + }, + { + path: 'event-details-documents-options', + loadChildren: () => import('./shared/popover/event-details-documents-options/event-details-documents-options.module').then( m => m.EventDetailsDocumentsOptionsPageModule) + }, + { + path: 'preview-camera', + loadChildren: () => import('./modals/preview-camera/preview-camera.module').then( m => m.PreviewCameraPageModule) + }, + { + path: 'group-icons', + loadChildren: () => import('./modals/group-icons/group-icons.module').then( m => m.GroupIconsPageModule) + }, + { + path: 'video-allowed', + loadChildren: () => import('./modals/video-allowed/video-allowed.module').then( m => m.VideoAllowedPageModule) + }, + { + path: 'preview-photo', + loadChildren: () => import('./modals/preview-photo/preview-photo.module').then( m => m.PreviewPhotoPageModule) + }, + { + path: 'custom-image-cache', + loadChildren: () => import('./services/file/custom-image-cache/custom-image-cache.module').then( m => m.CustomImageCachePageModule) + }, + { + path: 'view-media', + loadChildren: () => import('./modals/view-media/view-media.module').then( m => m.ViewMediaPageModule) + }, + { + path: 'view-event', + loadChildren: () => import('./modals/view-event/view-event.module').then( m => m.ViewEventPageModule) + }, + { + path: 'previewer', + loadChildren: () => import('./modals/previewer/previewer.module').then( m => m.PreviewerPageModule) + }, + { + path: 'set-room-owner', + loadChildren: () => import('./modals/set-room-owner/set-room-owner.module').then( m => m.SetRoomOwnerPageModule) + }, + { + path: 'diplomas-gerar', + loadChildren: () => import('./shared/gabinete-digital/diplomas-gerar/diplomas-gerar.module').then( m => m.DiplomasGerarPageModule) + }, + { + path: 'diplomas-gerar-options', + loadChildren: () => import('./shared/popover/diplomas-gerar-options/diplomas-gerar-options.module').then( m => m.DiplomasGerarOptionsPageModule) + }, + { + path: 'chat-debugging', + loadChildren: () => import('./shared/popover/chat-debugging/chat-debugging.module').then( m => m.ChatDebuggingPageModule) + }, + { path: 'chat-message-debugging', loadChildren: () => import('./shared/popover/chat-message-debugging/chat-message-debugging.module').then( m => m.ChatMessageDebuggingPageModule) }, @@ -260,25 +261,29 @@ const routes = [ { path: 'information', loadChildren: () => import('./modals/information/information.module').then( m => m.InformationPageModule) + }, + { + path: 'chat-options-popover', + loadChildren:() => import('./shared/popover/chat-options-popover/chat-options-popover.module').then( m => m.ChatOptionsPopoverPageModule) } - - /* - path: 'chat', - component: ChatPage - } */ - - /* - path: 'chat', - component: ChatPage - } */ - -]; -@NgModule({ - imports: [ - RouterModule.forRoot(routes, - { preloadingStrategy: PreloadAllModules }) - ], - exports: [RouterModule] -}) -export class AppRoutingModule {} + + /* + path: 'chat', + component: ChatPage + } */ + + /* + path: 'chat', + component: ChatPage + } */ + +]; +@NgModule({ + imports: [ + RouterModule.forRoot(routes, + { preloadingStrategy: PreloadAllModules }) + ], + exports: [RouterModule] +}) +export class AppRoutingModule {} diff --git a/src/app/modals/document-set-up-meeting/document-set-up-meeting.page.html b/src/app/modals/document-set-up-meeting/document-set-up-meeting.page.html index 5c9718ad4..c6f63a9d0 100644 --- a/src/app/modals/document-set-up-meeting/document-set-up-meeting.page.html +++ b/src/app/modals/document-set-up-meeting/document-set-up-meeting.page.html @@ -171,7 +171,7 @@ [(ngModel)]="postData.StartDate" [disabled]="disabled" > - + - + 52 ? (hours === 23 ? 0 : ++hours) : hours; + + if (m == 0) { + if(minutes > m){ + m = m + 15; + } + timeToReturn.setHours(h); + timeToReturn.setMinutes(m); + }else{ + if(minutes > m){ + + m = m + 15; + + timeToReturn.setHours(h); + timeToReturn.setMinutes(m); + }else { + timeToReturn.setHours(h); + timeToReturn.setMinutes(m); + } + } + + // console.log("AFTER IF MINUTES: " +m); + // console.log("AFTER HOURS: " +h); + + return timeToReturn; + } + + setStartDate(){ + this.postData.StartDate = this.roundTimeQuarterHour(); + } + + setEndDate(){ + this.postData.EndDate = this.postData.StartDate; + } + } diff --git a/src/app/pages/gabinete-digital/expediente/book-meeting-modal/book-meeting-modal.page.html b/src/app/pages/gabinete-digital/expediente/book-meeting-modal/book-meeting-modal.page.html index 68058bd0c..4e7d0f496 100644 --- a/src/app/pages/gabinete-digital/expediente/book-meeting-modal/book-meeting-modal.page.html +++ b/src/app/pages/gabinete-digital/expediente/book-meeting-modal/book-meeting-modal.page.html @@ -147,7 +147,7 @@ [min]="minDate" [disabled]="disabled" > - + - + 52 ? (hours === 23 ? 0 : ++hours) : hours; + + if (m == 0) { + if(minutes > m){ + m = m + 15; + } + timeToReturn.setHours(h); + timeToReturn.setMinutes(m); + }else{ + if(minutes > m){ + + m = m + 15; + + timeToReturn.setHours(h); + timeToReturn.setMinutes(m); + }else { + timeToReturn.setHours(h); + timeToReturn.setMinutes(m); + } + } + + // console.log("AFTER IF MINUTES: " +m); + // console.log("AFTER HOURS: " +h); + + return timeToReturn; + } + + setStartDate(){ + this.postData.StartDate = this.roundTimeQuarterHour(); + } + + setEndDate(){ + this.postData.EndDate = this.postData.StartDate; + } + } diff --git a/src/app/pages/publications/edit-action/edit-action.page.ts b/src/app/pages/publications/edit-action/edit-action.page.ts index 59517d6af..714f77c3c 100644 --- a/src/app/pages/publications/edit-action/edit-action.page.ts +++ b/src/app/pages/publications/edit-action/edit-action.page.ts @@ -25,7 +25,7 @@ export class EditActionPage implements OnInit { public minDate = new Date().toISOString() public maxDate: any; public stepHour = 1; - public stepMinute = 5; + public stepMinute = 15; public stepSecond = 5; public dateControlStart = new FormControl(moment("DD MM YYYY hh")); public dateControlEnd = new FormControl(moment("DD MM YYYY hh")); diff --git a/src/app/pages/publications/new-action/new-action.page.html b/src/app/pages/publications/new-action/new-action.page.html index e1410f6c7..853c838b8 100644 --- a/src/app/pages/publications/new-action/new-action.page.html +++ b/src/app/pages/publications/new-action/new-action.page.html @@ -44,7 +44,7 @@ [formControl]="dateControlStart" [disabled]="disabled" > - + - + 52 ? (hours === 23 ? 0 : ++hours) : hours; + + if (m == 0) { + if(minutes > m){ + m = m + 15; + } + timeToReturn.setHours(h); + timeToReturn.setMinutes(m); + }else{ + if(minutes > m) { + + m = m + 15; + + timeToReturn.setHours(h); + timeToReturn.setMinutes(m); + }else { + timeToReturn.setHours(h); + timeToReturn.setMinutes(m); + } + } + + return timeToReturn; + } + + setStartDate(){ + this.dateControlStart = new FormControl(moment(this.roundTimeQuarterHour())); + } + + setEndDate(){ + this.dateControlEnd = this.dateControlStart; + } } diff --git a/src/app/pages/publications/new-publication/new-publication.page.ts b/src/app/pages/publications/new-publication/new-publication.page.ts index e08e53da1..baf605d77 100644 --- a/src/app/pages/publications/new-publication/new-publication.page.ts +++ b/src/app/pages/publications/new-publication/new-publication.page.ts @@ -44,7 +44,7 @@ export class NewPublicationPage implements OnInit { public minDate = new Date().toISOString().slice(0, 10) public endMinDate = new Date(new Date().getTime() + 15 * 60000); public stepHour = 1; - public stepMinute = 5; + public stepMinute = 15; public stepSecond = 5; public color: ThemePalette = 'primary'; diff --git a/src/app/pages/search/search.page.html b/src/app/pages/search/search.page.html index c6e78e75d..33dbf864b 100644 --- a/src/app/pages/search/search.page.html +++ b/src/app/pages/search/search.page.html @@ -27,19 +27,19 @@
-
- +
@@ -102,7 +102,14 @@
-
+ +
+ + Todos + {{ searchDocuments.length }} +
+ +
{{ category.Name }} {{ category.Qtd }} diff --git a/src/app/pages/search/search.page.ts b/src/app/pages/search/search.page.ts index 5cf1d67a2..47847ce54 100644 --- a/src/app/pages/search/search.page.ts +++ b/src/app/pages/search/search.page.ts @@ -704,6 +704,7 @@ export class SearchPage implements OnInit { } + TodosCategory = true async filterDocList(categoryName:string){ // show all category @@ -716,6 +717,27 @@ export class SearchPage implements OnInit { } this.showCategory = categoryName; + + for(let category of this.searchCategories) { + if(category['Active']) { + this.TodosCategory = false + return false + } + } + + this.TodosCategory = true + + } + + + noFilter() { + this.TodosCategory = true + let n = 0 + for(let category of this.searchCategories) { + this.searchCategories[n]['Active'] = false + n++ + } + this.showSearchDocuments = this.searchDocuments; } diff --git a/src/app/services/chat/chat-system.service.ts b/src/app/services/chat/chat-system.service.ts index 0cbe52090..37a5d0d16 100644 --- a/src/app/services/chat/chat-system.service.ts +++ b/src/app/services/chat/chat-system.service.ts @@ -320,13 +320,13 @@ export class ChatSystemService { this.defaultSubtribe(id) } - this.RochetChatConnectorService.streamNotifyLogged().then((subscription=>{ + this.RochetChatConnectorService.streamNotifyLogged().then((subscription => { console.log(subscription) })) - // this.RochetChatConnectorService.subStreamNotifyUser().then((subscription=>{ - // console.log(subscription) - // })) + this.RochetChatConnectorService.subStreamMessageUser().then((subscription => { + console.log(subscription) + })) } /** @@ -622,7 +622,7 @@ export class ChatSystemService { return !roomData.fname } - getUsers = () =>{ + getUsers = () => { return this.users } diff --git a/src/app/services/chat/rochet-chat-connector.service.ts b/src/app/services/chat/rochet-chat-connector.service.ts index 19bb9ae42..c4832f22b 100644 --- a/src/app/services/chat/rochet-chat-connector.service.ts +++ b/src/app/services/chat/rochet-chat-connector.service.ts @@ -466,6 +466,34 @@ export class RochetChatConnectorService { } + subStreamMessageUser(param?: any) { + + const requestId = uuidv4() + + let message = { + msg: "sub", + id: requestId, + name: "stream-notify-user", + params:[ + `${SessionStore.user.ChatData.data.userId}/message`, + param + ] + } + + + this.ws.send({message, requestId}) + + return new Promise((resolve, reject) => { + this.ws.registerCallback({type:'Onmessage', funx:(message)=>{ + if(message.id == requestId ) { // same request send + resolve(message) + return true + } + }}) + }); + + } + receiveStreamNotifyRoom(funx: Function) { this.ws.registerCallback({ diff --git a/src/app/shared/agenda/edit-event-to-approve/edit-event-to-approve.page.ts b/src/app/shared/agenda/edit-event-to-approve/edit-event-to-approve.page.ts index c913efd2b..9aa8aff42 100644 --- a/src/app/shared/agenda/edit-event-to-approve/edit-event-to-approve.page.ts +++ b/src/app/shared/agenda/edit-event-to-approve/edit-event-to-approve.page.ts @@ -45,7 +45,7 @@ export class EditEventToApprovePage implements OnInit { public endMinDate = new Date(new Date().getTime() + 15 * 60000); public maxDate: any; public stepHour = 1; - public stepMinute = 5; + public stepMinute = 15; public stepSecond = 5; public dateControlStart = new FormControl(moment("DD MM YYYY hh")); public dateControlEnd = new FormControl(moment("DD MM YYYY hh")); diff --git a/src/app/shared/gabinete-digital/edit-event-to-approve/edit-event.page.ts b/src/app/shared/gabinete-digital/edit-event-to-approve/edit-event.page.ts index 86e1b0ea0..2d658e336 100644 --- a/src/app/shared/gabinete-digital/edit-event-to-approve/edit-event.page.ts +++ b/src/app/shared/gabinete-digital/edit-event-to-approve/edit-event.page.ts @@ -47,7 +47,7 @@ export class EditEventToApproveComponent implements OnInit { public endMinDate = new Date(new Date().getTime() + 15 * 60000); public maxDate: any; public stepHour = 1; - public stepMinute = 5; + public stepMinute = 15; public stepSecond = 5; recurringTypes: any; selectedRecurringType: any; diff --git a/src/app/shared/popover/chat-options-popover/chat-options-popover.page.html b/src/app/shared/popover/chat-options-popover/chat-options-popover.page.html index 95f5df98b..9dbe98acd 100644 --- a/src/app/shared/popover/chat-options-popover/chat-options-popover.page.html +++ b/src/app/shared/popover/chat-options-popover/chat-options-popover.page.html @@ -11,7 +11,8 @@
- + +
diff --git a/src/app/shared/publication/edit-action/edit-action.page.ts b/src/app/shared/publication/edit-action/edit-action.page.ts index 95d10dd6b..148a679fa 100644 --- a/src/app/shared/publication/edit-action/edit-action.page.ts +++ b/src/app/shared/publication/edit-action/edit-action.page.ts @@ -25,7 +25,7 @@ export class EditActionPage implements OnInit { public endMinDate = new Date(new Date().getTime() + 15 * 60000); public maxDate: any; public stepHour = 1; - public stepMinute = 5; + public stepMinute = 15; public stepSecond = 5; public dateControlStart = new FormControl(moment("DD MM YYYY hh")); public dateControlEnd = new FormControl(moment("DD MM YYYY hh")); diff --git a/src/app/shared/publication/new-action/new-action.page.html b/src/app/shared/publication/new-action/new-action.page.html index 9f60cc61b..abe2e7b7d 100644 --- a/src/app/shared/publication/new-action/new-action.page.html +++ b/src/app/shared/publication/new-action/new-action.page.html @@ -47,7 +47,7 @@ [(ngModel)]="folder.DateBegin" [disabled]="disabled" > - + - + 52 ? (hours === 23 ? 0 : ++hours) : hours; + + if (m == 0) { + if(minutes > m){ + m = m + 15; + } + timeToReturn.setHours(h); + timeToReturn.setMinutes(m); + }else{ + if(minutes > m){ + + m = m + 15; + + timeToReturn.setHours(h); + timeToReturn.setMinutes(m); + }else { + timeToReturn.setHours(h); + timeToReturn.setMinutes(m); + } + } + + // console.log("AFTER IF MINUTES: " +m); + // console.log("AFTER HOURS: " +h); + + return timeToReturn; + } + + setStartDate(){ + this.dateControlStart = new FormControl(moment(this.roundTimeQuarterHour())); + } + + setEndDate(){ + this.dateControlEnd = this.dateControlStart; + } } diff --git a/src/assets/images/theme/blue/search.svg b/src/assets/images/theme/blue/search.svg new file mode 100644 index 000000000..bef4a8100 --- /dev/null +++ b/src/assets/images/theme/blue/search.svg @@ -0,0 +1 @@ +Search \ No newline at end of file diff --git a/src/assets/images/theme/gov/search.svg b/src/assets/images/theme/gov/search.svg new file mode 100644 index 000000000..bef4a8100 --- /dev/null +++ b/src/assets/images/theme/gov/search.svg @@ -0,0 +1 @@ +Search \ No newline at end of file diff --git a/src/assets/images/theme/tribunal/search.svg b/src/assets/images/theme/tribunal/search.svg new file mode 100644 index 000000000..bef4a8100 --- /dev/null +++ b/src/assets/images/theme/tribunal/search.svg @@ -0,0 +1 @@ +Search \ No newline at end of file diff --git a/src/global.scss b/src/global.scss index 23ae1144e..92657ef51 100644 --- a/src/global.scss +++ b/src/global.scss @@ -1419,3 +1419,11 @@ $font-size: 11pt; } +.mat-form-field { + width: 100%; +} + +ngx-mat-datetime-content button.mat-stroked-button { + top: -56px; + margin-bottom: -35px; +} \ No newline at end of file diff --git a/version/git-version.ts b/version/git-version.ts index 183b53d04..d1cb54d14 100644 --- a/version/git-version.ts +++ b/version/git-version.ts @@ -1,12 +1,12 @@ export let versionData = { - "shortSHA": "9c6f92038", - "SHA": "9c6f92038e6e7c00dfb6e2bd21bfd833120d7a99", + "shortSHA": "61d142fa1", + "SHA": "61d142fa13d63aa6dd3ef308224f162110504458", "branch": "no_bug_movemente", "lastCommitAuthor": "'Peter Maquiran'", - "lastCommitTime": "'Thu Jan 19 13:03:28 2023 +0100'", - "lastCommitMessage": "improve", - "lastCommitNumber": "4669", + "lastCommitTime": "'Thu Jan 19 14:17:42 2023 +0100'", + "lastCommitMessage": "Message", + "lastCommitNumber": "4670", "change": "", - "changeStatus": "On branch no_bug_movemente\nChanges to be committed:\n (use \"git restore --staged ...\" to unstage)\n\tmodified: src/app/pages/chat/group-messages/group-messages.page.html\n\tmodified: src/app/pages/chat/messages/messages.page.html\n\tmodified: src/app/shared/chat/group-messages/group-messages.page.html\n\tmodified: src/app/shared/chat/messages/messages.page.html", + "changeStatus": "On branch no_bug_movemente\nChanges to be committed:\n (use \"git restore --staged ...\" to unstage)\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", "changeAuthor": "peter.maquiran" } \ No newline at end of file From 753fbf1fad5de9121f50b1e1540220276e734297 Mon Sep 17 00:00:00 2001 From: Peter Maquiran Date: Fri, 20 Jan 2023 15:45:46 +0100 Subject: [PATCH 36/42] improve manifest --- android/app/src/main/AndroidManifest.xml | 1 + version/git-version.ts | 12 ++++++------ 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/android/app/src/main/AndroidManifest.xml b/android/app/src/main/AndroidManifest.xml index 0a921fe6f..989436b41 100644 --- a/android/app/src/main/AndroidManifest.xml +++ b/android/app/src/main/AndroidManifest.xml @@ -39,4 +39,5 @@ + diff --git a/version/git-version.ts b/version/git-version.ts index d1cb54d14..f8b471bc9 100644 --- a/version/git-version.ts +++ b/version/git-version.ts @@ -1,12 +1,12 @@ export let versionData = { - "shortSHA": "61d142fa1", - "SHA": "61d142fa13d63aa6dd3ef308224f162110504458", + "shortSHA": "a203566b3", + "SHA": "a203566b3e1a48383393458c7f804d59762d0dbf", "branch": "no_bug_movemente", "lastCommitAuthor": "'Peter Maquiran'", - "lastCommitTime": "'Thu Jan 19 14:17:42 2023 +0100'", - "lastCommitMessage": "Message", - "lastCommitNumber": "4670", + "lastCommitTime": "'Fri Jan 20 14:57:50 2023 +0100'", + "lastCommitMessage": "improve", + "lastCommitNumber": "4671", "change": "", - "changeStatus": "On branch no_bug_movemente\nChanges to be committed:\n (use \"git restore --staged ...\" to unstage)\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\nChanges to be committed:\n (use \"git restore --staged ...\" to unstage)\n\tmodified: android/app/src/main/AndroidManifest.xml", "changeAuthor": "peter.maquiran" } \ No newline at end of file From 658720f47ff463fe7e6ff672a2f562d74662480c Mon Sep 17 00:00:00 2001 From: Peter Maquiran Date: Sun, 22 Jan 2023 15:27:01 +0100 Subject: [PATCH 37/42] save --- src/app/modals/profile/profile.page.html | 4 ++-- src/app/pages/agenda/agenda.page.ts | 17 ++++++++++++++--- .../pages/agenda/new-event/new-event.page.ts | 9 ++------- src/app/pages/chat/messages/messages.page.ts | 4 ++-- .../gabinete-digital/gabinete-digital.page.html | 4 ++-- .../shared/agenda/new-event/new-event.page.ts | 5 +++-- .../all-processes/all-processes.page.html | 2 +- .../edit-event-to-approve/edit-event.page.ts | 8 ++------ src/app/shared/header/header.page.html | 6 +++--- src/environments/environment.prod.ts | 16 ++++++++-------- version/git-version.ts | 14 +++++++------- 11 files changed, 46 insertions(+), 43 deletions(-) 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/agenda/agenda.page.ts b/src/app/pages/agenda/agenda.page.ts index 1ffc23ab7..d4156e563 100644 --- a/src/app/pages/agenda/agenda.page.ts +++ b/src/app/pages/agenda/agenda.page.ts @@ -108,8 +108,8 @@ export class AgendaPage implements OnInit { postEvent: any; // temporary data - taskParticipants: any[] = []; - taskParticipantsCc: any[] = []; + taskParticipants: EventPerson[] = []; + taskParticipantsCc: EventPerson[] = []; adding: "intervenient" | "CC" = "intervenient"; @ViewChild(CalendarComponent) myCal: CalendarComponent; @@ -1225,12 +1225,18 @@ export class AgendaPage implements OnInit { this.IsEvent = 'add'; if (window.innerWidth <= 1024) { + let taskParticipants = [{ + EmailAddress: SessionStore.user.Email, + IsRequired: true, + Name: SessionStore.user.UserName + }] const modal = await this.modalCtrl.create({ component: NewEventPage, componentProps: { segment: this.segment, profile: this.profile, - eventSelectedDate: this.eventSelectedDate + eventSelectedDate: this.eventSelectedDate, + attendees: taskParticipants }, cssClass: 'modal modal-desktop', backdropDismiss: false @@ -1244,6 +1250,11 @@ export class AgendaPage implements OnInit { }); } else { this.mobileComponent.showAddNewEvent = true; + this.taskParticipants = [{ + EmailAddress: SessionStore.user.Email, + IsRequired: true, + Name: SessionStore.user.UserName + }] } } diff --git a/src/app/pages/agenda/new-event/new-event.page.ts b/src/app/pages/agenda/new-event/new-event.page.ts index c65deb70c..635fb3c47 100644 --- a/src/app/pages/agenda/new-event/new-event.page.ts +++ b/src/app/pages/agenda/new-event/new-event.page.ts @@ -103,7 +103,6 @@ export class NewEventPage implements OnInit { this.selectedSegment = this.navParams.get('segment'); this.selectedDate = this.navParams.get('eventSelectedDate'); this.taskParticipants = this.navParams.get('attendees'); - } ngOnInit() { @@ -487,12 +486,8 @@ export class NewEventPage implements OnInit { const newAttendees: EventPerson[] = data['taskParticipants']; const newAttendeesCC: EventPerson[] = data['taskParticipantsCc']; - if(newAttendees.length) { - this.setIntervenient(newAttendees); - } - if(newAttendeesCC) { - this.setIntervenientCC(newAttendeesCC); - } + this.setIntervenient(newAttendees); + this.setIntervenientCC(newAttendeesCC); } diff --git a/src/app/pages/chat/messages/messages.page.ts b/src/app/pages/chat/messages/messages.page.ts index e00f64a40..c464a2ab0 100644 --- a/src/app/pages/chat/messages/messages.page.ts +++ b/src/app/pages/chat/messages/messages.page.ts @@ -11,7 +11,6 @@ import { ChatService } from 'src/app/services/chat.service'; import { FileService } from 'src/app/services/functions/file.service'; import { ProcessesService } from 'src/app/services/processes.service'; import { ToastService } from 'src/app/services/toast.service'; -import { NewEventPage } from 'src/app/shared/agenda/new-event/new-event.page'; import { ChatOptionsPopoverPage } from 'src/app/shared/popover/chat-options-popover/chat-options-popover.page'; import { MessagesOptionsPage } from 'src/app/shared/popover/messages-options/messages-options.page'; import { ChatMessageStore } from 'src/app/store/chat/chat-message.service'; @@ -41,6 +40,7 @@ import { ViewMediaPage } from 'src/app/modals/view-media/view-media.page'; import { File } from '@awesome-cordova-plugins/file/ngx'; import { FileOpener } from '@awesome-cordova-plugins/file-opener/ngx'; import { Filesystem, Directory } from '@capacitor/filesystem'; +import { NewEventPage } from '../../agenda/new-event/new-event.page'; const IMAGE_DIR = 'stored-images'; @@ -607,7 +607,7 @@ export class MessagesPage implements OnInit, AfterViewInit, OnDestroy { await modal.present(); modal.onDidDismiss().then((data) => { if (data) { - + console.log(data) } }); } 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/agenda/new-event/new-event.page.ts b/src/app/shared/agenda/new-event/new-event.page.ts index 706229c88..7b8de29aa 100644 --- a/src/app/shared/agenda/new-event/new-event.page.ts +++ b/src/app/shared/agenda/new-event/new-event.page.ts @@ -68,6 +68,7 @@ export class NewEventPage implements OnInit { recurringTypes = [] selectedRecurringType: any; + @Input() attendees: [] @Input() profile:string; @Input() roomId:string; @Input() selectedSegment: string; @@ -162,7 +163,7 @@ export class NewEventPage implements OnInit { StartDate: this.autoStartTime, EndDate: this.autoEndTime, EventType: 'Reunião', - Attendees: null, + Attendees: this.attendees || null, IsMeeting: false, IsRecurring: false, AppointmentState: 0, @@ -184,7 +185,7 @@ export class NewEventPage implements OnInit { StartDate: this.autoStartTime, EndDate: this.autoEndTime, EventType: 'Reunião', - Attendees: null, + Attendees: this.attendees || null, IsMeeting: false, IsRecurring: false, AppointmentState: 0, 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/gabinete-digital/edit-event-to-approve/edit-event.page.ts b/src/app/shared/gabinete-digital/edit-event-to-approve/edit-event.page.ts index 2d658e336..d023e5b6a 100644 --- a/src/app/shared/gabinete-digital/edit-event-to-approve/edit-event.page.ts +++ b/src/app/shared/gabinete-digital/edit-event-to-approve/edit-event.page.ts @@ -364,12 +364,8 @@ export class EditEventToApproveComponent implements OnInit { const newAttendees: EventPerson[] = data['taskParticipants']; const newAttendeesCC: EventPerson[] = data['taskParticipantsCc']; - if(newAttendees.length) { - this.setIntervenient(newAttendees); - } - if(newAttendeesCC) { - this.setIntervenientCC(newAttendeesCC); - } + this.setIntervenient(newAttendees); + this.setIntervenientCC(newAttendeesCC); } }); 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..9697adcac 100644 --- a/src/environments/environment.prod.ts +++ b/src/environments/environment.prod.ts @@ -2,20 +2,20 @@ 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://gdchat-dev.dyndns.info/api/v1/', + //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', //equilibrium.ao.ao + domain: 'oapr.gov.ao', //equilibrium.ao.ao defaultuser: '',//paulo.pinto@gabinetedigital.local defaultuserpwd: '', //tabteste@006,06, chatOffline: true, diff --git a/version/git-version.ts b/version/git-version.ts index 88a966f37..da406d513 100644 --- a/version/git-version.ts +++ b/version/git-version.ts @@ -1,12 +1,12 @@ export let versionData = { - "shortSHA": "753fbf1fa", - "SHA": "753fbf1fad5de9121f50b1e1540220276e734297", + "shortSHA": "c1816b863", + "SHA": "c1816b863e387315b1359975ecffa252775236a7", "branch": "no_bug_movemente", "lastCommitAuthor": "'Peter Maquiran'", - "lastCommitTime": "'Fri Jan 20 15:45:46 2023 +0100'", - "lastCommitMessage": "improve manifest", - "lastCommitNumber": "4672", - "change": "diff --git a/.husky.rar b/.husky.rar\ndeleted file mode 100644\nindex d4ce065d3..000000000\nBinary files a/.husky.rar and /dev/null differ", - "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\tnew file: .husky.rar\n\tmodified: src/app/pages/agenda/new-event/new-event.page.ts\n\tmodified: src/environments/environment.prod.ts\n\nChanges not staged for commit:\n (use \"git add/rm ...\" to update what will be committed)\n (use \"git restore ...\" to discard changes in working directory)\n\tdeleted: .husky.rar", + "lastCommitTime": "'Fri Jan 20 16:09:27 2023 +0100'", + "lastCommitMessage": "merg", + "lastCommitNumber": "4676", + "change": "", + "changeStatus": "On branch no_bug_movemente\nChanges to be committed:\n (use \"git restore --staged ...\" to unstage)\n\tmodified: src/app/modals/profile/profile.page.html\n\tmodified: src/app/pages/agenda/agenda.page.ts\n\tmodified: src/app/pages/agenda/new-event/new-event.page.ts\n\tmodified: src/app/pages/chat/messages/messages.page.ts\n\tmodified: src/app/pages/gabinete-digital/gabinete-digital.page.html\n\tmodified: src/app/shared/agenda/new-event/new-event.page.ts\n\tmodified: src/app/shared/gabinete-digital/all-processes/all-processes.page.html\n\tmodified: src/app/shared/gabinete-digital/edit-event-to-approve/edit-event.page.ts\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 From 378ea8fe5b32dc1a9b68a71b98b32ed1e2e7a5a0 Mon Sep 17 00:00:00 2001 From: Peter Maquiran Date: Sun, 22 Jan 2023 18:48:45 +0100 Subject: [PATCH 38/42] improve --- .../pages/agenda/new-event/new-event.page.ts | 32 +++++++++++++++---- .../pages/chat/messages/messages.page.html | 18 ----------- src/app/pages/chat/messages/messages.page.ts | 23 ++++++++++--- .../shared/agenda/new-event/new-event.page.ts | 1 - .../chat-options-popover.page.ts | 21 +++--------- version/git-version.ts | 12 +++---- 6 files changed, 55 insertions(+), 52 deletions(-) diff --git a/src/app/pages/agenda/new-event/new-event.page.ts b/src/app/pages/agenda/new-event/new-event.page.ts index 635fb3c47..d2ab84223 100644 --- a/src/app/pages/agenda/new-event/new-event.page.ts +++ b/src/app/pages/agenda/new-event/new-event.page.ts @@ -17,6 +17,7 @@ import { ThemeService } from 'src/app/services/theme.service'; import { NgxMatDateFormats } from '@angular-material-components/datetime-picker'; import { NGX_MAT_DATE_FORMATS } from '@angular-material-components/datetime-picker'; import { SessionStore } from 'src/app/store/session.service'; +import { ChatMethodsService } from 'src/app/services/chat/chat-methods.service'; const CUSTOM_DATE_FORMATS: NgxMatDateFormats = { parse: { @@ -84,6 +85,7 @@ export class NewEventPage implements OnInit { autoStartTime; autoEndTime; CalendarNamesOptions = ['Oficial', 'Pessoal'] + roomId:string; constructor( private modalController: ModalController, @@ -93,6 +95,7 @@ export class NewEventPage implements OnInit { private toastService: ToastService, public ThemeService: ThemeService, private platform: Platform, + private chatMethodService: ChatMethodsService, ) { this.loggeduser = SessionStore.user; this.postEvent = new Event(); @@ -100,6 +103,7 @@ export class NewEventPage implements OnInit { this.eventBody = { BodyType : "1", Text : ""}; this.postEvent.Body = this.eventBody; + this.roomId = this.navParams.get('roomId'); this.selectedSegment = this.navParams.get('segment'); this.selectedDate = this.navParams.get('eventSelectedDate'); this.taskParticipants = this.navParams.get('attendees'); @@ -107,20 +111,20 @@ export class NewEventPage implements OnInit { ngOnInit() { if (this.platform.is('desktop')) { - this.taskParticipants = []; + // this.taskParticipants = []; } - - this.CalendarName = this.loggeduser.Profile; - this.selectedRecurringType = "-1"; - + if(!this.CalendarName) { if(this.eventService.calendarNamesAry.includes('Meu calendario')) { this.CalendarName = 'Meu calendario'; + console.log(this.eventService.calendarNamesAry) } else { this.CalendarName = this.eventService.calendarNamesAry[0] } } - + + + this.selectedRecurringType = "-1"; this.getRecurrenceTypes(); @@ -413,8 +417,22 @@ export class NewEventPage implements OnInit { }); + let data1 = { + "subject": this.postEvent.Subject, + "start": this.postEvent.StartDate, + "end": this.postEvent.EndDate, + "venue": this.postEvent.Location, + "id": eventId, + "calendarId": CalendarId + } + + if(this.roomId) { + this.chatMethodService.sendMessage(this.roomId, data1); + } + this.toastService._successMessage() - this.modalController.dismiss(this.postEvent); + let data = Object.assign(this.postEvent,{id:eventId}) + this.modalController.dismiss(data); } catch (error) { this.toastService._badRequest() diff --git a/src/app/pages/chat/messages/messages.page.html b/src/app/pages/chat/messages/messages.page.html index 27d02bb37..f626c951b 100644 --- a/src/app/pages/chat/messages/messages.page.html +++ b/src/app/pages/chat/messages/messages.page.html @@ -198,24 +198,6 @@
-
-
- {{msg.u.name}} criou esta reunião
-
- - De {{showDateDuration(msg.file.start_date)}} a - {{showDateDuration(msg.file.end_date)}} -
- - - {{msg.file.venue}} -
-
- {{last ? scrollToBottom() : ''}} -
-
Apagou a mensagem
diff --git a/src/app/pages/chat/messages/messages.page.ts b/src/app/pages/chat/messages/messages.page.ts index c464a2ab0..dae0950b1 100644 --- a/src/app/pages/chat/messages/messages.page.ts +++ b/src/app/pages/chat/messages/messages.page.ts @@ -586,7 +586,7 @@ export class MessagesPage implements OnInit, AfterViewInit, OnDestroy { } async bookMeeting() { - this.attendees = this.members.map((val) => { + let attendees = this.ChatSystemService.getDmRoom(this.roomId).members.map((val) => { return { Name: val.name, EmailAddress: val.username + "@" + environment.domain, @@ -599,15 +599,30 @@ export class MessagesPage implements OnInit, AfterViewInit, OnDestroy { const modal = await this.modalController.create({ component: NewEventPage, componentProps: { - attendees: this.attendees, + attendees: attendees, + roomId: this.roomId }, cssClass: 'modal modal-desktop', backdropDismiss: false }); await modal.present(); modal.onDidDismiss().then((data) => { - if (data) { - console.log(data) + if (data?.data && data.data.id) { + + // const roomId = this.roomId + + // this.ChatSystemService.getDmRoom(roomId).send({ + // file: { + // "type": "application/meeting", + // "subject": data.data.Subject, + // "start_date": data.data.StartDate, + // "end_date": data.data.EndDate, + // "venue": data.data.venue, + // "id": data.data.id, + // "calendarId": data.data.CalendarId + // }, + // temporaryData: {} + // }) } }); } diff --git a/src/app/shared/agenda/new-event/new-event.page.ts b/src/app/shared/agenda/new-event/new-event.page.ts index 7b8de29aa..35f79dc98 100644 --- a/src/app/shared/agenda/new-event/new-event.page.ts +++ b/src/app/shared/agenda/new-event/new-event.page.ts @@ -643,7 +643,6 @@ export class NewEventPage implements OnInit { } selectedCalendarId () { - console.log('1:1',this.eventService.calendarNamesType,'2', this.CalendarName) if (this.eventService.calendarNamesType[this.CalendarName]?.['Oficial'] && this.postEvent.CalendarName == 'Oficial') { console.log('1') diff --git a/src/app/shared/popover/chat-options-popover/chat-options-popover.page.ts b/src/app/shared/popover/chat-options-popover/chat-options-popover.page.ts index 18c19e4ee..cfb50d77d 100644 --- a/src/app/shared/popover/chat-options-popover/chat-options-popover.page.ts +++ b/src/app/shared/popover/chat-options-popover/chat-options-popover.page.ts @@ -120,22 +120,11 @@ export class ChatOptionsPopoverPage implements OnInit { async bookMeeting() { - this.popoverController.dismiss(); - if( window.innerWidth <= 1024){ - const modal = await this.modalController.create({ - component: NewEventPage, - componentProps:{ - attendees: this.attendees, - }, - cssClass: 'modal modal-desktop', - backdropDismiss: false - }); - await modal.present(); - modal.onDidDismiss().then((data) => { - if(data){ - - } - }); + if( window.innerWidth < 701){ + this.popoverController.dismiss('meeting'); + } + else{ + this.modalController.dismiss('meeting'); } } diff --git a/version/git-version.ts b/version/git-version.ts index da406d513..ce748ec79 100644 --- a/version/git-version.ts +++ b/version/git-version.ts @@ -1,12 +1,12 @@ export let versionData = { - "shortSHA": "c1816b863", - "SHA": "c1816b863e387315b1359975ecffa252775236a7", + "shortSHA": "658720f47", + "SHA": "658720f47ff463fe7e6ff672a2f562d74662480c", "branch": "no_bug_movemente", "lastCommitAuthor": "'Peter Maquiran'", - "lastCommitTime": "'Fri Jan 20 16:09:27 2023 +0100'", - "lastCommitMessage": "merg", - "lastCommitNumber": "4676", + "lastCommitTime": "'Sun Jan 22 15:27:01 2023 +0100'", + "lastCommitMessage": "save", + "lastCommitNumber": "4677", "change": "", - "changeStatus": "On branch no_bug_movemente\nChanges to be committed:\n (use \"git restore --staged ...\" to unstage)\n\tmodified: src/app/modals/profile/profile.page.html\n\tmodified: src/app/pages/agenda/agenda.page.ts\n\tmodified: src/app/pages/agenda/new-event/new-event.page.ts\n\tmodified: src/app/pages/chat/messages/messages.page.ts\n\tmodified: src/app/pages/gabinete-digital/gabinete-digital.page.html\n\tmodified: src/app/shared/agenda/new-event/new-event.page.ts\n\tmodified: src/app/shared/gabinete-digital/all-processes/all-processes.page.html\n\tmodified: src/app/shared/gabinete-digital/edit-event-to-approve/edit-event.page.ts\n\tmodified: src/app/shared/header/header.page.html\n\tmodified: src/environments/environment.prod.ts", + "changeStatus": "On branch no_bug_movemente\nChanges to be committed:\n (use \"git restore --staged ...\" to unstage)\n\tmodified: src/app/pages/agenda/new-event/new-event.page.ts\n\tmodified: src/app/pages/chat/messages/messages.page.html\n\tmodified: src/app/pages/chat/messages/messages.page.ts\n\tmodified: src/app/shared/agenda/new-event/new-event.page.ts\n\tmodified: src/app/shared/popover/chat-options-popover/chat-options-popover.page.ts", "changeAuthor": "peter.maquiran" } \ No newline at end of file From 47cc0257f828b4bf00b5497bb71a21143388c73e Mon Sep 17 00:00:00 2001 From: Peter Maquiran Date: Mon, 23 Jan 2023 10:00:16 +0100 Subject: [PATCH 39/42] Select agenda by default --- src/app/home/home.page.html | 2 +- .../document-set-up-meeting.page.ts | 18 ++++++++++++++++++ .../book-meeting-modal.page.ts | 19 +++++++++++++++++++ .../pages/publications/publications.page.ts | 3 ++- version/git-version.ts | 12 ++++++------ 5 files changed, 46 insertions(+), 8 deletions(-) diff --git a/src/app/home/home.page.html b/src/app/home/home.page.html index 508ad8347..f4287e966 100644 --- a/src/app/home/home.page.html +++ b/src/app/home/home.page.html @@ -27,7 +27,7 @@ - Ações + Acções diff --git a/src/app/modals/document-set-up-meeting/document-set-up-meeting.page.ts b/src/app/modals/document-set-up-meeting/document-set-up-meeting.page.ts index ab295c1d4..90fda08ac 100644 --- a/src/app/modals/document-set-up-meeting/document-set-up-meeting.page.ts +++ b/src/app/modals/document-set-up-meeting/document-set-up-meeting.page.ts @@ -117,6 +117,24 @@ export class DocumentSetUpMeetingPage implements OnInit { this.postData.CalendarName = "Oficial"; this.postData.Category = 'Reunião' + + if(!this.CalendarName) { + if(this._eventService.calendarNamesAry.includes('Meu calendario')) { + this.CalendarName = 'Meu calendario'; + console.log(this._eventService.calendarNamesAry) + } else { + this.CalendarName = this._eventService.calendarNamesAry[0] + } + } + + if(this.taskParticipants.length == 0) { + this.taskParticipants = [{ + EmailAddress: SessionStore.user.Email, + IsRequired: true, + Name: SessionStore.user.UserName + }] + } + } ngOnInit() { diff --git a/src/app/pages/gabinete-digital/expediente/book-meeting-modal/book-meeting-modal.page.ts b/src/app/pages/gabinete-digital/expediente/book-meeting-modal/book-meeting-modal.page.ts index 08641b7e7..174cfcd3e 100644 --- a/src/app/pages/gabinete-digital/expediente/book-meeting-modal/book-meeting-modal.page.ts +++ b/src/app/pages/gabinete-digital/expediente/book-meeting-modal/book-meeting-modal.page.ts @@ -130,6 +130,8 @@ export class BookMeetingModalPage implements OnInit { authService: AuthService, private toastService: ToastService, public ThemeService: ThemeService, + public eventService: EventsService, + ) { this.taskParticipants = []; @@ -148,6 +150,23 @@ export class BookMeetingModalPage implements OnInit { this.postData.Category = 'Reunião' + if(!this.CalendarName) { + if(this.eventService.calendarNamesAry.includes('Meu calendario')) { + this.CalendarName = 'Meu calendario'; + console.log(this.eventService.calendarNamesAry) + } else { + this.CalendarName = this.eventService.calendarNamesAry[0] + } + } + + if(this.taskParticipants.length == 0) { + this.taskParticipants = [{ + EmailAddress: SessionStore.user.Email, + IsRequired: true, + Name: SessionStore.user.UserName + }] + } + } ngOnInit() { diff --git a/src/app/pages/publications/publications.page.ts b/src/app/pages/publications/publications.page.ts index b901bac6f..a8ffc6082 100644 --- a/src/app/pages/publications/publications.page.ts +++ b/src/app/pages/publications/publications.page.ts @@ -260,8 +260,9 @@ export class PublicationsPage implements OnInit { } finally { loader.remove() + this.refreshing() } - this.refreshing() + } async AddPublicationFolder(item?: any) { diff --git a/version/git-version.ts b/version/git-version.ts index ce748ec79..9b9af958e 100644 --- a/version/git-version.ts +++ b/version/git-version.ts @@ -1,12 +1,12 @@ export let versionData = { - "shortSHA": "658720f47", - "SHA": "658720f47ff463fe7e6ff672a2f562d74662480c", + "shortSHA": "378ea8fe5", + "SHA": "378ea8fe5b32dc1a9b68a71b98b32ed1e2e7a5a0", "branch": "no_bug_movemente", "lastCommitAuthor": "'Peter Maquiran'", - "lastCommitTime": "'Sun Jan 22 15:27:01 2023 +0100'", - "lastCommitMessage": "save", - "lastCommitNumber": "4677", + "lastCommitTime": "'Sun Jan 22 18:48:45 2023 +0100'", + "lastCommitMessage": "improve", + "lastCommitNumber": "4678", "change": "", - "changeStatus": "On branch no_bug_movemente\nChanges to be committed:\n (use \"git restore --staged ...\" to unstage)\n\tmodified: src/app/pages/agenda/new-event/new-event.page.ts\n\tmodified: src/app/pages/chat/messages/messages.page.html\n\tmodified: src/app/pages/chat/messages/messages.page.ts\n\tmodified: src/app/shared/agenda/new-event/new-event.page.ts\n\tmodified: src/app/shared/popover/chat-options-popover/chat-options-popover.page.ts", + "changeStatus": "On branch no_bug_movemente\nChanges to be committed:\n (use \"git restore --staged ...\" to unstage)\n\tmodified: src/app/home/home.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.ts\n\tmodified: src/app/pages/publications/publications.page.ts", "changeAuthor": "peter.maquiran" } \ No newline at end of file From 16e90870988f16410f86e49b4783850132982004 Mon Sep 17 00:00:00 2001 From: Peter Maquiran Date: Mon, 23 Jan 2023 15:24:35 +0100 Subject: [PATCH 40/42] hot fix --- src/app/pages/agenda/agenda.page.html | 20 +++++++------- src/app/pages/agenda/agenda.page.scss | 11 +++++--- src/app/pages/agenda/agenda.page.ts | 3 ++- .../pages/agenda/new-event/new-event.page.ts | 15 +++++++++-- src/app/pages/events/events.page.html | 2 +- .../gabinete-digital/gabinete-digital.page.ts | 22 ++++++++-------- src/app/pages/search/search.page.ts | 4 +-- .../shared/agenda/new-event/new-event.page.ts | 26 ++++++++++++------- .../opts-expediente/opts-expediente.page.html | 2 -- .../opts-expediente/opts-expediente.page.ts | 14 ++-------- version/git-version.ts | 12 ++++----- 11 files changed, 72 insertions(+), 59 deletions(-) diff --git a/src/app/pages/agenda/agenda.page.html b/src/app/pages/agenda/agenda.page.html index 9c1fa190e..0f08bdc40 100644 --- a/src/app/pages/agenda/agenda.page.html +++ b/src/app/pages/agenda/agenda.page.html @@ -278,13 +278,12 @@
o dia
- {{ event.event.CalendarName }} -
{{event.event.Location}}

{{event.event.Subject}}

-
{{SessionStore.user.FullName}}
- {{eventService.getCalendarOwnNameByCalendarId(event.event.CalendarId)}} +
{{event.event.Location}}
+
{{SessionStore.user.FullName}}
+ {{eventService.getCalendarOwnNameByCalendarId(event.event.CalendarId)}}
@@ -321,11 +320,11 @@
o dia
-
{{event.event.Location}}

{{event.event.Subject}}

-
{{SessionStore.user.FullName}}
+
{{event.event.Location}}
+
{{SessionStore.user.FullName}}
{{eventService.getCalendarOwnNameByCalendarId(event.event.CalendarId)}}
@@ -365,11 +364,12 @@
o dia
-
{{event.event.Location}}
-

{{event.event.Subject}}

+

{{event.event.Subject}} ....

-
{{SessionStore.user.FullName}}
+
{{event.event.Location}}
+ +
{{SessionStore.user.FullName}}
{{eventService.getCalendarOwnNameByCalendarId(event.event.CalendarId)}}
@@ -416,7 +416,7 @@ [eventAttendees]="contacts" (clearContact)="clearContact()" (setContact)="setContact($event)" - + [CalendarDate]="viewDate" (setIntervenient)="setIntervenient($event)" (setIntervenientCC)="setIntervenientCC($event)" > diff --git a/src/app/pages/agenda/agenda.page.scss b/src/app/pages/agenda/agenda.page.scss index b7f934b9e..0275b93d6 100644 --- a/src/app/pages/agenda/agenda.page.scss +++ b/src/app/pages/agenda/agenda.page.scss @@ -509,17 +509,21 @@ td.monthview-primary-with-event { width: 100%; overflow: auto; - .location{ + .location { width: 100%; font-family: Roboto; - font-size: 13px; color: black; + font-size: 14px; } + + .calendar-owner { + font-size: 14px; + } + .description{ width: 100%; font-family: Roboto; - font-size: 15px; font-weight: bold; color: var(--title-text-color); } @@ -528,6 +532,7 @@ td.monthview-primary-with-event { white-space: nowrap; overflow: hidden !important; text-overflow: ellipsis !important; + font-size: 17px; } } diff --git a/src/app/pages/agenda/agenda.page.ts b/src/app/pages/agenda/agenda.page.ts index d4156e563..e4fab7593 100644 --- a/src/app/pages/agenda/agenda.page.ts +++ b/src/app/pages/agenda/agenda.page.ts @@ -1236,7 +1236,8 @@ export class AgendaPage implements OnInit { segment: this.segment, profile: this.profile, eventSelectedDate: this.eventSelectedDate, - attendees: taskParticipants + attendees: taskParticipants, + CalendarDate: this.viewDate }, cssClass: 'modal modal-desktop', backdropDismiss: false diff --git a/src/app/pages/agenda/new-event/new-event.page.ts b/src/app/pages/agenda/new-event/new-event.page.ts index d2ab84223..75ec9c57b 100644 --- a/src/app/pages/agenda/new-event/new-event.page.ts +++ b/src/app/pages/agenda/new-event/new-event.page.ts @@ -63,6 +63,7 @@ export class NewEventPage implements OnInit { eventAttendees: EventPerson[]; selectedSegment: string; selectedDate: Date; + CalendarDate: Date; recurringTypes: any; selectedRecurringType: any; @@ -107,6 +108,7 @@ export class NewEventPage implements OnInit { this.selectedSegment = this.navParams.get('segment'); this.selectedDate = this.navParams.get('eventSelectedDate'); this.taskParticipants = this.navParams.get('attendees'); + this.CalendarDate = this.navParams.get('CalendarDate') } ngOnInit() { @@ -179,14 +181,23 @@ export class NewEventPage implements OnInit { } }; + this.setDefaultTime() + + } + + setDefaultTime() { + console.log(this.CalendarDate) + this.postEvent.StartDate = this.roundTimeQuarterHour(this.CalendarDate); + this.postEvent.EndDate = this.postEvent.StartDate; } close() { this.modalController.dismiss(); } - roundTimeQuarterHour() { - var timeToReturn = new Date(); + roundTimeQuarterHour(timeToReturn?) { + var timeToReturn = timeToReturn || new Date(); + var minutes = timeToReturn.getMinutes(); var hours = timeToReturn.getHours(); diff --git a/src/app/pages/events/events.page.html b/src/app/pages/events/events.page.html index f74da62f6..527beb5dc 100644 --- a/src/app/pages/events/events.page.html +++ b/src/app/pages/events/events.page.html @@ -125,7 +125,7 @@ (click)="goToExpediente(task.SerialNumber)">
-
{{task.taskStartDate | date: 'dd-MM-yyyy'}}
+
{{task.taskStartDate | date: 'dd-MM-yy'}}
{{task.taskStartDate | date: 'HH:mm'}}
diff --git a/src/app/pages/gabinete-digital/gabinete-digital.page.ts b/src/app/pages/gabinete-digital/gabinete-digital.page.ts index 546ec76f1..1d21c855d 100644 --- a/src/app/pages/gabinete-digital/gabinete-digital.page.ts +++ b/src/app/pages/gabinete-digital/gabinete-digital.page.ts @@ -165,8 +165,8 @@ export class GabineteDigitalPage implements OnInit { } const pathname = window.location.pathname - this.router.events.forEach((event) => { - if (event instanceof NavigationEnd && event.url == pathname) { + //this.router.events.forEach((event) => { + //if (event instanceof NavigationEnd && event.url == pathname) { this.waitForDomService.selector({ selector: 'app-gabinete-digital ion-content .aside-wrapper', callback: () => { @@ -179,18 +179,18 @@ export class GabineteDigitalPage implements OnInit { } } }) - } - }); + //} + //}); this.hideRefreshButton(); - this.waitForDomService.selector({ - selector: 'app-gabinete-digital ion-content .aside-wrapper', - callback: () => { - // console.log('SECOND CALL') - this.loadAllProcesses(); - } - }) + // this.waitForDomService.selector({ + // selector: 'app-gabinete-digital ion-content .aside-wrapper', + // callback: () => { + // // console.log('SECOND CALL') + // this.loadAllProcesses(); + // } + // }) this.backgroundservice.registerBackService('Online', () => { // this.loadAllProcesses(); diff --git a/src/app/pages/search/search.page.ts b/src/app/pages/search/search.page.ts index 47847ce54..a01dc100a 100644 --- a/src/app/pages/search/search.page.ts +++ b/src/app/pages/search/search.page.ts @@ -426,7 +426,7 @@ export class SearchPage implements OnInit { }); this.search.basicSearch(this.searchSubject, this.searchDocumentDate, this.searchSender - ,this.searchOrganicEntiry, this.searchDocTypeId, '361').subscribe(res=>{ + ,this.searchOrganicEntiry, this.searchDocTypeId, '361').subscribe(res => { res.Categories.forEach( e => { e['Active'] = false; @@ -442,7 +442,7 @@ export class SearchPage implements OnInit { this.reorderList(this.ordinance); // hide show document - if(this.searchDocuments.length >= 1){ + if(this.searchDocuments.length >= 1) { this.showDocuments = true; } else { this.showDocuments = false diff --git a/src/app/shared/agenda/new-event/new-event.page.ts b/src/app/shared/agenda/new-event/new-event.page.ts index 35f79dc98..3fd33a44e 100644 --- a/src/app/shared/agenda/new-event/new-event.page.ts +++ b/src/app/shared/agenda/new-event/new-event.page.ts @@ -73,6 +73,7 @@ export class NewEventPage implements OnInit { @Input() roomId:string; @Input() selectedSegment: string; @Input() selectedDate: Date; + @Input() CalendarDate: Date; @Input() taskParticipants: EventPerson[] = []; @Input() taskParticipantsCc: any = []; @@ -147,7 +148,7 @@ export class NewEventPage implements OnInit { } this.getRecurrenceTypes(); - if(!this.restoreTemporaryData()){ + if(!this.restoreTemporaryData()) { // clear this.eventBody = { BodyType : "1", Text : ""}; this.postEvent.Body = this.eventBody; @@ -218,11 +219,18 @@ export class NewEventPage implements OnInit { this.date = new Date(2021,9,4,5,6,7); this.injectValidation(); + this.setDefaultTime(); } - roundTimeQuarterHour() { - var timeToReturn = new Date(); + setDefaultTime() { + console.log(this.CalendarDate) + this.postEvent.StartDate = this.roundTimeQuarterHour(this.CalendarDate); + this.postEvent.EndDate = this.postEvent.StartDate; + } + + roundTimeQuarterHour(timeToReturn?) { + var timeToReturn = timeToReturn || new Date(); // var minutes = timeToReturn.getMinutes(); var minutes = timeToReturn.getMinutes(); var hours = timeToReturn.getHours(); @@ -260,11 +268,11 @@ export class NewEventPage implements OnInit { } setStartDate(){ - this.postEvent.StartDate = this.roundTimeQuarterHour(); + // this.postEvent.StartDate = this.roundTimeQuarterHour(); } setEndDate(){ - this.postEvent.EndDate = this.postEvent.StartDate; + // this.postEvent.EndDate = this.postEvent.StartDate; } runValidation() { @@ -362,7 +370,7 @@ export class NewEventPage implements OnInit { } } - async getDoc(){ + async getDoc() { const modal = await this.modalController.create({ component: SearchPage, cssClass: 'modal-width-100-width-background modal', @@ -373,7 +381,7 @@ export class NewEventPage implements OnInit { } }); await modal.present(); - modal.onDidDismiss().then((res)=>{ + modal.onDidDismiss().then((res) => { if(res){ const data = res.data; this.documents.push(data.selected); @@ -497,12 +505,12 @@ export class NewEventPage implements OnInit { }); await DocumentToSave.forEach((attachments, i) => { this.attachmentsService.setEventAttachmentById(attachments).subscribe((res) =>{ - if(DocumentToSave.length == (i+1)){ + if(DocumentToSave.length == (i+1)) { this.afterSave(); } }); }); - if(DocumentToSave.length == 0){ + if(DocumentToSave.length == 0) { this.afterSave(); } this.toastService._successMessage('Evento criado'); diff --git a/src/app/shared/popover/opts-expediente/opts-expediente.page.html b/src/app/shared/popover/opts-expediente/opts-expediente.page.html index 3798b2ee2..d2b1e2096 100644 --- a/src/app/shared/popover/opts-expediente/opts-expediente.page.html +++ b/src/app/shared/popover/opts-expediente/opts-expediente.page.html @@ -15,8 +15,6 @@ -
-
diff --git a/src/app/shared/popover/opts-expediente/opts-expediente.page.ts b/src/app/shared/popover/opts-expediente/opts-expediente.page.ts index 2f38ce6cd..6d271bde9 100644 --- a/src/app/shared/popover/opts-expediente/opts-expediente.page.ts +++ b/src/app/shared/popover/opts-expediente/opts-expediente.page.ts @@ -51,21 +51,11 @@ export class OptsExpedientePage implements OnInit { private expedienteService: ExpedienteService, public ThemeService: ThemeService ) { - this.loggeduser = SessionStore.user - this.task = this.navParams.get('task'); - this.fulltask = this.navParams.get('fulltask'); - - if(this.task.Status != 'Pending') { - this.showEnviarPendentes = true; - } + } ngOnInit() { - window.onresize = (event) => { - if( window.innerWidth >= 800){ - this.popoverController.dismiss(); - } - }; + } async openNewGroupPage(){ diff --git a/version/git-version.ts b/version/git-version.ts index 9b9af958e..6e8e6533f 100644 --- a/version/git-version.ts +++ b/version/git-version.ts @@ -1,12 +1,12 @@ export let versionData = { - "shortSHA": "378ea8fe5", - "SHA": "378ea8fe5b32dc1a9b68a71b98b32ed1e2e7a5a0", + "shortSHA": "47cc0257f", + "SHA": "47cc0257f828b4bf00b5497bb71a21143388c73e", "branch": "no_bug_movemente", "lastCommitAuthor": "'Peter Maquiran'", - "lastCommitTime": "'Sun Jan 22 18:48:45 2023 +0100'", - "lastCommitMessage": "improve", - "lastCommitNumber": "4678", + "lastCommitTime": "'Mon Jan 23 10:00:16 2023 +0100'", + "lastCommitMessage": "Select agenda by default", + "lastCommitNumber": "4679", "change": "", - "changeStatus": "On branch no_bug_movemente\nChanges to be committed:\n (use \"git restore --staged ...\" to unstage)\n\tmodified: src/app/home/home.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.ts\n\tmodified: src/app/pages/publications/publications.page.ts", + "changeStatus": "On branch no_bug_movemente\nChanges to be committed:\n (use \"git restore --staged ...\" to unstage)\n\tmodified: src/app/pages/agenda/agenda.page.html\n\tmodified: src/app/pages/agenda/agenda.page.scss\n\tmodified: src/app/pages/agenda/agenda.page.ts\n\tmodified: src/app/pages/agenda/new-event/new-event.page.ts\n\tmodified: src/app/pages/events/events.page.html\n\tmodified: src/app/pages/gabinete-digital/gabinete-digital.page.ts\n\tmodified: src/app/pages/search/search.page.ts\n\tmodified: src/app/shared/agenda/new-event/new-event.page.ts\n\tmodified: src/app/shared/popover/opts-expediente/opts-expediente.page.html\n\tmodified: src/app/shared/popover/opts-expediente/opts-expediente.page.ts", "changeAuthor": "peter.maquiran" } \ No newline at end of file From 0292a95ddb35731bc75043117352f76d6044246d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Eudes=20In=C3=A1cio?= Date: Mon, 23 Jan 2023 16:51:30 +0100 Subject: [PATCH 41/42] build problem solved --- android/app/google-services.json | 40 ------------------- package-lock.json | 14 +++---- package.json | 2 +- src/app/modals/profile/profile.page.html | 4 +- .../gabinete-digital.page.html | 4 +- .../all-processes/all-processes.page.html | 2 +- src/app/shared/header/header.page.html | 6 +-- src/environments/environment.prod.ts | 2 +- src/environments/environment.ts | 4 +- version/git-version.ts | 12 +++--- 10 files changed, 25 insertions(+), 65 deletions(-) delete mode 100644 android/app/google-services.json 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 From 5733874d5fb6301eedde143e28a046e3810c2317 Mon Sep 17 00:00:00 2001 From: Peter Maquiran Date: Tue, 24 Jan 2023 14:31:05 +0100 Subject: [PATCH 42/42] fixe --- src/app/pages/search/search.page.html | 14 ++- src/app/pages/search/search.page.ts | 130 ++++++++++++++++++++----- src/app/services/search.service.ts | 26 +++++ src/app/shared/header/header.page.html | 11 ++- version/git-version.ts | 12 +-- 5 files changed, 153 insertions(+), 40 deletions(-) diff --git a/src/app/pages/search/search.page.html b/src/app/pages/search/search.page.html index 33dbf864b..c9785f51b 100644 --- a/src/app/pages/search/search.page.html +++ b/src/app/pages/search/search.page.html @@ -37,19 +37,25 @@
-
+ +
-
+ + +
+ + +
diff --git a/src/app/pages/search/search.page.ts b/src/app/pages/search/search.page.ts index a01dc100a..e7a892237 100644 --- a/src/app/pages/search/search.page.ts +++ b/src/app/pages/search/search.page.ts @@ -11,6 +11,7 @@ import { DocumentDetailPage } from 'src/app/modals/document-detail/document-deta import { SearchCategory, SearchList } from 'src/app/models/search-document'; import { ThemeService } from 'src/app/services/theme.service' import { ViewDocumentPage } from 'src/app/modals/view-document/view-document.page'; +import { Router } from '@angular/router'; @Component({ selector: 'app-search', @@ -62,7 +63,8 @@ export class SearchPage implements OnInit { private search: SearchService, private modalCtrl: ModalController, private navParams: NavParams, - public ThemeService: ThemeService) + public ThemeService: ThemeService, + private router: Router) { this.ordinance = "recent"; this.currentPath= window.location.pathname; @@ -166,9 +168,7 @@ export class SearchPage implements OnInit { wordCloud() { - this.search.mostSeachWord("15").subscribe(res=>{ - - console.log('LOAD LIST'); + this.search.mostSeachWord("15").subscribe( res => { const highest= res[0].Hits; const lowest = res[res.length-1].Hits; @@ -191,7 +191,6 @@ export class SearchPage implements OnInit { }); this.list = list - console.log('set list') const elem = document.documentElement.querySelector('.most-searched-word-container'); @@ -213,7 +212,7 @@ export class SearchPage implements OnInit { loadWordCloud() { - setTimeout(()=>{ + setTimeout(() => { const elem = document.documentElement.querySelector('.most-searched-word-container'); WordCloud( @@ -386,7 +385,7 @@ export class SearchPage implements OnInit { let counter = 0; this.search.basicSearch(this.searchSubject, this.searchDocumentDate, this.searchSender - ,this.searchOrganicEntiry, this.searchDocTypeId, '8').subscribe(res=>{ + ,this.searchOrganicEntiry, this.searchDocTypeId, '8').subscribe(res => { res.Categories.forEach( e => { e['Active'] = false; this.searchCategories.push(e) @@ -544,7 +543,7 @@ export class SearchPage implements OnInit { counter++; - if(counter ==2){ + if(counter ==2) { this.showLoader = false; } @@ -552,7 +551,7 @@ export class SearchPage implements OnInit { },error => { counter++; - if(counter ==2){ + if(counter ==2) { this.showLoader = false; } this.searchResult = "Registo não encontrado" @@ -561,9 +560,13 @@ export class SearchPage implements OnInit { } } - else if (this.type == "AccoesPresidenciais"){ + else if (this.type == "AccoesPresidenciais") { + + let counter = 0; this.showLoader = true; + this.searchCategories = [] + this.searchDocuments = [] this.search.basicSearch(this.searchSubject, this.searchDocumentDate, this.searchSender ,this.searchOrganicEntiry, this.searchDocTypeId, '386').subscribe(res=>{ @@ -571,12 +574,18 @@ export class SearchPage implements OnInit { res.Categories.forEach( e => { e['Active'] = false; + e['Name'] = "Publicações" }); // bind respose - this.searchCategories = res.Categories; + for ( const a of res.Categories) { + this.searchCategories.push(a); + } - this.searchDocuments = this.sortArrayISODate(res.Documents); + for ( const a of this.sortArrayISODate(res.Documents)) { + a.DocTypeDesc = "Publicações" + this.searchDocuments.push(a); + } this.reorderList(this.ordinance); @@ -587,13 +596,71 @@ export class SearchPage implements OnInit { this.showDocuments = false } - this.showLoader = false; + counter++; + + if(counter ==2){ + this.showLoader = false; + } + this.loadWordCloud(); },error => { - this.showLoader = false; + counter++; + + if(counter ==2){ + this.showLoader = false; + } this.searchResult = "Registo não encontrado" console.log(error) }); + + + + this.search.basicSearchPublication(this.searchSubject, this.searchDocumentDate, this.searchSender + ,this.searchOrganicEntiry, this.searchDocTypeId, '386').subscribe(res => { + + + res.Categories.forEach( e => { + e['Active'] = false; + e['Name'] = "Acções" + }); + + // bind respose + for ( const a of res.Categories) { + this.searchCategories.push(a); + } + + + + for ( const a of this.sortArrayISODate(res.Documents)) { + a.DocTypeDesc = "Acções" + this.searchDocuments.push(a); + } + + this.reorderList(this.ordinance); + + // hide show document + if(this.searchDocuments.length >= 1) { + this.showDocuments = true; + } else { + this.showDocuments = false + } + + counter++; + + if(counter ==2) { + this.showLoader = false; + } + this.loadWordCloud(); + }, error => { + counter++; + + if(counter ==2) { + this.showLoader = false; + } + this.searchResult = "Registo não encontrado" + console.log(error) + }); + } } @@ -757,6 +824,7 @@ export class SearchPage implements OnInit { const ApplicationType = searchDocument.ApplicationType.toString() const Id = searchDocument.Id const CalendarId = searchDocument.ApplicationName.split(':')[1] + const DocTypeDesc = searchDocument.DocTypeDesc if(this.select == false) { if(this.type == "Agenda") { @@ -776,7 +844,7 @@ export class SearchPage implements OnInit { } else if(this.type == "AccoesPresidenciais") { - this.viewPublicationDetail(Id); + this.viewPublicationDetail(Id, DocTypeDesc); } else if(this.type == "AccoesPresidenciais & ArquivoDespachoElect") { @@ -790,19 +858,27 @@ export class SearchPage implements OnInit { } } - async viewPublicationDetail(publicationId:string) { - const modal = await this.modalController.create({ - component: PublicationDetailPage, - componentProps:{ - publicationId: publicationId, - isModal: true - }, - cssClass: 'publication-detail modal modal-desktop ', - //backdropDismiss: false - }); + async viewPublicationDetail(publicationId:string, DocTypeDesc) { + // validation my friend + + if(DocTypeDesc == 'Acções') { + this.router.navigate(['/home/publications', publicationId]); + } else if( DocTypeDesc == 'Publicações') { + const modal = await this.modalController.create({ + component: PublicationDetailPage, + componentProps:{ + publicationId: publicationId, + isModal: true + }, + cssClass: 'publication-detail modal modal-desktop ', + //backdropDismiss: false + }); + + await modal.present(); + modal.onDidDismiss().then(()=>{}); + } + - await modal.present(); - modal.onDidDismiss().then(()=>{}); } diff --git a/src/app/services/search.service.ts b/src/app/services/search.service.ts index 8b6075663..71acc268a 100644 --- a/src/app/services/search.service.ts +++ b/src/app/services/search.service.ts @@ -66,6 +66,32 @@ export class SearchService { return this.http.get(`${geturl}`, options); } + + basicSearchPublication(subject:string, date:string = null, sender:string = null, organicEntity:string = null, docTypeId:string = null, applicationType:string): Observable{ + // Endpoint + const geturl = environment.apiURL + 'search'; + // store params + let params = new HttpParams(); + // set https params + + + params = params.set("assunto", subject); + params = params.set("data", date); + params = params.set("remetente", sender); + params = params.set("entidadeOrganica", organicEntity); + params = params.set("docTypeId", docTypeId); + params = params.set("applicationType", applicationType); + params = params.set("listOnlyFolders", true) + + + const options = { + headers: this.headers, + params: params + }; + + return this.http.get(`${geturl}`, options); + } + mostSeachWord(size:string):Observable{ // Endpoint diff --git a/src/app/shared/header/header.page.html b/src/app/shared/header/header.page.html index 0187c4f53..429ee8f1f 100644 --- a/src/app/shared/header/header.page.html +++ b/src/app/shared/header/header.page.html @@ -127,18 +127,23 @@
-
+
-
+ +
+ + +
diff --git a/version/git-version.ts b/version/git-version.ts index 6e8e6533f..22209f478 100644 --- a/version/git-version.ts +++ b/version/git-version.ts @@ -1,12 +1,12 @@ export let versionData = { - "shortSHA": "47cc0257f", - "SHA": "47cc0257f828b4bf00b5497bb71a21143388c73e", + "shortSHA": "16e908709", + "SHA": "16e90870988f16410f86e49b4783850132982004", "branch": "no_bug_movemente", "lastCommitAuthor": "'Peter Maquiran'", - "lastCommitTime": "'Mon Jan 23 10:00:16 2023 +0100'", - "lastCommitMessage": "Select agenda by default", - "lastCommitNumber": "4679", + "lastCommitTime": "'Mon Jan 23 15:24:35 2023 +0100'", + "lastCommitMessage": "hot fix", + "lastCommitNumber": "4680", "change": "", - "changeStatus": "On branch no_bug_movemente\nChanges to be committed:\n (use \"git restore --staged ...\" to unstage)\n\tmodified: src/app/pages/agenda/agenda.page.html\n\tmodified: src/app/pages/agenda/agenda.page.scss\n\tmodified: src/app/pages/agenda/agenda.page.ts\n\tmodified: src/app/pages/agenda/new-event/new-event.page.ts\n\tmodified: src/app/pages/events/events.page.html\n\tmodified: src/app/pages/gabinete-digital/gabinete-digital.page.ts\n\tmodified: src/app/pages/search/search.page.ts\n\tmodified: src/app/shared/agenda/new-event/new-event.page.ts\n\tmodified: src/app/shared/popover/opts-expediente/opts-expediente.page.html\n\tmodified: src/app/shared/popover/opts-expediente/opts-expediente.page.ts", + "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", "changeAuthor": "peter.maquiran" } \ No newline at end of file