Results import fixes and additions. Table creation rework.

web/app/services/forms.py

@@ -1,18 +0,0 @@
-from flask_wtf import FlaskForm
-from werkzeug.utils import secure_filename
-from wtforms import FileField, SubmitField, ValidationError
-from wtforms.validators import DataRequired
-
-
-class ImportResultsForm(FlaskForm):
-    '''
-    Form used to import one result json file.
-    '''
-    file = FileField('File', validators=[DataRequired()])
-    submit = SubmitField()
-
-    def validate_file(self, field):
-        if not field.data.filename.lower().endswith('.json'):
-            raise ValidationError('File does not have an approved extension: '
-                                  '.json')
-        field.data.filename = secure_filename(field.data.filename)

web/app/services/views.py

@@ -1,17 +1,13 @@
 from flask import (abort, current_app, flash, make_response, render_template,
                    url_for)
 from flask_login import current_user, login_required
-from .forms import ImportResultsForm
 from werkzeug.utils import secure_filename
 from . import services
 from .. import db
 from ..jobs.forms import AddFileSetupJobForm, AddNLPJobForm, AddOCRJobForm
-from ..models import Job, JobInput, Result, ResultFile, User
-from .tables import ResultTable, ResultItem
+from ..models import Job, JobInput
 import json
 import os
-import html
-from datetime import datetime
 
 
 SERVICES = {'corpus_analysis': {'name': 'Corpus analysis'},
@@ -85,84 +81,3 @@ def service(service):
     return render_template('services/{}.html.j2'.format(service),
                            title=SERVICES[service]['name'],
                            add_job_form=add_job_form)
-
-
-@services.route('/import_results', methods=['GET', 'POST'])
-@login_required
-def import_results():
-    '''
-    View to import one json result file. Uses the ImportReultFileForm.
-    '''
-    # TODO: Build in a check if uploaded json is actually a result file and
-    # not something different
-    # Add the possibility to add several result files at once.
-    import_results_form = ImportResultsForm(prefix='add-result-file-form')
-    if import_results_form.is_submitted():
-        if not import_results_form.validate():
-            return make_response(import_results_form.errors, 400)
-        # Save the file
-        # result creation only happens on file save to avoid creating a result
-        # object in the db everytime by just visiting the import_results page
-        result = Result(user_id=current_user.id)
-        db.session.add(result)
-        db.session.commit()
-        if not (result.creator == current_user
-                or current_user.is_administrator()):
-            abort(403)
-        dir = os.path.join(str(result.user_id),
-                           'results',
-                           'corpus_analysis_results',
-                           str(result.id))
-        abs_dir = os.path.join(current_app.config['NOPAQUE_STORAGE'], dir)
-        abs_file_path = os.path.join(abs_dir,
-                                     import_results_form.file.data.filename)
-        os.makedirs(abs_dir)
-        import_results_form.file.data.save(abs_file_path)
-        # Saves all needed metadata entries in one json field
-        with open(abs_file_path, 'r') as f:
-            corpus_metadata = json.load(f)
-        del corpus_metadata['matches']
-        del corpus_metadata['cpos_lookup']
-        result_file = ResultFile(
-            result_id=result.id,
-            dir=dir,
-            filename=import_results_form.file.data.filename)
-        result.corpus_metadata = corpus_metadata
-        db.session.add(result_file)
-        db.session.commit()
-        flash('Result file added!', 'result')
-        return make_response(
-            {'redirect_url': url_for('services.results')},
-            201)
-    return render_template('services/import_results.html.j2',
-                           import_results_form=import_results_form,
-                           title='Add corpus file')
-
-
-@services.route('/results')
-@login_required
-def results():
-    '''
-    Shows an overview of imported results.
-    '''
-    # get all results of current user
-    results = User.query.get(current_user.id).results
-    # create table row for every result#
-
-    def __p_time(time_str):
-        return datetime.strptime(time_str, '%Y-%m-%dT%H:%M:%S.%f')
-
-    items = [ResultItem(r.corpus_metadata['query'],
-                        r.corpus_metadata['match_count'],
-                        r.corpus_metadata['corpus_name'],
-                        __p_time(r.corpus_metadata['corpus_creation_date']),
-                        __p_time(r.corpus_metadata['corpus_analysis_date']),
-                        r.corpus_metadata['corpus_type'],
-                        r.id) for r in results]
-    # create table with items and save it as html
-    table = html.unescape(ResultTable(items).__html__())
-    # add class=list to table body with string replacement
-    table = table.replace('tbody', 'tbody class=list', 1)
-    return render_template('services/results.html.j2',
-                           title='Imported Results',
-                           table=table)