sporada/nopaque
1
0
Fork 0
mirror of https://gitlab.ub.uni-bielefeld.de/sfb1288inf/nopaque.git synced 2024-11-15 01:05:42 +00:00
Code Issues Projects Releases Wiki Activity

Merge branch 'development' of gitlab.ub.uni-bielefeld.de:sfb1288inf/nopaque into development

Browse Source
This commit is contained in:
Patrick Jentsch 2020-07-13 15:33:58 +02:00
commit ac3310fea5
5 changed files with 12 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
web/app/results/views.py
View File

@ -14,9 +14,9 @@ from .. import logger
from jsonschema import validate
@results.route('/import_results', methods=['GET', 'POST'])
@results.route('/import', methods=['GET', 'POST'])
@login_required
def import_results():
def result_import():
'''
View to import one json result file. Uses the ImportReultFileForm.
'''
@ -77,9 +77,9 @@ def import_results():
# deletes before created Result and ResultFile db entries
tasks.delete_result(result.id)
return make_response(
{'redirect_url': url_for('results.import_results')},
{'redirect_url': url_for('results.result_import')},
201)
return render_template('results/import_results.html.j2',
return render_template('results/result_import.html.j2',
import_results_form=import_results_form,
title='Add corpus file')
@ -132,7 +132,7 @@ def result_details(result_id):
@login_required
def result_inspect(result_id):
'''
View to inspect one importe result file in a corpus analysis like interface
View to inspect one imported result file in a corpus analysis like interface
'''
display_options_form = DisplayOptionsForm(
prefix='display-options-form',

2
web/app/templates/main/dashboard.html.j2
View File

@ -28,7 +28,7 @@
<ul class="pagination"></ul>
</div>
<div class="card-action right-align">
<a class="waves-effect waves-light btn" href="{{ url_for('results.import_results') }}">Import Results<i class="material-icons right">file_upload</i></a>
<a class="waves-effect waves-light btn" href="{{ url_for('results.result_import') }}">Import Results<i class="material-icons right">file_upload</i></a>
<a class="waves-effect waves-light btn" href="{{ url_for('results.results_overview') }}">Show Imported Results<i class="material-icons right">folder</i></a>
<a class="waves-effect waves-light btn" href="{{ url_for('corpora.add_corpus') }}">New corpus<i class="material-icons right">add</i></a>
</div>

0
web/app/templates/results/import_results.html.j2 → web/app/templates/results/result_import.html.j2
View File

2
web/app/templates/results/results.html.j2
View File

@ -41,7 +41,7 @@
<ul class="pagination paginationBottom"></ul>
</div>
<div class="card-action right-align">
<a class="waves-effect waves-light btn" href="{{ url_for('results.import_results') }}">Import Results<i class="material-icons right">file_upload</i></a>
<a class="waves-effect waves-light btn" href="{{ url_for('results.result_import') }}">Import Results<i class="material-icons right">file_upload</i></a>
</div>
</div>
</div>

5
web/app/templates/services/corpus_analysis.html.j2
View File

@ -37,6 +37,11 @@
<ul class="pagination"></ul>
</div>
<div class="card-action right-align">
<<<<<<< HEAD
=======
<a class="waves-effect waves-light btn" href="{{ url_for('results.result_import') }}">Import Results<i class="material-icons right">file_upload</i></a>
<a class="waves-effect waves-light btn" href="{{ url_for('results.results_overview') }}">Show Imported Results<i class="material-icons right">folder</i></a>
>>>>>>> cdd421e48a28fc8353db4d61fb3c88ef8ff3b2a9
<a class="waves-effect waves-light btn" href="{{ url_for('corpora.add_corpus') }}">New corpus<i class="material-icons right">add</i></a>
</div>
</div>