peter/doneit-web
1
0
Fork 0
mirror of https://code.equilibrium.co.ao/ITO/doneit-web.git synced 2026-04-18 20:47:54 +00:00
Code Issues Packages Projects Releases Wiki Activity

Add component in aganda

Browse Source
This commit is contained in:
Peter Maquiran
2021-03-24 15:10:46 +01:00
parent f5ec384100
commit 35102b380d
15 changed files with 266 additions and 58 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/app/pages/agenda/agenda.module.ts
+5 -1
View File
@@ -18,6 +18,8 @@ import { EditEventComponent } from 'src/app/shared/agenda/edit-event/edit-event.
import { ViewEventPage } from 'src/app/shared/agenda/view-event/view-event.page';
import { EventListComponent } from "src/app/shared/agenda/event-list/event-list.component";
import { ApproveEventComponent } from "src/app/shared/agenda/approve-event/approve-event.component";
import { AttendeesPage } from 'src/app/shared/event/attendees/attendees.page';
import { AttendeeModalPage } from 'src/app/shared/event/attendee-modal/attendee-modal.page';
registerLocaleData(localeDe);
@@ -45,7 +47,9 @@ import { adapterFactory } from 'angular-calendar/date-adapters/date-fns';
EditEventComponent,
ViewEventPage,
EventListComponent,
ApproveEventComponent
ApproveEventComponent,
AttendeesPage,
AttendeeModalPage
],
schemas: [CUSTOM_ELEMENTS_SCHEMA],
providers: [
src/app/pages/agenda/agenda.page.html
+19 -8
View File
@@ -288,8 +288,7 @@
</mwl-calendar-day-view>
</div>
<div [ngSwitch]="view" class="fs-timeline flex-grow-1 d-none d-md-block"
*ngIf="showTimelineMD">
<div [ngSwitch]="view" class="fs-timeline flex-grow-1 d-none d-md-block" *ngIf="showTimelineMD">
<mwl-calendar-day-view
*ngSwitchCase="'day'"
[viewDate]="viewDate"
@@ -299,8 +298,7 @@
</mwl-calendar-day-view>
</div>
<div [ngSwitch]="view" class="sd-timeline flex-grow-1 d-none d-md-block timeline-md"
*ngIf="showTimelinePR">
<div [ngSwitch]="view" class="sd-timeline flex-grow-1 d-none d-md-block timeline-md" *ngIf="showTimelinePR">
<mwl-calendar-day-view
*ngSwitchCase="'day'"
[viewDate]="viewDate"
@@ -323,7 +321,8 @@
mobileComponent.showEditEvent == false &&
mobileComponent.showEventDitails == false &&
mobileComponent.showEventList == false &&
mobileComponent.showEventToApprove == false
mobileComponent.showEventToApprove == false &&
mobileComponent.showAttendees == false
)
"
class="text-black nothing-to-show">
@@ -336,6 +335,7 @@
[selectedSegment]=segment
[selectedDate]="eventSelectedDate"
(onAddEvent)="openAddEventDismiss($event)"
(openAttendeesComponent)="openAttendeesComponent($event)"
></app-new-event>
<!-- Edit -->
@@ -344,11 +344,10 @@
[selectedSegment]="segment"
[postEvent]="postEvent"
(cloneAllmobileComponent)="cloneAllmobileComponent($event)"
></app-edit-event>
<!-- View -->
<app-view-event *ngIf="mobileComponent.showEventDitails"
<app-view-event *ngIf="mobileComponent.showEventDetails"
[profile]="profile"
[eventId]="selectedEventId"
(viewEventDetailDismiss)="viewEventDetailDismiss($event)"
@@ -371,8 +370,20 @@
>
</app-approve-event>
<app-attendees
class="d-flex flex-column height-100"
*ngIf="mobileComponent.showAttendees"
(openAttendeeModal)="openAttendeeModal()"
>
</app-attendees>
<app-attendee-modal
class="d-flex flex-column height-100"
*ngIf="mobileComponent.showAttendeeModal"
(openAttendeesComponent)="openAttendeesComponent($event)"
>
</app-attendee-modal>
</div>
src/app/pages/agenda/agenda.page.ts
+41 -16
View File
@@ -110,11 +110,13 @@ export class AgendaPage implements OnInit {
mobileComponent: any = {
showAddNewEvent: false,
showEditEvent: false,
showEventDitails: false,
showEventDetails: false,
showEventList: false,
transparentEventList: false,
transparentEventToApprove: false,
showEventToApprove: false
showEventToApprove: false,
showAttendees: false,
showAttendeeModal: false
}
eventToaprove: any = {
@@ -129,7 +131,7 @@ export class AgendaPage implements OnInit {
private modalCtrl: ModalController,
private eventService: EventsService,
private router: Router,
private alertCrontroller: AlertService,
private alertController: AlertService,
private sanitizer: DomSanitizer
) {
@@ -204,7 +206,7 @@ export class AgendaPage implements OnInit {
this.router.navigate(["/home/agenda", event.id, 'agenda']);
} else {
this.cloneAllmobileComponent();
this.mobileComponent.showEventDitails = true;
this.mobileComponent.showEventDetails = true;
}
}
@@ -369,7 +371,7 @@ export class AgendaPage implements OnInit {
timelineBoxCorrectHeight(timeout){
setTimeout(()=>{
this.eventSource.forEach((el, eventIndex)=>{
this.eventSource.forEach((el:any, eventIndex)=>{
const startEvent = new Date(el.startTime);
const endEvent = new Date(el.endTime);
@@ -382,16 +384,17 @@ export class AgendaPage implements OnInit {
if(ele.className.indexOf(`timeline-box-event-${eventIndex}`)>=0){
ele.setAttribute('style',`height:${minutes}px`);
}
if(`timeline-box-event-${eventIndex}` == `timeline-box-event-3`){
// this event has an contraction time
// if(`timeline-box-event-${eventIndex}` == `timeline-box-event-3`){
// alert(startEvent.toString()+' '+ endEvent.toString());
}
// }
});
});
},timeout)
setTimeout(()=>{
this.TimelinePR.forEach((el, eventIndex)=>{
this.eventSource.forEach((el, eventIndex)=>{
const startEvent = new Date(el['startTime']);
const endEvent = new Date(el['endTime']);
@@ -632,11 +635,14 @@ export class AgendaPage implements OnInit {
this.eventService.getAllMdEvents( momentG(new Date(startTime),'yyyy-MM-dd HH:mm:ss'), momentG(new Date(endTime),'yyyy-MM-dd 23:59:59') ).subscribe(
response => {
this.TimelineMD = [];
this.eventsList = response;
// loop
this.eventsList.forEach((element, eventIndex) => {
this.eventSource.push({
index: eventIndex,
title: element.Subject,
startTime: new Date(element.StartDate),
endTime: new Date(element.EndDate),
@@ -646,13 +652,12 @@ export class AgendaPage implements OnInit {
profile: 'md'
});
});
this.TimelineMD = this.timelineFilter(this.timelineFilterState, this.eventsList, 'md');
// this.eventSource = this.TimelineMD;
this.events = this.timelineFilter(this.timelineFilterState, this.eventsList, 'md');
this.TimelineMD = this.timelineFilter(this.timelineFilterState, this.eventsList, 'md');
this.myCal.update();
this.myCal.loadEvents();
@@ -665,10 +670,14 @@ export class AgendaPage implements OnInit {
this.eventService.getAllPrEvents(momentG(new Date(startTime),'yyyy-MM-dd HH:mm:ss'), momentG(new Date(endTime),'yyyy-MM-dd 23:59:59')).subscribe(
response => {
this.TimelinePR = [];
this.eventsList = response;
this.eventsList.forEach((element, eventIndex) => {
this.eventSource.push({
index: eventIndex,
title: element.Subject,
startTime: new Date(element.StartDate),
endTime: new Date(element.EndDate),
@@ -710,7 +719,7 @@ export class AgendaPage implements OnInit {
}, 250)
}
showAlert(){
this.alertCrontroller.presentAlert("Funcionalidade em desenvolvimento.");
this.alertController.presentAlert("Funcionalidade em desenvolvimento.");
}
changeProfile(){
@@ -777,6 +786,7 @@ export class AgendaPage implements OnInit {
this.cloneAllmobileComponent();
}
// open component
async viewEventDetail(eventId:any) {
console.log(this.profile);
@@ -796,6 +806,7 @@ export class AgendaPage implements OnInit {
});
}
// open component
async viewEventDetailDismiss(data){
await this.cloneAllmobileComponent()
@@ -835,7 +846,7 @@ export class AgendaPage implements OnInit {
this.mobileComponent.showEventList = true;
}
}
}
approveEventDismiss({saveData, serialNumber, action}){
@@ -871,7 +882,7 @@ export class AgendaPage implements OnInit {
this.mobileComponent= {
showAddNewEvent: false,
showEditEvent: false,
showEventDitails: false,
showEventDetails: false,
showEventList: false,
showEventToApprove: false
}
@@ -887,4 +898,18 @@ export class AgendaPage implements OnInit {
this.mobileComponent.showAddNewEvent = true;
}
// open component
async openAttendeesComponent(data){
console.log('open attendees component');
this.cloneAllmobileComponent();
this.mobileComponent.showAttendees = true;
}
async openAttendeeModal(){
this.cloneAllmobileComponent();
this.mobileComponent.showAttendeeModal = true;
}
}