Skip to content

Commit 3ff44ef

Browse files
EricJJonesEricJJones
committed
Cleanup tethys 4 update
1 parent 9bb7df8 commit 3ff44ef

File tree

8 files changed

+46
-52
lines changed

8 files changed

+46
-52
lines changed

‎tethysapp/gwdm/interpolation_utils.py

+1-2
Original file line numberDiff line numberDiff line change
@@ -526,7 +526,6 @@ def calculate_aquifer_area(imputed_raster, units):
526526

527527
def clip_nc_file(file_path, aquifer_obj, region_id, storage_coefficient, units):
528528
thredds_directory = app.get_custom_setting("gw_thredds_directory")
529-
print(f'Thredds dir: {thredds_directory}\n')
530529
aquifer_name = aquifer_obj[1].replace(" ", "_")
531530
aquifer_dir = os.path.join(thredds_directory, str(region_id), str(aquifer_name))
532531
if not os.path.exists(aquifer_dir):
@@ -588,7 +587,7 @@ def mlr_interpolation(mlr_dict):
588587
end_date = mlr_dict["end_date"]
589588
storage_coefficient = mlr_dict["storage_coefficient"]
590589
units = mlr_dict["units"]
591-
590+
592591
bbox, wells_query_df, measurements_df, aquifer_obj = extract_query_objects(
593592
region_id, aquifer_id, variable
594593
)

‎tethysapp/gwdm/public/js/edit_wells.js

+3-3
Original file line numberDiff line numberDiff line change
@@ -75,15 +75,15 @@ var LIBRARY_OBJECT = (function() {
7575
});
7676

7777
var viewIcon = function(cell, formatterParams){ //plain text value
78-
return "<span class='sunglasses view-region-tabulator'></span>";
78+
return "<i class='bi bi-sunglasses view-region-tabulator'></i>";
7979
};
8080

8181
var deleteIcon = function(cell, formatterParams){ //plain text value
82-
return "<span class='file-x'></span>";
82+
return "<i class='bi bi-file-x'></i>";
8383
};
8484

8585
var updateIcon = function(cell, formatterParams){ //plain text value
86-
return "<span class='device-hdd'></span>";
86+
return "<i class='bi bi-device-hdd'></i>";
8787
};
8888

8989
delete_well = function(e, cell){

‎tethysapp/gwdm/public/js/update_aquifer.js

+3-3
Original file line numberDiff line numberDiff line change
@@ -79,15 +79,15 @@ var LIBRARY_OBJECT = (function() {
7979
});
8080

8181
var viewIcon = function(cell, formatterParams){ //plain text value
82-
return "<span class='sunglasses view-aquifer-tabulator'></span>";
82+
return "<i class='bi bi-sunglasses view-aquifer-tabulator'></i>";
8383
};
8484

8585
var deleteIcon = function(cell, formatterParams){ //plain text value
86-
return "<span class='x-lg'></span>";
86+
return "<i class='bi bi-x-lg'></i>";
8787
};
8888

8989
var updateIcon = function(cell, formatterParams){ //plain text value
90-
return "<span class='device-hdd'></span>";
90+
return "<i class='bi bi-device-hdd'></i>";
9191
};
9292

9393
delete_aquifer = function(e, cell){

‎tethysapp/gwdm/public/js/update_region.js

+3-3
Original file line numberDiff line numberDiff line change
@@ -80,15 +80,15 @@ var LIBRARY_OBJECT = (function() {
8080
});
8181

8282
var viewIcon = function(cell, formatterParams){ //plain text value
83-
return "<span class='sunglasses view-region-tabulator'></span>";
83+
return "<i class='bi bi-sunglasses view-region-tabulator'></i>";
8484
};
8585

8686
var deleteIcon = function(cell, formatterParams){ //plain text value
87-
return "<span class='x-lg'></span>";
87+
return "<i class='bi bi-x-lg'></i>";
8888
};
8989

9090
var updateIcon = function(cell, formatterParams){ //plain text value
91-
return "<span class='device-hdd'></span>";
91+
return "<i class='bi bi-device-hdd'></i>";
9292
};
9393

9494
delete_region = function(e, cell){

‎tethysapp/gwdm/public/js/update_variable.js

+2-2
Original file line numberDiff line numberDiff line change
@@ -60,11 +60,11 @@ var LIBRARY_OBJECT = (function() {
6060

6161

6262
var deleteIcon = function(cell, formatterParams){ //plain text value
63-
return "<span class='x-lg'></span>";
63+
return "<i class='bi bi-x-lg'></i>";
6464
};
6565

6666
var updateIcon = function(cell, formatterParams){ //plain text value
67-
return "<span class='device-hdd'></span>";
67+
return "<i class='bi bi-device-hdd'></i>";
6868
};
6969

7070
delete_variable = function(e, cell){

‎tethysapp/gwdm/templates/gwdm/base.html

+30-30
Original file line numberDiff line numberDiff line change
@@ -34,13 +34,13 @@
3434
{% url 'gwdm:upload-rasters' as upload_rasters %}
3535
{% url 'gwdm:delete-rasters' as delete_rasters %}
3636
<br>
37-
<li class="nav-item{% if request.path == home_url %} active{% endif %}"><a class="nav-link" href="{{home_url}}">Home</a></li>
38-
<li class="nav-item{% if request.path == metrics_url %} active{% endif %}"><a class="nav-link" href="{{metrics_url}}">Summary Statistics</a></li>
37+
<li class="nav-item"><a class="nav-link{% if request.path == home_url %} active{% endif %}" href="{{home_url}}">Home</a></li>
38+
<li class="nav-item"><a class="nav-link{% if request.path == metrics_url %} active{% endif %}" href="{{metrics_url}}">Summary Statistics</a></li>
3939

4040
{% if user.is_superuser or user.is_staff %}
4141
<li class="nav-item title">Configuration</li>
42-
<li class="nav-item{% if request.path == config_url %} active{% endif %}"><a class="nav-link" href="{{config_url}}">Configure App</a></li>
43-
<li class="nav-item{% if request.path == interpolation_url %} active{% endif %}"><a class="nav-link" href="{{interpolation_url}}">Interpolation Wizard</a></li>
42+
<li class="nav-item"><a class="nav-link{% if request.path == config_url %} active{% endif %}" href="{{config_url}}">Configure App</a></li>
43+
<li class="nav-item"><a class="nav-link"{% if request.path == interpolation_url %} active{% endif %} href="{{interpolation_url}}">Interpolation Wizard</a></li>
4444
<!--<li class="{% if request.path == jobs_table %}active{% endif %}"><a href="{{jobs_table}}">Interpolation Jobs Table</a></li>-->
4545
<!--<li class="{% if request.path == add_region_url %}active{% endif %}"><a href="{{add_region_url}}">Add Region</a></li>-->
4646
<!--<li class="{% if request.path == update_region_url %}active{% endif %}"><a href="{{update_region_url}}">Edit Region</a></li>-->
@@ -59,13 +59,13 @@
5959
</div>
6060
</a>
6161
<div id='submenu1' class="collapse sidebar-submenu {% if request.path == add_region_url or request.path == update_region_url %}in{% endif %}">
62-
<li class="nav-item{% if request.path == add_region_url %} active{% endif %}">
63-
<a class="nav-link" href="{{add_region_url}}" class="list-group-item list-group-item-action bg-dark text-white">
62+
<li class="nav-item">
63+
<a class="nav-link{% if request.path == add_region_url %} active{% endif %}" href="{{add_region_url}}" class="list-group-item list-group-item-action bg-dark text-white">
6464
<span class="menu-collapsed">Add Region</span>
6565
</a>
6666
</li>
67-
<li class="nav-item{% if request.path == update_region_url %} active{% endif %}">
68-
<a class="nav-link" href="{{update_region_url}}" class="list-group-item list-group-item-action bg-dark text-white">
67+
<li class="nav-item">
68+
<a class="nav-link{% if request.path == update_region_url %} active{% endif %}" href="{{update_region_url}}" class="list-group-item list-group-item-action bg-dark text-white">
6969
<span class="menu-collapsed">Edit Region</span>
7070
</a>
7171
</li>
@@ -76,13 +76,13 @@
7676
</div>
7777
</a>
7878
<div id='submenu2' class="collapse sidebar-submenu {% if request.path == add_aquifer_url or request.path == update_aquifer_url %}in{% endif %}">
79-
<li class="nav-item{% if request.path == add_aquifer_url %} active{% endif %}">
80-
<a class="nav-link" href="{{add_aquifer_url}}" class="list-group-item list-group-item-action bg-dark text-white">
79+
<li class="nav-item">
80+
<a class="nav-link{% if request.path == add_aquifer_url %} active{% endif %}" href="{{add_aquifer_url}}" class="list-group-item list-group-item-action bg-dark text-white">
8181
<span class="menu-collapsed">Add Aquifer</span>
8282
</a>
8383
</li>
84-
<li class="nav-item{% if request.path == update_aquifer_url %} active{% endif %}">
85-
<a class="nav-link" href="{{update_aquifer_url}}" class="list-group-item list-group-item-action bg-dark text-white">
84+
<li class="nav-item">
85+
<a class="nav-link{% if request.path == update_aquifer_url %} active{% endif %}" href="{{update_aquifer_url}}" class="list-group-item list-group-item-action bg-dark text-white">
8686
<span class="menu-collapsed">Edit Aquifer</span>
8787
</a>
8888
</li>
@@ -94,18 +94,18 @@
9494
</a>
9595
<div id='submenu3' class="collapse sidebar-submenu
9696
{% if request.path == add_wells_url or request.path == edit_wells_url or request.path == delete_wells %}in{% endif %}">
97-
<li class="nav-item{% if request.path == add_wells_url %} active{% endif %}">
98-
<a class="nav-link" href="{{add_wells_url}}" class="list-group-item list-group-item-action bg-dark text-white">
97+
<li class="nav-item">
98+
<a class="nav-link{% if request.path == add_wells_url %} active{% endif %}" href="{{add_wells_url}}" class="list-group-item list-group-item-action bg-dark text-white">
9999
<span class="menu-collapsed">Add Wells</span>
100100
</a>
101101
</li>
102-
<li class="nav-item{% if request.path == edit_wells_url %} active{% endif %}">
103-
<a class="nav-link" href="{{edit_wells_url}}" class="list-group-item list-group-item-action bg-dark text-white">
102+
<li class="nav-item">
103+
<a class="nav-link{% if request.path == edit_wells_url %} active{% endif %}" href="{{edit_wells_url}}" class="list-group-item list-group-item-action bg-dark text-white">
104104
<span class="menu-collapsed">Edit Wells</span>
105105
</a>
106106
</li>
107-
<li class="nav-item{% if request.path == delete_wells %} active{% endif %}">
108-
<a class="nav-link" href="{{delete_wells}}" class="list-group-item list-group-item-action bg-dark text-white">
107+
<li class="nav-item">
108+
<a class="nav-link{% if request.path == delete_wells %} active{% endif %}" href="{{delete_wells}}" class="list-group-item list-group-item-action bg-dark text-white">
109109
<span class="menu-collapsed">Delete Wells by Aquifer</span>
110110
</a>
111111
</li>
@@ -116,13 +116,13 @@
116116
</div>
117117
</a>
118118
<div id='submenu4' class="collapse sidebar-submenu {% if request.path == add_measurements_url or request.path == update_measurements_url %}in{% endif %}">
119-
<li class="nav-item{% if request.path == add_measurements_url %} active{% endif %}">
120-
<a class="nav-link" href="{{add_measurements_url}}" class="list-group-item list-group-item-action bg-dark text-white">
119+
<li class="nav-item">
120+
<a class="nav-link{% if request.path == add_measurements_url %} active{% endif %}" href="{{add_measurements_url}}" class="list-group-item list-group-item-action bg-dark text-white">
121121
<span class="menu-collapsed">Add Measurements</span>
122122
</a>
123123
</li>
124-
<li class="nav-item{% if request.path == update_aquifer_url %} active{% endif %}">
125-
<a class="nav-link" href="{{update_measurements_url}}" class="list-group-item list-group-item-action bg-dark text-white">
124+
<li class="nav-item">
125+
<a class="nav-link{% if request.path == update_aquifer_url %} active{% endif %}" href="{{update_measurements_url}}" class="list-group-item list-group-item-action bg-dark text-white">
126126
<span class="menu-collapsed">Delete Measurements</span>
127127
</a>
128128
</li>
@@ -133,13 +133,13 @@
133133
</div>
134134
</a>
135135
<div id='submenu5' class="collapse sidebar-submenu {% if request.path == add_variable_url or request.path == update_variable_url %}in{% endif %}">
136-
<li class="nav-item{% if request.path == add_variable_url %} active{% endif %}">
137-
<a class="nav-link" href="{{add_variable_url}}" class="list-group-item list-group-item-action bg-dark text-white">
136+
<li class="nav-item">
137+
<a class="nav-link{% if request.path == add_variable_url %} active{% endif %}" href="{{add_variable_url}}" class="list-group-item list-group-item-action bg-dark text-white">
138138
<span class="menu-collapsed">Add Variable</span>
139139
</a>
140140
</li>
141-
<li class="nav-item{% if request.path == update_variable_url %} active{% endif %}">
142-
<a class="nav-link" href="{{update_variable_url}}" class="list-group-item list-group-item-action bg-dark text-white">
141+
<li class="nav-item">
142+
<a class="nav-link{% if request.path == update_variable_url %} active{% endif %}" href="{{update_variable_url}}" class="list-group-item list-group-item-action bg-dark text-white">
143143
<span class="menu-collapsed">Edit Variables</span>
144144
</a>
145145
</li>
@@ -150,13 +150,13 @@
150150
</div>
151151
</a>
152152
<div id='submenu6' class="collapse sidebar-submenu {% if request.path == delete_rasters or request.path == upload_rasters %}in{% endif %}">
153-
<li class="nav-item{% if request.path == upload_rasters %} active{% endif %}">
154-
<a class="nav-link" href="{{upload_rasters}}" class="list-group-item list-group-item-action bg-dark text-white">
153+
<li class="nav-item">
154+
<a class="nav-link{% if request.path == upload_rasters %} active{% endif %}" href="{{upload_rasters}}" class="list-group-item list-group-item-action bg-dark text-white">
155155
<span class="menu-collapsed">Upload Rasters</span>
156156
</a>
157157
</li>
158-
<li class="nav-item{% if request.path == delete_rasters %} active{% endif %}">
159-
<a class="nav-link" href="{{delete_rasters}}" class="list-group-item list-group-item-action bg-dark text-white">
158+
<li class="nav-item">
159+
<a class="nav-link{% if request.path == delete_rasters %} active{% endif %}" href="{{delete_rasters}}" class="list-group-item list-group-item-action bg-dark text-white">
160160
<span class="menu-collapsed">Delete Rasters</span>
161161
</a>
162162
</li>

‎tethysapp/gwdm/templates/gwdm/region_map.html

+3-1
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,9 @@
6060

6161
{% url 'gwdm:home' as home_url %}
6262

63-
<li class="nav-item{% if request.path == home_url %} active{% endif %}"><a href="{{home_url}}">Go Home</a></li>
63+
<li class="nav-item">
64+
<a class="nav-link{% if request.path == home_url %} active{% endif %}" href="{{home_url}}">Go Home</a>
65+
</li>
6466
<h3>Region Name: {{region_name}}</h3>
6567
{% gizmo region_select %}
6668
{% gizmo aquifer_select %}

‎tethysapp/gwdm/utils.py

+1-8
Original file line numberDiff line numberDiff line change
@@ -899,8 +899,6 @@ def process_measurements_file(
899899
if temp_dir is not None:
900900
if os.path.exists(temp_dir):
901901
shutil.rmtree(temp_dir)
902-
print("\nMyTest")
903-
print(response)
904902
return response
905903

906904

@@ -1058,12 +1056,7 @@ def get_wms_datasets(aquifer_name: str, variable_id: str, region_id: str) -> Lis
10581056
.datasets.items()
10591057
if f"_{variable_id}_" in name
10601058
]
1061-
print(c)
1062-
print(c.catalog_refs[f"{region_id}"])
1063-
print(urls)
1064-
except KeyError as e:
1065-
print("found error")
1066-
print(e)
1059+
except KeyError:
10671060
urls = []
10681061

10691062
return urls

0 commit comments

Comments
 (0)