Merge pull request nlohmann#28 from dirtcrusher/feature/more_links

Author: nlohmann

app/templates/v2_patch.html

@@ -14,6 +14,21 @@
 {% endblock %}
 
 {% block content %}
+
+    <div class="d-flex justify-content-between">
+        {% if previous_patch is not none %}
+            <span><a href="{{ url_for('route_v2_project_project_id_patches_patch_id', project_id=project.id, patch_id=previous_patch.id, filter_patch_state=filter_patch_state, filter_confirmation_state=filter_confirmation_state, filter_run_state=filter_run_state) }}">&laquo; Patch {{ previous_patch.id }}</a></span>
+        {% else %}
+            <span></span>
+        {% endif %}
+
+        {% if next_patch is not none %}
+            <span><a href="{{ url_for('route_v2_project_project_id_patches_patch_id', project_id=project.id, patch_id=next_patch.id, filter_patch_state=filter_patch_state, filter_confirmation_state=filter_confirmation_state, filter_run_state=filter_run_state) }}">Patch {{ next_patch.id }} &raquo;</a></span>
+        {% else %}
+        <span></span>
+        {% endif %}
+    </div>
+
     <h1>Patch {{ patch.id }}</h1>
 
     <h2>Patch</h2>

app/templates/v2_patches.html

@@ -22,6 +22,7 @@ <h1>Patches</h1>
         <thead>
         <tr>
             <th>patch</th>
+            <th>file</th>
             <th>line</th>
             <th>kind</th>
             <th>state</th>
@@ -32,8 +33,9 @@ <h1>Patches</h1>
         {% for patch in patches.items %}
             <tr>
                 <td>
-                    <a href="{{ url_for('route_v2_project_project_id_patches_patch_id', project_id=project.id, patch_id=patch.id) }}">{{ patch.id }}</a>
+                    <a href="{{ url_for('route_v2_project_project_id_patches_patch_id', project_id=project.id, patch_id=patch.id, filter_patch_state=filter_patch_state, filter_confirmation_state=filter_confirmation_state, filter_run_state=filter_run_state) }}">{{ patch.id }}</a>
                 </td>
+                <td>{{ patch.file.filename|basename }}</td>
                 <td>{{ patch.line }}</td>
                 <td><a href="{{ url_for('route_v2_mutators_mutator_id', mutator_id=patch.kind) }}">{{ patch.kind }}</a></td>
                 <td>
@@ -66,15 +68,15 @@ <h1>Patches</h1>
         <ul class="pagination">
             <li class="page-item{% if not patches.has_prev %} disabled{% endif %}">
                 <a class="page-link"
-                   href="{{ url_for('route_v2_project_project_id_patches', project_id=project.id, page=patches.prev_num, patch_state=request.args.get('patch_state'), confirmation_state=request.args.get('confirmation_state')) }}">
+                   href="{{ url_for('route_v2_project_project_id_patches', project_id=project.id, page=patches.prev_num, patch_state=request.args.get('patch_state'), confirmation_state=request.args.get('confirmation_state'), run_state=request.args.get('run_state')) }}">
                     <span>&laquo;</span>
                 </a>
             </li>
 
             {% for page in patches.iter_pages() %}
                 {% if page %}
                 <li class="page-item{% if page == patches.page %} active{% endif %}">
-                    <a class="page-link" href="{{ url_for('route_v2_project_project_id_patches', project_id=project.id, page=page, patch_state=request.args.get('patch_state'), confirmation_state=request.args.get('confirmation_state')) }}">{{ page }}</a>
+                    <a class="page-link" href="{{ url_for('route_v2_project_project_id_patches', project_id=project.id, page=page, patch_state=request.args.get('patch_state'), confirmation_state=request.args.get('confirmation_state'), run_state=request.args.get('run_state')) }}">{{ page }}</a>
                 </li>
                 {% else %}
                     <li class="page-item disabled">
@@ -85,11 +87,11 @@ <h1>Patches</h1>
 
             <li class="page-item{% if not patches.has_next %} disabled{% endif %}">
                 <a class="page-link"
-                   href="{{ url_for('route_v2_project_project_id_patches', project_id=project.id, page=patches.next_num, patch_state=request.args.get('patch_state'), confirmation_state=request.args.get('confirmation_state')) }}">
+                   href="{{ url_for('route_v2_project_project_id_patches', project_id=project.id, page=patches.next_num, patch_state=request.args.get('patch_state'), confirmation_state=request.args.get('confirmation_state'), run_state=request.args.get('run_state')) }}">
                     <span>&raquo;</span>
                 </a>
             </li>
         </ul>
     </nav>
 
-{% endblock %}
+{% endblock %}

app/templates/v2_project.html

@@ -142,17 +142,17 @@ <h2 class="pt-5">Patches</h2>
                         <ul>
                             {% if run_stats.run.count._all_.failure %}
                             <li>
-                                <a class="bg-success text-white" href="">{{ run_stats.run.count._all_.failure }} failure</a>
+                                <a class="bg-success text-white" href="{{ url_for('route_v2_project_project_id_patches', project_id=project.id, patch_state='killed', run_state='failure') }}">{{ run_stats.run.count._all_.failure }} failure</a>
                             </li>
                             {% endif %}
                         {% if run_stats.run.count._all_.nochange %}
                             <li>
-                                <a class="bg-success text-white" href="">{{ run_stats.run.count._all_.nochange }} nochange</a>
+                                <a class="bg-success text-white" href="{{ url_for('route_v2_project_project_id_patches', project_id=project.id, patch_state='killed', run_state='nochange') }}">{{ run_stats.run.count._all_.nochange }} nochange</a>
                             </li>
                         {% endif %}
                         {% if run_stats.run.count._all_.timeout %}
                             <li>
-                                <a class="bg-success text-white" href="">{{ run_stats.run.count._all_.timeout }} timeout</a>
+                                <a class="bg-success text-white" href="{{ url_for('route_v2_project_project_id_patches', project_id=project.id, patch_state='killed', run_state='timeout') }}">{{ run_stats.run.count._all_.timeout }} timeout</a>
                             </li>
                         {% endif %}
                         </ul>

app/views.py

@@ -226,6 +226,7 @@ def route_v2_project_project_id_patches(project_id):
     page = int(request.args.get('page', 1))
     patch_state = request.args.get('patch_state')
     confirmation_state = request.args.get('confirmation_state')
+    run_state = request.args.get('run_state')
 
     # initial patch query
     patches = Patch.query.filter(Patch.project_id == project_id)
@@ -235,23 +236,33 @@ def route_v2_project_project_id_patches(project_id):
         patches = patches.filter(Patch.state == patch_state)
     if confirmation_state:
         patches = patches.filter(Patch.confirmation == confirmation_state)
+    if run_state:
+        patches = patches.join(Run).filter(Run.log == run_state)
 
     # add pagination
     patches = patches.paginate(page, app.config['ITEMS_PER_PAGE'], False)
 
-    return render_template('v2_patches.html', project=project, patches=patches)
+    return render_template('v2_patches.html', project=project, patches=patches, filter_patch_state=patch_state,
+                           filter_confirmation_state=confirmation_state, filter_run_state=run_state)
 
 
 @app.route('/projects/<int:project_id>/patches/<int:patch_id>', methods=['GET', 'POST'])
 def route_v2_project_project_id_patches_patch_id(project_id, patch_id):
+    # retrieve project
     project = Project.query.get(project_id)
     if project is None:
         abort(404)
 
+    # retrieve patch
     patch = Patch.query.get(patch_id)
     if patch is None:
         abort(404)
 
+    # retrieve parameters
+    filter_patch_state = request.args.get('filter_patch_state')
+    filter_confirmation_state = request.args.get('filter_confirmation_state')
+    filter_run_state = request.args.get('filter_run_state')
+
     form = SetConfirmationForm()
 
     if request.method == 'GET':
@@ -260,7 +271,22 @@ def route_v2_project_project_id_patches_patch_id(project_id, patch_id):
         patch.confirmation = form.confirmation.data
         db.session.commit()
 
-    return render_template('v2_patch.html', project=project, patch=patch, form=form)
+    # retrieve previous and next patch id
+    filtered_patches = Patch.query
+    if filter_patch_state:
+        filtered_patches = filtered_patches.where(Patch.state == filter_patch_state)
+    if filter_confirmation_state:
+        filtered_patches = filtered_patches.where(Patch.confirmation == filter_confirmation_state)
+    if filter_run_state:
+        filtered_patches = filtered_patches.join(Run).filter(Run.log == filter_run_state)
+
+    previous_patch = filtered_patches.where(Patch.id < patch.id).order_by(Patch.id.desc()).first()
+
+    next_patch = filtered_patches.where(Patch.id > patch.id).order_by(Patch.id).first()
+
+    return render_template('v2_patch.html', project=project, patch=patch, form=form,
+                           filter_patch_state=filter_patch_state, filter_confirmation_state=filter_confirmation_state,
+                           filter_run_state=filter_run_state, previous_patch=previous_patch, next_patch=next_patch)
 
 
 @app.route('/projects/<int:project_id>/files/<int:file_id>/generate', methods=['GET', 'POST'])
@@ -332,4 +358,3 @@ def route_v2_mutators_mutator_id(mutator_id):
         abort(404)
 
     return render_template('v2_mutator.html', mutator=mutator, patches=patches)
-