ownSoft/BeWoPlaner
1
1
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

MoK-Kalender weitergemacht

Browse Source
This commit is contained in:
Lyndon Jetten
2026-06-29 13:45:15 +02:00
parent 95bf29a901
commit c25af9c053
45 changed files with 2059 additions and 777 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
Shared/Core/SchedulerUtils.cs
View File

@@ -1,5 +1,6 @@
using System;
using System.Collections.Generic;
using System.Linq;
using BS.Shared.DataContracts;
using BS.Shared.Extensions;

4
Shared/DataContracts/SchedulerAppointmentDC.cs
View File

@@ -162,6 +162,10 @@ namespace BS.Shared.DataContracts
[DataMember]
public List<ServiceRecordDC> ServiceRecordList { get; set; }
// Nur im DC, damit man im MoK-Scheduler als CustomField darauf zugreifen kann.
public bool ShowEmployeeColors { get; set; }
public bool CanBeViewed { get; set; } = true;
public bool CanBeDeleted { get; set; } = true;
public long? FormerAbsenceTimeOid { get; set; }
public DateTime? Krankheitsmeldung { get; set; }
public AbsenceReasonDC AbsenceReason { get; set; }

2
Shared/Extensions/DateTimeExtensions.cs
View File

@@ -614,7 +614,7 @@ namespace BS.Shared.Extensions
$"{start.ToShortDateString()} {start.ToShortTimeString()} - {end.ToShortTimeString()}";
}
public static DateTime MergeDateWithHoursMinutesSeconds(this DateTime date, int hours, int minutes, int seconds = 0)
public static DateTime MergeDateWithHoursMinutesSeconds(this DateTime date, int hours, int minutes = 0, int seconds = 0)
{
var h = hours >= 0 && hours < 24 ? hours : 0;
var m = minutes >= 0 && minutes < 60 ? minutes : 0;