#19 adjustments for transfer table

WiSchLabs · May 2, 2017 · 8992395 · 8992395
1 parent db872ac
commit 8992395
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 9 deletions.
diff --git a/core/static/core/js/table_formats.js b/core/static/core/js/table_formats.js
@@ -158,7 +158,11 @@ function numberFormatter(value) {
     return value.toLocaleString('de-DE');
 }
 function moneyFormatter(value) {
-    return numberFormatter(value) + " &euro;";
+    if (typeof value === 'number') {
+        return numberFormatter(value) + " &euro;";
+    } else {
+        return value
+    }
 }
 
 window.onload=table_loader;
diff --git a/core/static/core/js/transfer_charts_handler.js b/core/static/core/js/transfer_charts_handler.js
@@ -221,21 +221,19 @@ function fillOverviewTable(data){
 
     var header_row = '<tr><th></th>';
 
-    var group1Length = data.group1.length;
-    for (var k = 0; k < group1Length; k++) {
+    for (var k = 0; k < data.group1.length; k++) {
         header_row += '<th>' + data.group1[k] + '</th>'
     }
     header_row += '</tr>';
 
     $('#TransfersOverviewTable').append(header_row);
 
-    var group2Length = data.group2.length;
-    for (var i = 0; i < group2Length; i++) {
+    for (var i = 0; i < data.group2.length; i++) {
         var row = '<tr><th>' + data.group2[i] + '</th>';
 
         var rowLength = data.medians[i].length;
         for (var j = 0; j < rowLength; j++) {
-            row += '<td>' + data.medians[i][j] + '</td>';
+            row += '<td>' + moneyFormatter(data.medians[i][j]) + '</td>';
         }
 
         row += '</tr>';
@@ -271,5 +269,5 @@ $(function () {
     requestChartDetailData();
     requestOverviewTableData();
 
-    setTimeout(makeTableSelectable, 1000);
+    setTimeout(makeTableSelectable, 3000);
 });
diff --git a/core/templates/core/ofm/transfers.html b/core/templates/core/ofm/transfers.html
@@ -115,5 +115,6 @@ <h1 class="page-header">
     </script>
 
     <script src="{% static 'core/js/parsing_overlay.js' %}"></script>
+    <script src="{% static 'core/js/table_formats.js' %}"></script>
     <script src="{% static 'core/js/transfer_charts_handler.js' %}"></script>
 {% endblock %}
diff --git a/core/views/ofm/transfers_views.py b/core/views/ofm/transfers_views.py
@@ -132,9 +132,10 @@ def _get_medians(group1, prices, group2):
             row = []
             for group1_item in group1:
                 try:
-                    row.append("{:,}".format(prices.get_group((group1_item, group2_item)).median()))
+                    formatted_median = prices.get_group((group1_item, group2_item)).median()
+                    row.append(float(formatted_median))
                 except KeyError:
-                    row.append('NA')
+                    row.append('-')
             medians.append(row)
         return medians