Merge pull request #523 from onaio/issue-508-namibia-irs-bugs

Issue 508 namibia irs bugs
onaio · Oct 14, 2019 · d533586 · d533586
2 parents 8c35698 + 946aa8c
commit d533586
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 8 deletions.
diff --git a/src/containers/pages/IRS/JurisdictionsReport/helpers.ts b/src/containers/pages/IRS/JurisdictionsReport/helpers.ts
@@ -66,15 +66,17 @@ export const NamibiaColumns = [
     Header: 'Refusals',
     columns: [
       {
+        Cell: (cell: CellInfo) => getIRSThresholdAdherenceIndicator(cell, null),
         Header: 'Following first visit',
         accessor: 'refusalsfirst',
-        className: 'centered',
+        className: 'indicator centered',
         id: 'refusalsfirst',
       },
       {
+        Cell: (cell: CellInfo) => getIRSThresholdAdherenceIndicator(cell, null),
         Header: 'Following mop-up',
         accessor: 'refusalsmopup',
-        className: 'centered',
+        className: 'indicator centered',
         id: 'refusalsmopup',
       },
     ],
@@ -84,15 +86,17 @@ export const NamibiaColumns = [
     Header: 'Locked',
     columns: [
       {
+        Cell: (cell: CellInfo) => getIRSThresholdAdherenceIndicator(cell, null),
         Header: 'Following first visit',
         accessor: 'lockedfirst',
-        className: 'centered',
+        className: 'indicator centered',
         id: 'lockedfirst',
       },
       {
+        Cell: (cell: CellInfo) => getIRSThresholdAdherenceIndicator(cell, null),
         Header: 'Following mop-up',
         accessor: 'lockedmopup',
-        className: 'centered',
+        className: 'indicator centered',
         id: 'lockedmopup',
       },
     ],

diff --git a/src/helpers/indicators.tsx b/src/helpers/indicators.tsx
@@ -211,14 +211,15 @@ export function getThresholdAdherenceIndicator(cell: CellInfo, configId: string)
 
 /** Renders an indicator Cell based on cell.value and threshold configs
  * @param {CellInfo} cell - the ReactTable.Cell being rendered in an indicator drilldown table
- * @param {string} configId - the key vause used to get the custom reporting configs
+ * @param {IndicatorThresholds | null} thresholds - the indicator thresholds
  * @returns {React.ReactElement} - the ReactTable.Cell element to be rendered for the indicator
  */
-export function getIRSThresholdAdherenceIndicator(cell: CellInfo) {
+export function getIRSThresholdAdherenceIndicator(
+  cell: CellInfo,
+  thresholds: IndicatorThresholds | null = indicatorThresholdsNA
+) {
   // determine if cell.value is a number
   const isNumber = !Number.isNaN(Number(cell.value));
-  // get thresholds config from settings
-  const thresholds: IndicatorThresholds | null = indicatorThresholdsNA;
   // determine cell background color
   const cellColor = thresholds ? getThresholdColor(cell, thresholds) : WHITE;