Skip to content

Commit

Permalink
Merge pull request #3159 from SEED-platform/2683-bug/unselected-meter…
Browse files Browse the repository at this point in the history
…s-shown

refactor flilteredReadings to exclude cols and rows
  • Loading branch information
Ryo committed Mar 10, 2022
2 parents 7812762 + 41c766b commit 76b0303
Showing 1 changed file with 2 additions and 11 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -162,17 +162,8 @@ angular.module('BE.seed.controller.inventory_detail_meters', [])
var filterByMeterLabels = function filterByMeterLabels (readings, columnDefs, meterLabels) {
var timeColumns = ['start_time', 'end_time', 'month', 'year'];
var selectedColumns = meterLabels.concat(timeColumns);
var filteredReadings = readings.map(function (reading) {
return Object.entries(reading).reduce(function (newReading, _ref) {
var key = _ref[0],
value = _ref[1];

if (selectedColumns.includes(key)) {
newReading[key] = value;
}

return newReading;
}, {});
var filteredReadings = readings.filter(reading => {
return meterLabels.some(label => Object.keys(reading).includes(label));
});
var filteredColumnDefs = columnDefs.filter(function (columnDef) {
return selectedColumns.includes(columnDef.field);
Expand Down

0 comments on commit 76b0303

Please sign in to comment.