Merge pull request MaxBo#638 from MaxBo/feature/Frontend

Feature/frontend
H2020Cinderela · Oct 22, 2019 · 6f8dfba · 6f8dfba
2 parents 2425000 + 1018cbb
commit 6f8dfba
Show file tree

Hide file tree

Showing 7 changed files with 24 additions and 16 deletions.
diff --git a/repair/js/views/common/baseview.js b/repair/js/views/common/baseview.js
@@ -50,8 +50,13 @@ var BaseView = Backbone.View.extend(
     },
 
     /** format a number to currently set language **/
-    format: function(value){
-        return value.toLocaleString(this.language);
+    format: function(value, forceSignum){
+        var formatted = value.toLocaleString(this.language);
+        if (this.forceSignum){
+            if (value > 0) formatted = '+' + formatted;
+            if (value == 0) formatted = '+-0';
+        }
+        return formatted;
     },
 
     /**

diff --git a/repair/js/views/common/filter-flows.js b/repair/js/views/common/filter-flows.js
@@ -179,6 +179,7 @@ var FilterFlowsView = BaseView.extend(
             displayWarnings: true,
             filter: filter
         });
+        this.flowsView.loader = this.loader;
         var displayLevel = this.displayLevelSelect.value;
         this.flowsView.draw(displayLevel);
     },

diff --git a/repair/js/views/common/flows.js b/repair/js/views/common/flows.js
@@ -229,7 +229,6 @@ var FlowsView = BaseView.extend(
             apiTag: 'flows',
             apiIds: [ this.caseStudy.id, this.keyflowId]
         });
-
         this.loader.activate();
         var data = {};
         if (options.strategy)

diff --git a/repair/js/views/common/flowsankey.js b/repair/js/views/common/flowsankey.js
@@ -108,7 +108,8 @@ var FlowSankeyView = BaseView.extend(
             selectable: true,
             gradient: false,
             stretchFactor: (this.stretchInput) ? this.stretchInput.value: 1,
-            selectOnDoubleClick: (dblclkCheck) ? dblclkCheck.checked : false
+            selectOnDoubleClick: (dblclkCheck) ? dblclkCheck.checked : false,
+            forceSignum: this.forceSignum
         })
 
         // redirect the event with same properties
@@ -213,14 +214,12 @@ var FlowSankeyView = BaseView.extend(
             fractions.forEach(function(material){
                 var amount = (material.value != null) ? material.value: material.amount;
                 if (amount == 0) return;
-                if (_this.forceSignum && amount >= 0)
-                    text += '+';
                 if (_this.showRelativeComposition){
                     fraction = amount / totalAmount,
                     value = Math.round(fraction * 100000) / 1000;
-                    text += _this.format(value) + '%';
+                    text += _this.format(value, _this.forceSignum) + '%';
                 } else {
-                    text += _this.format(amount) + ' ' + gettext('t/year');
+                    text += _this.format(amount, _this.forceSignum) + ' ' + gettext('t/year');
                 }
                 text += ' ' + material.name
                 if (material.avoidable) text += ' <i>' + gettext('avoidable') +'</i>';
@@ -263,9 +262,6 @@ var FlowSankeyView = BaseView.extend(
             var crepr = compositionRepr(flow),
                 amount = flow.get('amount'),
                 value = (norm === 'log')? normalize(amount): Math.round(amount);
-
-            if (_this.forceSignum && amount >= 0)
-                amount = '+' + amount.toLocaleString(this.language);
             links.push({
                 id: flow.id,
                 originalData: flow,
@@ -323,7 +319,7 @@ var FlowSankeyView = BaseView.extend(
 
         var header = [gettext('origin'), gettext('origin') + '_code', gettext('origin') + '_wkt',
                       gettext('destination'), gettext('destination') + '_code', gettext('destination') + '_wkt',
-                      gettext('amount'), gettext('composition')],
+                      gettext('amount (t/year)'), gettext('composition')],
             rows = [],
             _this = this;
         rows.push(header.join('\t'));
@@ -340,11 +336,9 @@ var FlowSankeyView = BaseView.extend(
                 destination = link.target,
                 originName = origin.name,
                 destinationName = (!link.isStock) ? destination.name : gettext('Stock'),
-                amount = _this.format(link.amount) + ' ' + link.units,
+                amount = _this.format(link.amount, _this.forceSignum),
                 composition = link.composition;
 
-            if (_this.forceSignum && amount >= 0)
-                amount = '-' + amount;
             var originCode = origin.code,
                 destinationCode = (destination) ? destination.code: '',
                 originWkt = '',

diff --git a/repair/js/views/status-quo/workshop-flows.js b/repair/js/views/status-quo/workshop-flows.js
@@ -95,6 +95,7 @@ var FlowsWorkshopView = BaseView.extend(
             materials: this.materials,
             filter: filter
         });
+        this.flowsView.loader = this.loader;
         this.draw();
     },
 

diff --git a/repair/js/views/strategy/modified-flows.js b/repair/js/views/strategy/modified-flows.js
@@ -118,6 +118,7 @@ var ModifiedFlowsView = BaseView.extend(
             filter: filter,
             strategy: this.strategy
         });
+        this.flowsView.loader = this.loader;
         this.draw();
     },
 

diff --git a/repair/js/visualizations/sankey.js b/repair/js/visualizations/sankey.js
@@ -39,12 +39,18 @@ class Sankey{
             .size([this.width * this.stretchFactor, this.height])
             .align(alignment);
         this.selectable = options.selectable;
+        this.forceSignum = options.forceSignum;
         this.gradient = options.gradient;
         this.selectOnDoubleClick = options.selectOnDoubleClick || false;
     }
 
     format(d) {
-        return d.toLocaleString(this.language);
+        var formatted = d.toLocaleString(this.language);
+        if (this.forceSignum){
+            if (d > 0) formatted = '+' + formatted;
+            if (d == 0) formatted = '+-0';
+        }
+        return formatted;
     }
 
     align(alignment){
@@ -175,6 +181,7 @@ class Sankey{
                 outSum += parseInt(link.amount || link.value);
                 if (!outUnits) outUnits = link.units;
             }
+
             var ins = "in: " + _this.format(inSum) + " " + (inUnits || ""),
                 out = "out: " + _this.format(outSum) + " " + (outUnits || "");
             var text = (d.text) ? d.text + '<br>': '';