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/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/pages/gabinete-digital/gabinete-digital.page.html b/src/app/pages/gabinete-digital/gabinete-digital.page.html index cb3a456a1..6c6e6ea80 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 ef48d0263..0cc310ac2 100644 --- a/src/app/shared/chat/messages/messages.page.ts +++ b/src/app/shared/chat/messages/messages.page.ts @@ -387,6 +387,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/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 58f478a27..04f5f5ce3 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/app/shared/gabinete-digital/all-processes/all-processes.page.html b/src/app/shared/gabinete-digital/all-processes/all-processes.page.html index d2dc9f9cc..9d63acd23 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/src/environments/environment.prod.ts b/src/environments/environment.prod.ts index 94baefa97..1420e1e74 100644 --- a/src/environments/environment.prod.ts +++ b/src/environments/environment.prod.ts @@ -10,14 +10,14 @@ export const environment = { //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://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: 'evandre.dasilva@equilibrium.co.ao', - defaultuser: 'evandre.dasilva@equilibrium.co.ao',//paulo.pinto@gabinetedigital.local - defaultuserpwd: 'Luand@1219', //tabteste@006, + domain: 'oapr.gov.ao', //equilibrium.ao.ao + defaultuser: '',//paulo.pinto@gabinetedigital.local + defaultuserpwd: '', //tabteste@006,06, chatOffline: true, presidencia: false, version: versionData, diff --git a/src/environments/environment.ts b/src/environments/environment.ts index e988415b9..f5d27fc98 100644 --- a/src/environments/environment.ts +++ b/src/environments/environment.ts @@ -1,8 +1,8 @@ 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://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/', @@ -11,12 +11,12 @@ export const environment = { //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://gd-chat.oapr.gov.ao/api/v1/', + apiWsChatUrl: 'wss://gd-chat.oapr.gov.ao/websocket', */ production: false, domain: 'equilibrium.co.ao', - defaultuser: 'evandre.dasilva@equilibrium.co.ao',//paulo.pinto@gabinetedigital.local - defaultuserpwd: 'Luand@1219', //tabteste@006, + 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 aab83843c..34a46fc86 100644 --- a/version/git-version.ts +++ b/version/git-version.ts @@ -1,12 +1,12 @@ export let versionData = { - "shortSHA": "39f1884aa", - "SHA": "39f1884aac462aefbe93eec560febe4636b13b1a", + "shortSHA": "f83ef8201", + "SHA": "f83ef8201fffa4d964d7293d17004c90e6429d7d", "branch": "no_bug_movemente", "lastCommitAuthor": "'Peter Maquiran'", - "lastCommitTime": "'Thu Jan 19 12:05:14 2023 +0100'", - "lastCommitMessage": "fix create action mobile", - "lastCommitNumber": "4661", + "lastCommitTime": "'Thu Jan 19 12:47:00 2023 +0100'", + "lastCommitMessage": "fix chat", + "lastCommitNumber": "4662", "change": "", - "changeStatus": "On branch no_bug_movemente\nChanges to be committed:\n (use \"git restore --staged ...\" to unstage)\n\tmodified: package-lock.json\n\tmodified: package.json\n\tmodified: src/app/services/auth.service.ts\n\tmodified: src/app/services/chat/chat-system.service.ts\n\tmodified: src/app/shared/popover/event-details-documents-options/event-details-documents-options.page.html", + "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: src/app/modals/profile/profile.page.html\n\tmodified: src/app/pages/agenda/new-event/new-event.page.ts\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/event/attendee-modal/attendee-modal.page.html\n\tmodified: src/app/shared/event/attendee-modal/attendee-modal.page.ts\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\n\tmodified: version/git-version.ts", "changeAuthor": "peter.maquiran" } \ No newline at end of file