diff options
| author | Philip Sargent <philip.sargent@klebos.com> | 2022-09-20 22:52:31 +0300 |
|---|---|---|
| committer | Philip Sargent <philip.sargent@klebos.com> | 2022-09-20 22:52:31 +0300 |
| commit | 71bd07e70e542df553c595096dede77ea9569052 (patch) | |
| tree | da4df221a9f8fe908ba94bf406c4fce6e63ef1ec /core/views/uploads.py | |
| parent | 94b49adc4ed961807ca32b726ccbf300f129e49c (diff) | |
| download | troggle-71bd07e70e542df553c595096dede77ea9569052.tar.gz troggle-71bd07e70e542df553c595096dede77ea9569052.tar.bz2 troggle-71bd07e70e542df553c595096dede77ea9569052.zip | |
Handling and fixing bad dates in JSON input
Diffstat (limited to 'core/views/uploads.py')
| -rw-r--r-- | core/views/uploads.py | 22 |
1 files changed, 16 insertions, 6 deletions
diff --git a/core/views/uploads.py b/core/views/uploads.py index e1c1c8e..79fdae7 100644 --- a/core/views/uploads.py +++ b/core/views/uploads.py @@ -631,14 +631,24 @@ def scanupload(request, path=None): # clearly we need to fix this when we first import date strings.. datestr = datestr[:-1] + '0' + datestr[-1] print(f' - {datestr=} ') - samedate = datetime.date.fromisoformat(datestr) + try: + samedate = datetime.date.fromisoformat(datestr) + except: + try: + samedate = datetime.date.fromisoformat(datestr[:10]) + except: + samedate = None 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) + if samedate: + 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 else: svxothers = None |