⚙ Added better error handling for missing chart data

CHANGELOG.md

@@ -6,6 +6,7 @@
 
 - Cloudbase chart
 - Chart titles can be changed
+- Better error handling if data isn't available for a chart
 
 ### Fixed
 

src/index.html.tmpl

@@ -199,8 +199,13 @@
   #end if
 
   #for $record in $span($day_delta=1).spans(interval=current_interval)
-    #set val = $getattr($record, $name)
-    [$record.start.raw, $getattr($val, $column).format(add_label=False, localize=False, None_string="null")],
+    #try
+      #set val = $getattr($record, $name)
+      #set data = $getattr($val, $column).format(add_label=False, localize=False, None_string="null")
+      [$record.start.raw, $data],
+    #except
+
+    #end try
   #end for
 #end def
 

src/month-%Y-%m.html.tmpl

@@ -183,8 +183,13 @@
 
 #def getChartData($name, $column)
   #for $record in $month.days
-    #set val = $getattr($record, $name)
-    [$record.start.raw, $getattr($val, $column).format(add_label=False, localize=False, None_string="null")],
+    #try
+      #set val = $getattr($record, $name)
+      #set data = $getattr($val, $column).format(add_label=False, localize=False, None_string="null")
+      [$record.start.raw, $data],
+    #except
+
+    #end try
   #end for
 #end def
 

src/month.html.tmpl

@@ -181,8 +181,13 @@
   #end if
 
   #for $record in $span($month_delta=1).spans(interval=current_interval)
-    #set val = $getattr($record, $name)
-    [$record.start.raw, $getattr($val, $column).format(add_label=False, localize=False, None_string="null")],
+    #try
+      #set val = $getattr($record, $name)
+      #set data = $getattr($val, $column).format(add_label=False, localize=False, None_string="null")
+      [$record.start.raw, $data],
+    #except
+
+    #end try
   #end for
 #end def
 

src/telemetry.html.tmpl

@@ -90,8 +90,13 @@
 #def getChartData($name, $column)
   #set current_interval = int($Extras.Charts.current_timespan)
   #for $record in $span($day_delta=1).spans(interval=current_interval)
-    #set val = $getattr($record, $name)
-    [$record.start.raw, $getattr($val, $column).format(add_label=False, localize=False, None_string="null")],
+    #try
+      #set val = $getattr($record, $name)
+      #set data = $getattr($val, $column).format(add_label=False, localize=False, None_string="null")
+      [$record.start.raw, $data],
+    #except
+
+    #end try
   #end for
 #end def
 

src/week.html.tmpl

@@ -181,8 +181,13 @@
   #end if
 
   #for $record in $span($week_delta=1).spans(interval=current_interval)
-    #set val = $getattr($record, $name)
-    [$record.start.raw, $getattr($val, $column).format(add_label=False, localize=False, None_string="null")],
+    #try
+      #set val = $getattr($record, $name)
+      #set data = $getattr($val, $column).format(add_label=False, localize=False, None_string="null")
+      [$record.start.raw, $data],
+    #except
+
+    #end try
   #end for
 #end def
 

src/year-%Y.html.tmpl

@@ -227,8 +227,13 @@
 
 #def getChartData($name, $column)
   #for $record in $year.days
-    #set val = $getattr($record, $name)
-    [$record.start.raw, $getattr($val, $column).format(add_label=False, localize=False, None_string="null")],
+    #try
+      #set val = $getattr($record, $name)
+      #set data = $getattr($val, $column).format(add_label=False, localize=False, None_string="null")
+      [$record.start.raw, $data],
+    #except
+
+    #end try
   #end for
 #end def
 

src/year.html.tmpl

@@ -181,8 +181,13 @@
   #end if
 
   #for $record in $span($year_delta=1).spans(interval=current_interval)
-    #set val = $getattr($record, $name)
-    [$record.start.raw, $getattr($val, $column).format(add_label=False, localize=False, None_string="null")],
+    #try
+      #set val = $getattr($record, $name)
+      #set data = $getattr($val, $column).format(add_label=False, localize=False, None_string="null")
+      [$record.start.raw, $data],
+    #except
+
+    #end try
   #end for
 #end def
 

src/yesterday.html.tmpl

@@ -180,8 +180,13 @@
   #end if
 
   #for $record in $span($hour_delta=48).spans(interval=current_interval)
-    #set val = $getattr($record, $name)
-    [$record.start.raw, $getattr($val, $column).format(add_label=False, localize=False, None_string="null")],
+    #try
+      #set val = $getattr($record, $name)
+      #set data = $getattr($val, $column).format(add_label=False, localize=False, None_string="null")
+      [$record.start.raw, $data],
+    #except
+
+    #end try
   #end for
 #end def