Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

WIP: Create Data Discovery Page #116

Closed
wants to merge 3 commits into from
Closed

WIP: Create Data Discovery Page #116

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
26efdbe
init datadiscovery pages
KoalaGeo Jun 28, 2023
6448387
add blank line
KoalaGeo Jun 28, 2023
a79229d
Change text
KoalaGeo Jun 28, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions app/main.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -78,6 +78,11 @@ async def landing_page(request: Request):
return templates.TemplateResponse('landing_page.html', {'request': request})


@app.get("/datadiscovery", response_class=HTMLResponse, include_in_schema=False)
async def datadiscovery(request: Request):
return templates.TemplateResponse('datadiscovery.html', {'request': request})


def custom_openapi():
if app.openapi_schema:
return app.openapi_schema
Expand Down
39 changes: 39 additions & 0 deletions app/templates/datadiscovery.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,39 @@
{% extends "_base.html" %}
{% block title %}Home{% endblock %}
{% block body %}

<br/>
<section id="identification">
<h1>AGS4 File Utilities Tool and API</h1>
<br>
<p>This tool and associated <a href="/docs/">API</a> allow schema validation, data validation and conversion of your <a href="https://www.ags.org.uk/data-format/">AGS files</a>. Files are not saved or stored by this tool. Also included are links to our other AGS data related services and applications</p>
<h2>Tools and Utilities</h2>
<ul>
<li><a href="/datadiscovery/">AGS Data Discovery</a> - Find AGS data, view/download scanned logs, download AGS files</li>
<li><a href="/#deposit">AGS Data Submission</a> - How to submit data to BGS</li>
<li><a href="/#validator">AGS Schema & Data Validator</a></li>
<li><a href="/#converter">File Conversion .ags &#8596; .xlsx</a></li>
<li><a href="/#openapi">API Documentation</a></li>
</ul>
</section>
<br>
<hr>
<br>
<section id="ags_data">
<h2>AGS Data Discovery</h2>
<br>
<p>Use the map below to find AGS data, click on the markers to find borehole information, links to graphical logs and the original submitted data.</p>
<p><b>The map will show a maximum of 100 AGS markers - users may need to pan/zoom to display markers of interest. </b></p>
<p><b>If no AGS Submission Record is shown at the link provided there is likely a legacy confidentiality restriction.</b></p>
<br>
<div id="mapid">
<!-- <div id="dOpacitySliderBox">
<div id="opacitySlider"></div>
<div class="dOpacitySliderLabel">Transparency</div>
</div>-->
</div>
</section>
<br>
<br>

{% endblock %}
21 changes: 2 additions & 19 deletions app/templates/landing_page.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,9 +9,9 @@ <h1>AGS4 File Utilities Tool and API</h1>
<p>This tool and associated <a href="/docs/">API</a> allow schema validation, data validation and conversion of your <a href="https://www.ags.org.uk/data-format/">AGS files</a>. Files are not saved or stored by this tool. Also included are links to our other AGS data related services and applications</p>
<h2>Tools and Utilities</h2>
<ul>
<li><a href="#deposit">AGS Data Submission</a></li>
<li><a href="/datadiscovery/">AGS Data Discovery</a> - Find AGS data, view/download scanned logs, download AGS files</li>
<li><a href="/#deposit">AGS Data Submission</a> - How to submit data to BGS</li>
<li><a href="#validator">AGS Schema & Data Validator</a></li>
<li><a href="#ags_data">AGS Data Discovery</a></li>
<li><a href="#converter">File Conversion .ags &#8596; .xlsx</a></li>
<li><a href="#openapi">API Documentation</a></li>
</ul>
Expand Down Expand Up @@ -139,23 +139,6 @@ <h4>Future data validation rules: (Coming Soon)</h4>
<br>
<br>
<br>
<section id="ags_data">
<h2>AGS Data Discovery</h2>
<br>
<p>Use the map below to find AGS data, click on the markers to find borehole information, links to graphical logs and the original submitted data.</p>
<p><b>The map will show a maximum of 100 AGS markers - users may need to pan/zoom to display markers of interest. </b></p>
<p><b>If no AGS Submission Record is shown at the link provided there is likely a legacy confidentiality restriction.</b></p>
<br>
<div id="mapid">
<!-- <div id="dOpacitySliderBox">
<div id="opacitySlider"></div>
<div class="dOpacitySliderLabel">Transparency</div>
</div>-->
</div>
</section>
<br>
<br>
<br>
<section id="converter">
<h2>AGS Converter</h2>
<div class="tooltip"><p>Convert .ags file(s) to/from .xlsx.</p>
Expand Down
Loading