diff --git a/src/app/pages/agenda/agenda.module.ts b/src/app/pages/agenda/agenda.module.ts index 2812f3dc8..190f44809 100644 --- a/src/app/pages/agenda/agenda.module.ts +++ b/src/app/pages/agenda/agenda.module.ts @@ -16,6 +16,7 @@ import { SharedModule } from 'src/app/shared/shared.module'; import { NewEventPage } from "src/app/shared/agenda/new-event/new-event.component" import { EditEventComponent } from 'src/app/shared/agenda/edit-event/edit-event.component'; import { ViewEventPage } from 'src/app/shared/agenda/view-event/view-event.page'; +import { EventListComponent } from "src/app/shared/agenda/event-list/event-list.component"; registerLocaleData(localeDe); @@ -40,7 +41,8 @@ import { adapterFactory } from 'angular-calendar/date-adapters/date-fns'; AgendaPage, NewEventPage, EditEventComponent, - ViewEventPage + ViewEventPage, + EventListComponent ], schemas: [CUSTOM_ELEMENTS_SCHEMA], providers: [ diff --git a/src/app/pages/agenda/agenda.page.html b/src/app/pages/agenda/agenda.page.html index b92b202a7..521ea4272 100644 --- a/src/app/pages/agenda/agenda.page.html +++ b/src/app/pages/agenda/agenda.page.html @@ -284,11 +284,21 @@
+ +
+ Nenhum evento selecionado +
+ + + +
diff --git a/src/app/pages/agenda/agenda.page.scss b/src/app/pages/agenda/agenda.page.scss index 2de779489..18b0c45da 100644 --- a/src/app/pages/agenda/agenda.page.scss +++ b/src/app/pages/agenda/agenda.page.scss @@ -557,9 +557,9 @@ app-view-event{ } app-edit-even{ - height: 100%; display: flex; - flex-wrap: wrap; + flex-direction: column; + height: 100%; } app-new-event{ @@ -567,4 +567,19 @@ app-new-event{ display: flex; flex-wrap: wrap; flex-direction: column; +} + +app-event-list{ + display: flex; + flex-direction: column; + height: 100%; + height: 100%; + flex-wrap: wrap-reverse; +} + +.nothing-to-show{ + justify-content: center; + display: flex; + align-items: center; + height: 100%; } \ No newline at end of file diff --git a/src/app/pages/agenda/agenda.page.ts b/src/app/pages/agenda/agenda.page.ts index 76b47267b..0d4cb86ba 100644 --- a/src/app/pages/agenda/agenda.page.ts +++ b/src/app/pages/agenda/agenda.page.ts @@ -107,6 +107,7 @@ export class AgendaPage implements OnInit { showAddNewEvent: false, showEditEvent: false, showEventDitails: false, + showEventList: false } constructor( @@ -174,6 +175,8 @@ export class AgendaPage implements OnInit { // this.viewEventDetail(event.id); + this.cloneAllmobileComponent() + if( window.innerWidth <= 1024){ this.router.navigate(["/home/agenda", event.id, 'agenda']); } else { @@ -606,6 +609,8 @@ export class AgendaPage implements OnInit { async openAddEvent() { + await this.cloneAllmobileComponent() + if( window.innerWidth <= 1024){ const modal = await this.modalCtrl.create({ component: NewEventPage, @@ -687,15 +692,24 @@ export class AgendaPage implements OnInit { } async viewEventsToApprove(){ - const modal = await this.modalCtrl.create({ - component: EventListPage, - componentProps:{ - }, - cssClass: 'modal', - backdropDismiss: false - }); - await modal.present(); - modal.onDidDismiss(); + await this.cloneAllmobileComponent() + + if( window.innerWidth <= 1024){ + const modal = await this.modalCtrl.create({ + component: EventListPage, + componentProps:{ + }, + cssClass: 'modal', + backdropDismiss: false + }); + await modal.present(); + modal.onDidDismiss(); + } else { + // hide all components + this.cloneAllmobileComponent(); + this.mobileComponent.showEventList = true; + } + } async cloneAllmobileComponent(){ @@ -704,6 +718,7 @@ export class AgendaPage implements OnInit { showAddNewEvent: false, showEditEvent: false, showEventDitails: false, + showEventList: false } } diff --git a/src/app/pages/agenda/approve-event-modal/approve-event-modal.page.html b/src/app/pages/agenda/approve-event-modal/approve-event-modal.page.html index 3dd5efff9..1e7343919 100644 --- a/src/app/pages/agenda/approve-event-modal/approve-event-modal.page.html +++ b/src/app/pages/agenda/approve-event-modal/approve-event-modal.page.html @@ -4,7 +4,7 @@
- +
diff --git a/src/app/pages/gabinete-digital/event-list/event-list.page.html b/src/app/pages/gabinete-digital/event-list/event-list.page.html index ed50ba2c2..2700b553c 100644 --- a/src/app/pages/gabinete-digital/event-list/event-list.page.html +++ b/src/app/pages/gabinete-digital/event-list/event-list.page.html @@ -4,7 +4,7 @@
- +
+ + + + Seu calendário + + + Presidente da República + + + + + + + + + + + + +
+ +
+ + + +
+
+

{{event.workflowInstanceDataFields.StartDate | date: 'hh:mm'}}

+

{{event.workflowInstanceDataFields.EndDate | date: 'hh:mm'}}

+
+
+

{{event.workflowInstanceDataFields.StartDate | date: 'd/M/yy' }} - {{ event.workflowInstanceDataFields.EndDate | date: 'dd/M/yy'}} | {{event.workflowInstanceDataFields.Location}}

+

{{event.workflowInstanceDataFields.StartDate | date: 'd/M/yy' }} | {{event.workflowInstanceDataFields.Location}}

+

{{event.workflowInstanceDataFields.Subject}}

+
+
+ + + +
+ + +
+ + +
+
+

{{event.workflowInstanceDataFields.StartDate | date: 'hh:mm'}}

+

{{event.workflowInstanceDataFields.EndDate | date: 'hh:mm'}}

+
+
+

{{event.workflowInstanceDataFields.StartDate | date: 'd/M/yy' }} - {{ event.workflowInstanceDataFields.EndDate | date: 'dd/M/yy'}} | {{event.workflowInstanceDataFields.Location}}

+

{{event.workflowInstanceDataFields.StartDate | date: 'd/M/yy' }} | {{event.workflowInstanceDataFields.Location}}

+

{{event.workflowInstanceDataFields.Subject}}

+
+
+ + +
+ +
+ diff --git a/src/app/shared/agenda/event-list/event-list.component.scss b/src/app/shared/agenda/event-list/event-list.component.scss new file mode 100644 index 000000000..cc474d78f --- /dev/null +++ b/src/app/shared/agenda/event-list/event-list.component.scss @@ -0,0 +1,107 @@ +.header-content{ + width: 360px; + overflow: auto; + margin: 0 auto; + padding-top: 25px; + } + .header-icon-left{ + width: 36px; + font-size: 33px; + color: #42b9fe; + float: left; + } + .header-title{ + width: 300px; + font-family: Roboto; + font-size: 25px; + margin: 0 5px 0 5px; + padding: 0; + color:#000; + float: left; + } + ion-item-sliding{ + margin-top: 5px; + } + .Rectangle { + width: 360px; + border-radius: 15px; + box-shadow: 0 0 10px 0 rgba(0, 0, 0, 0.07); + border: solid 1px #e9e9e9; + background-color: var(--white); + margin: 0 auto; + padding: 10px; + margin-bottom: 10px; + overflow: auto; + } + .content-mdgpr-Oficial{ + width: 340px; + border-radius: 5px; + border-right: 5px solid #99e47b; + overflow: auto; + } + .content-mdgpr-Pessoal{ + width: 340px; + border-radius: 5px; + border-right: 5px solid #958bfc; + overflow: auto; + } + .content-pr-Oficial{ + width: 340px; + border-radius: 5px; + border-right: 5px solid #ffb703; + overflow: auto; + } + .content-pr-Pessoal{ + width: 340px; + border-radius: 5px; + border-right: 5px solid #f05d5e; + overflow: auto; + } + + .approve-event-time{ + float: left; + } + .approve-event-time p{ + width: 33px; + font-family: Roboto; + font-size: 13px; + font-weight: normal; + font-stretch: normal; + font-style: normal; + line-height: normal; + letter-spacing: normal; + color: var(--Antartic-grey); + margin: 0; + padding: 0; + } + .approve-event-detail{ + float: left; + margin-left: 10px; + } + .approve-event-detail p{ + width: 250px; + font-family: Roboto; + font-size: 13px; + font-weight: normal; + font-stretch: normal; + font-style: normal; + line-height: normal; + letter-spacing: normal; + color: var(--black); + margin: 0; + padding: 0; + } + .approve-event-detail h3{ + width: 250px; + font-family: Roboto; + font-size: 15px; + font-weight: bold; + font-stretch: normal; + font-style: normal; + line-height: normal; + letter-spacing: normal; + color: #0d89d1; + margin: 0; + padding: 0; + } + \ No newline at end of file diff --git a/src/app/shared/agenda/event-list/event-list.component.spec.ts b/src/app/shared/agenda/event-list/event-list.component.spec.ts new file mode 100644 index 000000000..e054b909d --- /dev/null +++ b/src/app/shared/agenda/event-list/event-list.component.spec.ts @@ -0,0 +1,24 @@ +import { async, ComponentFixture, TestBed } from '@angular/core/testing'; +import { IonicModule } from '@ionic/angular'; + +import { EventListComponent } from './event-list.component'; + +describe('EventListComponent', () => { + let component: EventListComponent; + let fixture: ComponentFixture; + + beforeEach(async(() => { + TestBed.configureTestingModule({ + declarations: [ EventListComponent ], + imports: [IonicModule.forRoot()] + }).compileComponents(); + + fixture = TestBed.createComponent(EventListComponent); + component = fixture.componentInstance; + fixture.detectChanges(); + })); + + it('should create', () => { + expect(component).toBeTruthy(); + }); +}); diff --git a/src/app/shared/agenda/event-list/event-list.component.ts b/src/app/shared/agenda/event-list/event-list.component.ts new file mode 100644 index 000000000..1e2ba3eec --- /dev/null +++ b/src/app/shared/agenda/event-list/event-list.component.ts @@ -0,0 +1,86 @@ +import { Component, OnInit, Input, EventEmitter, Output } from '@angular/core'; +import { EventBody } from 'src/app/models/eventbody.model'; +import { EventPerson } from 'src/app/models/eventperson.model'; +import { Event } from 'src/app/models/event.model'; +import { ProcessesService } from 'src/app/services/processes.service'; +import { ModalController, NavParams } from '@ionic/angular'; +import { ApproveEventModalPage } from 'src/app/pages/agenda/approve-event-modal/approve-event-modal.page'; +import { NavigationEnd, Router } from '@angular/router'; + +@Component({ + selector: 'app-event-list', + templateUrl: './event-list.component.html', + styleUrls: ['./event-list.component.scss'], +}) +export class EventListComponent implements OnInit { + + showLoader: boolean; + eventsPRList: any; + eventsMDGPRList: any; + eventPerson: EventPerson; + eventBody: EventBody; + categories: string[]; + serialnumber:string; + + @Input() segment:string; + @Output() cloneAllmobileComponent = new EventEmitter(); + + + constructor( + private processes:ProcessesService, + private modalController: ModalController, + private router: Router, + ) { } + + ngOnInit() { + + console.log(this.segment); + this.LoadToApproveEvents(); + + this.router.events.forEach((event) => { + if(event instanceof NavigationEnd && event.url == this.router.url) { + this.LoadToApproveEvents(); + } + }); + } + + LoadToApproveEvents(){ + this.showLoader = true; + + this.processes.GetToApprovedEvents('PR','false').subscribe(res=>{ + this.showLoader = false; + this.eventsPRList = res; + }); + this.processes.GetToApprovedEvents('MDGPR','false').subscribe(res=>{ + this.showLoader = false; + this.eventsMDGPRList = res; + }); + } + async openApproveModal(eventSerialNumber){ + const modal = await this.modalController.create({ + component: ApproveEventModalPage, + componentProps:{ + serialNumber: eventSerialNumber, + }, + cssClass: 'cal-modal', + backdropDismiss: false + }); + + await modal.present(); + + modal.onDidDismiss(); + } + doRefresh(event) { + this.LoadToApproveEvents(); + console.log('refresh'); + setTimeout(() => { + event.target.complete(); + }, 2000); + } + close(){ + console.log('close') + this.cloneAllmobileComponent.emit(); + } + + } + \ No newline at end of file