Commit 9b6fd8b9 authored by echel0n's avatar echel0n

Added MISSED labeling to show display view

parent 036fc030
# Changelog
- * a244b27 - 2017-10-24: Refactoring requirements.txt
- * 54586ee - 2017-10-24: Added MISSED labeling to show display view
- * 036fc03 - 2017-10-24: Refactoring requirements.txt
- * 2a15a42 - 2017-10-24: Refactoring requirements.txt
- * c7de2b3 - 2017-10-24: Refactoring requirements.txt
- * 3df51c0 - 2017-10-24: Refactoring requirements.txt
......
......@@ -961,13 +961,18 @@ ul.tags li a {
}
.wanted {
background-color: #ffb0b0;
background-color: #ff9f38;
}
.snatched {
background-color: #ebc1ea;
}
.missed {
background-color: #ffb0b0;
}
span.unaired {
color: #584b20;
border: 1px solid #584b20;
......@@ -989,8 +994,8 @@ span.qual {
}
span.wanted {
color: #890000;
border: 1px solid #890000;
color: #894305;
border: 1px solid #894305;
}
span.snatched {
......@@ -998,11 +1003,17 @@ span.snatched {
border: 1px solid #652164;
}
span.missed {
color: #890000;
border: 1px solid #890000;
}
span.unaired b,
span.skipped b,
span.good b,
span.qual b,
span.wanted b,
span.missed b,
span.snatched b {
color: #000000;
font-weight: 800;
......
......@@ -612,6 +612,7 @@ class Overview(object):
WANTED = WANTED # 3
GOOD = 4
SKIPPED = SKIPPED # 5
MISSED = 6 # 6
# For both snatched statuses. Note: SNATCHED/QUAL have same value and break dict.
SNATCHED = SNATCHED_PROPER = SNATCHED_BEST # 9
......@@ -621,7 +622,8 @@ class Overview(object):
QUAL: "qual",
GOOD: "good",
UNAIRED: "unaired",
SNATCHED: "snatched"}
SNATCHED: "snatched",
MISSED: "missed"}
def get_quality_string(quality):
......
This source diff could not be displayed because it is too large. You can view the blob instead.
......@@ -61,6 +61,7 @@ from sickrage.core.helpers import argToBool, backupSR, chmodAsParent, findCertai
clean_hosts
from sickrage.core.helpers.browser import foldersAtPath
from sickrage.core.helpers.compat import cmp
from sickrage.core.helpers.srdatetime import srDateTime
from sickrage.core.imdb_popular import imdbPopular
from sickrage.core.media.util import indexerImage
from sickrage.core.nameparser import validator
......@@ -1161,7 +1162,6 @@ class Home(WebHandler):
return self.redirect('/' + sickrage.srCore.srConfig.DEFAULT_PAGE + '/')
def displayShow(self, show=None):
if show is None:
return self._genericMessage(_("Error"), _("Invalid show ID"))
else:
......@@ -1244,9 +1244,20 @@ class Home(WebHandler):
epCounts[Overview.GOOD] = 0
epCounts[Overview.UNAIRED] = 0
epCounts[Overview.SNATCHED] = 0
epCounts[Overview.MISSED] = 0
for curEp in episodeResults:
curEpCat = showObj.getOverview(int(curEp['status'] or -1))
if curEp['airdate'] != 1:
today = datetime.datetime.now().replace(tzinfo=tz_updater.sr_timezone)
airDate = datetime.datetime.fromordinal(curEp['airdate'])
if airDate.year >= 1970 or showObj.network:
airDate = srDateTime.convert_to_setting(
tz_updater.parse_date_time(airDate, showObj.airs, showObj.network))
if curEpCat == Overview.WANTED and airDate < today:
curEpCat = Overview.MISSED
if curEpCat:
epCats[str(curEp['season']) + "x" + str(curEp['episode'])] = curEpCat
epCounts[curEpCat] += 1
......
......@@ -415,6 +415,12 @@
<div class="col-md-6 pull-right">
<div class="pull-right" id="checkboxControls">
<div>
<label class="pull-right" for="missed" style="padding-bottom: 5px;">
<span class="missed">
<input type="checkbox" id="missed" checked/>
${_('Missed:')} <b>${epCounts[Overview.MISSED]}</b>
</span>
</label>
<label class="pull-right" for="wanted" style="padding-bottom: 5px;">
<span class="wanted">
<input type="checkbox" id="wanted" checked/>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment