From 62c22a45ef09fd045a6a4fc3d67649ff00d70118 Mon Sep 17 00:00:00 2001
From: Jason Sylvestre <jsylvestre@ucdavis.edu>
Date: Thu, 16 May 2024 08:29:42 -0700
Subject: [PATCH 1/2] Update ae api nuget

---
 Finjector.Core/Finjector.Core.csproj | 2 +-
 Finjector.Web/Finjector.Web.csproj   | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/Finjector.Core/Finjector.Core.csproj b/Finjector.Core/Finjector.Core.csproj
index 67aa2e9a..2f46c7db 100644
--- a/Finjector.Core/Finjector.Core.csproj
+++ b/Finjector.Core/Finjector.Core.csproj
@@ -7,7 +7,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="AggieEnterpriseApi" Version="0.2.222" />
+    <PackageReference Include="AggieEnterpriseApi" Version="0.2.224" />
     <PackageReference Include="ietws" Version="0.2.22" />
     <PackageReference Include="Microsoft.EntityFrameworkCore" Version="6.0.24" />
     <PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="6.0.24">
diff --git a/Finjector.Web/Finjector.Web.csproj b/Finjector.Web/Finjector.Web.csproj
index a341f154..fdb1f9b6 100644
--- a/Finjector.Web/Finjector.Web.csproj
+++ b/Finjector.Web/Finjector.Web.csproj
@@ -15,7 +15,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="AggieEnterpriseApi" Version="0.2.222" />
+    <PackageReference Include="AggieEnterpriseApi" Version="0.2.224" />
     <PackageReference Include="Ietws" Version="0.2.22" />
     <PackageReference Include="Microsoft.AspNetCore.Authentication.OpenIdConnect" Version="6.0.9" />
     <PackageReference Include="Microsoft.AspNetCore.SpaProxy" Version="6.0.0" />

From 132eaf0408d3973e59ba651cddb03f6d12d790ff Mon Sep 17 00:00:00 2001
From: Jason Sylvestre <jsylvestre@ucdavis.edu>
Date: Thu, 16 May 2024 08:39:26 -0700
Subject: [PATCH 2/2] Display it if it is there

---
 Finjector.Core/Models/AeDetails.cs            |  2 ++
 .../Services/AggieEnterpriseService.cs        | 17 +++++++++---
 .../src/components/Details/PpmDetails.tsx     | 26 +++++++++++++++++++
 Finjector.Web/ClientApp/src/types.ts          |  2 ++
 4 files changed, 43 insertions(+), 4 deletions(-)

diff --git a/Finjector.Core/Models/AeDetails.cs b/Finjector.Core/Models/AeDetails.cs
index e5af3885..6372ecbc 100644
--- a/Finjector.Core/Models/AeDetails.cs
+++ b/Finjector.Core/Models/AeDetails.cs
@@ -90,6 +90,8 @@ public class PpmDetails
 
         public string? ProjectStatus { get; set; } = string.Empty;
         public string? AwardStatus { get; set; } = string.Empty;
+        public string? AwardStartDate { get; set; } = string.Empty;
+        public string? AwardEndDate { get; set; } = string.Empty;
 
         public string? ProjectTypeName { get; set; } = string.Empty;
 
diff --git a/Finjector.Core/Services/AggieEnterpriseService.cs b/Finjector.Core/Services/AggieEnterpriseService.cs
index b3514eeb..634ef0ce 100644
--- a/Finjector.Core/Services/AggieEnterpriseService.cs
+++ b/Finjector.Core/Services/AggieEnterpriseService.cs
@@ -440,6 +440,11 @@ private async Task SetAwardSpecificPpmGlInfo(AeDetails aeDetails, IDisplayDetail
             var awardDetail = aeDetails.SegmentDetails.SingleOrDefault(s => s.Entity == "Award");
             if (awardDetail != null)
             {
+                if (aeDetails.PpmDetails == null)
+                {
+                    aeDetails.PpmDetails = new PpmDetails();
+                }
+
                 var awardResult = await GetAward(awardDetail.Code);
                 if (awardResult != null) //&& awardResult.EligibleForUse
                 {
@@ -447,12 +452,16 @@ private async Task SetAwardSpecificPpmGlInfo(AeDetails aeDetails, IDisplayDetail
 
                     if(!string.IsNullOrWhiteSpace( awardResult.AwardStatus?.ToString()))
                     {
-                        if(aeDetails.PpmDetails == null)
-                        {
-                            aeDetails.PpmDetails = new PpmDetails();
-                        }
                         aeDetails.PpmDetails.AwardStatus = awardResult.AwardStatus.ToString();
                     }
+                    if(!string.IsNullOrWhiteSpace(awardResult.StartDate))
+                    {
+                        aeDetails.PpmDetails.AwardStartDate = awardResult.StartDate;
+                    }
+                    if(!string.IsNullOrWhiteSpace(awardResult.EndDate))
+                    {
+                        aeDetails.PpmDetails.AwardEndDate = awardResult.EndDate;
+                    }
 
                     if (awardResult.GlFundCode != null)
                     {
diff --git a/Finjector.Web/ClientApp/src/components/Details/PpmDetails.tsx b/Finjector.Web/ClientApp/src/components/Details/PpmDetails.tsx
index 2a29966a..f482b49f 100644
--- a/Finjector.Web/ClientApp/src/components/Details/PpmDetails.tsx
+++ b/Finjector.Web/ClientApp/src/components/Details/PpmDetails.tsx
@@ -69,6 +69,32 @@ const PpmDetailsPage: React.FC<PpmDetailsProps> = ({ details }) => {
           </CopyToClipboardHover>
         }
       />
+      {details.awardStartDate && (
+        <DetailsRow
+          headerColText="Award Start Date"
+          column2={
+            <CopyToClipboardHover
+              value={details.awardStartDate}
+              id="awardStartDate"
+            >
+              {details.awardStartDate}
+            </CopyToClipboardHover>
+          }
+        />
+      )}
+      {details.awardEndDate && (
+        <DetailsRow
+          headerColText="Award End Date"
+          column2={
+            <CopyToClipboardHover
+              value={details.awardEndDate}
+              id="awardEndDate"
+            >
+              {details.awardEndDate}
+            </CopyToClipboardHover>
+          }
+        />
+      )}
       {details.awardStatus && (
         <DetailsRow
           headerColText="Award Status"
diff --git a/Finjector.Web/ClientApp/src/types.ts b/Finjector.Web/ClientApp/src/types.ts
index 3ca8d607..8fab1057 100644
--- a/Finjector.Web/ClientApp/src/types.ts
+++ b/Finjector.Web/ClientApp/src/types.ts
@@ -167,6 +167,8 @@ export interface PpmDetails {
   projectCompletionDate: string;
   projectStatus: string;
   awardStatus?: string;
+  awardStartDate?: string;
+  awardEndDate?: string;
   projectTypeName: string;
   poetString: string;
   glRevenueTransferString: string;