switch yearbuilt back to number instead of string, fix some commas too.

#32 #25
cityenergyproject · Jan 9, 2017 · 03ebdd3 · 03ebdd3
1 parent fdad32e
commit 03ebdd3
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 4 deletions.
diff --git a/src/app/templates/building_comparison/table_body.html b/src/app/templates/building_comparison/table_body.html
@@ -6,7 +6,7 @@
 <% _.each(metrics, function(metric){ %>
     <td>
       <div class="subheader"><span>average</span></div>
-      <div class="average-container" style="color: <%= metric.color %>"><span class="average"><%= metric.median.toLocaleString() %></span> <span class="unit"><%= metric.unit %></span></div>
+      <div class="average-container" style="color: <%= metric.color %>"><span class="average"><%= metric.isYear ? metric.median : metric.median.toLocaleString() %></span> <span class="unit"><%= metric.unit %></span></div>
     </td>
 <% }) %>
   </tr>
@@ -21,7 +21,7 @@
       <td class="metric <%= metric.undefined %>">
         <div class="metric-container">
           <div class="histogram"></div>
-          <span class="value" style="color: <%= metric.color %>"><%= (metric.value || "").toLocaleString() %></span>
+          <span class="value" style="color: <%= metric.color %>"><%= metric.isYear ? metric.value : (metric.value || "").toLocaleString() %></span>
           <span class="no-value">N/A</span>
         </div>
       </td>

diff --git a/src/app/views/building_comparison/building_comparison.js b/src/app/views/building_comparison/building_comparison.js
@@ -45,6 +45,7 @@ define([
         return {
           value: value,
           color: color,
+          isYear: (field == 'yearbuilt'), // TODO: don't hardcode this
           undefined: (value ? 'defined' : 'undefined')
         };
       }, this);
@@ -75,6 +76,7 @@ define([
 
     return _.extend({}, field, {
       median: median,
+      isYear: (field.field_name == 'yearbuilt'),  // TODO: don't hardcode this
       color: gradientCalculator.toColor(median)
     });
   };

diff --git a/src/cities/seattle.json b/src/cities/seattle.json
@@ -33,7 +33,7 @@
         {"field": "primary_ptype_epa", "label": "Property Type: "},
         {"field": "buildingtypename", "label": "Seattle Building Type: "},
         {"field": "reported_gross_floor_area", "label": "Property Size (ft²): "},
-        {"field": "yearbuiltstring", "label": "Year Built: "},
+        {"field": "yearbuilt", "label": "Year Built: "},
         {"field": "numbuildings", "label": "Number of Buildings: ", "suppress_unless_field": "primary_ptype_epa", "suppress_unless_value": "Multifamily Housing"},
         {"field": "numfloors", "label": "Number of Floors: ", "suppress_unless_field": "primary_ptype_epa", "suppress_unless_value": "Multifamily Housing"},
         {"field": "numunits", "label": "Number of Units: ", "suppress_unless_field": "primary_ptype_epa", "suppress_unless_value": "Multifamily Housing"},
@@ -75,7 +75,7 @@
         },
         {
             "title": "Year Built",
-            "field_name": "yearbuiltstring",
+            "field_name": "yearbuilt",
             "display_type": "range",
             "range_slice_count": 18,
             "color_range": ["#f0e5c7","#007749"],