Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix Cheetah error #44

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions src/index.html.tmpl
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
$getVar('obs.label.' + name)


#if $name in $Extras.Appearance.show_trend_on and $getVar('trend.' + name + '.raw') is not None
#if $name in $Extras.Appearance.show_trend_on and $getVar('trend.' + name + '.raw') != None

#if $getVar('trend.' + name + '.raw') > 0.1
<i class="wi wi-direction-up-right"
Expand Down Expand Up @@ -149,7 +149,7 @@
#for $x in $Extras.Appearance.values_order

#if $x == "ET"
#if $day.ET.has_data and $day.ET.sum.raw is not None and $day.ET.sum.raw > 0.0
#if $day.ET.has_data and $day.ET.sum.raw != None and $day.ET.sum.raw > 0.0
$valuesCard('ET')
#end if
#else
Expand All @@ -165,7 +165,7 @@
#for $x in $Extras.Appearance.charts_order

#if $x == "ET"
#if $day.ET.has_data and $day.ET.sum.raw is not None and $day.ET.sum.raw > 0.0
#if $day.ET.has_data and $day.ET.sum.raw != None and $day.ET.sum.raw > 0.0
$chartCard($x, $x + 'chart')
#end if
#else
Expand Down Expand Up @@ -311,7 +311,7 @@ new ApexCharts(document.querySelector('#$id'), {
$getChartJsCode("UV", "UVchart", "area", "UV", "", "max")
#end if

#if $day.ET.has_data and $day.ET.sum.raw is not None and $day.ET.sum.raw > 0.0
#if $day.ET.has_data and $day.ET.sum.raw != None and $day.ET.sum.raw > 0.0
$getChartJsCode("ET", "ETchart", "area", "ET", "", "max")
#end if

Expand Down
6 changes: 3 additions & 3 deletions src/month-%Y-%m.html.tmpl
Original file line number Diff line number Diff line change
Expand Up @@ -136,7 +136,7 @@
#for $x in $Extras.Appearance.values_order

#if $x == "ET"
#if $month.ET.has_data and $month.ET.sum.raw is not None and $month.ET.sum.raw > 0.0
#if $month.ET.has_data and $month.ET.sum.raw != None and $month.ET.sum.raw > 0.0
$valuesCard('ET')
#end if
#else
Expand All @@ -154,7 +154,7 @@
#for $x in $Extras.Appearance.charts_order

#if $x == "ET"
#if $month.ET.has_data and $month.ET.sum.raw is not None and $month.ET.sum.raw > 0.0
#if $month.ET.has_data and $month.ET.sum.raw != None and $month.ET.sum.raw > 0.0
$chartCard($x, $x + 'chart')
#end if
#else
Expand Down Expand Up @@ -342,7 +342,7 @@ new ApexCharts(document.querySelector('#$id'), {
$getChartJsCode("UV", "UVchart", "area", "UV", "", "max")
#end if

#if $month.ET.has_data and $month.ET.sum.raw is not None and $month.ET.sum.raw > 0.0
#if $month.ET.has_data and $month.ET.sum.raw != None and $month.ET.sum.raw > 0.0
$getChartJsCode("ET", "ETchart", "area", "ET", "", "max")
#end if

Expand Down
6 changes: 3 additions & 3 deletions src/month.html.tmpl
Original file line number Diff line number Diff line change
Expand Up @@ -131,7 +131,7 @@
#for $x in $Extras.Appearance.values_order

#if $x == "ET"
#if $month.ET.has_data and $month.ET.sum.raw is not None and $month.ET.sum.raw > 0.0
#if $month.ET.has_data and $month.ET.sum.raw != None and $month.ET.sum.raw > 0.0
$valuesCard('ET')
#end if
#else
Expand All @@ -147,7 +147,7 @@
#for $x in $Extras.Appearance.charts_order

#if $x == "ET"
#if $month.ET.has_data and $month.ET.sum.raw is not None and $month.ET.sum.raw > 0.0
#if $month.ET.has_data and $month.ET.sum.raw != None and $month.ET.sum.raw > 0.0
$chartCard($x, $x + 'chart')
#end if
#else
Expand Down Expand Up @@ -293,7 +293,7 @@ new ApexCharts(document.querySelector('#$id'), {
$getChartJsCode("UV", "UVchart", "area", "UV", "", "max")
#end if

#if $month.ET.has_data and $month.ET.sum.raw is not None and $month.ET.sum.raw > 0.0
#if $month.ET.has_data and $month.ET.sum.raw != None and $month.ET.sum.raw > 0.0
$getChartJsCode("ET", "ETchart", "area", "ET", "", "max")
#end if

Expand Down
6 changes: 3 additions & 3 deletions src/week.html.tmpl
Original file line number Diff line number Diff line change
Expand Up @@ -131,7 +131,7 @@
#for $x in $Extras.Appearance.values_order

#if $x == "ET"
#if $week.ET.has_data and $week.ET.sum.raw is not None and $week.ET.sum.raw > 0.0
#if $week.ET.has_data and $week.ET.sum.raw != None and $week.ET.sum.raw > 0.0
$valuesCard('ET')
#end if
#else
Expand All @@ -147,7 +147,7 @@
#for $x in $Extras.Appearance.charts_order

#if $x == "ET"
#if $week.ET.has_data and $week.ET.sum.raw is not None and $week.ET.sum.raw > 0.0
#if $week.ET.has_data and $week.ET.sum.raw != None and $week.ET.sum.raw > 0.0
$chartCard($x, $x + 'chart')
#end if
#else
Expand Down Expand Up @@ -293,7 +293,7 @@ new ApexCharts(document.querySelector('#$id'), {
$getChartJsCode("UV", "UVchart", "area", "UV", "", "max")
#end if

#if $week.ET.has_data and $week.ET.sum.raw is not None and $week.ET.sum.raw > 0.0
#if $week.ET.has_data and $week.ET.sum.raw != None and $week.ET.sum.raw > 0.0
$getChartJsCode("ET", "ETchart", "area", "ET", "", "max")
#end if

Expand Down
6 changes: 3 additions & 3 deletions src/year-%Y.html.tmpl
Original file line number Diff line number Diff line change
Expand Up @@ -182,7 +182,7 @@
#for $x in $Extras.Appearance.values_order

#if $x == "ET"
#if $year.ET.has_data and $year.ET.sum.raw is not None and $year.ET.sum.raw > 0.0
#if $year.ET.has_data and $year.ET.sum.raw != None and $year.ET.sum.raw > 0.0
$valuesCard('ET')
#end if
#else
Expand All @@ -198,7 +198,7 @@
#for $x in $Extras.Appearance.charts_order

#if $x == "ET"
#if $year.ET.has_data and $year.ET.sum.raw is not None and $year.ET.sum.raw > 0.0
#if $year.ET.has_data and $year.ET.sum.raw != None and $year.ET.sum.raw > 0.0
$chartCard($x, $x + 'chart')
#end if
#else
Expand Down Expand Up @@ -386,7 +386,7 @@ new ApexCharts(document.querySelector('#$id'), {
$getChartJsCode("UV", "UVchart", "area", "UV", "", "max")
#end if

#if $year.ET.has_data and $year.ET.sum.raw is not None and $year.ET.sum.raw > 0.0
#if $year.ET.has_data and $year.ET.sum.raw != None and $year.ET.sum.raw > 0.0
$getChartJsCode("ET", "ETchart", "area", "ET", "", "max")
#end if

Expand Down
6 changes: 3 additions & 3 deletions src/year.html.tmpl
Original file line number Diff line number Diff line change
Expand Up @@ -131,7 +131,7 @@
#for $x in $Extras.Appearance.values_order

#if $x == "ET"
#if $year.ET.has_data and $year.ET.sum.raw is not None and $year.ET.sum.raw > 0.0
#if $year.ET.has_data and $year.ET.sum.raw != None and $year.ET.sum.raw > 0.0
$valuesCard('ET')
#end if
#else
Expand All @@ -147,7 +147,7 @@
#for $x in $Extras.Appearance.charts_order

#if $x == "ET"
#if $year.ET.has_data and $year.ET.sum.raw is not None and $year.ET.sum.raw > 0.0
#if $year.ET.has_data and $year.ET.sum.raw != None and $year.ET.sum.raw > 0.0
$chartCard($x, $x + 'chart')
#end if
#else
Expand Down Expand Up @@ -340,7 +340,7 @@ new ApexCharts(document.querySelector('#$id'), {
$getChartJsCode("UV", "UVchart", "area", "UV", "", "max")
#end if

#if $year.ET.has_data and $year.ET.sum.raw is not None and $year.ET.sum.raw > 0.0
#if $year.ET.has_data and $year.ET.sum.raw != None and $year.ET.sum.raw > 0.0
$getChartJsCode("ET", "ETchart", "area", "ET", "", "max")
#end if

Expand Down
6 changes: 3 additions & 3 deletions src/yesterday.html.tmpl
Original file line number Diff line number Diff line change
Expand Up @@ -130,7 +130,7 @@
#for $x in $Extras.Appearance.values_order

#if $x == "ET"
#if $yesterday.ET.has_data and $yesterday.ET.sum.raw is not None and $yesterday.ET.sum.raw > 0.0
#if $yesterday.ET.has_data and $yesterday.ET.sum.raw != None and $yesterday.ET.sum.raw > 0.0
$valuesCard('ET')
#end if
#else
Expand All @@ -146,7 +146,7 @@
#for $x in $Extras.Appearance.charts_order

#if $x == "ET"
#if $yesterday.ET.has_data and $yesterday.ET.sum.raw is not None and $yesterday.ET.sum.raw > 0.0
#if $yesterday.ET.has_data and $yesterday.ET.sum.raw != None and $yesterday.ET.sum.raw > 0.0
$chartCard($x, $x + 'chart')
#end if
#else
Expand Down Expand Up @@ -316,7 +316,7 @@ new ApexCharts(document.querySelector('#$id'), {
$getChartJsCode("UV", "UVchart", "area", "UV", "", "max")
#end if

#if $yesterday.ET.has_data and $yesterday.ET.sum.raw is not None and $yesterday.ET.sum.raw > 0.0
#if $yesterday.ET.has_data and $yesterday.ET.sum.raw != None and $yesterday.ET.sum.raw > 0.0
$getChartJsCode("ET", "ETchart", "area", "ET", "", "max")
#end if

Expand Down