more date columns in mart

Author: sdebruyn

models/marts/marts.yml

@@ -38,6 +38,26 @@ models:
         description: Peak moment of the month as date
         tests:
           - not_null
+      - name: month_peak_day_of_week_name
+        description: Name of the day of the week of the peak moment of the month
+        tests:
+          - not_null
+      - name: month_peak_day_of_month
+        description: Day of the month of the peak moment of the month
+        tests:
+          - not_null
+      - name: month_peak_day_type
+        description: Type of the day of the peak moment of the month
+        tests:
+          - not_null
+          - accepted_values:
+              values:
+                - weekday
+                - weekend
+      - name: month_peak_is_holiday
+        description: Whether the peak moment of the month is a holiday
+        tests:
+          - not_null
       - name: month_peak_value
         description: Peak value of the month
         tests:

models/marts/mrt_capacity_tariff.sql

@@ -38,6 +38,10 @@ with_avg as (
         d.from_timestamp as month_peak_timestamp,
         d.to_timestamp as month_peak_timestamp_end,
         d.from_timestamp::date as month_peak_date,
+        d.day_of_week_name as month_peak_day_of_week_name,
+        d.day_of_month as month_peak_day_of_month,
+        d.day_type as month_peak_day_type,
+        d.is_holiday as month_peak_is_holiday,
         p.month_peak as month_peak_value,
         avg(p.month_peak) over (rows between 11 preceding and current row) as month_peak_12month_avg,
     from components d

pages/capacity-tariff.md

@@ -7,7 +7,9 @@ select
     month_name,
     month_name_short,
     month_peak_12month_avg as month_peak_12month_avg_kwh3,
-    month_start_date
+    month_start_date,
+    month_peak_timestamp as month_peak_timestamp_hm,
+    month_peak_timestamp_end as month_peak_timestamp_end_hm
 from mrt_capacity_tariff
 ```
 
@@ -23,14 +25,16 @@ select
     *
 from ${mrt_capacity_tariff}
 order by month_start_date desc
-limit 4
+limit 6
 ```
 
-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 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_kwh3/>**.
 
- Here are the monthly peaks for the last 4 months:
+ Here are the monthly peaks for the last 6 months:
 
 {#each mrt_capacity_tariff_last_months as month_row}