diff --git a/src/AD419/ClientApp/src/components/NavMenu.tsx b/src/AD419/ClientApp/src/components/NavMenu.tsx index 351eb0c..20cd47f 100644 --- a/src/AD419/ClientApp/src/components/NavMenu.tsx +++ b/src/AD419/ClientApp/src/components/NavMenu.tsx @@ -18,7 +18,7 @@ export const NavMenu = (): JSX.Element => { > AD419
- Fiscal Year 2021 + Fiscal Year 2022
diff --git a/src/AD419/ClientApp/src/components/associations/ProjectsTable.tsx b/src/AD419/ClientApp/src/components/associations/ProjectsTable.tsx index ccdcbb5..49b2c08 100644 --- a/src/AD419/ClientApp/src/components/associations/ProjectsTable.tsx +++ b/src/AD419/ClientApp/src/components/associations/ProjectsTable.tsx @@ -54,8 +54,11 @@ export default function ProjectsTable(props: Props): JSX.Element { }; const areAllSelected = (): boolean => { - return props.selectedAssociations.length > 0 && props.selectedAssociations.length === props.projects.length; - } + return ( + props.selectedAssociations.length > 0 && + props.selectedAssociations.length === props.projects.length + ); + }; const toggleSelectAll = (): void => { const shouldUnassignAll = areAllSelected(); @@ -84,8 +87,11 @@ export default function ProjectsTable(props: Props): JSX.Element { > {total.toFixed(2)} % - Project PI + + Project ({props.selectedAssociations.length} of{' '} + {props.projects.length}) + @@ -107,8 +113,8 @@ export default function ProjectsTable(props: Props): JSX.Element { projectPercentageChange={props.projectPercentageChange} > - {proj.project} {proj.pi} + {proj.project} ))} diff --git a/src/AD419/Controllers/SummaryController.cs b/src/AD419/Controllers/SummaryController.cs index bfb0f03..089885f 100644 --- a/src/AD419/Controllers/SummaryController.cs +++ b/src/AD419/Controllers/SummaryController.cs @@ -48,7 +48,7 @@ public async Task GetExpensesBySFN(string code, string accession, { return Ok(await conn.QueryAsync("usp_GetExpensesBySFN", new { OrgR = code, Accession = accession, IntAssociationStatus = associationStatus }, - commandType: CommandType.StoredProcedure)); + commandType: CommandType.StoredProcedure, commandTimeout: 120)); } } }