diff --git a/Dockerfile b/Dockerfile index 99b91cb086c4e52edb826455172ae776c5deed99..58a08df89be19999a7bdd2fd917299126b8899f0 100644 --- a/Dockerfile +++ b/Dockerfile @@ -8,6 +8,10 @@ ENV CODEROOT=/home/docker/code ENV NGINXERR=/var/log/app/nginx.err.log ENV NGINXREQ=/var/log/app/nginx.req.log +RUN cat /etc/apt/sources.list +RUN echo "deb http://archive.debian.org/debian/ jessie main" > /etc/apt/sources.list +RUN echo "deb-src http://archive.debian.org/debian/ jessie main" >> /etc/apt/sources.list + # Install dependencies. RUN apt-get -qq update && apt-get install -y \ build-essential \ diff --git a/src/containers/BGroup/BGroup.js b/src/containers/BGroup/BGroup.js index f321471ee193861b3800c16aae239fb67d1d6bcb..8e9dc14746c09247f44353a410fce3cd1fd9b4e2 100644 --- a/src/containers/BGroup/BGroup.js +++ b/src/containers/BGroup/BGroup.js @@ -200,6 +200,9 @@ export class BGroup extends Component { owner_occupied: val.owner_occupied, stable_tenure_of_ownership: val.stable_tenure_of_ownership, type_of_fuel: val.type_of_fuel, + building_age: val.building_age, + pre_post_war: val.pre_post_war, + complaint_311: val.complaint_311, }; return acc; }, {}); diff --git a/src/containers/BGroup/BGroupBuildingTable.js b/src/containers/BGroup/BGroupBuildingTable.js index eaaf669dd0efcbde4a952f000623c73072579c4c..d44d918138daac947a107f3ee8ac1970bb7c5a8d 100644 --- a/src/containers/BGroup/BGroupBuildingTable.js +++ b/src/containers/BGroup/BGroupBuildingTable.js @@ -406,6 +406,36 @@ export default class BGroupBuildingTable extends Component { {row.value} ), + }, { + Header: 'Age of Building', + filterable: true, + style: { textAlign: 'center' }, + accessor: 'building_age', + Cell: row => ( +
+ {row.value} +
+ ), + }, { + Header: 'Pre War/Post War', + filterable: true, + style: { textAlign: 'center' }, + accessor: 'pre_post_war', + Cell: row => ( +
+ {row.value} +
+ ), + }, { + Header: '# of 311 Complaints', + filterable: true, + style: { textAlign: 'center' }, + accessor: 'complaint_311', + Cell: row => ( +
+ {row.value} +
+ ), }, ], }], ...(!this.state.displayContact) ? [] : [{ @@ -779,12 +809,18 @@ export default class BGroupBuildingTable extends Component { val.fuel_type = heatPumpScores[val.building_id].type_of_fuel; val.owner_occupied = heatPumpScores[val.building_id].owner_occupied; val.stable_ownership = heatPumpScores[val.building_id].stable_tenure_of_ownership; + val.building_age = heatPumpScores[val.building_id].building_age; + val.pre_post_war = heatPumpScores[val.building_id].pre_post_war; + val.complaint_311 = heatPumpScores[val.building_id].complaint_311; } else { val.heat_pump_score = -1; val.building_proximities = -1; val.fuel_type = -1; val.owner_occupied = -1; val.stable_ownership = -1; + val.building_age = -1; + val.pre_post_war = -1; + val.complaint_311 = -1; } // Contact val.contact_account = contactAccounts[val.building_id];