diff --git a/src/components/Blocnote/FinancialInputs/csrftoken.js b/src/components/Blocnote/FinancialInputs/csrftoken.js
deleted file mode 100644
index 7c7bc44c5d20c8c439db5b956fe50f625c5ed3a3..0000000000000000000000000000000000000000
--- a/src/components/Blocnote/FinancialInputs/csrftoken.js
+++ /dev/null
@@ -1,25 +0,0 @@
-import React from 'react';
-
-const getCookie = (name) => {
- let cookieValue = null;
- if (document.cookie && document.cookie !== '') {
- const cookies = document.cookie.split(';');
- for (let i = 0; i < cookies.length; i += 1) {
- let cookie = cookies[i];
- cookie = cookie.trim();
- // console.log(cookie); // eslint-disable-line
- if (cookie.substring(0, name.length + 1) === `${name}=`) {
- cookieValue = decodeURIComponent(cookie.substring(name.length + 1));
- break;
- }
- }
- }
- return cookieValue;
-};
-const csrftoken = getCookie('csrftoken');
-const CSRFToken = () => {
- return (
-
- );
-};
-export default CSRFToken;
diff --git a/src/components/Blocnote/PreliminaryFinance/SavingEstimation.js b/src/components/Blocnote/PreliminaryFinance/SavingEstimation.js
index 904edc0c962e88c7965d044ef15d4e97586d1844..eaa72e31f16b5ad81fedb48a2564ec3794ac18c3 100644
--- a/src/components/Blocnote/PreliminaryFinance/SavingEstimation.js
+++ b/src/components/Blocnote/PreliminaryFinance/SavingEstimation.js
@@ -14,7 +14,7 @@ class SavingEstimation extends Component {
};
}
- updRow = (row) => {
+ updateRow = (row) => {
const newRow = row;
const savingEstimation = this.state.savingEstimation;
newRow.estimated_savings = String(row.estimated_savings);
@@ -44,7 +44,7 @@ class SavingEstimation extends Component {
usedBeforeRetrofit={utilityData.used_before_retrofit}
usedAfterRetrofit={utilityData.used_after_retrofit}
utilityType={utilityData.utility_type}
- updRow={this.updRow}
+ updateRow={this.updateRow}
/>
);
});
diff --git a/src/components/Blocnote/PreliminaryFinance/SavingEstimationRow.js b/src/components/Blocnote/PreliminaryFinance/SavingEstimationRow.js
index fe346d30ac7d7b6bb8355f787e379e7ff9586c43..ca392f045fa0fa90e17fc0613eda279a9785857a 100644
--- a/src/components/Blocnote/PreliminaryFinance/SavingEstimationRow.js
+++ b/src/components/Blocnote/PreliminaryFinance/SavingEstimationRow.js
@@ -25,7 +25,7 @@ class SavingEstimationRow extends Component {
['usedBeforeRetrofit', 'usedAfterRetrofit'].includes(event.target.name) ?
event.target.checked : event.target.value },
() => {
- this.props.updRow(this.state);
+ this.props.updateRow(this.state);
});
}
@@ -88,7 +88,7 @@ SavingEstimationRow.propTypes = {
estimatedSavings: PropTypes.number,
usedBeforeRetrofit: PropTypes.bool,
usedAfterRetrofit: PropTypes.bool,
- updRow: PropTypes.func,
+ updateRow: PropTypes.func,
};
export default SavingEstimationRow;
diff --git a/src/components/Blocnote/PreliminaryFinance/test.js b/src/components/Blocnote/PreliminaryFinance/test.js
deleted file mode 100644
index ba2a8bafb90ff86283e2a7f0cc16afd37a81cac0..0000000000000000000000000000000000000000
--- a/src/components/Blocnote/PreliminaryFinance/test.js
+++ /dev/null
@@ -1,53 +0,0 @@
-import React, { PureComponent } from 'react';
-import {
- BarChart, Bar, Cell, XAxis, YAxis, CartesianGrid, Tooltip, Legend,
-} from 'recharts';
-
-const data = [
- {
- name: 'Page A', uv: 4000, pv: 2400, amt: 2400,
- },
- {
- name: 'Page B', uv: 3000, pv: 1398, amt: 2210,
- },
- {
- name: 'Page C', uv: 2000, pv: 9800, amt: 2290,
- },
- {
- name: 'Page D', uv: 2780, pv: 3908, amt: 2000,
- },
- {
- name: 'Page E', uv: 1890, pv: 4800, amt: 2181,
- },
- {
- name: 'Page F', uv: 2390, pv: 3800, amt: 2500,
- },
- {
- name: 'Page G', uv: 3490, pv: 4300, amt: 2100,
- },
-];
-
-export default class Example extends PureComponent {
- static jsfiddleUrl = 'https://jsfiddle.net/alidingling/30763kr7/';
-
- render() {
- return (
-
-
-
-
-
-
-
-
-
- );
- }
-}
diff --git a/src/components/Blocnote/styles.css b/src/components/Blocnote/styles.css
deleted file mode 100644
index e6249044b459f8a87ac5ea47970b50ac1a55735a..0000000000000000000000000000000000000000
--- a/src/components/Blocnote/styles.css
+++ /dev/null
@@ -1,14 +0,0 @@
-.top-notification {
- position: fixed;
- z-index: 1060;
- top: 0;
- left: 0;
- right: 0;
- text-align: center;
- overflow: hidden;
-}
-
-.top-notification-item {
- border-radius: 0px !important;
- line-height: 2;
-}
diff --git a/src/containers/Blocnote/BudgetSimulator/index.js b/src/containers/Blocnote/BudgetSimulator/index.js
index 00b40c5aa2aec6d03cac1a6b5a27466f1bc52c83..b23f93a3f72fd01529caa29d84c4190e47897d0f 100644
--- a/src/containers/Blocnote/BudgetSimulator/index.js
+++ b/src/containers/Blocnote/BudgetSimulator/index.js
@@ -4,12 +4,11 @@ import { connect } from 'react-redux';
import { bindActionCreators } from 'redux';
import LinkBarDetail from '../../../components/LinkBarDetail';
import buildingDetailPropTypes from '../../Building/propTypes';
-import './../styles.css';
import Loading from '../../../components/Loading';
import BugetTable from '../../../components/Blocnote/BudgetSimulator/BugetTable';
import BudgetChart from '../../../components/Blocnote/BudgetSimulator/BudgetChart';
import { loadBudgetSimulator } from './actions';
-import blocnoteProps from './../propTypes';
+import blocnoteProps from '../propTypes';
class BudgetSimulator extends Component {
@@ -32,7 +31,7 @@ class BudgetSimulator extends Component {
render() {
let mainContent = null;
- let bugetTables = [];
+ let budgetTables = [];
const blockStyle = { marginBottom: '40px' };
const tableKeys = [
'budgetLoanFirst',
@@ -55,7 +54,7 @@ class BudgetSimulator extends Component {
mainContent = ;
} else {
const dataDic = this.processData(data);
- bugetTables = tableKeys.map((tableKey) => {
+ budgetTables = tableKeys.map((tableKey) => {
return (
diff --git a/src/containers/Blocnote/PreliminaryFinance/index.js b/src/containers/Blocnote/PreliminaryFinance/index.js
index 720090a88ecaf3128c4a103d742c027bf31e26b5..6c46344eb72de6c1f7832b36bb87a3a56295f529 100644
--- a/src/containers/Blocnote/PreliminaryFinance/index.js
+++ b/src/containers/Blocnote/PreliminaryFinance/index.js
@@ -3,23 +3,22 @@ import PropTypes from 'prop-types';
import { connect } from 'react-redux';
import { bindActionCreators } from 'redux';
import LinkBarDetail from '../../../components/LinkBarDetail';
-import './../styles.css';
-import blocnoteProps from './../propTypes';
+import blocnoteProps from '../propTypes';
import Loading from '../../../components/Loading';
import {
loadScenario, updateScenario,
} from './actions';
-import BudgetChart from './../../../components/Blocnote/PreliminaryFinance/BudgetChart';
-import LoanSummary from './../../../components/Blocnote/PreliminaryFinance/LoanSummary';
-import ProjectEconomics from './../../../components/Blocnote/PreliminaryFinance/ProjectEconomics';
-import SavingsScheduleChart from './../../../components/Blocnote/PreliminaryFinance/SavingsScheduleChart';
-import PriorRetrofitIncomeStatement from './../../../components/Blocnote/PreliminaryFinance/PriorRetrofitIncomeStatement';
-import PostRetrofitIncomeStatement from './../../../components/Blocnote/PreliminaryFinance/PostRetrofitIncomeStatement';
-import PriorRetrofitBalanceSheet from './../../../components/Blocnote/PreliminaryFinance/PriorRetrofitBalanceSheet';
-import PostRetrofitBalanceSheet from './../../../components/Blocnote/PreliminaryFinance/PostRetrofitBalanceSheet';
-import DownPayment from './../../../components/Blocnote/PreliminaryFinance/DownPayment';
-import SelectScenario from './../../../components/Blocnote/PreliminaryFinance/SelectScenario';
-import InputScenario from './../../../components/Blocnote/PreliminaryFinance/InputScenario';
+import BudgetChart from '../../../components/Blocnote/PreliminaryFinance/BudgetChart';
+import LoanSummary from '../../../components/Blocnote/PreliminaryFinance/LoanSummary';
+import ProjectEconomics from '../../../components/Blocnote/PreliminaryFinance/ProjectEconomics';
+import SavingsScheduleChart from '../../../components/Blocnote/PreliminaryFinance/SavingsScheduleChart';
+import PriorRetrofitIncomeStatement from '../../../components/Blocnote/PreliminaryFinance/PriorRetrofitIncomeStatement';
+import PostRetrofitIncomeStatement from '../../../components/Blocnote/PreliminaryFinance/PostRetrofitIncomeStatement';
+import PriorRetrofitBalanceSheet from '../../../components/Blocnote/PreliminaryFinance/PriorRetrofitBalanceSheet';
+import PostRetrofitBalanceSheet from '../../../components/Blocnote/PreliminaryFinance/PostRetrofitBalanceSheet';
+import DownPayment from '../../../components/Blocnote/PreliminaryFinance/DownPayment';
+import SelectScenario from '../../../components/Blocnote/PreliminaryFinance/SelectScenario';
+import InputScenario from '../../../components/Blocnote/PreliminaryFinance/InputScenario';
import { blocnoteURL } from '../../../utils/restServices';
@@ -49,7 +48,6 @@ class PreliminaryFinance extends Component {
fontWeight: 'bold',
};
- console.log(this.props); // eslint-disable-line
const { blocnote } = this.props;
const { scenario } = blocnote;
diff --git a/src/containers/Blocnote/index.js b/src/containers/Blocnote/index.js
index f5d13fbdbfba352c3ee909cebec9568367940e5b..cb1b322eaef63b6fe4a9305aa8f0d53d59a14135 100644
--- a/src/containers/Blocnote/index.js
+++ b/src/containers/Blocnote/index.js
@@ -7,7 +7,6 @@ import { Link } from 'react-router';
import LinkBarDetail from '../../components/LinkBarDetail';
import buildingDetailPropTypes from '../Building/propTypes';
import { loadLandingData } from './actions';
-import './styles.css';
import Loading from '../../components/Loading';
import blocnoteProps from './propTypes';
@@ -19,7 +18,7 @@ class Blocnote extends Component {
processData = (data) => {
const rootURL = `/buildings/${this.props.building.building_id}`;
- const dataDic = {
+ const rows = {
financialInputs: {
name: null,
status: null,
@@ -35,52 +34,52 @@ class Blocnote extends Component {
};
if (data.instance.if_completed) {
- dataDic.name = (
+ rows.name = (
Financial Inputs
);
- dataDic.status = (
Complete);
- dataDic.preliminaryFinance.name = (
+ rows.status = (
Complete);
+ rows.preliminaryFinance.name = (
Preliminary Finance
);
- dataDic.preliminaryFinance.status = (
OK);
- dataDic.budgetSimilator.name = (
+ rows.preliminaryFinance.status = (
OK);
+ rows.budgetSimilator.name = (
Budget Simulator
);
- dataDic.budgetSimilator.status = (
OK);
+ rows.budgetSimilator.status = (
OK);
} else {
- dataDic.name = (
+ rows.name = (
Financial Inputs
);
if (data.instance.if_started) {
- dataDic.status = (
Started but not complete.);
+ rows.status = (
Started but not complete.);
} else {
- dataDic.status = (
Not Started.);
+ rows.status = (
Not Started.);
}
- dataDic.preliminaryFinance.name = (
Preliminary Finance);
+ rows.preliminaryFinance.name = (
Preliminary Finance);
const prelimItems = data.instance.not_saved_list_for_prelim.map((item) => {
return (
Please fill {item});
});
- dataDic.preliminaryFinance.status = (
+ rows.preliminaryFinance.status = (
);
if (data.instance.if_completed_for_budget) {
- dataDic.budgetSimilator.name = (
+ rows.budgetSimilator.name = (
Budget Simulator
);
- dataDic.budgetSimilator.status = (
OK);
+ rows.budgetSimilator.status = (
OK);
} else {
- dataDic.budgetSimilator.name = (
Budget Simulator);
+ rows.budgetSimilator.name = (
Budget Simulator);
const budgetItems = data.instance.not_saved_list_for_budget.map((item) => {
return (
Please fill {item});
});
- dataDic.budgetSimilator.status = (
);
+ rows.budgetSimilator.status = (
);
}
}
- return dataDic;
+ return rows;
}
render() {
@@ -92,7 +91,7 @@ class Blocnote extends Component {
if (data === null) {
mainContent =
;
} else {
- const dataDic = this.processData(data);
+ const rows = this.processData(data);
mainContent = (
@@ -107,26 +106,26 @@ class Blocnote extends Component {
|
- {dataDic.name}
+ {rows.name}
|
- {dataDic.status}
+ {rows.status}
|
|
- {dataDic.preliminaryFinance.name}
+ {rows.preliminaryFinance.name}
|
- {dataDic.preliminaryFinance.status}
+ {rows.preliminaryFinance.status}
|
|
- {dataDic.budgetSimilator.name}
+ {rows.budgetSimilator.name}
|
- {dataDic.budgetSimilator.status}
+ {rows.budgetSimilator.status}
|
diff --git a/src/containers/Blocnote/reducer.js b/src/containers/Blocnote/reducer.js
index 28a07d32cb97899a1f95fa82cf5f79362b8484b9..490bb3f79ed8b8803de80fe04594fe80799a7dd7 100644
--- a/src/containers/Blocnote/reducer.js
+++ b/src/containers/Blocnote/reducer.js
@@ -62,7 +62,6 @@ const blocnoteInitialState = {
};
export default function (state = blocnoteInitialState, action) {
- console.log(state); // eslint-disable-line
switch (action.type) {
case LandingPage.LANDING_DATA_REQUESTED:
return {
@@ -220,18 +219,6 @@ export default function (state = blocnoteInitialState, action) {
};
case FinancialInputs.CREATE_BILLS_SUMMARY_SUCCEEDED:
- // const utilityType = action.instance.utility_type;
- console.log(state.billsSummary.data); // eslint-disable-line
- // console.log([
- // ...state.billsSummary.data,
- // {
- // id: action.result.id,
- // utility_type: action.instance.utility_type,
- // year: action.instance.year,
- // charge: action.instance.charge,
- // },
- // ]); // eslint-disable-line
-
return {
...state,
billsSummary: {
@@ -341,7 +328,6 @@ export default function (state = blocnoteInitialState, action) {
};
case FinancialInputs.LOAN_OPTIONS_FAILED:
- console.log(action); // eslint-disable-line
return {
...state,
loanOptions: {
@@ -506,8 +492,6 @@ export default function (state = blocnoteInitialState, action) {
};
case FinancialInputs.UPDATE_BILLS_OVERVIEW_SUCCEEDED:
- console.log(action); // eslint-disable-line
- console.log(state); // eslint-disable-line
return {
...state,
billsOverview: {
@@ -537,8 +521,6 @@ export default function (state = blocnoteInitialState, action) {
};
case FinancialInputs.UPDATE_INCOME_STATEMENTS_SUCCEEDED:
- console.log(action); // eslint-disable-line
- console.log(state); // eslint-disable-line
return {
...state,
incomeStatement: {
@@ -568,8 +550,6 @@ export default function (state = blocnoteInitialState, action) {
};
case FinancialInputs.UPDATE_CASH_BALANCE_SUCCEEDED:
- console.log(action); // eslint-disable-line
- console.log(state); // eslint-disable-line
return {
...state,
cashBalance: {
@@ -599,8 +579,6 @@ export default function (state = blocnoteInitialState, action) {
};
case FinancialInputs.UPDATE_LIABILITIES_SUCCEEDED:
- console.log(action); // eslint-disable-line
- console.log(state); // eslint-disable-line
return {
...state,
liabilities: {
@@ -630,8 +608,6 @@ export default function (state = blocnoteInitialState, action) {
};
case FinancialInputs.UPDATE_LOAN_OPTIONS_SUCCEEDED:
- console.log(action); // eslint-disable-line
- console.log(state); // eslint-disable-line
return {
...state,
loanOptions: {
@@ -661,8 +637,6 @@ export default function (state = blocnoteInitialState, action) {
};
case FinancialInputs.UPDATE_CUSTOMER_PREFERENCE_SUCCEEDED:
- console.log(action); // eslint-disable-line
- console.log(state); // eslint-disable-line
return {
...state,
customerPreference: {
@@ -692,8 +666,6 @@ export default function (state = blocnoteInitialState, action) {
};
case PreliminaryFinance.SCENARIO_SUCCEEDED:
- console.log(action); // eslint-disable-line
- console.log(state); // eslint-disable-line
return {
...state,
scenario: {
@@ -723,8 +695,6 @@ export default function (state = blocnoteInitialState, action) {
};
case PreliminaryFinance.UPDATE_SCENARIO_SUCCEEDED:
- console.log(action); // eslint-disable-line
- console.log(state); // eslint-disable-line
return {
...state,
scenario: {
diff --git a/src/containers/Blocnote/sagas.js b/src/containers/Blocnote/sagas.js
index b07e51ad3d5efa016171da9bc95c7d9ca49c3f26..59a9aacb507e874919d97978ae1909353867eaa7 100644
--- a/src/containers/Blocnote/sagas.js
+++ b/src/containers/Blocnote/sagas.js
@@ -108,7 +108,6 @@ function* loadBudgetSimulator(action) {
}
function* createBillsSummary(action) {
- console.log(action); // eslint-disable-line
const url = `${process.env.REACT_APP_BLOCNOTE_URL}/buildings/${action.buildingId}/financial-inputs/bills-summary/`;
const res = yield call(
request,
@@ -121,7 +120,6 @@ function* createBillsSummary(action) {
);
if (!res.err) {
- console.log(res); // eslint-disable-line
yield put(createBillsSummarySucceeded(action.payload, res));
} else {
yield put(createBillsSummaryFailed(res.err));
@@ -129,7 +127,6 @@ function* createBillsSummary(action) {
}
function* updateBillsSummary(action) {
- console.log(action); // eslint-disable-line
const url = `${process.env.REACT_APP_BLOCNOTE_URL}/buildings/${action.buildingId}/financial-inputs/bills-summary/`;
const res = yield call(
request,
@@ -149,7 +146,6 @@ function* updateBillsSummary(action) {
}
function* deleteBillsSummary(action) {
- console.log(action); // eslint-disable-line
const url = `${process.env.REACT_APP_BLOCNOTE_URL}/buildings/${action.buildingId}/financial-inputs/bills-summary/`;
const res = yield call(
request,
@@ -169,7 +165,6 @@ function* deleteBillsSummary(action) {
}
function* createBillsOverview(action) {
- console.log(action); // eslint-disable-line
const url = `${process.env.REACT_APP_BLOCNOTE_URL}/buildings/${action.buildingId}/financial-inputs/bills-overview/`;
const res = yield call(
request,
@@ -182,7 +177,6 @@ function* createBillsOverview(action) {
);
if (!res.err) {
- console.log(res); // eslint-disable-line
yield put(createBillsOverviewSucceeded(action.payload, res));
} else {
yield put(createBillsOverviewFailed(res.err));
@@ -285,7 +279,6 @@ function* updateLoanOptions(action) {
}
function* updateCustomerPreference(action) {
- console.log(action); // eslint-disable-line
const url = `${process.env.REACT_APP_BLOCNOTE_URL}/buildings/${action.buildingId}/financial-inputs/customer-preference/`;
const res = yield call(
request,
@@ -305,14 +298,11 @@ function* updateCustomerPreference(action) {
}
function* loadScenario(action) {
- console.log(action); // eslint-disable-line
- console.log(`${process.env.REACT_APP_BLOCNOTE_URL}/buildings/${action.buildingId}/preliminary-finance/scenario/`); // eslint-disable-line
const url = `${process.env.REACT_APP_BLOCNOTE_URL}/buildings/${action.buildingId}/preliminary-finance/scenario/`;
yield SagaRequests.get(action, url, scenarioLoaded, scenarioFailed);
}
function* updateScenario(action) {
- console.log(action); // eslint-disable-line
const url = `${process.env.REACT_APP_BLOCNOTE_URL}/buildings/${action.buildingId}/preliminary-finance/scenario/`;
const res = yield call(
request,
@@ -324,7 +314,6 @@ function* updateScenario(action) {
}
);
- console.log(res); // eslint-disable-line
if (!res.err) {
yield put(updateScenarioSucceeded(action.payload));
} else {
diff --git a/src/containers/Blocnote/styles.css b/src/containers/Blocnote/styles.css
deleted file mode 100644
index b849a45a13feb51f31e5b5af8676647fe8be624b..0000000000000000000000000000000000000000
--- a/src/containers/Blocnote/styles.css
+++ /dev/null
@@ -1,10 +0,0 @@
-.leaflet-container {
- height: 475px;
-}
-
-#run-sim-btn {
- position: absolute;
- right: 0;
- bottom: 0;
- margin-bottom: 17px;
-}