Merge pull request #337 from payerle/has_usage_gauge_divby0

Fix for #336 - Divide-by-zero error for Attrib value=0 and has_usage
ubccr · Dec 23, 2021 · 87804e5 · 87804e5
2 parents 4c61ed2 + 72bdfbb
commit 87804e5
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 1 deletion.
diff --git a/coldfront/core/allocation/models.py b/coldfront/core/allocation/models.py
@@ -113,6 +113,10 @@ def get_information(self):
                     percent = 'Invalid Value'
                     logger.error("Allocation attribute '%s' is not an int but has a usage",
                                  attribute.allocation_attribute_type.name)
+                except ZeroDivisionError:
+                    percent = 100
+                    logger.error("Allocation attribute '%s' == 0 but has a usage",
+                                 attribute.allocation_attribute_type.name)
 
                 string = '{}: {}/{} ({} %) <br>'.format(
                     attribute.allocation_attribute_type.name,

diff --git a/coldfront/core/allocation/utils.py b/coldfront/core/allocation/utils.py
@@ -16,7 +16,12 @@ def generate_guauge_data_from_usage(name, value, usage):
 
     label = "%s: %.2f of %.2f" % (name, usage, value)
 
-    percent = (usage/value)*100
+    try:
+        percent = (usage/value)*100
+    except ZeroDivisionError:
+        percent = 100
+    except ValueError:
+        percent = 100
 
     if percent < 80:
         color = "#6da04b"