diff --git a/src/app/pages/agenda/agenda.page.scss b/src/app/pages/agenda/agenda.page.scss index 0f61d69fc..a1301e52d 100644 --- a/src/app/pages/agenda/agenda.page.scss +++ b/src/app/pages/agenda/agenda.page.scss @@ -60,7 +60,6 @@ ion-slide{ .title-content{ width: 360px; margin: 0px auto; - overflow: auto; padding: 0 !important; background: #ecf8ff; } @@ -258,21 +257,18 @@ td.monthview-primary-with-event { background-color: white !important; } .header-title{ - width: 300px; font-family: Roboto; font-size: 25px; margin: 0 5px 0 25px; padding: 0; /* color:#ffffff; */ color:#000; - float: left; } .div-top-header{ width: 400px; margin: 0 auto; background-color: #0782c9; - overflow: auto; padding-top: 15px; border: 0!important; diff --git a/src/app/pages/agenda/edit-event/edit-event.page.ts b/src/app/pages/agenda/edit-event/edit-event.page.ts index fe1ce1e8c..a9b3dd04a 100644 --- a/src/app/pages/agenda/edit-event/edit-event.page.ts +++ b/src/app/pages/agenda/edit-event/edit-event.page.ts @@ -38,7 +38,6 @@ export class EditEventPage implements OnInit { private modalController: ModalController, private navParams: NavParams, private eventsService: EventsService, - private alertService: AlertService, public alertController: AlertController, ) { this.isEventEdited = false; @@ -61,10 +60,10 @@ export class EditEventPage implements OnInit { } - if(this.postEvent.IsRecurring == false){ + if(this.postEvent.IsRecurring == false) { this.isRecurring = "Não se repete"; } - else{ + else { this.isRecurring = "Repete"; } this.profile = this.navParams.get('profile'); @@ -81,11 +80,11 @@ export class EditEventPage implements OnInit { } - close(){ + close() { this.modalController.dismiss(); } - save(){ + save() { this.postEvent.Attendees = this.taskParticipants.concat(this.taskParticipantsCc) @@ -152,7 +151,6 @@ export class EditEventPage implements OnInit { this.openAttendees(); } - dynamicSetIntervenient({taskParticipants, taskParticipantsCc}){ this.taskParticipants = taskParticipants; this.taskParticipantsCc = taskParticipantsCc; diff --git a/src/app/pages/gabinete-digital/expediente/book-meeting-modal/book-meeting-modal.module.ts b/src/app/pages/gabinete-digital/expediente/book-meeting-modal/book-meeting-modal.module.ts index e89e2d7be..aa4ed1f1b 100644 --- a/src/app/pages/gabinete-digital/expediente/book-meeting-modal/book-meeting-modal.module.ts +++ b/src/app/pages/gabinete-digital/expediente/book-meeting-modal/book-meeting-modal.module.ts @@ -7,6 +7,7 @@ import { IonicModule } from '@ionic/angular'; import { BookMeetingModalPageRoutingModule } from './book-meeting-modal-routing.module'; import { BookMeetingModalPage } from './book-meeting-modal.page'; +import { AttendeeModalPage } from 'src/app/shared/event/attendee-modal/attendee-modal.page'; @NgModule({ imports: [ @@ -15,6 +16,9 @@ import { BookMeetingModalPage } from './book-meeting-modal.page'; IonicModule, BookMeetingModalPageRoutingModule ], - declarations: [BookMeetingModalPage] + declarations: [ + BookMeetingModalPage, + AttendeeModalPage + ] }) export class BookMeetingModalPageModule {} diff --git a/src/app/pages/gabinete-digital/expediente/book-meeting-modal/book-meeting-modal.page.html b/src/app/pages/gabinete-digital/expediente/book-meeting-modal/book-meeting-modal.page.html index a37497c9f..b2869674c 100644 --- a/src/app/pages/gabinete-digital/expediente/book-meeting-modal/book-meeting-modal.page.html +++ b/src/app/pages/gabinete-digital/expediente/book-meeting-modal/book-meeting-modal.page.html @@ -1,191 +1,197 @@ - - -
-
+
+ +
-
- -
+
+ +
+ +
-
-
-
- +
+
+
+ +
+
+ +
-
- + + + Campo obrigatório + + +
+ +
+
+
+ +
+
+ + Oficial + Pessoal + +
- - - Campo obrigatório - -
- -
+
- - Oficial - Pessoal - + + +
-
+
-
-
-
- -
-
- - - -
-
-
- -
-
-
- -
-
- - - -
-
-
- -
-
-
- -
-
- - Não se repete - Repete - - -
-
-
- -
-
-
- -
-
-
- - - Adicionar intervenientes - {{participant.Name}} - - -
-
- +
+
+
+ +
+
+ + + +
-
-
-
-
-
- -
-
-
- - - Com conhecimento - {{participant.Name}} - - -
-
- +
+
+
+ +
+
+ + Não se repete + Repete + + +
-
-
-
-
-
- +
+
+
+ +
+
+
+ + + Adicionar intervenientes + {{participant.Name}} + + +
+
+ +
+
+
-
- + +
+
+
+ +
+
+
+ + + Com conhecimento + {{participant.Name}} + + +
+
+ +
+
+
+
+ +
+
+
+ +
+
+ +
+
+
+ + + +
+ + Documentos Anexados + + + + +

{{attachment.Description}}

+

{{attachment.Stakeholders}} {{ attachment.CreateDate | date: 'dd/MM/yyyy' }}

+ + +
+
- - -
- - Documentos Anexados - - - - -

{{attachment.Description}}

-

{{attachment.Stakeholders}} {{ attachment.CreateDate | date: 'dd/MM/yyyy' }}

- - - -
-
-
+
+ +
diff --git a/src/app/pages/gabinete-digital/expediente/book-meeting-modal/book-meeting-modal.page.scss b/src/app/pages/gabinete-digital/expediente/book-meeting-modal/book-meeting-modal.page.scss index 5dd6dbf71..92855e48c 100644 --- a/src/app/pages/gabinete-digital/expediente/book-meeting-modal/book-meeting-modal.page.scss +++ b/src/app/pages/gabinete-digital/expediente/book-meeting-modal/book-meeting-modal.page.scss @@ -4,7 +4,6 @@ float: left; .header-content{ - overflow: auto; } .header-title{ font-family: Roboto; 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 ba265a73b..6d2e3b961 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 @@ -16,18 +16,25 @@ import { AttachmentsService } from 'src/app/services/attachments.service'; templateUrl: './book-meeting-modal.page.html', styleUrls: ['./book-meeting-modal.page.scss'], }) + export class BookMeetingModalPage implements OnInit { + task: any; - taskParticipants: any; - taskParticipantsCc: any; + + taskParticipants: EventPerson[] = []; + taskParticipantsCc: EventPerson[] = []; + taskDocId:string; loadedAttachments:any; + adding: "intervenient" | "CC" = "intervenient"; + postData: Event; eventBody: EventBody; eventAttendees: EventPerson[]; formLocationSatus: boolean = false; + showAttendees= false; constructor( private modalController: ModalController, @@ -50,18 +57,19 @@ export class BookMeetingModalPage implements OnInit { let selectedEndDate = new Date(); /* this.postData.EndDate = new Date(selectedEndDate.setMinutes(new Date().getMinutes() + 30)); */ + + } ngOnInit() { - console.log(this.task) - console.log(this.task.SerialNumber); + this.adding = "intervenient"; + this.getAttachments(); } getAttachments(){ this.attachmentsService.getAttachmentsBySerial(this.task.SerialNumber).subscribe(res=>{ this.loadedAttachments = res; - console.log(res); }); } @@ -108,74 +116,88 @@ export class BookMeetingModalPage implements OnInit { } async addParticipants(){ - const modal = await this.modalController.create({ - component: AddParticipantsModalPage, - componentProps: { - eventPersons: this.eventAttendees - }, - cssClass: 'book-meeting-modal', - backdropDismiss: false - }); - await modal.present(); + if(window.innerWidth <= 800){ + const modal = await this.modalController.create({ + component: AddParticipantsModalPage, + componentProps: { + eventPersons: this.eventAttendees + }, + cssClass: 'book-meeting-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 = { + "EmailAddress": newattendee.EmailAddress, + "Name": newattendee.Name, + "IsRequired": true + }; + if (this.eventAttendees == null) + { + this.eventAttendees = new Array(); + } + this.eventAttendees.push(att); + }); + } + this.postData.Attendees = this.eventAttendees; + }); + } else { + + this.showAttendees = true; + } - modal.onDidDismiss().then((res) => { - this.taskParticipants = res.data; - let newattendees: EventPerson[] = res['data']; - if (newattendees != null) - { - newattendees.forEach(newattendee => { - let att = { - "EmailAddress": newattendee.EmailAddress, - "Name": newattendee.Name, - "IsRequired": true - }; - if (this.eventAttendees == null) - { - this.eventAttendees = new Array(); - } - this.eventAttendees.push(att); - }); - } - this.postData.Attendees = this.eventAttendees; - }); } - async addParticipantsCc(){ - const modal = await this.modalController.create({ - component: AddParticipantsCcModalPage, - componentProps: { - eventPersons: this.eventAttendees - }, - cssClass: 'add-participants-cc-modal', - backdropDismiss: false - }); + async addParticipantsCc() { + + this.adding = "CC"; - await modal.present(); - - modal.onDidDismiss().then((res) => { - this.taskParticipantsCc = res.data; - let newattendees: EventPerson[] = res['data']; - - - if (newattendees != null) - { - newattendees.forEach(newattendee => { - let att = { - "EmailAddress": newattendee.EmailAddress, - "Name": newattendee.Name, - "IsRequired": false - }; - if (this.eventAttendees == null) - { - this.eventAttendees = new Array(); - } - this.eventAttendees.push(att); - - }); - } - this.postData.Attendees = this.eventAttendees; - }); + if(window.innerWidth <= 800) { + const modal = await this.modalController.create({ + component: AddParticipantsCcModalPage, + componentProps: { + eventPersons: this.eventAttendees + }, + 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 = { + "EmailAddress": newattendee.EmailAddress, + "Name": newattendee.Name, + "IsRequired": false + }; + if (this.eventAttendees == null) + { + this.eventAttendees = new Array(); + } + this.eventAttendees.push(att); + + }); + } + this.postData.Attendees = this.eventAttendees; + }); + } else { + this.showAttendees = true; + } } async distartExpedientModal(){ @@ -192,6 +214,7 @@ export class BookMeetingModalPage implements OnInit { modal.onDidDismiss(); } + validateFormInputs(){ let formLocation = this.postData.Location.trim(); if(!this.postData.Location && formLocation.length <= 0){ @@ -199,4 +222,10 @@ export class BookMeetingModalPage implements OnInit { } } -} + dynamicSetIntervenient({taskParticipants, taskParticipantsCc}){ + + this.taskParticipants = taskParticipants; + this.taskParticipantsCc = taskParticipantsCc; + } + +} \ No newline at end of file diff --git a/src/app/pages/gabinete-digital/gabinete-digital.page.html b/src/app/pages/gabinete-digital/gabinete-digital.page.html index e44e8b198..14273edd9 100644 --- a/src/app/pages/gabinete-digital/gabinete-digital.page.html +++ b/src/app/pages/gabinete-digital/gabinete-digital.page.html @@ -14,7 +14,7 @@
Gabinete Digital -
@@ -66,6 +66,22 @@

- Documentos

+ +
+
+ +
+

Expediente Presidente

+

- Documentos

+
+
+
+ +
+

Despacho do Presidente da República

+

- Documentos

+
+
diff --git a/src/app/pages/gabinete-digital/gabinete-digital.page.scss b/src/app/pages/gabinete-digital/gabinete-digital.page.scss index 2445e16f0..3a3b9b069 100644 --- a/src/app/pages/gabinete-digital/gabinete-digital.page.scss +++ b/src/app/pages/gabinete-digital/gabinete-digital.page.scss @@ -115,11 +115,12 @@ ion-content{ //justify-content: center; } .exp-card-long{ - width: 100%; + width: 360px; margin: 7px 20px; border-radius: 15px; background-color: #ffffff !important; padding: 7px; + border: blue !important; .center-div{ width: fit-content; @@ -201,7 +202,16 @@ ion-content{ } - +@media only screen and (min-width: 561px) { + .exp-card-long{ + width: 547px !important; + } +} +@media only screen and (min-width: 749px) { + .exp-card-long{ + width: 734px !important; + } +} @media only screen and (min-width: 801px) { @@ -215,6 +225,10 @@ ion-content{ .aside{ background:transparent; + + .d-none{ + display: block; + } } .aside-title{ font-family: Roboto; @@ -232,6 +246,7 @@ ion-content{ } .exp-card-long{ + display: none !important; width: 100% !important; .center-div{ @@ -299,7 +314,16 @@ ion-content{ //display: none; margin-top: 0px !important; } - } + } + .exp-card:visited{ + background: blue; + } + .exp-card:hover{ + background: blue; + } +} +.btn-refresh:visited{ + background: blue !important; } @media only screen and (min-width: 1024px){ .content{ diff --git a/src/app/shared/agenda/edit-event/edit-event.component.ts b/src/app/shared/agenda/edit-event/edit-event.component.ts index da53048fc..30af0bd18 100644 --- a/src/app/shared/agenda/edit-event/edit-event.component.ts +++ b/src/app/shared/agenda/edit-event/edit-event.component.ts @@ -53,7 +53,6 @@ export class EditEventComponent implements OnInit { } // attendees list - alert(JSON.stringify(this.postEvent.Attendees)) if(this.postEvent.Attendees != null) { this.postEvent.Attendees.forEach(e =>{ if(e.IsRequired) { @@ -96,12 +95,12 @@ export class EditEventComponent implements OnInit { this.postEvent.Attendees = this.taskParticipants.concat(this.taskParticipantsCc); await this.eventsService.editEvent(this.postEvent, 2, 3).subscribe(async () => { - /* const alert = await this.alertController.create({ + const alert = await this.alertController.create({ cssClass: 'my-custom-class', header: 'Evento actualizado', buttons: ['OK'] }); - await alert.present(); */ + await alert.present(); }); 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 0480d24ee..cafc69fd9 100644 --- a/src/app/shared/event/attendee-modal/attendee-modal.page.ts +++ b/src/app/shared/event/attendee-modal/attendee-modal.page.ts @@ -44,10 +44,12 @@ export class AttendeeModalPage implements OnInit { if(this.taskParticipantsCc == null || this.taskParticipantsCc == undefined) { this.taskParticipantsCc = []; } - + } - ngOnChanges(event){} + ngOnChanges(event){ + + } save(){ this.setIntervenient.emit(this.taskParticipants); @@ -61,6 +63,32 @@ export class AttendeeModalPage implements OnInit { this.setIntervenient.emit(this.taskParticipants); this.setIntervenientCC.emit(this.taskParticipantsCc); } + + console.log('data', this.taskParticipants, this.taskParticipantsCc ); + this.dynamicSetIntervenient.emit({ + taskParticipants: this.taskParticipants, + taskParticipantsCc: this.taskParticipantsCc + }) + } + + async selectContact(itm: EventPerson){ + + if(this.adding == "intervenient") { + + itm.IsRequired = true; + this.taskParticipants.push(itm); + + } else if (this.adding == "CC") { + + itm.IsRequired = false; + this.taskParticipantsCc.push(itm); + } else { + // alert('bug') + } + + // run only in gabinete digital + + this.setContactWithClose(); } close(){ @@ -130,32 +158,11 @@ export class AttendeeModalPage implements OnInit { }); } - - this.dynamicSetIntervenient.emit({ - taskParticipants: this.taskParticipants, - taskParticipantsCc: this.taskParticipantsCc - }) - this.setContactWithClose(); } - async selectContact(itm: EventPerson){ - if(this.adding == "intervenient"){ - - itm.IsRequired = true; - this.taskParticipants.push(itm); - - } else if (this.adding == "CC") { - - itm.IsRequired = false; - this.taskParticipantsCc.push(itm); - } - - // run only in gabinete digital - this.setContactWithClose(); - } async fetchContacts(filter: string) { this.showLoader = true; diff --git a/src/app/shared/popover/chat-options-popover/chat-options-popover.page.html b/src/app/shared/popover/chat-options-popover/chat-options-popover.page.html index 63aa6619e..8471b8e16 100644 --- a/src/app/shared/popover/chat-options-popover/chat-options-popover.page.html +++ b/src/app/shared/popover/chat-options-popover/chat-options-popover.page.html @@ -1,6 +1,8 @@
- +