Merge pull request #355 from ucdavis/JCS/MoreAwardInfo20240516

Jcs/more award info20240516
ucdavis · May 16, 2024 · 9ed29ae · 9ed29ae
2 parents 9c5b4e5 + 132eaf0
commit 9ed29ae
Show file tree

Hide file tree

Showing 6 changed files with 45 additions and 6 deletions.
diff --git 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.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
@@ -440,19 +440,28 @@ 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
                 {
                     awardDetail.Name = awardResult.Name;
 
                     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
@@ -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
@@ -167,6 +167,8 @@ export interface PpmDetails {
   projectCompletionDate: string;
   projectStatus: string;
   awardStatus?: string;
+  awardStartDate?: string;
+  awardEndDate?: string;
   projectTypeName: string;
   poetString: string;
   glRevenueTransferString: string;

diff --git 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" />