mirror
/
Radarr
mirror of https://github.com/Radarr/Radarr
1
0
Fork 0
Code Issues Releases Wiki Activity

Dates used for sorting will rely on EN-US standard, display will relay on user's culture.

This commit is contained in:
Mark McDowall 2012-02-14 10:48:13 -08:00
parent 02ecd0f958
commit baed29710e
5 changed files with 13 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
NzbDrone.Web/Controllers/HistoryController.cs
View File

@ -37,6 +37,7 @@ namespace NzbDrone.Web.Controllers
Quality = h.Quality.ToString(),
IsProper = h.IsProper,
Date = h.Date.ToString(),
DateSorter = h.Date.ToString("MM/dd/yyyy h:mm:ss tt"),
Indexer = h.Indexer,
EpisodeId = h.EpisodeId
}).OrderByDescending(h => h.Date).ToList();

2
NzbDrone.Web/Controllers/MissingController.cs
View File

@ -31,7 +31,7 @@ namespace NzbDrone.Web.Controllers
EpisodeTitle = e.Title,
Overview = e.Overview,
SeriesTitle = e.Series.Title,
AirDate = e.AirDate.Value.ToString(),
AirDate = e.AirDate.Value.ToString("MM/dd/yyyy"),
AirDateString = e.AirDate.Value.ToBestDateString()
});

2
NzbDrone.Web/Controllers/UpcomingController.cs
View File

@ -46,7 +46,7 @@ namespace NzbDrone.Web.Controllers
Overview = u.Overview,
AirDateTime = GetDateTime(u.AirDate.Value, u.Series.AirTimes),
AirDate = u.AirDate.Value.ToBestDateString(),
AirTime = String.IsNullOrEmpty(u.Series.AirTimes) ? "?" : Convert.ToDateTime(u.Series.AirTimes).ToShortTimeString(),
AirTime = String.IsNullOrEmpty(u.Series.AirTimes) ? "?" : Convert.ToDateTime(u.Series.AirTimes).ToString("MM/dd/yyyy"),
Status = u.Status.ToString()
}).OrderBy(e => e.AirDateTime).ToList();
}

1
NzbDrone.Web/Models/HistoryModel.cs
View File

@ -14,6 +14,7 @@ namespace NzbDrone.Web.Models
public string NzbTitle { get; set; }
public string Quality { get; set; }
public string Date { get; set; }
public string DateSorter { get; set; }
public bool IsProper { get; set; }
public string Indexer { get; set; }
public int EpisodeId { get; set; }

9
NzbDrone.Web/Views/History/Index.cshtml
View File

@ -73,6 +73,15 @@
{ sWidth: 'auto', "mDataProp": "EpisodeTitle", "bSortable": false }, //Episode Title
{ sWidth: '70px', "mDataProp": "Quality", "bSortable": false }, //Quality
{ sWidth: '150px', "mDataProp": "Date" }, //Grabbed On
{ sWidth: '150px', "mDataProp": function (source, type, val) {
// 'display' and 'filter' use our fancy naming
if (type === 'display' || type === 'filter') {
return source["Date"];
}
// 'sort' and 'type' both just use the raw data
return source["DateSorter"];
}
}, //Date
{ sWidth: '40px', "mDataProp": "HistoryId", "bSortable": false, "fnRender": function (row) {
var deleteImage = "<img src=\"../../Content/Images/X.png\" alt=\"Delete\" title=\"Delete from History\" class=\"gridImage\" onclick=\"deleteHistory(this.parentNode.parentNode, " + row.aData["HistoryId"] + ")\">";
var redownloadImage = "<img src=\"../../Content/Images/Downloading.png\" alt=\"Redownload\" title=\Redownload Episode\" class=\"gridImage\" onclick=\"redownloadHistory(this.parentNode.parentNode, " + row.aData["HistoryId"] + ", " + row.aData["EpisodeId"] + ")\">";