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

Merge pull request #5296 from sbwalker/dev

Browse Source 
display local datetimes in the Job Scheduler (using time zones)
This commit is contained in:
Shaun Walker
2025-05-13 11:29:40 -04:00
committed by GitHub
parent f237cb9655 139793f3c0
commit 49c62f80e8
3 changed files with 39 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
Oqtane.Client/Modules/Admin/Jobs/Edit.razor
View File

@ -132,13 +132,13 @@
_isEnabled = job.IsEnabled.ToString(); _isEnabled = job.IsEnabled.ToString();
_interval = job.Interval.ToString(); _interval = job.Interval.ToString();
_frequency = job.Frequency; _frequency = job.Frequency;
_startDate = Utilities.UtcAsLocalDate(job.StartDate); _startDate = UtcToLocal(job.StartDate);
_startTime = Utilities.UtcAsLocalDateTime(job.StartDate); _startTime = UtcToLocal(job.StartDate);
_endDate = Utilities.UtcAsLocalDate(job.EndDate); _endDate = UtcToLocal(job.EndDate);
_endTime = Utilities.UtcAsLocalDateTime(job.EndDate); _endTime = UtcToLocal(job.EndDate);
_retentionHistory = job.RetentionHistory.ToString(); _retentionHistory = job.RetentionHistory.ToString();
_nextDate = Utilities.UtcAsLocalDate(job.NextExecution); _nextDate = UtcToLocal(job.NextExecution);
_nextTime = Utilities.UtcAsLocalDateTime(job.NextExecution); _nextTime = UtcToLocal(job.NextExecution);
createdby = job.CreatedBy; createdby = job.CreatedBy;
createdon = job.CreatedOn; createdon = job.CreatedOn;
modifiedby = job.ModifiedBy; modifiedby = job.ModifiedBy;
@ -176,10 +176,10 @@
{ {
job.Interval = int.Parse(_interval); job.Interval = int.Parse(_interval);
} }
job.StartDate = Utilities.LocalDateAndTimeAsUtc(_startDate, _startTime); job.StartDate = LocalToUtc(_startDate.Value.Date.Add(_startTime.Value.TimeOfDay));
job.EndDate = Utilities.LocalDateAndTimeAsUtc(_endDate, _endTime); job.EndDate = LocalToUtc(_endDate.Value.Date.Add(_endTime.Value.TimeOfDay));
job.RetentionHistory = int.Parse(_retentionHistory); job.RetentionHistory = int.Parse(_retentionHistory);
job.NextExecution = Utilities.LocalDateAndTimeAsUtc(_nextDate, _nextTime); job.NextExecution = LocalToUtc(_nextDate.Value.Date.Add(_nextTime.Value.TimeOfDay));
try try
{ {

2
Oqtane.Client/Modules/Admin/Jobs/Index.razor
View File

@ -29,7 +29,7 @@ else
<td>@context.Name</td> <td>@context.Name</td>
<td>@DisplayStatus(context.IsEnabled, context.IsExecuting)</td> <td>@DisplayStatus(context.IsEnabled, context.IsExecuting)</td>
<td>@DisplayFrequency(context.Interval, context.Frequency)</td> <td>@DisplayFrequency(context.Interval, context.Frequency)</td>
<td>@context.NextExecution?.ToLocalTime()</td> <td>@UtcToLocal(context.NextExecution)</td>
<td> <td>
@if (context.IsStarted) @if (context.IsStarted)
{ {

29
Oqtane.Client/Modules/ModuleBase.cs
View File

@ -487,6 +487,35 @@ namespace Oqtane.Modules
return content; return content;
} }
// date methods
public DateTime? UtcToLocal(DateTime? datetime)
{
TimeZoneInfo timezone = null;
if (PageState.User != null && !string.IsNullOrEmpty(PageState.User.TimeZoneId))
{
timezone = TimeZoneInfo.FindSystemTimeZoneById(PageState.User.TimeZoneId);
}
else if (!string.IsNullOrEmpty(PageState.Site.TimeZoneId))
{
timezone = TimeZoneInfo.FindSystemTimeZoneById(PageState.Site.TimeZoneId);
}
return Utilities.UtcAsLocalDateTime(datetime, timezone);
}
public DateTime? LocalToUtc(DateTime? datetime)
{
TimeZoneInfo timezone = null;
if (PageState.User != null && !string.IsNullOrEmpty(PageState.User.TimeZoneId))
{
timezone = TimeZoneInfo.FindSystemTimeZoneById(PageState.User.TimeZoneId);
}
else if (!string.IsNullOrEmpty(PageState.Site.TimeZoneId))
{
timezone = TimeZoneInfo.FindSystemTimeZoneById(PageState.Site.TimeZoneId);
}
return Utilities.LocalDateAndTimeAsUtc(datetime, timezone);
}
// logging methods // logging methods
public async Task Log(Alias alias, LogLevel level, string function, Exception exception, string message, params object[] args) public async Task Log(Alias alias, LogLevel level, string function, Exception exception, string message, params object[] args)
{ {