MIRRI/mirri_tools
3
0
Fork 1
Code Issues Pull Requests Projects Releases Wiki Activity

Compare commits

base: MIRRI:master
Branches Tags
MIRRI:master
msantos:master
..
compare: msantos:master
Branches Tags
msantos:master
MIRRI:master

1 Commits
master ... master

Author SHA1 Message Date
denisaborgesccg
0790146d34 update templates folder 2023-07-24 12:49:36 +01:00
4 changed files with 21 additions and 11 deletions
Show Stats Expand all files Collapse all files

2
web_tools/templates/base.html
View File

@ -150,7 +150,7 @@
aria-hidden="true" aria-labelledby="sm-16143429460579077-3" aria-expanded="false"> aria-hidden="true" aria-labelledby="sm-16143429460579077-3" aria-expanded="false">
<li class="menu-item menu-item-type-post_type menu-item-object-page menu-item-1267"> <li class="menu-item menu-item-type-post_type menu-item-object-page menu-item-1267">
<a href="/tools/validator/" class="raven-submenu-item raven-link-item "> <a href="/tools/validator/" class="raven-submenu-item raven-link-item ">
Strain v20200601 Strain v20230324
</a> </a>
</li> </li>
</ul > </ul >

13
web_tools/templates/validation_html_output.html
View File

@ -2,7 +2,7 @@
{% load web_tool_utils %} {% load web_tool_utils %}
{% block title %} MIRRI Validation tool {% endblock title %} {% block title %} MIRRI Validation tool {% endblock title %}
{% block navigator%} MIRRI Validation tool{% endblock navigator%} {% block navigator%} MIRRI Validation tool{% endblock navigator%}
{% block page_title %} MIRRI v20200601 specifications validator {% endblock page_title %} {% block page_title %} MIRRI v20230324 specifications validator {% endblock page_title %}
{% block content %} {% block content %}
<div> <div>
{% if not validation_done%} {% if not validation_done%}
@ -10,12 +10,17 @@
<p>Please refer to this instructions to compile your excel file:</p> <p>Please refer to this instructions to compile your excel file:</p>
<ul> <ul>
<li>
<a href="https://www.mirri.org/wp-content/uploads/2023/03/MIRRI-IS_dataset_preface.pdf" target="_blank">Preface_MIRRI-IS_dataset_v20230324.pdf</a>
</li>
<li> <li>
<a href="https://synology.mirri.org:5019/d/f/585510897426937562" target="_blank" >HowToCompileTheSheets_v20200601.pdf</a> <a href="https://www.mirri.org/wp-content/uploads/2023/03/MIRRI_IS_dataset_HowToCompileTheSheets_v5.1_20230324.pdf" target="_blank" >HowToCompileTheSheets_v20230324.pdf</a>
</li> </li>
<li> <li>
<a href="https://synology.mirri.org:5019/d/f/585510897965905633" target="_blank">RecommendationsToCollections_v20200601.pdf</a> <a href="https://www.mirri.org/wp-content/uploads/2023/03/MIRRI-IS_dataset_Specifications.pdf" target="_blank">Specifications_v20230324.pdf</a>
</li> </li>
</ul> </ul>
<p>You can also contact the MIRRI ICT by email using <a href="mailto:ict-support@mirri.org">ICT Support</a></p> <p>You can also contact the MIRRI ICT by email using <a href="mailto:ict-support@mirri.org">ICT Support</a></p>
<br /> <br />
@ -48,7 +53,7 @@
<p>Dear Curator of Culture Collection {{culture_collection}}:</p> <p>Dear Curator of Culture Collection {{culture_collection}}:</p>
<p>The ExcelFile <span class="strong">{{fname}}</span> you’ve provided on {{file_date}} with your collection Strains Data contains errors/inconsistencies/missing data.</p> <p>The ExcelFile <span class="strong">{{fname}}</span> you’ve provided on {{file_date}} with your collection Strains Data contains errors/inconsistencies/missing data.</p>
<p>Please, see below the list of detected errors/missing data, for you to proceed with the appropriated correction/completion.</p> <p>Please, see below the list of detected errors/missing data, for you to proceed with the appropriated correction/completion.</p>
<p>If you need help, please refer to the instructions contained in <a href="https://synology.mirri.org:5019/d/f/585510897426937562" target="_blank" >HowToCompileTheSheets_v20200601.pdf</a> and <a href="https://synology.mirri.org:5019/d/f/585510897965905633" target="_blank">RecommendationsToCollections_v20200601.pdf</a>. <p>If you need help, please refer to the instructions contained in <a href="https://www.mirri.org/wp-content/uploads/2023/03/MIRRI_IS_dataset_HowToCompileTheSheets_v5.1_20230324.pdf" target="_blank" >HowToCompileTheSheets_v20230324.pdf</a> and <a href="https://www.mirri.org/wp-content/uploads/2023/03/MIRRI-IS_dataset_Specifications.pdf" target="_blank">Specifications_v20230324.pdf</a>.
<p>You can also contact the MIRRI ICT by email using: <a href="mailto:ict-support@mirri.org">ICT Support</a></p> <p>You can also contact the MIRRI ICT by email using: <a href="mailto:ict-support@mirri.org">ICT Support</a></p>
<p>You can download the report <a href='{{error_pdf_url}}' target='_blank'>Here</a></p> <p>You can download the report <a href='{{error_pdf_url}}' target='_blank'>Here</a></p>

11
web_tools/templates/validation_pdf_output.html
View File

@ -39,7 +39,7 @@
<p>Dear Curator of Culture Collection {{culture_collection}}:</p> <p>Dear Curator of Culture Collection {{culture_collection}}:</p>
<p>The ExcelFile <span class="strong">{{fname}}</span> you’ve provided on {{file_date}} with your collection Strains Data contains errors/ inconsistencies/ missing data.<br> <p>The ExcelFile <span class="strong">{{fname}}</span> you’ve provided on {{file_date}} with your collection Strains Data contains errors/ inconsistencies/ missing data.<br>
Please, see below the list of detected errors/missing data, for you to proceed with the appropriated correction/completion.<br> Please, see below the list of detected errors/missing data, for you to proceed with the appropriated correction/completion.<br>
If you need help, please refer to the instructions contained in <a href="https://synology.mirri.org:5019/d/f/585510897426937562" target="_blank" >HowToCompileTheSheets_v20200601.pdf</a> and <a href="https://synology.mirri.org:5019/d/f/585510897965905633" target="_blank">RecommendationsToCollections_v20200601.pdf</a>.</p> If you need help, please refer to the instructions contained in <a href="https://www.mirri.org/wp-content/uploads/2023/03/MIRRI_IS_dataset_HowToCompileTheSheets_v5.1_20230324.pdf" target="_blank" >HowToCompileTheSheets_v20230324.pdf</a> and <a href="https://www.mirri.org/wp-content/uploads/2023/03/MIRRI-IS_dataset_Specifications.pdf" target="_blank">Specifications_v20230324.pdf</a>.
<p>You can also contact the MIRRI ICT by email using: <a href="mailto:ict-support@mirri.org">ICT Support</a></p> <p>You can also contact the MIRRI ICT by email using: <a href="mailto:ict-support@mirri.org">ICT Support</a></p>
@ -72,12 +72,17 @@
<h2 style='text-align:center'> MIRRI validator Report for {{ fname }}</h2> <h2 style='text-align:center'> MIRRI validator Report for {{ fname }}</h2>
<p>Please refer to this instructions to compile your excel file:</p> <p>Please refer to this instructions to compile your excel file:</p>
<ul> <ul>
<li>
<a href="https://www.mirri.org/wp-content/uploads/2023/03/MIRRI-IS_dataset_preface.pdf" target="_blank">Preface_MIRRI-IS_dataset_v20230324.pdf</a>
</li>
<li> <li>
<a href="https://synology.mirri.org:5019/d/f/585510897426937562" target="_blank" >HowToCompileTheSheets_v20200601.pdf</a> <a href="https://www.mirri.org/wp-content/uploads/2023/03/MIRRI_IS_dataset_HowToCompileTheSheets_v5.1_20230324.pdf" target="_blank" >HowToCompileTheSheets_v20230324.pdf</a>
</li> </li>
<li> <li>
<a href="https://synology.mirri.org:5019/d/f/585510897965905633" target="_blank">RecommendationsToCollections_v20200601.pdf</a> <a href="https://www.mirri.org/wp-content/uploads/2023/03/MIRRI-IS_dataset_Specifications.pdf" target="_blank">Specifications_v20230324.pdf</a>
</li> </li>
</ul> </ul>
<p>You can also contact the MIRRI ICT by email using <a href="mailto:ict-support@mirri.org">ICT Support</a></p> <p>You can also contact the MIRRI ICT by email using <a href="mailto:ict-support@mirri.org">ICT Support</a></p>
<br /> <br />

2
web_tools/views.py
View File

@ -49,7 +49,7 @@ def validation_view(request):
fhand = form.cleaned_data["file"] fhand = form.cleaned_data["file"]
fname = fhand.name fname = fhand.name
do_upload = form.cleaned_data['do_upload'] do_upload = form.cleaned_data['do_upload']
version = '20200601' version = '5.1.2'
error_log = validate_mirri_excel(fhand, version=version) error_log = validate_mirri_excel(fhand, version=version)
all_errors = error_log.get_errors() all_errors = error_log.get_errors()