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.

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

Draft: V5 gui #147

Merged
merged 22 commits into from
Mar 27, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 1 addition & 1 deletion app/main.py
Original file line number Diff line number Diff line change
Expand Up @@ -83,7 +83,7 @@ def custom_openapi():
return app.openapi_schema
openapi_schema = get_openapi(
title="pyagsapi - AGS File Utilities Tools and API",
version="4.5.3",
version="5.0",
description=("The API performs schema validation, data validation and conversion of your AGS files. "
"It also exports a graphical log from AGS data held by NGDC. "
"Schema validation and conversion uses https://gitlab.com/ags-data-format-wg/ags-python-library"),
Expand Down
3 changes: 0 additions & 3 deletions app/routes.py
Original file line number Diff line number Diff line change
Expand Up @@ -320,7 +320,6 @@ async def convert(background_tasks: BackgroundTasks,
summary="Generate Graphical Log",
description=("Generate a graphical log (.pdf) from AGS data "
"held by the National Geoscience Data Centre."),
include_in_schema=False,
response_class=Response,
responses=pdf_responses)
def get_ags_log(bgs_loca_id: str = ags_log_query,
Expand Down Expand Up @@ -369,7 +368,6 @@ def get_ags_log(bgs_loca_id: str = ags_log_query,
summary="Export one or more boreholes in .ags format",
description=("Export one or more borehole in .ags format from AGS data "
"held by the National Geoscience Data Centre."),
include_in_schema=False,
response_class=Response,
responses=ags_export_responses)
def ags_export(bgs_loca_id: str = ags_export_query):
Expand Down Expand Up @@ -418,7 +416,6 @@ def ags_export(bgs_loca_id: str = ags_export_query):
description=("Export a number of boreholes in .ags format from AGS data "
"held by the National Geoscience Data Centre, using a"
" polygon using Well-Known-Text."),
include_in_schema=False,
response_model=BoreholeCountResponse,
responses=ags_export_responses)
def ags_export_by_polygon(polygon: str = polygon_query,
Expand Down
68 changes: 63 additions & 5 deletions app/static/css/htmlView.css
Original file line number Diff line number Diff line change
Expand Up @@ -21,17 +21,17 @@
font-size: 90%;
cursor:pointer;
box-shadow: 2px 2px 4px #444;
}
}
#resultPopup>h2>input:hover{
border: 1px solid #000;
background-color: #444;
color: #FFF;
box-shadow: 1px 1px 2px #222;
}
}

input.submitBtn{color:rgb(0,48,66);}
input.submitBtn:disabled{opacity:0.5;color:#888;}

#resultPopup>p{
padding: 4px 8px;
margin: 0px;
Expand All @@ -41,7 +41,7 @@ input.submitBtn:disabled{opacity:0.5;color:#888;}
margin:5px;
background-color: #FFFFFF;
}
#res_Files>article>h3{color:#FFF;}
#res_Files>article>h3{color:#FFF;}
#res_Files>article>h3.valid{background-color:#080;}
#res_Files>article>h3.invalid{background-color:#900;color:#FFF;}
#res_Files>article>h3>*{display:inline-block;padding: 2px 4px;}
Expand Down Expand Up @@ -69,3 +69,61 @@ input.submitBtn:disabled{opacity:0.5;color:#888;}
#res_Files>article>ul.fileResErrors>li>ul{display:none;}
#res_Files>article>ul.fileResErrors>li>ul>li>span{color:#800000;}

/* Validation map container */
#res_Map{height:400px;}

/* Validation map marker popups */
span.popupContent{}
span.popupContent>h4{border-bottom:1px solid #000000;margin:0em;}
span.popupContent>label{color:#444;}
span.popupContent>strong{color:#000;}

#resultPopup>p#res_LoadMsg{
color:#FFF;
background-color:#97875B;
margin:10px;
padding:2px 5px;
border-radius:5px;
font-size:120%;
}

#res_LoadMsg>span{
font-weight:bold;
display:inline-block;
width:24px;
height:24px;
padding:2px;
margin:2px;
color:#97875B;
background-color:#FFF;
border-radius:50%;
}

.rotate{animation: rotation 2s linear infinite;}

@keyframes rotation{
from {transform: rotate(0deg);}
to {transform: rotate(359deg);}
}

/* Validation map key and symbols */

p.mapKey{
border: 1px solid #CCC;
margin: 1px;
}

span.symbol {
display: inline-block;
width: 16px;
height: 16px;
overflow: hidden;
border-radius: 50%;
margin: 0px;
padding: 0px;
}

h3>span.symbol{
padding: 0px;
border:1px solid #FFF;
}
14 changes: 0 additions & 14 deletions app/static/css/jQuerySlideshow.css

This file was deleted.

132 changes: 0 additions & 132 deletions app/static/css/jQueryTabbedPanels.css

This file was deleted.

Loading