ctactic/aircox-radiocampus
1
0
Fork 0
forked from rc/aircox
Code Issues 10 Pull Requests Activity

work on admin interface, fix bugs

Browse Source
This commit is contained in:
bkfox
2016-10-28 12:18:12 +02:00
parent 28597e470c
commit 45268cd699
8 changed files with 138 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
aircox/models.py
View File

@ -208,6 +208,8 @@ class Station(Nameable):
logs.filter(date__gt = diff.end, date__lt = diff_.start) \
if diff_ else \
logs.filter(date__gt = diff.end)
print(diff.end, *[str(log.date > diff.end) + " " + str(log.date) for log in logs])
diff_ = diff
items.extend(logs_)
items.append(diff)
@ -217,7 +219,7 @@ class Station(Nameable):
if diff_:
if count and len(items) >= count:
return items[:count]
logs_ = logs.filter(date__lt = diff_.end)
logs_ = logs.filter(date__lt = diff_.start)
else:
logs_ = logs.all()