Merge pull request #1400 from kellyi/feature/update-water-quality-vis…

…ualizations Remove biochemical oxygen demand component Connects #1174
WikiWatershed · Jul 27, 2016 · 89a57db · 89a57db
2 parents 8f813df + 85389e7
commit 89a57db
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 10 deletions.
diff --git a/src/mmw/apps/modeling/tasks.py b/src/mmw/apps/modeling/tasks.py
@@ -149,11 +149,10 @@ def aoi_resolution(area_of_interest):
 
 
 def format_quality(model_output):
-    measures = ['Biochemical Oxygen Demand',
-                'Total Suspended Solids',
+    measures = ['Total Suspended Solids',
                 'Total Nitrogen',
                 'Total Phosphorus']
-    codes = ['bod', 'tss', 'tn', 'tp']
+    codes = ['tss', 'tn', 'tp']
 
     def fn(input):
         measure, code = input

diff --git a/src/mmw/js/src/core/utils.js b/src/mmw/js/src/core/utils.js
@@ -234,6 +234,10 @@ var utils = {
         }
     },
 
+    filterOutOxygenDemand: function(element) {
+        return element.measure !== "Biochemical Oxygen Demand";
+    },
+
     // Reverse sorting of a Backbone Collection.
     // Taken from http://stackoverflow.com/a/12220415/2053314
     reverseSortBy: function(sortByFunction) {

diff --git a/src/mmw/js/src/modeling/tr55/quality/views.js b/src/mmw/js/src/modeling/tr55/quality/views.js
@@ -9,7 +9,8 @@ var $ = require('jquery'),
     barChartTmpl = require('../../../core/templates/barChart.html'),
     resultTmpl = require('./templates/result.html'),
     tableRowTmpl = require('./templates/tableRow.html'),
-    tableTmpl = require('./templates/table.html');
+    tableTmpl = require('./templates/table.html'),
+    utils = require('../../../core/utils.js');
 
 var ResultView = Marionette.LayoutView.extend({
     className: 'tab-pane',
@@ -51,8 +52,9 @@ var ResultView = Marionette.LayoutView.extend({
                 }));
             } else {
                 var dataCollection = new Backbone.Collection(
-                    this.model.get('result').quality
-                );
+                    this.model.get('result').quality.filter(
+                        utils.filterOutOxygenDemand
+                ));
 
                 this.tableRegion.show(new TableView({
                     aoiVolumeModel: this.aoiVolumeModel,
@@ -168,10 +170,9 @@ var CompareChartView = Marionette.ItemView.extend({
         }
 
         var chartEl = this.$el.find('.bar-chart').get(0),
-            result = this.model.get('result').quality,
+            result = this.model.get('result').quality.filter(utils.filterOutOxygenDemand),
             aoiVolumeModel = this.options.aoiVolumeModel,
-            seriesDisplayNames = ['Oxygen Demand',
-                                  'Suspended Solids',
+            seriesDisplayNames = ['Suspended Solids',
                                   'Nitrogen',
                                   'Phosphorus'],
             data,
@@ -181,7 +182,7 @@ var CompareChartView = Marionette.ItemView.extend({
         if (result) {
             data = getData(result, seriesDisplayNames);
             chartOptions = {
-                seriesColors: ['#1589ff', '#4aeab3', '#4ebaea', '#329b9c'],
+                seriesColors: ['#4aeab3', '#4ebaea', '#329b9c'],
                 yAxisLabel: 'Loading Rate (kg/ha)',
                 yAxisUnit: 'kg/ha',
                 margin: {top: 20, right: 0, bottom: 40, left: 60},