sander/rowsandall
Private
Public Access
1
0
Fork 0
Code Activity

nog mooier fitleren

Browse Source
This commit is contained in:
Sander Roosendaal
2022-11-14 21:19:07 +01:00
parent a63d55a0e5
commit 03c91df45b
3 changed files with 38 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
rowers/views/analysisviews.py
View File

@@ -1974,12 +1974,26 @@ class SavedAnalysisView(UserPassesTestMixin, View):
self.searchform = SearchForm()
if query:
query_list = query.split()
self.analyses = self.analyses.filter(
reduce(operator.and_,
(Q(name__icontains=q) for q in query_list)) |
reduce(operator.and_,
(Q(notes__icontains=q) for q in query_list))
)
if self.analysis_class == InStrokeAnalysis:
self.analyses = self.analyses.filter(
reduce(operator.and_,
(Q(name__icontains=q) for q in query_list)) |
reduce(operator.and_,
(Q(notes__icontains=q) for q in query_list)) |
reduce(operator.and_,
(Q(metric__icontains=q) for q in query_list)) |
reduce(operator.and_,
(Q(workout__name__icontains=q) for q in query_list))
)
else:
self.analyses = self.analyses.filter(
reduce(operator.and_,
(Q(name__icontains=q) for q in query_list)) |
reduce(operator.and_,
(Q(notes__icontains=q) for q in query_list)) |
reduce(operator.and_,
(Q(workout__name__icontains=q) for q in query_list))
)
self.searchform = SearchForm(initial={'q': query})
date_initial = {}
if startdate:
@@ -2023,6 +2037,8 @@ class SavedAnalysisView(UserPassesTestMixin, View):
'the_script': self.script,
'the_div': self.div,
'selected': self.selected,
'searchform': self.searchform,
'dateform': self.dateform,
})