github/Ombi
1
0
Fork 0
mirror of https://github.com/Ombi-app/Ombi.git synced 2025-07-15 01:32:55 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions

Added Released propety to RequestViewModel. Added Released filter to the Requests page

Browse source
This commit is contained in:
Chris Lees 2016-04-29 14:46:39 -04:00
parent 21a3830101
commit 1f2e460f6d
4 changed files with 11 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

1
PlexRequests.UI/Content/requests.js
View file

@ -540,6 +540,7 @@ function buildRequestContext(result, type) {
requestedUsers: result.requestedUsers ? result.requestedUsers.join(', ') : '', requestedUsers: result.requestedUsers ? result.requestedUsers.join(', ') : '',
requestedDate: Humanize(result.requestedDate), requestedDate: Humanize(result.requestedDate),
requestedDateTicks: result.requestedDateTicks, requestedDateTicks: result.requestedDateTicks,
released: result.released,
available: result.available, available: result.available,
admin: result.admin, admin: result.admin,
issues: result.issues, issues: result.issues,

1
PlexRequests.UI/Models/RequestViewModel.cs
View file

@ -38,6 +38,7 @@ namespace PlexRequests.UI.Models
public string Title { get; set; } public string Title { get; set; }
public string PosterPath { get; set; } public string PosterPath { get; set; }
public DateTime ReleaseDate { get; set; } public DateTime ReleaseDate { get; set; }
public bool Released { get; set; }
public long ReleaseDateTicks { get; set; } public long ReleaseDateTicks { get; set; }
public RequestType Type { get; set; } public RequestType Type { get; set; }
public string Status { get; set; } public string Status { get; set; }

3
PlexRequests.UI/Modules/RequestsModule.cs
View file

@ -163,6 +163,7 @@ namespace PlexRequests.UI.Modules
ReleaseDate = movie.ReleaseDate, ReleaseDate = movie.ReleaseDate,
ReleaseDateTicks = movie.ReleaseDate.Ticks, ReleaseDateTicks = movie.ReleaseDate.Ticks,
RequestedDate = movie.RequestedDate, RequestedDate = movie.RequestedDate,
Released = DateTime.Now > movie.ReleaseDate,
RequestedDateTicks = DateTimeHelper.OffsetUTCDateTime(movie.RequestedDate, DateTimeOffset).Ticks, RequestedDateTicks = DateTimeHelper.OffsetUTCDateTime(movie.RequestedDate, DateTimeOffset).Ticks,
Approved = movie.Available || movie.Approved, Approved = movie.Available || movie.Approved,
Title = movie.Title, Title = movie.Title,
@ -246,6 +247,7 @@ namespace PlexRequests.UI.Modules
ReleaseDateTicks = tv.ReleaseDate.Ticks, ReleaseDateTicks = tv.ReleaseDate.Ticks,
RequestedDate = tv.RequestedDate, RequestedDate = tv.RequestedDate,
RequestedDateTicks = DateTimeHelper.OffsetUTCDateTime(tv.RequestedDate, DateTimeOffset).Ticks, RequestedDateTicks = DateTimeHelper.OffsetUTCDateTime(tv.RequestedDate, DateTimeOffset).Ticks,
Released = DateTime.Now > tv.ReleaseDate,
Approved = tv.Available || tv.Approved, Approved = tv.Available || tv.Approved,
Title = tv.Title, Title = tv.Title,
Overview = tv.Overview, Overview = tv.Overview,
@ -288,6 +290,7 @@ namespace PlexRequests.UI.Modules
ReleaseDateTicks = album.ReleaseDate.Ticks, ReleaseDateTicks = album.ReleaseDate.Ticks,
RequestedDate = album.RequestedDate, RequestedDate = album.RequestedDate,
RequestedDateTicks = DateTimeHelper.OffsetUTCDateTime(album.RequestedDate, DateTimeOffset).Ticks, RequestedDateTicks = DateTimeHelper.OffsetUTCDateTime(album.RequestedDate, DateTimeOffset).Ticks,
Released = DateTime.Now > album.ReleaseDate,
Approved = album.Available || album.Approved, Approved = album.Available || album.Approved,
Title = album.Title, Title = album.Title,
Overview = album.Overview, Overview = album.Overview,

4
PlexRequests.UI/Views/Requests/Index.cshtml
View file

@ -63,6 +63,8 @@
<li><a href="#" class="filter" data-filter=".approved-false"><i class="fa fa-square-o"></i> Not Approved</a></li> <li><a href="#" class="filter" data-filter=".approved-false"><i class="fa fa-square-o"></i> Not Approved</a></li>
<li><a href="#" class="filter" data-filter=".available-true"><i class="fa fa-square-o"></i> Available</a></li> <li><a href="#" class="filter" data-filter=".available-true"><i class="fa fa-square-o"></i> Available</a></li>
<li><a href="#" class="filter" data-filter=".available-false"><i class="fa fa-square-o"></i> Not Available</a></li> <li><a href="#" class="filter" data-filter=".available-false"><i class="fa fa-square-o"></i> Not Available</a></li>
<li><a href="#" class="filter" data-filter=".released-true"><i class="fa fa-square-o"></i> Released</a></li>
<li><a href="#" class="filter" data-filter=".released-false"><i class="fa fa-square-o"></i> Not Released</a></li>
</ul> </ul>
</div> </div>
<div class="btn-group"> <div class="btn-group">
@ -125,7 +127,7 @@
<script id="search-template" type="text/x-handlebars-template"> <script id="search-template" type="text/x-handlebars-template">
<div id="{{requestId}}Template" class="mix available-{{available}} approved-{{approved}}" data-requestorder="{{requestedDateTicks}}" data-releaseorder="{{releaseDateTicks}}"> <div id="{{requestId}}Template" class="mix available-{{available}} approved-{{approved}} released-{{released}}" data-requestorder="{{requestedDateTicks}}" data-releaseorder="{{releaseDateTicks}}">
<div class="row"> <div class="row">
<div class="col-sm-2"> <div class="col-sm-2">
{{#if_eq type "movie"}} {{#if_eq type "movie"}}