Handle local server time and different cultures for PublishLater and ArchiveLater

- Does not include jQuery.datepicker localization, currently forced to en-US parsing

--HG--
branch : dev

src/Orchard.Web/Modules/Orchard.ArchiveLater/Drivers/ArchiveLaterPartDriver.cs

@@ -5,11 +5,14 @@ using Orchard.ArchiveLater.ViewModels;
 using Orchard.ContentManagement;
 using Orchard.ContentManagement.Drivers;
 using Orchard.Localization;
+using System.Globalization;
 
 namespace Orchard.ArchiveLater.Drivers {
     public class ArchiveLaterPartDriver : ContentPartDriver<ArchiveLaterPart> {
         private const string TemplateName = "Parts/ArchiveLater";
         private readonly IArchiveLaterService _archiveLaterService;
+        private const string DatePattern = "M/d/yyyy";
+        private const string TimePattern = "h:mm tt";
 
         public ArchiveLaterPartDriver(
             IOrchardServices services,
@@ -38,8 +41,8 @@ namespace Orchard.ArchiveLater.Drivers {
 
             model.ScheduledArchiveUtc = part.ScheduledArchiveUtc.Value;
             model.ArchiveLater = model.ScheduledArchiveUtc.HasValue;
-            model.ScheduledArchiveDate = model.ScheduledArchiveUtc.HasValue ? model.ScheduledArchiveUtc.Value.ToLocalTime().ToShortDateString() : String.Empty;
-            model.ScheduledArchiveTime = model.ScheduledArchiveUtc.HasValue ? model.ScheduledArchiveUtc.Value.ToLocalTime().ToShortTimeString() : String.Empty;
+            model.ScheduledArchiveDate = model.ScheduledArchiveUtc.HasValue ? model.ScheduledArchiveUtc.Value.ToLocalTime().ToString(DatePattern, CultureInfo.InvariantCulture) : String.Empty;
+            model.ScheduledArchiveTime = model.ScheduledArchiveUtc.HasValue ? model.ScheduledArchiveUtc.Value.ToLocalTime().ToString(TimePattern, CultureInfo.InvariantCulture) : String.Empty;
 
             return ContentShape("Parts_ArchiveLater_Edit",
                                 () => shapeHelper.EditorTemplate(TemplateName: TemplateName, Model: model, Prefix: Prefix));
@@ -51,9 +54,16 @@ namespace Orchard.ArchiveLater.Drivers {
             if (updater.TryUpdateModel(model, Prefix, null, null) ) {
                 if ( model.ArchiveLater ) {
                     DateTime scheduled;
-                    if ( DateTime.TryParse(string.Format("{0} {1}", model.ScheduledArchiveDate, model.ScheduledArchiveTime), out scheduled) )
+                    string parseDateTime = String.Concat(model.ScheduledArchiveDate, " ", model.ScheduledArchiveTime);
+
+                    // use an english culture as it is the one used by jQuery.datepicker by default
+                    if (DateTime.TryParse(parseDateTime, CultureInfo.GetCultureInfo("en-US"), DateTimeStyles.AssumeLocal, out scheduled)) {
                         model.ScheduledArchiveUtc = scheduled.ToUniversalTime();
-                    _archiveLaterService.ArchiveLater(model.ContentItem, model.ScheduledArchiveUtc.HasValue ? model.ScheduledArchiveUtc.Value : DateTime.MaxValue);
+                        _archiveLaterService.ArchiveLater(model.ContentItem, model.ScheduledArchiveUtc.HasValue ? model.ScheduledArchiveUtc.Value : DateTime.MaxValue);
+                    }
+                    else {
+                        updater.AddModelError(Prefix, T("{0} is an invalid date and time", parseDateTime));
+                    }
                 }
                 else {
                     _archiveLaterService.RemoveArchiveLaterTasks(model.ContentItem);

src/Orchard.Web/Modules/Orchard.PublishLater/Drivers/PublishLaterPartDriver.cs

@@ -6,12 +6,16 @@ using Orchard.PublishLater.Models;
 using Orchard.PublishLater.Services;
 using Orchard.PublishLater.ViewModels;
 using Orchard.Localization;
+using System.Globalization;
+using Orchard.Core.Localization.Services;
 
 namespace Orchard.PublishLater.Drivers {
     public class PublishLaterPartDriver : ContentPartDriver<PublishLaterPart> {
         private const string TemplateName = "Parts/PublishLater";
         private readonly ICommonService _commonService;
         private readonly IPublishLaterService _publishLaterService;
+        private const string DatePattern = "M/d/yyyy";
+        private const string TimePattern = "h:mm tt";
 
         public PublishLaterPartDriver(
             IOrchardServices services,
@@ -42,35 +46,43 @@ namespace Orchard.PublishLater.Drivers {
         }
 
         protected override DriverResult Editor(PublishLaterPart part, dynamic shapeHelper) {
-            var model = BuildEditorViewModel(part);
+            // date and time are formatted using the same patterns as DateTimePicker is, preventing other cultures issues
+            var model = new PublishLaterViewModel(part) {
+                ScheduledPublishUtc = part.ScheduledPublishUtc.Value,
+                ScheduledPublishDate = part.ScheduledPublishUtc.Value.HasValue ? part.ScheduledPublishUtc.Value.Value.ToLocalTime().ToString(DatePattern, CultureInfo.InvariantCulture) : String.Empty,
+                ScheduledPublishTime = part.ScheduledPublishUtc.Value.HasValue ? part.ScheduledPublishUtc.Value.Value.ToLocalTime().ToString(TimePattern, CultureInfo.InvariantCulture) : String.Empty
+            };
+
             return ContentShape("Parts_PublishLater_Edit",
                                 () => shapeHelper.EditorTemplate(TemplateName: TemplateName, Model: model, Prefix: Prefix));
         }
         protected override DriverResult Editor(PublishLaterPart part, IUpdateModel updater, dynamic shapeHelper) {
             var model = new PublishLaterViewModel(part);
+
             updater.TryUpdateModel(model, Prefix, null, null);
             switch (model.Command) {
                 case "PublishNow":
                     _commonService.Publish(model.ContentItem);
-                    //Services.Notifier.Information(T("{0} has been published!", model.ContentItem.TypeDefinition.DisplayName));
                     break;
                 case "PublishLater":
                     DateTime scheduled;
-                    if (DateTime.TryParse(string.Format("{0} {1}", model.ScheduledPublishUtcDate, model.ScheduledPublishUtcTime), out scheduled))
-                        model.ScheduledPublishUtc = scheduled;
-                    _publishLaterService.Publish(model.ContentItem, model.ScheduledPublishUtc.HasValue ? model.ScheduledPublishUtc.Value : DateTime.MaxValue);
-                    //Services.Notifier.Information(T("{0} has been scheduled for publishing!", model.ContentItem.TypeDefinition.DisplayName));
+                    string parseDateTime = String.Concat(model.ScheduledPublishDate, " ", model.ScheduledPublishTime);
+                    
+                    // use an english culture as it is the one used by jQuery.datepicker by default
+                    if (DateTime.TryParse(parseDateTime, CultureInfo.GetCultureInfo("en-US"), DateTimeStyles.AssumeLocal, out scheduled)) {
+                        model.ScheduledPublishUtc = part.ScheduledPublishUtc.Value = scheduled.ToUniversalTime();
+                        _publishLaterService.Publish(model.ContentItem, model.ScheduledPublishUtc.Value);
+                    }
+                    else {
+                        updater.AddModelError(Prefix, T("{0} is an invalid date and time", parseDateTime));
+                    }
+
                     break;
                 case "SaveDraft":
-                    //Services.Notifier.Information(T("{0} draft has been saved!", model.ContentItem.TypeDefinition.DisplayName));
                     break;
             }
             return ContentShape("Parts_PublishLater_Edit",
                                 () => shapeHelper.EditorTemplate(TemplateName: TemplateName, Model: model, Prefix: Prefix));
         }
-
-        private static PublishLaterViewModel BuildEditorViewModel(PublishLaterPart part) {
-            return new PublishLaterViewModel(part);
-        }
     }
 }

src/Orchard.Web/Modules/Orchard.PublishLater/Styles/datetime.css

@@ -6,9 +6,9 @@ html.dyn input.hinted {
     color:#ccc;
     font-style:italic;
 }
-input#PublishLater_ScheduledPublishUtcDate {
+input#PublishLater_ScheduledPublishDate {
     width:50%;
 }
-input#PublishLater_ScheduledPublishUtcTime {
+input#PublishLater_ScheduledPublishTime {
     width:36%;
 }

src/Orchard.Web/Modules/Orchard.PublishLater/ViewModels/PublishLaterViewModel.cs

@@ -6,8 +6,6 @@ using Orchard.PublishLater.Models;
 namespace Orchard.PublishLater.ViewModels {
     public class PublishLaterViewModel {
         private readonly PublishLaterPart _publishLaterPart;
-        private string _scheduledPublishUtcTime;
-        private string _scheduledPublishUtcDate;
 
         public PublishLaterViewModel(PublishLaterPart publishLaterPart) {
             _publishLaterPart = publishLaterPart;
@@ -37,23 +35,8 @@ namespace Orchard.PublishLater.ViewModels {
 
         public DateTime? ScheduledPublishUtc { get; set; }
 
-        public string ScheduledPublishUtcDate {
-            get {
-                return !HasPublished && !string.IsNullOrEmpty(_scheduledPublishUtcDate) || !ScheduledPublishUtc.HasValue
-                           ? _scheduledPublishUtcDate
-                           : ScheduledPublishUtc.Value.ToShortDateString();
-            }
-            set { _scheduledPublishUtcDate = value; }
-        }
+        public string ScheduledPublishDate { get; set; }
 
-
-        public string ScheduledPublishUtcTime {
-            get {
-                return !HasPublished && !string.IsNullOrEmpty(_scheduledPublishUtcTime) || !ScheduledPublishUtc.HasValue
-                           ? _scheduledPublishUtcTime
-                           : ScheduledPublishUtc.Value.ToShortTimeString();
-            }
-            set { _scheduledPublishUtcTime = value; }
-        }
+        public string ScheduledPublishTime { get; set; }
     }
 }

src/Orchard.Web/Modules/Orchard.PublishLater/Views/EditorTemplates/Parts/PublishLater.cshtml

@@ -21,10 +21,10 @@
         <label class="forcheckbox" for="@ViewData.TemplateInfo.GetFullHtmlFieldId("Command_PublishLater")">@T("Publish Later")</label>
     </div>
     <div>
-        <label class="forpicker" for="@ViewData.TemplateInfo.GetFullHtmlFieldId("ScheduledPublishUtcDate")">@T("Date")</label>
-        @Html.EditorFor(m => m.ScheduledPublishUtcDate)
-        <label class="forpicker" for="@ViewData.TemplateInfo.GetFullHtmlFieldId("ScheduledPublishUtcTime")">@T("Time")</label>
-        @Html.EditorFor(m => m.ScheduledPublishUtcTime)
+        <label class="forpicker" for="@ViewData.TemplateInfo.GetFullHtmlFieldId("ScheduledPublishDate")">@T("Date")</label>
+        @Html.EditorFor(m => m.ScheduledPublishDate)
+        <label class="forpicker" for="@ViewData.TemplateInfo.GetFullHtmlFieldId("ScheduledPublishTime")">@T("Time")</label>
+        @Html.EditorFor(m => m.ScheduledPublishTime)
     </div>
 </fieldset>
 @using(Script.Foot()) {
@@ -43,8 +43,9 @@
             .blur(function () { var $this = $(this); setTimeout(function () { if (!$this.val()) { $this.addClass("hinted").val($this.data("hint")) } }, 300) });
             }
         });
-        $(@(new HtmlString(string.Format("\"#{0}\"", ViewData.TemplateInfo.GetFullHtmlFieldId("ScheduledPublishUtcDate"))))).datepicker({ showAnim: "" }).focus(function () { $(@(new HtmlString(string.Format("\"#{0}\"", ViewData.TemplateInfo.GetFullHtmlFieldId("Command_PublishLater"))))).attr("checked", "checked") });
-        $(@(new HtmlString(string.Format("\"#{0}\"", ViewData.TemplateInfo.GetFullHtmlFieldId("ScheduledPublishUtcTime"))))).timepickr().focus(function () { $(@(new HtmlString(string.Format("\"#{0}\"", ViewData.TemplateInfo.GetFullHtmlFieldId("Command_PublishLater"))))).attr("checked", "checked") });
+        $('#@ViewData.TemplateInfo.GetFullHtmlFieldId("ScheduledPublishDate")').datepicker({ showAnim: "" }).focus(function () { $('#@ViewData.TemplateInfo.GetFullHtmlFieldId("Command_PublishLater")').attr("checked", "checked") });
+        $('#@ViewData.TemplateInfo.GetFullHtmlFieldId("ScheduledPublishTime")').timepickr().focus(function () { $('#@ViewData.TemplateInfo.GetFullHtmlFieldId("Command_PublishLater")').attr("checked", "checked") });
+
     })
 //]]>
 </script>

src/Orchard.Web/Modules/Orchard.PublishLater/Views/Parts/PublishLater.Metadata.SummaryAdmin.cshtml

@@ -30,7 +30,7 @@
         }
         else {
             <img class="icon" src="@Href("~/Core/PublishLater/Content/Admin/images/scheduled.gif")" alt="@T("Scheduled")" title="@T("The page is scheduled for publishing")" /><text>  @T("Scheduled") </text>
-            @Html.DateTime(((DateTime?)Model.ScheduledPublishUtc).Value, T("M/d/yyyy h:mm tt"))
+            @Html.DateTime(((DateTime?)Model.ScheduledPublishUtc).Value.ToLocalTime(), T("M/d/yyyy h:mm tt"))
         }&nbsp;&#124;&nbsp;</li>
     }
 </ul>