4031: Adds product FY progress text

Author: greensomes

src/components/sections/FYProductionSummary/FYProductionSummary.js

@@ -6,18 +6,23 @@ import oilIconUrl from '../../../images/icons/icon-oil.svg';
 import gasIconUrl from '../../../images/icons/icon-gas.svg';
 import coalIconUrl from '../../../images/icons/icon-coal.svg';
 import PercentDifference from '../../utils/PercentDifference';
-import { getFiscalYear } from '../../utils/nrrdUtils'
+import { getFiscalYear, getFiscalMonthShortName } from '../../utils/nrrdUtils'
 
 const useStyles = makeStyles({
   h3: {
     marginTop: '0.5rem',
-    marginBottom: '1rem',
+    marginBottom: '0rem',
     textAlign: 'center'
+  },
+  fyProgress: {
+    textAlign: 'center',
+    marginBottom: '1rem',
+    display: 'block'
   }
 })
 
 
-export default function FYProductionSummary({ currentFYData, prevFYData }) {
+export default function FYProductionSummary({ currentFYData, prevFYData, fyPeriodData }) {
   const classes = useStyles()
 
   const currentOil = currentFYData.find((i) => i.commodity === 'Oil');
@@ -28,11 +33,19 @@ export default function FYProductionSummary({ currentFYData, prevFYData }) {
   const previousGas = prevFYData.find((i) => i.commodity === 'Gas');
   const previousCoal = prevFYData.find((i) => i.commodity === 'Coal');
 
+  let fyProgressText = `FY ${ fyPeriodData.fiscalYear }`
+  if (fyPeriodData.fiscalMonth < 12) {
+    fyProgressText += ` so far (Oct - ${ getFiscalMonthShortName(fyPeriodData.fiscalMonth) })`
+  }
+
   return (
     <Box bgcolor="primary.main" mb={2} pt={0.5} pb={2} pl={3} pr={3} borderRadius={10}>
       <Typography variant="h3" className={classes.h3}>
         Production
       </Typography>
+      <Typography variant='inherit' className={classes.fyProgress} >
+        { fyProgressText }
+      </Typography>
       <Grid container spacing={1}>
         <Grid item>
           <img src={oilIconUrl} alt="Logo" width={30}/>

src/components/sections/LandingPageSidebar/LandingPageSidebar.js

@@ -19,8 +19,9 @@ const atAGlanceQuery = gql`
       volume
     }
 
-    max_fy_month_by_dataset_v {
-      fiscal_month
+    datasetPeriodInfo: max_fy_month_by_dataset_v {
+      fiscalYear: fiscal_year
+      fiscalMonth: fiscal_month
       dataset
     }
   }
@@ -39,7 +40,8 @@ export default function LandingPageSidebar() {
 
       <FYProductionSummary 
         currentFYData={ data.productionCurrFy }
-        prevFYData={ data.productionPrevFy }/>
+        prevFYData={ data.productionPrevFy }
+        fyPeriodData={data.datasetPeriodInfo.find((p) => p.dataset === 'production')}/>
 
       <LPMonthlyFactSheet />
 

src/components/utils/nrrdUtils/GetFiscalMonthShortName.js

@@ -0,0 +1,11 @@
+export default function getFiscalMonthShortName(monthNumber) {
+  const shortMonths = [
+    "Oct", "Nov", "Dec", "Jan", "Feb", "Mar",
+    "Apr", "May", "Jun", "Jul", "Aug", "Sep"
+  ];
+
+  if (monthNumber < 1 || monthNumber > 12) {
+    return null;
+  }
+  return shortMonths[monthNumber - 1];
+}

src/components/utils/nrrdUtils/index.js

@@ -1 +1,2 @@
-export { default as getFiscalYear } from './GetFiscalYear'
+export { default as getFiscalYear } from './GetFiscalYear'
+export {default as getFiscalMonthShortName} from './GetFiscalMonthShortName'