From 753fbf1fad5de9121f50b1e1540220276e734297 Mon Sep 17 00:00:00 2001 From: Peter Maquiran Date: Fri, 20 Jan 2023 15:45:46 +0100 Subject: [PATCH 1/5] 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 2/5] 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 3/5] 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 4/5] 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 5/5] 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