-
+
{{SessionStore.user.FullName}}
{{eventService.getCalendarOwnNameByCalendarId(event.event.CalendarId)}}
diff --git a/src/app/pages/agenda/agenda.page.ts b/src/app/pages/agenda/agenda.page.ts
index 79fe7e5aa..aa870b0ec 100644
--- a/src/app/pages/agenda/agenda.page.ts
+++ b/src/app/pages/agenda/agenda.page.ts
@@ -1254,6 +1254,24 @@ export class AgendaPage implements OnInit {
}
+
+ diffHours(date1Str: string, date2Str: string) {
+
+ // Convert string dates to Date objects
+ const date1: any = new Date(date1Str);
+ const date2: any = new Date(date2Str);
+
+ date1.setHours(0, 0, 0, 0); // Set hours, minutes, seconds, and milliseconds to 0
+
+ // Calculate the difference in milliseconds
+ const timeDifferenceMs = date2 - date1;
+
+ // Convert difference to hours
+ const hoursDifference = timeDifferenceMs / (1000 * 60 * 60);
+
+ return hoursDifference
+ }
+
shoeEventDay(events: any[]) {
if (this.segment == 'Combinado') {
diff --git a/src/app/services/agenda/list-box.service.ts b/src/app/services/agenda/list-box.service.ts
index 16791d8f1..d88e1f0f1 100644
--- a/src/app/services/agenda/list-box.service.ts
+++ b/src/app/services/agenda/list-box.service.ts
@@ -135,7 +135,7 @@ export class ListBoxService {
if (diffDays >= 1) {
- const StartEvent = this.transForm(event, {startMany: true, endMany: false, middle: false})
+ const StartEvent = this.transForm(event, {startMany: true, endMany: false, middle: false, hasMany: true})
if(this.CanPush(event, selectedDate) && (new Date(event.start)).getTime() >= cloneSelectedDate.getTime()) {
days[day].push(StartEvent); this.push(StartEvent, year)
@@ -164,14 +164,14 @@ export class ListBoxService {
startDate.getMonth() != endDate.getMonth() ||
startDate.getDate() != endDate.getDate())) {
// last push
- const EndEvent = this.transForm(cloneEvent, {startMany: false, endMany: true, middle: false})
+ const EndEvent = this.transForm(cloneEvent, {startMany: false, endMany: true, middle: false, hasMany: true})
if(this.CanPush(cloneEvent, selectedDate) && cloneEvent.start.getTime() >= cloneSelectedDate.getTime()) {
days[otherDays].push(EndEvent) ; this.push(EndEvent, year)
}
} else {
- const EndEvent = this.transForm(cloneEvent, {startMany: false,endMany: true, middle: true})
+ const EndEvent = this.transForm(cloneEvent, {startMany: false,endMany: false, middle: true, hasMany: true})
if(this.CanPush(cloneEvent, selectedDate) && cloneEvent.start.getTime() >= cloneSelectedDate.getTime()) {
days[otherDays].push(EndEvent) ; this.push(EndEvent, year)
} else {
@@ -191,11 +191,11 @@ export class ListBoxService {
}
} else {
-
if(this.CanPush(event, selectedDate)) { days[day].push(event) ; this.push(event, year) }
}
} else {
+ event['sameDay'] = true
if(this.CanPush(event, selectedDate) && diffDays != 2) { days[day].push(event) ; this.push(event, year) }
}
@@ -306,9 +306,10 @@ export class ListBoxService {
return events;
}
- transForm(event: CustomCalendarEvent, {startMany, endMany, middle}) {
+ transForm(event: CustomCalendarEvent, {startMany, endMany, middle, hasMany = false}) {
let daysLeft = this.daysToEndWithJS(event.start, event.end);
+ let eventTotalDuration = this.daysToEndWithJS(event.event.StartDate, event.event.EndDate);
return Object.assign({}, {
start: event.start,
@@ -325,6 +326,9 @@ export class ListBoxService {
CalendarId: event.event.CalendarId,
daysLeft
},
+ eventTotalDuration,
+ hasMany,
+ duration: this.duration(event.start, event.event.EndDate),
daysLeft,
Subject: event.event.Subject,
startMany: startMany,
@@ -341,6 +345,8 @@ export class ListBoxService {
const startDate: any = new Date(startDateStr);
const endDate: any = new Date(endDateStr);
+ startDate.setHours(0, 0, 0, 0); // Set hours, minutes, seconds, and milliseconds to 0
+ endDate.setHours(0, 0, 0, 0); // Set hours, minutes, seconds, and milliseconds to 0
// Calculate the difference in milliseconds between the two dates
const differenceMs = Math.abs(endDate - startDate);
@@ -355,6 +361,26 @@ export class ListBoxService {
}
+
+ duration(date1Str, date2Str) {
+
+ // Convert string dates to Date objects
+ const date1: any = new Date(date1Str);
+ const date2: any = new Date(date2Str);
+
+ // Calculate the difference in milliseconds
+ const timeDifferenceMs = date2 - date1;
+
+ // Convert difference to days, hours, and minutes
+ const totalMinutes = Math.floor(timeDifferenceMs / (1000 * 60));
+ const days = Math.floor(totalMinutes / (60 * 24));
+ const hours = Math.floor((totalMinutes % (60 * 24)) / 60);
+ const minutes = totalMinutes % 60;
+
+ return `${days}d`
+ }
+
+
transformObjectKeyOrder(originalObject, keyOrder) {
const transformedObject = {};
diff --git a/src/app/services/http.service.ts b/src/app/services/http.service.ts
index 0ae0b7175..50634d4fb 100644
--- a/src/app/services/http.service.ts
+++ b/src/app/services/http.service.ts
@@ -62,6 +62,16 @@ export class HttpService {
return err(e as HttpErrorResponse)
}
}
+
+
+ async patch