From 0d6b3634d1139b6facf57f79813c97ec489c5241 Mon Sep 17 00:00:00 2001 From: Aizizi Yigaimu Date: Wed, 10 Jul 2019 16:11:16 -0400 Subject: [PATCH 1/3] Add infeasible data handling processs --- .../Blocnote/PreliminaryFinance/index.js | 219 ++++++++++-------- 1 file changed, 118 insertions(+), 101 deletions(-) diff --git a/src/containers/Blocnote/PreliminaryFinance/index.js b/src/containers/Blocnote/PreliminaryFinance/index.js index dfd32a36..337630ad 100644 --- a/src/containers/Blocnote/PreliminaryFinance/index.js +++ b/src/containers/Blocnote/PreliminaryFinance/index.js @@ -38,110 +38,127 @@ class PreliminaryFinance extends Component { mainContent = ; if (scenario.data !== null) { - const tables = scenario.data.instance.instance.tables; - const budgets = Object.keys(tables).map(tableName => tables[tableName][0].slice(1)); + if (scenario.data.feasible !== undefined && scenario.data.feasible === false) { + mainContent = ( +
+
+ {scenario.data.instance.name} is not feasible! +
+
+ ); + } else { + console.log(scenario.data); // eslint-disable-line + const tables = scenario.data.instance.instance.tables; + const budgets = Object.keys(tables).map(tableName => tables[tableName][0].slice(1)); - const projectEconomicsContent = [[]]; - Object.keys(scenario.data.instance.economics_overview).forEach((key) => { - const temp = []; - temp.push(key); - temp.push(scenario.data.instance.economics_overview[key]); - projectEconomicsContent.push(temp); - }); - const savings = { - gas: { - estimated_savings: 0, - used_before_retrofit: false, - used_after_retrofit: false, - utility_type: 'gas', - }, - electric: { - estimated_savings: 0, - used_before_retrofit: false, - used_after_retrofit: false, - utility_type: 'electric', - }, - oil: { - estimated_savings: 0, - used_before_retrofit: false, - used_after_retrofit: false, - utility_type: 'oil', - }, - water: { - estimated_savings: 0, - used_before_retrofit: false, - used_after_retrofit: false, - utility_type: 'water', - }, - }; + const projectEconomicsContent = [[]]; + Object.keys(scenario.data.instance.economics_overview).forEach((key) => { + const temp = []; + temp.push(key); + temp.push(scenario.data.instance.economics_overview[key]); + projectEconomicsContent.push(temp); + }); + const savings = { + gas: { + estimated_savings: 0, + used_before_retrofit: false, + used_after_retrofit: false, + utility_type: 'gas', + }, + electric: { + estimated_savings: 0, + used_before_retrofit: false, + used_after_retrofit: false, + utility_type: 'electric', + }, + oil: { + estimated_savings: 0, + used_before_retrofit: false, + used_after_retrofit: false, + utility_type: 'oil', + }, + water: { + estimated_savings: 0, + used_before_retrofit: false, + used_after_retrofit: false, + utility_type: 'water', + }, + }; - Object.keys(scenario.data.instance.savings).forEach(utilityType => { - if (Object.keys(savings).includes(utilityType)) { - savings[utilityType] = scenario.data.instance.savings[utilityType]; - } - }); + Object.keys(scenario.data.instance.savings).forEach(utilityType => { + if (Object.keys(savings).includes(utilityType)) { + savings[utilityType] = scenario.data.instance.savings[utilityType]; + } + }); - mainContent = ( -
- - - - - - - - - - - -
- ); + mainContent = ( +
+ + + + + + + + + + + +
+ ); + } } return ( -- GitLab From 096136d9c28149742af1408f8a269b09e2c51a58 Mon Sep 17 00:00:00 2001 From: Aizizi Yigaimu Date: Wed, 10 Jul 2019 17:37:33 -0400 Subject: [PATCH 2/3] Remove logs --- src/containers/Blocnote/PreliminaryFinance/index.js | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/src/containers/Blocnote/PreliminaryFinance/index.js b/src/containers/Blocnote/PreliminaryFinance/index.js index 337630ad..a7f13f2b 100644 --- a/src/containers/Blocnote/PreliminaryFinance/index.js +++ b/src/containers/Blocnote/PreliminaryFinance/index.js @@ -38,7 +38,7 @@ class PreliminaryFinance extends Component { mainContent = ; if (scenario.data !== null) { - if (scenario.data.feasible !== undefined && scenario.data.feasible === false) { + if (scenario.data.instance.feasible !== undefined && scenario.data.instance.feasible === false) { mainContent = (
); } else { - console.log(scenario.data); // eslint-disable-line const tables = scenario.data.instance.instance.tables; const budgets = Object.keys(tables).map(tableName => tables[tableName][0].slice(1)); - const projectEconomicsContent = [[]]; Object.keys(scenario.data.instance.economics_overview).forEach((key) => { const temp = []; -- GitLab From d396ff0730b2d0c508e802e7737cdcee6143990d Mon Sep 17 00:00:00 2001 From: Aizizi Yigaimu Date: Thu, 11 Jul 2019 11:05:54 -0400 Subject: [PATCH 3/3] Separata single long line to two lines --- src/containers/Blocnote/PreliminaryFinance/index.js | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/containers/Blocnote/PreliminaryFinance/index.js b/src/containers/Blocnote/PreliminaryFinance/index.js index a7f13f2b..b08ee120 100644 --- a/src/containers/Blocnote/PreliminaryFinance/index.js +++ b/src/containers/Blocnote/PreliminaryFinance/index.js @@ -38,7 +38,8 @@ class PreliminaryFinance extends Component { mainContent = ; if (scenario.data !== null) { - if (scenario.data.instance.feasible !== undefined && scenario.data.instance.feasible === false) { + if (scenario.data.instance.feasible !== undefined && + scenario.data.instance.feasible === false) { mainContent = (