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

Merge branch 'feature/calendar' into developer

Browse Source
This commit is contained in:
tiago.kayaya
2021-03-26 10:54:05 +01:00
parent 558164063e cff95f6d8f
commit 7b3770ce3d
25 changed files with 635 additions and 163 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
+41 -16
View File
@@ -45,7 +45,7 @@
<ion-icon *ngIf="profile == 'mdgpr' " (click)="changeProfile()" class="right-icons d-md-none" src="assets/images/icons-profile-calendar-md.svg"></ion-icon>
<ion-icon *ngIf="profile == 'pr' " (click)="changeProfile()" class="right-icons d-md-none" src="assets/images/icons-profile-calendar-pr.svg"></ion-icon>
<ion-icon (click)="viewEventsToApprove()" class="right-icons" src="assets/images/icons-received-event.svg"></ion-icon>
<ion-icon (click)="openAddEvent()" class="right-icons" src="assets/images/icons-add-new-event.svg" ></ion-icon>
<ion-icon (click)="clearContact();openAddEvent()" class="right-icons" src="assets/images/icons-add-new-event.svg" ></ion-icon>
</ion-row>
</ion-row>
@@ -283,29 +283,27 @@
*ngSwitchCase="'day'"
[viewDate]="viewDate"
[events]="events"
(eventClicked)="eventClicked($event)"
(eventClicked)="clearContact();eventClicked($event)"
>
</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"
[events]="TimelineMD"
(eventClicked)="eventClicked($event)"
(eventClicked)="clearContact();eventClicked($event)"
>
</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"
[events]="TimelinePR"
(eventClicked)="eventClicked($event)"
(eventClicked)="clearContact();eventClicked($event)"
>
</mwl-calendar-day-view>
</div>
@@ -321,12 +319,14 @@
<div *ngIf="(
mobileComponent.showAddNewEvent == false &&
mobileComponent.showEditEvent == false &&
mobileComponent.showEventDitails == false &&
mobileComponent.showEventDetails == false &&
mobileComponent.showEventList == false &&
mobileComponent.showEventToApprove == false
mobileComponent.showEventToApprove == false &&
mobileComponent.showAttendees == false &&
mobileComponent.showAttendeeModal == false
)
"
class="text-black nothing-to-show">
class="text-black nothing-to-show">
Nenhum evento selecionado
</div>
@@ -336,6 +336,11 @@
[selectedSegment]=segment
[selectedDate]="eventSelectedDate"
(onAddEvent)="openAddEventDismiss($event)"
(openAttendeesComponent)="openAttendeesComponent($event)"
(cloneAllmobileComponent)="cloneAllmobileComponent()"
[eventAttendees]="contacts"
(clearContact)="clearContact()"
(setContact)="setContact()"
></app-new-event>
<!-- Edit -->
@@ -343,15 +348,18 @@
[profile]="profile"
[selectedSegment]="segment"
[postEvent]="postEvent"
(cloneAllmobileComponent)="cloneAllmobileComponent($event)"
(cloneAllmobileComponent)="cloneAllmobileComponent()"
(clearContact)="clearContact()"
(openAttendeesComponent)="openAttendeesComponent($event)"
(setContact)="setContact()"
></app-edit-event>
<!-- View -->
<app-view-event *ngIf="mobileComponent.showEventDitails"
<app-view-event *ngIf="mobileComponent.showEventDetails"
[profile]="profile"
[eventId]="selectedEventId"
(viewEventDetailDismiss)="viewEventDetailDismiss($event)"
[eventAttendees]="contacts"
></app-view-event>
@@ -366,13 +374,30 @@
<app-approve-event class="d-flex flex-column" *ngIf="mobileComponent.showEventToApprove" [class.transparent]="mobileComponent.transparentEventToApprove"
[serialNumber] = "eventToaprove.serialNumber"
(cloneAllmobileComponent)="viewEventDetailDismiss($event)"
(closeEventToApprove)="closeEventToApprove($event)"
(closeEventToApprove)="closeEventToApprove()"
(AproveEventEditEvent)="AproveEventEditEvent($event)"
[eventAttendees]="contacts"
>
</app-approve-event>
<app-attendees
class="d-flex flex-column height-100"
*ngIf="mobileComponent.showAttendees"
(openAttendeeModal)="openAttendeeModal()"
[eventAttendees]="contacts"
(openAddEvent)="openAddEvent($event)"
(GoBackEditOrAdd)="GoBackEditOrAdd()"
>
</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
+115 -25
View File
@@ -9,6 +9,8 @@ import { Router, NavigationEnd } from '@angular/router';
import { AlertService } from 'src/app/services/alert.service';
import { momentG } from 'src/plugin/momentG';
import { DomSanitizer } from "@angular/platform-browser";
import { EventPerson } from 'src/app/models/eventperson.model';
// showTimeline
import { setHours, setMinutes } from 'date-fns';
@@ -48,6 +50,8 @@ export class AgendaPage implements OnInit {
timelineDate: string;
contacts: EventPerson[]
setView(view: CalendarView) {
this.view = view;
}
@@ -99,6 +103,9 @@ export class AgendaPage implements OnInit {
eventsListPessoal: Event[];
eventsListOficial: Event[];
// this will make toggle add event and.
showEventEditOrOpen: "edit" | "add" | "" = ""
prEventList: Event[];
mdEventList: Event[];
@@ -107,14 +114,16 @@ export class AgendaPage implements OnInit {
startTime: Date;
endTime: Date;
mobileComponent: any = {
mobileComponent = {
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 +138,7 @@ export class AgendaPage implements OnInit {
private modalCtrl: ModalController,
private eventService: EventsService,
private router: Router,
private alertCrontroller: AlertService,
private alertController: AlertService,
private sanitizer: DomSanitizer
) {
@@ -198,17 +207,24 @@ export class AgendaPage implements OnInit {
// this.viewEventDetail(event.id);
this.cloneAllmobileComponent()
this.cloneAllmobileComponent();
this.showEventEditOrOpen = 'edit';
if( window.innerWidth <= 1024){
this.router.navigate(["/home/agenda", event.id, 'agenda']);
this.viewEventDetail(event.id)
//this.router.navigate(["/home/agenda", event.id, 'agenda']);
} else {
this.cloneAllmobileComponent();
this.mobileComponent.showEventDitails = true;
this.mobileComponent.showEventDetails = true;
}
}
//Show information of the event
async onEventSelected(ev: { event: Event}){
this.viewEventDetail(ev.event.EventId);
@@ -369,7 +385,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);
@@ -380,15 +396,23 @@ export class AgendaPage implements OnInit {
document.querySelectorAll('.fs-timeline .timeline-box').forEach(ele => {
if(ele.className.indexOf(`timeline-box-event-${eventIndex}`)>=0){
ele.setAttribute('style',`height:${minutes}px`);
if(ele['offsetHeight'] <= minutes){
ele.setAttribute('style',`height:${minutes}px`);
}
}
// 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']);
@@ -629,11 +653,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),
@@ -643,10 +670,11 @@ export class AgendaPage implements OnInit {
profile: 'md'
});
});
this.events = this.timelineFilter(this.timelineFilterState, this.eventsList, 'md');
this.TimelineMD = this.timelineFilter(this.timelineFilterState, this.eventsList, 'md');
this.events = this.timelineFilter(this.timelineFilterState, this.eventsList, 'md');
this.myCal.update();
this.myCal.loadEvents();
@@ -660,10 +688,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),
@@ -705,7 +737,7 @@ export class AgendaPage implements OnInit {
}, 250)
}
showAlert(){
this.alertCrontroller.presentAlert("Funcionalidade em desenvolvimento.");
this.alertController.presentAlert("Funcionalidade em desenvolvimento.");
}
changeProfile(){
@@ -727,7 +759,9 @@ export class AgendaPage implements OnInit {
async openAddEvent() {
await this.cloneAllmobileComponent()
await this.cloneAllmobileComponent();
this.showEventEditOrOpen = 'add';
if( window.innerWidth <= 1024){
const modal = await this.modalCtrl.create({
@@ -752,6 +786,12 @@ export class AgendaPage implements OnInit {
}
}
openEditEvent(){
this.showEventEditOrOpen = 'edit';
}
openAddEventDismiss(data){
let postEvent: Event = data;
@@ -772,6 +812,7 @@ export class AgendaPage implements OnInit {
this.cloneAllmobileComponent();
}
// open component
async viewEventDetail(eventId:any) {
console.log(this.profile);
@@ -791,6 +832,7 @@ export class AgendaPage implements OnInit {
});
}
// open component
async viewEventDetailDismiss(data){
await this.cloneAllmobileComponent()
@@ -830,7 +872,7 @@ export class AgendaPage implements OnInit {
this.mobileComponent.showEventList = true;
}
}
}
approveEventDismiss({saveData, serialNumber, action}){
@@ -862,17 +904,16 @@ export class AgendaPage implements OnInit {
}
async cloneAllmobileComponent(){
this.mobileComponent = {
showAddNewEvent: false,
showEditEvent: false,
showEventDitails: false,
showEventList: false,
showEventToApprove: false
}
this.mobileComponent.showAddNewEvent = false;
this.mobileComponent.showEditEvent = false;
this.mobileComponent.showEventDetails = false;
this.mobileComponent.showEventList = false;
this.mobileComponent.showEventToApprove = false;
this.mobileComponent.showAttendees = false;
this.mobileComponent.showAttendeeModal = false;
this.closeEventToApprove();
}
async AproveEventEditEvent(data){
@@ -882,4 +923,53 @@ export class AgendaPage implements OnInit {
this.mobileComponent.showAddNewEvent = true;
}
// open component
async openAttendeesComponent(data){
if(Array.isArray(data)){
if(data.length != 0){
console.log('save!!!',data.length);
console.log(data);
this.contacts = data ;
}
}
this.cloneAllmobileComponent();
this.mobileComponent.showAttendees = true;
}
async clearContact(){
this.contacts = [];
}
async setContact(data:EventPerson[]){
this.contacts = data;
}
async openAttendeeModal(){
this.cloneAllmobileComponent();
this.mobileComponent.showAttendeeModal = true;
}
async GoBackEditOrAdd(){
if(this.showEventEditOrOpen == "edit"){
this.cloneAllmobileComponent();
this.mobileComponent.showEditEvent = true;
} else if(this.showEventEditOrOpen == "add") {
this.cloneAllmobileComponent();
this.mobileComponent.showAddNewEvent = true;
} else {
// do Nothings
}
}
}
src/app/pages/agenda/new-event/new-event.page.scss
+1 -2
View File
@@ -18,10 +18,9 @@ ion-content{
transform: translate3d(0, 1px, 0);
.title-content{
width: 360px;
padding: 0px 20px;
margin: 0px auto;
overflow: auto;
padding: 0 !important;
background: #fff;
.middle{
padding: 0!important;
src/app/pages/agenda/view-event/view-event.page.scss
+1 -2
View File
@@ -25,10 +25,9 @@ ion-menu{
transform: translate3d(0, 1px, 0);
.title-content{
width: 360px;
padding: 0px 20px;
margin: 0px auto;
overflow: auto;
padding: 0 !important;
background: #fff;
.left{