Skip to content

Commit

Permalink
Update gui version numbers and sorting strategy input
Browse files Browse the repository at this point in the history
  • Loading branch information
KoalaGeo committed Mar 6, 2024
1 parent bcfdc74 commit 86de980
Show file tree
Hide file tree
Showing 3 changed files with 11 additions and 10 deletions.
3 changes: 0 additions & 3 deletions app/static/js/htmlView.js
Original file line number Diff line number Diff line change
Expand Up @@ -207,9 +207,6 @@ agsHtml.displayFileResult=function(fileResult){
if(fileResult.additional_metadata.bgs_loca_rows){
xhtml=xhtml + "<li>" + fileResult.additional_metadata.bgs_loca_rows + "</li>";
};
if(fileResult.additional_metadata.bgs_loca_rows){
xhtml=xhtml + "<li>" + fileResult.additional_metadata.bgs_loca_rows + "</li>";
};
xhtml=xhtml + "</ul>";
};

Expand Down
2 changes: 1 addition & 1 deletion app/templates/_base.html
Original file line number Diff line number Diff line change
Expand Up @@ -409,7 +409,7 @@
<hr>
<br>
<div>
Powered by <a title="pyagsapi" href="https://github.com/BritishGeologicalSurvey/pyagsapi">pyagsapi 4.6</a>. pyagsapi was created by and is maintained by the <a href="https://www.bgs.ac.uk/">British Geological Survey</a> and is distributed under the <a title="license" href="https://github.com/BritishGeologicalSurvey/pyagsapi/blob/main/LICENSE">LGPL v3.0 licence</a>, code is available on <a title="github" href="https://github.com/BritishGeologicalSurvey/pyagsapi">GitHub</a>. <a title="agspython" href="https://github.com/BritishGeologicalSurvey/pyagsapi">pyagsapi</a> uses the <a href="https://gitlab.com/ags-data-format-wg/ags-python-library.">Official AGS Python Library</a>.
Powered by <a title="pyagsapi" href="https://github.com/BritishGeologicalSurvey/pyagsapi">pyagsapi 5.0</a>. pyagsapi was created by and is maintained by the <a href="https://www.bgs.ac.uk/">British Geological Survey</a> and is distributed under the <a title="license" href="https://github.com/BritishGeologicalSurvey/pyagsapi/blob/main/LICENSE">LGPL v3.0 licence</a>, code is available on <a title="github" href="https://github.com/BritishGeologicalSurvey/pyagsapi">GitHub</a>. <a title="agspython" href="https://github.com/BritishGeologicalSurvey/pyagsapi">pyagsapi</a> uses the <a href="https://gitlab.com/ags-data-format-wg/ags-python-library.">Official AGS Python Library v0.5.0</a>.
</div>

<div id="extentModal">
Expand Down
16 changes: 10 additions & 6 deletions app/templates/landing_page.html
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ <h2>AGS Data Submission</h2>
<h2>AGS4 Schema & Data Validation</h2>
<br>
<h3>AGS4 Validation </h3>
<p>Performs validation using the <a href="https://gitlab.com/ags-data-format-wg/ags-python-library.">Official AGS Python Library</a> <strong>version 0.4.1</strong>, this implements checks of the rules as written in the <strong>AGS data format standard v4.x.</strong></p>
<p>Performs validation using the <a href="https://gitlab.com/ags-data-format-wg/ags-python-library.">Official AGS Python Library</a> <strong>version 0.5.0</strong>, this implements checks of the rules as written in the <strong>AGS data format standard v4.x.</strong></p>
<p style="color:red">If you're using AGS Data Format Standard v3.x use our legacy <a href="https://webapps.bgs.ac.uk/data/ags/validation/index.cfm">AGS Validator</a></p>
<br>
<h3>BGS Data Validation</h3>
Expand Down Expand Up @@ -165,11 +165,15 @@ <h2>AGS Converter</h2>
<br>
<form action="/convert/" enctype="multipart/form-data" method="post" id="convertForm">
<fieldset>
<legend>Sort worksheets in .xlsx file in alphabetical order <strong>(Warning: .ags to .xlsx only. The original group order will be lost)</strong></legend>
<input type="radio" id="alpha" name="sort_tables" value="True">
<label for="alpha">True</label>
<input type="radio" id="default" name="sort_tables" value="False" checked>
<label for="default">False</label><br>
<legend>Sort worksheets in .xlsx file using sorting strategy<strong>(Warning: .ags to .xlsx only. The original group order will be lost)</strong></legend>
<input type="radio" id="dictionary" name="sort_tables" value="dictionary">
<label for="dictionary">Dictionary</label>
<input type="radio" id="alphabetical" name="sort_tables" value="alphabetical">
<label for="alphabetical">Alphabetical</label>
<input type="radio" id="hierarchical" name="sort_tables" value="hierarchical">
<label for="hierarchical">Hierarchical</label>
<input type="radio" id="default" name="sort_tables" value="Maintain Order" checked>
<label for="default">None (Maintain Input File Order)</label><br>
</fieldset>
<br>
<fieldset>
Expand Down

0 comments on commit 86de980

Please sign in to comment.