Merge pull request 'fixing tables' (#24) from work into main
Reviewed-on: #24
This commit is contained in:
commit
2584ec7c14
@ -228,6 +228,7 @@ else:
|
|||||||
returntable += tablestart + "<colgroup><col/><col/><col/><col/><col/><col/><col/><col/></colgroup><tr><th>Name"+th+"Type"+th+"Times Renewed"+th+"Checked Out"+th+"Due Date"+th+"Title" + th + "ISBN" + th + "Thumbnail</th></tr>"
|
returntable += tablestart + "<colgroup><col/><col/><col/><col/><col/><col/><col/><col/></colgroup><tr><th>Name"+th+"Type"+th+"Times Renewed"+th+"Checked Out"+th+"Due Date"+th+"Title" + th + "ISBN" + th + "Thumbnail</th></tr>"
|
||||||
for item in returnlist:
|
for item in returnlist:
|
||||||
returntable += "<TR><TD>" + item.person + td + item.materialtype + td + str(item.renewalcount) + td + str(item.checkoutdate) + td + str(item.duedate) + td + item.title + td + item.isbn + td +'<img src="'+ item.coverurl+'">' +"</td></tr>\n"
|
returntable += "<TR><TD>" + item.person + td + item.materialtype + td + str(item.renewalcount) + td + str(item.checkoutdate) + td + str(item.duedate) + td + item.title + td + item.isbn + td +'<img src="'+ item.coverurl+'">' +"</td></tr>\n"
|
||||||
|
returntable += tableend
|
||||||
returnlist = [d for d in allbooks if (d.renewalcount == 2)]
|
returnlist = [d for d in allbooks if (d.renewalcount == 2)]
|
||||||
if len(returnlist) == 0:
|
if len(returnlist) == 0:
|
||||||
pass
|
pass
|
||||||
@ -243,6 +244,7 @@ else:
|
|||||||
returntable += tablestart + "<colgroup><col/><col/><col/><col/><col/><col/><col/><col/></colgroup><tr><th>Name"+th+"Type"+th+"Times Renewed"+th+"Checked Out"+th+"Due Date"+th+"Title" + th + "ISBN" + th + "Thumbnail</th></tr>"
|
returntable += tablestart + "<colgroup><col/><col/><col/><col/><col/><col/><col/><col/></colgroup><tr><th>Name"+th+"Type"+th+"Times Renewed"+th+"Checked Out"+th+"Due Date"+th+"Title" + th + "ISBN" + th + "Thumbnail</th></tr>"
|
||||||
for item in returnlist:
|
for item in returnlist:
|
||||||
returntable += "<TR><TD>" + item.person + td + item.materialtype + td + str(item.renewalcount) + td + str(item.checkoutdate) + td + str(item.duedate) + td + item.title + td + item.isbn + td +'<img src="'+ item.coverurl+'">' +"</td></tr>\n"
|
returntable += "<TR><TD>" + item.person + td + item.materialtype + td + str(item.renewalcount) + td + str(item.checkoutdate) + td + str(item.duedate) + td + item.title + td + item.isbn + td +'<img src="'+ item.coverurl+'">' +"</td></tr>\n"
|
||||||
|
returntable += tableend
|
||||||
returnlist = [d for d in allbooks if (d.renewalcount == 1)]
|
returnlist = [d for d in allbooks if (d.renewalcount == 1)]
|
||||||
if len(returnlist) == 0:
|
if len(returnlist) == 0:
|
||||||
pass
|
pass
|
||||||
@ -258,6 +260,7 @@ else:
|
|||||||
returntable += tablestart + "<colgroup><col/><col/><col/><col/><col/><col/><col/><col/></colgroup><tr><th>Name"+th+"Type"+th+"Times Renewed"+th+"Checked Out"+th+"Due Date"+th+"Title" + th + "ISBN" + th + "Thumbnail</th></tr>"
|
returntable += tablestart + "<colgroup><col/><col/><col/><col/><col/><col/><col/><col/></colgroup><tr><th>Name"+th+"Type"+th+"Times Renewed"+th+"Checked Out"+th+"Due Date"+th+"Title" + th + "ISBN" + th + "Thumbnail</th></tr>"
|
||||||
for item in returnlist:
|
for item in returnlist:
|
||||||
returntable += "<TR><TD>" + item.person + td + item.materialtype + td + str(item.renewalcount) + td + str(item.checkoutdate) + td + str(item.duedate) + td + item.title + td + item.isbn + td +'<img src="'+ item.coverurl+'">' +"</td></tr>\n"
|
returntable += "<TR><TD>" + item.person + td + item.materialtype + td + str(item.renewalcount) + td + str(item.checkoutdate) + td + str(item.duedate) + td + item.title + td + item.isbn + td +'<img src="'+ item.coverurl+'">' +"</td></tr>\n"
|
||||||
|
returntable += tableend
|
||||||
returnlist = [d for d in allbooks if (d.renewalcount == 0)]
|
returnlist = [d for d in allbooks if (d.renewalcount == 0)]
|
||||||
if len(returnlist) == 0:
|
if len(returnlist) == 0:
|
||||||
pass
|
pass
|
||||||
@ -273,6 +276,7 @@ else:
|
|||||||
returntable += tablestart + "<colgroup><col/><col/><col/><col/><col/><col/><col/><col/></colgroup><tr><th>Name"+th+"Type"+th+"Times Renewed"+th+"Checked Out"+th+"Due Date"+th+"Title" + th + "ISBN" + th + "Thumbnail</th></tr>"
|
returntable += tablestart + "<colgroup><col/><col/><col/><col/><col/><col/><col/><col/></colgroup><tr><th>Name"+th+"Type"+th+"Times Renewed"+th+"Checked Out"+th+"Due Date"+th+"Title" + th + "ISBN" + th + "Thumbnail</th></tr>"
|
||||||
for item in returnlist:
|
for item in returnlist:
|
||||||
returntable += "<TR><TD>" + item.person + td + item.materialtype + td + str(item.renewalcount) + td + str(item.checkoutdate) + td + str(item.duedate) + td + item.title + td + item.isbn + td +'<img src="'+ item.coverurl+'">' +"</td></tr>\n"
|
returntable += "<TR><TD>" + item.person + td + item.materialtype + td + str(item.renewalcount) + td + str(item.checkoutdate) + td + str(item.duedate) + td + item.title + td + item.isbn + td +'<img src="'+ item.coverurl+'">' +"</td></tr>\n"
|
||||||
|
returntable += tableend
|
||||||
with open("/var/www/html/returnlist.html","w",encoding='utf-8') as outhtml:
|
with open("/var/www/html/returnlist.html","w",encoding='utf-8') as outhtml:
|
||||||
outhtml.write(returntable)
|
outhtml.write(returntable)
|
||||||
htmltable = returntable
|
htmltable = returntable
|
||||||
|
Loading…
x
Reference in New Issue
Block a user