From 75e6a96086f24ec3a0316681a1267a513c7e762f Mon Sep 17 00:00:00 2001
From: Sukhpal <6563909+sukhpalp@users.noreply.github.com>
Date: Tue, 6 Aug 2024 14:43:46 -0700
Subject: [PATCH] Add FoN to Active Wildfire counts

---
 .../active-fires-widget.component.ts            | 17 +++++++++++++++--
 .../summary-widget/summary-widget.component.ts  | 16 ++++++++++++++--
 2 files changed, 29 insertions(+), 4 deletions(-)

diff --git a/client/wfnews-war/src/main/angular/src/app/components/dashboard-component/widgets/active-fires-widget/active-fires-widget.component.ts b/client/wfnews-war/src/main/angular/src/app/components/dashboard-component/widgets/active-fires-widget/active-fires-widget.component.ts
index deb91d56b..0d6c66bc6 100644
--- a/client/wfnews-war/src/main/angular/src/app/components/dashboard-component/widgets/active-fires-widget/active-fires-widget.component.ts
+++ b/client/wfnews-war/src/main/angular/src/app/components/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/client/wfnews-war/src/main/angular/src/app/components/dashboard-component/widgets/summary-widget/summary-widget.component.ts b/client/wfnews-war/src/main/angular/src/app/components/dashboard-component/widgets/summary-widget/summary-widget.component.ts
index 3d3bff444..dcf8cb135 100644
--- a/client/wfnews-war/src/main/angular/src/app/components/dashboard-component/widgets/summary-widget/summary-widget.component.ts
+++ b/client/wfnews-war/src/main/angular/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;