DateTime.ToString fixes for other countries

Fixed: Aired Date sorting on Missing
pull/4/head
Mark McDowall 12 years ago
parent 7bdc10c370
commit feaf63c758

@ -362,7 +362,7 @@
<WebProjectProperties> <WebProjectProperties>
<UseIIS>False</UseIIS> <UseIIS>False</UseIIS>
<AutoAssignPort>True</AutoAssignPort> <AutoAssignPort>True</AutoAssignPort>
<DevelopmentServerPort>62182</DevelopmentServerPort> <DevelopmentServerPort>32122</DevelopmentServerPort>
<DevelopmentServerVPath>/</DevelopmentServerVPath> <DevelopmentServerVPath>/</DevelopmentServerVPath>
<IISUrl>http://localhost:62182/</IISUrl> <IISUrl>http://localhost:62182/</IISUrl>
<NTLMAuthentication>False</NTLMAuthentication> <NTLMAuthentication>False</NTLMAuthentication>

@ -1,4 +1,5 @@
using System; using System;
using System.Globalization;
using System.Linq; using System.Linq;
using System.Linq.Dynamic; using System.Linq.Dynamic;
using System.Web.Mvc; using System.Web.Mvc;
@ -45,7 +46,7 @@ namespace NzbDrone.Web.Controllers
Quality = h.Quality.ToString(), Quality = h.Quality.ToString(),
IsProper = h.IsProper, IsProper = h.IsProper,
Date = h.Date.ToString(), Date = h.Date.ToString(),
DateSorter = h.Date.ToString("MM/dd/yyyy h:mm:ss tt"), DateSorter = h.Date.ToString("o", CultureInfo.InvariantCulture),
Indexer = h.Indexer, Indexer = h.Indexer,
EpisodeId = h.EpisodeId, EpisodeId = h.EpisodeId,
NzbInfoUrl = h.NzbInfoUrl, NzbInfoUrl = h.NzbInfoUrl,

@ -1,5 +1,6 @@
using System; using System;
using System.Collections.Generic; using System.Collections.Generic;
using System.Globalization;
using System.Linq; using System.Linq;
using System.Web; using System.Web;
using System.Web.Mvc; using System.Web.Mvc;
@ -34,8 +35,8 @@ namespace NzbDrone.Web.Controllers
Overview = e.Overview, Overview = e.Overview,
SeriesTitle = e.Series.Title, SeriesTitle = e.Series.Title,
SeriesTitleSorter = SortHelper.SkipArticles(e.Series.Title), SeriesTitleSorter = SortHelper.SkipArticles(e.Series.Title),
AirDate = e.AirDate.Value.ToString("MM/dd/yyyy"), AirDateSorter = e.AirDate.Value.ToString("o", CultureInfo.InvariantCulture),
AirDateString = e.AirDate.Value.ToBestDateString() AirDate = e.AirDate.Value.ToBestDateString()
}); });
JsConfig.IncludeNullValues = true; JsConfig.IncludeNullValues = true;

@ -225,7 +225,7 @@ namespace NzbDrone.Web.Controllers
EpisodeCount = s.EpisodeCount, EpisodeCount = s.EpisodeCount,
EpisodeFileCount = s.EpisodeFileCount, EpisodeFileCount = s.EpisodeFileCount,
NextAiring = s.NextAiring == null ? String.Empty : s.NextAiring.Value.ToBestDateString(), NextAiring = s.NextAiring == null ? String.Empty : s.NextAiring.Value.ToBestDateString(),
NextAiringSorter = s.NextAiring == null ? "12/31/9999" : s.NextAiring.Value.ToString("MM/dd/yyyy"), NextAiringSorter = s.NextAiring == null ? new DateTime(9999, 12, 31).ToString("o", CultureInfo.InvariantCulture) : s.NextAiring.Value.ToString("o", CultureInfo.InvariantCulture),
AirTime = s.AirTimes, AirTime = s.AirTimes,
CustomStartDate = s.CustomStartDate.HasValue ? s.CustomStartDate.Value.ToString("yyyy-MM-dd") : String.Empty CustomStartDate = s.CustomStartDate.HasValue ? s.CustomStartDate.Value.ToString("yyyy-MM-dd") : String.Empty
}).ToList(); }).ToList();

@ -12,8 +12,8 @@ namespace NzbDrone.Web.Models
public string SeriesTitleSorter { get; set; } public string SeriesTitleSorter { get; set; }
public string EpisodeNumbering { get; set; } public string EpisodeNumbering { get; set; }
public string EpisodeTitle { get; set; } public string EpisodeTitle { get; set; }
public string AirDateSorter { get; set; }
public string AirDate { get; set; } public string AirDate { get; set; }
public string AirDateString { get; set; }
public string Overview { get; set; } public string Overview { get; set; }
public string Details { get; set; } public string Details { get; set; }
} }

@ -49,10 +49,10 @@
function airDate (source, type, val) { function airDate (source, type, val) {
// 'display' and 'filter' use our fancy naming // 'display' and 'filter' use our fancy naming
if (type === 'display' || type === 'filter') { if (type === 'display' || type === 'filter') {
return source["AirDateString"]; return source["AirDate"];
} }
// 'sort' and 'type' both just use the raw data // 'sort' and 'type' both just use the raw data
return source["AirDate"]; return source["AirDateSorter"];
} }
function actions(row) { function actions(row) {

Loading…
Cancel
Save