xle/troggle-unchained
2
0
Fork 0
forked from expo/troggle
Code Issues 4 Pull Requests Projects 1 Wiki Activity

bugfix for missing dates

Browse Source
This commit is contained in:
Philip Sargent 2022-09-16 21:26:03 +03:00
parent 0ab3a4ff44
commit ddfc677a1e
1 changed files with 22 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
core/views/uploads.py
View File

@ -593,23 +593,29 @@ def scanupload(request, path=None):
waldata["description url"]="" waldata["description url"]=""
# find trips and survex files of the same date # find trips and survex files of the same date
datestr = waldata["date"].replace('.','-') if waldata["date"]:
try: datestr = waldata["date"].replace('.','-')
samedate = datetime.date.fromisoformat(datestr) try:
except ValueError: samedate = datetime.date.fromisoformat(datestr)
# probably a single digit day number. HACKUS MAXIMUS. except ValueError:
# clearly we need to fix this when we first import date strings.. # probably a single digit day number. HACKUS MAXIMUS.
datestr = datestr[:-1] + '0' + datestr[-1] # clearly we need to fix this when we first import date strings..
print(f' - {datestr=} ') datestr = datestr[:-1] + '0' + datestr[-1]
samedate = datetime.date.fromisoformat(datestr) print(f' - {datestr=} ')
samedate = datetime.date.fromisoformat(datestr)
thisexpo = Expedition.objects.get(year=int(year))
expeditionday = thisexpo.get_expedition_day(samedate)
#print(f' - {thisexpo=} {expeditionday=}')
svxothers = SurvexBlock.objects.filter(expeditionday=expeditionday)
#print(f' - {thisexpo=} {expeditionday=} {svxothers=}')
trips = LogbookEntry.objects.filter(date=samedate)
else:
svxothers = None
trips = None
trips = LogbookEntry.objects.filter(date=samedate)
thisexpo = Expedition.objects.get(year=int(year))
expeditionday = thisexpo.get_expedition_day(samedate)
#print(f' - {thisexpo=} {expeditionday=}')
svxothers = SurvexBlock.objects.filter(expeditionday=expeditionday)
#print(f' - {thisexpo=} {expeditionday=} {svxothers=}')
#Survex and survex complaints, comes from json file on disc, not as pre-populated as above #Survex and survex complaints, comes from json file on disc, not as pre-populated as above
complaints, caveobject = get_complaints([], waldata, svxfiles, files, wallet, wurl) complaints, caveobject = get_complaints([], waldata, svxfiles, files, wallet, wurl)
# print(f' - {caveobject=}') # print(f' - {caveobject=}')