mirror of
https://code.equilibrium.co.ao/ITO/doneit-web.git
synced 2026-04-19 21:06:06 +00:00
fix
This commit is contained in:
@@ -142,11 +142,12 @@ export class ListBoxService {
|
||||
|
||||
let i = 1;
|
||||
|
||||
// create event between date
|
||||
//create event between date
|
||||
while (startDate.getFullYear() != endDate.getFullYear() ||
|
||||
startDate.getMonth() != endDate.getMonth() ||
|
||||
startDate.getDate() != endDate.getDate()) {
|
||||
|
||||
console.log("while", event)
|
||||
const newDate = startDate.setDate(startDate.getDate()+ i)
|
||||
let otherDays = this.dateService.getDay(newDate)
|
||||
|
||||
@@ -162,7 +163,6 @@ export class ListBoxService {
|
||||
startDate.getMonth() != endDate.getMonth() ||
|
||||
startDate.getDate() != endDate.getDate())) {
|
||||
// last push
|
||||
|
||||
const EndEvent = this.transForm(event, {startMany: false, endMany: true, middle: false})
|
||||
if(this.CanPush(event, selectedDate)) {days[otherDays].push(EndEvent) ; this.push(event, year)}
|
||||
|
||||
@@ -188,8 +188,6 @@ export class ListBoxService {
|
||||
if(this.CanPush(event, selectedDate) && diffDays != 2) { days[day].push(event) ; this.push(event, year) }
|
||||
}
|
||||
|
||||
//
|
||||
|
||||
})
|
||||
|
||||
// remove days that haven't event
|
||||
|
||||
@@ -1,4 +1,5 @@
|
||||
import { Injectable } from '@angular/core';
|
||||
import { EventList } from '../models/agenda/AgendaEventList';
|
||||
|
||||
@Injectable({
|
||||
providedIn: 'root'
|
||||
@@ -9,7 +10,7 @@ export class DateService {
|
||||
|
||||
deferenceBetweenDays(start: any, end: any) {
|
||||
const diffTime = Math.abs(end - start);
|
||||
return Math.ceil(diffTime / (1000 * 60 * 60 * 24));
|
||||
return Math.ceil(diffTime / (1000 * 60 * 60 * 24));
|
||||
}
|
||||
|
||||
notSameDate(start: any, end: any): boolean {
|
||||
@@ -25,12 +26,11 @@ export class DateService {
|
||||
const endTimeSamp = new Date(endTime).toLocaleDateString()
|
||||
|
||||
const endMinutes = new Date(endTime).getMinutes()
|
||||
const endHours = new Date(endTime).getHours()
|
||||
const endHours = new Date(endTime).getHours()
|
||||
|
||||
|
||||
if (startTimeSamp < endTimeSamp && (endMinutes + endHours) == 0) {
|
||||
endTime = new Date(endTime);
|
||||
endTime.setSeconds(endTime.getSeconds() - 1);
|
||||
return new Date(endTime)
|
||||
} else {
|
||||
return new Date(endTime)
|
||||
@@ -42,4 +42,25 @@ export class DateService {
|
||||
getDay(date) {
|
||||
return (((new Date (date)).getDate())).toString().padStart(2,'0')
|
||||
}
|
||||
|
||||
|
||||
fixDate(res: EventList) {
|
||||
if(res.IsAllDayEvent && this.deferenceBetweenDays(new Date(res.StartDate), new Date(res.EndDate)) >= 1) {
|
||||
|
||||
const date = new Date(res.EndDate);
|
||||
|
||||
date.setDate(date.getDate() -1);
|
||||
|
||||
const _date = date.getDate();
|
||||
const month = date.getMonth() + 1;
|
||||
const fullYear = date.getFullYear();
|
||||
const formattedDate = `${fullYear}-${month}-${_date} 23:59`;
|
||||
res.EndDate = formattedDate
|
||||
|
||||
console.log('reduze')
|
||||
|
||||
}
|
||||
|
||||
return res as any
|
||||
}
|
||||
}
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
import { Injectable } from '@angular/core';
|
||||
import { Event, EventToApproveEdit } from '../models/event.model';
|
||||
import { Event, EventToApproveEdit, } from '../models/event.model';
|
||||
import { HttpClient, HttpHeaders, HttpParams } from '@angular/common/http';
|
||||
import { Observable, from } from 'rxjs';
|
||||
import { environment } from 'src/environments/environment';
|
||||
@@ -626,6 +626,11 @@ export class EventsService {
|
||||
}
|
||||
|
||||
|
||||
private deferenceBetweenDays(start: any, end: any) {
|
||||
const diffTime = Math.abs(end - start);
|
||||
return Math.ceil(diffTime / (1000 * 60 * 60 * 24));
|
||||
}
|
||||
|
||||
async getEventsByCalendarId( startdate: string, enddate: string, calendarId: any) {
|
||||
const calendars = SessionStore.user.OwnerCalendars.concat(SessionStore.user.SharedCalendars)
|
||||
const agendasCalendars = calendars.filter( e => e.CalendarId == calendarId)
|
||||
@@ -652,7 +657,30 @@ export class EventsService {
|
||||
params: params
|
||||
};
|
||||
|
||||
const calendar = await this.http.get<Event[]>(`${geturl}`, options).toPromise()
|
||||
let calendar = await this.http.get<EventList[]>(`${geturl}`, options).toPromise()
|
||||
|
||||
calendar = calendar.map(e => {
|
||||
if(e.IsAllDayEvent && this.deferenceBetweenDays(new Date(e.StartDate), new Date(e.EndDate)) >= 1) {
|
||||
|
||||
const date = new Date(e.EndDate);
|
||||
|
||||
date.setDate(date.getDate() -1);
|
||||
|
||||
const _date = date.getDate();
|
||||
const month = date.getMonth() + 1;
|
||||
const fullYear = date.getFullYear();
|
||||
const formattedDate = `${fullYear}-${month}-${_date} 23:59`;
|
||||
e.EndDate = formattedDate
|
||||
|
||||
console.log('reduze')
|
||||
|
||||
}
|
||||
|
||||
return e
|
||||
})
|
||||
|
||||
console.log({calendar})
|
||||
|
||||
|
||||
result = result.concat(calendar)
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user