Minor tweaks.

This commit is contained in:
Timothy Allen 2018-10-17 20:21:01 +02:00
parent 6dce6de696
commit de62a36fa7
2 changed files with 3 additions and 3 deletions

View File

@ -56,7 +56,7 @@ def main():
spreadsheets = [] spreadsheets = []
uniqurl = [] uniqurl = []
wpa = 'http://www.wpa.org.za/Events/DynamicEvents.asmx/BuildEventDisplay' wpa = 'http://www.wpa.org.za/Events/DynamicEvents.asmx/BuildEventDisplay'
for year in range(2016, dt.datetime.now().year + 1): for year in range(2018, dt.datetime.now().year + 1):
log.debug("Finding results for {}".format(year)); log.debug("Finding results for {}".format(year));
args = {"WPAExtra":"True","TimeColumn":"True","entityid":"674417","selectedyear":year,"selectedmonth":0,"commissionid":"0","selectedstate":"0","categoryid":0,"themeid":"46"} args = {"WPAExtra":"True","TimeColumn":"True","entityid":"674417","selectedyear":year,"selectedmonth":0,"commissionid":"0","selectedstate":"0","categoryid":0,"themeid":"46"}
data = bytes(json.dumps(args).encode('utf8')) data = bytes(json.dumps(args).encode('utf8'))
@ -99,7 +99,7 @@ def main():
filename = os.path.basename(urlparts.path) filename = os.path.basename(urlparts.path)
if re.search('WALKRESULTS', filename, flags=re.IGNORECASE): if re.search('WALKRESULTS', filename, flags=re.IGNORECASE):
continue continue
log.info("Loading data from URL {}".format(url)) log.warning("Loading data from URL {}".format(url))
filepath = os.path.join(tmpdir, filename) filepath = os.path.join(tmpdir, filename)
with open(filepath, 'wb') as fp: with open(filepath, 'wb') as fp:
fp.write(data) fp.write(data)

View File

@ -35,7 +35,7 @@
<td class="nowrap"><span class="label">Date</span> <span>{{ row.date|cleandate|e }}</span></td> <td class="nowrap"><span class="label">Date</span> <span>{{ row.date|cleandate|e }}</span></td>
<td class="long"><span class="label">Notes</span> <span> <td class="long"><span class="label">Notes</span> <span>
{%- if row.sex and row.sexposition and row.sexposition | int <= 100 %}{{ row.sexposition|ordinal|e }} {{ row.sex|lower|gender|e }}{% endif -%} {%- if row.sex and row.sexposition and row.sexposition | int <= 100 %}{{ row.sexposition|ordinal|e }} {{ row.sex|lower|gender|e }}{% endif -%}
{%- if row.sexposition and row.sexposition | int <= 100 and row.catposition and row.catposition | int <= 100 %} and {% endif -%} {%- if row.sex and row.sexposition and row.sexposition | int <= 100 and row.catposition and row.catposition | int <= 100 %} and {% endif -%}
{%- if row.catposition and row.catposition | int <= 100 %}{{ row.catposition|ordinal|e }} in category{% endif -%} {%- if row.catposition and row.catposition | int <= 100 %}{{ row.catposition|ordinal|e }} in category{% endif -%}
</span> </span>
</td> </td>