Merge pull request jlucansky#4 from maikebing/dev

Added UseLocalTime option so we're not always stuck with UTC
shakenovdev · Jan 9, 2020 · 3554502 · 3554502
2 parents 12722c8 + edc5794
commit 3554502
Show file tree

Hide file tree

Showing 11 changed files with 73 additions and 50 deletions.
diff --git a/Source/Examples/AspNetCoreHost/Startup.cs b/Source/Examples/AspNetCoreHost/Startup.cs
@@ -14,7 +14,8 @@ public void Configure(IApplicationBuilder app)
         {
             app.UseQuartzmin(new QuartzminOptions()
             {
-                Scheduler = DemoScheduler.Create().Result,
+                UseLocalTime = true,
+                Scheduler = DemoScheduler.Create().Result,
                 VirtualPathRoot = "/test",
             });
         }

diff --git a/Source/Examples/NetCoreSelfHost/app.config b/Source/Examples/NetCoreSelfHost/app.config
@@ -10,5 +10,7 @@
 
     <add key="quartz.plugin.quartzmin.type" value="Quartzmin.SelfHost.QuartzminPlugin, Quartzmin.SelfHost" />
     <add key="quartz.plugin.quartzmin.url" value="http://*:333" />
+    <add key="quartz.plugin.quartzmin.useLocalTime" value="true" />
+    <add key="quartz.plugin.quartzmin.defaultDateFormat" value="dd/MM/yyyy" />
   </quartz>
 </configuration>
diff --git a/Source/Examples/WinFormSelfHost/App.config b/Source/Examples/WinFormSelfHost/App.config
@@ -1,38 +1,40 @@
-<?xml version="1.0" encoding="utf-8"?>
-<configuration>
-  <configSections>
-    <section name="quartz" type="System.Configuration.NameValueFileSectionHandler" />
-  </configSections>
-
-  <startup>
-    <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.5.2" />
-  </startup>
-
-  <quartz>
-    <add key="quartz.plugin.recentHistory.type" value="Quartz.Plugins.RecentHistory.ExecutionHistoryPlugin, Quartz.Plugins.RecentHistory" />
-    <add key="quartz.plugin.recentHistory.storeType" value="Quartz.Plugins.RecentHistory.Impl.InProcExecutionHistoryStore, Quartz.Plugins.RecentHistory" />
-
-    <add key="quartz.plugin.quartzmin.type" value="Quartzmin.SelfHost.QuartzminPlugin, Quartzmin.SelfHost" />
-    <add key="quartz.plugin.quartzmin.url" value="http://localhost:9999" />
-  </quartz>
-  <runtime>
-    <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
-      <dependentAssembly>
-        <assemblyIdentity name="Microsoft.Owin" publicKeyToken="31bf3856ad364e35" culture="neutral" />
-        <bindingRedirect oldVersion="0.0.0.0-2.1.0.0" newVersion="2.1.0.0" />
-      </dependentAssembly>
-      <dependentAssembly>
-        <assemblyIdentity name="System.Web.Http" publicKeyToken="31bf3856ad364e35" culture="neutral" />
-        <bindingRedirect oldVersion="0.0.0.0-5.2.6.0" newVersion="5.2.6.0" />
-      </dependentAssembly>
-      <dependentAssembly>
-        <assemblyIdentity name="System.Net.Http.Formatting" publicKeyToken="31bf3856ad364e35" culture="neutral" />
-        <bindingRedirect oldVersion="0.0.0.0-5.2.6.0" newVersion="5.2.6.0" />
-      </dependentAssembly>
-      <dependentAssembly>
-        <assemblyIdentity name="Newtonsoft.Json" publicKeyToken="30ad4fe6b2a6aeed" culture="neutral" />
-        <bindingRedirect oldVersion="0.0.0.0-12.0.0.0" newVersion="12.0.0.0" />
-      </dependentAssembly>
-    </assemblyBinding>
-  </runtime>
+<?xml version="1.0" encoding="utf-8"?>
+<configuration>
+  <configSections>
+    <section name="quartz" type="System.Configuration.NameValueFileSectionHandler" />
+  </configSections>
+
+  <startup>
+    <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.5.2" />
+  </startup>
+
+  <quartz>
+    <add key="quartz.plugin.recentHistory.type" value="Quartz.Plugins.RecentHistory.ExecutionHistoryPlugin, Quartz.Plugins.RecentHistory" />
+    <add key="quartz.plugin.recentHistory.storeType" value="Quartz.Plugins.RecentHistory.Impl.InProcExecutionHistoryStore, Quartz.Plugins.RecentHistory" />
+
+    <add key="quartz.plugin.quartzmin.type" value="Quartzmin.SelfHost.QuartzminPlugin, Quartzmin.SelfHost" />
+    <add key="quartz.plugin.quartzmin.url" value="http://localhost:9999" />
+    <add key="quartz.plugin.quartzmin.useLocalTime" value="true" />
+    <add key="quartz.plugin.quartzmin.defaultDateFormat" value="dd/MM/yyyy" />
+  </quartz>
+  <runtime>
+    <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
+      <dependentAssembly>
+        <assemblyIdentity name="Microsoft.Owin" publicKeyToken="31bf3856ad364e35" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-2.1.0.0" newVersion="2.1.0.0" />
+      </dependentAssembly>
+      <dependentAssembly>
+        <assemblyIdentity name="System.Web.Http" publicKeyToken="31bf3856ad364e35" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-5.2.6.0" newVersion="5.2.6.0" />
+      </dependentAssembly>
+      <dependentAssembly>
+        <assemblyIdentity name="System.Net.Http.Formatting" publicKeyToken="31bf3856ad364e35" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-5.2.6.0" newVersion="5.2.6.0" />
+      </dependentAssembly>
+      <dependentAssembly>
+        <assemblyIdentity name="Newtonsoft.Json" publicKeyToken="30ad4fe6b2a6aeed" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-11.0.0.0" newVersion="11.0.0.0" />
+      </dependentAssembly>
+    </assemblyBinding>
+  </runtime>
 </configuration>
diff --git a/Source/Quartz.Plugins.RecentHistory/ExecutionHistoryPlugin.cs b/Source/Quartz.Plugins.RecentHistory/ExecutionHistoryPlugin.cs
@@ -23,7 +23,7 @@ public class ExecutionHistoryPlugin : ISchedulerPlugin, IJobListener
             return Task.FromResult(0);
         }
 
-        public async Task Start(CancellationToken cancellationToken = default(CancellationToken))
+        public Task Start(CancellationToken cancellationToken = default(CancellationToken))
         {
             _store = _scheduler.Context.GetExecutionHistoryStore();
 
@@ -40,15 +40,15 @@ public class ExecutionHistoryPlugin : ISchedulerPlugin, IJobListener
 
             _store.SchedulerName = _scheduler.SchedulerName;
 
-            await _store.Purge();
+            return _store.Purge();
         }
 
         public Task Shutdown(CancellationToken cancellationToken = default(CancellationToken))
         {
             return Task.FromResult(0);
         }
 
-        public async Task JobToBeExecuted(IJobExecutionContext context, CancellationToken cancellationToken = default(CancellationToken))
+        public Task JobToBeExecuted(IJobExecutionContext context, CancellationToken cancellationToken = default(CancellationToken))
         {
             var entry = new ExecutionHistoryEntry()
             {
@@ -61,7 +61,7 @@ public class ExecutionHistoryPlugin : ISchedulerPlugin, IJobListener
                 Job = context.JobDetail.Key.ToString(),
                 Trigger = context.Trigger.Key.ToString(),
             };
-            await _store.Save(entry);
+            return _store.Save(entry);
         }
 
         public async Task JobWasExecuted(IJobExecutionContext context, JobExecutionException jobException, CancellationToken cancellationToken = default(CancellationToken))

diff --git a/Source/Quartz.Plugins.RecentHistory/Impl/InProcExecutionHistoryStore.cs b/Source/Quartz.Plugins.RecentHistory/Impl/InProcExecutionHistoryStore.cs
@@ -24,8 +24,8 @@ public Task<ExecutionHistoryEntry> Get(string fireInstanceId)
             {
                 if (_data.TryGetValue(fireInstanceId, out var entry))
                     return Task.FromResult(entry);
-                else
-                    return Task.FromResult<ExecutionHistoryEntry>(null); ;
+                return Task.FromResult<ExecutionHistoryEntry>(null);
+
             }
         }
 

diff --git a/Source/Quartzmin.SelfHost/QuartzminPlugin.cs b/Source/Quartzmin.SelfHost/QuartzminPlugin.cs
@@ -18,6 +18,8 @@ public class QuartzminPlugin : ISchedulerPlugin
         public string DefaultDateFormat { get; set; }
         public string DefaultTimeFormat { get; set; }
 
+        public bool UseLocalTime { get; set; }
+
         public string Logo { get; set; }
         public string ProductName { get; set; }
 
@@ -31,7 +33,7 @@ public class QuartzminPlugin : ISchedulerPlugin
         }
 
 #if NETSTANDARD
-        public async Task Start(CancellationToken cancellationToken = default(CancellationToken))
+        public Task Start(CancellationToken cancellationToken = default(CancellationToken))
         {
             var host = Microsoft.AspNetCore.WebHost.CreateDefaultBuilder().Configure(app => {
                 app.UseQuartzmin(CreateQuartzminOptions());
@@ -46,7 +48,7 @@ public class QuartzminPlugin : ISchedulerPlugin
 
             _webApp = host;
 
-            await host.StartAsync();
+            return host.StartAsync();
         }
 #endif
 
@@ -81,6 +83,9 @@ private QuartzminOptions CreateQuartzminOptions()
             if (!string.IsNullOrEmpty(ProductName))
                 options.ProductName = ProductName;
 
+            if (UseLocalTime)
+                options.UseLocalTime = UseLocalTime;
+
             return options;
         }
 

diff --git a/Source/Quartzmin/Controllers/SchedulerController.cs b/Source/Quartzmin/Controllers/SchedulerController.cs
@@ -62,7 +62,8 @@ public async Task<IActionResult> Index()
             {
                 History = histogram,
                 MetaData = metadata,
-                RunningSince = metadata.RunningSince != null ? metadata.RunningSince.Value.UtcDateTime.ToDefaultFormat() + " UTC" : "N / A",
+                RunningSince = metadata.RunningSince?.UtcDateTime.ToDefaultFormat() ?? "N / A",
+                UtcLabel = DateTimeSettings.UseLocalTime ? string.Empty : "UTC",
                 Environment.MachineName,
                 Application = Environment.CommandLine,
                 JobsCount = jobKeys.Count,

diff --git a/Source/Quartzmin/DateTimeSettings.cs b/Source/Quartzmin/DateTimeSettings.cs
@@ -4,5 +4,6 @@ internal static class DateTimeSettings
     {
         public static string DefaultDateFormat { get; set; } = "MM/dd/yyyy";
         public static string DefaultTimeFormat { get; set; } = "HH:mm:ss";
+        public static bool UseLocalTime { get; set; } = false;
     }
 }
diff --git a/Source/Quartzmin/Extensions.cs b/Source/Quartzmin/Extensions.cs
@@ -37,7 +37,12 @@ public static JobDataMapItemBase[] GetModel(this IEnumerable<Dictionary<string,
 
         public static string ToDefaultFormat(this DateTime date)
         {
-            return date.ToString(DateTimeSettings.DefaultDateFormat + " " + DateTimeSettings.DefaultTimeFormat, CultureInfo.InvariantCulture);
+            return DateTimeSettings.UseLocalTime
+                ? date.ToLocalTime()
+                    .ToString(DateTimeSettings.DefaultDateFormat + " " + DateTimeSettings.DefaultTimeFormat,
+                        CultureInfo.InvariantCulture)
+                : date.ToString(DateTimeSettings.DefaultDateFormat + " " + DateTimeSettings.DefaultTimeFormat,
+                    CultureInfo.InvariantCulture);
         }
 
         public static Dictionary<string, string> ToDictionary(this IEnumerable<TimeZoneInfo> timeZoneInfos)

diff --git a/Source/Quartzmin/QuartzminOptions.cs b/Source/Quartzmin/QuartzminOptions.cs
@@ -44,6 +44,12 @@ public string DefaultTimeFormat
             set => DateTimeSettings.DefaultTimeFormat = value;
         }
 
+        public bool UseLocalTime
+        {
+            get => DateTimeSettings.UseLocalTime;
+            set => DateTimeSettings.UseLocalTime = value;
+        }
+
         public QuartzminOptions()
         {
             DefaultSelectedType = new StringHandler() { Name = "String" };
@@ -70,6 +76,7 @@ public QuartzminOptions()
             string.IsNullOrEmpty(SitePhysicalDirectory) ? null : Path.Combine(SitePhysicalDirectory, "Content");
         internal string ViewsRootDirectory => 
             string.IsNullOrEmpty(SitePhysicalDirectory) ? null : Path.Combine(SitePhysicalDirectory, "Views");
+
 #else
         internal string ContentRootDirectory => null;
         internal string ViewsRootDirectory => null;

diff --git a/Source/Quartzmin/Views/Scheduler/Index.hbs b/Source/Quartzmin/Views/Scheduler/Index.hbs
@@ -51,8 +51,7 @@
                         <td>{{Upper MetaData.InStandbyMode}}</td>
                     </tr>
                     <tr>
-                        <td>Running Since</td>
-                        <td>{{RunningSince}}</td>
+                        <td>{{RunningSince}} {{UtcLabel}}</td>
                     </tr>
                     <tr>
                         <td>Shutdown</td>