Skip to content

Upgrade the app to run on tethys4 #5

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

Open
wants to merge 18 commits into
base: interpolation_debug
Choose a base branch
from
Open

Upgrade the app to run on tethys4 #5

Show file tree
Hide file tree
Changes from 13 commits
Commits
Show all changes
18 commits
Select commit Hold shift + click to select a range
9bb7df8
Upgrade the app to run on tethys4
EricJJones Jun 15, 2022
3ff44ef
Cleanup tethys 4 update
EricJJones Jun 23, 2022
0f18290
Small quote fix
swainn Jun 23, 2022
fc28191
Remove duplicate classes on nav-links
swainn Jun 23, 2022
620b7de
Fix bootstrap icon
swainn Jun 23, 2022
723465b
Fix more bootstrap icons
swainn Jun 23, 2022
a3e1606
Delete catalog.xml
swainn Jun 23, 2022
ef000c8
Delete settings.json
swainn Jun 23, 2022
4924bf4
fix close button
EricJJones Jul 19, 2022
573ba58
change hidden to d-none
EricJJones Jul 21, 2022
2285e6f
fix bad hidden tag
EricJJones Jul 21, 2022
beba86f
Style changes to @Controller
EricJJones Sep 14, 2022
16c00a7
Flake and Style updates
EricJJones Sep 20, 2022
5baea0f
remove unnecessary code
EricJJones Sep 22, 2022
d31e289
Styling changes. Remove Interpolation.
SarvaPulla Jan 3, 2024
269c52b
Updates to handle tethys4
SarvaPulla Feb 22, 2024
a03aa99
fix request.is_ajax()
Jun 13, 2024
cccd715
fix high charts exports
romer8 Feb 19, 2025
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: 2 additions & 0 deletions .flake8
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
[flake8]
max-line-length = 120
2 changes: 2 additions & 0 deletions install.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
# This file should be committed to your app code.
version: 1.0
# This should be greater or equal to your tethys-platform in your environment
tethys_version: ">=4.0.0"
# This should match the app - package name in your setup.py
name: gwdm

Expand Down
1 change: 1 addition & 0 deletions setup.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@
setup(
name=release_package,
version="0.0.2",
tethys_version=['3', '4'],
description="Ground Water Data Mapper",
long_description="",
keywords="",
Expand Down
336 changes: 4 additions & 332 deletions tethysapp/gwdm/app.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
SpatialDatasetServiceSetting,
CustomSetting,
)
from tethys_sdk.base import TethysAppBase, url_map_maker
from tethys_sdk.base import TethysAppBase


class Gwdm(TethysAppBase):
Expand All @@ -12,7 +12,7 @@ class Gwdm(TethysAppBase):
"""

name = "Groundwater Data Mapper"
index = "gwdm:home"
index = "home"
icon = "gwdm/images/gw_logo.png"
package = "gwdm"
root_url = "gwdm"
Expand All @@ -22,335 +22,7 @@ class Gwdm(TethysAppBase):
enable_feedback = False
feedback_emails = []

def url_maps(self):
"""
Add controllers
"""
UrlMap = url_map_maker(self.root_url)

url_maps = (
UrlMap(name="home", url="gwdm", controller="gwdm.controllers.home"),
UrlMap(
name="config", url="gwdm/config", controller="gwdm.controllers.config"
),
UrlMap(
name="metrics",
url="gwdm/metrics",
controller="gwdm.controllers.metrics",
),
UrlMap(
name="interpolation",
url="gwdm/interpolation",
controller="gwdm.controllers.interpolation",
),
UrlMap(
name="interpolation-submit",
url="gwdm/interpolation/submit",
controller="gwdm.controllers_ajax.interpolate",
),
UrlMap(
name="interpolation-aquifers",
url="gwdm/interpolation/get-aquifers",
controller="gwdm.controllers_ajax.get_aquifers",
),
UrlMap(
name="run-dask",
url="gwdm/dask/add/{job_type}",
controller="gwdm.controllers.run_job",
),
UrlMap(
name="jobs-table",
url="gwdm/dask/jobs_table",
controller="gwdm.controllers.jobs_table",
),
UrlMap(
name="result",
url="gwdm/dask/result/{job_id}",
controller="gwdm.controllers.result",
),
UrlMap(
name="error_message",
url="gwdm/dask/error",
controller="gwdm.controllers.error_message",
),
UrlMap(
name="region-map",
url="gwdm/region-map",
controller="gwdm.controllers.region_map",
),
UrlMap(
name="region-map-aquifers",
url="gwdm/region-map/get-aquifers",
controller="gwdm.controllers_ajax.get_aquifers",
),
UrlMap(
name="region-map-ts",
url="gwdm/region-map/get-timeseries",
controller="gwdm.controllers_ajax.region_timeseries",
),
UrlMap(
name="region-map-multi-ts",
url="gwdm/region-map/get-multi-timeseries",
controller="gwdm.controllers_ajax.region_multiple_timeseries",
),
UrlMap(
name="region-map-well-obs",
url="gwdm/region-map/get-well-obs",
controller="gwdm.controllers_ajax.region_well_obs",
),
UrlMap(
name="region-map-wms-datasets",
url="gwdm/region-map/get-wms-datasets",
controller="gwdm.controllers_ajax.region_wms_datasets",
),
UrlMap(
name="region-map-wms-metadata",
url="gwdm/region-map/get-wms-metadata",
controller="gwdm.controllers_ajax.region_wms_metadata",
),
UrlMap(
name="region-map-outlier",
url="gwdm/region-map/set-outlier",
controller="gwdm.controllers_ajax.set_outlier",
),
UrlMap(
name="add-region",
url="gwdm/add-region",
controller="gwdm.controllers.add_region",
),
UrlMap(
name="add-region-ajax",
url="gwdm/add-region/submit",
controller="gwdm.controllers_ajax.region_add",
),
UrlMap(
name="update-region",
url="gwdm/update-region",
controller="gwdm.controllers.update_region",
),
UrlMap(
name="update-region-tabulator",
url="gwdm/update-region/tabulator",
controller="gwdm.controllers_ajax.region_tabulator",
),
UrlMap(
name="update-region-ajax",
url="gwdm/update-region/update",
controller="gwdm.controllers_ajax.region_update",
),
UrlMap(
name="delete-region-ajax",
url="gwdm/update-region/delete",
controller="gwdm.controllers_ajax.region_delete",
),
UrlMap(
name="add-aquifer",
url="gwdm/add-aquifer",
controller="gwdm.controllers.add_aquifer",
),
UrlMap(
name="update-aquifer",
url="gwdm/update-aquifer",
controller="gwdm.controllers.update_aquifer",
),
UrlMap(
name="update-aquifer-tabulator",
url="gwdm/update-aquifer/tabulator",
controller="gwdm.controllers_ajax.aquifer_tabulator",
),
UrlMap(
name="update-aquifer-ajax",
url="gwdm/update-aquifer/update",
controller="gwdm.controllers_ajax.aquifer_update",
),
UrlMap(
name="delete-aquifer-ajax",
url="gwdm/update-aquifer/delete",
controller="gwdm.controllers_ajax.aquifer_delete",
),
UrlMap(
name="get-aquifer-attributes",
url="gwdm/add-aquifer/get-attributes",
controller="gwdm.controllers_ajax.get_shp_attributes",
),
UrlMap(
name="add-aquifer-ajax",
url="gwdm/add-aquifer/submit",
controller="gwdm.controllers_ajax.aquifer_add",
),
UrlMap(
name="add-wells",
url="gwdm/add-wells",
controller="gwdm.controllers.add_wells",
),
UrlMap(
name="get-wells-attributes",
url="gwdm/add-wells/get-attributes",
controller="gwdm.controllers_ajax.get_well_attributes",
),
UrlMap(
name="add-wells-aquifers",
url="gwdm/add-wells/get-aquifers",
controller="gwdm.controllers_ajax.get_aquifers",
),
UrlMap(
name="add-wells-ajax",
url="gwdm/add-wells/submit",
controller="gwdm.controllers_ajax.wells_add",
),
UrlMap(
name="edit-wells",
url="gwdm/edit-wells",
controller="gwdm.controllers.edit_wells",
),
UrlMap(
name="edit-wells-aquifers",
url="gwdm/edit-wells/get-aquifers",
controller="gwdm.controllers_ajax.get_aquifers",
),
UrlMap(
name="edit-wells-tabulator",
url="gwdm/edit-wells/tabulator",
controller="gwdm.controllers_ajax.wells_tabulator",
),
UrlMap(
name="delete-well-ajax",
url="gwdm/edit-wells/delete",
controller="gwdm.controllers_ajax.well_delete",
),
UrlMap(
name="delete-wells",
url="gwdm/delete-wells",
controller="gwdm.controllers.delete_wells",
),
UrlMap(
name="delete-wells-aquifers",
url="gwdm/delete-wells/get-aquifers",
controller="gwdm.controllers_ajax.get_aquifers",
),
UrlMap(
name="delete-wells-submit",
url="gwdm/delete-wells/submit",
controller="gwdm.controllers_ajax.bulk_delete_wells",
),
UrlMap(
name="add-measurements",
url="gwdm/add-measurements",
controller="gwdm.controllers.add_measurements",
),
UrlMap(
name="add-measurements-aquifers",
url="gwdm/add-measurements/get-aquifers",
controller="gwdm.controllers_ajax.get_aquifers",
),
UrlMap(
name="add-measurements-date-format",
url="gwdm/add-measurements/check-date-format",
controller="gwdm.controllers_ajax.validate_date_format",
),
UrlMap(
name="add-measurements-aquifers",
url="gwdm/add-measurements/get-aquifers",
controller="gwdm.controllers_ajax.get_aquifers",
),
UrlMap(
name="add-measurements-wells",
url="gwdm/add-measurements/get-wells",
controller="gwdm.controllers_ajax.get_wells",
),
UrlMap(
name="get-measurements-attributes",
url="gwdm/add-measurements/get-attributes",
controller="gwdm.controllers_ajax.get_measurements_attributes",
),
UrlMap(
name="add-measurements-ajax",
url="gwdm/add-measurements/submit",
controller="gwdm.controllers_ajax.measurements_add",
),
UrlMap(
name="update-measurements",
url="gwdm/update-measurements",
controller="gwdm.controllers.update_measurements",
),
UrlMap(
name="update-measurements-aquifers",
url="gwdm/update-measurements/get-aquifers",
controller="gwdm.controllers_ajax.get_aquifers",
),
UrlMap(
name="update-measurements-submit",
url="gwdm/update-measurements/submit",
controller="gwdm.controllers_ajax.measurements_delete",
),
UrlMap(
name="add-variable",
url="gwdm/add-variable",
controller="gwdm.controllers.add_variable",
),
UrlMap(
name="update-variable",
url="gwdm/update-variable",
controller="gwdm.controllers.update_variable",
),
UrlMap(
name="update-variable-tabulator",
url="gwdm/update-variable/tabulator",
controller="gwdm.controllers_ajax.variable_tabulator",
),
UrlMap(
name="delete-variable-ajax",
url="gwdm/update-variable/delete",
controller="gwdm.controllers_ajax.variable_delete",
),
UrlMap(
name="update-variable-ajax",
url="gwdm/update-variable/update",
controller="gwdm.controllers_ajax.variable_update",
),
UrlMap(
name="delete-rasters",
url="gwdm/delete-rasters",
controller="gwdm.controllers.delete_rasters",
),
UrlMap(
name="delete-rasters-aquifers",
url="gwdm/delete-rasters/get-aquifers",
controller="gwdm.controllers_ajax.get_aquifers",
),
UrlMap(
name="rasters-wms-datasets",
url="gwdm/delete-rasters/get-wms-datasets",
controller="gwdm.controllers_ajax.region_wms_datasets",
),
UrlMap(
name="delete-rasters-submit",
url="gwdm/delete-rasters/submit",
controller="gwdm.controllers_ajax.rasters_delete",
),
UrlMap(
name="upload-rasters",
url="gwdm/upload-rasters",
controller="gwdm.controllers.upload_rasters",
),
UrlMap(
name="upload-rasters-submit",
url="gwdm/upload-rasters/submit",
controller="gwdm.controllers_ajax.rasters_upload",
),
UrlMap(
name="upload-rasters-metadata",
url="gwdm/upload-rasters/get-aquifers",
controller="gwdm.controllers_ajax.get_aquifers",
),
UrlMap(
name="upload-rasters-ajax",
url="gwdm/upload-rasters/get-attributes",
controller="gwdm.controllers_ajax.get_raster_attributes",
),
)

return url_maps
controller_modules = ['controllers', 'controllers_ajax', ]

def custom_settings(self):

Expand All @@ -362,7 +34,7 @@ def custom_settings(self):
required=True,
),
CustomSetting(
name="gw_thredds_directoy",
name="gw_thredds_directory",
type=CustomSetting.TYPE_STRING,
description="Path to the Ground Water Thredds Directory",
required=True,
Expand Down
Loading