mnr

uonafya · May 24, 2021 · bb9b877 · bb9b877
1 parent 0590441
commit bb9b877
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 9 deletions.
diff --git a/.gitignore b/.gitignore
@@ -3,11 +3,6 @@
 # dependencies
 /node_modules
 /server
-/server/*
-/server/node_modules
-/server/package-lock.json
-/server/.env
-
 /.pnp
 .pnp.js
 
@@ -16,6 +11,7 @@
 
 # production
 /build
+/server
 /buildev
 
 # misc

diff --git a/public/manifest.webapp b/public/manifest.webapp
@@ -1,5 +1,5 @@
 {
-  "version": "1.0.9-beta",
+  "version": "1.1.0-beta",
   "name": "Health Commodities Dashboard - Beta",
   "appType": "APP",
   "description": "An App to Visualize Health Commodities data",

diff --git a/src/views/Dashboard/Dashboard.js b/src/views/Dashboard/Dashboard.js
@@ -149,7 +149,7 @@ const Dashboard = props => {
             if (rows.length > 0) {
               let dx_rows = rows.filter(o_dx_rw => o_dx_rw[0] == o_dx);
               if (dx_rows.length > 0) {
-                rows_data.push(parseFloat(dx_rows[0][3]));
+                rows_data.push(parseFloat(dx_rows[0][reply.fetchedData.headers.findIndex(jk=>jk.name=="value")]));
               } else {
                 rows_data.push(0);
               }
@@ -206,7 +206,7 @@ const Dashboard = props => {
       .then(dataz => {
         justFetch(hf_exp_url, { signal: abortRequests.signal })
           .then(totalorgs => {
-            totalorgs = parseInt(totalorgs.fetchedData.rows[0][3]) || 0;
+            totalorgs = parseInt(totalorgs.fetchedData.rows[0][ dataz.fetchedData.headers.findIndex(jk=>jk.name=="value") ]) || 0;
 
             const data = dataz.fetchedData;
             let orgunits = data.metaData.dimensions.ou;
@@ -239,7 +239,7 @@ const Dashboard = props => {
                 hfss_row.push(nme);
                 data.rows.map(rentry => {
                   let dxid = rentry[0];
-                  let mosval = parseFloat(rentry[3]);
+                  let mosval = parseFloat(rentry[ data.headers.findIndex(jk=>jk.name=="value") ]);
                   if (dxid == entry) {
                     if (mosval > 6) {
                       overstock++;