Merge pull request #67 from ucdavis/cyd/shannonchanges22

new # count and reverse order on columns
ucdavis · Nov 15, 2022 · 0eac7e4 · 0eac7e4
2 parents e09271e + f3fcf1a
commit 0eac7e4
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 6 deletions.
diff --git 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 => {
       >
         <a className='navbar-brand logo text-left' href='/'>
           AD419 <br />
-          <span className='secondary-font current-year'>Fiscal Year 2021</span>
+          <span className='secondary-font current-year'>Fiscal Year 2022</span>
         </a>
 
         <NavbarToggler onClick={toggleNavbar} className='mr-2' />

diff --git 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 {
                 ></input>
               </th>
               <th>{total.toFixed(2)} %</th>
-              <th>Project</th>
               <th>PI</th>
+              <th>
+                Project ({props.selectedAssociations.length} of{' '}
+                {props.projects.length})
+              </th>
             </tr>
           </thead>
           <tbody>
@@ -107,8 +113,8 @@ export default function ProjectsTable(props: Props): JSX.Element {
                     projectPercentageChange={props.projectPercentageChange}
                   ></PercentInput>
                 </td>
-                <td>{proj.project}</td>
                 <td>{proj.pi}</td>
+                <td>{proj.project}</td>
               </tr>
             ))}
           </tbody>

diff --git a/src/AD419/Controllers/SummaryController.cs b/src/AD419/Controllers/SummaryController.cs
@@ -48,7 +48,7 @@ public async Task<IActionResult> GetExpensesBySFN(string code, string accession,
             {
                 return Ok(await conn.QueryAsync<SFNSummary>("usp_GetExpensesBySFN",
                     new { OrgR = code, Accession = accession, IntAssociationStatus = associationStatus },
-                    commandType: CommandType.StoredProcedure));
+                    commandType: CommandType.StoredProcedure, commandTimeout: 120));
             }
         }
     }