kwh3 custom format

Author: sdebruyn

.evidence/customization/custom-formatting.json

@@ -1,4 +1,15 @@
 {
   "version": "1.0",
-  "customFormats": []
+  "customFormats": [
+    {
+      "formatTag": "kwh0",
+      "formatCode": "#,##0\" kWh\"",
+      "valueType": "number"
+    },
+    {
+      "formatTag": "kwh3",
+      "formatCode": "#,##0.000\" kWh\"",
+      "valueType": "number"
+    }
+  ]
 }

pages/capacity-tariff.md

@@ -2,20 +2,20 @@
 
 ```mrt_capacity_tariff
 select
-    month_peak_value,
+    month_peak_value as month_peak_value_kwh3,
     pct_change as pct_change_pct1,
     month_name,
     month_name_short,
-    month_peak_12month_avg,
+    month_peak_12month_avg as month_peak_12month_avg_kwh3,
     month_start_date
 from mrt_capacity_tariff
 ```
 
 The capacity tariff is based on the 12-month rolling average of your monthly peak consumption. The higher your peak consumption, the higher your capacity tariff.
 
-<Chart data={mrt_capacity_tariff} x=month_start_date title="Month peak value evolution" yAxisTitle="kWh" xAxisTitle="month">
-    <Bar y=month_peak_value />
-    <Line y=month_peak_12month_avg name="Rolling average" />
+<Chart data={mrt_capacity_tariff} x=month_start_date title="Month peak value evolution" yAxisTitle="peak" xAxisTitle="month">
+    <Bar y=month_peak_value_kwh3 />
+    <Line y=month_peak_12month_avg_kwh3 name="Rolling average" />
 </Chart>
 
 ```mrt_capacity_tariff_last_months
@@ -26,15 +26,15 @@ order by month_start_date desc
 limit 4
 ```
 
-The current (<Value data={mrt_capacity_tariff_last_months} column=month_name_short/>) monthly peak is **<Value data={mrt_capacity_tariff_last_months} column=month_peak_value/> kWh**. The change over last month (<Value data={mrt_capacity_tariff_last_months} column=month_name_short row=1/>) is **<Value data={mrt_capacity_tariff_last_months} column=pct_change_pct1/>** as we then had <Value data={mrt_capacity_tariff_last_months} column=month_peak_value row=1/> kWh.
+The current (<Value data={mrt_capacity_tariff_last_months} column=month_name_short/>) monthly peak is **<Value data={mrt_capacity_tariff_last_months} column=month_peak_value_kwh3/>**. The change over last month (<Value data={mrt_capacity_tariff_last_months} column=month_name_short row=1/>) is **<Value data={mrt_capacity_tariff_last_months} column=pct_change_pct1/>** as we then had <Value data={mrt_capacity_tariff_last_months} column=month_peak_value_kwh3 row=1/>.
 
- The average monthly peak for the last 12 months is **<Value data={mrt_capacity_tariff_last_months} column=month_peak_12month_avg/> kWh**.
+ The average monthly peak for the last 12 months is **<Value data={mrt_capacity_tariff_last_months} column=month_peak_12month_avg_kwh3/>**.
 
  Here are the monthly peaks for the last 4 months:
 
 {#each mrt_capacity_tariff_last_months as month_row}
 
-* {month_row.month_name}: {month_row.month_peak_value} kWh, <Value data={month_row} column=pct_change_pct1 />
+* {month_row.month_name}: <Value data={month_row} column=month_peak_value_kwh3 />, <Value data={month_row} column=pct_change_pct1 />
 {#if month_row.pct_change_pct1 > 0}
 ↗️ more
 {:else}

pages/index.md

@@ -8,11 +8,11 @@ Navigate through the menu on the left to analyze your electricity data.
 
 ```mrt_capacity_tariff_current
 select
-  month_peak_12month_avg,
+  month_peak_12month_avg as month_peak_12month_avg_kwh3,
   pct_change as pct_change_pct2,
 from mrt_capacity_tariff
 order by month_start_date desc
 limit 1
 ```
 
-<BigValue data={mrt_capacity_tariff_current} value=month_peak_12month_avg comparison=pct_change_pct2 downIsGood=true comparisonTitle="Evolution" title="Average monthly peak (kWh)" />
+<BigValue data={mrt_capacity_tariff_current} value=month_peak_12month_avg_kwh3 comparison=pct_change_pct2 downIsGood=true comparisonTitle="current peak vs. last month" title="Average monthly peak" />