From d8b443add6a64568c3078b6b7d90a0732e85de92 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Eudes=20In=C3=A1cio?= Date: Wed, 18 Jan 2023 14:20:23 +0100 Subject: [PATCH 1/2] Intervinientes bug solved --- .../pages/agenda/new-event/new-event.page.ts | 4 +++- .../attendee-modal/attendee-modal.page.html | 2 +- .../attendee-modal/attendee-modal.page.ts | 5 +++++ src/environments/environment.prod.ts | 14 +++++++------- src/environments/environment.ts | 18 +++++++++--------- version/git-version.ts | 14 +++++++------- 6 files changed, 32 insertions(+), 25 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 5eaaa4bbc..4c57dcf37 100644 --- a/src/app/pages/agenda/new-event/new-event.page.ts +++ b/src/app/pages/agenda/new-event/new-event.page.ts @@ -106,7 +106,7 @@ export class NewEventPage implements OnInit { } ngOnInit() { - + this.taskParticipants = []; this.CalendarName = this.loggeduser.Profile; this.selectedRecurringType = "-1"; @@ -497,11 +497,13 @@ export class NewEventPage implements OnInit { } setIntervenient(data) { + this.taskParticipants = []; this.taskParticipants = data; this.postEvent.Attendees = data; } setIntervenientCC(data){ + this.taskParticipantsCc = []; this.taskParticipantsCc = data; } diff --git a/src/app/shared/event/attendee-modal/attendee-modal.page.html b/src/app/shared/event/attendee-modal/attendee-modal.page.html index 39a0817c6..b81cf0951 100644 --- a/src/app/shared/event/attendee-modal/attendee-modal.page.html +++ b/src/app/shared/event/attendee-modal/attendee-modal.page.html @@ -2,7 +2,7 @@ Adicionar intervenientes - + diff --git a/src/app/shared/event/attendee-modal/attendee-modal.page.ts b/src/app/shared/event/attendee-modal/attendee-modal.page.ts index 6184e6692..39b242e82 100644 --- a/src/app/shared/event/attendee-modal/attendee-modal.page.ts +++ b/src/app/shared/event/attendee-modal/attendee-modal.page.ts @@ -4,6 +4,8 @@ import { ContactsService } from 'src/app/services/contacts.service'; import { EventPerson } from 'src/app/models/eventperson.model'; import { removeDuplicate } from 'src/plugin/removeDuplicate.js' import { ThemeService } from 'src/app/services/theme.service' +import { ViewChild } from '@angular/core'; +import { Searchbar } from 'ionic-angular'; @Component({ selector: 'app-attendee-modal', @@ -31,6 +33,8 @@ export class AttendeePage implements OnInit { @Input() footer: boolean; + @ViewChild('Searchbar') searchbar: Searchbar; + LtaskParticipants: EventPerson[] = []; LtaskParticipantsCc: EventPerson[] = []; @@ -70,6 +74,7 @@ export class AttendeePage implements OnInit { this.setIntervenient.emit(removeDuplicate(this.LtaskParticipants)); this.setIntervenientCC.emit(removeDuplicate(this.LtaskParticipantsCc)); + this.searchbar.value = null; this.closeComponent.emit(); } diff --git a/src/environments/environment.prod.ts b/src/environments/environment.prod.ts index bdbafa9af..8970b0d17 100644 --- a/src/environments/environment.prod.ts +++ b/src/environments/environment.prod.ts @@ -1,20 +1,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://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: '', + domain: 'oapr.gov.ao', //equilibrium.ao.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 e66379414..f5d27fc98 100644 --- a/src/environments/environment.ts +++ b/src/environments/environment.ts @@ -1,22 +1,22 @@ import { versionData } from '../../version/git-version' export const environment = { // apiURL: 'https://gabinetedigital.dyndns.info/GabineteDigital.Services/V5/api/', - apiURL: 'https://gd-api.oapr.gov.ao/api/', - //apiURL: 'https://API.DONEIT.CO.AO/api/', + //apiURL: 'https://gd-api.oapr.gov.ao/api/', + apiURL: 'https://API.DONEIT.CO.AO/api/', //apiURL: 'https://gdapi-dev.dyndns.info/GabineteDigital.Services/V5/api/', // apiURL: 'http://gpr-dev-01.gabinetedigital.local/GabineteDigital.Services/V5/api/', // apiChatUrl: 'http://192.168.0.29:3000/api/v1/', // apiWsChatUrl: 'wss://192.168.0.29:3000/websocket', //apiChatUrl: 'https://gdchat-dev.dyndns.info/api/v1/', //apiWsChatUrl: 'wss://gdchat-dev.dyndns.info/websocket', - //apiChatUrl: 'https://CHAT.DONEIT.CO.AO/api/v1/', - //apiWsChatUrl: 'wss://CHAT.DONEIT.CO.AO/websocket', - apiChatUrl: 'https://gd-chat.oapr.gov.ao/api/v1/', - apiWsChatUrl: 'wss://gd-chat.oapr.gov.ao/websocket', + apiChatUrl: 'https://CHAT.DONEIT.CO.AO/api/v1/', + apiWsChatUrl: 'wss://CHAT.DONEIT.CO.AO/websocket', + /* apiChatUrl: 'https://gd-chat.oapr.gov.ao/api/v1/', + apiWsChatUrl: 'wss://gd-chat.oapr.gov.ao/websocket', */ production: false, - domain: 'evandre.dasilva@equilibrium.co.ao', - defaultuser: 'ppinto@oapr.gov.ao',//paulo.pinto@gabinetedigital.local - defaultuserpwd: 'M@p2022', //tabteste@006, + domain: 'equilibrium.co.ao', + 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 7fd1f8d5f..ff4418131 100644 --- a/version/git-version.ts +++ b/version/git-version.ts @@ -1,12 +1,12 @@ export let versionData = { - "shortSHA": "b6a351421", - "SHA": "b6a3514215a666d62a2ded788463375c2b7ff7ee", + "shortSHA": "711e9fc64", + "SHA": "711e9fc640420029233c0aa0fad0151f26a5fb4a", "branch": "no_bug_movemente", "lastCommitAuthor": "'Peter Maquiran'", - "lastCommitTime": "'Tue Jan 17 17:08:03 2023 +0100'", - "lastCommitMessage": "improve search", - "lastCommitNumber": "4647", + "lastCommitTime": "'Tue Jan 17 17:12:01 2023 +0100'", + "lastCommitMessage": "fix", + "lastCommitNumber": "4650", "change": "", - "changeStatus": "On branch no_bug_movemente\nAll conflicts fixed but you are still merging.\n (use \"git commit\" to conclude merge)\n\nChanges to be committed:\n\tmodified: android/app/src/main/res/drawable-land-hdpi/splash.png\n\tnew file: android/app/src/main/res/drawable-land-ldpi/splash.png\n\tmodified: android/app/src/main/res/drawable-land-mdpi/splash.png\n\tmodified: android/app/src/main/res/drawable-land-xhdpi/splash.png\n\tmodified: android/app/src/main/res/drawable-land-xxhdpi/splash.png\n\tmodified: android/app/src/main/res/drawable-land-xxxhdpi/splash.png\n\tmodified: android/app/src/main/res/drawable-port-hdpi/splash.png\n\tnew file: android/app/src/main/res/drawable-port-ldpi/splash.png\n\tmodified: android/app/src/main/res/drawable-port-mdpi/splash.png\n\tmodified: android/app/src/main/res/drawable-port-xhdpi/splash.png\n\tmodified: android/app/src/main/res/drawable-port-xxhdpi/splash.png\n\tmodified: android/app/src/main/res/drawable-port-xxxhdpi/splash.png\n\tmodified: android/app/src/main/res/mipmap-hdpi/ic_launcher.png\n\tmodified: android/app/src/main/res/mipmap-hdpi/ic_launcher_foreground.png\n\tmodified: android/app/src/main/res/mipmap-hdpi/ic_launcher_round.png\n\tmodified: android/app/src/main/res/mipmap-mdpi/ic_launcher.png\n\tmodified: android/app/src/main/res/mipmap-mdpi/ic_launcher_foreground.png\n\tmodified: android/app/src/main/res/mipmap-mdpi/ic_launcher_round.png\n\tmodified: android/app/src/main/res/mipmap-xhdpi/ic_launcher.png\n\tmodified: android/app/src/main/res/mipmap-xhdpi/ic_launcher_foreground.png\n\tmodified: android/app/src/main/res/mipmap-xhdpi/ic_launcher_round.png\n\tmodified: android/app/src/main/res/mipmap-xxhdpi/ic_launcher.png\n\tmodified: android/app/src/main/res/mipmap-xxhdpi/ic_launcher_foreground.png\n\tmodified: android/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.png\n\tmodified: android/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png\n\tmodified: android/app/src/main/res/mipmap-xxxhdpi/ic_launcher_foreground.png\n\tmodified: android/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.png\n\tmodified: src/app/modals/profile/profile.page.html\n\tmodified: src/app/pipes/expediente-task.pipe.ts\n\tmodified: version/git-version.ts", - "changeAuthor": "peter.maquiran" + "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/app/pages/agenda/new-event/new-event.page.ts\n\tmodified: src/app/shared/event/attendee-modal/attendee-modal.page.html\n\tmodified: src/app/shared/event/attendee-modal/attendee-modal.page.ts\n\tmodified: src/environments/environment.prod.ts\n\tmodified: src/environments/environment.ts", + "changeAuthor": "eudes.inacio" } \ No newline at end of file From 0144b306a87b09f30811af394d85fd2c3942e894 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Eudes=20In=C3=A1cio?= Date: Wed, 18 Jan 2023 17:07:25 +0100 Subject: [PATCH 2/2] Text change to doneIT --- src/app/modals/profile/profile.page.html | 4 ++-- .../gabinete-digital/gabinete-digital.page.html | 6 ++++-- src/app/shared/chat/messages/messages.page.ts | 2 ++ .../all-processes/all-processes.page.html | 3 ++- src/app/shared/header/header.page.html | 6 +++--- version/git-version.ts | 14 +++++++------- 6 files changed, 20 insertions(+), 15 deletions(-) diff --git a/src/app/modals/profile/profile.page.html b/src/app/modals/profile/profile.page.html index 46efdb983..6de0842de 100644 --- a/src/app/modals/profile/profile.page.html +++ b/src/app/modals/profile/profile.page.html @@ -8,7 +8,7 @@
-

Presidente da República

+

doneIT

GABINETE DIGITAL

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

Presidente da República

+

doneIT

GABINETE DIGITAL

diff --git a/src/app/pages/gabinete-digital/gabinete-digital.page.html b/src/app/pages/gabinete-digital/gabinete-digital.page.html index b4efdde6e..7f728eb71 100644 --- a/src/app/pages/gabinete-digital/gabinete-digital.page.html +++ b/src/app/pages/gabinete-digital/gabinete-digital.page.html @@ -71,7 +71,8 @@
- Agenda {{task.Agenda || task.workflowInstanceDataFields.Agenda}} do Presidente da República + + Agenda {{task.Agenda || task.workflowInstanceDataFields.Agenda}} do Titular A sua agenda {{task.Agenda || task.workflowInstanceDataFields.Agenda}} @@ -227,7 +228,8 @@
-

Despacho do Presidente da República

+ +

Despacho do Titular

Despachos criados por mim

{{ despachoprstore.count }} Documentos

diff --git a/src/app/shared/chat/messages/messages.page.ts b/src/app/shared/chat/messages/messages.page.ts index f74cb4955..0fb593dc9 100644 --- a/src/app/shared/chat/messages/messages.page.ts +++ b/src/app/shared/chat/messages/messages.page.ts @@ -385,6 +385,8 @@ export class MessagesPage implements OnInit, OnChanges, AfterViewInit, OnDestroy } async goToEvent(event: any) { + console.log(event.id) + console.log(event.calendarId) let classs; if (window.innerWidth < 701) { classs = 'modal modal-desktop' 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 1bc3ba743..a11a5d2e0 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 @@ -61,7 +61,8 @@
- Agenda {{task.Agenda}} do Presidente da República + + Agenda {{task.Agenda}} do Titular A sua agenda {{task.Agenda}} diff --git a/src/app/shared/header/header.page.html b/src/app/shared/header/header.page.html index 0187c4f53..b6c75ca89 100644 --- a/src/app/shared/header/header.page.html +++ b/src/app/shared/header/header.page.html @@ -19,7 +19,7 @@
-

Presidente da República

+

doneIT

GABINETE DIGITAL

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

Presidente da República

+

doneIT

GABINETE DIGITAL

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

Calendário Partilhado

-

Presidente da República

+

doneIT

GABINETE DIGITAL

diff --git a/version/git-version.ts b/version/git-version.ts index ff4418131..71a13a235 100644 --- a/version/git-version.ts +++ b/version/git-version.ts @@ -1,12 +1,12 @@ export let versionData = { - "shortSHA": "711e9fc64", - "SHA": "711e9fc640420029233c0aa0fad0151f26a5fb4a", + "shortSHA": "d8b443add", + "SHA": "d8b443add6a64568c3078b6b7d90a0732e85de92", "branch": "no_bug_movemente", - "lastCommitAuthor": "'Peter Maquiran'", - "lastCommitTime": "'Tue Jan 17 17:12:01 2023 +0100'", - "lastCommitMessage": "fix", - "lastCommitNumber": "4650", + "lastCommitAuthor": "'Eudes Inácio'", + "lastCommitTime": "'Wed Jan 18 14:20:23 2023 +0100'", + "lastCommitMessage": "Intervinientes bug solved", + "lastCommitNumber": "4651", "change": "", - "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/app/pages/agenda/new-event/new-event.page.ts\n\tmodified: src/app/shared/event/attendee-modal/attendee-modal.page.html\n\tmodified: src/app/shared/event/attendee-modal/attendee-modal.page.ts\n\tmodified: src/environments/environment.prod.ts\n\tmodified: src/environments/environment.ts", + "changeStatus": "On branch no_bug_movemente\nYour branch is ahead of 'origin/no_bug_movemente' by 1 commit.\n (use \"git push\" to publish your local commits)\n\nChanges to be committed:\n (use \"git restore --staged ...\" to unstage)\n\tmodified: src/app/modals/profile/profile.page.html\n\tmodified: src/app/pages/gabinete-digital/gabinete-digital.page.html\n\tmodified: src/app/shared/chat/messages/messages.page.ts\n\tmodified: src/app/shared/gabinete-digital/all-processes/all-processes.page.html\n\tmodified: src/app/shared/header/header.page.html", "changeAuthor": "eudes.inacio" } \ No newline at end of file