Issue 137 (#153)

* add column for grantcodes in ui and vsc export

* issue fixed

---------

Co-authored-by: = <=>

Author: tomlebl

nomad-front-end/src/components/AccountsComponents/AccountsTable.jsx

@@ -16,6 +16,18 @@ const AccountsTable = props => {
     }
   ]
 
+  //add the grantCode column if data are for user calculation
+  if (props.header === 'User Name') {
+    columns.push({
+      title: 'Grant Code',
+      width: 35,
+      dataIndex: 'grantCode',
+      key: 'grantCode',
+      fixed: 'left',
+      align: 'center'
+    })
+  }
+
   //Getting dynamic table headers from the first data object
   props.data[0].costsPerInstrument.forEach((cost, index) => {
     columns.push({
@@ -61,6 +73,7 @@ const AccountsTable = props => {
   const data = props.data.map((entry, key) => {
     const newEntry = {
       name: entry.name,
+      grantCode: entry.grantCode || undefined,
       totalCost: entry.totalCost,
       key
     }

nomad-front-end/src/components/NavBar/PageHeader/Controls/AccountingControls.jsx

@@ -17,12 +17,15 @@ const AccountingControls = props => {
       columns = standardColumns.grants
     } else {
       columns = [head]
+      if (type === 'Users') {
+        columns = [...columns, 'Grant Code']
+      }
       let presentColumns = data[0].costsPerInstrument
       presentColumns.forEach(({ instrument }) => {
         const newColumnsToAdd = [
           instrument + ' Exp Time Manual',
           instrument + ' Exp Time Auto',
-          instrument + ' Exp Time Cost [£]'
+          instrument + ' Cost [£]'
         ]
         columns = [...columns, ...newColumnsToAdd]
       })
@@ -54,6 +57,11 @@ const AccountingControls = props => {
     } else {
       data.forEach(row => {
         let FlatRow = [row.name]
+
+        if (type === 'Users') {
+          FlatRow = [...FlatRow, row.grantCode]
+        }
+
         row.costsPerInstrument.forEach(instrumentData => {
           const { cost, expTimeAuto, expTimeClaims } = instrumentData
           FlatRow = [...FlatRow, expTimeClaims, expTimeAuto, cost]

nomad-rest-api/controllers/admin/accounts.js

@@ -9,6 +9,7 @@ import Instrument from '../../models/instrument.js'
 import Grant from '../../models/grant.js'
 import {
   checkDuplicate,
+  getGrantInfo,
   getSearchParams,
   getSearchParamsClaims
 } from '../../utils/accountsUtils.js'
@@ -82,14 +83,25 @@ export async function getCosts(req, res) {
 
       await Promise.all(
         usrArray.map(async usrId => {
-          const user = await User.findById(usrId)
+          const [user, grantInfo] = await Promise.all([User.findById(usrId), getGrantInfo(usrId)])
+
+          let grant
+          if (grantInfo) {
+            grant = await Grant.findById(grantInfo.grantId)
+          }
+
           const usrInactive = !user.isActive || user.group.toString() !== groupId
           const newEntry = {
-            name: `${user.username} - ${user.fullName} ${usrInactive ? '(Inactive)' : ''}`,
+            name: `${user.username} - ${user.fullName}`,
+            grantCode: grant && grant.grantCode,
             costsPerInstrument: [],
             totalCost: 0
           }
 
+          if (groupId !== 'all') {
+            newEntry.name += `${usrInactive ? '(Inactive)' : ''}`
+          }
+
           instrumentList.forEach(i => {
             const filteredExpArray = expArray.filter(
               exp => exp.instrument.name === i.name && exp.user.id.toString() === usrId