From 86de9800b2c1b66dfd2f61f0aca0b8ad2d0ed185 Mon Sep 17 00:00:00 2001 From: KoalaGeo Date: Wed, 6 Mar 2024 11:36:39 +0000 Subject: [PATCH 1/2] Update gui version numbers and sorting strategy input --- app/static/js/htmlView.js | 3 --- app/templates/_base.html | 2 +- app/templates/landing_page.html | 16 ++++++++++------ 3 files changed, 11 insertions(+), 10 deletions(-) diff --git a/app/static/js/htmlView.js b/app/static/js/htmlView.js index ef94d48..b8d344d 100644 --- a/app/static/js/htmlView.js +++ b/app/static/js/htmlView.js @@ -207,9 +207,6 @@ agsHtml.displayFileResult=function(fileResult){ if(fileResult.additional_metadata.bgs_loca_rows){ xhtml=xhtml + "
  • " + fileResult.additional_metadata.bgs_loca_rows + "
    • "; }; - if(fileResult.additional_metadata.bgs_loca_rows){ - xhtml=xhtml + "
  • " + fileResult.additional_metadata.bgs_loca_rows + "
    • "; - }; xhtml=xhtml + ""; }; diff --git a/app/templates/_base.html b/app/templates/_base.html index 1704d16..2d5d47e 100644 --- a/app/templates/_base.html +++ b/app/templates/_base.html @@ -409,7 +409,7 @@

    - Powered by pyagsapi 4.6. pyagsapi was created by and is maintained by the British Geological Survey and is distributed under the LGPL v3.0 licence, code is available on GitHub. pyagsapi uses the Official AGS Python Library. + Powered by pyagsapi 5.0. pyagsapi was created by and is maintained by the British Geological Survey and is distributed under the LGPL v3.0 licence, code is available on GitHub. pyagsapi uses the Official AGS Python Library v0.5.0.
    diff --git a/app/templates/landing_page.html b/app/templates/landing_page.html index 731e77e..3b013c7 100644 --- a/app/templates/landing_page.html +++ b/app/templates/landing_page.html @@ -30,7 +30,7 @@

    AGS Data Submission

    AGS4 Schema & Data Validation


    AGS4 Validation

    -

    Performs validation using the Official AGS Python Library version 0.4.1, this implements checks of the rules as written in the AGS data format standard v4.x.

    +

    Performs validation using the Official AGS Python Library version 0.5.0, this implements checks of the rules as written in the AGS data format standard v4.x.

    If you're using AGS Data Format Standard v3.x use our legacy AGS Validator


    BGS Data Validation

    @@ -165,11 +165,15 @@

    AGS Converter


    - Sort worksheets in .xlsx file in alphabetical order (Warning: .ags to .xlsx only. The original group order will be lost) - - - -
    + Sort worksheets in .xlsx file using sorting strategy(Warning: .ags to .xlsx only. The original group order will be lost) + + + + + + + +

    From 6ce297d1849c97130f30aa11780b03479e999b1a Mon Sep 17 00:00:00 2001 From: KoalaGeo Date: Wed, 6 Mar 2024 13:59:29 +0000 Subject: [PATCH 2/2] rename sort value maintain order to default --- app/templates/landing_page.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/templates/landing_page.html b/app/templates/landing_page.html index 3b013c7..8d9098b 100644 --- a/app/templates/landing_page.html +++ b/app/templates/landing_page.html @@ -172,7 +172,7 @@

    AGS Converter

    - +