Diplomarbeit-Absolventenverein/oqtane.framework
10
0
Fork 0
Code Issues Pull Requests 1 Packages Projects Releases Wiki Activity

Merge pull request #3185 from leigh-pointer/SchedularTimeControls

Browse Source 
Fix for Schedular Allows incorrect Time format #3184
This commit is contained in:
Shaun Walker
2023-08-25 10:54:13 -04:00
committed by GitHub
parent d4daf098e1 96480b4382
commit 73c4bcee30
2 changed files with 78 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

55
Oqtane.Shared/Shared/Utilities.cs
View File

@ -490,17 +490,21 @@ namespace Oqtane.Shared
return $"[{@class.GetType()}] {message}";
}
public static DateTime? LocalDateAndTimeAsUtc(DateTime? date, string time, TimeZoneInfo localTimeZone = null)
public static DateTime? LocalDateAndTimeAsUtc(DateTime? date, DateTime? time, TimeZoneInfo localTimeZone = null)
{
localTimeZone ??= TimeZoneInfo.Local;
if (date != null)
{
if (!string.IsNullOrEmpty(time))
if (time != null)
{
return TimeZoneInfo.ConvertTime(DateTime.Parse(date.Value.Date.ToShortDateString() + " " + time), localTimeZone, TimeZoneInfo.Utc);
DateTime localDateTime = date.Value.Date.Add(time.Value.TimeOfDay);
return TimeZoneInfo.ConvertTimeToUtc(localDateTime, localTimeZone);
}
return TimeZoneInfo.ConvertTime(date.Value.Date, localTimeZone, TimeZoneInfo.Utc);
return TimeZoneInfo.ConvertTimeToUtc(date.Value.Date, localTimeZone);
}
return null;
}
@ -534,6 +538,49 @@ namespace Oqtane.Shared
return (localDateTime?.Date, localTime);
}
public static DateTime? LocalDateAndTimeAsUtc(DateTime? date, string time, TimeZoneInfo localTimeZone = null)
{
localTimeZone ??= TimeZoneInfo.Local;
if (date != null)
{
if (!string.IsNullOrEmpty(time))
{
return TimeZoneInfo.ConvertTime(DateTime.Parse(date.Value.Date.ToShortDateString() + " " + time), localTimeZone, TimeZoneInfo.Utc);
}
return TimeZoneInfo.ConvertTime(date.Value.Date, localTimeZone, TimeZoneInfo.Utc);
}
return null;
}
public static DateTime? UtcAsLocalDateAndTimeToDate(DateTime? dateTime, TimeZoneInfo timeZone = null)
{
var result = UtcAsLocalDateAndTime(dateTime, timeZone);
return result.date;
}
public static DateTime? UtcAsLocalDateAndTimeToTime(DateTime? dateTime, TimeZoneInfo timeZone = null)
{
var result = UtcAsLocalDateAndTime(dateTime, timeZone);
if (string.IsNullOrEmpty(result.time))
{
return result.date;
}
else
{
var timeParts = result.time.Split(':');
if (timeParts.Length == 2 && int.TryParse(timeParts[0], out int hours) && int.TryParse(timeParts[1], out int minutes))
{
TimeSpan timeOfDay = new TimeSpan(hours, minutes, 0);
return result.date?.Date + timeOfDay;
}
else
{
// Handle parsing error
return null;
}
}
}
[Obsolete("ContentUrl(Alias alias, int fileId) is deprecated. Use FileUrl(Alias alias, int fileId) instead.", false)]
public static string ContentUrl(Alias alias, int fileId)
{