Cleanup tethys 4 update

BYU-Hydroinformatics · Jun 23, 2022 · 3ff44ef · 3ff44ef
1 parent 9bb7df8
commit 3ff44ef
Show file tree

Hide file tree

Showing 8 changed files with 46 additions and 52 deletions.
diff --git a/tethysapp/gwdm/interpolation_utils.py b/tethysapp/gwdm/interpolation_utils.py
@@ -526,7 +526,6 @@ def calculate_aquifer_area(imputed_raster, units):
 
 def clip_nc_file(file_path, aquifer_obj, region_id, storage_coefficient, units):
     thredds_directory = app.get_custom_setting("gw_thredds_directory")
-    print(f'Thredds dir: {thredds_directory}\n')
     aquifer_name = aquifer_obj[1].replace(" ", "_")
     aquifer_dir = os.path.join(thredds_directory, str(region_id), str(aquifer_name))
     if not os.path.exists(aquifer_dir):
@@ -588,7 +587,7 @@ def mlr_interpolation(mlr_dict):
     end_date = mlr_dict["end_date"]
     storage_coefficient = mlr_dict["storage_coefficient"]
     units = mlr_dict["units"]
-    
+
     bbox, wells_query_df, measurements_df, aquifer_obj = extract_query_objects(
         region_id, aquifer_id, variable
     )

diff --git a/tethysapp/gwdm/public/js/edit_wells.js b/tethysapp/gwdm/public/js/edit_wells.js
@@ -75,15 +75,15 @@ var LIBRARY_OBJECT = (function() {
     });
 
     var viewIcon = function(cell, formatterParams){ //plain text value
-        return "<span class='sunglasses view-region-tabulator'></span>";
+        return "<i class='bi bi-sunglasses view-region-tabulator'></i>";
     };
 
     var deleteIcon = function(cell, formatterParams){ //plain text value
-        return "<span class='file-x'></span>";
+        return "<i class='bi bi-file-x'></i>";
     };
 
     var updateIcon = function(cell, formatterParams){ //plain text value
-        return "<span class='device-hdd'></span>";
+        return "<i class='bi bi-device-hdd'></i>";
     };
 
     delete_well = function(e, cell){

diff --git a/tethysapp/gwdm/public/js/update_aquifer.js b/tethysapp/gwdm/public/js/update_aquifer.js
@@ -79,15 +79,15 @@ var LIBRARY_OBJECT = (function() {
     });
 
     var viewIcon = function(cell, formatterParams){ //plain text value
-        return "<span class='sunglasses view-aquifer-tabulator'></span>";
+        return "<i class='bi bi-sunglasses view-aquifer-tabulator'></i>";
     };
 
     var deleteIcon = function(cell, formatterParams){ //plain text value
-        return "<span class='x-lg'></span>";
+        return "<i class='bi bi-x-lg'></i>";
     };
 
     var updateIcon = function(cell, formatterParams){ //plain text value
-        return "<span class='device-hdd'></span>";
+        return "<i class='bi bi-device-hdd'></i>";
     };
 
     delete_aquifer = function(e, cell){

diff --git a/tethysapp/gwdm/public/js/update_region.js b/tethysapp/gwdm/public/js/update_region.js
@@ -80,15 +80,15 @@ var LIBRARY_OBJECT = (function() {
     });
 
     var viewIcon = function(cell, formatterParams){ //plain text value
-        return "<span class='sunglasses view-region-tabulator'></span>";
+        return "<i class='bi bi-sunglasses view-region-tabulator'></i>";
     };
 
     var deleteIcon = function(cell, formatterParams){ //plain text value
-        return "<span class='x-lg'></span>";
+        return "<i class='bi bi-x-lg'></i>";
     };
 
     var updateIcon = function(cell, formatterParams){ //plain text value
-        return "<span class='device-hdd'></span>";
+        return "<i class='bi bi-device-hdd'></i>";
     };
 
     delete_region = function(e, cell){

diff --git a/tethysapp/gwdm/public/js/update_variable.js b/tethysapp/gwdm/public/js/update_variable.js
@@ -60,11 +60,11 @@ var LIBRARY_OBJECT = (function() {
 
 
     var deleteIcon = function(cell, formatterParams){ //plain text value
-        return "<span class='x-lg'></span>";
+        return "<i class='bi bi-x-lg'></i>";
     };
 
     var updateIcon = function(cell, formatterParams){ //plain text value
-        return "<span class='device-hdd'></span>";
+        return "<i class='bi bi-device-hdd'></i>";
     };
 
     delete_variable = function(e, cell){

diff --git a/tethysapp/gwdm/templates/gwdm/base.html b/tethysapp/gwdm/templates/gwdm/base.html
@@ -34,13 +34,13 @@
 {% url 'gwdm:upload-rasters' as upload_rasters %}
 {% url 'gwdm:delete-rasters' as delete_rasters %}
 <br>
-<li class="nav-item{% if request.path == home_url %} active{% endif %}"><a class="nav-link" href="{{home_url}}">Home</a></li>
-<li class="nav-item{% if request.path == metrics_url %} active{% endif %}"><a class="nav-link" href="{{metrics_url}}">Summary Statistics</a></li>
+<li class="nav-item"><a class="nav-link{% if request.path == home_url %} active{% endif %}" href="{{home_url}}">Home</a></li>
+<li class="nav-item"><a class="nav-link{% if request.path == metrics_url %} active{% endif %}" href="{{metrics_url}}">Summary Statistics</a></li>
 
 {% if user.is_superuser or user.is_staff %}
 <li class="nav-item title">Configuration</li>
-<li class="nav-item{% if request.path == config_url %} active{% endif %}"><a class="nav-link" href="{{config_url}}">Configure App</a></li>
-<li class="nav-item{% if request.path == interpolation_url %} active{% endif %}"><a class="nav-link" href="{{interpolation_url}}">Interpolation Wizard</a></li>
+<li class="nav-item"><a class="nav-link{% if request.path == config_url %} active{% endif %}" href="{{config_url}}">Configure App</a></li>
+<li class="nav-item"><a class="nav-link"{% if request.path == interpolation_url %} active{% endif %} href="{{interpolation_url}}">Interpolation Wizard</a></li>
 <!--<li class="{% if request.path == jobs_table %}active{% endif %}"><a href="{{jobs_table}}">Interpolation Jobs Table</a></li>-->
 <!--<li class="{% if request.path == add_region_url %}active{% endif %}"><a href="{{add_region_url}}">Add Region</a></li>-->
 <!--<li class="{% if request.path == update_region_url %}active{% endif %}"><a href="{{update_region_url}}">Edit Region</a></li>-->
@@ -59,13 +59,13 @@
   </div>
 </a>
 <div id='submenu1' class="collapse sidebar-submenu {% if request.path == add_region_url or  request.path == update_region_url %}in{% endif %}">
-  <li class="nav-item{% if request.path == add_region_url %} active{% endif %}">
-    <a class="nav-link" href="{{add_region_url}}" class="list-group-item list-group-item-action bg-dark text-white">
+  <li class="nav-item">
+    <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">
       <span class="menu-collapsed">Add Region</span>
     </a>
   </li>
-  <li class="nav-item{% if request.path == update_region_url %} active{% endif %}">
-    <a class="nav-link" href="{{update_region_url}}" class="list-group-item list-group-item-action bg-dark text-white">
+  <li class="nav-item">
+    <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">
       <span class="menu-collapsed">Edit Region</span>
     </a>
   </li>
@@ -76,13 +76,13 @@
   </div>
 </a>
 <div id='submenu2' class="collapse sidebar-submenu {% if request.path == add_aquifer_url or  request.path == update_aquifer_url %}in{% endif %}">
-  <li class="nav-item{% if request.path == add_aquifer_url %} active{% endif %}">
-    <a class="nav-link" href="{{add_aquifer_url}}" class="list-group-item list-group-item-action bg-dark text-white">
+  <li class="nav-item">
+    <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">
       <span class="menu-collapsed">Add Aquifer</span>
     </a>
   </li>
-  <li class="nav-item{% if request.path == update_aquifer_url %} active{% endif %}">
-    <a class="nav-link" href="{{update_aquifer_url}}" class="list-group-item list-group-item-action bg-dark text-white">
+  <li class="nav-item">
+    <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">
       <span class="menu-collapsed">Edit Aquifer</span>
     </a>
   </li>
@@ -94,18 +94,18 @@
 </a>
 <div id='submenu3' class="collapse sidebar-submenu
 {% if request.path == add_wells_url or request.path == edit_wells_url or request.path == delete_wells %}in{% endif %}">
-  <li class="nav-item{% if request.path == add_wells_url %} active{% endif %}">
-    <a class="nav-link" href="{{add_wells_url}}" class="list-group-item list-group-item-action bg-dark text-white">
+  <li class="nav-item">
+    <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">
       <span class="menu-collapsed">Add Wells</span>
     </a>
   </li>
-  <li class="nav-item{% if request.path == edit_wells_url %} active{% endif %}">
-    <a class="nav-link" href="{{edit_wells_url}}" class="list-group-item list-group-item-action bg-dark text-white">
+  <li class="nav-item">
+    <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">
       <span class="menu-collapsed">Edit Wells</span>
     </a>
   </li>
-  <li class="nav-item{% if request.path == delete_wells %} active{% endif %}">
-    <a class="nav-link" href="{{delete_wells}}" class="list-group-item list-group-item-action bg-dark text-white">
+  <li class="nav-item">
+    <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">
       <span class="menu-collapsed">Delete Wells by Aquifer</span>
     </a>
   </li>
@@ -116,13 +116,13 @@
   </div>
 </a>
 <div id='submenu4' class="collapse sidebar-submenu {% if request.path == add_measurements_url or  request.path == update_measurements_url %}in{% endif %}">
-  <li class="nav-item{% if request.path == add_measurements_url %} active{% endif %}">
-    <a class="nav-link" href="{{add_measurements_url}}" class="list-group-item list-group-item-action bg-dark text-white">
+  <li class="nav-item">
+    <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">
       <span class="menu-collapsed">Add Measurements</span>
     </a>
   </li>
-  <li class="nav-item{% if request.path == update_aquifer_url %} active{% endif %}">
-    <a class="nav-link" href="{{update_measurements_url}}" class="list-group-item list-group-item-action bg-dark text-white">
+  <li class="nav-item">
+    <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">
       <span class="menu-collapsed">Delete Measurements</span>
     </a>
   </li>
@@ -133,13 +133,13 @@
   </div>
 </a>
 <div id='submenu5' class="collapse sidebar-submenu {% if request.path == add_variable_url or  request.path == update_variable_url %}in{% endif %}">
-  <li class="nav-item{% if request.path == add_variable_url %} active{% endif %}">
-    <a class="nav-link" href="{{add_variable_url}}" class="list-group-item list-group-item-action bg-dark text-white">
+  <li class="nav-item">
+    <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">
       <span class="menu-collapsed">Add Variable</span>
     </a>
   </li>
-  <li class="nav-item{% if request.path == update_variable_url %} active{% endif %}">
-    <a class="nav-link" href="{{update_variable_url}}" class="list-group-item list-group-item-action bg-dark text-white">
+  <li class="nav-item">
+    <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">
       <span class="menu-collapsed">Edit Variables</span>
     </a>
   </li>
@@ -150,13 +150,13 @@
   </div>
 </a>
 <div id='submenu6' class="collapse sidebar-submenu {% if request.path == delete_rasters or request.path == upload_rasters %}in{% endif %}">
-  <li class="nav-item{% if request.path == upload_rasters %} active{% endif %}">
-    <a class="nav-link" href="{{upload_rasters}}" class="list-group-item list-group-item-action bg-dark text-white">
+  <li class="nav-item">
+    <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">
       <span class="menu-collapsed">Upload Rasters</span>
     </a>
   </li>
-  <li class="nav-item{% if request.path == delete_rasters %} active{% endif %}">
-    <a class="nav-link" href="{{delete_rasters}}" class="list-group-item list-group-item-action bg-dark text-white">
+  <li class="nav-item">
+    <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">
       <span class="menu-collapsed">Delete Rasters</span>
     </a>
   </li>

diff --git a/tethysapp/gwdm/templates/gwdm/region_map.html b/tethysapp/gwdm/templates/gwdm/region_map.html
@@ -60,7 +60,9 @@
 
 {% url 'gwdm:home' as home_url %}
 
-<li class="nav-item{% if request.path == home_url %} active{% endif %}"><a href="{{home_url}}">Go Home</a></li>
+<li class="nav-item">
+    <a class="nav-link{% if request.path == home_url %} active{% endif %}" href="{{home_url}}">Go Home</a>
+</li>
 <h3>Region Name: {{region_name}}</h3>
 {% gizmo region_select %}
 {% gizmo aquifer_select %}

diff --git a/tethysapp/gwdm/utils.py b/tethysapp/gwdm/utils.py
@@ -899,8 +899,6 @@ def process_measurements_file(
         if temp_dir is not None:
             if os.path.exists(temp_dir):
                 shutil.rmtree(temp_dir)
-    print("\nMyTest")
-    print(response)
     return response
 
 
@@ -1058,12 +1056,7 @@ def get_wms_datasets(aquifer_name: str, variable_id: str, region_id: str) -> Lis
             .datasets.items()
             if f"_{variable_id}_" in name
         ]
-        print(c)
-        print(c.catalog_refs[f"{region_id}"])
-        print(urls)
-    except KeyError as e:
-        print("found error")
-        print(e)
+    except KeyError:
         urls = []
 
     return urls