Add FoN to Active Wildfire counts

bcgov · Aug 6, 2024 · 75e6a96 · 75e6a96
1 parent bb2a145
commit 75e6a96
Show file tree

Hide file tree

Showing 2 changed files with 29 additions and 4 deletions.
diff --git a/...mponents/dashboard-component/widgets/active-fires-widget/active-fires-widget.component.ts b/...mponents/dashboard-component/widgets/active-fires-widget/active-fires-widget.component.ts
@@ -58,14 +58,20 @@ export class ActiveFiresWidget implements AfterViewInit {
               n,
               {
                 activeBeingHeldFires,
+                activeBeingHeldFiresOfNote,
                 activeOutOfControlFires,
+                activeOutOfControlFiresOfNote,
                 activeUnderControlFires,
+                activeUnderControlFiresOfNote,
               },
             ) =>
               n +
               activeBeingHeldFires +
+              activeBeingHeldFiresOfNote +
               activeOutOfControlFires +
-              activeUnderControlFires,
+              activeOutOfControlFiresOfNote +
+              activeUnderControlFires +
+              activeUnderControlFiresOfNote,
             0,
           ) || 0;
         const previousYearActive =
@@ -74,16 +80,23 @@ export class ActiveFiresWidget implements AfterViewInit {
               n,
               {
                 activeBeingHeldFires,
+                activeBeingHeldFiresOfNote,
                 activeOutOfControlFires,
+                activeOutOfControlFiresOfNote,
                 activeUnderControlFires,
+                activeUnderControlFiresOfNote,
               },
             ) =>
               n +
               activeBeingHeldFires +
+              activeBeingHeldFiresOfNote +
               activeOutOfControlFires +
-              activeUnderControlFires,
+              activeOutOfControlFiresOfNote +
+              activeUnderControlFires +
+              activeUnderControlFiresOfNote,
             0,
           ) || 0;
+
         const currentYearActiveFoN =
           stats.reduce(
             (

diff --git a/...src/app/components/dashboard-component/widgets/summary-widget/summary-widget.component.ts b/...src/app/components/dashboard-component/widgets/summary-widget/summary-widget.component.ts
@@ -33,14 +33,20 @@ export class SummaryWidget implements AfterViewInit {
               n,
               {
                 activeBeingHeldFires,
+                activeBeingHeldFiresOfNote,
                 activeOutOfControlFires,
+                activeOutOfControlFiresOfNote,
                 activeUnderControlFires,
+                activeUnderControlFiresOfNote,
               },
             ) =>
               n +
               activeBeingHeldFires +
+              activeBeingHeldFiresOfNote +
               activeOutOfControlFires +
-              activeUnderControlFires,
+              activeOutOfControlFiresOfNote +
+              activeUnderControlFires +
+              activeUnderControlFiresOfNote,
             0,
           ) || 0;
         const previousYearActive =
@@ -49,14 +55,20 @@ export class SummaryWidget implements AfterViewInit {
               n,
               {
                 activeBeingHeldFires,
+                activeBeingHeldFiresOfNote,
                 activeOutOfControlFires,
+                activeOutOfControlFiresOfNote,
                 activeUnderControlFires,
+                activeUnderControlFiresOfNote,
               },
             ) =>
               n +
               activeBeingHeldFires +
+              activeBeingHeldFiresOfNote +
               activeOutOfControlFires +
-              activeUnderControlFires,
+              activeOutOfControlFiresOfNote +
+              activeUnderControlFires +
+              activeUnderControlFiresOfNote,
             0,
           ) || 0;