Add changes for new file_setup Pipeline

app/jobs/forms.py

@@ -62,7 +62,7 @@ class AddOCRJobForm(FlaskForm):
                                       'extension: .pdf')
 
 
-class AddSetupFilesJobForm(FlaskForm):
+class AddFileSetupJobForm(FlaskForm):
     description = StringField('Description',
                               validators=[DataRequired(), Length(1, 255)])
     submit = SubmitField()

app/services/views.py

@@ -4,22 +4,22 @@ from flask_login import current_user, login_required
 from werkzeug.utils import secure_filename
 from . import services
 from .. import db
-from ..jobs.forms import AddNLPJobForm, AddOCRJobForm, AddSetupFilesJobForm
+from ..jobs.forms import AddFileSetupJobForm, AddNLPJobForm, AddOCRJobForm
 from ..models import Job, JobInput
 import json
 import os
 
 
 SERVICES = {'corpus_analysis': {'name': 'Corpus analysis'},
+            'file_setup': {'name': 'File setup',
+                           'resources': {'mem_mb': 4096, 'n_cores': 4},
+                           'add_job_form': AddFileSetupJobForm},
             'nlp': {'name': 'Natural Language Processing',
                     'resources': {'mem_mb': 4096, 'n_cores': 2},
                     'add_job_form': AddNLPJobForm},
             'ocr': {'name': 'Optical Character Recognition',
                     'resources': {'mem_mb': 8192, 'n_cores': 4},
-                    'add_job_form': AddOCRJobForm},
+                    'add_job_form': AddOCRJobForm}}
-            'setup_files': {'name': 'File setup',
-                            'resources': {'mem_mb': 4096, 'n_cores': 4},
-                            'add_job_form': AddSetupFilesJobForm}}
 
 
 @services.route('/<service>', methods=['GET', 'POST'])

app/templates/main/dashboard.html.j2

@@ -70,7 +70,7 @@
     <h4>Select a service</h4>
     <div class="row">
       <div class="col s12 m4">
-        <a href="{{ url_for('services.service', service='setup_files') }}" style="color: rgba(0,0,0,0.87);">
+        <a href="{{ url_for('services.service', service='file_setup') }}" style="color: rgba(0,0,0,0.87);">
           <div class="card-panel center-align hoverable">
             <i class="large material-icons" style="color: #ee6e73;">burst_mode</i>
             <p>File setup</p>

app/templates/nopaque.html.j2

@@ -101,7 +101,7 @@
         <li><a href="{{ url_for('main.dashboard', _anchor='jobs') }}" style="padding-left: 47px;"><i class="material-icons">work</i>My Jobs</a></li>
         <li><div class="divider"></div></li>
         <li><a class="subheader">Processes and Services</a></li>
-        <li><a href="{{ url_for('services.service', service='setup_files') }}"><i class="material-icons">burst_mode</i>File setup</a></li>
+        <li><a href="{{ url_for('services.service', service='file_setup') }}"><i class="material-icons">burst_mode</i>File setup</a></li>
         <li><a href="{{ url_for('services.service', service='ocr') }}"><i class="material-icons">find_in_page</i>OCR</a></li>
         <li><a href="{{ url_for('services.service', service='nlp') }}"><i class="material-icons">format_textdirection_l_to_r</i>NLP</a></li>
         <li><a href="{{ url_for('services.service', service='corpus_analysis') }}"><i class="material-icons">search</i>Corpus analysis</a></li>

app/templates/services/file_setup.html.j2

@@ -14,7 +14,7 @@
         <div class="col s12">
           <div class="card-panel z-depth-0">
             <span class="card-title"><i class="left material-icons">layers</i>Merge process</span>
-            <p>nopaque converts and merges your files in its cloud infrastructure to facilitate further processing and the application of other services. You only have to number your files in the correct order to receive a multi-page TIFF file.</p>
+            <p>nopaque converts and merges your files in its cloud infrastructure to facilitate further processing and the application of other services. You only have to number your files in the correct order to receive a PDF file.</p>
           </div>
         </div>
       </div>