1
0
Fork 0
mirror of https://github.com/evilhero/mylar synced 2025-03-19 01:55:21 +00:00

Story Arc Updates

This commit is contained in:
DarkSir23 2016-09-15 23:48:40 -04:00 committed by evilhero
parent cb7da2e6a3
commit 0ff36a145f
3 changed files with 5 additions and 3 deletions

View file

@ -136,6 +136,7 @@
<td id="action">
%if item['Status'] is None or item['Status'] == None:
<a href="#" onclick="doAjaxCall('queueit?ComicName=${item['ComicName'] | u}&ComicIssue=${item['IssueNumber']}&ComicYear=${issuedate}&mode=readlist&SARC=${item['StoryArc']}&IssueArcID=${item['IssueArcID']}&SeriesYear=${item['SeriesYear']}',$(this),'table')" data-success="Now searching for ${item['ComicName']} #${item['IssueNumber']}"><span class="ui-icon ui-icon-plus"></span>Grab it</a>
<a title="Remove Issue from Story Arc" onclick="doAjaxCall('removefromreadlist?&IssueArcID=${item['IssueArcID']}',$(this),'table')" data-success='Successfully deleted ${item['IssueArcID']}'><span class="ui-icon ui-icon-minus"></span>Remove it</a>
%elif item['Status'] == 'Snatched':
<a href="#" onclick="doAjaxCall('queueissue?ComicName=${item['ComicName'] | u}&ComicIssue=${item['IssueNumber']}&ComicYear=${issuedate}&mode=readlist&SARC=${item['StoryArc']}&IssueArcID=${item['IssueArcID']}&SeriesYear=${item['SeriesYear']}',$(this),'table')" data-success="Trying to Retry"><span class="ui-icon ui-icon-plus"></span>Retry</a>
%endif

View file

@ -1106,7 +1106,7 @@ def renamefile_readingorder(readorder):
import logger
logger.fdebug('readingorder#: ' + str(readorder))
if int(readorder) < 10: readord = "00" + str(readorder)
elif int(readorder) > 10 and int(readorder) < 99: readord = "0" + str(readorder)
elif int(readorder) >= 10 and int(readorder) < 99: readord = "0" + str(readorder)
else: readord = str(readorder)
return readord

View file

@ -2301,6 +2301,7 @@ class WebInterface(object):
alist = myDB.select("SELECT * from readinglist WHERE ComicName is not Null group by StoryArcID") #COLLATE NOCASE")
for al in alist:
totalcnt = myDB.select("SELECT * FROM readinglist WHERE StoryArcID=?", [al['StoryArcID']])
totalissues = myDB.select("SELECT COUNT(*) as count from readinglist WHERE StoryARcID=?", [al['StoryArcID']])
lowyear = 9999
maxyear = 0
for la in totalcnt:
@ -2321,7 +2322,7 @@ class WebInterface(object):
havecnt = myDB.select("SELECT COUNT(*) as count FROM readinglist WHERE StoryArcID=? AND (Status='Downloaded' or Status='Archived')", [al['StoryArcID']])
havearc = havecnt[0][0]
totalarc = int(al['TotalIssues'])
totalarc = totalissues[0][0]
if not havearc:
havearc = 0
try:
@ -2340,7 +2341,7 @@ class WebInterface(object):
"percent": percent,
"Have": havearc,
"SpanYears": spanyears,
"Total": al['TotalIssues'],
"Total": totalissues[0][0],
"CV_ArcID": al['CV_ArcID']})
return serve_template(templatename="storyarc.html", title="Story Arcs", arclist=arclist, delete_type=0)
storyarc_main.exposed = True