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