diff --git a/web/app/corpora/forms.py b/web/app/corpora/forms.py index 0a2e21705f484fe73337b95787dcc49f1f3cd3c9..14c22f1bae1fa33cb3c5c60fee8fd4f0040d4b3f 100644 --- a/web/app/corpora/forms.py +++ b/web/app/corpora/forms.py @@ -12,6 +12,8 @@ class AddCorpusFileForm(FlaskForm): # Required fields author = StringField('Author', validators=[DataRequired(), Length(1, 255)]) file = FileField('File', validators=[DataRequired()]) + publishing_year = IntegerField('Publishing year', + validators=[DataRequired()]) title = StringField('Title', validators=[DataRequired(), Length(1, 255)]) # Optional fields address = StringField('Adress', validators=[Length(0, 255)]) @@ -22,7 +24,6 @@ class AddCorpusFileForm(FlaskForm): journal = StringField('Journal', validators=[Length(0, 255)]) pages = StringField('Pages', validators=[Length(0, 255)]) publisher = StringField('Publisher', validators=[Length(0, 255)]) - publishing_year = IntegerField('Publishing year') school = StringField('School', validators=[Length(0, 255)]) submit = SubmitField() @@ -46,6 +47,8 @@ class EditCorpusFileForm(FlaskForm): ''' # Required fields author = StringField('Author', validators=[DataRequired(), Length(1, 255)]) + publishing_year = IntegerField('Publishing year', + validators=[DataRequired()]) title = StringField('Title', validators=[DataRequired(), Length(1, 255)]) # Optional fields address = StringField('Adress', validators=[Length(0, 255)]) @@ -56,7 +59,6 @@ class EditCorpusFileForm(FlaskForm): journal = StringField('Journal', validators=[Length(0, 255)]) pages = StringField('Pages', validators=[Length(0, 255)]) publisher = StringField('Publisher', validators=[Length(0, 255)]) - publishing_year = IntegerField('Publishing year') school = StringField('School', validators=[Length(0, 255)]) submit = SubmitField() diff --git a/web/app/templates/corpora/add_corpus_file.html.j2 b/web/app/templates/corpora/add_corpus_file.html.j2 index 5f8f25b34e999757837ffe6e3a8b6d1453a3cef7..70f72834e64d0f4af8fa9fd84b0ba3aed152adcc 100644 --- a/web/app/templates/corpora/add_corpus_file.html.j2 +++ b/web/app/templates/corpora/add_corpus_file.html.j2 @@ -31,6 +31,9 @@ <div class="col s12 m4"> {{ wtf.render_field(add_corpus_file_form.title, data_length='255', material_icon='title') }} </div> + <div class="col s12 m4"> + {{ wtf.render_field(add_corpus_file_form.publishing_year, material_icon='access_time') }} + </div> <div class="col s12"> {{ wtf.render_field(add_corpus_file_form.file, accept='.vrt', placeholder='Choose your .vrt file') }} </div> @@ -46,7 +49,7 @@ <div class="collapsible-header"><i class="material-icons">add</i>Add additional metadata</div> <div class="collapsible-body"> {% for field in add_corpus_file_form - if field.short_name not in ['author', 'csrf_token', 'file', 'submit', 'title'] %} + if field.short_name not in ['author', 'csrf_token', 'file', 'publishing_year', 'submit', 'title'] %} {{ wtf.render_field(field, data_length='255', material_icon=field.label.text[0:1]) }} {% endfor %} </div> diff --git a/web/app/templates/corpora/corpus_file.html.j2 b/web/app/templates/corpora/corpus_file.html.j2 index 810816febcd380dde67d6afd4df7ab7e7eea8a46..4f02a085e60d1e1fccaf87a1dbc34a353fb5a2d9 100644 --- a/web/app/templates/corpora/corpus_file.html.j2 +++ b/web/app/templates/corpora/corpus_file.html.j2 @@ -20,12 +20,15 @@ <div class="card"> <div class="card-content"> <div class="row"> - <div class="col s12 m6"> + <div class="col s12 m4"> {{ wtf.render_field(edit_corpus_file_form.author, data_length='255', material_icon='person') }} </div> - <div class="col s12 m6"> + <div class="col s12 m4"> {{ wtf.render_field(edit_corpus_file_form.title, data_length='255', material_icon='title') }} </div> + <div class="col s12 m4"> + {{ wtf.render_field(edit_corpus_file_form.publishing_year, material_icon='access_time') }} + </div> </div> </div> <div class="card-action right-align"> @@ -38,7 +41,7 @@ <div class="collapsible-header"><i class="material-icons">edit</i>Edit additional metadata</div> <div class="collapsible-body"> {% for field in edit_corpus_file_form - if field.short_name not in ['author', 'csrf_token', 'submit', 'title'] %} + if field.short_name not in ['author', 'csrf_token', 'publishing_year', 'submit', 'title'] %} {{ wtf.render_field(field, data_length='255', material_icon=field.label.text[0:1]) }} {% endfor %} </div>