Rename blackout to power_shortage in queries

kaskranenburgQ · kaskranenburgQ · commit 8411db5ad07f · 2025-05-22T11:53:31.000+02:00
diff --git a/gqueries/general/electricity/power_shortage/power_shortage_hours.gql b/gqueries/general/electricity/power_shortage/power_shortage_hours.gql
@@ -1,2 +1,7 @@
-- query = Q(dashboard_blackout_hours)
+- query =
+    IF(
+      GRAPH().future?,
+      -> { V(GRAPH(), number_of_power_shortage_hours) },
+      -> { 0 }
+    )
 - unit = hours
diff --git a/gqueries/general/electricity/power_shortage/power_shortage_peak.gql b/gqueries/general/electricity/power_shortage/power_shortage_peak.gql
@@ -1,7 +1,7 @@
 - query =
     IF(
       GRAPH().future?,
-      -> { V(GRAPH(), peak_of_blackout_hours) },
+      -> { V(GRAPH(), peak_of_power_shortage_hours) },
       -> { 0 }
     )
 - unit = MW
diff --git a/gqueries/general/electricity/power_shortage/power_shortage_volume.gql b/gqueries/general/electricity/power_shortage/power_shortage_volume.gql
@@ -1,12 +1,12 @@
-# The "volume_of_blackout_hours" method returns the blackouts in MWh.
+# The "volume_of_power_shortage_hours" method returns the blackouts in MWh.
 # This needs to be refactored to PJ.
 
 - query =
     DIVIDE(
       PRODUCT(
         IF(
           GRAPH().future?,
-          -> { V(GRAPH(), volume_of_blackout_hours) },
+          -> { V(GRAPH(), volume_of_power_shortage_hours) },
           -> { 0 }
         ),
         MWH_TO_GJ
diff --git a/gqueries/output_elements/dashboard/dashboard_blackout_hours.gql b/gqueries/output_elements/dashboard/dashboard_blackout_hours.gql
diff --git a/gqueries/output_elements/dashboard/dashboard_power_shortage_hours.gql b/gqueries/output_elements/dashboard/dashboard_power_shortage_hours.gql
@@ -0,0 +1,3 @@
+- query =
+    Q(power_shortage_hours)
+- unit = hours
diff --git a/gqueries/output_elements/output_series/mekko_of_electricity_network/supply_of_power_shortage_for_electricity_network_mekko.gql b/gqueries/output_elements/output_series/mekko_of_electricity_network/supply_of_power_shortage_for_electricity_network_mekko.gql

Original file line number	Diff line number	Diff line change
`@@ -1,7 +1,7 @@`
`1`	`1`	`- query =`
`2`	`2`	`IF(`
`3`	`3`	`GRAPH().future?,`
`4`		`- -> { V(GRAPH(), peak_of_blackout_hours) },`
	`4`	`+ -> { V(GRAPH(), peak_of_power_shortage_hours) },`
`5`	`5`	`-> { 0 }`
`6`	`6`	`)`
`7`	`7`	`- unit = MW`
Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,3 @@`
	`1`	`+- query =`
	`2`	`+ Q(power_shortage_hours)`
	`3`	`+- unit = hours`