From e6c417ee3e7ee3ba5fdd53ecf3c5fc8dff177a6b Mon Sep 17 00:00:00 2001 From: Peter Maquiran Date: Thu, 1 Apr 2021 14:19:00 +0100 Subject: [PATCH 1/4] Improve attendee scroll bar --- src/app/pages/agenda/agenda.page.html | 1 - .../shared/agenda/edit-event/edit-event.component.html | 10 ++++++---- .../shared/agenda/edit-event/edit-event.component.scss | 9 ++++++++- .../shared/agenda/new-event/new-event.component.scss | 6 ++++++ 4 files changed, 20 insertions(+), 6 deletions(-) diff --git a/src/app/pages/agenda/agenda.page.html b/src/app/pages/agenda/agenda.page.html index a5213dbde..60edf220b 100644 --- a/src/app/pages/agenda/agenda.page.html +++ b/src/app/pages/agenda/agenda.page.html @@ -369,7 +369,6 @@ (cloneAllmobileComponent)="viewEventDetailDismiss($event)" > -> -
-
+
+
-
- +
+ + +
diff --git a/src/app/shared/agenda/edit-event/edit-event.component.scss b/src/app/shared/agenda/edit-event/edit-event.component.scss index 6e6fc7e2f..fcb66c717 100644 --- a/src/app/shared/agenda/edit-event/edit-event.component.scss +++ b/src/app/shared/agenda/edit-event/edit-event.component.scss @@ -165,4 +165,11 @@ ion-content{ color:red; } - } \ No newline at end of file + } + + +.container-div{ + ion-textarea{ + height: 81px; + } +} \ No newline at end of file diff --git a/src/app/shared/agenda/new-event/new-event.component.scss b/src/app/shared/agenda/new-event/new-event.component.scss index be8370be6..9cdd3e022 100644 --- a/src/app/shared/agenda/new-event/new-event.component.scss +++ b/src/app/shared/agenda/new-event/new-event.component.scss @@ -171,3 +171,9 @@ ion-content{ } + +.container-div{ + ion-textarea{ + height: 81px; + } +} \ No newline at end of file From 81f9c3108f1d422d596f13f20cc5302321e5e1f4 Mon Sep 17 00:00:00 2001 From: Peter Maquiran Date: Thu, 1 Apr 2021 14:44:12 +0100 Subject: [PATCH 2/4] Fixe agenda create event list all attendees --- .../agenda/new-event/new-event.component.html | 10 ++++++---- .../agenda/new-event/new-event.component.ts | 17 ++++++----------- 2 files changed, 12 insertions(+), 15 deletions(-) diff --git a/src/app/shared/agenda/new-event/new-event.component.html b/src/app/shared/agenda/new-event/new-event.component.html index a22f074da..f4cd0dfdc 100644 --- a/src/app/shared/agenda/new-event/new-event.component.html +++ b/src/app/shared/agenda/new-event/new-event.component.html @@ -129,16 +129,18 @@
-
+
+
- Adicionar participantes - + Adicionar intervenientes + {{participant.Name}}
-
+ +
diff --git a/src/app/shared/agenda/new-event/new-event.component.ts b/src/app/shared/agenda/new-event/new-event.component.ts index 499a2ce7e..aa44eb056 100644 --- a/src/app/shared/agenda/new-event/new-event.component.ts +++ b/src/app/shared/agenda/new-event/new-event.component.ts @@ -3,7 +3,6 @@ import { EventBody } from 'src/app/models/eventbody.model'; import { EventPerson } from 'src/app/models/eventperson.model'; import { EventsService } from 'src/app/services/events.service'; import { Event } from 'src/app/models/event.model'; -import { AttendeesPage } from 'src/app/pages/events/attendees/attendees.page'; import { ModalController } from '@ionic/angular'; @Component({ @@ -34,12 +33,7 @@ export class NewEventPage implements OnInit { constructor( private modalController: ModalController, private eventService: EventsService, - ) { - - - - - } + ) {} ngOnInit() { @@ -49,7 +43,7 @@ export class NewEventPage implements OnInit { this.eventBody = { BodyType : "1", Text : ""}; this.postEvent.Body = this.eventBody; - console.log(this.profile); + /* console.log(this.profile); */ let selectedStartdDate = this.selectedDate; let selectedEndDate = new Date(this.selectedDate); @@ -114,7 +108,9 @@ export class NewEventPage implements OnInit { } save(){ - + + this.postEvent.Attendees = this.eventAttendees; + if(this.profile=='mdgpr'){ this.eventService.postEventMd(this.postEvent, this.postEvent.CalendarName).subscribe(); } @@ -128,8 +124,7 @@ export class NewEventPage implements OnInit { this.GoBackEditOrAdd.emit(); } - async openAttendees(data: any) - { + async openAttendees(){ this.saveTemporaryData(); this.openAttendeesComponent.emit(); From 3d229ade11af9f73c792b01979d8995792553336 Mon Sep 17 00:00:00 2001 From: Peter Maquiran Date: Thu, 1 Apr 2021 15:26:26 +0100 Subject: [PATCH 3/4] improve gabinete digital add .. --- .../expedient-task-modal.page.ts | 146 ++++++++++-------- .../agenda/new-event/new-event.component.html | 2 +- .../attendee-modal/attendee-modal.page.ts | 5 + .../header-no-search.page.html | 2 +- 4 files changed, 88 insertions(+), 67 deletions(-) diff --git a/src/app/pages/gabinete-digital/expediente/expedient-task-modal/expedient-task-modal.page.ts b/src/app/pages/gabinete-digital/expediente/expedient-task-modal/expedient-task-modal.page.ts index 1034261b4..a9678402e 100644 --- a/src/app/pages/gabinete-digital/expediente/expedient-task-modal/expedient-task-modal.page.ts +++ b/src/app/pages/gabinete-digital/expediente/expedient-task-modal/expedient-task-modal.page.ts @@ -7,7 +7,6 @@ import { Participant } from 'src/app/models/participant.model'; import { Folder } from 'src/app/models/folder.model'; import { AuthService } from 'src/app/services/auth.service'; import { ProcessesService } from 'src/app/services/processes.service'; -import { StorageService } from 'src/app/services/storage.service'; import { AddParticipantsCcModalPage } from '../add-participants-cc-modal/add-participants-cc-modal.page'; import { AddParticipantsModalPage } from '../add-participants-modal/add-participants-modal.page'; import { environment } from 'src/environments/environment'; @@ -40,10 +39,11 @@ export class ExpedientTaskModalPage implements OnInit { dispatchFolder: Folder; participants: Participant[]; - contacts: EventPerson[] = []; + contacts= []; // trigger hide and show for attendee component showAttendees= false; + adding: "intervenient" | "CC" constructor( private modalController: ModalController, @@ -78,17 +78,8 @@ export class ExpedientTaskModalPage implements OnInit { ngOnInit() { this.taskDate = new Date(this.task.taskStartDate); - /* this.authService.userData$.subscribe((res:any)=>{ - console.log(res); - }); - console.log(this.user); */ - /* console.log(this.task) */ - - /* console.log(this.task.serialNumber); */ - this.getAttachments(); - /* console.log(this.getSubjectType()); */ - + this.getAttachments(); } close(){ @@ -159,63 +150,78 @@ export class ExpedientTaskModalPage implements OnInit { } async addParticipants(){ - const modal = await this.modalController.create({ - component: AddParticipantsModalPage, - componentProps: { - eventPersons: this.participants - }, - cssClass: 'add-participants-modal', - backdropDismiss: false - }); - await modal.present(); - modal.onDidDismiss().then((res) => { - this.taskParticipants = res.data; - let newattendees: EventPerson[] = res['data']; - if(newattendees!= null){ - newattendees.forEach(newattendee => { - let att = { - 'UserEmail': newattendee.EmailAddress, - 'UserType': 'I', - }; - if(this.participants == null){ - this.participants = new Array(); - } - this.participants.push(att); + + this.adding = "intervenient"; + this.contacts = this.taskParticipants; + + if(window.innerWidth <=1024){ + const modal = await this.modalController.create({ + component: AddParticipantsModalPage, + componentProps: { + eventPersons: this.participants + }, + cssClass: 'add-participants-modal', + backdropDismiss: false }); - } - this.postData.UsersSelected = this.participants; - console.log(this.postData); - }); + await modal.present(); + modal.onDidDismiss().then((res) => { + this.taskParticipants = res.data; + let newattendees: EventPerson[] = res['data']; + if(newattendees!= null){ + newattendees.forEach(newattendee => { + let att = { + 'UserEmail': newattendee.EmailAddress, + 'UserType': 'I', + }; + if(this.participants == null){ + this.participants = new Array(); + } + this.participants.push(att); + }); + } + this.postData.UsersSelected = this.participants; + console.log(this.postData); + }); + } else { + + } } async addParticipantsCc(){ - const modal = await this.modalController.create({ - component: AddParticipantsCcModalPage, - componentProps: { - eventPersons: this.participants - }, - cssClass: 'add-participants-cc-modal', - backdropDismiss: false - }); - await modal.present(); - modal.onDidDismiss().then((res) => { - this.taskParticipantsCc = res.data; - let newattendees: EventPerson[] = res['data']; - if(newattendees!= null){ - newattendees.forEach(newattendee => { - let att = { - 'UserEmail': newattendee.EmailAddress, - 'UserType': 'CC', - }; - if(this.participants == null){ - this.participants = new Array(); - } - this.participants.push(att); + + this.adding = "CC"; + this.contacts = this.taskParticipantsCc; + + if(window.innerWidth <=1024){ + const modal = await this.modalController.create({ + component: AddParticipantsCcModalPage, + componentProps: { + eventPersons: this.participants + }, + cssClass: 'add-participants-cc-modal', + backdropDismiss: false }); - } - this.postData.UsersSelected = this.participants; - console.log(this.postData); - }); + await modal.present(); + modal.onDidDismiss().then((res) => { + this.taskParticipantsCc = res.data; + let newattendees: EventPerson[] = res['data']; + if(newattendees!= null){ + newattendees.forEach(newattendee => { + let att = { + 'UserEmail': newattendee.EmailAddress, + 'UserType': 'CC', + }; + if(this.participants == null){ + this.participants = new Array(); + } + this.participants.push(att); + }); + } + this.postData.UsersSelected = this.participants; + console.log(this.postData); + }); + } + } async distartExpedientModal(){ @@ -236,7 +242,17 @@ export class ExpedientTaskModalPage implements OnInit { } async setContact(data:EventPerson[]){ - this.contacts = data; + + if(this.adding == "intervenient"){ + console.log('intervenient') + this.contacts = data; + this.taskParticipants = data; + } else if (this.adding == "CC") { + + console.log('CCCC') + this.taskParticipantsCc = data; + } + } async closeComponent(){ diff --git a/src/app/shared/agenda/new-event/new-event.component.html b/src/app/shared/agenda/new-event/new-event.component.html index f4cd0dfdc..ba1953a6c 100644 --- a/src/app/shared/agenda/new-event/new-event.component.html +++ b/src/app/shared/agenda/new-event/new-event.component.html @@ -134,7 +134,7 @@
- Adicionar intervenientes + Adicionar intervenientes {{participant.Name}} 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 c5a7d8acf..60743606b 100644 --- a/src/app/shared/event/attendee-modal/attendee-modal.page.ts +++ b/src/app/shared/event/attendee-modal/attendee-modal.page.ts @@ -10,6 +10,7 @@ import { EventPerson } from 'src/app/models/eventperson.model'; }) export class AttendeeModalPage implements OnInit { + // Defined by the API contacts: EventPerson[]; showLoader: boolean = false; selectedContact: EventPerson[] =[]; @@ -28,6 +29,10 @@ export class AttendeeModalPage implements OnInit { this.fetchContacts(""); this.selectedContact = this.eventAttendees; } + + ngOnChanges(){ + console.log('change !!!') + } save(){ // set data to agenda component diff --git a/src/app/shared/headers/header-no-search/header-no-search.page.html b/src/app/shared/headers/header-no-search/header-no-search.page.html index d28efc73d..746cfb579 100644 --- a/src/app/shared/headers/header-no-search/header-no-search.page.html +++ b/src/app/shared/headers/header-no-search/header-no-search.page.html @@ -39,7 +39,7 @@
- Ações + Acções
From 88bbb1ce18a9714b10b554b10852acdfb6846540 Mon Sep 17 00:00:00 2001 From: Peter Maquiran Date: Thu, 1 Apr 2021 15:35:05 +0100 Subject: [PATCH 4/4] Fixe spelling --- src/app/shared/header/header.page.html | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/src/app/shared/header/header.page.html b/src/app/shared/header/header.page.html index cc80d9061..c582a9ab8 100644 --- a/src/app/shared/header/header.page.html +++ b/src/app/shared/header/header.page.html @@ -11,7 +11,6 @@
-
@@ -40,7 +39,7 @@
- Ações + Acções