Skip to content

Commit

Permalink
Merge pull request #351 from ucdavis/JCS/ExtraPpmInfo20240417
Browse files Browse the repository at this point in the history
Jcs/extra ppm info20240417
  • Loading branch information
jSylvestre authored Apr 18, 2024
2 parents bf6d2d9 + 728f448 commit e20973e
Show file tree
Hide file tree
Showing 5 changed files with 25 additions and 0 deletions.
2 changes: 2 additions & 0 deletions Finjector.Core/Models/AeDetails.cs
Original file line number Diff line number Diff line change
Expand Up @@ -93,6 +93,8 @@ public class PpmDetails
public string? ProjectTypeName { get; set; } = string.Empty;

public string PoetString { get; set; } = string.Empty;

public string? GlRevenueTransferString { get; set; } = string.Empty;
}

}
6 changes: 6 additions & 0 deletions Finjector.Core/Services/AggieEnterpriseService.cs
Original file line number Diff line number Diff line change
Expand Up @@ -630,6 +630,12 @@ private void SetPpmDetails(AeDetails aeDetails, IDisplayDetailsPpmResult data, P
}
aeDetails.PpmDetails.PoetString = $"{ppmSegments?.Project}-{ppmSegments?.Organization}-{ppmSegments?.ExpenditureType}-{ppmSegments?.Task}-{data.PpmSegmentStringValidate.Segments.Award ?? "0000000"}-{data.PpmSegmentStringValidate.Segments.FundingSource ?? "00000"}";


if (aeDetails.PpmDetails.ProjectTypeName?.Equals("Internal", StringComparison.OrdinalIgnoreCase) ?? false)
{
aeDetails.PpmDetails.GlRevenueTransferString = $"{entity}-{fund}-{dept}-775B15-80-{program}-{project}-{activity}-0000-000000-000000";
}

}

public FinancialChartStringType GetChartType(string segmentString)
Expand Down
13 changes: 13 additions & 0 deletions Finjector.Web/ClientApp/src/components/Details/PpmDetails.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -77,6 +77,19 @@ const PpmDetailsPage: React.FC<PpmDetailsProps> = ({ details }) => {
</CopyToClipboardHover>
}
/>
{details.glRevenueTransferString && (
<DetailsRow
headerColText="GL Revenue Transfer String"
column2={
<CopyToClipboardHover
value={details.glRevenueTransferString}
id="glRevenueTransferString"
>
{details.glRevenueTransferString}
</CopyToClipboardHover>
}
/>
)}
</>
);
};
Expand Down
1 change: 1 addition & 0 deletions Finjector.Web/ClientApp/src/types.ts
Original file line number Diff line number Diff line change
Expand Up @@ -168,6 +168,7 @@ export interface PpmDetails {
projectStatus: string;
projectTypeName: string;
poetString: string;
glRevenueTransferString: string;
}

export interface SegmentDetails {
Expand Down
3 changes: 3 additions & 0 deletions Finjector.Web/ClientApp/test/mocks/mockData.ts
Original file line number Diff line number Diff line change
Expand Up @@ -257,6 +257,7 @@ const fakePpmDetails: PpmDetails = {
projectStatus: "In Progress",
projectTypeName: "New Project",
poetString: "Fake-POET-String",
glRevenueTransferString: "Fake-Gl-Transfer-String",
};

// let's just assign the first chart to be valid and the second to be invalid
Expand Down Expand Up @@ -342,6 +343,7 @@ const fakeInvalidAeDetails: AeDetails = {
projectStatus: "In Progress",
projectTypeName: "New Project",
poetString: "Fake-POET-String",
glRevenueTransferString: "Fake-Gl-Transfer-String",
},
hasWarnings: false,
};
Expand Down Expand Up @@ -424,6 +426,7 @@ const fakeValidAeDetails: AeDetails = {
projectStatus: "In Progress",
projectTypeName: "New Project",
poetString: "Fake-POET-String",
glRevenueTransferString: "Fake-Gl-Transfer-String",
},
hasWarnings: false,
};
Expand Down

0 comments on commit e20973e

Please sign in to comment.