diff --git a/CHANGELOG.md b/CHANGELOG.md index 972e326..84fa554 100644 --- a/CHANGELOG.md +++ b/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 diff --git a/src/index.html.tmpl b/src/index.html.tmpl index f31d914..c7a8274 100644 --- a/src/index.html.tmpl +++ b/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 diff --git a/src/month-%Y-%m.html.tmpl b/src/month-%Y-%m.html.tmpl index d2fe140..c54464d 100644 --- a/src/month-%Y-%m.html.tmpl +++ b/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 diff --git a/src/month.html.tmpl b/src/month.html.tmpl index 6ad126d..5cc135b 100644 --- a/src/month.html.tmpl +++ b/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 diff --git a/src/telemetry.html.tmpl b/src/telemetry.html.tmpl index d86f6dc..8d4a6e4 100644 --- a/src/telemetry.html.tmpl +++ b/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 diff --git a/src/week.html.tmpl b/src/week.html.tmpl index 3ddd345..3900066 100644 --- a/src/week.html.tmpl +++ b/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 diff --git a/src/year-%Y.html.tmpl b/src/year-%Y.html.tmpl index 54de8c5..d783189 100644 --- a/src/year-%Y.html.tmpl +++ b/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 diff --git a/src/year.html.tmpl b/src/year.html.tmpl index 94d22f6..2d6afde 100644 --- a/src/year.html.tmpl +++ b/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 diff --git a/src/yesterday.html.tmpl b/src/yesterday.html.tmpl index cd08e18..ca1b66c 100644 --- a/src/yesterday.html.tmpl +++ b/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