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

21
rowers/templates/forcecurve_analysis.html
View File

@@ -19,7 +19,7 @@
<h1>Force Curve Analysis for {{ rower.user.first_name }} {{ rower.user.last_name }}</h1> <h1>Force Curve Analysis for {{ rower.user.first_name }} {{ rower.user.last_name }}</h1>
<form enctype="multipart/form-data" method="post">
<ul class="main-content"> <ul class="main-content">
{% if the_div %} {% if the_div %}
<li class="grid_4"> <li class="grid_4">
@@ -28,6 +28,18 @@
</div> </div>
</li> </li>
{% endif %} {% endif %}
<li class="grid_4">
<form method="get">
{{ searchform.as_table }}
{{ dateform.as_table }}
<input name='filter' type='submit' value="Filter">
</form>
</li>
<li class="grid_4">
<form enctype="multipart/form-data" method="post">
{% csrf_token %}
<input name='instroke_compare' type="submit" value="Compare Selected">
</li>
{% if analyses %} {% if analyses %}
{% for analysis in analyses %} {% for analysis in analyses %}
<li class="grid_4 divlines" id="analysis_{{ analysis.id }}"> <li class="grid_4 divlines" id="analysis_{{ analysis.id }}">
@@ -84,14 +96,11 @@
{% endfor %} {% endfor %}
{% else %} {% else %}
<li class="grid_4"> <li class="grid_4">
<p>You have not saved any analyses for {{ rower.user.first_name }}</p> <p>No analyses found for {{ rower.user.first_name }}</p>
</li> </li>
{% endif %} {% endif %}
</form>
</ul> </ul>
{% csrf_token %}
<input name='instroke_compare' type="submit" value="Compare Selected">
</form>
{% endblock %} {% endblock %}

2
rowers/templates/instroke_analysis.html
View File

@@ -95,7 +95,7 @@
{% endfor %} {% endfor %}
{% else %} {% else %}
<li class="grid_4"> <li class="grid_4">
<p>You have not saved any analyses for {{ rower.user.first_name }}</p> <p>No analyses found for {{ rower.user.first_name }}</p>
</li> </li>
{% endif %} {% endif %}
</form> </form>

28
rowers/views/analysisviews.py
View File

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