mirror of
https://code.equilibrium.co.ao/ITO/doneit-web.git
synced 2026-04-20 21:35:50 +00:00
Improve
This commit is contained in:
@@ -173,9 +173,9 @@
|
|||||||
|
|
||||||
<!-- Timeline -->
|
<!-- Timeline -->
|
||||||
<div>
|
<div>
|
||||||
<div class="timeline-container d-flex" >
|
<div class="timeline-container d-flex py-20" >
|
||||||
|
|
||||||
<div [ngSwitch]="view" class="ss-timeline timeline-mobile flex-grow-1 d-md-none">
|
<!-- <div [ngSwitch]="view" class="ss-timeline timeline-mobile flex-grow-1 d-md-none">
|
||||||
<mwl-calendar-day-view
|
<mwl-calendar-day-view
|
||||||
*ngSwitchCase="'day'"
|
*ngSwitchCase="'day'"
|
||||||
[viewDate]="viewDate"
|
[viewDate]="viewDate"
|
||||||
@@ -203,6 +203,134 @@
|
|||||||
(eventClicked)="clearContact();eventClicked($event)"
|
(eventClicked)="clearContact();eventClicked($event)"
|
||||||
>
|
>
|
||||||
</mwl-calendar-day-view>
|
</mwl-calendar-day-view>
|
||||||
|
</div> -->
|
||||||
|
|
||||||
|
<!-- <div class="ss-timeline timeline-mobile flex-grow-1 text-black d-md-none">
|
||||||
|
<div *ngFor="let events of TimelineMDList | keyvalue; let i = index ">
|
||||||
|
{{ i }}
|
||||||
|
<div *ngFor="let event of events">
|
||||||
|
{{ event.Subject}}
|
||||||
|
</div>
|
||||||
|
|
||||||
|
</div>
|
||||||
|
</div> -->
|
||||||
|
|
||||||
|
<div class="ss-timeline timeline-mobile flex-grow-1 d-md-none text-black pl-20" >
|
||||||
|
<div *ngFor="let events of TimelineMDList | keyvalue;" >
|
||||||
|
|
||||||
|
<div >
|
||||||
|
<div class="day mt-10">
|
||||||
|
{{ TimelineDayEvent(events.key)}}
|
||||||
|
</div>
|
||||||
|
|
||||||
|
<div *ngFor="let event of events.value" >
|
||||||
|
|
||||||
|
|
||||||
|
<div class="d-flex content-{{event.Profile}}-{{event.event.CalendarName}} mt-10 cursor-pointer width-100 " (click)="eventClicked(event)" *ngIf="eventListVisible(event.start)">
|
||||||
|
<div class="schedule-time" *ngIf="!event.event.IsAllDayEvent">
|
||||||
|
|
||||||
|
<div *ngIf="!event.endMany && !event.middle" class="time-start">{{event.event.StartDate | date: 'HH:mm'}}</div>
|
||||||
|
<div *ngIf="event.endMany && !event.middle" class="time-start">--</div>
|
||||||
|
|
||||||
|
<div *ngIf="!event.startMany && !event.middle" class="time-end">{{event.event.EndDate | date: 'HH:mm'}}</div>
|
||||||
|
<div *ngIf="event.startMany && !event.middle" class="time-end"> -- </div>
|
||||||
|
|
||||||
|
<div *ngIf="event.middle" class="time-start"> Todo </div>
|
||||||
|
<div *ngIf="event.middle" class="time-end text-center"> o dia </div>
|
||||||
|
|
||||||
|
</div>
|
||||||
|
<div class="schedule-time" *ngIf="event.event.IsAllDayEvent">
|
||||||
|
<div class="time-start">Todo</div>
|
||||||
|
<div class="time-end text-center">o dia</div>
|
||||||
|
</div>
|
||||||
|
<div class="schedule-details">
|
||||||
|
{{ event.event.CalendarName }}
|
||||||
|
<div class="location">{{event.event.Location}}</div>
|
||||||
|
<div class="description">{{event.event.Subject}}</div>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
|
||||||
|
<div class="fs-timeline flex-grow-1 d-none d-md-block d-md-block text-black pl-20 pr-20" *ngIf="loggeduser.Profile == 'MDGPR'">
|
||||||
|
<div *ngFor="let events of TimelineMDList | keyvalue;" >
|
||||||
|
|
||||||
|
<div >
|
||||||
|
<div class="day mt-10">
|
||||||
|
{{ TimelineDayEvent(events.key)}}
|
||||||
|
</div>
|
||||||
|
|
||||||
|
<div *ngFor="let event of events.value" >
|
||||||
|
|
||||||
|
<div class="d-flex content-mdgpr-{{event.event.CalendarName}} mt-10 cursor-pointer" (click)="eventClicked(event)">
|
||||||
|
<div class="schedule-time" *ngIf="!event.event.IsAllDayEvent">
|
||||||
|
<div *ngIf="!event.endMany && !event.middle" class="time-start">{{event.event.StartDate | date: 'HH:mm'}}</div>
|
||||||
|
<div *ngIf="event.endMany && !event.middle" class="time-start">--</div>
|
||||||
|
|
||||||
|
<div *ngIf="!event.startMany && !event.middle" class="time-end">{{event.event.EndDate | date: 'HH:mm'}}</div>
|
||||||
|
<div *ngIf="event.startMany && !event.middle" class="time-end"> -- </div>
|
||||||
|
|
||||||
|
<div *ngIf="event.middle" class="time-start"> Todo </div>
|
||||||
|
<div *ngIf="event.middle" class="time-end text-center"> o dia </div>
|
||||||
|
|
||||||
|
</div>
|
||||||
|
<div class="schedule-time" *ngIf="event.event.IsAllDayEvent">
|
||||||
|
<div class="time-start">Todo</div>
|
||||||
|
<div class="time-end">o dia</div>
|
||||||
|
</div>
|
||||||
|
<div class="schedule-details">
|
||||||
|
<div class="location">{{event.event.Location}}</div>
|
||||||
|
<div class="description">{{event.event.Subject}}</div>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
|
||||||
|
<div class="sd-timeline flex-grow-1 d-none d-md-block timeline-md text-black pr-20" >
|
||||||
|
<div *ngFor="let events of TimelinePRList | keyvalue;">
|
||||||
|
|
||||||
|
<div >
|
||||||
|
|
||||||
|
<div class="day mt-10">
|
||||||
|
{{ TimelineDayEvent(events.key)}}
|
||||||
|
</div>
|
||||||
|
|
||||||
|
<div *ngFor="let event of events.value" >
|
||||||
|
|
||||||
|
<div class="d-flex content-pr-{{event.event.CalendarName}} mt-10 cursor-pointer" (click)="eventClicked(event)">
|
||||||
|
<div class="schedule-time" *ngIf="!event.event.IsAllDayEvent">
|
||||||
|
<div *ngIf="!event.endMany && !event.middle" class="time-start">{{event.event.StartDate | date: 'HH:mm'}}</div>
|
||||||
|
<div *ngIf="event.endMany && !event.middle" class="time-start">--</div>
|
||||||
|
|
||||||
|
<div *ngIf="!event.startMany && !event.middle" class="time-end">{{event.event.EndDate | date: 'HH:mm'}}</div>
|
||||||
|
<div *ngIf="event.startMany && !event.middle" class="time-end"> -- </div>
|
||||||
|
|
||||||
|
<div *ngIf="event.middle" class="time-start"> Todo </div>
|
||||||
|
<div *ngIf="event.middle" class="time-end text-center"> o dia </div>
|
||||||
|
|
||||||
|
</div>
|
||||||
|
<div class="schedule-time" *ngIf="event.event.IsAllDayEvent">
|
||||||
|
<div class="time-start">Todo</div>
|
||||||
|
<div class="time-end">o dia</div>
|
||||||
|
</div>
|
||||||
|
<div class="schedule-details">
|
||||||
|
<div class="location">{{event.event.Location}}</div>
|
||||||
|
<div class="description">{{event.event.Subject}}</div>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
|
||||||
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
</div>
|
</div>
|
||||||
|
|||||||
@@ -466,6 +466,105 @@ td.monthview-primary-with-event {
|
|||||||
|
|
||||||
|
|
||||||
.timeline-container{
|
.timeline-container{
|
||||||
|
|
||||||
|
.day {
|
||||||
|
font-weight: bold;
|
||||||
|
color: #2e2e2e !important;
|
||||||
|
font-size: 13px;
|
||||||
|
}
|
||||||
|
|
||||||
|
.content-pr-Oficial, .content-pr-Pessoal, .content-mdgpr-Pessoal, .content-mdgpr-Oficial {
|
||||||
|
width: 100% !important;
|
||||||
|
padding: 0px 10px !important;
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
.schedule-time{
|
||||||
|
margin-right: 10px;
|
||||||
|
min-width: 33px;
|
||||||
|
.time-start{
|
||||||
|
color: #797979 !important;
|
||||||
|
font-family: Roboto;
|
||||||
|
font-size: 13px;
|
||||||
|
}
|
||||||
|
.time-end{
|
||||||
|
color: #797979 !important;
|
||||||
|
font-family: Roboto;
|
||||||
|
font-size: 13px;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
.schedule-date{
|
||||||
|
margin-right: 10px;
|
||||||
|
width: 22%;
|
||||||
|
color: #797979 !important;
|
||||||
|
font-size: 13px;
|
||||||
|
}
|
||||||
|
.schedule-details{
|
||||||
|
display: flex;
|
||||||
|
flex-wrap: wrap;
|
||||||
|
align-items: center;
|
||||||
|
width: 100%;
|
||||||
|
.location{
|
||||||
|
font-family: Roboto;
|
||||||
|
font-size: 13px;
|
||||||
|
color: black;
|
||||||
|
width: 100%;
|
||||||
|
|
||||||
|
}
|
||||||
|
.description{
|
||||||
|
font-family: Roboto;
|
||||||
|
font-size: 15px;
|
||||||
|
font-weight: bold;
|
||||||
|
color: #0d89d1;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
.color{
|
||||||
|
width: 5px;
|
||||||
|
height: 40px;
|
||||||
|
border-top-right-radius: 5px;
|
||||||
|
border-bottom-right-radius: 5px;
|
||||||
|
background-color: #f05d5e;
|
||||||
|
}
|
||||||
|
|
||||||
|
.div-content-Oficial{
|
||||||
|
width: 85%;
|
||||||
|
float: left;
|
||||||
|
border-left: 4px solid #cab0dc;
|
||||||
|
padding: 0 0 0 12px;
|
||||||
|
}
|
||||||
|
.div-content-Pessoal{
|
||||||
|
width: 85%;
|
||||||
|
float: left;
|
||||||
|
border-left: 4px solid #cbeecb;
|
||||||
|
padding: 0 0 0 12px;
|
||||||
|
}
|
||||||
|
.div-content-Oficial h3, .div-content-Pessoal h3{
|
||||||
|
font-size: 14pt;
|
||||||
|
/* border: 1px solid red; */
|
||||||
|
}
|
||||||
|
.div-content-Oficial p, .div-content-Pessoal p{
|
||||||
|
font-size: 12pt;
|
||||||
|
color: rgb(94, 92, 92);
|
||||||
|
padding: 0 !important;
|
||||||
|
margin: 0 !important;
|
||||||
|
}
|
||||||
|
|
||||||
|
.content-pr-Pessoal{
|
||||||
|
background-color: var(--white);
|
||||||
|
border-radius: 5px;
|
||||||
|
border-right: 5px solid #958bfc;
|
||||||
|
overflow: auto;
|
||||||
|
}
|
||||||
|
.content-mdgpr-Oficial{
|
||||||
|
border-radius: 5px;
|
||||||
|
border-right: 5px solid #ffb703;
|
||||||
|
overflow: auto;
|
||||||
|
}
|
||||||
|
.content-mdgpr-Pessoal{
|
||||||
|
border-radius: 5px;
|
||||||
|
border-right: 5px solid #f05d5e;
|
||||||
|
overflow: auto;
|
||||||
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -601,3 +700,5 @@ app-approve-event{
|
|||||||
height: 100%;
|
height: 100%;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|||||||
@@ -26,6 +26,7 @@ import { ViewEventPage } from './view-event/view-event.page';
|
|||||||
import { NewEventPage } from './new-event/new-event.page';
|
import { NewEventPage } from './new-event/new-event.page';
|
||||||
import { AuthService } from 'src/app/services/auth.service';
|
import { AuthService } from 'src/app/services/auth.service';
|
||||||
import { User } from 'src/app/models/user.model';
|
import { User } from 'src/app/models/user.model';
|
||||||
|
import { letProto } from 'rxjs-compat/operator/let';
|
||||||
|
|
||||||
@Component({
|
@Component({
|
||||||
selector: 'app-agenda',
|
selector: 'app-agenda',
|
||||||
@@ -65,7 +66,9 @@ export class AgendaPage implements OnInit {
|
|||||||
// for timeline
|
// for timeline
|
||||||
events: CalendarEvent[] = [];
|
events: CalendarEvent[] = [];
|
||||||
TimelinePR: CalendarEvent[] = [];
|
TimelinePR: CalendarEvent[] = [];
|
||||||
|
TimelinePRList = {}
|
||||||
TimelineMD: CalendarEvent[] = [];
|
TimelineMD: CalendarEvent[] = [];
|
||||||
|
TimelineMDList = {}
|
||||||
|
|
||||||
showTimelinePR = false;
|
showTimelinePR = false;
|
||||||
showTimelineMD = false;
|
showTimelineMD = false;
|
||||||
@@ -89,6 +92,7 @@ export class AgendaPage implements OnInit {
|
|||||||
selectedDate: Date;
|
selectedDate: Date;
|
||||||
eventSelectedDate: Date = new Date();
|
eventSelectedDate: Date = new Date();
|
||||||
eventSelectedDate2: Date;
|
eventSelectedDate2: Date;
|
||||||
|
|
||||||
rangeStartDate: Date;
|
rangeStartDate: Date;
|
||||||
rangeEndDate: Date;
|
rangeEndDate: Date;
|
||||||
|
|
||||||
@@ -144,7 +148,7 @@ export class AgendaPage implements OnInit {
|
|||||||
* @description determinant if edit or add event component is open
|
* @description determinant if edit or add event component is open
|
||||||
*/
|
*/
|
||||||
IsEvent: "edit" | "add" | "view";
|
IsEvent: "edit" | "add" | "view";
|
||||||
viewingEventObject: { event: CalendarEvent };
|
viewingEventObject: CalendarEvent ;
|
||||||
loggeduser: User;
|
loggeduser: User;
|
||||||
|
|
||||||
constructor(
|
constructor(
|
||||||
@@ -213,7 +217,7 @@ export class AgendaPage implements OnInit {
|
|||||||
}
|
}
|
||||||
|
|
||||||
// show information about the clicked event in timeline
|
// show information about the clicked event in timeline
|
||||||
eventClicked({ event }: { event: CalendarEvent }): void {
|
eventClicked(event : CalendarEvent): void {
|
||||||
/* console.log('Event clicked', event); */
|
/* console.log('Event clicked', event); */
|
||||||
//clear
|
//clear
|
||||||
|
|
||||||
@@ -223,7 +227,7 @@ export class AgendaPage implements OnInit {
|
|||||||
|
|
||||||
this.IsEvent= "view";
|
this.IsEvent= "view";
|
||||||
|
|
||||||
this.viewingEventObject = {event};
|
this.viewingEventObject = event;
|
||||||
|
|
||||||
this.eventSelectedDate = event.start;
|
this.eventSelectedDate = event.start;
|
||||||
this.selectedEventId = event.id;
|
this.selectedEventId = event.id;
|
||||||
@@ -362,7 +366,7 @@ export class AgendaPage implements OnInit {
|
|||||||
} catch (error) {
|
} catch (error) {
|
||||||
//
|
//
|
||||||
if(!this.showLoader) {
|
if(!this.showLoader) {
|
||||||
this.selectFirstEventOfTheDay();
|
//this.selectFirstEventOfTheDay();
|
||||||
}
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
@@ -377,6 +381,10 @@ export class AgendaPage implements OnInit {
|
|||||||
return momentG(new Date(),'dd MMMM yyyy', 'pt') == momentG(this.eventSelectedDate,'dd MMMM yyyy', 'pt');
|
return momentG(new Date(),'dd MMMM yyyy', 'pt') == momentG(this.eventSelectedDate,'dd MMMM yyyy', 'pt');
|
||||||
}
|
}
|
||||||
|
|
||||||
|
momentG(date, formate , wgs) {
|
||||||
|
return momentG(date, formate , wgs)
|
||||||
|
}
|
||||||
|
|
||||||
// for timeline
|
// for timeline
|
||||||
timeLineTemplate(startTime: string, eventlocation: string, eventDiscription: any, calendarName: string, subject: string, startTimeWisthS: string, endTime: string, eventIndex: number, profile: string): string{
|
timeLineTemplate(startTime: string, eventlocation: string, eventDiscription: any, calendarName: string, subject: string, startTimeWisthS: string, endTime: string, eventIndex: number, profile: string): string{
|
||||||
|
|
||||||
@@ -512,15 +520,25 @@ export class AgendaPage implements OnInit {
|
|||||||
index: eventIndex,
|
index: eventIndex,
|
||||||
profile: profile,
|
profile: profile,
|
||||||
CalendarName: element.CalendarName,
|
CalendarName: element.CalendarName,
|
||||||
|
event: element,
|
||||||
|
Subject: element.Subject
|
||||||
});
|
});
|
||||||
|
|
||||||
});
|
});
|
||||||
|
|
||||||
|
|
||||||
return events;
|
return events;
|
||||||
}
|
}
|
||||||
|
|
||||||
eventFilter(){}
|
eventFilter() {}
|
||||||
|
|
||||||
|
TimelineDayEvent(day): string {
|
||||||
|
return (day).padStart(2, '0') +' '+this.viewTitle
|
||||||
|
}
|
||||||
|
|
||||||
|
get calendarDay(): string {
|
||||||
|
|
||||||
|
return ((new Date(this.timelineDate)).getDate()).toString().padStart(2,'0')
|
||||||
|
}
|
||||||
|
|
||||||
loadRangeEvents(startTime: Date, endTime: Date){
|
loadRangeEvents(startTime: Date, endTime: Date){
|
||||||
|
|
||||||
@@ -536,7 +554,6 @@ export class AgendaPage implements OnInit {
|
|||||||
case "Combinado":
|
case "Combinado":
|
||||||
//Inicializa o array eventSource
|
//Inicializa o array eventSource
|
||||||
//this.eventSource=[];
|
//this.eventSource=[];
|
||||||
|
|
||||||
|
|
||||||
if(this.profile == "mdgpr" && this.loggeduser.Profile == 'MDGPR' ) {
|
if(this.profile == "mdgpr" && this.loggeduser.Profile == 'MDGPR' ) {
|
||||||
this.eventService.getAllMdEvents( momentG(new Date(startTime),'yyyy-MM-dd HH:mm:ss'), momentG(new Date(endTime),'yyyy-MM-dd 23:59:59') ).subscribe(
|
this.eventService.getAllMdEvents( momentG(new Date(startTime),'yyyy-MM-dd HH:mm:ss'), momentG(new Date(endTime),'yyyy-MM-dd 23:59:59') ).subscribe(
|
||||||
@@ -563,9 +580,13 @@ export class AgendaPage implements OnInit {
|
|||||||
|
|
||||||
const list = this.timelineFilter(this.timelineFilterState, this.eventsList, 'md');
|
const list = this.timelineFilter(this.timelineFilterState, this.eventsList, 'md');
|
||||||
|
|
||||||
|
this.TimelineMDList = this.eventListBox(list)
|
||||||
|
|
||||||
this.events = list;
|
this.events = list;
|
||||||
// optional
|
// optional
|
||||||
this.TimelineMD = list;
|
this.TimelineMD = list;
|
||||||
|
|
||||||
|
console.log('TimelineMD', this.TimelineMD)
|
||||||
|
|
||||||
this.myCal.update();
|
this.myCal.update();
|
||||||
this.myCal.loadEvents();
|
this.myCal.loadEvents();
|
||||||
@@ -602,9 +623,10 @@ export class AgendaPage implements OnInit {
|
|||||||
});
|
});
|
||||||
|
|
||||||
});
|
});
|
||||||
|
|
||||||
|
|
||||||
const list = this.timelineFilter(this.timelineFilterState, this.eventsList, 'pr');
|
const list = this.timelineFilter(this.timelineFilterState, this.eventsList, 'pr');
|
||||||
|
|
||||||
|
this.TimelineMDList = this.eventListBox(list)
|
||||||
|
|
||||||
this.events = list;
|
this.events = list;
|
||||||
|
|
||||||
@@ -627,6 +649,8 @@ export class AgendaPage implements OnInit {
|
|||||||
case "Pessoal":
|
case "Pessoal":
|
||||||
//Inicializa o array eventSource
|
//Inicializa o array eventSource
|
||||||
|
|
||||||
|
alert('pessoal')
|
||||||
|
|
||||||
if(this.profile == "mdgpr" && this.loggeduser.Profile == 'MDGPR') {
|
if(this.profile == "mdgpr" && this.loggeduser.Profile == 'MDGPR') {
|
||||||
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.eventService.getAllMdEvents(momentG(new Date(startTime),'yyyy-MM-dd HH:mm:ss'), momentG(new Date(endTime),'yyyy-MM-dd 23:59:59')).subscribe(response => {
|
||||||
|
|
||||||
@@ -651,6 +675,10 @@ export class AgendaPage implements OnInit {
|
|||||||
|
|
||||||
const list = this.timelineFilter(this.timelineFilterState, this.eventsListPessoal, 'md');
|
const list = this.timelineFilter(this.timelineFilterState, this.eventsListPessoal, 'md');
|
||||||
|
|
||||||
|
|
||||||
|
this.TimelineMDList = this.eventListBox(list)
|
||||||
|
|
||||||
|
|
||||||
this.events = list;
|
this.events = list;
|
||||||
this.TimelineMD = list;
|
this.TimelineMD = list;
|
||||||
|
|
||||||
@@ -682,6 +710,9 @@ export class AgendaPage implements OnInit {
|
|||||||
});
|
});
|
||||||
|
|
||||||
const list = this.timelineFilter(this.timelineFilterState, this.eventsListPessoal, 'pr');
|
const list = this.timelineFilter(this.timelineFilterState, this.eventsListPessoal, 'pr');
|
||||||
|
|
||||||
|
|
||||||
|
this.TimelineMDList = this.eventListBox(list)
|
||||||
|
|
||||||
this.events = list;
|
this.events = list;
|
||||||
// optional
|
// optional
|
||||||
@@ -700,6 +731,8 @@ export class AgendaPage implements OnInit {
|
|||||||
break;
|
break;
|
||||||
|
|
||||||
case "Oficial":
|
case "Oficial":
|
||||||
|
|
||||||
|
alert('Oficial')
|
||||||
//Inicializa o array eventSource
|
//Inicializa o array eventSource
|
||||||
this.eventsListOficial = [];
|
this.eventsListOficial = [];
|
||||||
|
|
||||||
@@ -721,8 +754,11 @@ export class AgendaPage implements OnInit {
|
|||||||
});
|
});
|
||||||
|
|
||||||
const list = this.timelineFilter(this.timelineFilterState, this.eventsListOficial, 'md');
|
const list = this.timelineFilter(this.timelineFilterState, this.eventsListOficial, 'md');
|
||||||
|
|
||||||
|
this.TimelineMDList = this.eventListBox(list)
|
||||||
|
|
||||||
this.events = list;
|
this.events = list;
|
||||||
|
// Petencial error
|
||||||
this.TimelinePR = list;
|
this.TimelinePR = list;
|
||||||
|
|
||||||
this.myCal.update();
|
this.myCal.update();
|
||||||
@@ -750,10 +786,11 @@ export class AgendaPage implements OnInit {
|
|||||||
});
|
});
|
||||||
});
|
});
|
||||||
|
|
||||||
|
|
||||||
const list = this.timelineFilter(this.timelineFilterState, this.eventsListOficial, 'pr');
|
const list = this.timelineFilter(this.timelineFilterState, this.eventsListOficial, 'pr');
|
||||||
|
|
||||||
|
|
||||||
|
this.TimelineMDList = this.eventListBox(list)
|
||||||
|
|
||||||
this.events = list;
|
this.events = list;
|
||||||
// optional
|
// optional
|
||||||
this.TimelinePR = list;
|
this.TimelinePR = list;
|
||||||
@@ -783,59 +820,60 @@ 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(
|
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 => {
|
response => {
|
||||||
|
|
||||||
|
if(this.segment == 'Oficial') {
|
||||||
if(this.segment == 'Oficial') {
|
this.eventsList = response.filter(data => data.CalendarName == "Oficial");
|
||||||
this.eventsList = response.filter(data => data.CalendarName == "Oficial");
|
} else if (this.segment == 'Pessoal') {
|
||||||
} else if (this.segment == 'Pessoal') {
|
this.eventsList = response.filter(data => data.CalendarName == "Pessoal");
|
||||||
this.eventsList = response.filter(data => data.CalendarName == "Pessoal");
|
} else {
|
||||||
} else {
|
this.eventsList = response;
|
||||||
this.eventsList = response;
|
}
|
||||||
}
|
|
||||||
|
|
||||||
this.eventSource= this.eventSource.filter(e => e.profile != 'md');
|
this.eventSource= this.eventSource.filter(e => e.profile != 'md');
|
||||||
// loop
|
// loop
|
||||||
this.eventsList.forEach((element, eventIndex) => {
|
this.eventsList.forEach((element, eventIndex) => {
|
||||||
|
|
||||||
|
// calendar
|
||||||
|
this.eventSource.push({
|
||||||
|
index: eventIndex,
|
||||||
|
title: element.Subject,
|
||||||
|
startTime: new Date(element.StartDate),
|
||||||
|
endTime: new Date(element.EndDate),
|
||||||
|
allDay: false,
|
||||||
|
event: element,
|
||||||
|
calendarName: element.CalendarName,
|
||||||
|
profile: 'md',
|
||||||
|
id: element.EventId,
|
||||||
|
});
|
||||||
|
|
||||||
|
});
|
||||||
|
|
||||||
// calendar
|
const MDEventList = this.timelineFilter(this.timelineFilterState, this.eventsList, 'md');
|
||||||
this.eventSource.push({
|
|
||||||
index: eventIndex,
|
|
||||||
title: element.Subject,
|
|
||||||
startTime: new Date(element.StartDate),
|
this.TimelineMDList = this.eventListBox(MDEventList, 'md')
|
||||||
endTime: new Date(element.EndDate),
|
|
||||||
allDay: false,
|
this.events = MDEventList;
|
||||||
event: element,
|
this.TimelineMD = MDEventList;
|
||||||
calendarName: element.CalendarName,
|
|
||||||
profile: 'md',
|
this.myCal.update();
|
||||||
id: element.EventId,
|
this.myCal.loadEvents();
|
||||||
});
|
|
||||||
|
this.showTimelineMD = true;
|
||||||
});
|
|
||||||
|
counter++;
|
||||||
const MDEventList = this.timelineFilter(this.timelineFilterState, this.eventsList, 'md');
|
if(counter==2){
|
||||||
|
this.showLoader = false;
|
||||||
this.events = MDEventList;
|
this.timelineBoxCorrectHeight(500);
|
||||||
this.TimelineMD = MDEventList;
|
this.centralizeTimeline(500);
|
||||||
|
}
|
||||||
this.myCal.update();
|
|
||||||
this.myCal.loadEvents();
|
|
||||||
|
|
||||||
this.showTimelineMD = true;
|
|
||||||
|
|
||||||
counter++;
|
|
||||||
if(counter==2){
|
|
||||||
this.showLoader = false;
|
|
||||||
this.timelineBoxCorrectHeight(500);
|
|
||||||
this.centralizeTimeline(500);
|
|
||||||
}
|
|
||||||
|
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
this.eventService.getAllPrEvents(momentG(new Date(startTime),'yyyy-MM-dd HH:mm:ss'), momentG(new Date(endTime),'yyyy-MM-dd 23:59:59')).subscribe(
|
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 => {
|
response => {
|
||||||
|
|
||||||
|
|
||||||
if(this.segment == 'Oficial') {
|
if(this.segment == 'Oficial') {
|
||||||
this.eventsList = response.filter(data => data.CalendarName == "Oficial");
|
this.eventsList = response.filter(data => data.CalendarName == "Oficial");
|
||||||
} else if (this.segment == 'Pessoal') {
|
} else if (this.segment == 'Pessoal') {
|
||||||
@@ -848,7 +886,7 @@ export class AgendaPage implements OnInit {
|
|||||||
|
|
||||||
this.eventsList.forEach((element, eventIndex) => {
|
this.eventsList.forEach((element, eventIndex) => {
|
||||||
|
|
||||||
// calendar
|
// calendar
|
||||||
this.eventSource.push({
|
this.eventSource.push({
|
||||||
index: eventIndex,
|
index: eventIndex,
|
||||||
title: element.Subject,
|
title: element.Subject,
|
||||||
@@ -865,6 +903,9 @@ export class AgendaPage implements OnInit {
|
|||||||
|
|
||||||
this.TimelinePR = this.timelineFilter(this.timelineFilterState, this.eventsList, 'pr');
|
this.TimelinePR = this.timelineFilter(this.timelineFilterState, this.eventsList, 'pr');
|
||||||
|
|
||||||
|
|
||||||
|
this.TimelinePRList = this.eventListBox(this.TimelinePR)
|
||||||
|
|
||||||
this.myCal.update();
|
this.myCal.update();
|
||||||
this.myCal.loadEvents();
|
this.myCal.loadEvents();
|
||||||
|
|
||||||
@@ -883,6 +924,162 @@ export class AgendaPage implements OnInit {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
eventListBox(list, nice?) {
|
||||||
|
let days = {};
|
||||||
|
|
||||||
|
list.forEach( (event:any)=> {
|
||||||
|
|
||||||
|
var startDate = new Date(event.start);
|
||||||
|
var endDate = new Date(event.end);
|
||||||
|
|
||||||
|
const day = (((new Date (event.start)).getDate())).toString().padStart(2,'0')
|
||||||
|
|
||||||
|
event.manyDays = false
|
||||||
|
|
||||||
|
if ( (new Date (this.viewDate).getMonth()) == (new Date(event.start).getMonth()) ) {
|
||||||
|
|
||||||
|
if(!days.hasOwnProperty(day)) {
|
||||||
|
days[day] = []
|
||||||
|
}
|
||||||
|
|
||||||
|
var Difference_In_Days = endDate.getDate() - startDate.getDate()
|
||||||
|
|
||||||
|
if ( endDate.getTime() > startDate.getTime() && Difference_In_Days <= 50 && !event.event.IsAllDayEvent ) {
|
||||||
|
if (Difference_In_Days >= 1) {
|
||||||
|
|
||||||
|
if(nice == 'md') {
|
||||||
|
console.log('md', event)
|
||||||
|
}
|
||||||
|
|
||||||
|
const StartEvent = Object.assign({}, {
|
||||||
|
title: event.title,
|
||||||
|
start: event.start,
|
||||||
|
end: event.end,
|
||||||
|
color: event.color,
|
||||||
|
id: event.id,
|
||||||
|
index: event.index,
|
||||||
|
profile: event.profile,
|
||||||
|
CalendarName: event.CalendarName,
|
||||||
|
event: {
|
||||||
|
Subject: event.event.Subject,
|
||||||
|
StartDate: event.event.StartDate,
|
||||||
|
EndDate: event.event.EndDate,
|
||||||
|
Location: event.event.Location,
|
||||||
|
EventId: event.event.EventId,
|
||||||
|
CalendarName: event.event.CalendarName
|
||||||
|
},
|
||||||
|
startMany: true,
|
||||||
|
endMany: false,
|
||||||
|
middle: false
|
||||||
|
})
|
||||||
|
|
||||||
|
days[day].push(StartEvent)
|
||||||
|
|
||||||
|
|
||||||
|
let i = 1;
|
||||||
|
|
||||||
|
while (startDate.getFullYear() != endDate.getFullYear() ||
|
||||||
|
startDate.getMonth() != endDate.getMonth() ||
|
||||||
|
startDate.getDate() != endDate.getDate()) {
|
||||||
|
|
||||||
|
const newDate = startDate.setDate(startDate.getDate()+ i)
|
||||||
|
|
||||||
|
let otherDays = (((new Date (newDate)).getDate())).toString().padStart(2,'0')
|
||||||
|
|
||||||
|
|
||||||
|
event.other = true
|
||||||
|
|
||||||
|
event.start = newDate
|
||||||
|
if(!days.hasOwnProperty(otherDays)) {
|
||||||
|
|
||||||
|
|
||||||
|
days[otherDays] = []
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
if (!(startDate.getFullYear() != endDate.getFullYear() ||
|
||||||
|
startDate.getMonth() != endDate.getMonth() ||
|
||||||
|
startDate.getDate() != endDate.getDate())) {
|
||||||
|
// last push
|
||||||
|
|
||||||
|
const EndEvent = Object.assign({}, {
|
||||||
|
title: event.title,
|
||||||
|
start: event.start,
|
||||||
|
end: event.end,
|
||||||
|
color: event.color,
|
||||||
|
id: event.id,
|
||||||
|
index: event.index,
|
||||||
|
profile: event.profile,
|
||||||
|
CalendarName: event.CalendarName,
|
||||||
|
event: {
|
||||||
|
Subject: event.event.Subject,
|
||||||
|
StartDate: event.event.StartDate,
|
||||||
|
EndDate: event.event.EndDate,
|
||||||
|
Location: event.event.Location,
|
||||||
|
EventId: event.event.EventId,
|
||||||
|
CalendarName: event.event.CalendarName
|
||||||
|
},
|
||||||
|
Subject: event.Subject,
|
||||||
|
startMany: false,
|
||||||
|
endMany: true,
|
||||||
|
middle: false
|
||||||
|
})
|
||||||
|
|
||||||
|
days[otherDays].push(EndEvent)
|
||||||
|
|
||||||
|
} else {
|
||||||
|
const EndEvent = Object.assign({}, {
|
||||||
|
title: event.title,
|
||||||
|
start: event.start,
|
||||||
|
end: event.end,
|
||||||
|
color: event.color,
|
||||||
|
id: event.id,
|
||||||
|
index: event.index,
|
||||||
|
profile: event.profile,
|
||||||
|
CalendarName: event.CalendarName,
|
||||||
|
event: {
|
||||||
|
Subject: event.event.Subject,
|
||||||
|
StartDate: event.event.StartDate,
|
||||||
|
EndDate: event.event.EndDate,
|
||||||
|
Location: event.event.Location,
|
||||||
|
EventId: event.event.EventId,
|
||||||
|
CalendarName: event.event.CalendarName
|
||||||
|
},
|
||||||
|
Subject: event.Subject,
|
||||||
|
startMany: false,
|
||||||
|
endMany: true,
|
||||||
|
middle: true
|
||||||
|
})
|
||||||
|
days[otherDays].push(EndEvent)
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
}
|
||||||
|
|
||||||
|
} else {
|
||||||
|
days[day].push(event)
|
||||||
|
|
||||||
|
}
|
||||||
|
} else {
|
||||||
|
days[day].push(event)
|
||||||
|
|
||||||
|
}
|
||||||
|
|
||||||
|
}
|
||||||
|
|
||||||
|
})
|
||||||
|
|
||||||
|
return days
|
||||||
|
}
|
||||||
|
|
||||||
|
eventListVisible(event) {
|
||||||
|
return momentG(event,'MMMM yyyy') == momentG(this.calendar.currentDate, 'MMMM yyyy')
|
||||||
|
}
|
||||||
|
|
||||||
|
log(event) {
|
||||||
|
console.log(event)
|
||||||
|
}
|
||||||
|
|
||||||
// for timeline select the first event in the timeline
|
// for timeline select the first event in the timeline
|
||||||
selectFirstEventOfTheDay(){
|
selectFirstEventOfTheDay(){
|
||||||
|
|
||||||
@@ -895,15 +1092,15 @@ export class AgendaPage implements OnInit {
|
|||||||
|
|
||||||
|
|
||||||
let filterDate = sortedDate.filter((e) => {
|
let filterDate = sortedDate.filter((e) => {
|
||||||
console.log( e.startTime.toLocaleDateString('en-US'),' == ',this.eventSelectedDate.toLocaleDateString('en-US'));
|
//console.log( e.startTime.toLocaleDateString('en-US'),' == ',this.eventSelectedDate.toLocaleDateString('en-US'));
|
||||||
return e.startTime.toLocaleDateString('en-US') == this.eventSelectedDate.toLocaleDateString('en-US');
|
return e.startTime.toLocaleDateString('en-US') == this.eventSelectedDate.toLocaleDateString('en-US');
|
||||||
});
|
});
|
||||||
|
|
||||||
console.log('Event -- ',filterDate[filterDate.length - 1], filterDate['startTime']);
|
// console.log('Event -- ',filterDate[filterDate.length - 1], filterDate['startTime']);
|
||||||
|
|
||||||
const firstEventStartHours = new Date(filterDate[filterDate.length - 1].startTime).getHours();
|
const firstEventStartHours = new Date(filterDate[filterDate.length - 1].startTime).getHours();
|
||||||
|
|
||||||
console.log('firstEventStartHours-- ', firstEventStartHours)
|
// console.log('firstEventStartHours-- ', firstEventStartHours)
|
||||||
|
|
||||||
if(firstEventStartHours) {
|
if(firstEventStartHours) {
|
||||||
const scrollContainer = document.querySelector('.timeline-wrapper');
|
const scrollContainer = document.querySelector('.timeline-wrapper');
|
||||||
@@ -929,11 +1126,11 @@ export class AgendaPage implements OnInit {
|
|||||||
}, 250)
|
}, 250)
|
||||||
}
|
}
|
||||||
|
|
||||||
showAlert(){
|
showAlert() {
|
||||||
this.alertController.presentAlert("Funcionalidade em desenvolvimento.");
|
this.alertController.presentAlert("Funcionalidade em desenvolvimento.");
|
||||||
}
|
}
|
||||||
|
|
||||||
changeProfile(){
|
changeProfile() {
|
||||||
|
|
||||||
if(this.profile == "mdgpr"){
|
if(this.profile == "mdgpr"){
|
||||||
console.log('pr');
|
console.log('pr');
|
||||||
|
|||||||
@@ -66,7 +66,7 @@ export class FingerprintPage implements OnInit {
|
|||||||
// this.badRequest()
|
// this.badRequest()
|
||||||
// });
|
// });
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
async successMessage(message?: string) {
|
async successMessage(message?: string) {
|
||||||
|
|
||||||
|
|||||||
@@ -15,6 +15,7 @@ var month = [
|
|||||||
]
|
]
|
||||||
|
|
||||||
var week = new Array('Domingo', 'Segunda', 'Terça', 'Quarta', 'Quinta', 'Sexta', 'Sábado');
|
var week = new Array('Domingo', 'Segunda', 'Terça', 'Quarta', 'Quinta', 'Sexta', 'Sábado');
|
||||||
|
var weekV = new Array('Do', 'Seg', 'Terç', 'Qua', 'Qui', 'Sex', 'Sáb');
|
||||||
|
|
||||||
class momentG {
|
class momentG {
|
||||||
static run(date, formate , wgs){
|
static run(date, formate , wgs){
|
||||||
@@ -37,7 +38,8 @@ class momentG {
|
|||||||
MM : (date.getMonth()+1).toString().padStart(2,"0"),
|
MM : (date.getMonth()+1).toString().padStart(2,"0"),
|
||||||
HH : date.getHours().toString().padStart(2,"0"),
|
HH : date.getHours().toString().padStart(2,"0"),
|
||||||
yy: date.getFullYear().toString().slice(2,4).padStart(2,"0") ,
|
yy: date.getFullYear().toString().slice(2,4).padStart(2,"0") ,
|
||||||
EEEE : week[date.getDay()].padStart(2,"0") ,
|
EEEE : week[date.getDay()].padStart(2,"0") ,
|
||||||
|
EEEEV : weekV[date.getDay()].padStart(2,"0") ,
|
||||||
MMMM : month[date.getMonth()],
|
MMMM : month[date.getMonth()],
|
||||||
yyyy : date.getFullYear() ,
|
yyyy : date.getFullYear() ,
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user