From 75446421b49b9d8e5fa3df923d7a8bbf36597b4c Mon Sep 17 00:00:00 2001
From: Alex Swindler <Alex.Swindler@nrel.gov>
Date: Fri, 17 Apr 2015 22:14:57 -0600
Subject: [PATCH 01/22] Fixing typos

---
 BE/settings/dev.py                               | 2 +-
 seed/static/seed/js/directives/beUploader.js     | 6 +++---
 seed/static/seed/js/filters/stripImportPrefix.js | 4 ++--
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/BE/settings/dev.py b/BE/settings/dev.py
index 3ceb6b2185..d7eef9a3a3 100644
--- a/BE/settings/dev.py
+++ b/BE/settings/dev.py
@@ -49,7 +49,7 @@
     LOGGING = {
         'version': 1,
         'disable_existing_loggers': True,
-        # set up some log message handers to chose from
+        # set up some log message handlers to choose from
         'handlers': {
             'sentry': {
                 'level': 'ERROR',
diff --git a/seed/static/seed/js/directives/beUploader.js b/seed/static/seed/js/directives/beUploader.js
index 458669bf29..b3d99fda97 100644
--- a/seed/static/seed/js/directives/beUploader.js
+++ b/seed/static/seed/js/directives/beUploader.js
@@ -11,7 +11,7 @@
  *              `message` - string - options: "upload_submitted",
  *              "upload_in_progress", "upload_complete", and "invalid_extension"
  *              `filename` - string name of the file uploaded
- *              `progress` - JS object with keys `loaded` and `total` wehere
+ *              `progress` - JS object with keys `loaded` and `total` where
  *                           `loaded` / `total` * 100.0 is the percent uploaded
  *  importrecord - int or string - id of import record or dataset
  *  
@@ -111,7 +111,7 @@ var makeS3Uploader = function(scope, element, attrs, filename) {
          * onComplete: overloaded callback that calls the callback defined
          * in the element attribute unless the upload failed, which will
          * fire a window alert. Passes as arguments to the callback
-         * a message indicating upload has copmleted, "upload_complete", and
+         * a message indicating upload has completed, "upload_complete", and
          * the filename. 
          */
         onComplete: function(id, fileName, responseJSON) {
@@ -242,7 +242,7 @@ var makeFileSystemUploader = function(scope, element, attrs, filename) {
              * onComplete: overloaded callback that calls the callback defined
              * in the element attribute unless the upload failed, which will
              * fire a window alert. Passes as arguments to the callback
-             * a message indicating upload has copmleted, "upload_complete", and
+             * a message indicating upload has completed, "upload_complete", and
              * the filename. 
              */
             onComplete: function(id, fileName, responseJSON) {
diff --git a/seed/static/seed/js/filters/stripImportPrefix.js b/seed/static/seed/js/filters/stripImportPrefix.js
index 32dbb2a52d..4f824a5b4d 100644
--- a/seed/static/seed/js/filters/stripImportPrefix.js
+++ b/seed/static/seed/js/filters/stripImportPrefix.js
@@ -10,11 +10,11 @@ angular.module('stripImportPrefix', []).filter('stripImportPrefix', [
   function($filter) {
     /** ids are sometime prefixed by the Import Record id.
     * e.g. import 28 would prefix all assessor data ids with 'IMP28-' and 
-    *      stripImportPrefix would stip out the 'IMP28-'s from the html and only
+    *      stripImportPrefix would strip out the 'IMP28-'s from the html and only
     *      display the ids. 
     *
     * Usage: building.id = "IMP12-007"
-    *        HTML: <span> {{ buidling.id | stripImportPrefix }} </span>
+    *        HTML: <span> {{ building.id | stripImportPrefix }} </span>
     *         compiles to: <span> 007 </span>
     *        JS  : stripImportPrefix(building.id)
     *         returns: "007"

From 94bb4e9b5073dda37a8ab3692ebf3505e145e89e Mon Sep 17 00:00:00 2001
From: Alex Swindler <Alex.Swindler@nrel.gov>
Date: Fri, 17 Apr 2015 22:28:00 -0600
Subject: [PATCH 02/22] Initial upload improvements

---
 .../js/controllers/data_upload_modal_ctrl.js  |  7 +-
 .../seed/js/services/uploader_service.js      |  2 +-
 .../seed/partials/data_upload_modal.html      | 20 ++++-
 seed/tasks.py                                 | 76 ++++++++++++-------
 4 files changed, 72 insertions(+), 33 deletions(-)

diff --git a/seed/static/seed/js/controllers/data_upload_modal_ctrl.js b/seed/static/seed/js/controllers/data_upload_modal_ctrl.js
index d9bac3ed74..4297efb272 100644
--- a/seed/static/seed/js/controllers/data_upload_modal_ctrl.js
+++ b/seed/static/seed/js/controllers/data_upload_modal_ctrl.js
@@ -18,6 +18,8 @@
  * ng-switch-when="8" == Add files to your Data Set.
  * ng-switch-when="9" == Add files to {$ dataset.name $}
  * ng-switch-when="10" == No matches found
+ * ng-switch-when="11" == Confirm Save Mappings?
+ * ng-switch-when="12" == Error Processing Data
  */
 angular.module('BE.seed.controller.data_upload_modal', [])
 .controller('data_upload_modal_ctrl', [
@@ -161,7 +163,6 @@ angular.module('BE.seed.controller.data_upload_modal', [])
         }
         if (event_message === "upload_complete") {
             var current_step = $scope.step.number;
-            var data_is_green_button = 
           
             $scope.uploader.status_message = "upload complete";
             $scope.dataset.import_file_id = file.file_id;
@@ -272,6 +273,10 @@ angular.module('BE.seed.controller.data_upload_modal', [])
                 }
 
             }, $scope.uploader);
+        }, function(data){
+            $scope.step_12_error_message = data.message;
+            console.error($scope.step_12_error_message);
+            $scope.step.number = 12;
         });
     };
 
diff --git a/seed/static/seed/js/services/uploader_service.js b/seed/static/seed/js/services/uploader_service.js
index a08fa2bad3..1c52ba8441 100644
--- a/seed/static/seed/js/services/uploader_service.js
+++ b/seed/static/seed/js/services/uploader_service.js
@@ -136,7 +136,7 @@ angular.module('BE.seed.service.uploader', []).factory('uploader_service', [
           }, 750);
         }, function (data, status) {
           // reject promise
-          console.log(data, status);
+          console.error(data, status);
         });
     };
 
diff --git a/seed/static/seed/partials/data_upload_modal.html b/seed/static/seed/partials/data_upload_modal.html
index 1632793a28..5cedd2477a 100644
--- a/seed/static/seed/partials/data_upload_modal.html
+++ b/seed/static/seed/partials/data_upload_modal.html
@@ -10,6 +10,7 @@ <h4 class="modal-title" ng-switch-when="8">{$ matched_buildings|number:0 $} buil
     <h4 class="modal-title" ng-switch-when="9">Add files to {$ dataset.name $}.</h4>
     <h4 class="modal-title" ng-switch-when="10">{$ step_10_title|titleCase $}</h4>
     <h4 class="modal-title" ng-switch-when="11">Confirm Save Mappings?</h4>
+    <h4 class="modal-title" ng-switch-when="12">Error Processing Data</h4>
 </div>
 <div class="modal-body no_bottom_padding" ng-switch on="step.number">
 	<!-- Step 1 -->
@@ -29,8 +30,8 @@ <h4 class="modal-title" ng-switch-when="11">Confirm Save Mappings?</h4>
 	<div class="data_upload_steps" ng-switch-when="2">
 	    <div class="row">
 	    	<div class="alert alert-danger alert-dismissable" ng-show="uploader.invalid_extension_alert">
-		    <button type="button" class="close" ng-click="uploader.invalid_extension_alert = false" aria-hidden="true">&times;</button>
-		    <strong>Sorry!</strong> SEED doesn't currently support that file format. Only <strong>.csv</strong> files are supported.
+		        <button type="button" class="close" ng-click="uploader.invalid_extension_alert = false" aria-hidden="true">&times;</button>
+		        <strong>Sorry!</strong> SEED doesn't currently support that file format. Only <strong>.csv</strong>, <strong>.xls</strong>, <strong>.xlsx</strong>, and <strong>.xml</strong> files are supported.
 		    </div>
 		    <div class="form-group col-lg-12 col-sm-12">
 		    	<div class="row">
@@ -50,7 +51,7 @@ <h4 class="modal-title" ng-switch-when="11">Confirm Save Mappings?</h4>
 	    <div class="row" ng-hide="uploader.in_progress">
 		    <div class="col-lg-12 col-sm-12">
 		    	<div>
-		    		<p>File types supported: <strong>.csv</strong>, <strong>.xls</strong> and <strong>.xlsx</strong> and <strong>.xml</strong>.</p> 
+		    		<p>File types supported: <strong>.csv</strong>, <strong>.xls</strong>, <strong>.xlsx</strong>, and <strong>.xml</strong>.</p>
 		    		<p><strong>Note:</strong> multi-tabbed MS Excel files are not currently supported.</p>
 		    	</div>
 		    </div>
@@ -70,7 +71,7 @@ <h4 class="modal-title" ng-switch-when="11">Confirm Save Mappings?</h4>
 	    <div class="row">
 	    	<div class="alert alert-danger alert-dismissable" ng-show="uploader.invalid_extension_alert">
 		    	<button type="button" class="close" data-dismiss="alert" aria-hidden="true">&times;</button>
-		    	<strong>Sorry!</strong> SEED doesn't currently support that file format. Only .csv, .xls, .xlsx files are supported.
+		    	<strong>Sorry!</strong> SEED doesn't currently support that file format. Only <strong>.csv</strong>, <strong>.xls</strong>, <strong>.xlsx</strong>, and <strong>.xml</strong> files are supported.
 		    </div>
 		    <div class="form-group col-lg-12 col-sm-12">
 		        <div be-uploader sourcetype="Portfolio Raw" importrecord="dataset.id" buttontext="Upload your energy data file(s)" eventfunc="uploaderfunc(message, file, progress)" ng-hide="uploader.in_progress"></div>
@@ -151,6 +152,17 @@ <h4 class="modal-title" ng-switch-when="11">Confirm Save Mappings?</h4>
             </div>
 		</div>
 	</div>
+	<!-- Step 12: Error Processing Data  -->
+	<div class="data_upload_steps" ng-switch-when="12">
+		<div class="row">
+		    <div class="col-lg-12 col-sm-12">
+		    	<div>
+		    		<p>An error occurred while processing the file. Please ensure that your file meets the required specifications.</p>
+		    		<pre class="pre-scrollable" ng-show="step_12_error_message">{$ step_12_error_message $}</pre>
+		    	</div>
+		    </div>
+	    </div>
+	</div>
 </div>
 
 <div class="modal-footer" ng-switch on="step.number">
diff --git a/seed/tasks.py b/seed/tasks.py
index cf52889f21..4f6bc240e7 100644
--- a/seed/tasks.py
+++ b/seed/tasks.py
@@ -8,6 +8,7 @@
 import string
 import operator
 import os
+import traceback
 
 from django.core.mail import send_mail
 from django.conf import settings
@@ -21,6 +22,7 @@
 from django.core.urlresolvers import reverse_lazy
 
 from celery.task import task, chord
+from celery.utils.log import get_task_logger
 
 from audit_logs.models import AuditLog
 from landing.models import SEEDUser as User
@@ -71,6 +73,8 @@
 from . import exporter
 
 
+logger = get_task_logger(__name__)
+
 # Maximum number of possible matches under which we'll allow a system match.
 MAX_SEARCH = 5
 # Minimum confidence of two buildings being related.
@@ -626,9 +630,13 @@ def cache_first_rows(import_file, parser):
 
     validation_rows = []
     for i in range(5):
-        row = rows.next()
-        if row:
-            validation_rows.append(row)
+        try:
+            row = rows.next()
+            if row:
+                validation_rows.append(row)
+        except StopIteration:
+            """Less than 5 rows in file"""
+            break
 
     #This is a fix for issue #24 to use original field order when importing
     #This is ultimately not the correct place for this fix.  The correct fix 
@@ -694,43 +702,57 @@ def _save_raw_green_button_data(file_pk, *args, **kwargs):
 @lock_and_track
 def _save_raw_data(file_pk, *args, **kwargs):
     """Chunk up the CSV and save data into the DB raw."""
-    import_file = ImportFile.objects.get(pk=file_pk)
+    status = ''
+    error_msg = ''
+    try:
+        import_file = ImportFile.objects.get(pk=file_pk)
 
-    if import_file.raw_save_done:
-        return {'status': 'warning', 'message': 'raw data already saved'}
+        if import_file.raw_save_done:
+            return {'status': 'warning', 'message': 'raw data already saved'}
 
-    if import_file.source_type == "Green Button Raw":
-        return _save_raw_green_button_data(file_pk, *args, **kwargs)
+        if import_file.source_type == "Green Button Raw":
+            return _save_raw_green_button_data(file_pk, *args, **kwargs)
 
-    parser = reader.MCMParser(import_file.local_file)
-    cache_first_rows(import_file, parser)
-    rows = parser.next()
-    import_file.num_rows = 0
+        parser = reader.MCMParser(import_file.local_file)
+        cache_first_rows(import_file, parser)
+        rows = parser.next()
+        import_file.num_rows = 0
 
-    prog_key = get_prog_key('save_raw_data', file_pk)
+        prog_key = get_prog_key('save_raw_data', file_pk)
 
-    tasks = []
-    for chunk in batch(rows, 100):
-        import_file.num_rows += len(chunk)
-        tasks.append(_save_raw_data_chunk.subtask((chunk, file_pk, prog_key)))
+        tasks = []
+        for chunk in batch(rows, 100):
+            import_file.num_rows += len(chunk)
+            tasks.append(_save_raw_data_chunk.subtask((chunk, file_pk, prog_key)))
 
-    tasks = add_cache_increment_parameter(tasks)
-    import_file.num_columns = parser.num_columns()
-    import_file.save()
+        tasks = add_cache_increment_parameter(tasks)
+        import_file.num_columns = parser.num_columns()
+        import_file.save()
 
-    if tasks:
-        chord(tasks, interval=15)(finish_raw_save.subtask([file_pk]))
-    else:
-        finish_raw_save.task(file_pk)
+        if tasks:
+            chord(tasks, interval=15)(finish_raw_save.subtask([file_pk]))
+        else:
+            finish_raw_save.task(file_pk)
 
-    return {'status': 'success'}
+        status = 'success'
+    except StopIteration:
+        error_msg = traceback.format_exc()
+        status = 'error'
+
+    if status == 'success':
+        return {'status': status}
+    else:
+        return {'status': status, 'message': error_msg}
 
 
 @task
 @lock_and_track
 def save_raw_data(file_pk, *args, **kwargs):
-    _save_raw_data.delay(file_pk, *args, **kwargs)
-    return {'status': 'success'}
+    response = _save_raw_data.delay(file_pk, *args, **kwargs)
+    if response.result['status'] == 'success':
+        return {'status': response.result['status']}
+    else:
+        return {'status': response.result['status'], 'message': response.result['message']}
 
 
 def _stringify(values):

From 7666d3f3d1e283f1e2b7139457b370df77363b9f Mon Sep 17 00:00:00 2001
From: Julie Gallagher <julie.gallagher@covelogroup.com>
Date: Mon, 20 Apr 2015 16:12:45 -0700
Subject: [PATCH 03/22] issue #50 adding first and last buttons to lists

---
 .../js/controllers/matching_controller.js     | 28 +++++++++++++++++++
 .../static/seed/js/services/search_service.js | 18 ++++++++++++
 .../static/seed/partials/buildings_table.html | 10 ++++---
 seed/static/seed/partials/dataset_list.html   |  8 ++++--
 .../static/seed/partials/matching_detail.html | 12 ++++----
 .../seed/partials/matching_detail_table.html  | 10 ++++---
 .../seed/partials/matching_list_table.html    | 10 ++++---
 7 files changed, 76 insertions(+), 20 deletions(-)

diff --git a/seed/static/seed/js/controllers/matching_controller.js b/seed/static/seed/js/controllers/matching_controller.js
index 7f4effb02b..e072ead97c 100644
--- a/seed/static/seed/js/controllers/matching_controller.js
+++ b/seed/static/seed/js/controllers/matching_controller.js
@@ -130,6 +130,29 @@ angular.module('BE.seed.controller.matching', [])
         $scope.next_page_disabled = $scope.current_page === $scope.num_pages;
 
     };
+
+    /**
+     * first_page: triggered when the `first` paging button is clicked, it
+     *   sets the results to the first page and shows that page
+     */
+    $scope.pagination.first_page = function() {
+        $scope.current_page = 1;
+        $scope.filter_search();
+    };
+
+    /**
+     * last_page: triggered when the `last` paging button is clicked, it
+     *   sets the results to the last page and shows that page
+     */
+    $scope.pagination.last_page = function() {
+        $scope.current_page = $scope.num_pages;
+        $scope.filter_search();
+    };
+
+    /**
+     * next_page: triggered when the `next` paging button is clicked, it
+     *   increments the page of the results, and fetches that page
+     */
     $scope.pagination.next_page = function() {
         $scope.current_page += 1;
         if ($scope.current_page > $scope.num_pages) {
@@ -137,6 +160,11 @@ angular.module('BE.seed.controller.matching', [])
         }
         $scope.filter_search();
     };
+
+    /**
+     * prev_page: triggered when the `previous` paging button is clicked, it
+     *   decrements the page of the results, and fetches that page
+     */
     $scope.pagination.prev_page = function() {
         $scope.current_page -= 1;
         if ($scope.current_page < 1) {
diff --git a/seed/static/seed/js/services/search_service.js b/seed/static/seed/js/services/search_service.js
index 08e6b377d7..37d5e044b4 100644
--- a/seed/static/seed/js/services/search_service.js
+++ b/seed/static/seed/js/services/search_service.js
@@ -194,6 +194,24 @@ angular.module('BE.seed.service.search', [])
         this.showing.start = ((this.current_page - 1)*this.number_per_page) + 1;
     };
 
+    /**
+    * first_page: triggered when the `first` paging button is clicked, it
+    *   sets the page to the first in the results, and fetches that page
+    */
+    search_service.first_page = function() {
+      this.current_page = 1;
+      this.search_buildings();
+    };
+
+    /**
+    * last_page: triggered when the `last` paging button is clicked, it
+    *   sets the page to the last in the results, and fetches that page
+    */
+    search_service.last_page = function() {
+      this.current_page = this.num_pages;
+      this.search_buildings();
+    };
+
     /**
      * next_page: triggered when the `next` paging button is clicked, it
      *   increments the page of the results, and fetches that page
diff --git a/seed/static/seed/partials/buildings_table.html b/seed/static/seed/partials/buildings_table.html
index 441a5bbdf8..f65fafcd41 100644
--- a/seed/static/seed/partials/buildings_table.html
+++ b/seed/static/seed/partials/buildings_table.html
@@ -75,14 +75,16 @@
         </div>
         <div class="display_number_entries_text">buildings</div>
     </div>
-    <div class="counts col-sm-6 col-md-6">
+    <div class="counts col-sm-4 col-md-4">
         <span>Showing {$ search.showing.start | number:0 $} to {$ search.showing.end | number:0 $} of {$ search.number_matching_search | number:0 $} buildings</span>
     </div>
-    <div class="pager_container col-sm-3 col-md-3">
+    <div class="pager_container col-sm-5 col-md-5">
         <ul class="pager">
-          <li ng-class="{disabled: search.prev_page_disabled}"><a href="javascript:void(0);" ng-click="search.prev_page()"><i class="fa fa-angle-double-left"></i> Previous</a></li>
+            <li ng-class="{disabled: search.prev_page_disabled}"><a href="javascript:void(0);" ng-click="search.first_page()"><i class="fa fa-angle-double-left"></i> First</a></li>
+            <li ng-class="{disabled: search.prev_page_disabled}"><a href="javascript:void(0);" ng-click="search.prev_page()"><i class="fa fa-angle-left"></i> Previous</a></li>
 
-          <li ng-class="{disabled: search.next_page_disabled}"><a href="javascript:void(0);" ng-click="search.next_page()">Next <i class="fa fa-angle-double-right"></i></a></li>
+            <li ng-class="{disabled: search.next_page_disabled}"><a href="javascript:void(0);" ng-click="search.next_page()">Next <i class="fa fa-angle-right"></i></a></li>
+            <li ng-class="{disabled: search.next_page_disabled}"><a href="javascript:void(0);" ng-click="search.last_page()">Last <i class="fa fa-angle-double-right"></i></a></li>
         </ul>
     </div>
 </div>
diff --git a/seed/static/seed/partials/dataset_list.html b/seed/static/seed/partials/dataset_list.html
index 1c4e5e8ed5..fb2a593a99 100644
--- a/seed/static/seed/partials/dataset_list.html
+++ b/seed/static/seed/partials/dataset_list.html
@@ -57,10 +57,12 @@ <h1><i class="fa fa-sitemap"></i> {$ datasets.length | number:0 $} Data Sets</h1
 		        </table>
 		        <div class="table_footer">
 		            <div class="display_number_entries col-sm-3 col-md-3"></div>
-		            <div class="pager_container col-sm-3 col-md-3" ng-show="more_than_one_page()">
+		            <div class="pager_container col-sm-5 col-md-5" ng-show="more_than_one_page()">
 		                <ul class="pager">
-		                <li><a href="" ng-click="prev_page()" ng-show="current_page != 1"><i class="fa fa-angle-double-left"></i> Previous</a></li>
-		                <li><a href="" ng-click="next_page()" ng-show="current_page != num_pages">Next <i class="fa fa-angle-double-right"></i></a></li>
+							<li><a href="" ng-click="first_page()" ng-show="current_page != 1"><i class="fa fa-angle-double-left"></i> First</a></li>
+							<li><a href="" ng-click="prev_page()" ng-show="current_page != 1"><i class="fa fa-angle-left"></i> Previous</a></li>
+							<li><a href="" ng-click="next_page()" ng-show="current_page != num_pages">Next <i class="fa fa-angle-right"></i></a></li>
+							<li><a href="" ng-click="last_page()" ng-show="current_page != num_pages">Last <i class="fa fa-angle-double-right"></i></a></li>
 		                </ul>
 		            </div>
 		        </div>
diff --git a/seed/static/seed/partials/matching_detail.html b/seed/static/seed/partials/matching_detail.html
index b7507ce38c..d7162a9413 100644
--- a/seed/static/seed/partials/matching_detail.html
+++ b/seed/static/seed/partials/matching_detail.html
@@ -100,14 +100,16 @@ <h1>Matching ({$ import_file.file_name $})</h1>
                     </div>
                     <div class="display_number_entries_text">buildings</div>
                 </div>
-            <div class="counts col-sm-6 col-md-6">
+            <div class="counts col-sm-4 col-md-4">
                 <span>{$ assessed_buildings.length | number:0 $} possible matches</span>
             </div>
-            <div class="pager_container col-sm-3 col-md-3" ng-hide="true">
+            <div class="pager_container col-sm-5 col-md-5" ng-hide="true">
                 <ul class="pager">
-                  <li ng-class="{disabled: prev_page_disabled}"><a ng-click="prev_page()"><i class="fa fa-angle-double-left"></i> Previous</a></li>
-        
-                  <li ng-class="{disabled: next_page_disabled}"><a ng-click="next_page()">Next <i class="fa fa-angle-double-right"></i></a></li>
+                    <li ng-class="{disabled: prev_page_disabled}"><a ng-click="first_page()"><i class="fa fa-angle-double-left"></i> First</a></li>
+                    <li ng-class="{disabled: prev_page_disabled}"><a ng-click="prev_page()"><i class="fa fa-angle-left"></i> Previous</a></li>
+
+                    <li ng-class="{disabled: next_page_disabled}"><a ng-click="next_page()">Next <i class="fa fa-angle-right"></i></a></li>
+                    <li ng-class="{disabled: next_page_disabled}"><a ng-click="last_page()">Last <i class="fa fa-angle-double-right"></i></a></li>
                 </ul>
             </div>
         </div>
diff --git a/seed/static/seed/partials/matching_detail_table.html b/seed/static/seed/partials/matching_detail_table.html
index e78b14d538..771fb9602a 100644
--- a/seed/static/seed/partials/matching_detail_table.html
+++ b/seed/static/seed/partials/matching_detail_table.html
@@ -62,14 +62,16 @@
                 </div>
                 <div class="display_number_entries_text">buildings</div>
             </div>
-            <div class="counts col-sm-6 col-md-6">
+            <div class="counts col-sm-4 col-md-4">
                 <span>{$ search.number_matching_search | number:0 $} search results</span>
             </div>
-            <div class="pager_container col-sm-3 col-md-3" ng-hide="false">
+            <div class="pager_container col-sm-5 col-md-5" ng-hide="false">
                 <ul class="pager">
-                  <li ng-class="{disabled: search.prev_page_disabled}"><a ng-click="search.prev_page()"><i class="fa fa-angle-double-left"></i> Previous</a></li>
+                    <li ng-class="{disabled: search.prev_page_disabled}"><a href="javascript:void(0);" ng-click="search.first_page()"><i class="fa fa-angle-double-left"></i> First</a></li>
+                    <li ng-class="{disabled: search.prev_page_disabled}"><a href="javascript:void(0);" ng-click="search.prev_page()"><i class="fa fa-angle-left"></i> Previous</a></li>
 
-                  <li ng-class="{disabled: search.next_page_disabled}"><a ng-click="search.next_page()">Next <i class="fa fa-angle-double-right"></i></a></li>
+                    <li ng-class="{disabled: search.next_page_disabled}"><a href="javascript:void(0);" ng-click="search.next_page()">Next <i class="fa fa-angle-right"></i></a></li>
+                    <li ng-class="{disabled: search.next_page_disabled}"><a href="javascript:void(0);" ng-click="search.last_page()">Last <i class="fa fa-angle-double-right"></i></a></li>
                 </ul>
             </div>
         </div>
diff --git a/seed/static/seed/partials/matching_list_table.html b/seed/static/seed/partials/matching_list_table.html
index a34cf71097..b13aa3cc56 100644
--- a/seed/static/seed/partials/matching_list_table.html
+++ b/seed/static/seed/partials/matching_list_table.html
@@ -125,14 +125,16 @@
                 </div>
                 <div class="display_number_entries_text">buildings</div>
             </div>
-            <div class="counts col-sm-6 col-md-6">
+            <div class="counts col-sm-4 col-md-4">
                 <span>Showing {$ showing.start | number:0 $} to {$ showing.end | number:0 $} of {$ number_matching_search | number:0 $} buildings <span class="number_unmatched">({$ unmatched_buildings $} unmatched)</span></span>
             </div>
-            <div class="pager_container col-sm-3 col-md-3">
+            <div class="pager_container col-sm-5 col-md-5">
                 <ul class="pager">
-                  <li ng-class="{disabled: prev_page_disabled}"><a href="javascript:void(0);" ng-click="pagination.prev_page()"><i class="fa fa-angle-double-left"></i> Previous</a></li>
+                    <li ng-class="{disabled: prev_page_disabled}"><a href="javascript:void(0);" ng-click="pagination.first_page()"><i class="fa fa-angle-double-left"></i> First</a></li>
+                    <li ng-class="{disabled: prev_page_disabled}"><a href="javascript:void(0);" ng-click="pagination.prev_page()"><i class="fa fa-angle-left"></i> Previous</a></li>
 
-                  <li ng-class="{disabled: next_page_disabled}"><a href="javascript:void(0);" ng-click="pagination.next_page()">Next <i class="fa fa-angle-double-right"></i></a></li>
+                    <li ng-class="{disabled: next_page_disabled}"><a href="javascript:void(0);" ng-click="pagination.next_page()">Next <i class="fa fa-angle-right"></i></a></li>
+                    <li ng-class="{disabled: next_page_disabled}"><a href="javascript:void(0);" ng-click="pagination.last_page()">Last <i class="fa fa-angle-double-right"></i></a></li>
                 </ul>
             </div>
         </div>

From 148661443231ff8ccb8657b1070a4adeccc5e60b Mon Sep 17 00:00:00 2001
From: Julie Gallagher <julie.gallagher@covelogroup.com>
Date: Mon, 20 Apr 2015 16:26:32 -0700
Subject: [PATCH 04/22] issue #50 adding first and last buttons to lists

---
 seed/static/seed/partials/buildings_table.html       | 4 ++--
 seed/static/seed/partials/dataset_list.html          | 4 ++--
 seed/static/seed/partials/matching_detail.html       | 4 ++--
 seed/static/seed/partials/matching_detail_table.html | 4 ++--
 seed/static/seed/partials/matching_list_table.html   | 4 ++--
 5 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/seed/static/seed/partials/buildings_table.html b/seed/static/seed/partials/buildings_table.html
index f65fafcd41..4dfc801880 100644
--- a/seed/static/seed/partials/buildings_table.html
+++ b/seed/static/seed/partials/buildings_table.html
@@ -80,11 +80,11 @@
     </div>
     <div class="pager_container col-sm-5 col-md-5">
         <ul class="pager">
-            <li ng-class="{disabled: search.prev_page_disabled}"><a href="javascript:void(0);" ng-click="search.first_page()"><i class="fa fa-angle-double-left"></i> First</a></li>
+            <li ng-class="{disabled: search.prev_page_disabled}"><a href="javascript:void(0);" ng-click="search.first_page()"><i class="fa fa-angle-double-left"></i> First Record</a></li>
             <li ng-class="{disabled: search.prev_page_disabled}"><a href="javascript:void(0);" ng-click="search.prev_page()"><i class="fa fa-angle-left"></i> Previous</a></li>
 
             <li ng-class="{disabled: search.next_page_disabled}"><a href="javascript:void(0);" ng-click="search.next_page()">Next <i class="fa fa-angle-right"></i></a></li>
-            <li ng-class="{disabled: search.next_page_disabled}"><a href="javascript:void(0);" ng-click="search.last_page()">Last <i class="fa fa-angle-double-right"></i></a></li>
+            <li ng-class="{disabled: search.next_page_disabled}"><a href="javascript:void(0);" ng-click="search.last_page()">Last Record <i class="fa fa-angle-double-right"></i></a></li>
         </ul>
     </div>
 </div>
diff --git a/seed/static/seed/partials/dataset_list.html b/seed/static/seed/partials/dataset_list.html
index fb2a593a99..5bbad22f2e 100644
--- a/seed/static/seed/partials/dataset_list.html
+++ b/seed/static/seed/partials/dataset_list.html
@@ -59,10 +59,10 @@ <h1><i class="fa fa-sitemap"></i> {$ datasets.length | number:0 $} Data Sets</h1
 		            <div class="display_number_entries col-sm-3 col-md-3"></div>
 		            <div class="pager_container col-sm-5 col-md-5" ng-show="more_than_one_page()">
 		                <ul class="pager">
-							<li><a href="" ng-click="first_page()" ng-show="current_page != 1"><i class="fa fa-angle-double-left"></i> First</a></li>
+							<li><a href="" ng-click="first_page()" ng-show="current_page != 1"><i class="fa fa-angle-double-left"></i> First Record</a></li>
 							<li><a href="" ng-click="prev_page()" ng-show="current_page != 1"><i class="fa fa-angle-left"></i> Previous</a></li>
 							<li><a href="" ng-click="next_page()" ng-show="current_page != num_pages">Next <i class="fa fa-angle-right"></i></a></li>
-							<li><a href="" ng-click="last_page()" ng-show="current_page != num_pages">Last <i class="fa fa-angle-double-right"></i></a></li>
+							<li><a href="" ng-click="last_page()" ng-show="current_page != num_pages">Last Record <i class="fa fa-angle-double-right"></i></a></li>
 		                </ul>
 		            </div>
 		        </div>
diff --git a/seed/static/seed/partials/matching_detail.html b/seed/static/seed/partials/matching_detail.html
index d7162a9413..aec2f8880c 100644
--- a/seed/static/seed/partials/matching_detail.html
+++ b/seed/static/seed/partials/matching_detail.html
@@ -105,11 +105,11 @@ <h1>Matching ({$ import_file.file_name $})</h1>
             </div>
             <div class="pager_container col-sm-5 col-md-5" ng-hide="true">
                 <ul class="pager">
-                    <li ng-class="{disabled: prev_page_disabled}"><a ng-click="first_page()"><i class="fa fa-angle-double-left"></i> First</a></li>
+                    <li ng-class="{disabled: prev_page_disabled}"><a ng-click="first_page()"><i class="fa fa-angle-double-left"></i> First Record</a></li>
                     <li ng-class="{disabled: prev_page_disabled}"><a ng-click="prev_page()"><i class="fa fa-angle-left"></i> Previous</a></li>
 
                     <li ng-class="{disabled: next_page_disabled}"><a ng-click="next_page()">Next <i class="fa fa-angle-right"></i></a></li>
-                    <li ng-class="{disabled: next_page_disabled}"><a ng-click="last_page()">Last <i class="fa fa-angle-double-right"></i></a></li>
+                    <li ng-class="{disabled: next_page_disabled}"><a ng-click="last_page()">Last Record <i class="fa fa-angle-double-right"></i></a></li>
                 </ul>
             </div>
         </div>
diff --git a/seed/static/seed/partials/matching_detail_table.html b/seed/static/seed/partials/matching_detail_table.html
index 771fb9602a..f7c8465340 100644
--- a/seed/static/seed/partials/matching_detail_table.html
+++ b/seed/static/seed/partials/matching_detail_table.html
@@ -67,11 +67,11 @@
             </div>
             <div class="pager_container col-sm-5 col-md-5" ng-hide="false">
                 <ul class="pager">
-                    <li ng-class="{disabled: search.prev_page_disabled}"><a href="javascript:void(0);" ng-click="search.first_page()"><i class="fa fa-angle-double-left"></i> First</a></li>
+                    <li ng-class="{disabled: search.prev_page_disabled}"><a href="javascript:void(0);" ng-click="search.first_page()"><i class="fa fa-angle-double-left"></i> First Record</a></li>
                     <li ng-class="{disabled: search.prev_page_disabled}"><a href="javascript:void(0);" ng-click="search.prev_page()"><i class="fa fa-angle-left"></i> Previous</a></li>
 
                     <li ng-class="{disabled: search.next_page_disabled}"><a href="javascript:void(0);" ng-click="search.next_page()">Next <i class="fa fa-angle-right"></i></a></li>
-                    <li ng-class="{disabled: search.next_page_disabled}"><a href="javascript:void(0);" ng-click="search.last_page()">Last <i class="fa fa-angle-double-right"></i></a></li>
+                    <li ng-class="{disabled: search.next_page_disabled}"><a href="javascript:void(0);" ng-click="search.last_page()">Last Record <i class="fa fa-angle-double-right"></i></a></li>
                 </ul>
             </div>
         </div>
diff --git a/seed/static/seed/partials/matching_list_table.html b/seed/static/seed/partials/matching_list_table.html
index b13aa3cc56..9a09a69c74 100644
--- a/seed/static/seed/partials/matching_list_table.html
+++ b/seed/static/seed/partials/matching_list_table.html
@@ -130,11 +130,11 @@
             </div>
             <div class="pager_container col-sm-5 col-md-5">
                 <ul class="pager">
-                    <li ng-class="{disabled: prev_page_disabled}"><a href="javascript:void(0);" ng-click="pagination.first_page()"><i class="fa fa-angle-double-left"></i> First</a></li>
+                    <li ng-class="{disabled: prev_page_disabled}"><a href="javascript:void(0);" ng-click="pagination.first_page()"><i class="fa fa-angle-double-left"></i> First Record</a></li>
                     <li ng-class="{disabled: prev_page_disabled}"><a href="javascript:void(0);" ng-click="pagination.prev_page()"><i class="fa fa-angle-left"></i> Previous</a></li>
 
                     <li ng-class="{disabled: next_page_disabled}"><a href="javascript:void(0);" ng-click="pagination.next_page()">Next <i class="fa fa-angle-right"></i></a></li>
-                    <li ng-class="{disabled: next_page_disabled}"><a href="javascript:void(0);" ng-click="pagination.last_page()">Last <i class="fa fa-angle-double-right"></i></a></li>
+                    <li ng-class="{disabled: next_page_disabled}"><a href="javascript:void(0);" ng-click="pagination.last_page()">Last Record <i class="fa fa-angle-double-right"></i></a></li>
                 </ul>
             </div>
         </div>

From 3d4641da1cad6897ad06e4295ffe17b9c6a4beac Mon Sep 17 00:00:00 2001
From: Nicholas Serra <nicks@ydekproductions.com>
Date: Wed, 22 Apr 2015 18:52:59 -0400
Subject: [PATCH 05/22] Exact and empty matching on search fields.

---
 seed/search.py           |  26 ++++++---
 seed/tests/test_views.py | 114 +++++++++++++++++++++++++++++++++++++++
 2 files changed, 134 insertions(+), 6 deletions(-)

diff --git a/seed/search.py b/seed/search.py
index edd78eee5e..ed95383fd9 100644
--- a/seed/search.py
+++ b/seed/search.py
@@ -8,6 +8,7 @@
 # python
 import operator
 import json
+import re
 
 # django
 from django.db.models import Q
@@ -187,21 +188,34 @@ def is_column(k, columns):
         else:
             return False
 
-    query_dict = {}
+    # Build query as Q objects so we can AND and OR.
+    query_filters = Q()
     for k, v in other_params.iteritems():
         in_columns = is_column(k, db_columns)
-        if in_columns and k != 'q' and v is not None and v != '':
-            if ('__lt' in k or
+        if in_columns and k != 'q' and v is not None:
+
+            # Is this query a string?
+            is_string_query = isinstance(v, basestring)
+
+            # Is this query surrounded by matching quotes?
+            exact_match = re.match(r"""^(["'])(.+)\1$""", v) if is_string_query else False
+            empty_match = re.match(r"""^(["'])\1$""", v) if is_string_query else False
+
+            if exact_match:
+                query_filters &= Q(**{"%s__exact" % k: exact_match.group(2)})
+            elif empty_match:
+                query_filters &= Q(**{"%s__exact" % k: ''}) | Q(**{"%s__isnull" % k: True})
+            elif ('__lt' in k or
                 '__lte' in k or
                 '__gt' in k or
                 '__gte' in k or
                 '__isnull' in k or
                k == 'import_file_id' or k == 'source_type'):
-                query_dict["%s" % k] = v
+                query_filters &= Q(**{"%s" % k: v})
             else:
-                query_dict["%s__icontains" % k] = v
+                query_filters &= Q(**{"%s__icontains" % k: v})
 
-    queryset = queryset.filter(**query_dict)
+    queryset = queryset.filter(query_filters)
 
     # handle extra_data with json_query
     for k, v in other_params.iteritems():
diff --git a/seed/tests/test_views.py b/seed/tests/test_views.py
index 89c3093397..5b31ec366a 100644
--- a/seed/tests/test_views.py
+++ b/seed/tests/test_views.py
@@ -625,6 +625,120 @@ def test_search_filter_range(self):
         self.assertEqual(data['buildings'][1]['year_built'], 6)
         self.assertEqual(data['buildings'][2]['year_built'], 7)
 
+    def test_search_exact_match(self):
+        """
+        Tests search_buidlings method when called with an exact match.
+        """
+
+        # Uppercase address
+        cb1 = CanonicalBuilding(active=True)
+        cb1.save()
+        b1 = SEEDFactory.building_snapshot(
+            canonical_building=cb1,
+            address_line_1="Address"
+        )
+        cb1.canonical_snapshot = b1
+        cb1.save()
+        b1.super_organization = self.org
+        b1.save()
+
+        # Lowercase address
+        cb2 = CanonicalBuilding(active=True)
+        cb2.save()
+        b2 = SEEDFactory.building_snapshot(
+            canonical_building=cb2,
+            address_line_1="address"
+        )
+        cb2.canonical_snapshot = b2
+        cb2.save()
+        b2.super_organization = self.org
+        b2.save()
+
+        url = reverse_lazy("seed:search_buildings")
+        post_data = {
+            'filter_params': {
+                'address_line_1': '"Address"'
+            },
+            'number_per_page': 10,
+            'order_by': '',
+            'page': 1,
+            'q': '',
+            'sort_reverse': False,
+            'project_id': None,
+        }
+
+        # act
+        response = self.client.post(
+            url,
+            content_type='application/json',
+            data=json.dumps(post_data)
+        )
+        json_string = response.content
+        data = json.loads(json_string)
+
+        # assert
+        self.assertEqual(data['status'], 'success')
+        self.assertEqual(data['number_matching_search'], 1)
+        self.assertEqual(len(data['buildings']), 1)
+        self.assertEqual(data['buildings'][0]['address_line_1'], 'Address')
+
+    def test_search_empty_column(self):
+        """
+        Tests search_buidlings method when called with an empty column query.
+        """
+
+        # Empty column
+        cb1 = CanonicalBuilding(active=True)
+        cb1.save()
+        b1 = SEEDFactory.building_snapshot(
+            canonical_building=cb1,
+            address_line_1=""
+        )
+        cb1.canonical_snapshot = b1
+        cb1.save()
+        b1.super_organization = self.org
+        b1.save()
+
+        # Populated column
+        cb2 = CanonicalBuilding(active=True)
+        cb2.save()
+        b2 = SEEDFactory.building_snapshot(
+            canonical_building=cb2,
+            address_line_1="Address"
+        )
+        cb2.canonical_snapshot = b2
+        cb2.save()
+        b2.super_organization = self.org
+        b2.save()
+
+        url = reverse_lazy("seed:search_buildings")
+        post_data = {
+            'filter_params': {
+                'address_line_1': '""'
+            },
+            'number_per_page': 10,
+            'order_by': '',
+            'page': 1,
+            'q': '',
+            'sort_reverse': False,
+            'project_id': None,
+        }
+
+        # act
+        response = self.client.post(
+            url,
+            content_type='application/json',
+            data=json.dumps(post_data)
+        )
+        json_string = response.content
+        data = json.loads(json_string)
+
+        # assert
+        self.assertEqual(data['status'], 'success')
+        self.assertEqual(data['number_matching_search'], 1)
+        self.assertEqual(len(data['buildings']), 1)
+        self.assertEqual(data['buildings'][0]['address_line_1'], '')
+        self.assertEqual(data['buildings'][0]['pk'], b1.pk)
 
     def test_apply_label_to_project_buildings(self):
         """

From 98a7a758aa5b4277daecea47de69e2b02023855f Mon Sep 17 00:00:00 2001
From: Nicholas Long <nicholas.long@nrel.gov>
Date: Fri, 24 Apr 2015 16:16:56 -0600
Subject: [PATCH 06/22] cleanup osx instructions

---
 README-osx.md | 60 +++++++++++++++++++++++++++++++++------------------
 1 file changed, 39 insertions(+), 21 deletions(-)

diff --git a/README-osx.md b/README-osx.md
index 64cd1367cd..51ef1e0e30 100644
--- a/README-osx.md
+++ b/README-osx.md
@@ -4,18 +4,27 @@ These instructions are for installing and running SEED on Mac OSX in development
 
 ## Prerequisites
 
-These instructions assume you have/use [Macports](https://www.macports.org/).
+These instructions assume you have/use [Macports](https://www.macports.org/). The workflow has been testing with homebrew as well, but is not directly supported. You system should have the following dependencies already installed:
 
-Although you _could_ install Python packages globally, the easiest way to install Python packages is with [virtualenv](https://virtualenv.pypa.io/en/latest/) and [virtualenvwrapper](https://virtualenvwrapper.readthedocs.org/en/latest/). Setting these up first will help avoid polluting your base Python installation and make it much easier to switch between different versions of the code.
+* git (`port install git` or `brew install git`)
+* Mercurial (`port install hg` or `brew install mercurial`)
 
-Once you have these installed, creating and entering a new virtualenv called "``seed``" for SEED development is as easy as:
+(Recommended)
 
-    mkvirtualenv --python=python2.7 seed
-    
+* [virtualenv](https://virtualenv.pypa.io/en/latest/) and [virtualenvwrapper](https://virtualenvwrapper.readthedocs.org/en/latest/).
+    * Although you _could_ install Python packages globally, this is the easiest way to install Python packages. Setting these up first will help avoid polluting your base Python installation and make it much easier to switch between different versions of the code.
+
+        pip install virtualenv
+        pip install virtualenvwrapper
+
+    * Follow instructions on [virtualenvwrapper](https://virtualenvwrapper.readthedocs.org/en/latest/) to setup your environment.
+    * Once you have these installed, creating and entering a new virtualenv called "``seed``" for SEED development is as easy as:
+
+        mkvirtualenv --python=python2.7 seed
 
 ## Install PostgreSQL 9.4
 
-Perform the following commands as 'root'
+Perform the following commands as 'root' if using port
 
     sudo su - root
     
@@ -25,7 +34,12 @@ Install Postgres 9.4
     # init db
     mkdir -p /opt/local/var/db/postgresql94/defaultdb
     chown postgres:postgres /opt/local/var/db/postgresql94/defaultdb
-    
+
+    # homebrew
+    brew install postgres
+    # follow the post install instructions to add to launchagents or call manually with `postgres -D /usr/local/var/postgres`
+    # Skip the remaining Postgres instructions
+
 Finish initializing the DB
 
     sudo su postgres - c '/opt/local/lib/postgresql94/bin/initdb -D /opt/local/var/db/postgresql94/defaultdb'
@@ -44,11 +58,10 @@ Start Postgres
   
 Switch to postgres user
 
-      sudo su - postgres
-      PATH=$PATH:/opt/local/lib/postgresql94/bin/
+    sudo su - postgres
+    PATH=$PATH:/opt/local/lib/postgresql94/bin/
       
-Configure Postgresql. Replace 'seeddb', 'seeduser' with desired db/user.
-seedpass
+Configure PostgreSQL. Replace 'seeddb', 'seeduser' with desired db/user. By default use password `seedpass` when prompted
 
     createdb seeddb
     createuser -P seeduser
@@ -60,13 +73,15 @@ Now exit any root environments, becoming just yourself (even though it's not tha
 
 Run these commands as your normal user id.
 
-Change to a virtualenv (using virtualenvwrapper) or do the following as a superuser. A virtualenv is usually better for development.
+Change to a virtualenv (using virtualenvwrapper) or do the following as a superuser. A virtualenv is usually better for development. Set the virtualenv to seed.
 
-Make sure PostgreSQL command line scripts are in your PATH
+    workon seed
+
+Make sure PostgreSQL command line scripts are in your PATH (if using port)
 
     export PATH=$PATH:/opt/local/lib/postgresql94/bin
-    
-Install requirements with `pip`
+
+Install requirements with `pip`.
 
     pip install -r requirements.txt
     
@@ -80,13 +95,11 @@ Install library with `setup.py`
 
 First, install [npm](https://www.npmjs.com/) if you haven't already. You can do this by installing from [nodejs.org](http://nodejs.org/), or use Macports:
 
+    # port
     sudo port install npm
 
-### Install libraries
-
-Then run, from the top-level, a script to install the JS libraries:
-
-    ./bin/install_javascript_dependencies.sh
+    # homebrew
+    brew install npm
 
 ## Configure Django and its back-end DBs
 
@@ -145,7 +158,7 @@ If you want to do any API testing (and of course you do!), you will
 need to add an API KEY for this user.
 You can do this in postgresql directly:
 
-    psql94 seeddb seeduser
+    psql seeddb seeduser
     seeddb=> update landing_seeduser set api_key='DEADBEEF' where id=1;
 
 The 'secret' key DEADBEEF is hard-coded into the test scripts.
@@ -154,8 +167,13 @@ The 'secret' key DEADBEEF is hard-coded into the test scripts.
 
 You need to manually install Redis for Celery to work.
 
+    # port
     sudo port install redis
 
+    # homebrew
+    brew install redis
+    # follow the post install instructions to add to launchagents or call manually with `redis-server`
+
 ### Install Javascript dependencies
 
 The JS dependencies are installed using node.js package management (npm), with

From 11632c728595c0f087f278a88fea737d31c33b37 Mon Sep 17 00:00:00 2001
From: Alex Swindler <Alex.Swindler@nrel.gov>
Date: Wed, 29 Apr 2015 00:17:36 -0600
Subject: [PATCH 07/22] Adding error handling for specific failures

---
 .../js/controllers/data_upload_modal_ctrl.js  |  4 ++-
 .../controllers/dataset_detail_controller.js  |  2 +-
 .../seed/js/controllers/menu_controller.js    |  2 +-
 .../seed/partials/data_upload_modal.html      |  2 +-
 seed/static/seed/partials/dataset_detail.html |  6 ++--
 seed/tasks.py                                 | 30 ++++++++++++++-----
 6 files changed, 31 insertions(+), 15 deletions(-)

diff --git a/seed/static/seed/js/controllers/data_upload_modal_ctrl.js b/seed/static/seed/js/controllers/data_upload_modal_ctrl.js
index 4297efb272..45ab734dd6 100644
--- a/seed/static/seed/js/controllers/data_upload_modal_ctrl.js
+++ b/seed/static/seed/js/controllers/data_upload_modal_ctrl.js
@@ -25,6 +25,7 @@ angular.module('BE.seed.controller.data_upload_modal', [])
 .controller('data_upload_modal_ctrl', [
   '$scope',
   '$modalInstance',
+  '$log',
   'step',
   'dataset',
   '$timeout',
@@ -36,6 +37,7 @@ angular.module('BE.seed.controller.data_upload_modal', [])
   function (
     $scope,
     $modalInstance,
+    $log,
     step,
     dataset,
     $timeout,
@@ -275,7 +277,7 @@ angular.module('BE.seed.controller.data_upload_modal', [])
             }, $scope.uploader);
         }, function(data){
             $scope.step_12_error_message = data.message;
-            console.error($scope.step_12_error_message);
+            $log.error(data.stacktrace);
             $scope.step.number = 12;
         });
     };
diff --git a/seed/static/seed/js/controllers/dataset_detail_controller.js b/seed/static/seed/js/controllers/dataset_detail_controller.js
index 0fbee7d83d..3b339e1743 100644
--- a/seed/static/seed/js/controllers/dataset_detail_controller.js
+++ b/seed/static/seed/js/controllers/dataset_detail_controller.js
@@ -12,7 +12,7 @@ angular.module('BE.seed.controller.dataset_detail', [])
   function ($scope, dataset_payload, $log, dataset_service, $modal, urls) {
     $scope.dataset = dataset_payload.dataset;
 
-    $log.info({dataset_payload: dataset_payload});
+    $log.info('dataset_payload:', dataset_payload);
 
     $scope.confirm_delete = function (file) {
         var yes = confirm("Are you sure you want to PERMANENTLY delete '" + file.name + "'?");
diff --git a/seed/static/seed/js/controllers/menu_controller.js b/seed/static/seed/js/controllers/menu_controller.js
index 4032dd22fb..5836e6f77e 100644
--- a/seed/static/seed/js/controllers/menu_controller.js
+++ b/seed/static/seed/js/controllers/menu_controller.js
@@ -63,7 +63,7 @@ angular.module('BE.seed.controller.menu', [])
     });
     $scope.$on("$routeChangeStart", function($event, next, current) {
         $scope.menu.loading = next.controller === "mapping_controller";
-    })
+    });
     $scope.$on("$routeChangeSuccess", function() {
         $scope.menu.loading = false;
         $scope.menu.route_load_error = false;
diff --git a/seed/static/seed/partials/data_upload_modal.html b/seed/static/seed/partials/data_upload_modal.html
index 5cedd2477a..eb771dabeb 100644
--- a/seed/static/seed/partials/data_upload_modal.html
+++ b/seed/static/seed/partials/data_upload_modal.html
@@ -158,7 +158,7 @@ <h4 class="modal-title" ng-switch-when="12">Error Processing Data</h4>
 		    <div class="col-lg-12 col-sm-12">
 		    	<div>
 		    		<p>An error occurred while processing the file. Please ensure that your file meets the required specifications.</p>
-		    		<pre class="pre-scrollable" ng-show="step_12_error_message">{$ step_12_error_message $}</pre>
+		    		<pre ng-class="{'pre-scrollable': step_12_error_message.length >= 300}" ng-show="step_12_error_message">{$ step_12_error_message $}</pre>
 		    	</div>
 		    </div>
 	    </div>
diff --git a/seed/static/seed/partials/dataset_detail.html b/seed/static/seed/partials/dataset_detail.html
index f7c2d42cb1..fdcdc58483 100644
--- a/seed/static/seed/partials/dataset_detail.html
+++ b/seed/static/seed/partials/dataset_detail.html
@@ -33,9 +33,9 @@ <h1>{$ dataset.name $}</h1>
                                 <td>    
                                     <a href="javascript:void(0);" class="delete_link" ng-click="confirm_delete(f)"><i class="fa fa-trash-o"></i></a>
                                 </td>
-                                <td class="is_aligned_right">{$ f.num_rows $}</td>                                
-                                <td><a role="button" class="btn btn-sm btn-primary" ng-href="#/data/mapping/{$ f.id $}">{$ f.number_of_mappings $} Data Mapping</a></td>
-                                <td><a role="button" class="btn btn-sm btn-primary" ng-href="#/data/matching/{$ f.id $}">{$ f.number_of_matchings $} Data Matching</a></td>
+                                <td class="is_aligned_right">{$ f.num_rows || 0 $}</td>
+                                <td><a role="button" class="btn btn-sm btn-primary" ng-href="#/data/mapping/{$ f.id $}" ng-disabled="!f.num_rows">{$ f.number_of_mappings $} Data Mapping</a></td>
+                                <td><a role="button" class="btn btn-sm btn-primary" ng-href="#/data/matching/{$ f.id $}" ng-disabled="!f.num_rows">{$ f.number_of_matchings $} Data Matching</a></td>
                             </tr>
                         </tbody>
                     </table>
diff --git a/seed/tasks.py b/seed/tasks.py
index 4f6bc240e7..7a86c84011 100644
--- a/seed/tasks.py
+++ b/seed/tasks.py
@@ -10,6 +10,8 @@
 import os
 import traceback
 
+from _csv import Error
+
 from django.core.mail import send_mail
 from django.conf import settings
 from django.utils.http import urlsafe_base64_encode
@@ -702,8 +704,7 @@ def _save_raw_green_button_data(file_pk, *args, **kwargs):
 @lock_and_track
 def _save_raw_data(file_pk, *args, **kwargs):
     """Chunk up the CSV and save data into the DB raw."""
-    status = ''
-    error_msg = ''
+    status = error_msg = stacktrace = None
     try:
         import_file = ImportFile.objects.get(pk=file_pk)
 
@@ -736,23 +737,36 @@ def _save_raw_data(file_pk, *args, **kwargs):
 
         status = 'success'
     except StopIteration:
-        error_msg = traceback.format_exc()
+        error_msg = 'StopIteration Exception'
+        stacktrace = traceback.format_exc()
+        status = 'error'
+    except Error as e:
+        error_msg = 'CSV Error: ' + e.message
+        stacktrace = traceback.format_exc()
+        logger.info(error_msg)
+        status = 'error'
+    except KeyError as e:
+        error_msg = 'Invalid Column Name: "' + e.message + '"'
+        stacktrace = traceback.format_exc()
+        logger.info(error_msg)
+        status = 'error'
+    except Exception as e:
+        error_msg = 'Unhandled Error: ' + e.message
+        stacktrace = traceback.format_exc()
+        logger.info(error_msg)
         status = 'error'
 
     if status == 'success':
         return {'status': status}
     else:
-        return {'status': status, 'message': error_msg}
+        return {'status': status, 'message': error_msg, 'stacktrace': stacktrace}
 
 
 @task
 @lock_and_track
 def save_raw_data(file_pk, *args, **kwargs):
     response = _save_raw_data.delay(file_pk, *args, **kwargs)
-    if response.result['status'] == 'success':
-        return {'status': response.result['status']}
-    else:
-        return {'status': response.result['status'], 'message': response.result['message']}
+    return response.result
 
 
 def _stringify(values):

From c4c190a83cf555a2dde26e0270538224843f566e Mon Sep 17 00:00:00 2001
From: Nicholas Serra <nicks@ydekproductions.com>
Date: Wed, 29 Apr 2015 13:00:58 -0400
Subject: [PATCH 08/22] Save building sort column and order in sessionStorage

---
 .../js/controllers/building_list_controller.js |  1 +
 seed/static/seed/js/seed.js                    | 10 +++++++++-
 seed/static/seed/js/services/search_service.js | 18 ++++++++++++++++++
 3 files changed, 28 insertions(+), 1 deletion(-)

diff --git a/seed/static/seed/js/controllers/building_list_controller.js b/seed/static/seed/js/controllers/building_list_controller.js
index f9e2ef4e86..e30e33ecec 100644
--- a/seed/static/seed/js/controllers/building_list_controller.js
+++ b/seed/static/seed/js/controllers/building_list_controller.js
@@ -66,6 +66,7 @@ angular.module('BE.seed.controller.building_list', [])
      */
     var get_columns = function() {
         $scope.assessor_fields = all_columns.fields;
+        $scope.search.init_storage();
         $scope.columns = $scope.search.generate_columns(
             all_columns.fields,
             default_columns.columns,
diff --git a/seed/static/seed/js/seed.js b/seed/static/seed/js/seed.js
index d8399b288a..27e0c37b79 100644
--- a/seed/static/seed/js/seed.js
+++ b/seed/static/seed/js/seed.js
@@ -256,8 +256,16 @@ SEED_app.config(['$routeProvider', function ($routeProvider) {
                 'search_payload': ['building_services', '$route', function(building_services, $route){
                     var params = $route.current.params;
                     var q = params.q || "";
+
+                    // Check session storage for order and sort values.
+                    var orderBy = (typeof(Storage) !== "undefined" && sessionStorage.getItem('seedBuildingOrderBy') !== null) ?
+                        sessionStorage.getItem('seedBuildingOrderBy') : "";
+
+                    var sortReverse = (typeof(Storage) !== "undefined" && sessionStorage.getItem('seedBuildingSortReverse') !== null) ?
+                        JSON.parse(sessionStorage.getItem('seedBuildingSortReverse')) : false;
+
                     // params: (query, number_per_page, page_number, order_by, sort_reverse, other_params, project_id)
-                    return building_services.search_buildings(q, 10, 1, "", false, params, null);
+                    return building_services.search_buildings(q, 10, 1, orderBy, sortReverse, params, null);
                 }],
                 'default_columns': ['user_service', function(user_service){
                     return user_service.get_default_columns();
diff --git a/seed/static/seed/js/services/search_service.js b/seed/static/seed/js/services/search_service.js
index 8f1c56e15f..91f263b850 100644
--- a/seed/static/seed/js/services/search_service.js
+++ b/seed/static/seed/js/services/search_service.js
@@ -78,6 +78,18 @@ angular.module('BE.seed.service.search', [])
      * functions
      */
 
+    search_service.init_storage = function () {
+        // Check session storage for order and sort values.
+        if (typeof(Storage) !== "undefined" && sessionStorage.getItem('seedBuildingOrderBy') !== null) {
+            saas.order_by = sessionStorage.getItem('seedBuildingOrderBy');
+            saas.sort_column = sessionStorage.getItem('seedBuildingOrderBy');
+        }
+
+        if (typeof(Storage) !== "undefined" && sessionStorage.getItem('seedBuildingSortReverse') !== null) {
+            saas.sort_reverse = JSON.parse(sessionStorage.getItem('seedBuildingSortReverse'));
+        }
+    };
+
     /**
      * sanitize_params: removes filter params with null or undefined values
      */
@@ -306,6 +318,12 @@ angular.module('BE.seed.service.search', [])
                     saas.sort_column = this.sort_column;
                 }
             }
+
+            if (typeof(Storage) !== "undefined") {
+                sessionStorage.setItem('seedBuildingOrderBy', saas.sort_column);
+                sessionStorage.setItem('seedBuildingSortReverse', saas.sort_reverse);
+            }
+
             saas.order_by = this.sort_column;
             saas.current_page = 1;
             saas.search_buildings();

From dd29b2a7c6c46eff055e05df80cb4d0f2427cc62 Mon Sep 17 00:00:00 2001
From: Alex Swindler <Alex.Swindler@nrel.gov>
Date: Thu, 30 Apr 2015 09:52:59 -0600
Subject: [PATCH 09/22] Fixing mixed tabs and spaces

---
 seed/static/seed/css/mapping.css              |   6 +-
 seed/static/seed/partials/about.html          |   4 +-
 seed/static/seed/partials/accounts.html       |  72 ++---
 seed/static/seed/partials/add_project.html    |  12 +-
 .../seed/partials/building_area_section.html  |   6 +-
 .../seed/partials/building_audit_log.html     |  16 +-
 .../partials/building_contacts_section.html   |   6 +-
 .../partials/building_detail_section.html     |   6 +-
 .../partials/building_energy_section.html     |   6 +-
 .../partials/building_projects_section.html   |   6 +-
 seed/static/seed/partials/buildings.html      | 200 +++++++-------
 .../seed/partials/buildings_settings.html     |  76 +++---
 seed/static/seed/partials/concat_modal.html   |   2 +-
 .../partials/create_organization_modal.html   |  62 ++---
 .../seed/partials/data_upload_modal.html      | 252 +++++++++---------
 seed/static/seed/partials/dataset_list.html   |  94 +++----
 .../seed/partials/existing_members_modal.html | 108 ++++----
 seed/static/seed/partials/export_modal.html   |  62 ++---
 seed/static/seed/partials/feedback.html       |  28 +-
 seed/static/seed/partials/home.html           | 136 +++++-----
 seed/static/seed/partials/mapping.html        |   4 +-
 seed/static/seed/partials/matching.html       |  76 +++---
 .../static/seed/partials/matching_detail.html |  64 ++---
 .../seed/partials/matching_detail_table.html  |   4 +-
 .../seed/partials/matching_list_table.html    |  34 +--
 seed/static/seed/partials/members.html        |  18 +-
 .../seed/partials/new_member_modal.html       |  72 ++---
 .../seed/partials/new_project_modal.html      |  12 +-
 seed/static/seed/partials/project_detail.html | 158 +++++------
 .../seed/partials/project_settings.html       |  62 ++---
 seed/static/seed/partials/projects.html       |  12 +-
 seed/static/seed/partials/settings.html       |  42 +--
 seed/static/seed/partials/sharing.html        |  85 +++---
 seed/static/seed/partials/sub_org.html        |   6 +-
 seed/tests/test_matching.py                   |  12 +-
 35 files changed, 911 insertions(+), 910 deletions(-)

diff --git a/seed/static/seed/css/mapping.css b/seed/static/seed/css/mapping.css
index c586218d56..7c41a9634f 100644
--- a/seed/static/seed/css/mapping.css
+++ b/seed/static/seed/css/mapping.css
@@ -7,9 +7,9 @@
     margin: 10px;
 }
 .fa-arrows {
-	   padding-right: 7px;
-	   color: #444;
-   }
+    padding-right: 7px;
+    color: #444;
+}
 .tree-handle {
     padding: 10px;
     background: #428bca;
diff --git a/seed/static/seed/partials/about.html b/seed/static/seed/partials/about.html
index 8687301246..b0aefb9d10 100644
--- a/seed/static/seed/partials/about.html
+++ b/seed/static/seed/partials/about.html
@@ -24,8 +24,8 @@ <h2>Development Team:</h2>
           <p>Funding from: <a href="http://energy.gov/eere/buildings/standard-energy-efficiency-data-platform">U.S. Department of Energy</a></p>                                                                                                                                
           <p>Software developer: <a href="http://www.buildingenergy.com/">Building Energy</a></p>                                                                                                                                                                               
 
-	  <h3>Version</h3>
-	  <p>1.1.4</p>
+          <h3>Version</h3>
+          <p>1.1.4</p>
 
         </div>
       </div>
diff --git a/seed/static/seed/partials/accounts.html b/seed/static/seed/partials/accounts.html
index 0e37c1304e..ed82d56a97 100644
--- a/seed/static/seed/partials/accounts.html
+++ b/seed/static/seed/partials/accounts.html
@@ -12,29 +12,29 @@ <h1>Organizations</h1>
     </div>
 </div>
 <div class="section">
-	<div class="section_header_container" ng-if="NEEDS_IMPLEMENTATION">
+    <div class="section_header_container" ng-if="NEEDS_IMPLEMENTATION">
         <div class="section_header">
             <h2><i class="fa fa-users"></i> Pending Organization Invites</h2>
         </div>
     </div>
     <div class="section_content_container" ng-if="NEEDS_IMPLEMENTATION">
         <div class="section_content">
-        	<div class="table_list_container">
+            <div class="table_list_container">
                 <table class="table table-striped table_highlight_first">
-                	<thead>
+                    <thead>
                         <tr>
                             <th class="account_pending left">Name of Pending Organization</th>
                             <th class="account_pending right"></th>
                         </tr>
-                	</thead>
-                	<tbody>
-                		<tr>
-	                		<td class="account_pending left">Julie Daily (<strong>Owner</strong>) would like to add you in the role of <strong>Member</strong> to this organization.</td>
-	                		<td class="account_pending right" style="text-align:right;"><a class="btn btn-primary" href="">Accept</a> <a class="btn btn-default" href="">Reject</a>
-                		</tr>
-                	</tbody>
+                    </thead>
+                    <tbody>
+                        <tr>
+                            <td class="account_pending left">Julie Daily (<strong>Owner</strong>) would like to add you in the role of <strong>Member</strong> to this organization.</td>
+                            <td class="account_pending right" style="text-align:right;"><a class="btn btn-primary" href="">Accept</a> <a class="btn btn-default" href="">Reject</a>
+                        </tr>
+                    </tbody>
                 </table>
-        	</div>
+            </div>
         </div>
     </div>
     <div class="section_header_container" ng-show="orgs_I_own.length > 0">
@@ -44,32 +44,32 @@ <h2><i class="fa fa-users"></i> Organizations I Manage</h2>
     </div>
     <div class="section_content_container" ng-show="orgs_I_own.length > 0">
         <div class="section_content">
-        	<div class="table_list_container">
+            <div class="table_list_container">
                 <table class="table table-striped table_highlight_first" ng-repeat="org in orgs_I_own">
-                	<thead>
+                    <thead>
                         <tr>
                             <th colspan="2">Organization</th>
                             <!-- <th>Org Level</th> -->
                         </tr>
-                	</thead>
-                	<tbody>
-                		<tr>
-	                		<td class="account_org parent_org"><a ng-href="#/accounts/{$ org.id $}/members">{$ org.name $}</td>
-	                		<td class="account_org right">
+                    </thead>
+                    <tbody>
+                        <tr>
+                            <td class="account_org parent_org"><a ng-href="#/accounts/{$ org.id $}/members">{$ org.name $}</td>
+                            <td class="account_org right">
                                 <a href="#/accounts/{$ org.id $}"><i class="fa fa-cogs"></i>Settings</a> <a href="#/accounts/{$ org.id $}/sharing" ng-show="org.is_parent"><i class="fa fa-share-square-o"></i>Sharing</a><a href="#/accounts/{$ org.id $}/sub_org" ng-show="org.is_parent"><i class="fa fa-users"></i>Sub-Organizations</a> <a href="#/accounts/{$ org.id $}/members"><i class="fa fa-user"></i>Members</a> <a href="" ng-if="false"><i class="fa fa-times"></i>Remove</a> <i class="fa fa-cog"></i>
                             </td>
-                		</tr>
-                		<tr ng-show="org.is_parent">
+                        </tr>
+                        <tr ng-show="org.is_parent">
                             <th class="sub_head sub_org">Sub-Organizations</th>
                             <th class="sub_head sub_org right"><a href="javascript:void(0);" ng-click="create_organization_modal(org)"><i class="fa fa-plus"></i>Create new sub-organization</a> <i class="fa fa-cog"></i></th>
                         </tr>
-                		<tr ng-repeat="sub_org in org.sub_orgs">
-	                		<td class="account_org left"><a ng-href="#/accounts/{$ sub_org.id $}/members">{$ sub_org.name $}</td>
-	                		<td class="account_org right"><a ng-href="#/accounts/{$ sub_org.id $}/members"><i class="fa fa-user"></i>Members</a> <a href="javascript:void(0);" ng-click="remove_sub_org(sub_org)" ng-if="false"><i class="fa fa-times"></i>Remove</a> <i class="fa fa-cog"></i></td>
-                		</tr>
-                	</tbody>
+                        <tr ng-repeat="sub_org in org.sub_orgs">
+                            <td class="account_org left"><a ng-href="#/accounts/{$ sub_org.id $}/members">{$ sub_org.name $}</td>
+                            <td class="account_org right"><a ng-href="#/accounts/{$ sub_org.id $}/members"><i class="fa fa-user"></i>Members</a> <a href="javascript:void(0);" ng-click="remove_sub_org(sub_org)" ng-if="false"><i class="fa fa-times"></i>Remove</a> <i class="fa fa-cog"></i></td>
+                        </tr>
+                    </tbody>
                 </table>
-        	</div>
+            </div>
         </div>
     </div>
     <div class="section_header_container">
@@ -79,33 +79,33 @@ <h2><i class="fa fa-users"></i> Organizations I Belong To</h2>
     </div>
     <div class="section_content_container">
         <div class="section_content">
-        	<div class="table_list_container">
+            <div class="table_list_container">
                 <table class="table table-striped table_highlight_first">
-                	<thead>
+                    <thead>
                         <tr>
                             <th>Organization Name</th>
                             <th>Number of Buildings</th>
                             <th>Your Role</th>
                             <th>Organization Owner(s)</th>
                         </tr>
-                	</thead>
-                	<tbody>
+                    </thead>
+                    <tbody>
                         <tr ng-repeat="org in orgs">
-	                		<td class="align_to_top">
+                            <td class="align_to_top">
                                 <a ng-href="#/accounts/{$ org.id $}/members" ng-if="org.user_role !== 'viewer'">{$ org.name $}</a>
                                 <span ng-if="org.user_role === 'viewer'">{$ org.name $}</span>
                             </td>
                             <td class="align_to_top">
                                 <span>{$ org.num_buildings $}</span>
                             </td>
-	                		<td class="align_to_top">{$ org.user_role || "-" $}</td>
-	                		<td>
+                            <td class="align_to_top">{$ org.user_role || "-" $}</td>
+                            <td>
                                 <span ng-repeat="owner in org.owners">{$ owner.first_name $} {$ owner.last_name $}<br /></span>
                             </td>
-                		</tr>
-                	</tbody>
+                        </tr>
+                    </tbody>
                 </table>
-        	</div>
+            </div>
         </div>
     </div>
 </div>
diff --git a/seed/static/seed/partials/add_project.html b/seed/static/seed/partials/add_project.html
index 966827856c..c7a366fe2a 100644
--- a/seed/static/seed/partials/add_project.html
+++ b/seed/static/seed/partials/add_project.html
@@ -13,12 +13,12 @@ <h1>Create a New Project</h1>
 </div>
 
 <div class="section">
-	<div class="alert_container" ng-show="alert_error">
-		<div class="alert alert-danger">
-        	<button type="button" class="close" ng-click="alert_error = false">&times;</button>
-        	Sorry. The project name <strong>{$ project.name $}</strong> is already in use.
-	    </div>
-	</div>
+    <div class="alert_container" ng-show="alert_error">
+        <div class="alert alert-danger">
+            <button type="button" class="close" ng-click="alert_error = false">&times;</button>
+            Sorry. The project name <strong>{$ project.name $}</strong> is already in use.
+        </div>
+    </div>
     <form novalidate name="project_form" class="form-horizontal" role="form">
         <div class="section_header_container">
             <div class="section_header">
diff --git a/seed/static/seed/partials/building_area_section.html b/seed/static/seed/partials/building_area_section.html
index 9ca30a2b93..c636462c3f 100644
--- a/seed/static/seed/partials/building_area_section.html
+++ b/seed/static/seed/partials/building_area_section.html
@@ -2,14 +2,14 @@
     <div class="section_header_container">
         <div class="section_header fixed_height_short has_no_padding">
             <div class="section_action_container left">
-            	<h2><i class="fa fa-th-large"></i> Area</h2>
+                <h2><i class="fa fa-th-large"></i> Area</h2>
             </div>
             <div class="section_action_container right" ng-hide="building.edit_form_showing">
                 <a href="javascript:void(0);" ng-click="building.edit_form_showing = true; save_building_state()" ng-show="user_role !== 'viewer'" ><i class="fa fa-pencil"></i> Edit</a>
             </div>
             <div class="section_action_container right section_action_btn" ng-show="building.edit_form_showing">
-            	<a roll="button" class="btn btn-default btn-sm" href="javascript:void(0);" ng-click="building.edit_form_showing = false; restore_building()">Cancel</a>
-				<a roll="button" class="btn btn-primary btn-sm" href="javascript:void(0);" ng-click="building.edit_form_showing = false; save_building()">Save Changes</a>
+                <a roll="button" class="btn btn-default btn-sm" href="javascript:void(0);" ng-click="building.edit_form_showing = false; restore_building()">Cancel</a>
+                <a roll="button" class="btn btn-primary btn-sm" href="javascript:void(0);" ng-click="building.edit_form_showing = false; save_building()">Save Changes</a>
             </div>
         </div>
     </div>
diff --git a/seed/static/seed/partials/building_audit_log.html b/seed/static/seed/partials/building_audit_log.html
index de20a356e1..20c5bbce19 100644
--- a/seed/static/seed/partials/building_audit_log.html
+++ b/seed/static/seed/partials/building_audit_log.html
@@ -2,14 +2,14 @@
     <div class="section_header_container">
         <div class="section_header fixed_height_short has_no_padding">
             <div class="section_action_container left">
-            	<h2><i class="fa fa-list-ul"></i> Audit Log &amp; Notes </h2>
+                <h2><i class="fa fa-list-ul"></i> Audit Log &amp; Notes </h2>
             </div>
             <div class="section_action_container right" ng-hide="building.edit_form_showing">
                 <a href="javascript:void(0);" ng-click="open_create_note_modal()" ng-show="user_role !== 'viewer'"><i class="fa fa-comment"></i> Add a note</a>
             </div>
             <div class="section_action_container right section_action_btn" ng-show="building.edit_form_showing">
-            	<a roll="button" class="btn btn-default btn-sm" href="javascript:void(0);" ng-click="building.edit_form_showing = false; restore_building()">Cancel</a>
-				<a roll="button" class="btn btn-primary btn-sm" href="javascript:void(0);" ng-click="building.edit_form_showing = false; save_building()">Save Changes</a>
+                <a roll="button" class="btn btn-default btn-sm" href="javascript:void(0);" ng-click="building.edit_form_showing = false; restore_building()">Cancel</a>
+                <a roll="button" class="btn btn-primary btn-sm" href="javascript:void(0);" ng-click="building.edit_form_showing = false; save_building()">Save Changes</a>
             </div>
         </div>
     </div>
@@ -25,12 +25,12 @@ <h2><i class="fa fa-list-ul"></i> Audit Log &amp; Notes </h2>
                         </tr>
                     </thead>
                     <tbody>
-	                    <tr ng-repeat="entry in audit_logs">
-	                        <td class="align_to_top has_no_min_width">{$ entry.user.first_name $} {$ entry.user.last_name $}</td>
+                        <tr ng-repeat="entry in audit_logs">
+                            <td class="align_to_top has_no_min_width">{$ entry.user.first_name $} {$ entry.user.last_name $}</td>
                             <td class="align_to_top" ng-if="entry.audit_type == 'Log'">{$ entry.action_note || entry.action $}</td>
-	                        <td class="align_to_top whitespace note" ng-if="entry.audit_type == 'Note'"><label class="label label-info"><i class="fa fa-comment"></i> note</label> {$ entry.action_note $}  <a href="javascript:void(0);" class="note_edit pull-right" ng-click="open_create_note_modal(entry)" ng-show="user_role !== 'viewer'" ng-if="entry.audit_type == 'Note'">edit</a></td>
-	                        <td class="align_to_top">{$ entry.created | date:"MM/dd/yyyy 'at' h:mma" $}</td>
-	                    </tr>
+                            <td class="align_to_top whitespace note" ng-if="entry.audit_type == 'Note'"><label class="label label-info"><i class="fa fa-comment"></i> note</label> {$ entry.action_note $}  <a href="javascript:void(0);" class="note_edit pull-right" ng-click="open_create_note_modal(entry)" ng-show="user_role !== 'viewer'" ng-if="entry.audit_type == 'Note'">edit</a></td>
+                            <td class="align_to_top">{$ entry.created | date:"MM/dd/yyyy 'at' h:mma" $}</td>
+                        </tr>
                     </tbody>
                 </table>
             </div>
diff --git a/seed/static/seed/partials/building_contacts_section.html b/seed/static/seed/partials/building_contacts_section.html
index bf42e23c71..586c0d6b34 100644
--- a/seed/static/seed/partials/building_contacts_section.html
+++ b/seed/static/seed/partials/building_contacts_section.html
@@ -2,14 +2,14 @@
     <div class="section_header_container">
         <div class="section_header fixed_height_short has_no_padding">
             <div class="section_action_container left">
-            	<h2><i class="fa fa-user"></i> Contact Information</h2>
+                <h2><i class="fa fa-user"></i> Contact Information</h2>
             </div>
             <div class="section_action_container right" ng-hide="building.edit_form_showing">
                 <a href="javascript:void(0);" ng-click="building.edit_form_showing = true; save_building_state()" ng-show="user_role !== 'viewer'" ><i class="fa fa-pencil"></i> Edit</a>
             </div>
             <div class="section_action_container right section_action_btn" ng-show="building.edit_form_showing">
-            	<a roll="button" class="btn btn-default btn-sm" href="javascript:void(0);" ng-click="building.edit_form_showing = false; restore_building()">Cancel</a>
-				<a roll="button" class="btn btn-primary btn-sm" href="javascript:void(0);" ng-click="building.edit_form_showing = false; save_building()">Save Changes</a>
+                <a roll="button" class="btn btn-default btn-sm" href="javascript:void(0);" ng-click="building.edit_form_showing = false; restore_building()">Cancel</a>
+                <a roll="button" class="btn btn-primary btn-sm" href="javascript:void(0);" ng-click="building.edit_form_showing = false; save_building()">Save Changes</a>
             </div>
         </div>
     </div>
diff --git a/seed/static/seed/partials/building_detail_section.html b/seed/static/seed/partials/building_detail_section.html
index 3c3c16ae99..2ce0ebe388 100644
--- a/seed/static/seed/partials/building_detail_section.html
+++ b/seed/static/seed/partials/building_detail_section.html
@@ -2,14 +2,14 @@
     <div class="section_header_container">
         <div class="section_header fixed_height_short has_no_padding">
             <div class="section_action_container left">
-            	<h2><i class="fa fa-building-o"></i> Building Information</h2>
+                <h2><i class="fa fa-building-o"></i> Building Information</h2>
             </div>
             <div class="section_action_container right" ng-hide="building.edit_form_showing">
                 <a href="javascript:void(0);" ng-click="building.edit_form_showing = true; save_building_state()" ng-show="user_role !== 'viewer'" ><i class="fa fa-pencil"></i> Edit</a>
             </div>
             <div class="section_action_container right section_action_btn" ng-show="building.edit_form_showing">
-            	<a roll="button" class="btn btn-default btn-sm" href="javascript:void(0);" ng-click="building.edit_form_showing = false; restore_building()">Cancel</a>
-				<a roll="button" class="btn btn-primary btn-sm" href="javascript:void(0);" ng-click="building.edit_form_showing = false; save_building()">Save Changes</a>
+                <a roll="button" class="btn btn-default btn-sm" href="javascript:void(0);" ng-click="building.edit_form_showing = false; restore_building()">Cancel</a>
+                <a roll="button" class="btn btn-primary btn-sm" href="javascript:void(0);" ng-click="building.edit_form_showing = false; save_building()">Save Changes</a>
             </div>
         </div>
     </div>
diff --git a/seed/static/seed/partials/building_energy_section.html b/seed/static/seed/partials/building_energy_section.html
index c78c3f877d..4e8933cf07 100644
--- a/seed/static/seed/partials/building_energy_section.html
+++ b/seed/static/seed/partials/building_energy_section.html
@@ -2,14 +2,14 @@
     <div class="section_header_container">
         <div class="section_header fixed_height_short has_no_padding">
             <div class="section_action_container left">
-            	<h2><i class="fa fa-lightbulb-o"></i> Energy Data</h2>
+                <h2><i class="fa fa-lightbulb-o"></i> Energy Data</h2>
             </div>
             <div class="section_action_container right" ng-hide="building.edit_form_showing">
                 <a href="javascript:void(0);" ng-click="building.edit_form_showing = true; save_building_state()" ng-show="user_role !== 'viewer'" ><i class="fa fa-pencil"></i> Edit</a>
             </div>
             <div class="section_action_container right section_action_btn" ng-show="building.edit_form_showing">
-            	<a roll="button" class="btn btn-default btn-sm" href="javascript:void(0);" ng-click="building.edit_form_showing = false; restore_building()">Cancel</a>
-				<a roll="button" class="btn btn-primary btn-sm" href="javascript:void(0);" ng-click="building.edit_form_showing = false; save_building()">Save Changes</a>
+                <a roll="button" class="btn btn-default btn-sm" href="javascript:void(0);" ng-click="building.edit_form_showing = false; restore_building()">Cancel</a>
+                <a roll="button" class="btn btn-primary btn-sm" href="javascript:void(0);" ng-click="building.edit_form_showing = false; save_building()">Save Changes</a>
             </div>
         </div>
     </div>
diff --git a/seed/static/seed/partials/building_projects_section.html b/seed/static/seed/partials/building_projects_section.html
index eb4850219a..3c780f9b54 100644
--- a/seed/static/seed/partials/building_projects_section.html
+++ b/seed/static/seed/partials/building_projects_section.html
@@ -2,14 +2,14 @@
     <div class="section_header_container">
         <div class="section_header fixed_height_short has_no_padding">
             <div class="section_action_container left_wide">
-            	<h2><i class="fa fa-folder-o"></i> Projects That Include This Building</h2>
+                <h2><i class="fa fa-folder-o"></i> Projects That Include This Building</h2>
             </div>
             <div class="section_action_container right" ng-hide="building.edit_form_showing">
                 <a href="javascript:void(0);" ng-click="building.edit_form_showing = true; save_building_state()" ng-show="user_role !== 'viewer'" ><i class="fa fa-pencil"></i> Edit</a>
             </div>
             <div class="section_action_container right section_action_btn" ng-show="building.edit_form_showing">
-            	<a roll="button" class="btn btn-default btn-sm" href="javascript:void(0);" ng-click="building.edit_form_showing = false; restore_building()">Cancel</a>
-				<a roll="button" class="btn btn-primary btn-sm" href="javascript:void(0);" ng-click="building.edit_form_showing = false; save_building()">Save Changes</a>
+                <a roll="button" class="btn btn-default btn-sm" href="javascript:void(0);" ng-click="building.edit_form_showing = false; restore_building()">Cancel</a>
+                <a roll="button" class="btn btn-primary btn-sm" href="javascript:void(0);" ng-click="building.edit_form_showing = false; save_building()">Save Changes</a>
             </div>
         </div>
     </div>
diff --git a/seed/static/seed/partials/buildings.html b/seed/static/seed/partials/buildings.html
index 145df30255..98af3ef7e6 100644
--- a/seed/static/seed/partials/buildings.html
+++ b/seed/static/seed/partials/buildings.html
@@ -7,38 +7,38 @@
             <h1><i class="fa fa-building-o"></i> {$ search.number_matching_search | number:0 $} Buildings</h1>
         </div>
         <div class="right page_action_container page_action_btn">
-	        
+            
         </div>
     </div>
 </div>
 <div class="section_nav_container">
-	<div class="section_nav">
-		<a ng-href="#/buildings" class="active">Buildings List</a><a ng-href="#/buildings/settings">List Settings</a>
-	</div>
+    <div class="section_nav">
+        <a ng-href="#/buildings" class="active">Buildings List</a><a ng-href="#/buildings/settings">List Settings</a>
+    </div>
 </div>
 <div class="section">
-	<div class="alert_container" ng-show="show_alert">
-		<div class="alert alert-success">
-        	<button type="button" class="close" ng-click="show_alert = false">&times;</button>
-        	You successfully created the project <a href="#"><strong>{$ project.name $}</strong></a>.
-	    </div>
-	</div>
+    <div class="alert_container" ng-show="show_alert">
+        <div class="alert alert-success">
+            <button type="button" class="close" ng-click="show_alert = false">&times;</button>
+            You successfully created the project <a href="#"><strong>{$ project.name $}</strong></a>.
+        </div>
+    </div>
     <div class="section_header_container">
         <div class="section_header fixed_height">
             <div class="left section_action_container">
-            	<div class="check_action">
-	                <div class="btn-group" ng-style="nothing_selected_cursor()">
-	                  <button type="button" class="btn btn-default btn-sm dropdown-toggle" data-toggle="dropdown" ng-disabled="nothing_selected()">
-	                    Building Actions <span class="caret"></span>
-	                  </button>
-	                  <ul class="dropdown-menu" role="menu">
-	                    <li ng-hide="menu.user.organization.user_role === 'viewer'"><a href="javascript:void(0);" data-toggle="modal" data-target="#newProjectModal" ng-click="set_initial_project_state()">Create a new project</a></li>
-	                    <li ng-hide="menu.user.organization.user_role === 'viewer'"><a href="javascript:void(0);" data-toggle="modal" data-target="#existingProjectModal" ng-click="create_project_state='create'">Add to an existing project</a></li>
+                <div class="check_action">
+                    <div class="btn-group" ng-style="nothing_selected_cursor()">
+                      <button type="button" class="btn btn-default btn-sm dropdown-toggle" data-toggle="dropdown" ng-disabled="nothing_selected()">
+                        Building Actions <span class="caret"></span>
+                      </button>
+                      <ul class="dropdown-menu" role="menu">
+                        <li ng-hide="menu.user.organization.user_role === 'viewer'"><a href="javascript:void(0);" data-toggle="modal" data-target="#newProjectModal" ng-click="set_initial_project_state()">Create a new project</a></li>
+                        <li ng-hide="menu.user.organization.user_role === 'viewer'"><a href="javascript:void(0);" data-toggle="modal" data-target="#existingProjectModal" ng-click="create_project_state='create'">Add to an existing project</a></li>
                       <li ng-hide="menu.user.organization.user_role === 'viewer'"><a href="javascript:void(0);" ng-click="open_delete_modal()">Delete Buildings</a></li>
                       <li><a href="javascript:void(0);" ng-click="open_export_modal()">Export Buildings</a></li>
-	                  </ul>
-	                </div>
-            	</div>
+                      </ul>
+                    </div>
+                </div>
             </div>
             <div class="right section_action_container section_action_btn"></div>
         </div>
@@ -57,80 +57,80 @@ <h1><i class="fa fa-building-o"></i> {$ search.number_matching_search | number:0
   <div class="modal-dialog">
     <div class="modal-content">
       <form>
-	      <div class="modal-header">
-	        <button type="button" class="close" data-dismiss="modal" aria-hidden="true"><i class="fa fa-times"></i></button>
-	        <h4 class="modal-title" id="newProjectModalLabel" ng-show="create_project_state == 'create'">Create a New Project</h4>
-	        <h4 class="modal-title" id="newProjectModalLabel" ng-show="create_project_state == 'adding'">Adding buildings to project '{$ project.name $}'</h4>
-	        <h4 class="modal-title" id="newProjectModalLabel" ng-show="create_project_state == 'success'">Success!</h4>
-	      </div>
-	      <div class="modal-body no_bottom_padding form-horizontal">
-	        <div class="alert alert-danger" ng-show="create_project_error">
-	            {$ create_project_error_message $}</a>.
-	        </div>
-	        <div class="form-group" ng-show="create_project_state == 'create'">
-	            <label class="control-label col-sm-3" for="projectName">Project Name</label>
-	            <div class="col-sm-8">
-	                <input type="text" class="form-control" id="projectName" ng-model="project.name" placeholder="Project Name" required>
-	            </div>
-	        </div>
-	        <div class="form-group row" ng-show="create_project_state == 'create'">
-		        <div class="col-sm-offset-3 col-sm-8">
-		            <div class="checkbox complianceCheckbox">
-		                <label>
-		                    <input type="checkbox" ng-model="project.is_compliance"> Add compliance information.
-		                </label>
-		            </div>
-		        </div>
-	        </div>
-	      </div>
-	      <div class="modal-header" ng-show="project.is_compliance && create_project_state == 'create'">
-	            <h4 class="modal-title" id="editProjectComplianceModalLabel">Compliance Information</h4>
-	      </div>
-	      <div class="modal-body no_bottom_padding form-horizontal" ng-show="project.is_compliance && create_project_state == 'create'">
-	        <div class="form-group">
-	            <label class="control-label col-sm-3" for="projectCompliance">Submittal Type</label>
-	            <div class="col-sm-8">
-	                <select class="form-control" id="projectCompliance" ng-model="project.compliance_type">
-	                  <option>Benchmarking</option>
-	                  <option>Auditing</option>
-	                  <option>Retro Commissioning</option>
-	                </select>
-	            </div>
-	        </div>
-	        <div class="form-group">
-	            <label class="control-label col-sm-3" for="projectStartDate">Year Ending Date</label>
-	            <div class="col-sm-8">
-	                <input type="month" class="form-control" id="projectStartDate" ng-model="project.end_date">
-	                <span class="help-block">Choose the year ending month for report period. </span>
-	            </div>
-	        </div>
-	        <div class="form-group">
-	            <label class="control-label col-sm-3" for="projectDeadline">Reporting Deadline</label>
-	            <div class="col-sm-8">
-	                <input type="date" class="form-control" id="projectDeadline" ng-model="project.deadline_date">
-	            </div>
-	        </div>
-	      </div>
-			<div class="col-sm-7" ng-show="create_project_state == 'adding'">
-				<div class="progress">
-		            <div class="progress-bar progress-bar-success" role="progressbar" aria-valuenow="40" aria-valuemin="0" aria-valuemax="100" style="width: {$ progress_percentage | number: 0 $}%;">
-		            <span class="sr-only">40% Complete</span>
-		          </div>
-		        </div>
-			</div>
-			<div class="col-sm-5" ng-show="create_project_state == 'adding'">
-				{$ progress_numerator $} / {$ progress_denominator $} Buildings
-			</div>
-			<div class="alert alert-success" ng-show="create_project_state == 'success'">
-	            {$ progress_denominator $} buildings added to the project <a data-dismiss="modal" ng-click="go_to_project()"><strong>{$ project.name $}</strong></a>.
-	        </div>
-	      <div class="modal-footer">
-	        <button type="button" class="btn btn-default" data-dismiss="modal" ng-show="create_project_state == 'create'">Cancel</button>
-	        <button type="button" class="btn btn-default" data-dismiss="modal" ng-show="create_project_state == 'success'">Close</button>
-	        <input type="submit" class="btn btn-primary" ng-click="create_project()" ng-show="create_project_state == 'create'" value="Create Project" />
-	        <button type="button" class="btn btn-primary" data-dismiss="modal" ng-click="go_to_project()" ng-show="create_project_state == 'success'">View Project</button>
-	      </div>
-	    </form>
+          <div class="modal-header">
+            <button type="button" class="close" data-dismiss="modal" aria-hidden="true"><i class="fa fa-times"></i></button>
+            <h4 class="modal-title" id="newProjectModalLabel" ng-show="create_project_state == 'create'">Create a New Project</h4>
+            <h4 class="modal-title" id="newProjectModalLabel" ng-show="create_project_state == 'adding'">Adding buildings to project '{$ project.name $}'</h4>
+            <h4 class="modal-title" id="newProjectModalLabel" ng-show="create_project_state == 'success'">Success!</h4>
+          </div>
+          <div class="modal-body no_bottom_padding form-horizontal">
+            <div class="alert alert-danger" ng-show="create_project_error">
+                {$ create_project_error_message $}</a>.
+            </div>
+            <div class="form-group" ng-show="create_project_state == 'create'">
+                <label class="control-label col-sm-3" for="projectName">Project Name</label>
+                <div class="col-sm-8">
+                    <input type="text" class="form-control" id="projectName" ng-model="project.name" placeholder="Project Name" required>
+                </div>
+            </div>
+            <div class="form-group row" ng-show="create_project_state == 'create'">
+                <div class="col-sm-offset-3 col-sm-8">
+                    <div class="checkbox complianceCheckbox">
+                        <label>
+                            <input type="checkbox" ng-model="project.is_compliance"> Add compliance information.
+                        </label>
+                    </div>
+                </div>
+            </div>
+          </div>
+          <div class="modal-header" ng-show="project.is_compliance && create_project_state == 'create'">
+                <h4 class="modal-title" id="editProjectComplianceModalLabel">Compliance Information</h4>
+          </div>
+          <div class="modal-body no_bottom_padding form-horizontal" ng-show="project.is_compliance && create_project_state == 'create'">
+            <div class="form-group">
+                <label class="control-label col-sm-3" for="projectCompliance">Submittal Type</label>
+                <div class="col-sm-8">
+                    <select class="form-control" id="projectCompliance" ng-model="project.compliance_type">
+                      <option>Benchmarking</option>
+                      <option>Auditing</option>
+                      <option>Retro Commissioning</option>
+                    </select>
+                </div>
+            </div>
+            <div class="form-group">
+                <label class="control-label col-sm-3" for="projectStartDate">Year Ending Date</label>
+                <div class="col-sm-8">
+                    <input type="month" class="form-control" id="projectStartDate" ng-model="project.end_date">
+                    <span class="help-block">Choose the year ending month for report period. </span>
+                </div>
+            </div>
+            <div class="form-group">
+                <label class="control-label col-sm-3" for="projectDeadline">Reporting Deadline</label>
+                <div class="col-sm-8">
+                    <input type="date" class="form-control" id="projectDeadline" ng-model="project.deadline_date">
+                </div>
+            </div>
+          </div>
+            <div class="col-sm-7" ng-show="create_project_state == 'adding'">
+                <div class="progress">
+                    <div class="progress-bar progress-bar-success" role="progressbar" aria-valuenow="40" aria-valuemin="0" aria-valuemax="100" style="width: {$ progress_percentage | number: 0 $}%;">
+                    <span class="sr-only">40% Complete</span>
+                  </div>
+                </div>
+            </div>
+            <div class="col-sm-5" ng-show="create_project_state == 'adding'">
+                {$ progress_numerator $} / {$ progress_denominator $} Buildings
+            </div>
+            <div class="alert alert-success" ng-show="create_project_state == 'success'">
+                {$ progress_denominator $} buildings added to the project <a data-dismiss="modal" ng-click="go_to_project()"><strong>{$ project.name $}</strong></a>.
+            </div>
+          <div class="modal-footer">
+            <button type="button" class="btn btn-default" data-dismiss="modal" ng-show="create_project_state == 'create'">Cancel</button>
+            <button type="button" class="btn btn-default" data-dismiss="modal" ng-show="create_project_state == 'success'">Close</button>
+            <input type="submit" class="btn btn-primary" ng-click="create_project()" ng-show="create_project_state == 'create'" value="Create Project" />
+            <button type="button" class="btn btn-primary" data-dismiss="modal" ng-click="go_to_project()" ng-show="create_project_state == 'success'">View Project</button>
+          </div>
+        </form>
     </div><!-- /.modal-content -->
   </div><!-- /.modal-dialog -->
 </div><!-- /.modal -->
@@ -149,11 +149,11 @@ <h4 class="modal-title" id="newProjectModalLabel" ng-show="create_project_state
         </div>
       <div class="modal-body">
         <div class="form-group" ng-show="create_project_state == 'create'">
-			<label class="sr-only" for="projectName">Project Name</label>
-			<div class="col-sm-8">
-				<select class="form-control" id="existingProjectName" ng-options="p as p.name for p in projects" ng-model="project"></select>
-			</div>
-		</div>
+            <label class="sr-only" for="projectName">Project Name</label>
+            <div class="col-sm-8">
+                <select class="form-control" id="existingProjectName" ng-options="p as p.name for p in projects" ng-model="project"></select>
+            </div>
+        </div>
         <div class="col-sm-7" ng-show="create_project_state == 'adding'">
             <div class="progress">
                 <div class="progress-bar progress-bar-success" role="progressbar" aria-valuenow="40" aria-valuemin="0" aria-valuemax="100" style="width: {$ progress_percentage | number: 0 $}%;">
diff --git a/seed/static/seed/partials/buildings_settings.html b/seed/static/seed/partials/buildings_settings.html
index 2972c3faca..162ed3a5bf 100644
--- a/seed/static/seed/partials/buildings_settings.html
+++ b/seed/static/seed/partials/buildings_settings.html
@@ -7,74 +7,74 @@
             <h1><i class="fa fa-building-o"></i> Buildings</h1>
         </div>
         <div class="right page_action_container page_action_btn">
-	        
+            
         </div>
     </div>
 </div>
 <div class="section_nav_container">
-	<div class="section_nav">
-		<a ng-href="#/buildings">Buildings List</a><a ng-href="#/buildings/settings" class="active">List Settings</a>
-	</div>
+    <div class="section_nav">
+        <a ng-href="#/buildings">Buildings List</a><a ng-href="#/buildings/settings" class="active">List Settings</a>
+    </div>
 </div>
 <div class="section">
     <div class="section_header_container">
         <div class="section_header has_no_padding fixed_height_short">
-        	<div class="section_action_container left">
-        		<h2><i class="fa fa-cogs"></i> Building List Settings</h2>
-        	</div>
-        	<div class="section_action_container right section_action_btn">
-        		<button type="button" class="pull-right btn btn-primary" ng-click="save_settings()">Save Changes <i class="fa fa-check align_right" ng-show="settings_updated"></i></button>
-        	</div>
+            <div class="section_action_container left">
+                <h2><i class="fa fa-cogs"></i> Building List Settings</h2>
+            </div>
+            <div class="section_action_container right section_action_btn">
+                <button type="button" class="pull-right btn btn-primary" ng-click="save_settings()">Save Changes <i class="fa fa-check align_right" ng-show="settings_updated"></i></button>
+            </div>
         </div>
     </div>
     <div class="section_content_container">
         <div class="section_content with_padding">
-        	<h3>Add Shared Buildings.</h3>
-			<div class="checkbox">
-	          	<label>
-	          		<input type="checkbox" ng-model="user.show_shared_buildings">
-	          		Include in your buildings list all buildings shared with you.
-	          	</label>
-			</div>
-			<h3>There are {$ fields.length | number $} columns of data available to you.</h3>
+            <h3>Add Shared Buildings.</h3>
+            <div class="checkbox">
+                  <label>
+                      <input type="checkbox" ng-model="user.show_shared_buildings">
+                      Include in your buildings list all buildings shared with you.
+                  </label>
+            </div>
+            <h3>There are {$ fields.length | number $} columns of data available to you.</h3>
             <p>Select columns from the list below to make them appear in your Buildings List table.</p>
         </div>
-		<div class="section_content with_padding">
-        	<div class="table_list_container has_borders">
+        <div class="section_content with_padding">
+            <div class="table_list_container has_borders">
                 <table class="table table-striped has_no_btm_margin table_highlight_first">
-                	<thead>
+                    <thead>
                         <tr>
                             <th class="check is_aligned_center"><input type="checkbox" ng-model="controls.select_all" ng-change="select_all_clicked()"></th>
                             <th>Column Name</th>
                         </tr>
                         <tr class="sub_head">
-                        	<th class="sub_head check_row"></th>
-                        	<th class="sub_head">
-								<input type="text" class="form-control input-sm" ng-model="filter_params.title" placeholder="Search column name" ng-class="{active: filter_params.title.length > 0}">
-                        	</th>
+                            <th class="sub_head check_row"></th>
+                            <th class="sub_head">
+                                <input type="text" class="form-control input-sm" ng-model="filter_params.title" placeholder="Search column name" ng-class="{active: filter_params.title.length > 0}">
+                            </th>
                         </tr>
-                	</thead>
+                    </thead>
                 </table>
                 <div class="vert_table_scroll_container">
                     <table class="table has_no_btm_margin table-striped table_scroll">
-                    	<tbody>
-                    		<tr ng-repeat="field in fields | filter:filter_params:strict">
-    	                		<td class="check is_aligned_center" style="width: 5%; min-width: 30px;">
-    								<input type="checkbox" ng-model="field.checked">
-    							</td>
-    							<td>
-    								<span>{$ field.title $}</span>
-    							</td>
-                    		</tr>
-                    	</tbody>
+                        <tbody>
+                            <tr ng-repeat="field in fields | filter:filter_params:strict">
+                                <td class="check is_aligned_center" style="width: 5%; min-width: 30px;">
+                                    <input type="checkbox" ng-model="field.checked">
+                                </td>
+                                <td>
+                                    <span>{$ field.title $}</span>
+                                </td>
+                            </tr>
+                        </tbody>
                     </table>
                 </div>
-        	</div>
+            </div>
         </div>
     </div>
     <div class="section_content_container has_top_margin">
         <div class="section_content with_padding">
-        	<button type="button" class="btn btn-primary" ng-click="save_settings()">Save Changes <i class="fa fa-check align_right" ng-show="settings_updated"></i></button>
+            <button type="button" class="btn btn-primary" ng-click="save_settings()">Save Changes <i class="fa fa-check align_right" ng-show="settings_updated"></i></button>
         </div>
     </div>
 </div>
diff --git a/seed/static/seed/partials/concat_modal.html b/seed/static/seed/partials/concat_modal.html
index caaa52dd6e..30679d5bd1 100644
--- a/seed/static/seed/partials/concat_modal.html
+++ b/seed/static/seed/partials/concat_modal.html
@@ -45,7 +45,7 @@ <h5>Drag headers from your list on the left into the area below to combine them.
             <hr>
             <h5>A preview of your concatenated data will appear in the box below.</h5>
             <div class="well">
-            	<span ng-repeat="c in concat_columns">{$ c.raw_data[0] $} </span>
+                <span ng-repeat="c in concat_columns">{$ c.raw_data[0] $} </span>
             </div>
         </div>
     </div>
diff --git a/seed/static/seed/partials/create_organization_modal.html b/seed/static/seed/partials/create_organization_modal.html
index 0bc525a79e..2e4f08cc6e 100644
--- a/seed/static/seed/partials/create_organization_modal.html
+++ b/seed/static/seed/partials/create_organization_modal.html
@@ -1,35 +1,35 @@
 <div class="modal-header">
-	<button type="button" class="close" ng-click="close()" aria-hidden="true"><i class="fa fa-times"></i></button>
-	<h4 class="modal-title" id="createOrganizationLabel">Create a New Sub-Organization</h4>
+    <button type="button" class="close" ng-click="close()" aria-hidden="true"><i class="fa fa-times"></i></button>
+    <h4 class="modal-title" id="createOrganizationLabel">Create a New Sub-Organization</h4>
 </div>
 <form class="form-horizontal" role="form" name="sub_org_form" ng-submit="submit_form(sub_org_form.$valid)">
-	<div class="modal-body">
-	    <div class="form-group" ng-class="{ 'has-error' : sub_org_form.name.$invalid && !sub_org_form.name.$pristine }">
-			<label class="control-label col-sm-3" for="createOrganizationName">Sub-Org Name:</label>
-			<div class="col-sm-8">
-	            <input type="text" class="form-control" name="name" id="createOrganizationName" placeholder="Enter sub-organization name" ng-model="sub_org.name" required>
-	            <p ng-show="sub_org_form.name.$invalid && !sub_org_form.name.$pristine" class="help-block">Sub-Org name is required.</p>
-	        </div>
-		</div>
-		<div class="form-group" ng-class="{ 'has-error' : (sub_org_form.email.$invalid && !sub_org_form.email.$pristine) || error_message.length > 0 }">
-			<label class="control-label col-sm-3" for="createOrganizationInvite">Invite an Owner:</label>
-			<div class="col-sm-8">
-	            <input type="email" class="form-control" name="email" id="createOrganizationInvite" placeholder="Enter email address" ng-model="sub_org.email" required>
-	            <p ng-show="sub_org_form.email.$invalid && !sub_org_form.email.$pristine" class="help-block">Enter a valid email address.</p>
-	            <p ng-show="error_message.length > 0" class="help-block">{$ error_message $}</p>
-	        </div>
-		</div>
-		<div class="form-group">
-			<div class="col-sm-3"></div>
-			<div class="col-sm-8">
-				<p>Note 1: Sub-organizations can not be deleted.</p>
-				<p>Note 2: Parent organization members are not automatically made members of sub-organizations.</p>
-				
-			</div>
-		</div>
-	</div>
-	<div class="modal-footer">
-		<button type="button" class="btn btn-default" ng-click="cancel()">Cancel</button>
-		<button type="submit" class="btn btn-primary" ng-disabled="sub_org_form.$invalid">Create New Sub-Organization</button>
-	</div>
+    <div class="modal-body">
+        <div class="form-group" ng-class="{ 'has-error' : sub_org_form.name.$invalid && !sub_org_form.name.$pristine }">
+            <label class="control-label col-sm-3" for="createOrganizationName">Sub-Org Name:</label>
+            <div class="col-sm-8">
+                <input type="text" class="form-control" name="name" id="createOrganizationName" placeholder="Enter sub-organization name" ng-model="sub_org.name" required>
+                <p ng-show="sub_org_form.name.$invalid && !sub_org_form.name.$pristine" class="help-block">Sub-Org name is required.</p>
+            </div>
+        </div>
+        <div class="form-group" ng-class="{ 'has-error' : (sub_org_form.email.$invalid && !sub_org_form.email.$pristine) || error_message.length > 0 }">
+            <label class="control-label col-sm-3" for="createOrganizationInvite">Invite an Owner:</label>
+            <div class="col-sm-8">
+                <input type="email" class="form-control" name="email" id="createOrganizationInvite" placeholder="Enter email address" ng-model="sub_org.email" required>
+                <p ng-show="sub_org_form.email.$invalid && !sub_org_form.email.$pristine" class="help-block">Enter a valid email address.</p>
+                <p ng-show="error_message.length > 0" class="help-block">{$ error_message $}</p>
+            </div>
+        </div>
+        <div class="form-group">
+            <div class="col-sm-3"></div>
+            <div class="col-sm-8">
+                <p>Note 1: Sub-organizations can not be deleted.</p>
+                <p>Note 2: Parent organization members are not automatically made members of sub-organizations.</p>
+                
+            </div>
+        </div>
+    </div>
+    <div class="modal-footer">
+        <button type="button" class="btn btn-default" ng-click="cancel()">Cancel</button>
+        <button type="submit" class="btn btn-primary" ng-disabled="sub_org_form.$invalid">Create New Sub-Organization</button>
+    </div>
 </form>
diff --git a/seed/static/seed/partials/data_upload_modal.html b/seed/static/seed/partials/data_upload_modal.html
index eb771dabeb..0500711e69 100644
--- a/seed/static/seed/partials/data_upload_modal.html
+++ b/seed/static/seed/partials/data_upload_modal.html
@@ -13,108 +13,108 @@ <h4 class="modal-title" ng-switch-when="11">Confirm Save Mappings?</h4>
     <h4 class="modal-title" ng-switch-when="12">Error Processing Data</h4>
 </div>
 <div class="modal-body no_bottom_padding" ng-switch on="step.number">
-	<!-- Step 1 -->
-	<div class="data_upload_steps form-horizontal" ng-switch-when="1">
-    	<div class="alert alert-danger alert-dismissable" ng-show="dataset.alert">
-	    	<button type="button" class="close" data-dismiss="alert" aria-hidden="true">&times;</button>
-	    	The data set <strong>name "{$ dataset.name $}" already exists</strong>. Please select a new one.
-	    </div>   
+    <!-- Step 1 -->
+    <div class="data_upload_steps form-horizontal" ng-switch-when="1">
+        <div class="alert alert-danger alert-dismissable" ng-show="dataset.alert">
+            <button type="button" class="close" data-dismiss="alert" aria-hidden="true">&times;</button>
+            The data set <strong>name "{$ dataset.name $}" already exists</strong>. Please select a new one.
+        </div>   
         <div class="form-group" ng-class="{'has-error': dataset.alert, 'has-feedback': dataset.alert}">
-        	<label class="control-label col-lg-3 col-sm-3" for="inputDataUploadName">Data Set Name</label>
-        	<div class="col-lg-8 col-sm-8">
-	        	<input type="text" class="form-control" id="inputDataUploadName" ng-model="dataset.name" placeholder="your data set name" be-enter="create_dataset(dataset.name)" required>
-        	</div>
+            <label class="control-label col-lg-3 col-sm-3" for="inputDataUploadName">Data Set Name</label>
+            <div class="col-lg-8 col-sm-8">
+                <input type="text" class="form-control" id="inputDataUploadName" ng-model="dataset.name" placeholder="your data set name" be-enter="create_dataset(dataset.name)" required>
+            </div>
         </div>
-	</div>
+    </div>
     <!-- Step 2: load Covered Buildings Assessor data -->
-	<div class="data_upload_steps" ng-switch-when="2">
-	    <div class="row">
-	    	<div class="alert alert-danger alert-dismissable" ng-show="uploader.invalid_extension_alert">
-		        <button type="button" class="close" ng-click="uploader.invalid_extension_alert = false" aria-hidden="true">&times;</button>
-		        <strong>Sorry!</strong> SEED doesn't currently support that file format. Only <strong>.csv</strong>, <strong>.xls</strong>, <strong>.xlsx</strong>, and <strong>.xml</strong> files are supported.
-		    </div>
-		    <div class="form-group col-lg-12 col-sm-12">
-		    	<div class="row">
-		        	<div class="col-lg-4" be-uploader sourcetype="Assessed Raw" sourceprog="" sourcever="" importrecord="dataset.id" buttontext="Upload a spreadsheet" eventfunc="uploaderfunc(message, file, progress)" ng-hide="uploader.in_progress"></div>
-		        	<div class="col-lg-4 orange_button" be-uploader sourcetype="Assessed Raw" sourceprog="PortfolioManager" sourcever="1.0" importrecord="dataset.id" buttontext="Upload Portfolio Manager data" eventfunc="uploaderfunc(message, file, progress)" ng-hide="uploader.in_progress"></div>
-					<div class="col-lg-8 green_button" be-uploader sourcetype="Green Button Raw"
+    <div class="data_upload_steps" ng-switch-when="2">
+        <div class="row">
+            <div class="alert alert-danger alert-dismissable" ng-show="uploader.invalid_extension_alert">
+                <button type="button" class="close" ng-click="uploader.invalid_extension_alert = false" aria-hidden="true">&times;</button>
+                <strong>Sorry!</strong> SEED doesn't currently support that file format. Only <strong>.csv</strong>, <strong>.xls</strong>, <strong>.xlsx</strong>, and <strong>.xml</strong> files are supported.
+            </div>
+            <div class="form-group col-lg-12 col-sm-12">
+                <div class="row">
+                    <div class="col-lg-4" be-uploader sourcetype="Assessed Raw" sourceprog="" sourcever="" importrecord="dataset.id" buttontext="Upload a spreadsheet" eventfunc="uploaderfunc(message, file, progress)" ng-hide="uploader.in_progress"></div>
+                    <div class="col-lg-4 orange_button" be-uploader sourcetype="Assessed Raw" sourceprog="PortfolioManager" sourcever="1.0" importrecord="dataset.id" buttontext="Upload Portfolio Manager data" eventfunc="uploaderfunc(message, file, progress)" ng-hide="uploader.in_progress"></div>
+                    <div class="col-lg-8 green_button" be-uploader sourcetype="Green Button Raw"
                          sourceprog="" sourcever="" importrecord="dataset.id" buttontext="Upload Green Button Data" eventfunc="uploaderfunc(message, file, progress)" ng-hide="uploader.in_progress"></div>
-		    	</div>
-		        <div class="progress_bar_container" ng-show="uploader.in_progress">
-		        	<div class="progress_bar_copy_top">Uploading <strong>{$ dataset.filename $}</strong></div>
+                </div>
+                <div class="progress_bar_container" ng-show="uploader.in_progress">
+                    <div class="progress_bar_copy_top">Uploading <strong>{$ dataset.filename $}</strong></div>
 
-					<progressbar class="progress-striped active" value="uploader.progress" type="success"></progressbar>
-					<div class="progress_bar_copy_bottom">{$ uploader.progress | number:0 $}% {$ uploader.status_message $}</div>
-				</div>
-			</div>
-	    </div>
-	    <div class="row" ng-hide="uploader.in_progress">
-		    <div class="col-lg-12 col-sm-12">
-		    	<div>
-		    		<p>File types supported: <strong>.csv</strong>, <strong>.xls</strong>, <strong>.xlsx</strong>, and <strong>.xml</strong>.</p>
-		    		<p><strong>Note:</strong> multi-tabbed MS Excel files are not currently supported.</p>
-		    	</div>
-		    </div>
-	    </div>
-	</div>
-	<!-- Step 3 -->
-	<div class="data_upload_steps" ng-switch-when="3">
-	    <div class="row">
-		    <div class="alert alert-success alert-dismissable">
-		    	<button type="button" class="close" data-dismiss="alert" aria-hidden="true">&times;</button>
-		    	<strong>{$ dataset.filename $}</strong> has been uploaded to <strong>{$ dataset.name $}</strong>.
-		    </div>
-	    </div>
-	</div>
+                    <progressbar class="progress-striped active" value="uploader.progress" type="success"></progressbar>
+                    <div class="progress_bar_copy_bottom">{$ uploader.progress | number:0 $}% {$ uploader.status_message $}</div>
+                </div>
+            </div>
+        </div>
+        <div class="row" ng-hide="uploader.in_progress">
+            <div class="col-lg-12 col-sm-12">
+                <div>
+                    <p>File types supported: <strong>.csv</strong>, <strong>.xls</strong>, <strong>.xlsx</strong>, and <strong>.xml</strong>.</p>
+                    <p><strong>Note:</strong> multi-tabbed MS Excel files are not currently supported.</p>
+                </div>
+            </div>
+        </div>
+    </div>
+    <!-- Step 3 -->
+    <div class="data_upload_steps" ng-switch-when="3">
+        <div class="row">
+            <div class="alert alert-success alert-dismissable">
+                <button type="button" class="close" data-dismiss="alert" aria-hidden="true">&times;</button>
+                <strong>{$ dataset.filename $}</strong> has been uploaded to <strong>{$ dataset.name $}</strong>.
+            </div>
+        </div>
+    </div>
     <!-- Step 4: load Portfolio Manager report data -->
-	<div class="data_upload_steps" ng-switch-when="4">
-	    <div class="row">
-	    	<div class="alert alert-danger alert-dismissable" ng-show="uploader.invalid_extension_alert">
-		    	<button type="button" class="close" data-dismiss="alert" aria-hidden="true">&times;</button>
-		    	<strong>Sorry!</strong> SEED doesn't currently support that file format. Only <strong>.csv</strong>, <strong>.xls</strong>, <strong>.xlsx</strong>, and <strong>.xml</strong> files are supported.
-		    </div>
-		    <div class="form-group col-lg-12 col-sm-12">
-		        <div be-uploader sourcetype="Portfolio Raw" importrecord="dataset.id" buttontext="Upload your energy data file(s)" eventfunc="uploaderfunc(message, file, progress)" ng-hide="uploader.in_progress"></div>
-		        <div class="progress_bar_container" ng-show="uploader.in_progress">
-		        	<div class="progress_bar_copy_top">Uploading <strong>{$ dataset.filename $}</strong></div>
+    <div class="data_upload_steps" ng-switch-when="4">
+        <div class="row">
+            <div class="alert alert-danger alert-dismissable" ng-show="uploader.invalid_extension_alert">
+                <button type="button" class="close" data-dismiss="alert" aria-hidden="true">&times;</button>
+                <strong>Sorry!</strong> SEED doesn't currently support that file format. Only <strong>.csv</strong>, <strong>.xls</strong>, <strong>.xlsx</strong>, and <strong>.xml</strong> files are supported.
+            </div>
+            <div class="form-group col-lg-12 col-sm-12">
+                <div be-uploader sourcetype="Portfolio Raw" importrecord="dataset.id" buttontext="Upload your energy data file(s)" eventfunc="uploaderfunc(message, file, progress)" ng-hide="uploader.in_progress"></div>
+                <div class="progress_bar_container" ng-show="uploader.in_progress">
+                    <div class="progress_bar_copy_top">Uploading <strong>{$ dataset.filename $}</strong></div>
 
-					<progressbar class="progress-striped active" value="uploader.progress" type="success"></progressbar>
-					<div class="progress_bar_copy_bottom">{$ uploader.progress | number:0 $}% {$ uploader.status_message $}</div>
-				</div>
-		    </div>
-	    </div>
-	</div>
-	<!-- Step 5 -->
-	<div class="data_upload_steps" ng-switch-when="5">
-		<div class="row">
-		    <div class="alert alert-success alert-dismissable" ng-show="uploader.complete">
-		    	<button type="button" class="close" aria-hidden="true" ng-click="uploader.complete = false">&times;</button>
-		    	<strong>{$ dataset.filename $}</strong> has been uploaded to <strong>{$ dataset.name $}</strong>.
-		    </div>
-	    </div>
-	</div>
-	<!-- Step 6 -->
-	<div class="data_upload_steps" ng-switch-when="6">
-		<div class="row">
-			<div class="form-group col-lg-12 col-sm-12">
-				<button type="button" class="btn btn-primary" ng-click="goto_step(2)">Buildings list file</button>
-				<button type="button" class="btn btn-primary" ng-click="goto_step(4)">Energy data file</button>
-			</div>
-		</div>
-	</div>
-	<!-- Step 7: Finding building matches -->
-	<div class="data_upload_steps" ng-switch-when="7">
-		<div class="row">
-		    <div class="form-group col-lg-12 col-sm-12">
-		        <div class="progress_bar_container">
-		        	<div class="progress_bar_copy_top">Finding building matches for <strong>{$ dataset.filename $}</strong></div>
-					<progressbar class="progress-striped active" value="uploader.progress" type="success"></progressbar>
-					<div class="progress_bar_copy_bottom">{$ uploader.progress | number:0 $}% Complete</div>
-				</div>
-		    </div>
-		</div>
-	</div>
-	<!-- Step 8: Review matches -->
+                    <progressbar class="progress-striped active" value="uploader.progress" type="success"></progressbar>
+                    <div class="progress_bar_copy_bottom">{$ uploader.progress | number:0 $}% {$ uploader.status_message $}</div>
+                </div>
+            </div>
+        </div>
+    </div>
+    <!-- Step 5 -->
+    <div class="data_upload_steps" ng-switch-when="5">
+        <div class="row">
+            <div class="alert alert-success alert-dismissable" ng-show="uploader.complete">
+                <button type="button" class="close" aria-hidden="true" ng-click="uploader.complete = false">&times;</button>
+                <strong>{$ dataset.filename $}</strong> has been uploaded to <strong>{$ dataset.name $}</strong>.
+            </div>
+        </div>
+    </div>
+    <!-- Step 6 -->
+    <div class="data_upload_steps" ng-switch-when="6">
+        <div class="row">
+            <div class="form-group col-lg-12 col-sm-12">
+                <button type="button" class="btn btn-primary" ng-click="goto_step(2)">Buildings list file</button>
+                <button type="button" class="btn btn-primary" ng-click="goto_step(4)">Energy data file</button>
+            </div>
+        </div>
+    </div>
+    <!-- Step 7: Finding building matches -->
+    <div class="data_upload_steps" ng-switch-when="7">
+        <div class="row">
+            <div class="form-group col-lg-12 col-sm-12">
+                <div class="progress_bar_container">
+                    <div class="progress_bar_copy_top">Finding building matches for <strong>{$ dataset.filename $}</strong></div>
+                    <progressbar class="progress-striped active" value="uploader.progress" type="success"></progressbar>
+                    <div class="progress_bar_copy_bottom">{$ uploader.progress | number:0 $}% Complete</div>
+                </div>
+            </div>
+        </div>
+    </div>
+    <!-- Step 8: Review matches -->
     <div class="data_upload_steps" ng-switch-when="8">
         <div class="row">
             <div class="alert alert-success alert-dismissable">
@@ -132,72 +132,72 @@ <h4 class="modal-title" ng-switch-when="12">Error Processing Data</h4>
         </div>
     </div>
     <!-- Step 10: No matches -->
-	<div class="data_upload_steps" ng-switch-when="10">
-		<div class="row">
-		    <div class="alert alert-{$ step_10_style $} alert-dismissable">
+    <div class="data_upload_steps" ng-switch-when="10">
+        <div class="row">
+            <div class="alert alert-{$ step_10_style $} alert-dismissable">
                 <button type="button" class="close" aria-hidden="true" ng-click="uploader.complete = false">&times;</button>
                     <span ng-show="step_10_error_message">{$ step_10_error_message $}</span>
                     <span ng-hide="step_10_error_message">SEED could not locate any matches. Would you like to add another file?</span>
             </div>
             <div class="form-group col-lg-12 col-sm-12">
             </div>
-		</div>
-	</div>
-	<!-- Step 11: Save Mappings Permanently  -->
-	<div class="data_upload_steps" ng-switch-when="11">
-		<div class="row">
-		    <div class="alert alert-warning alert-dismissable">
+        </div>
+    </div>
+    <!-- Step 11: Save Mappings Permanently  -->
+    <div class="data_upload_steps" ng-switch-when="11">
+        <div class="row">
+            <div class="alert alert-warning alert-dismissable">
                 <button type="button" class="close" aria-hidden="true" ng-click="uploader.complete = false">&times;</button>
                     Did you review your mappings? It's a good idea to double check your mappings. Once SEED matches your buildings you can not undo or edit these mappings.
             </div>
-		</div>
-	</div>
-	<!-- Step 12: Error Processing Data  -->
-	<div class="data_upload_steps" ng-switch-when="12">
-		<div class="row">
-		    <div class="col-lg-12 col-sm-12">
-		    	<div>
-		    		<p>An error occurred while processing the file. Please ensure that your file meets the required specifications.</p>
-		    		<pre ng-class="{'pre-scrollable': step_12_error_message.length >= 300}" ng-show="step_12_error_message">{$ step_12_error_message $}</pre>
-		    	</div>
-		    </div>
-	    </div>
-	</div>
+        </div>
+    </div>
+    <!-- Step 12: Error Processing Data  -->
+    <div class="data_upload_steps" ng-switch-when="12">
+        <div class="row">
+            <div class="col-lg-12 col-sm-12">
+                <div>
+                    <p>An error occurred while processing the file. Please ensure that your file meets the required specifications.</p>
+                    <pre ng-class="{'pre-scrollable': step_12_error_message.length >= 300}" ng-show="step_12_error_message">{$ step_12_error_message $}</pre>
+                </div>
+            </div>
+        </div>
+    </div>
 </div>
 
 <div class="modal-footer" ng-switch on="step.number">
     <div ng-switch-when="1">
         <div class="row text-center">
-    	   <button type="button" class="btn btn-primary col-sm-6 col-lg-6 col-md-6 center-block" ng-click="create_dataset(dataset.name)" ng-disabled="dataset.disabled()">Create Data Set</button>
+           <button type="button" class="btn btn-primary col-sm-6 col-lg-6 col-md-6 center-block" ng-click="create_dataset(dataset.name)" ng-disabled="dataset.disabled()">Create Data Set</button>
         </div>    
     </div>
     <div ng-switch-when="2">
     </div>
     <div ng-switch-when="3">
-    	<!-- Leaving this out for now as I'm not sure we want to allow the user to do this right here.
-    	<button type="button" class="btn btn-default">Upload another building list file</button> -->
+        <!-- Leaving this out for now as I'm not sure we want to allow the user to do this right here.
+        <button type="button" class="btn btn-default">Upload another building list file</button> -->
         <div class="row text-center">
-        	<button type="button" class="btn btn-primary col-sm-6 col-lg-6 col-md-6 center-block" ng-click="goto_data_mapping()">Continue to data mapping</button>
+            <button type="button" class="btn btn-primary col-sm-6 col-lg-6 col-md-6 center-block" ng-click="goto_data_mapping()">Continue to data mapping</button>
         </div>
     </div>
     <div ng-switch-when="4">
     </div>
     <div ng-switch-when="5">
         <div class="row text-center">
-    	   <button type="button" class="btn btn-default col-sm-6 col-lg-6 col-md-6" center-block ng-click="goto_step(4)">Upload another energy data file</button>
+           <button type="button" class="btn btn-default col-sm-6 col-lg-6 col-md-6" center-block ng-click="goto_step(4)">Upload another energy data file</button>
         </div>
         <div class="row text-center">
-        	<button type="button" class="btn btn-primary col-sm-6 col-lg-6 col-md-6 center-block" ng-click="goto_data_matching()">Continue to data matching</button>
+            <button type="button" class="btn btn-primary col-sm-6 col-lg-6 col-md-6 center-block" ng-click="goto_data_matching()">Continue to data matching</button>
         </div>
     </div>
     <div ng-switch-when="7">
     </div>
     <div ng-switch-when="8">
         <div class="row text-center">
-        	<button type="button" class="btn btn-default col-sm-6 col-lg-6 col-md-6 center-block" ng-click="view_my_buildings()">View my buildings</button>
+            <button type="button" class="btn btn-default col-sm-6 col-lg-6 col-md-6 center-block" ng-click="view_my_buildings()">View my buildings</button>
         </div>
         <div class="row text-center">
-        	<button type="button" class="btn btn-primary col-sm-6 col-lg-6 col-md-6 center-block" ng-click="goto_data_matching()">Review matches</button>
+            <button type="button" class="btn btn-primary col-sm-6 col-lg-6 col-md-6 center-block" ng-click="goto_data_matching()">Review matches</button>
         </div>
     </div>
     <div ng-switch-when="9">
@@ -207,7 +207,7 @@ <h4 class="modal-title" ng-switch-when="12">Error Processing Data</h4>
     </div>
     <div ng-switch-when="10">
         <div class="row text-center">
-        	<button type="button" class="btn btn-primary col-sm-6 col-lg-6 col-md-6 center-block" ng-click="goto_step(2)">Add another file</button>
+            <button type="button" class="btn btn-primary col-sm-6 col-lg-6 col-md-6 center-block" ng-click="goto_step(2)">Add another file</button>
         </div>
         <div class="row text-center">
             <button type="button" class="btn btn-primary col-sm-6 col-lg-6 col-md-6 center-block" ng-click="view_my_buildings()">View my buildings</button>
diff --git a/seed/static/seed/partials/dataset_list.html b/seed/static/seed/partials/dataset_list.html
index 5bbad22f2e..9acf869cd0 100644
--- a/seed/static/seed/partials/dataset_list.html
+++ b/seed/static/seed/partials/dataset_list.html
@@ -15,58 +15,58 @@ <h1><i class="fa fa-sitemap"></i> {$ datasets.length | number:0 $} Data Sets</h1
 <div class="section">
     <div class="section_content_container">
         <div class="section_content">
-			<div class="table_list_container dataset_list" ng-cloak>
-		        <table class="table table-striped sorted">
-		            <tr>
-		                <th ng-repeat="c in columns" class="{$c.class$}" ng-click="c.toggle_sort()" ng-class="c.sorted_class()">
-		                    {$c.title$}
-		                </th>
-		            </tr>
+            <div class="table_list_container dataset_list" ng-cloak>
+                <table class="table table-striped sorted">
+                    <tr>
+                        <th ng-repeat="c in columns" class="{$c.class$}" ng-click="c.toggle_sort()" ng-class="c.sorted_class()">
+                            {$c.title$}
+                        </th>
+                    </tr>
 
-		            <tr ng-repeat="d in datasets" class="import_row">
-		                <td ng-class="d.column_class('name')" class="name">
-		                    <span class="view">
-		                        <a ng-href="#/data/{$d.id$}" class="import_name" ng-show="!d.edit_form_showing">{$d.name$}</a>
-		                        <a href="" class="delete_link" ng-click="confirm_delete(d)" ng-show="!d.edit_form_showing"><i class='fa fa-trash-o'></i></a>
-		                        <a href="" class="replace_file_button edit_file_name" ng-click="edit_dataset_name(d)" ng-show="!d.edit_form_showing"><i class="fa fa-pencil"></i></a>
-		                    </span>
-		                    <div class="row action edit_file_name" ng-show="d.edit_form_showing">
-		                        <form class="form form-inline edit_import_meta_form"
+                    <tr ng-repeat="d in datasets" class="import_row">
+                        <td ng-class="d.column_class('name')" class="name">
+                            <span class="view">
+                                <a ng-href="#/data/{$d.id$}" class="import_name" ng-show="!d.edit_form_showing">{$d.name$}</a>
+                                <a href="" class="delete_link" ng-click="confirm_delete(d)" ng-show="!d.edit_form_showing"><i class='fa fa-trash-o'></i></a>
+                                <a href="" class="replace_file_button edit_file_name" ng-click="edit_dataset_name(d)" ng-show="!d.edit_form_showing"><i class="fa fa-pencil"></i></a>
+                            </span>
+                            <div class="row action edit_file_name" ng-show="d.edit_form_showing">
+                                <form class="form form-inline edit_import_meta_form"
                                               role="form" action="" method="PUT" ng-submit=""
                                               be-enter="save_dataset_name(d)">
-		                            <div class="form-group col-sm-6 col-md-6">
-		                                <label class="sr-only" for="editDatasetName">Edit Name</label>
-		                                <input class="form-control input-sm" id="editDatasetName" type="text" name="name" ng-model="d.name" />
-		                            </div>
-		                            <div class="form-group col-sm-5 col-md-5">
-		                                <button type="submit" class="cancel_button btn btn-sm" ng-click="cancel_edit_name(d)" value="Cancel">Cancel</button>
-		                                <button type="submit" class="submit_button btn btn-sm btn-primary"  ng-click="save_dataset_name(d)"  value="Save">Save</button>
-		                            </div>
-		                        </form>
-		                    </div>
-		                </td>
-		                <td ng-class="d.column_class('status')" class="status_change status is_aligned_right">{$ d.importfiles.length | number:0 $}</td>
-		                <td ng-class="d.column_class('last_modified_seconds_ago')" class="last_change last_changed">{$ d.updated_at | fromNow $}</td>
-		                <td ng-class="d.column_class('last_modified_by')" class="last_change_user changed_by"> <span class="modified_by">{$d.last_modified_by$}</span></td>
+                                    <div class="form-group col-sm-6 col-md-6">
+                                        <label class="sr-only" for="editDatasetName">Edit Name</label>
+                                        <input class="form-control input-sm" id="editDatasetName" type="text" name="name" ng-model="d.name" />
+                                    </div>
+                                    <div class="form-group col-sm-5 col-md-5">
+                                        <button type="submit" class="cancel_button btn btn-sm" ng-click="cancel_edit_name(d)" value="Cancel">Cancel</button>
+                                        <button type="submit" class="submit_button btn btn-sm btn-primary"  ng-click="save_dataset_name(d)"  value="Save">Save</button>
+                                    </div>
+                                </form>
+                            </div>
+                        </td>
+                        <td ng-class="d.column_class('status')" class="status_change status is_aligned_right">{$ d.importfiles.length | number:0 $}</td>
+                        <td ng-class="d.column_class('last_modified_seconds_ago')" class="last_change last_changed">{$ d.updated_at | fromNow $}</td>
+                        <td ng-class="d.column_class('last_modified_by')" class="last_change_user changed_by"> <span class="modified_by">{$d.last_modified_by$}</span></td>
 
-		                <td ng-class="d.column_class('')" class="status_details percent_done">
-		                    <button type="button" class="btn btn-sm btn-primary" ng-click="open_data_upload_modal(d)">Add Data Files</button>
-		                </td>
-		            </tr>
+                        <td ng-class="d.column_class('')" class="status_details percent_done">
+                            <button type="button" class="btn btn-sm btn-primary" ng-click="open_data_upload_modal(d)">Add Data Files</button>
+                        </td>
+                    </tr>
 
-		        </table>
-		        <div class="table_footer">
-		            <div class="display_number_entries col-sm-3 col-md-3"></div>
-		            <div class="pager_container col-sm-5 col-md-5" ng-show="more_than_one_page()">
-		                <ul class="pager">
-							<li><a href="" ng-click="first_page()" ng-show="current_page != 1"><i class="fa fa-angle-double-left"></i> First Record</a></li>
-							<li><a href="" ng-click="prev_page()" ng-show="current_page != 1"><i class="fa fa-angle-left"></i> Previous</a></li>
-							<li><a href="" ng-click="next_page()" ng-show="current_page != num_pages">Next <i class="fa fa-angle-right"></i></a></li>
-							<li><a href="" ng-click="last_page()" ng-show="current_page != num_pages">Last Record <i class="fa fa-angle-double-right"></i></a></li>
-		                </ul>
-		            </div>
-		        </div>
-		    </div>
+                </table>
+                <div class="table_footer">
+                    <div class="display_number_entries col-sm-3 col-md-3"></div>
+                    <div class="pager_container col-sm-5 col-md-5" ng-show="more_than_one_page()">
+                        <ul class="pager">
+                            <li><a href="" ng-click="first_page()" ng-show="current_page != 1"><i class="fa fa-angle-double-left"></i> First Record</a></li>
+                            <li><a href="" ng-click="prev_page()" ng-show="current_page != 1"><i class="fa fa-angle-left"></i> Previous</a></li>
+                            <li><a href="" ng-click="next_page()" ng-show="current_page != num_pages">Next <i class="fa fa-angle-right"></i></a></li>
+                            <li><a href="" ng-click="last_page()" ng-show="current_page != num_pages">Last Record <i class="fa fa-angle-double-right"></i></a></li>
+                        </ul>
+                    </div>
+                </div>
+            </div>
         </div>
     </div>
 </div>
diff --git a/seed/static/seed/partials/existing_members_modal.html b/seed/static/seed/partials/existing_members_modal.html
index 14f009bc11..6f2743bef5 100644
--- a/seed/static/seed/partials/existing_members_modal.html
+++ b/seed/static/seed/partials/existing_members_modal.html
@@ -1,60 +1,60 @@
 <div class="modal-header">
-	<button type="button" class="close" ng-click="close()" aria-hidden="true"><i class="fa fa-times"></i></button>
-	<h4 class="modal-title" id="addMemberFromListLabel">Add Members from a List</h4>
+    <button type="button" class="close" ng-click="close()" aria-hidden="true"><i class="fa fa-times"></i></button>
+    <h4 class="modal-title" id="addMemberFromListLabel">Add Members from a List</h4>
 </div>
 <div class="modal-body">
-	<div class="table_list_container">
-	    <table class="table table-striped table_highlight_first">
-	    	<thead>
-	            <tr>
-	                <th class="check is_aligned_center"><input type="checkbox"></th>
-	                <th>Member Name</th>
-	                <th>Member Email</th>
-	                <th>Role</th>
-	            </tr>
-	    	</thead>
-	    	<tbody>
-	    		<tr>
-	        		<td class="check is_aligned_center">
-						<input type="checkbox" value="">
-					</td>
-					<td>
-						<span>John Smith</span>
-					</td>
-					<td>
-						<span>john.smith@thebest.org</span>
-					</td>
-					<td>
-						<select class="form-control">
-		                	<option>Owner</option>
-			                <option>Member</option>
-			                <option>Viewer</option>	
-		                </select>
-					</td>
-	    		</tr>
-	    		<tr>
-	        		<td class="check is_aligned_center">
-						<input type="checkbox" value="">
-					</td>
-					<td>
-						<span>John Smith</span>
-					</td>
-					<td>
-						<span>john.smith@thebest.org</span>
-					</td>
-					<td>
-						<select class="form-control">
-		                	<option>Owner</option>
-			                <option>Member</option>
-			                <option>Viewer</option>	
-		                </select>
-					</td>
-	    		</tr>
-	    	</tbody>
-	    </table>
-	</div>
+    <div class="table_list_container">
+        <table class="table table-striped table_highlight_first">
+            <thead>
+                <tr>
+                    <th class="check is_aligned_center"><input type="checkbox"></th>
+                    <th>Member Name</th>
+                    <th>Member Email</th>
+                    <th>Role</th>
+                </tr>
+            </thead>
+            <tbody>
+                <tr>
+                    <td class="check is_aligned_center">
+                        <input type="checkbox" value="">
+                    </td>
+                    <td>
+                        <span>John Smith</span>
+                    </td>
+                    <td>
+                        <span>john.smith@thebest.org</span>
+                    </td>
+                    <td>
+                        <select class="form-control">
+                            <option>Owner</option>
+                            <option>Member</option>
+                            <option>Viewer</option>    
+                        </select>
+                    </td>
+                </tr>
+                <tr>
+                    <td class="check is_aligned_center">
+                        <input type="checkbox" value="">
+                    </td>
+                    <td>
+                        <span>John Smith</span>
+                    </td>
+                    <td>
+                        <span>john.smith@thebest.org</span>
+                    </td>
+                    <td>
+                        <select class="form-control">
+                            <option>Owner</option>
+                            <option>Member</option>
+                            <option>Viewer</option>    
+                        </select>
+                    </td>
+                </tr>
+            </tbody>
+        </table>
+    </div>
 </div>
 <div class="modal-footer">
-	<button type="button" class="btn btn-default" ng-click="cancel()">Cancel</button>
-	<button type="button" class="btn btn-primary">Invite Checked Members</button>
+    <button type="button" class="btn btn-default" ng-click="cancel()">Cancel</button>
+    <button type="button" class="btn btn-primary">Invite Checked Members</button>
 </div>
diff --git a/seed/static/seed/partials/export_modal.html b/seed/static/seed/partials/export_modal.html
index c1bed64931..d3da85527e 100644
--- a/seed/static/seed/partials/export_modal.html
+++ b/seed/static/seed/partials/export_modal.html
@@ -5,37 +5,37 @@ <h4 class="modal-title" id="exportModalLabel" ng-show="export_state == 'prepare'
   <h4 class="modal-title" id="exportModalLabel" ng-show="export_state == 'success'">Success!</h4>
 </div>
 <div class="modal-body form-horizontal" style="padding-bottom: 0;">
-	<div class="form-group" ng-show="export_state == 'create'">
-		<label class="control-label col-sm-3" for="fileName" >Export Name</label>
-		<div class="col-sm-8" ng-show="export_state == 'create'">
-		  <input type="text" class="form-control" id="fileName" ng-model="building_export.export_name" placeholder="File Name" required>
-		</div>
-	</div>
-	<div class="form-group" style="margin-bottom: 0;" ng-show="export_state == 'create'">
-		<div class="col-sm-offset-3 col-sm-8 export_radio">
-			<label class="radio radio-inline">
-				<input type="radio" name="optionsRadio" id="optionsRadio1" value="csv" ng-model="building_export.export_type"> CSV
-			</label>
-			<label class="radio radio-inline">
-				<input type="radio" name="optionsRadio" id="optionsRadio2" value="xls" ng-model="building_export.export_type"> XLS
-			</label>
-		</div>
-	</div>
-	<div class="form-group" ng-show="export_state == 'prepare'">
-		<div class="col-sm-7">
-			<div class="progress">
-				<progressbar class="progress-striped active" value="progress_percentage" type="success"></progressbar>
-			</div>
-		</div>
-		<div class="col-sm-5">
-			{$ progress_numerator | number:0 $} / {$ progress_denominator | number:0 $} Buildings
-		</div>
-	</div>
-	<div class="form-group" ng-show="export_state == 'success'">
-		<div class="col-sm-12" >
-			If for any reason a download of your file does not complete, click the 'retry export' button to retry.
-		</div>
-	</div>
+    <div class="form-group" ng-show="export_state == 'create'">
+        <label class="control-label col-sm-3" for="fileName" >Export Name</label>
+        <div class="col-sm-8" ng-show="export_state == 'create'">
+          <input type="text" class="form-control" id="fileName" ng-model="building_export.export_name" placeholder="File Name" required>
+        </div>
+    </div>
+    <div class="form-group" style="margin-bottom: 0;" ng-show="export_state == 'create'">
+        <div class="col-sm-offset-3 col-sm-8 export_radio">
+            <label class="radio radio-inline">
+                <input type="radio" name="optionsRadio" id="optionsRadio1" value="csv" ng-model="building_export.export_type"> CSV
+            </label>
+            <label class="radio radio-inline">
+                <input type="radio" name="optionsRadio" id="optionsRadio2" value="xls" ng-model="building_export.export_type"> XLS
+            </label>
+        </div>
+    </div>
+    <div class="form-group" ng-show="export_state == 'prepare'">
+        <div class="col-sm-7">
+            <div class="progress">
+                <progressbar class="progress-striped active" value="progress_percentage" type="success"></progressbar>
+            </div>
+        </div>
+        <div class="col-sm-5">
+            {$ progress_numerator | number:0 $} / {$ progress_denominator | number:0 $} Buildings
+        </div>
+    </div>
+    <div class="form-group" ng-show="export_state == 'success'">
+        <div class="col-sm-12" >
+            If for any reason a download of your file does not complete, click the 'retry export' button to retry.
+        </div>
+    </div>
 </div>
 <div class="modal-footer">
   <button type="button" class="btn btn-default" ng-show="export_state == 'create'" ng-click="cancel()">Cancel</button>
diff --git a/seed/static/seed/partials/feedback.html b/seed/static/seed/partials/feedback.html
index b263547522..46d7aa5a07 100644
--- a/seed/static/seed/partials/feedback.html
+++ b/seed/static/seed/partials/feedback.html
@@ -2,33 +2,33 @@
   <div class="section_content_container">
     <div class="section_content">
       <div class="content_block row">
-	<div class="col-md-8 col-sm-8">
+        <div class="col-md-8 col-sm-8">
           <h1>Contact</h1>
 
-	  <h2>For SEED-Platform Users:</h2>
-	  <p>Please visit our User Support website for tutorials and documentation to help you learn how to use SEED-Platform. </p>
+          <h2>For SEED-Platform Users:</h2>
+          <p>Please visit our User Support website for tutorials and documentation to help you learn how to use SEED-Platform. </p>
 
-	  <p style="margin-left: 2em;"><a href="https://sites.google.com/a/lbl.gov/seed/">https://sites.google.com/a/lbl.gov/seed/</a></p>
+          <p style="margin-left: 2em;"><a href="https://sites.google.com/a/lbl.gov/seed/">https://sites.google.com/a/lbl.gov/seed/</a></p>
 
-	  <p>There is also a link to the SEED-Platform Users forum, where you can connect with other users.</p>
+          <p>There is also a link to the SEED-Platform Users forum, where you can connect with other users.</p>
 
-	  <p style="margin-left: 2em;"><a href="https://groups.google.com/forum/#!forum/seed-platform-users">https://groups.google.com/forum/#!forum/seed-platform-users</a></p>
+          <p style="margin-left: 2em;"><a href="https://groups.google.com/forum/#!forum/seed-platform-users">https://groups.google.com/forum/#!forum/seed-platform-users</a></p>
 
-	  <p>For direct help on a specific problem, please email:</p>
+          <p>For direct help on a specific problem, please email:</p>
 
-	  <p style="margin-left: 2em;"><a href="mailto:SEED-Support@lists.lbl.gov">SEED-Support@lists.lbl.gov</a></p>
+          <p style="margin-left: 2em;"><a href="mailto:SEED-Support@lists.lbl.gov">SEED-Support@lists.lbl.gov</a></p>
 
-	  <h2>For SEED-Platform Developers:</h2>
+          <h2>For SEED-Platform Developers:</h2>
 
-	  <p>The Open Source code is available on the Github organization SEED-Platform:</p>
+          <p>The Open Source code is available on the Github organization SEED-Platform:</p>
 
-	  <p style="margin-left: 2em;"><a href="https://github.com/SEED-platform">https://github.com/SEED-platform</a></p>
+          <p style="margin-left: 2em;"><a href="https://github.com/SEED-platform">https://github.com/SEED-platform</a></p>
 
-	  <p>Please join the SEED-Platform Dev forum where you can connect with other developers.</p>
+          <p>Please join the SEED-Platform Dev forum where you can connect with other developers.</p>
 
-	  <p style="margin-left: 2em;"><a href="https://groups.google.com/forum/#!forum/seed-platform-dev">https://groups.google.com/forum/#!forum/seed-platform-dev</a></p>
+          <p style="margin-left: 2em;"><a href="https://groups.google.com/forum/#!forum/seed-platform-dev">https://groups.google.com/forum/#!forum/seed-platform-dev</a></p>
 
-	</div>
+        </div>
       </div>
     </div>
   </div>
diff --git a/seed/static/seed/partials/home.html b/seed/static/seed/partials/home.html
index af7c789281..afb1aa91ef 100644
--- a/seed/static/seed/partials/home.html
+++ b/seed/static/seed/partials/home.html
@@ -7,84 +7,84 @@
           <a href="#/buildings"><i class="fa fa-building-o"></i>Buildings</a>
           <a href="#/data" ng-show="menu.user.organization.user_role !== 'viewer'"><i class="fa fa-sitemap"></i>Data</a>
           <a href="#/feedback"><i class="fa fa-certificate"></i>Contact</a>
-        </div>		
+        </div>        
       </div>
       <div class="jumbotron">
         <div class="home_hero_content_container">
-	  <h1>Getting Started</h1>
+          <h1>Getting Started</h1>
 
-	  <p>The DOE developed the Standard Energy Efficiency Data
-	  (SEED) Platform&#0153; as a free software tool that provides
-	  a standardized format for collecting, storing and analyzing
-	  building energy performance information about large
-	  portfolios. Upload your buildings list to get started.</p>
-	  
-	  <p><a href="javascript:void(0);" data-toggle="modal" data-target="#dataUploadModal" ng-click="open_data_upload_modal()" class="btn btn-primary btn-lg" role="button" ng-hide="menu.user.organization.user_role === 'viewer'"><i class="fa fa-cloud-upload"></i>&nbsp;&nbsp;Upload your buildings list</a> <a ng-href="{$ urls.static_url $}seed/pdf/SEED_Platform_V1.1_Getting_Started_Guide.pdf" target="_blank" title="SEED_v1.1_User_Guide" class="btn btn-warning btn-lg" role="button"><i class="fa fa-file-text"></i>&nbsp;&nbsp;Getting Started Guide</a></p>
+          <p>The DOE developed the Standard Energy Efficiency Data
+          (SEED) Platform&#0153; as a free software tool that provides
+          a standardized format for collecting, storing and analyzing
+          building energy performance information about large
+          portfolios. Upload your buildings list to get started.</p>
+          
+          <p><a href="javascript:void(0);" data-toggle="modal" data-target="#dataUploadModal" ng-click="open_data_upload_modal()" class="btn btn-primary btn-lg" role="button" ng-hide="menu.user.organization.user_role === 'viewer'"><i class="fa fa-cloud-upload"></i>&nbsp;&nbsp;Upload your buildings list</a> <a ng-href="{$ urls.static_url $}seed/pdf/SEED_Platform_V1.1_Getting_Started_Guide.pdf" target="_blank" title="SEED_v1.1_User_Guide" class="btn btn-warning btn-lg" role="button"><i class="fa fa-file-text"></i>&nbsp;&nbsp;Getting Started Guide</a></p>
         </div>
       </div>
       <div class="whats_new_container">
-	<div class="whats_new">
-	  <h2>Highlights of SEED Platform&#0153;</h2>
-	  
-	  <div class="row">
-	    <div class="content_col col-md-4">
-	      <div class="content_col_header">
-		<div class="content_col_header_left">
-		  <span><i class="fa fa-cloud-upload"></i></span>
-		</div>
-		<div class="content_col_header_right">
-		  <h3>Upload your data</h3>
-		</div>
-	      </div>
-	      <div class="copy">
+        <div class="whats_new">
+          <h2>Highlights of SEED Platform&#0153;</h2>
+          
+          <div class="row">
+            <div class="content_col col-md-4">
+              <div class="content_col_header">
+                <div class="content_col_header_left">
+                  <span><i class="fa fa-cloud-upload"></i></span>
+                </div>
+                <div class="content_col_header_right">
+                  <h3>Upload your data</h3>
+                </div>
+              </div>
+              <div class="copy">
 
-		<p>Get started using SEED Platform&#0153; by uploading your buildings
-		list (city tax assessor data) and then your EPA
-		Portfolio Manager data. Make sure these files are each
-		in .csv, .xls, .xlsx, or .xml format. The SEED
-		Platform will help you map and validate your data in
-		the process of loading.</p>
+                <p>Get started using SEED Platform&#0153; by uploading your buildings
+                list (city tax assessor data) and then your EPA
+                Portfolio Manager data. Make sure these files are each
+                in .csv, .xls, .xlsx, or .xml format. The SEED
+                Platform will help you map and validate your data in
+                the process of loading.</p>
 
-		<p><a ng-href="{$ urls.static_url $}seed/sample-data/seed-sample-data.zip" class="btn btn-info" role="button"><i class="fa fa-cloud-download"></i>&nbsp;&nbsp;Download Sample Data</a></p>
+                <p><a ng-href="{$ urls.static_url $}seed/sample-data/seed-sample-data.zip" class="btn btn-info" role="button"><i class="fa fa-cloud-download"></i>&nbsp;&nbsp;Download Sample Data</a></p>
 
-		
-	      </div>
-	    </div>
-	    <div class="content_col col-md-4">
-	      <div class="content_col_header">
-		<div class="content_col_header_left">
-		  <span><i class="fa fa-exchange"></i></span>
-		</div>
-		<div class="content_col_header_right">
-		  <h3>Match your data</h3>
-		</div>
-	      </div>
-	      <div class="copy">
-		
-		<p>Match-up your buildings list with the Portfolio
-		Manager dataset to tie building records together. SEED
-		Platform will help you by auto-matching high confidence
-		pairings and then provide you with tools to match the
-		rest of your dataset.</p>
-		
-	      </div>
-	    </div>
-	    <div class="content_col col-md-4">
-	      <div class="content_col_header">
-		<div class="content_col_header_left">
-		  <span><i class="fa fa-check-square"></i></span>
-		</div>
-		<div class="content_col_header_right">
-		  <h3>Manage compliance</h3>
-		</div>
-	      </div>
-	      <div class="copy">
-		<p>Use SEED Platform's flexible, easy-to-use labeling system and project groupings to track the status of data submission, review, and compliance.</p>
-		
-	      </div>
-	    </div>
-	  </div>
-	</div>
+            
+              </div>
+            </div>
+            <div class="content_col col-md-4">
+              <div class="content_col_header">
+                <div class="content_col_header_left">
+                  <span><i class="fa fa-exchange"></i></span>
+                </div>
+                <div class="content_col_header_right">
+                  <h3>Match your data</h3>
+                </div>
+              </div>
+              <div class="copy">
+            
+                <p>Match-up your buildings list with the Portfolio
+                Manager dataset to tie building records together. SEED
+                Platform will help you by auto-matching high confidence
+                pairings and then provide you with tools to match the
+                rest of your dataset.</p>
+            
+              </div>
+            </div>
+            <div class="content_col col-md-4">
+              <div class="content_col_header">
+                <div class="content_col_header_left">
+                  <span><i class="fa fa-check-square"></i></span>
+                </div>
+                <div class="content_col_header_right">
+                  <h3>Manage compliance</h3>
+                </div>
+              </div>
+              <div class="copy">
+                <p>Use SEED Platform's flexible, easy-to-use labeling system and project groupings to track the status of data submission, review, and compliance.</p>
+            
+              </div>
+            </div>
+          </div>
+        </div>
       </div>
     </div>
   </div>
diff --git a/seed/static/seed/partials/mapping.html b/seed/static/seed/partials/mapping.html
index a491756ab1..0fc03dca5c 100644
--- a/seed/static/seed/partials/mapping.html
+++ b/seed/static/seed/partials/mapping.html
@@ -184,8 +184,8 @@ <h1>Data Mapping &amp; Validation ({$ import_file.name $})</h1>
                 <button type="button" class="btn btn-primary" ng-click="review_mappings=false; show_mapped_buildings=false"><i class="fa fa-chevron-left"></i> Back to Mapping</button>
             </div>
             <div class="right_wide section_action_container section_action_btn">
-            	<button type="button" class="btn btn-default" ng-click="open_edit_columns_modal()"><i class="fa fa-columns"></i>View/Hide Columns</button>
-            	<a ng-href="#/data/mapping/{$ import_file.id $}"><button type="button" class="pull-right btn btn-primary" ng-click="open_data_upload_modal(import_file.dataset)" ng-hide="import_file.matching_done">Save Mappings</button></a>
+                <button type="button" class="btn btn-default" ng-click="open_edit_columns_modal()"><i class="fa fa-columns"></i>View/Hide Columns</button>
+                <a ng-href="#/data/mapping/{$ import_file.id $}"><button type="button" class="pull-right btn btn-primary" ng-click="open_data_upload_modal(import_file.dataset)" ng-hide="import_file.matching_done">Save Mappings</button></a>
             </div>
         </div>
     </div>
diff --git a/seed/static/seed/partials/matching.html b/seed/static/seed/partials/matching.html
index 54258a7385..d7d4a7f95d 100644
--- a/seed/static/seed/partials/matching.html
+++ b/seed/static/seed/partials/matching.html
@@ -14,56 +14,56 @@ <h1>Data Matching ({$ import_file.dataset.name $})</h1>
 
     <alert ng-repeat="alert in alerts" type="alert.type" close="closeAlert($index)">{$ alert.msg $}</alert>
 
-	<div class="section_tab_container">
-	  <tabset>
-	    <tab heading="Auto Matching">
-	    	<div class="row">
-	    		<div class="col-lg-6 col-sm-6 tab_content wide">
-	    			<p><strong>HOW THE SYSTEM AUTO-MATCHES YOUR BUILDINGS:</strong></p>
-					<p>Your source data file(s) are presented in the table on the left. All buildings where a possible data match exists are presented in a table on the right. The system attempts to auto-match building records using shared unique IDs like: PM Proprty ID, Tax Lot ID, and Custom IDs as well as Address information. Where the system believes a match exists between a record in your source file and an existing building record it will auto-check the 'match' <i class="fa fa-check-square-o"></i> checkbox &mdash; effectively making a match between these buildings. A confidence number (0 - 100%) is included to indicate the systems confidence that this match is correct.</p>
-				</div>
-				<div class="col-lg-6 col-sm-6 key tab_content wide">
-		    		<p class="important-tip"><strong>FIELDS NEEDED TO MAKE BUILDING MATCHES:</strong></p>
-		    		<p>The following is a list of the fields we use to match up buildings between different records. The more data you have in these four (4) fields the better our system will auto-match your buildings.</p>
-					<p><span class="label label-warning">Tax Lot ID</span> <span class="label label-warning">PM Property ID</span></p>
-					<p><span class="label label-warning">Custom ID</span> <span class="label label-warning">Address Line 1</span></p>
-				</div>
-	    	</div>
-	    </tab>
-	    <tab heading="Manual Matching" active="tab.active" disabled="tab.disabled">
-	      <div class="row">
-		      <div class="col-lg-6 col-sm-6 tab_content wide">
-		      	<p><strong>HOW TO MANUALLY MATCH YOUR BUILDINGS:</strong></p>
-					<p>You can review and edit each individual match by clicking one of the linked IDs in the table. This will open a new table that shows the source data for the individual building record you are attempting to match. Underneath this building is a searchable list of all potential existing building matches. Use this table to explore all your building records and to select single or multiple building records to match you source data to. </p>
-		      </div>
-		      <div class="col-lg-6 col-sm-6 tab_content wide">
-	    			<p><strong>VIEW/HIDE COLUMNS</strong></p>
-	    			<p>You can customize the columns displayed in the table below by clicking the 'View/Hide Columns' button and then selecting the column headers you want to review from the modal window.</p>
-	    		</div>
-	      </div>
+    <div class="section_tab_container">
+        <tabset>
+            <tab heading="Auto Matching">
+                <div class="row">
+                    <div class="col-lg-6 col-sm-6 tab_content wide">
+                        <p><strong>HOW THE SYSTEM AUTO-MATCHES YOUR BUILDINGS:</strong></p>
+                        <p>Your source data file(s) are presented in the table on the left. All buildings where a possible data match exists are presented in a table on the right. The system attempts to auto-match building records using shared unique IDs like: PM Proprty ID, Tax Lot ID, and Custom IDs as well as Address information. Where the system believes a match exists between a record in your source file and an existing building record it will auto-check the 'match' <i class="fa fa-check-square-o"></i> checkbox &mdash; effectively making a match between these buildings. A confidence number (0 - 100%) is included to indicate the systems confidence that this match is correct.</p>
+                    </div>
+                    <div class="col-lg-6 col-sm-6 key tab_content wide">
+                        <p class="important-tip"><strong>FIELDS NEEDED TO MAKE BUILDING MATCHES:</strong></p>
+                        <p>The following is a list of the fields we use to match up buildings between different records. The more data you have in these four (4) fields the better our system will auto-match your buildings.</p>
+                        <p><span class="label label-warning">Tax Lot ID</span> <span class="label label-warning">PM Property ID</span></p>
+                        <p><span class="label label-warning">Custom ID</span> <span class="label label-warning">Address Line 1</span></p>
+                    </div>
+                </div>
+            </tab>
+            <tab heading="Manual Matching" active="tab.active" disabled="tab.disabled">
+                <div class="row">
+                    <div class="col-lg-6 col-sm-6 tab_content wide">
+                        <p><strong>HOW TO MANUALLY MATCH YOUR BUILDINGS:</strong></p>
+                        <p>You can review and edit each individual match by clicking one of the linked IDs in the table. This will open a new table that shows the source data for the individual building record you are attempting to match. Underneath this building is a searchable list of all potential existing building matches. Use this table to explore all your building records and to select single or multiple building records to match you source data to. </p>
+                    </div>
+                    <div class="col-lg-6 col-sm-6 tab_content wide">
+                        <p><strong>VIEW/HIDE COLUMNS</strong></p>
+                        <p>You can customize the columns displayed in the table below by clicking the 'View/Hide Columns' button and then selecting the column headers you want to review from the modal window.</p>
+                    </div>
+                </div>
 
-	    </tab>
-	    <tab class="pull-right" heading="Collapse Tabs"></tab>
-	  </tabset>
-	</div>
-	<div class="section_header_container has_no_border">
+            </tab>
+            <tab class="pull-right" heading="Collapse Tabs"></tab>
+        </tabset>
+    </div>
+    <div class="section_header_container has_no_border">
         <div class="section_header fixed_height">
             <div class="left section_action_container row matching_toggle">
-            	<div class="col-sm-2" ng-hide="show_building_list">
-	            <button type="button" class="btn btn-primary btn-sm" ng-disabled="duplicates_present()" ng-click="back_to_list()"><i class="fa fa-chevron-left"></i>Back to List</button>
-            	</div>
+                <div class="col-sm-2" ng-hide="show_building_list">
+                <button type="button" class="btn btn-primary btn-sm" ng-disabled="duplicates_present()" ng-click="back_to_list()"><i class="fa fa-chevron-left"></i>Back to List</button>
+                </div>
             </div>
             <div class="right section_action_container section_action_btn">
-            	<button type="button" class="btn btn-default btn-sm" ng-click="open_edit_columns_modal()"><i class="fa fa-columns"></i>View/Hide Columns</button>
+                <button type="button" class="btn btn-default btn-sm" ng-click="open_edit_columns_modal()"><i class="fa fa-columns"></i>View/Hide Columns</button>
             </div>
         </div>
     </div>
     
-    <!-- matching list contanier -->
+    <!-- matching list container -->
     <ng-include src="urls.static_url + 'seed/partials/matching_list_table.html'" ng-show="show_building_list">
     </ng-include>
     
-    <!-- matching detail contanier -->
+    <!-- matching detail container -->
     <ng-include src="urls.static_url + 'seed/partials/matching_detail_table.html'" ng-hide="show_building_list">
         <!-- matching detail table loads here -->
     </ng-include>
diff --git a/seed/static/seed/partials/matching_detail.html b/seed/static/seed/partials/matching_detail.html
index aec2f8880c..d247539217 100644
--- a/seed/static/seed/partials/matching_detail.html
+++ b/seed/static/seed/partials/matching_detail.html
@@ -59,19 +59,19 @@ <h1>Matching ({$ import_file.file_name $})</h1>
                             </tr>
                         </thead>
                         <tbody>
-                             <tr>
-		                        <td class="to_match check is_aligned_center" ng-show="!building.matched"><i class="fa fa-question-circle"></i></td>
-		                        <td class="to_match check is_aligned_center" ng-show="building.matched"><i class="fa fa-check"></i></td>
-		
-		                        <td class="to_match">{$ building.property_id $}</td>
-		                        <td class="to_match">{$ building.extra_data['Custom Property ID 1 - ID'] $}</td>
-		                        <td class="to_match">{$ building.property_name $}</td>
-		                        <td class="to_match">{$ building.address_line_1 $}</td>
-		                        <td class="to_match">{$ building.year_built $}</td>
-		                        <td class="to_match">{$ building.postal_code $}</td>
-		                        <td class="to_match">{$ building.property_floor_area_bldg_park | number:0 $}</td>
-		                    </tr>
-		                    <tr ng-repeat="b in assessed_buildings | filter:filter_params:strict">
+                            <tr>
+                                <td class="to_match check is_aligned_center" ng-show="!building.matched"><i class="fa fa-question-circle"></i></td>
+                                <td class="to_match check is_aligned_center" ng-show="building.matched"><i class="fa fa-check"></i></td>
+        
+                                <td class="to_match">{$ building.property_id $}</td>
+                                <td class="to_match">{$ building.extra_data['Custom Property ID 1 - ID'] $}</td>
+                                <td class="to_match">{$ building.property_name $}</td>
+                                <td class="to_match">{$ building.address_line_1 $}</td>
+                                <td class="to_match">{$ building.year_built $}</td>
+                                <td class="to_match">{$ building.postal_code $}</td>
+                                <td class="to_match">{$ building.property_floor_area_bldg_park | number:0 $}</td>
+                            </tr>
+                            <tr ng-repeat="b in assessed_buildings | filter:filter_params:strict">
                                 <td class="is_aligned_center">
                                     <input type="checkbox" ng-model="b.matched" ng-change="toggle_match(b)">
                                 </td>
@@ -92,27 +92,27 @@ <h1>Matching ({$ import_file.file_name $})</h1>
                     </table>
                 </div>
                 <div class="table_footer">
-                <div class="display_number_entries col-sm-3 col-md-3" ng-hide="true">
-                     <div class="display_number_entries_text">Display:</div>
-                     <div class="display_number_entries_select">
-                        <select class="form-control input-sm col-xs-2" name="number_per_page_select" id="number_per_page_select" ng-options="number_per_page_option for number_per_page_option in number_per_page_options" ng-model="number_per_page_options_model" ng-change="update_number_per_page()">
-                        </select>
+                    <div class="display_number_entries col-sm-3 col-md-3" ng-hide="true">
+                        <div class="display_number_entries_text">Display:</div>
+                        <div class="display_number_entries_select">
+                            <select class="form-control input-sm col-xs-2" name="number_per_page_select" id="number_per_page_select" ng-options="number_per_page_option for number_per_page_option in number_per_page_options" ng-model="number_per_page_options_model" ng-change="update_number_per_page()">
+                            </select>
+                        </div>
+                        <div class="display_number_entries_text">buildings</div>
                     </div>
-                    <div class="display_number_entries_text">buildings</div>
-                </div>
-            <div class="counts col-sm-4 col-md-4">
-                <span>{$ assessed_buildings.length | number:0 $} possible matches</span>
-            </div>
-            <div class="pager_container col-sm-5 col-md-5" ng-hide="true">
-                <ul class="pager">
-                    <li ng-class="{disabled: prev_page_disabled}"><a ng-click="first_page()"><i class="fa fa-angle-double-left"></i> First Record</a></li>
-                    <li ng-class="{disabled: prev_page_disabled}"><a ng-click="prev_page()"><i class="fa fa-angle-left"></i> Previous</a></li>
+                    <div class="counts col-sm-4 col-md-4">
+                        <span>{$ assessed_buildings.length | number:0 $} possible matches</span>
+                    </div>
+                    <div class="pager_container col-sm-5 col-md-5" ng-hide="true">
+                        <ul class="pager">
+                            <li ng-class="{disabled: prev_page_disabled}"><a ng-click="first_page()"><i class="fa fa-angle-double-left"></i> First Record</a></li>
+                            <li ng-class="{disabled: prev_page_disabled}"><a ng-click="prev_page()"><i class="fa fa-angle-left"></i> Previous</a></li>
 
-                    <li ng-class="{disabled: next_page_disabled}"><a ng-click="next_page()">Next <i class="fa fa-angle-right"></i></a></li>
-                    <li ng-class="{disabled: next_page_disabled}"><a ng-click="last_page()">Last Record <i class="fa fa-angle-double-right"></i></a></li>
-                </ul>
-            </div>
-        </div>
+                            <li ng-class="{disabled: next_page_disabled}"><a ng-click="next_page()">Next <i class="fa fa-angle-right"></i></a></li>
+                            <li ng-class="{disabled: next_page_disabled}"><a ng-click="last_page()">Last Record <i class="fa fa-angle-double-right"></i></a></li>
+                        </ul>
+                    </div>
+                </div>
             </div>
         </div>
     </div>
diff --git a/seed/static/seed/partials/matching_detail_table.html b/seed/static/seed/partials/matching_detail_table.html
index f7c8465340..8e7f07a600 100644
--- a/seed/static/seed/partials/matching_detail_table.html
+++ b/seed/static/seed/partials/matching_detail_table.html
@@ -26,7 +26,7 @@
                 </thead>
                 <tbody>
                      <tr>
-                    	<td class="potential_matches" colspan="{$ columns.length + 1 $}"><span>Building from Source: <strong>{$ file_select.file.name $}</strong></span> <span class="label label-success matched" ng-show="detail.match_tree.length > 0">Matched!</span> <span ng-hide="true"><a href="" ng-show="detail.match_tree.length > 0">Next unmatched building.</a></span></td>
+                        <td class="potential_matches" colspan="{$ columns.length + 1 $}"><span>Building from Source: <strong>{$ file_select.file.name $}</strong></span> <span class="label label-success matched" ng-show="detail.match_tree.length > 0">Matched!</span> <span ng-hide="true"><a href="" ng-show="detail.match_tree.length > 0">Next unmatched building.</a></span></td>
                     </tr>
                     <tr ng-class="{'info': !detail.match_tree.length > 0, 'success': detail.match_tree.length > 0}">
                         <td class="is_aligned_center"><i class="fa fa-check green" ng-show="detail.match_tree.length > 0"></i></td>
@@ -34,7 +34,7 @@
                         <td ng-repeat="c in columns">{$ building[c.sort_column] $}</td>
                     </tr>
                     <tr>
-                    	<td class="potential_matches" colspan="{$ columns.length + 1 $}"><span>Potential Matches from Source: <strong>Existing Buildings</strong></span></td>
+                        <td class="potential_matches" colspan="{$ columns.length + 1 $}"><span>Potential Matches from Source: <strong>Existing Buildings</strong></span></td>
                     </tr>
                     <!-- matched building -->
                     <tr class="success" ng-repeat="b in detail.match_tree | filter:filter_current_building">
diff --git a/seed/static/seed/partials/matching_list_table.html b/seed/static/seed/partials/matching_list_table.html
index 9a09a69c74..919b455830 100644
--- a/seed/static/seed/partials/matching_list_table.html
+++ b/seed/static/seed/partials/matching_list_table.html
@@ -6,23 +6,23 @@
                         <tr>
                             <th class="source_data" colspan="{$ columns.length $}">
                                 <div ng-show="show_building_list">
-	                                <form class="form-inline" role="form">
-	                                	<div class="form-group">
-	                                		<label class="control-label">File Source:</label>
-	                                		<select ng-model="file_select.file" ng-options="f.name for f in import_file.dataset.importfiles" ng-change="filter_search()"></select>
-	                                	</div>
-				            			<div class="form-group">
+                                    <form class="form-inline" role="form">
+                                        <div class="form-group">
+                                            <label class="control-label">File Source:</label>
+                                            <select ng-model="file_select.file" ng-options="f.name for f in import_file.dataset.importfiles" ng-change="filter_search()"></select>
+                                        </div>
+                                        <div class="form-group">
 
-					            			<div class="col-sm-10 matching_toggle">
-												<label class="radio-inline" ng-click="filter_by_unmatched()">
-													<input type="radio" name="matchingRadios" id="matchingRadios1" value="unmatched"> <strong>{$ unmatched_buildings $}</strong> Unmatched
-												</label>
-												<label class="radio-inline" ng-click="filter_by_matched()">
-													<input type="radio" name="matchingRadios" id="matchingRadios2" value="matched"> <strong>{$ matched_buildings $}</strong> Matched
-												</label>
-					            			</div>
-				            			</div>
-									</form>
+                                            <div class="col-sm-10 matching_toggle">
+                                                <label class="radio-inline" ng-click="filter_by_unmatched()">
+                                                    <input type="radio" name="matchingRadios" id="matchingRadios1" value="unmatched"> <strong>{$ unmatched_buildings $}</strong> Unmatched
+                                                </label>
+                                                <label class="radio-inline" ng-click="filter_by_matched()">
+                                                    <input type="radio" name="matchingRadios" id="matchingRadios2" value="matched"> <strong>{$ matched_buildings $}</strong> Matched
+                                                </label>
+                                            </div>
+                                        </div>
+                                    </form>
                                 </div>
                             </th>
                             <th class="source_data blank" ng-hide="filter_params.children__isnull"></th>
@@ -88,7 +88,7 @@
                                 </label>
                             </td>
                             <td class="is_aligned_center has_no_padding" ng-hide="filter_params.children__isnull">
-                            	<span>{$ b.confidence * 100 | number:0 $}%</span>
+                                <span>{$ b.confidence * 100 | number:0 $}%</span>
                             </td>
                             <td ng-repeat="c in columns" ng-hide="filter_params.children__isnull">
                                 <span ng-switch on="c.type">
diff --git a/seed/static/seed/partials/members.html b/seed/static/seed/partials/members.html
index 3a2455f352..dafc461f5d 100644
--- a/seed/static/seed/partials/members.html
+++ b/seed/static/seed/partials/members.html
@@ -1,7 +1,7 @@
 <div class="page_header_container">
     <div class="page_header">
         <div class="left page_action_container">
-			<a href="#/accounts" class="page_action"><i class="fa fa-chevron-left"></i> Organizations</a>
+            <a href="#/accounts" class="page_action"><i class="fa fa-chevron-left"></i> Organizations</a>
           
         </div>
         <div class="page_title">
@@ -56,18 +56,18 @@ <h1>{$ org.name $}</h1>
                                 {$ u.email $}
                             </td>
                             <td>
-                            	<div class="row">
-                            		<div class="form-group">
-										<div class="col-sm-12">
-											<select class="form-control input-sm" ng-model="u.role" ng-options="role for role in roles" ng-change="update_role(u)" ng-if="auth.requires_owner">
+                                <div class="row">
+                                    <div class="form-group">
+                                        <div class="col-sm-12">
+                                            <select class="form-control input-sm" ng-model="u.role" ng-options="role for role in roles" ng-change="update_role(u)" ng-if="auth.requires_owner">
                                             </select>
                                             <span ng-if="!auth.requires_owner">{$ u.role $}</span>
-										</div>
-									</div>
-                            	</div>
+                                        </div>
+                                    </div>
+                                </div>
                             </td>
                             <td ng-if="auth.can_remove_member">
-                            	<a href="javascript:void(0);" ng-click="remove_member(u)">Remove</a>
+                                <a href="javascript:void(0);" ng-click="remove_member(u)">Remove</a>
                             </td>
                         </tr>
                     </tbody>
diff --git a/seed/static/seed/partials/new_member_modal.html b/seed/static/seed/partials/new_member_modal.html
index cdfefcd0fb..05678dd9d7 100644
--- a/seed/static/seed/partials/new_member_modal.html
+++ b/seed/static/seed/partials/new_member_modal.html
@@ -1,40 +1,40 @@
 <div class="modal-header">
-	<button type="button" class="close" ng-click="close()" aria-hidden="true"><i class="fa fa-times"></i></button>
-	<h4 class="modal-title" id="newMemberLabel">Invite a New Member</h4>
+    <button type="button" class="close" ng-click="close()" aria-hidden="true"><i class="fa fa-times"></i></button>
+    <h4 class="modal-title" id="newMemberLabel">Invite a New Member</h4>
 </div>
 <form name="new_member_form" class="form-horizontal" role="form" ng-submit="submit_form(new_member_form.$valid)" novalidate>
-	<div class="modal-body">
-	    <div class="form-group" ng-class="{ 'has-error' : new_member_form.first_name.$invalid && !new_member_form.first_name.$pristine }">
-			<label class="control-label col-sm-3" for="newMemberFirstName">First Name:</label>
-			<div class="col-sm-8">
-	            <input type="text" class="form-control" name="first_name" id="newMemberFirstName" placeholder="Enter first name" ng-model="user.first_name" required>
-	             <p ng-show="new_member_form.first_name.$invalid && !new_member_form.first_name.$pristine" class="help-block">First name is required.</p>
-	        </div>
-		</div>
-	    <div class="form-group"  ng-class="{ 'has-error' : new_member_form.last_name.$invalid && !new_member_form.last_name.$pristine }">
-			<label class="control-label col-sm-3" for="newMemberLastName">Last Name:</label>
-			<div class="col-sm-8">
-	            <input type="text" class="form-control" name="last_name" placeholder="Enter last name" ng-model="user.last_name" required>
-	             <p ng-show="new_member_form.last_name.$invalid && !new_member_form.last_name.$pristine" class="help-block">Last name is required.</p>
-	        </div>
-		</div>
-		<div class="form-group"  ng-class="{ 'has-error' : new_member_form.email.$invalid && !new_member_form.email.$pristine }">
-			<label class="control-label col-sm-3" for="newMemberEmail">Email Address:</label>
-			<div class="col-sm-8">
-	            <input type="email" class="form-control" name="email" placeholder="Enter Email Address" ng-model="user.email" required>
-	            <p ng-show="new_member_form.email.$invalid && !new_member_form.email.$pristine" class="help-block">Enter a valid email address.</p>
-	        </div>
-		</div>
-		<div class="form-group">
-			<label class="control-label col-sm-3" for="newMemberEmail">Role:</label>
-			<div class="col-sm-8">
-	            <select class="form-control" ng-model="user.role" ng-options="role as role.name for role in roles">
-	            </select>
-	        </div>
-		</div>
-	</div>
-	<div class="modal-footer">
-		<button type="button" class="btn btn-default" ng-click="cancel()">Cancel</button>
-		<button type="submit" class="btn btn-primary" ng-disabled="new_member_form.$invalid">Send Invite</button>
-	</div>
+    <div class="modal-body">
+        <div class="form-group" ng-class="{ 'has-error' : new_member_form.first_name.$invalid && !new_member_form.first_name.$pristine }">
+            <label class="control-label col-sm-3" for="newMemberFirstName">First Name:</label>
+            <div class="col-sm-8">
+                <input type="text" class="form-control" name="first_name" id="newMemberFirstName" placeholder="Enter first name" ng-model="user.first_name" required>
+                 <p ng-show="new_member_form.first_name.$invalid && !new_member_form.first_name.$pristine" class="help-block">First name is required.</p>
+            </div>
+        </div>
+        <div class="form-group"  ng-class="{ 'has-error' : new_member_form.last_name.$invalid && !new_member_form.last_name.$pristine }">
+            <label class="control-label col-sm-3" for="newMemberLastName">Last Name:</label>
+            <div class="col-sm-8">
+                <input type="text" class="form-control" name="last_name" placeholder="Enter last name" ng-model="user.last_name" required>
+                 <p ng-show="new_member_form.last_name.$invalid && !new_member_form.last_name.$pristine" class="help-block">Last name is required.</p>
+            </div>
+        </div>
+        <div class="form-group"  ng-class="{ 'has-error' : new_member_form.email.$invalid && !new_member_form.email.$pristine }">
+            <label class="control-label col-sm-3" for="newMemberEmail">Email Address:</label>
+            <div class="col-sm-8">
+                <input type="email" class="form-control" name="email" placeholder="Enter Email Address" ng-model="user.email" required>
+                <p ng-show="new_member_form.email.$invalid && !new_member_form.email.$pristine" class="help-block">Enter a valid email address.</p>
+            </div>
+        </div>
+        <div class="form-group">
+            <label class="control-label col-sm-3" for="newMemberEmail">Role:</label>
+            <div class="col-sm-8">
+                <select class="form-control" ng-model="user.role" ng-options="role as role.name for role in roles">
+                </select>
+            </div>
+        </div>
+    </div>
+    <div class="modal-footer">
+        <button type="button" class="btn btn-default" ng-click="cancel()">Cancel</button>
+        <button type="submit" class="btn btn-primary" ng-disabled="new_member_form.$invalid">Send Invite</button>
+    </div>
 </form>
diff --git a/seed/static/seed/partials/new_project_modal.html b/seed/static/seed/partials/new_project_modal.html
index 043b148ab2..c69c40a6cc 100644
--- a/seed/static/seed/partials/new_project_modal.html
+++ b/seed/static/seed/partials/new_project_modal.html
@@ -19,16 +19,16 @@ <h4 class="modal-title" id="newProjectModalLabel">Create a New Project</h4>
         <div class="form-group" style="margin-bottom: 0;">
             <!-- <label class="control-label col-sm-3" for="projectCompliance">Compliance Project?</label> -->
             <div class="col-sm-offset-3 col-sm-8">
-	            <div class="checkbox complianceCheckbox">
-		        	<label>
-			        	<input type="checkbox" value="complianceProject"> Add compliance information.
-			        </label>
-			    </div>
+                <div class="checkbox complianceCheckbox">
+                    <label>
+                        <input type="checkbox" value="complianceProject"> Add compliance information.
+                    </label>
+                </div>
             </div>
         </div>
       </div>
     <div class="modal-header">
-    	<h4 class="modal-title" id="newProjectComplianceModalLabel">Compliance Information</h4>
+        <h4 class="modal-title" id="newProjectComplianceModalLabel">Compliance Information</h4>
     </div>
     <div class="modal-body form-horizontal">
         <div class="form-group" ng-show="menu.create_project_state == 'create'">
diff --git a/seed/static/seed/partials/project_detail.html b/seed/static/seed/partials/project_detail.html
index f1407797f2..ced62b178c 100644
--- a/seed/static/seed/partials/project_detail.html
+++ b/seed/static/seed/partials/project_detail.html
@@ -1,7 +1,7 @@
 <div class="page_header_container">
     <div class="page_header">
         <div class="left page_action_container">
-           <a href="#/projects" class="page_action"><i class="fa fa-chevron-left"></i> Projects</a>
+            <a href="#/projects" class="page_action"><i class="fa fa-chevron-left"></i> Projects</a>
         </div>
         <div class="page_title">
             <h1><i class="fa fa-folder-o"></i>  {$ project.name $} ({$ search.number_matching_search | number:0 $} Buildings)</h1>
@@ -11,9 +11,9 @@ <h1><i class="fa fa-folder-o"></i>  {$ project.name $} ({$ search.number_matchin
     </div>
 </div>
 <div class="section_nav_container">
-	<div class="section_nav">
-		<a ng-href="#/projects/{$ user.project_id $}" class="active">Project Buildings</a><a ng-href="#/projects/{$ user.project_id $}/settings">List Settings</a>
-	</div>
+    <div class="section_nav">
+        <a ng-href="#/projects/{$ user.project_id $}" class="active">Project Buildings</a><a ng-href="#/projects/{$ user.project_id $}/settings">List Settings</a>
+    </div>
 </div>
 <div class="section">
     <div class="alert_container" ng-show="show_alert">
@@ -25,30 +25,30 @@ <h1><i class="fa fa-folder-o"></i>  {$ project.name $} ({$ search.number_matchin
     <div class="section_header_container">
         <div class="section_header fixed_height">
             <div class="left section_action_container">
-            	<div class="check_action">
-	                <div class="btn-group" ng-style="nothing_selected_cursor()">
-	                  <button type="button" class="btn btn-default btn-sm dropdown-toggle" data-toggle="dropdown" ng-disabled="nothing_selected()">
-	                    Project Actions <span class="caret"></span>
-	                  </button>
-	                  <ul class="dropdown-menu" role="menu">
-	                    <li ng-show="menu.user.organization.user_role !== 'viewer'"><a href="javascript:void(0);" data-toggle="modal" data-target="#myModal"ng-click="create_project_state='create'">Remove buildings from project</a></li>
-	                    
-	                    <li ng-show="menu.user.organization.user_role !== 'viewer'"><a href="javascript:void(0);" data-toggle="modal" data-target="#existingProjectModal" ng-click="create_project_state='create'">Move/copy buildings to another project</a></li>
-	                    <li class="divider" ng-show="project.is_compliance && menu.user.organization.user_role !== 'viewer'"></li>
-	                    <li ng-show="menu.user.organization.user_role !== 'viewer'"><span class="dropdown_menu_title" >Add a label:</span></li>
-	                    <li ng-show="menu.user.organization.user_role !== 'viewer'"><a href="javascript:void(0);" ng-repeat="l in labels" ng-click="apply_label(l)"><be-label name="{$ l.name $}" color="{$ l.color $}"></be-label></a></li>
-	                    <li class="divider" ng-show="menu.user.organization.user_role !== 'viewer'"></li>
-	                    <li ng-show="menu.user.organization.user_role !== 'viewer'"><a href="javascript:void(0);" ng-click="remove_label()">Remove labels</a></li>
-	                    <li ng-show="menu.user.organization.user_role !== 'viewer'"><a href="javascript:void(0);" ng-click="open_edit_label_modal()">Manage labels</a></li>
-                      <li><a href="javascript:void(0);" ng-click="open_export_modal()">Export Buildings</a></li>
-	                  </ul>
-	                </div>
-	            </div>
+                <div class="check_action">
+                    <div class="btn-group" ng-style="nothing_selected_cursor()">
+                        <button type="button" class="btn btn-default btn-sm dropdown-toggle" data-toggle="dropdown" ng-disabled="nothing_selected()">
+                          Project Actions <span class="caret"></span>
+                        </button>
+                        <ul class="dropdown-menu" role="menu">
+                            <li ng-show="menu.user.organization.user_role !== 'viewer'"><a href="javascript:void(0);" data-toggle="modal" data-target="#myModal"ng-click="create_project_state='create'">Remove buildings from project</a></li>
+                            
+                            <li ng-show="menu.user.organization.user_role !== 'viewer'"><a href="javascript:void(0);" data-toggle="modal" data-target="#existingProjectModal" ng-click="create_project_state='create'">Move/copy buildings to another project</a></li>
+                            <li class="divider" ng-show="project.is_compliance && menu.user.organization.user_role !== 'viewer'"></li>
+                            <li ng-show="menu.user.organization.user_role !== 'viewer'"><span class="dropdown_menu_title" >Add a label:</span></li>
+                            <li ng-show="menu.user.organization.user_role !== 'viewer'"><a href="javascript:void(0);" ng-repeat="l in labels" ng-click="apply_label(l)"><be-label name="{$ l.name $}" color="{$ l.color $}"></be-label></a></li>
+                            <li class="divider" ng-show="menu.user.organization.user_role !== 'viewer'"></li>
+                            <li ng-show="menu.user.organization.user_role !== 'viewer'"><a href="javascript:void(0);" ng-click="remove_label()">Remove labels</a></li>
+                            <li ng-show="menu.user.organization.user_role !== 'viewer'"><a href="javascript:void(0);" ng-click="open_edit_label_modal()">Manage labels</a></li>
+                            <li><a href="javascript:void(0);" ng-click="open_export_modal()">Export Buildings</a></li>
+                        </ul>
+                    </div>
+                </div>
             </div>
             <div class="center section_action_container"><span class="field_title">Type of Submittal:</span> {$ project.compliance_type || "None" $} 
-              <span ng-show="project.is_compliance">
-                <span class="field_title">Year Ending:</span> {$ project.end_date | date:'MM/dd/yyyy' $} <span class="field_title">Deadline:</span> {$ project.deadline_date | date:'MM/dd/yyyy' $}
-              </span>
+                <span ng-show="project.is_compliance">
+                    <span class="field_title">Year Ending:</span> {$ project.end_date | date:'MM/dd/yyyy' $} <span class="field_title">Deadline:</span> {$ project.deadline_date | date:'MM/dd/yyyy' $}
+                </span>
             </div>
             <div class="right section_action_container section_action_btn"></div>
         </div>
@@ -65,62 +65,62 @@ <h1><i class="fa fa-folder-o"></i>  {$ project.name $} ({$ search.number_matchin
 
 <!-- Modal -->
 <div class="modal fade" id="myModal" tabindex="-1" role="dialog" aria-labelledby="myModalLabel" aria-hidden="true">
-  <div class="modal-dialog">
-    <div class="modal-content">
-      <div class="modal-header">
-        <button type="button" class="close" data-dismiss="modal" aria-hidden="true">&times;</button>
-        <h4 class="modal-title" id="myModalLabel" ng-show="create_project_state == 'create'">Remove From Project</h4>
-        <h4 class="modal-title" id="newProjectModalLabel" ng-show="create_project_state == 'removing'"><i class="fa fa-spinner fa-spin"></i> Removing buildings from project '{$ project.name $}'</h4>
-        <h4 class="modal-title" id="newProjectModalLabel" ng-show="create_project_state == 'success'">Success</h4>
-      </div>
-      <div class="modal-body" ng-show="create_project_state == 'create'">Are you sure you want to remove {$ number_to_remove() $} buildings from project {$ project.name $}?</div>
-      <div class="modal-body" ng-show="create_project_state == 'success'">{$ progress_denominator $} buildings removed from project {$ project.name $}
-      </div>
-      <div class="modal-footer">
-        <button type="button" class="btn btn-default" data-dismiss="modal" ng-show="create_project_state == 'create'">No</button>
-        <button type="button" class="btn btn-primary"ng-click="remove_buildings()" ng-show="create_project_state == 'create'">Yes</button>
-        <button type="button" class="btn btn-primary" data-dismiss="modal" ng-show="create_project_state == 'success'">Close</button>
-      </div>
-    </div><!-- /.modal-content -->
-  </div><!-- /.modal-dialog -->
+    <div class="modal-dialog">
+        <div class="modal-content">
+            <div class="modal-header">
+                <button type="button" class="close" data-dismiss="modal" aria-hidden="true">&times;</button>
+                <h4 class="modal-title" id="myModalLabel" ng-show="create_project_state == 'create'">Remove From Project</h4>
+                <h4 class="modal-title" id="newProjectModalLabel" ng-show="create_project_state == 'removing'"><i class="fa fa-spinner fa-spin"></i> Removing buildings from project '{$ project.name $}'</h4>
+                <h4 class="modal-title" id="newProjectModalLabel" ng-show="create_project_state == 'success'">Success</h4>
+            </div>
+            <div class="modal-body" ng-show="create_project_state == 'create'">Are you sure you want to remove {$ number_to_remove() $} buildings from project {$ project.name $}?</div>
+            <div class="modal-body" ng-show="create_project_state == 'success'">{$ progress_denominator $} buildings removed from project {$ project.name $}
+            </div>
+            <div class="modal-footer">
+                <button type="button" class="btn btn-default" data-dismiss="modal" ng-show="create_project_state == 'create'">No</button>
+                <button type="button" class="btn btn-primary"ng-click="remove_buildings()" ng-show="create_project_state == 'create'">Yes</button>
+                <button type="button" class="btn btn-primary" data-dismiss="modal" ng-show="create_project_state == 'success'">Close</button>
+            </div>
+        </div><!-- /.modal-content -->
+    </div><!-- /.modal-dialog -->
 </div><!-- /.modal -->
 <!-- existingProjectModal -->
 <div class="modal fade" id="existingProjectModal" tabindex="-1" role="dialog" aria-labelledby="existingProjectModalLabel" aria-hidden="true">
-  <div class="modal-dialog">
-    <div class="modal-content">
-      <div class="modal-header" >
-        <button type="button" class="close" data-dismiss="modal" aria-hidden="true">&times;</button>
-        <h4 class="modal-title" id="existingProjectModalLabel" ng-show="create_project_state == 'create'">Where would you like to move these buildings?</h4>
-        <h4 class="modal-title" id="newProjectModalLabel" ng-show="create_project_state == 'adding'"><i class="fa fa-spinner fa-spin"></i> Adding buildings to project '{$ project.name $}'</h4>
-      </div>
-        <div class="alert alert-success" ng-show="create_project_state == 'success'">
-            {$ progress_denominator $} buildings added to the project <a data-dismiss="modal" ng-click="go_to_project(move_to_project.slug)"><strong>{$ move_to_project.name $}</strong></a>.
-        </div>
-      <div class="modal-body">
-        <div class="form-group" ng-show="create_project_state == 'create'">
-            <label class="sr-only" for="projectName">Project Name</label>
-            <div class="col-sm-8">
-                <select class="form-control" id="existingProjectName" ng-options="p as p.name for p in projects" ng-model="move_to_project"></select>
+    <div class="modal-dialog">
+        <div class="modal-content">
+            <div class="modal-header" >
+                <button type="button" class="close" data-dismiss="modal" aria-hidden="true">&times;</button>
+                <h4 class="modal-title" id="existingProjectModalLabel" ng-show="create_project_state == 'create'">Where would you like to move these buildings?</h4>
+                <h4 class="modal-title" id="newProjectModalLabel" ng-show="create_project_state == 'adding'"><i class="fa fa-spinner fa-spin"></i> Adding buildings to project '{$ project.name $}'</h4>
             </div>
-        </div>
-        <div class="col-sm-7" ng-show="create_project_state == 'adding'">
-            <div class="progress">
-                <div class="progress-bar progress-bar-success" role="progressbar" aria-valuenow="40" aria-valuemin="0" aria-valuemax="100" style="width: {$ progress_percentage | number: 0 $}%;">
-                <span class="sr-only">40% Complete</span>
-              </div>
+                <div class="alert alert-success" ng-show="create_project_state == 'success'">
+                    {$ progress_denominator $} buildings added to the project <a data-dismiss="modal" ng-click="go_to_project(move_to_project.slug)"><strong>{$ move_to_project.name $}</strong></a>.
+                </div>
+            <div class="modal-body">
+                <div class="form-group" ng-show="create_project_state == 'create'">
+                    <label class="sr-only" for="projectName">Project Name</label>
+                    <div class="col-sm-8">
+                        <select class="form-control" id="existingProjectName" ng-options="p as p.name for p in projects" ng-model="move_to_project"></select>
+                    </div>
+                </div>
+                <div class="col-sm-7" ng-show="create_project_state == 'adding'">
+                    <div class="progress">
+                        <div class="progress-bar progress-bar-success" role="progressbar" aria-valuenow="40" aria-valuemin="0" aria-valuemax="100" style="width: {$ progress_percentage | number: 0 $}%;">
+                        <span class="sr-only">40% Complete</span>
+                      </div>
+                    </div>
+                </div>
+                <div class="col-sm-5" ng-show="create_project_state == 'adding'">
+                    {$ progress_numerator $} / {$ progress_denominator $} Buildings
+                </div>
             </div>
-        </div>
-        <div class="col-sm-5" ng-show="create_project_state == 'adding'">
-            {$ progress_numerator $} / {$ progress_denominator $} Buildings
-        </div>
-      </div>
-      <div class="modal-footer">
-        <button type="button" class="btn btn-default" data-dismiss="modal" ng-show="create_project_state == 'create'">Cancel</button>
-        <button type="button" class="btn btn-default" data-dismiss="modal" ng-show="create_project_state == 'success'">Close</button>
-        <button type="button" class="btn btn-primary" ng-click="move_buildings(move_to_project.slug)" ng-show="create_project_state == 'create'">Move Buildings</button>
-        <button type="button" class="btn btn-primary" ng-click="copy_buildings(move_to_project.slug)" ng-show="create_project_state == 'create'">Copy Buildings</button>
-        <button type="button" class="btn btn-primary" ng-click="go_to_project(move_to_project.slug)" ng-show="create_project_state == 'success'">View Project</button>
-      </div>
-    </div><!-- /.modal-content -->
-  </div><!-- /.modal-dialog -->
+            <div class="modal-footer">
+                <button type="button" class="btn btn-default" data-dismiss="modal" ng-show="create_project_state == 'create'">Cancel</button>
+                <button type="button" class="btn btn-default" data-dismiss="modal" ng-show="create_project_state == 'success'">Close</button>
+                <button type="button" class="btn btn-primary" ng-click="move_buildings(move_to_project.slug)" ng-show="create_project_state == 'create'">Move Buildings</button>
+                <button type="button" class="btn btn-primary" ng-click="copy_buildings(move_to_project.slug)" ng-show="create_project_state == 'create'">Copy Buildings</button>
+                <button type="button" class="btn btn-primary" ng-click="go_to_project(move_to_project.slug)" ng-show="create_project_state == 'success'">View Project</button>
+            </div>
+        </div><!-- /.modal-content -->
+    </div><!-- /.modal-dialog -->
 </div><!-- /.modal -->
diff --git a/seed/static/seed/partials/project_settings.html b/seed/static/seed/partials/project_settings.html
index 35d9b7d379..e9c5f6da8e 100644
--- a/seed/static/seed/partials/project_settings.html
+++ b/seed/static/seed/partials/project_settings.html
@@ -7,67 +7,67 @@
             <h1><i class="fa fa-folder-o"></i> {$ project.name $} settings</h1>
         </div>
         <div class="right page_action_container page_action_btn">
-	        
+            
         </div>
     </div>
 </div>
 <div class="section_nav_container">
-	<div class="section_nav">
-		<a ng-href="#/projects/{$ user.project_slug $}">Project Buildings</a><a ng-href="#/projects/{$ user.project_slug $}/settings" class="active">List Settings</a>
-	</div>
+    <div class="section_nav">
+        <a ng-href="#/projects/{$ user.project_slug $}">Project Buildings</a><a ng-href="#/projects/{$ user.project_slug $}/settings" class="active">List Settings</a>
+    </div>
 </div>
 <div class="section">
     <div class="section_header_container">
         <div class="section_header has_no_padding fixed_height_short">
-        	<div class="section_action_container left">
-        		<h2><i class="fa fa-cogs"></i> Project Building List Settings</h2>
-        	</div>
-        	<div class="section_action_container right section_action_btn">
-        		<button type="button" class="pull-right btn btn-primary" ng-click="save_settings()">Save Changes<i class="fa fa-check align_right" ng-show="settings_updated"></i></button>
-        	</div>
+            <div class="section_action_container left">
+                <h2><i class="fa fa-cogs"></i> Project Building List Settings</h2>
+            </div>
+            <div class="section_action_container right section_action_btn">
+                <button type="button" class="pull-right btn btn-primary" ng-click="save_settings()">Save Changes<i class="fa fa-check align_right" ng-show="settings_updated"></i></button>
+            </div>
         </div>
     </div>
     <div class="section_content_container">
         <div class="section_content with_padding">
-			<h3>There are {$ fields.length | number $} columns of data available to you.</h3>
+            <h3>There are {$ fields.length | number $} columns of data available to you.</h3>
             <p>Select columns from the list below to make them appear in your Buildings List table.</p>
         </div>
-		<div class="section_content with_padding">
-        	<div class="table_list_container has_borders">
+        <div class="section_content with_padding">
+            <div class="table_list_container has_borders">
                 <table class="table table-striped has_no_btm_margin table_highlight_first">
-                	<thead>
+                    <thead>
                         <tr>
                             <th class="check is_aligned_center"><input type="checkbox" ng-model="controls.select_all" ng-change="select_all_clicked()"></th>
                             <th>Column Name</th>
                         </tr>
                         <tr class="sub_head">
-                        	<th class="sub_head check_row"></th>
-                        	<th class="sub_head">
-								<input type="text" class="form-control input-sm" ng-model="filter_params.title" placeholder="Search column name" ng-class="{active: filter_params.title.length > 0}">
-                        	</th>
+                            <th class="sub_head check_row"></th>
+                            <th class="sub_head">
+                                <input type="text" class="form-control input-sm" ng-model="filter_params.title" placeholder="Search column name" ng-class="{active: filter_params.title.length > 0}">
+                            </th>
                         </tr>
-                	</thead>
+                    </thead>
                 </table>
                 <div class="vert_table_scroll_container">
                     <table class="table has_no_btm_margin table-striped table_scroll">
-                    	<tbody>
-                    		<tr ng-repeat="field in fields | filter:filter_params:strict">
-    	                		<td class="check is_aligned_center" style="width: 5%; min-width: 30px;">
-    								<input type="checkbox" ng-model="field.checked">
-    							</td>
-    							<td>
-    								<span>{$ field.title $}</span>
-    							</td>
-                    		</tr>
-                    	</tbody>
+                        <tbody>
+                            <tr ng-repeat="field in fields | filter:filter_params:strict">
+                                <td class="check is_aligned_center" style="width: 5%; min-width: 30px;">
+                                    <input type="checkbox" ng-model="field.checked">
+                                </td>
+                                <td>
+                                    <span>{$ field.title $}</span>
+                                </td>
+                            </tr>
+                        </tbody>
                     </table>
                 </div>
-        	</div>
+            </div>
         </div>
     </div>
     <div class="section_content_container has_top_margin">
         <div class="section_content with_padding">
-        	<button type="button" class="btn btn-primary" ng-click="save_settings()">Save Changes <i class="fa fa-check align_right" ng-show="settings_updated"></i></button>
+            <button type="button" class="btn btn-primary" ng-click="save_settings()">Save Changes <i class="fa fa-check align_right" ng-show="settings_updated"></i></button>
         </div>
     </div>
 </div>
diff --git a/seed/static/seed/partials/projects.html b/seed/static/seed/partials/projects.html
index b6f7a71f41..032401ab7e 100644
--- a/seed/static/seed/partials/projects.html
+++ b/seed/static/seed/partials/projects.html
@@ -12,12 +12,12 @@ <h1><i class="fa fa-folder-o"></i> {$ projects_count | number:0 $} Projects</h1>
     </div>
 </div>
 <div class="section">
-	<div class="alert_container" ng-hide="true">
-		<div class="alert alert-success">
-        	<button type="button" class="close">&times;</button>
-        	You successfully created the project <a href="#"><strong>John's Incredible Project</strong></a>.
-	    </div>
-	</div>
+    <div class="alert_container" ng-hide="true">
+        <div class="alert alert-success">
+            <button type="button" class="close">&times;</button>
+            You successfully created the project <a href="#"><strong>John's Incredible Project</strong></a>.
+        </div>
+    </div>
     <div class="section_content_container">
         <div class="section_content">
             <div class="table_list_container">
diff --git a/seed/static/seed/partials/settings.html b/seed/static/seed/partials/settings.html
index 0d37a458a4..63277ff2b0 100644
--- a/seed/static/seed/partials/settings.html
+++ b/seed/static/seed/partials/settings.html
@@ -1,7 +1,7 @@
 <div class="page_header_container">
     <div class="page_header">
         <div class="left page_action_container">
-			<a href="#/accounts" class="page_action"><i class="fa fa-chevron-left"></i> Organizations</a>
+            <a href="#/accounts" class="page_action"><i class="fa fa-chevron-left"></i> Organizations</a>
           
         </div>
         <div class="page_title">
@@ -12,36 +12,36 @@ <h1>{$ org.name $}</h1>
     </div>
 </div>
 <div class="section_nav_container">
-	<div class="section_nav">
-		<a ng-href="#/accounts/{$ org.id $}" class="active">Settings</a><a ng-href="#/accounts/{$ org.id $}/sharing" ng-if="org.is_parent && auth.requires_owner">Sharing</a><a ng-href="#/accounts/{$ org.id $}/sub_org" ng-if="org.is_parent && auth.requires_owner">Sub-Organizations</a><a ng-href="#/accounts/{$ org.id $}/members">Members</a>
-	</div>
+    <div class="section_nav">
+        <a ng-href="#/accounts/{$ org.id $}" class="active">Settings</a><a ng-href="#/accounts/{$ org.id $}/sharing" ng-if="org.is_parent && auth.requires_owner">Sharing</a><a ng-href="#/accounts/{$ org.id $}/sub_org" ng-if="org.is_parent && auth.requires_owner">Sub-Organizations</a><a ng-href="#/accounts/{$ org.id $}/members">Members</a>
+    </div>
 </div>
 <div class="section">
     <div class="section_header_container">
         <div class="section_header has_no_padding fixed_height_short">
-	    	<div class="section_action_container left">
-	    		<h2><i class="fa fa-cogs"></i> Settings</h2>
-	    	</div>
-	    	<div class="section_action_container right section_action_btn">
-	    		<button type="button" class="pull-right btn btn-primary" ng-click="save_settings()">Save Changes<i class="fa fa-check" ng-show="settings_updated"></i></button>
-	    	</div>
-	    </div>
+            <div class="section_action_container left">
+                <h2><i class="fa fa-cogs"></i> Settings</h2>
+            </div>
+            <div class="section_action_container right section_action_btn">
+                <button type="button" class="pull-right btn btn-primary" ng-click="save_settings()">Save Changes<i class="fa fa-check" ng-show="settings_updated"></i></button>
+            </div>
+        </div>
     </div> 
     <div class="section_content_container">
         <div class="section_content with_padding">
-        	<h3>Organization Name</h3>
-        	<form class="form-horizontal" role="form">
-        		<div class="form-group">
-        			<div class="col-sm-4">
-        			<input type="text" class="form-control" id="editOrganizationName" ng-model="org.name" ng-disabled="!auth.requires_owner">
-        			</div>
-        		</div>
-        	</form>
+            <h3>Organization Name</h3>
+            <form class="form-horizontal" role="form">
+                <div class="form-group">
+                    <div class="col-sm-4">
+                    <input type="text" class="form-control" id="editOrganizationName" ng-model="org.name" ng-disabled="!auth.requires_owner">
+                    </div>
+                </div>
+            </form>
         </div>
     </div>
-	<div class="section_content_container" ng-if="auth.requires_owner">
+    <div class="section_content_container" ng-if="auth.requires_owner">
         <div class="section_content with_padding">
-        	<button type="button" class="btn btn-primary" ng-click="save_settings()">Save Changes <i class="fa fa-check" ng-show="settings_updated"></i></button>
+            <button type="button" class="btn btn-primary" ng-click="save_settings()">Save Changes <i class="fa fa-check" ng-show="settings_updated"></i></button>
         </div>
     </div>
 </div>
diff --git a/seed/static/seed/partials/sharing.html b/seed/static/seed/partials/sharing.html
index e45b37d7ec..3d4b533578 100644
--- a/seed/static/seed/partials/sharing.html
+++ b/seed/static/seed/partials/sharing.html
@@ -1,7 +1,7 @@
 <div class="page_header_container">
     <div class="page_header">
         <div class="left page_action_container">
-			<a href="#/accounts" class="page_action"><i class="fa fa-chevron-left"></i> Organizations</a>
+            <a href="#/accounts" class="page_action"><i class="fa fa-chevron-left"></i> Organizations</a>
           
         </div>
         <div class="page_title">
@@ -12,29 +12,30 @@ <h1>{$ org.name $}</h1>
     </div>
 </div>
 <div class="section_nav_container">
-	<div class="section_nav">
-		<a ng-href="#/accounts/{$ org.id $}">Settings</a><a ng-href="#/accounts/{$ org.id $}/sharing" ng-if="org.is_parent && auth.requires_owner" class="active">Sharing</a><a ng-href="#/accounts/{$ org.id $}/sub_org" ng-if="org.is_parent && auth.requires_owner">Sub-Organizations</a><a ng-href="#/accounts/{$ org.id $}/members">Members</a>
-	</div>
+    <div class="section_nav">
+        <a ng-href="#/accounts/{$ org.id $}">Settings</a><a ng-href="#/accounts/{$ org.id $}/sharing" ng-if="org.is_parent && auth.requires_owner" class="active">Sharing</a><a ng-href="#/accounts/{$ org.id $}/sub_org" ng-if="org.is_parent && auth.requires_owner">Sub-Organizations</a><a ng-href="#/accounts/{$ org.id $}/members">Members</a>
+    </div>
 </div>
 <div class="section">
     <div class="section_header_container">
         <div class="section_header has_no_padding fixed_height_short">
-        	<div class="section_action_container left">
-        		<h2><i class="fa fa-share-square-o"></i> Sharing Your Data</h2>
-        	</div>
-        	<div class="section_action_container right section_action_btn">
-        		<button type="button" class="pull-right btn btn-primary" ng-click="save_settings()">Save Changes <i class="fa fa-check" ng-show="settings_updated"></i></button>
-        	</div>
+            <div class="section_action_container left">
+                <h2><i class="fa fa-share-square-o"></i> Sharing Your Data</h2>
+            </div>
+            <div class="section_action_container right section_action_btn">
+                <button type="button" class="pull-right btn btn-primary" ng-click="save_settings()">Save Changes <i class="fa fa-check" ng-show="settings_updated"></i></button>
+            </div>
         </div>
     </div>
     <div class="section_content_container">
-   		<div class="section_content with_padding" ng-if="org.is_parent && auth.requires_owner">
-        		<h3>Selecting Fields to Share</h3>
-        		<p>As the admin of your SEED instance you can control what data is shared throughout your organization and between your sub-organizations as well as what data is shared externally with the public-at-large. The subset of data you choose to share with the public can be different than the subset shared between your sub-organizations.</p>
-                <p>From the list below, select the fields that you want to: 1) share internally within your organization, and 2) share publicly with users outside your organization.</p><div class="table_list_container has_borders">
+        <div class="section_content with_padding" ng-if="org.is_parent && auth.requires_owner">
+            <h3>Selecting Fields to Share</h3>
+            <p>As the admin of your SEED instance you can control what data is shared throughout your organization and between your sub-organizations as well as what data is shared externally with the public-at-large. The subset of data you choose to share with the public can be different than the subset shared between your sub-organizations.</p>
+            <p>From the list below, select the fields that you want to: 1) share internally within your organization, and 2) share publicly with users outside your organization.</p>
+            <div class="table_list_container has_borders">
                 <table class="table has_no_btm_margin table-striped table_highlight_first">
-                	<thead>
-                		<tr>
+                    <thead>
+                        <tr>
                             <th colspan="2" class="condensed_head">SHARE DATA WITH</th>
 
                             <th></th>
@@ -42,21 +43,21 @@ <h3>Selecting Fields to Share</h3>
                         <tr>
                             <th class="condensed_head">INTERNAL</th>
 
-							<th class="condensed_head">PUBLIC</th>
+                            <th class="condensed_head">PUBLIC</th>
                             <th>Field Name</th>
                         </tr>
                         <tr class="sub_head">
-                        	<th class="sub_head check is_aligned_center condensed_head">
-                        		<input type="checkbox" ng-model="controls.select_all" ng-change="select_all_clicked('internal')">
-                        	</th>
-                        	<th class="sub_head check is_aligned_center condensed_head">
-                        		<input type="checkbox" ng-model="controls.public_select_all" ng-change="select_all_clicked('public')">
-                        	</th>
-                        	<th class="sub_head">
-								<input type="text" class="form-control input-sm" ng-model="filter_params.title" placeholder="Search field name" ng-class="{active: filter_params.title.length > 0}">
-                        	</th>
+                            <th class="sub_head check is_aligned_center condensed_head">
+                                <input type="checkbox" ng-model="controls.select_all" ng-change="select_all_clicked('internal')">
+                            </th>
+                            <th class="sub_head check is_aligned_center condensed_head">
+                                <input type="checkbox" ng-model="controls.public_select_all" ng-change="select_all_clicked('public')">
+                            </th>
+                            <th class="sub_head">
+                                <input type="text" class="form-control input-sm" ng-model="filter_params.title" placeholder="Search field name" ng-class="{active: filter_params.title.length > 0}">
+                            </th>
                         </tr>
-                	</thead>
+                    </thead>
                 </table>
                 <div class="vert_table_scroll_container">
                     <table class="table table-striped table_scroll">
@@ -75,25 +76,25 @@ <h3>Selecting Fields to Share</h3>
                         </tbody>
                     </table>
                 </div>
-        	</div>
+            </div>
         </div>
-   		<div class="section_content with_padding">
+           <div class="section_content with_padding">
             <div ng-if="org.is_parent && auth.requires_owner">
-            	<h3>Set a Query Threshold</h3>
-            	<p>Enter the minimum threshold count of buildings that can be returned in a shared query. The building count threshold is important for allowing other organizations to perform statistical analysis on your data without revealing information about individual buildings.</p>
+                <h3>Set a Query Threshold</h3>
+                <p>Enter the minimum threshold count of buildings that can be returned in a shared query. The building count threshold is important for allowing other organizations to perform statistical analysis on your data without revealing information about individual buildings.</p>
                 <form class="form-horizontal" role="form">
-            		<div class="form-group">
-            			<div class="col-sm-2">
-            			<input type="number" class="form-control" id="editQueryThreshold" placeholder="Count #" ng-model="org.query_threshold" min="0">
-            			</div>
-            		</div>
-            	</form>
+                    <div class="form-group">
+                        <div class="col-sm-2">
+                        <input type="number" class="form-control" id="editQueryThreshold" placeholder="Count #" ng-model="org.query_threshold" min="0">
+                        </div>
+                    </div>
+                </form>
+            </div>
+        </div>
+        <div class="section_content_container">
+            <div class="section_content with_padding">
+                <button type="button" class="pull-right btn btn-primary" ng-click="save_settings()">Save Changes <i class="fa fa-check" ng-show="settings_updated"></i></button>
             </div>
         </div>
-		<div class="section_content_container">
-	        <div class="section_content with_padding">
-	        	<button type="button" class="pull-right btn btn-primary" ng-click="save_settings()">Save Changes <i class="fa fa-check" ng-show="settings_updated"></i></button>
-	        </div>
-	    </div>
     </div>
 </div>
diff --git a/seed/static/seed/partials/sub_org.html b/seed/static/seed/partials/sub_org.html
index 6e5b04ce06..ee8bfae36d 100644
--- a/seed/static/seed/partials/sub_org.html
+++ b/seed/static/seed/partials/sub_org.html
@@ -1,7 +1,7 @@
 <div class="page_header_container">
     <div class="page_header">
         <div class="left page_action_container">
-			<a href="#/accounts" class="page_action"><i class="fa fa-chevron-left"></i> Organizations</a>
+            <a href="#/accounts" class="page_action"><i class="fa fa-chevron-left"></i> Organizations</a>
           
         </div>
         <div class="page_title">
@@ -44,10 +44,10 @@ <h1>{$ org.name $}</h1>
                                 <span ng-repeat="owner in sub_org.owners">{$ owner.first_name $} {$ owner.last_name $}<br /></span>
                             </td>
                             <td>
-                            	<span ng-repeat="owner in sub_org.owners">{$ owner.email $}<br /></span>
+                                <span ng-repeat="owner in sub_org.owners">{$ owner.email $}<br /></span>
                             </td>
                             <td ng-if="false">
-                            	<a href="javascript:void(0);" ng-click="remove_sub_org(sub_org)">Remove</a>
+                                <a href="javascript:void(0);" ng-click="remove_sub_org(sub_org)">Remove</a>
                             </td>
                         </tr>
                     </tbody>
diff --git a/seed/tests/test_matching.py b/seed/tests/test_matching.py
index 85d35af552..87c9c47f06 100644
--- a/seed/tests/test_matching.py
+++ b/seed/tests/test_matching.py
@@ -44,17 +44,17 @@ def test_strip_leading_zeros(self):
         
     def test_abbrev_street_types(self):
         """
-	Catches the spelled out street types e.g., "Street" == "St"  
-	"""
+        Catches the spelled out street types e.g., "Street" == "St"  
+        """
 
-	normalized_addr = _normalize_address_str("STREET")
+        normalized_addr = _normalize_address_str("STREET")
         self.assertEqual(normalized_addr, "st")
-	
+    
         normalized_addr = _normalize_address_str("Street")
         self.assertEqual(normalized_addr, "st")
 
-	normalized_addr = _normalize_address_str("Boulevard")
+        normalized_addr = _normalize_address_str("Boulevard")
         self.assertEqual(normalized_addr, "blvd")
-	
+    
         normalized_addr = _normalize_address_str("avenue")
         self.assertEqual(normalized_addr, "ave")

From e125319b07841babeda8a3d8f927af272b63d94b Mon Sep 17 00:00:00 2001
From: Miles Clark <mmc@obispo.com>
Date: Fri, 1 May 2015 07:20:20 -0700
Subject: [PATCH 10/22] Revert "Upload error handling"

---
 BE/settings/dev.py                            |  2 +-
 .../js/controllers/data_upload_modal_ctrl.js  |  9 +-
 .../controllers/dataset_detail_controller.js  |  2 +-
 .../seed/js/controllers/menu_controller.js    |  2 +-
 seed/static/seed/js/directives/beUploader.js  |  6 +-
 .../seed/js/filters/stripImportPrefix.js      |  4 +-
 .../seed/js/services/uploader_service.js      |  2 +-
 .../seed/partials/data_upload_modal.html      | 20 +----
 seed/static/seed/partials/dataset_detail.html |  6 +-
 seed/tasks.py                                 | 90 ++++++-------------
 10 files changed, 44 insertions(+), 99 deletions(-)

diff --git a/BE/settings/dev.py b/BE/settings/dev.py
index d7eef9a3a3..3ceb6b2185 100644
--- a/BE/settings/dev.py
+++ b/BE/settings/dev.py
@@ -49,7 +49,7 @@
     LOGGING = {
         'version': 1,
         'disable_existing_loggers': True,
-        # set up some log message handlers to choose from
+        # set up some log message handers to chose from
         'handlers': {
             'sentry': {
                 'level': 'ERROR',
diff --git a/seed/static/seed/js/controllers/data_upload_modal_ctrl.js b/seed/static/seed/js/controllers/data_upload_modal_ctrl.js
index 45ab734dd6..d9bac3ed74 100644
--- a/seed/static/seed/js/controllers/data_upload_modal_ctrl.js
+++ b/seed/static/seed/js/controllers/data_upload_modal_ctrl.js
@@ -18,14 +18,11 @@
  * ng-switch-when="8" == Add files to your Data Set.
  * ng-switch-when="9" == Add files to {$ dataset.name $}
  * ng-switch-when="10" == No matches found
- * ng-switch-when="11" == Confirm Save Mappings?
- * ng-switch-when="12" == Error Processing Data
  */
 angular.module('BE.seed.controller.data_upload_modal', [])
 .controller('data_upload_modal_ctrl', [
   '$scope',
   '$modalInstance',
-  '$log',
   'step',
   'dataset',
   '$timeout',
@@ -37,7 +34,6 @@ angular.module('BE.seed.controller.data_upload_modal', [])
   function (
     $scope,
     $modalInstance,
-    $log,
     step,
     dataset,
     $timeout,
@@ -165,6 +161,7 @@ angular.module('BE.seed.controller.data_upload_modal', [])
         }
         if (event_message === "upload_complete") {
             var current_step = $scope.step.number;
+            var data_is_green_button = 
           
             $scope.uploader.status_message = "upload complete";
             $scope.dataset.import_file_id = file.file_id;
@@ -275,10 +272,6 @@ angular.module('BE.seed.controller.data_upload_modal', [])
                 }
 
             }, $scope.uploader);
-        }, function(data){
-            $scope.step_12_error_message = data.message;
-            $log.error(data.stacktrace);
-            $scope.step.number = 12;
         });
     };
 
diff --git a/seed/static/seed/js/controllers/dataset_detail_controller.js b/seed/static/seed/js/controllers/dataset_detail_controller.js
index 3b339e1743..0fbee7d83d 100644
--- a/seed/static/seed/js/controllers/dataset_detail_controller.js
+++ b/seed/static/seed/js/controllers/dataset_detail_controller.js
@@ -12,7 +12,7 @@ angular.module('BE.seed.controller.dataset_detail', [])
   function ($scope, dataset_payload, $log, dataset_service, $modal, urls) {
     $scope.dataset = dataset_payload.dataset;
 
-    $log.info('dataset_payload:', dataset_payload);
+    $log.info({dataset_payload: dataset_payload});
 
     $scope.confirm_delete = function (file) {
         var yes = confirm("Are you sure you want to PERMANENTLY delete '" + file.name + "'?");
diff --git a/seed/static/seed/js/controllers/menu_controller.js b/seed/static/seed/js/controllers/menu_controller.js
index 5836e6f77e..4032dd22fb 100644
--- a/seed/static/seed/js/controllers/menu_controller.js
+++ b/seed/static/seed/js/controllers/menu_controller.js
@@ -63,7 +63,7 @@ angular.module('BE.seed.controller.menu', [])
     });
     $scope.$on("$routeChangeStart", function($event, next, current) {
         $scope.menu.loading = next.controller === "mapping_controller";
-    });
+    })
     $scope.$on("$routeChangeSuccess", function() {
         $scope.menu.loading = false;
         $scope.menu.route_load_error = false;
diff --git a/seed/static/seed/js/directives/beUploader.js b/seed/static/seed/js/directives/beUploader.js
index b3d99fda97..458669bf29 100644
--- a/seed/static/seed/js/directives/beUploader.js
+++ b/seed/static/seed/js/directives/beUploader.js
@@ -11,7 +11,7 @@
  *              `message` - string - options: "upload_submitted",
  *              "upload_in_progress", "upload_complete", and "invalid_extension"
  *              `filename` - string name of the file uploaded
- *              `progress` - JS object with keys `loaded` and `total` where
+ *              `progress` - JS object with keys `loaded` and `total` wehere
  *                           `loaded` / `total` * 100.0 is the percent uploaded
  *  importrecord - int or string - id of import record or dataset
  *  
@@ -111,7 +111,7 @@ var makeS3Uploader = function(scope, element, attrs, filename) {
          * onComplete: overloaded callback that calls the callback defined
          * in the element attribute unless the upload failed, which will
          * fire a window alert. Passes as arguments to the callback
-         * a message indicating upload has completed, "upload_complete", and
+         * a message indicating upload has copmleted, "upload_complete", and
          * the filename. 
          */
         onComplete: function(id, fileName, responseJSON) {
@@ -242,7 +242,7 @@ var makeFileSystemUploader = function(scope, element, attrs, filename) {
              * onComplete: overloaded callback that calls the callback defined
              * in the element attribute unless the upload failed, which will
              * fire a window alert. Passes as arguments to the callback
-             * a message indicating upload has completed, "upload_complete", and
+             * a message indicating upload has copmleted, "upload_complete", and
              * the filename. 
              */
             onComplete: function(id, fileName, responseJSON) {
diff --git a/seed/static/seed/js/filters/stripImportPrefix.js b/seed/static/seed/js/filters/stripImportPrefix.js
index 4f824a5b4d..32dbb2a52d 100644
--- a/seed/static/seed/js/filters/stripImportPrefix.js
+++ b/seed/static/seed/js/filters/stripImportPrefix.js
@@ -10,11 +10,11 @@ angular.module('stripImportPrefix', []).filter('stripImportPrefix', [
   function($filter) {
     /** ids are sometime prefixed by the Import Record id.
     * e.g. import 28 would prefix all assessor data ids with 'IMP28-' and 
-    *      stripImportPrefix would strip out the 'IMP28-'s from the html and only
+    *      stripImportPrefix would stip out the 'IMP28-'s from the html and only
     *      display the ids. 
     *
     * Usage: building.id = "IMP12-007"
-    *        HTML: <span> {{ building.id | stripImportPrefix }} </span>
+    *        HTML: <span> {{ buidling.id | stripImportPrefix }} </span>
     *         compiles to: <span> 007 </span>
     *        JS  : stripImportPrefix(building.id)
     *         returns: "007"
diff --git a/seed/static/seed/js/services/uploader_service.js b/seed/static/seed/js/services/uploader_service.js
index 1c52ba8441..a08fa2bad3 100644
--- a/seed/static/seed/js/services/uploader_service.js
+++ b/seed/static/seed/js/services/uploader_service.js
@@ -136,7 +136,7 @@ angular.module('BE.seed.service.uploader', []).factory('uploader_service', [
           }, 750);
         }, function (data, status) {
           // reject promise
-          console.error(data, status);
+          console.log(data, status);
         });
     };
 
diff --git a/seed/static/seed/partials/data_upload_modal.html b/seed/static/seed/partials/data_upload_modal.html
index eb771dabeb..1632793a28 100644
--- a/seed/static/seed/partials/data_upload_modal.html
+++ b/seed/static/seed/partials/data_upload_modal.html
@@ -10,7 +10,6 @@ <h4 class="modal-title" ng-switch-when="8">{$ matched_buildings|number:0 $} buil
     <h4 class="modal-title" ng-switch-when="9">Add files to {$ dataset.name $}.</h4>
     <h4 class="modal-title" ng-switch-when="10">{$ step_10_title|titleCase $}</h4>
     <h4 class="modal-title" ng-switch-when="11">Confirm Save Mappings?</h4>
-    <h4 class="modal-title" ng-switch-when="12">Error Processing Data</h4>
 </div>
 <div class="modal-body no_bottom_padding" ng-switch on="step.number">
 	<!-- Step 1 -->
@@ -30,8 +29,8 @@ <h4 class="modal-title" ng-switch-when="12">Error Processing Data</h4>
 	<div class="data_upload_steps" ng-switch-when="2">
 	    <div class="row">
 	    	<div class="alert alert-danger alert-dismissable" ng-show="uploader.invalid_extension_alert">
-		        <button type="button" class="close" ng-click="uploader.invalid_extension_alert = false" aria-hidden="true">&times;</button>
-		        <strong>Sorry!</strong> SEED doesn't currently support that file format. Only <strong>.csv</strong>, <strong>.xls</strong>, <strong>.xlsx</strong>, and <strong>.xml</strong> files are supported.
+		    <button type="button" class="close" ng-click="uploader.invalid_extension_alert = false" aria-hidden="true">&times;</button>
+		    <strong>Sorry!</strong> SEED doesn't currently support that file format. Only <strong>.csv</strong> files are supported.
 		    </div>
 		    <div class="form-group col-lg-12 col-sm-12">
 		    	<div class="row">
@@ -51,7 +50,7 @@ <h4 class="modal-title" ng-switch-when="12">Error Processing Data</h4>
 	    <div class="row" ng-hide="uploader.in_progress">
 		    <div class="col-lg-12 col-sm-12">
 		    	<div>
-		    		<p>File types supported: <strong>.csv</strong>, <strong>.xls</strong>, <strong>.xlsx</strong>, and <strong>.xml</strong>.</p>
+		    		<p>File types supported: <strong>.csv</strong>, <strong>.xls</strong> and <strong>.xlsx</strong> and <strong>.xml</strong>.</p> 
 		    		<p><strong>Note:</strong> multi-tabbed MS Excel files are not currently supported.</p>
 		    	</div>
 		    </div>
@@ -71,7 +70,7 @@ <h4 class="modal-title" ng-switch-when="12">Error Processing Data</h4>
 	    <div class="row">
 	    	<div class="alert alert-danger alert-dismissable" ng-show="uploader.invalid_extension_alert">
 		    	<button type="button" class="close" data-dismiss="alert" aria-hidden="true">&times;</button>
-		    	<strong>Sorry!</strong> SEED doesn't currently support that file format. Only <strong>.csv</strong>, <strong>.xls</strong>, <strong>.xlsx</strong>, and <strong>.xml</strong> files are supported.
+		    	<strong>Sorry!</strong> SEED doesn't currently support that file format. Only .csv, .xls, .xlsx files are supported.
 		    </div>
 		    <div class="form-group col-lg-12 col-sm-12">
 		        <div be-uploader sourcetype="Portfolio Raw" importrecord="dataset.id" buttontext="Upload your energy data file(s)" eventfunc="uploaderfunc(message, file, progress)" ng-hide="uploader.in_progress"></div>
@@ -152,17 +151,6 @@ <h4 class="modal-title" ng-switch-when="12">Error Processing Data</h4>
             </div>
 		</div>
 	</div>
-	<!-- Step 12: Error Processing Data  -->
-	<div class="data_upload_steps" ng-switch-when="12">
-		<div class="row">
-		    <div class="col-lg-12 col-sm-12">
-		    	<div>
-		    		<p>An error occurred while processing the file. Please ensure that your file meets the required specifications.</p>
-		    		<pre ng-class="{'pre-scrollable': step_12_error_message.length >= 300}" ng-show="step_12_error_message">{$ step_12_error_message $}</pre>
-		    	</div>
-		    </div>
-	    </div>
-	</div>
 </div>
 
 <div class="modal-footer" ng-switch on="step.number">
diff --git a/seed/static/seed/partials/dataset_detail.html b/seed/static/seed/partials/dataset_detail.html
index fdcdc58483..f7c2d42cb1 100644
--- a/seed/static/seed/partials/dataset_detail.html
+++ b/seed/static/seed/partials/dataset_detail.html
@@ -33,9 +33,9 @@ <h1>{$ dataset.name $}</h1>
                                 <td>    
                                     <a href="javascript:void(0);" class="delete_link" ng-click="confirm_delete(f)"><i class="fa fa-trash-o"></i></a>
                                 </td>
-                                <td class="is_aligned_right">{$ f.num_rows || 0 $}</td>
-                                <td><a role="button" class="btn btn-sm btn-primary" ng-href="#/data/mapping/{$ f.id $}" ng-disabled="!f.num_rows">{$ f.number_of_mappings $} Data Mapping</a></td>
-                                <td><a role="button" class="btn btn-sm btn-primary" ng-href="#/data/matching/{$ f.id $}" ng-disabled="!f.num_rows">{$ f.number_of_matchings $} Data Matching</a></td>
+                                <td class="is_aligned_right">{$ f.num_rows $}</td>                                
+                                <td><a role="button" class="btn btn-sm btn-primary" ng-href="#/data/mapping/{$ f.id $}">{$ f.number_of_mappings $} Data Mapping</a></td>
+                                <td><a role="button" class="btn btn-sm btn-primary" ng-href="#/data/matching/{$ f.id $}">{$ f.number_of_matchings $} Data Matching</a></td>
                             </tr>
                         </tbody>
                     </table>
diff --git a/seed/tasks.py b/seed/tasks.py
index 7a86c84011..cf52889f21 100644
--- a/seed/tasks.py
+++ b/seed/tasks.py
@@ -8,9 +8,6 @@
 import string
 import operator
 import os
-import traceback
-
-from _csv import Error
 
 from django.core.mail import send_mail
 from django.conf import settings
@@ -24,7 +21,6 @@
 from django.core.urlresolvers import reverse_lazy
 
 from celery.task import task, chord
-from celery.utils.log import get_task_logger
 
 from audit_logs.models import AuditLog
 from landing.models import SEEDUser as User
@@ -75,8 +71,6 @@
 from . import exporter
 
 
-logger = get_task_logger(__name__)
-
 # Maximum number of possible matches under which we'll allow a system match.
 MAX_SEARCH = 5
 # Minimum confidence of two buildings being related.
@@ -632,13 +626,9 @@ def cache_first_rows(import_file, parser):
 
     validation_rows = []
     for i in range(5):
-        try:
-            row = rows.next()
-            if row:
-                validation_rows.append(row)
-        except StopIteration:
-            """Less than 5 rows in file"""
-            break
+        row = rows.next()
+        if row:
+            validation_rows.append(row)
 
     #This is a fix for issue #24 to use original field order when importing
     #This is ultimately not the correct place for this fix.  The correct fix 
@@ -704,69 +694,43 @@ def _save_raw_green_button_data(file_pk, *args, **kwargs):
 @lock_and_track
 def _save_raw_data(file_pk, *args, **kwargs):
     """Chunk up the CSV and save data into the DB raw."""
-    status = error_msg = stacktrace = None
-    try:
-        import_file = ImportFile.objects.get(pk=file_pk)
+    import_file = ImportFile.objects.get(pk=file_pk)
 
-        if import_file.raw_save_done:
-            return {'status': 'warning', 'message': 'raw data already saved'}
+    if import_file.raw_save_done:
+        return {'status': 'warning', 'message': 'raw data already saved'}
 
-        if import_file.source_type == "Green Button Raw":
-            return _save_raw_green_button_data(file_pk, *args, **kwargs)
+    if import_file.source_type == "Green Button Raw":
+        return _save_raw_green_button_data(file_pk, *args, **kwargs)
 
-        parser = reader.MCMParser(import_file.local_file)
-        cache_first_rows(import_file, parser)
-        rows = parser.next()
-        import_file.num_rows = 0
+    parser = reader.MCMParser(import_file.local_file)
+    cache_first_rows(import_file, parser)
+    rows = parser.next()
+    import_file.num_rows = 0
 
-        prog_key = get_prog_key('save_raw_data', file_pk)
+    prog_key = get_prog_key('save_raw_data', file_pk)
 
-        tasks = []
-        for chunk in batch(rows, 100):
-            import_file.num_rows += len(chunk)
-            tasks.append(_save_raw_data_chunk.subtask((chunk, file_pk, prog_key)))
+    tasks = []
+    for chunk in batch(rows, 100):
+        import_file.num_rows += len(chunk)
+        tasks.append(_save_raw_data_chunk.subtask((chunk, file_pk, prog_key)))
 
-        tasks = add_cache_increment_parameter(tasks)
-        import_file.num_columns = parser.num_columns()
-        import_file.save()
+    tasks = add_cache_increment_parameter(tasks)
+    import_file.num_columns = parser.num_columns()
+    import_file.save()
 
-        if tasks:
-            chord(tasks, interval=15)(finish_raw_save.subtask([file_pk]))
-        else:
-            finish_raw_save.task(file_pk)
-
-        status = 'success'
-    except StopIteration:
-        error_msg = 'StopIteration Exception'
-        stacktrace = traceback.format_exc()
-        status = 'error'
-    except Error as e:
-        error_msg = 'CSV Error: ' + e.message
-        stacktrace = traceback.format_exc()
-        logger.info(error_msg)
-        status = 'error'
-    except KeyError as e:
-        error_msg = 'Invalid Column Name: "' + e.message + '"'
-        stacktrace = traceback.format_exc()
-        logger.info(error_msg)
-        status = 'error'
-    except Exception as e:
-        error_msg = 'Unhandled Error: ' + e.message
-        stacktrace = traceback.format_exc()
-        logger.info(error_msg)
-        status = 'error'
-
-    if status == 'success':
-        return {'status': status}
+    if tasks:
+        chord(tasks, interval=15)(finish_raw_save.subtask([file_pk]))
     else:
-        return {'status': status, 'message': error_msg, 'stacktrace': stacktrace}
+        finish_raw_save.task(file_pk)
+
+    return {'status': 'success'}
 
 
 @task
 @lock_and_track
 def save_raw_data(file_pk, *args, **kwargs):
-    response = _save_raw_data.delay(file_pk, *args, **kwargs)
-    return response.result
+    _save_raw_data.delay(file_pk, *args, **kwargs)
+    return {'status': 'success'}
 
 
 def _stringify(values):

From e5e70d2a2efaccac217cbca5c7429a68f4922cfc Mon Sep 17 00:00:00 2001
From: Alex Swindler <Alex.Swindler@nrel.gov>
Date: Mon, 4 May 2015 16:37:15 -0600
Subject: [PATCH 11/22] Upload error handling via cache

---
 BE/settings/dev.py                            |   2 +-
 seed/decorators.py                            |   7 +-
 .../seed/js/controllers/admin_controller.js   |   2 +
 .../js/controllers/data_upload_modal_ctrl.js  |  18 ++-
 .../controllers/dataset_detail_controller.js  |   2 +-
 .../seed/js/controllers/mapping_controller.js |   2 +
 .../seed/js/controllers/menu_controller.js    |   2 +-
 seed/static/seed/js/directives/beUploader.js  |   6 +-
 .../seed/js/filters/stripImportPrefix.js      |   4 +-
 .../seed/js/services/uploader_service.js      |  33 +++---
 .../seed/partials/data_upload_modal.html      |  20 +++-
 seed/static/seed/partials/dataset_detail.html |   6 +-
 seed/tasks.py                                 | 112 +++++++++++-------
 seed/views/main.py                            |  16 ++-
 14 files changed, 152 insertions(+), 80 deletions(-)

diff --git a/BE/settings/dev.py b/BE/settings/dev.py
index 3ceb6b2185..d7eef9a3a3 100644
--- a/BE/settings/dev.py
+++ b/BE/settings/dev.py
@@ -49,7 +49,7 @@
     LOGGING = {
         'version': 1,
         'disable_existing_loggers': True,
-        # set up some log message handers to chose from
+        # set up some log message handlers to choose from
         'handlers': {
             'sentry': {
                 'level': 'ERROR',
diff --git a/seed/decorators.py b/seed/decorators.py
index d8cd035071..d9183a429b 100644
--- a/seed/decorators.py
+++ b/seed/decorators.py
@@ -22,6 +22,7 @@ def _get_lock_key(func_name, import_file_pk):
 
 
 def get_prog_key(func_name, import_file_pk):
+    """Return the progress key for the cache"""
     return _get_cache_key(
         PROGRESS_CACHE_PREFIX.format(func_name), import_file_pk
     )
@@ -29,14 +30,14 @@ def get_prog_key(func_name, import_file_pk):
 
 def increment_cache(key, increment):
     """Increment cache by value increment, never exceed 100."""
-    value = cache.get(key) or 0.0
-    value = float(value)
+    value = cache.get(key) or {'status': 'parsing', 'progress': 0.0}
+    value = float(value['progress'])
     if value + increment >= 100.0:
         value = 100.0
     else:
         value += increment
 
-    cache.set(key, value)
+    cache.set(key, {'status': 'parsing', 'progress': value})
 
 
 def lock_and_track(fn, *args, **kwargs):
diff --git a/seed/static/seed/js/controllers/admin_controller.js b/seed/static/seed/js/controllers/admin_controller.js
index 0bec88ec4c..321ee8fec8 100644
--- a/seed/static/seed/js/controllers/admin_controller.js
+++ b/seed/static/seed/js/controllers/admin_controller.js
@@ -162,6 +162,8 @@ angular.module('BE.seed.controller.admin', [])
                 function(data){  //success fn
                   org.remove_message = "success";
                   get_organizations();
+                }, function(data){  //failure fn
+                  // Do nothing
                 },
                 org  // progress bar obj
             );
diff --git a/seed/static/seed/js/controllers/data_upload_modal_ctrl.js b/seed/static/seed/js/controllers/data_upload_modal_ctrl.js
index d9bac3ed74..250676c9e4 100644
--- a/seed/static/seed/js/controllers/data_upload_modal_ctrl.js
+++ b/seed/static/seed/js/controllers/data_upload_modal_ctrl.js
@@ -18,11 +18,14 @@
  * ng-switch-when="8" == Add files to your Data Set.
  * ng-switch-when="9" == Add files to {$ dataset.name $}
  * ng-switch-when="10" == No matches found
+ * ng-switch-when="11" == Confirm Save Mappings?
+ * ng-switch-when="12" == Error Processing Data
  */
 angular.module('BE.seed.controller.data_upload_modal', [])
 .controller('data_upload_modal_ctrl', [
   '$scope',
   '$modalInstance',
+  '$log',
   'step',
   'dataset',
   '$timeout',
@@ -34,6 +37,7 @@ angular.module('BE.seed.controller.data_upload_modal', [])
   function (
     $scope,
     $modalInstance,
+    $log,
     step,
     dataset,
     $timeout,
@@ -161,7 +165,6 @@ angular.module('BE.seed.controller.data_upload_modal', [])
         }
         if (event_message === "upload_complete") {
             var current_step = $scope.step.number;
-            var data_is_green_button = 
           
             $scope.uploader.status_message = "upload complete";
             $scope.dataset.import_file_id = file.file_id;
@@ -216,6 +219,8 @@ angular.module('BE.seed.controller.data_upload_modal', [])
             mapping_service.start_mapping(file_id).then(function (dataa){
                 monitor_mapping(dataa.progress_key, file_id);
             });
+        }, function(data) {
+            // Do nothing
         }, $scope.uploader);
     };
 
@@ -232,6 +237,8 @@ angular.module('BE.seed.controller.data_upload_modal', [])
             matching_service.start_system_matching(file_id).then(function (dataa){
                 monitor_matching(dataa.progress_key, file_id);
             });
+        }, function(data) {
+            // Do nothing
         }, $scope.uploader);
     };
 
@@ -248,6 +255,8 @@ angular.module('BE.seed.controller.data_upload_modal', [])
             $scope.uploader.in_progress = false;
             $scope.uploader.progress = 1;
             $scope.step.number = 5;
+        }, function(data) {
+            // Do nothing
         }, $scope.uploader);
     };
 
@@ -271,6 +280,11 @@ angular.module('BE.seed.controller.data_upload_modal', [])
                     $scope.step.number = 3;
                 }
 
+            }, function(data){
+                $log.error(data.message);
+                if (data.hasOwnProperty('stacktrace')) $log.error(data.stacktrace);
+                $scope.step_12_error_message = data.message;
+                $scope.step.number = 12;
             }, $scope.uploader);
         });
     };
@@ -311,6 +325,8 @@ angular.module('BE.seed.controller.data_upload_modal', [])
                                 $scope.step.number = 10;
                             }
                         });
+                    }, function(data) {
+                        // Do nothing
                     },
                     $scope.uploader
                 );
diff --git a/seed/static/seed/js/controllers/dataset_detail_controller.js b/seed/static/seed/js/controllers/dataset_detail_controller.js
index 0fbee7d83d..3b339e1743 100644
--- a/seed/static/seed/js/controllers/dataset_detail_controller.js
+++ b/seed/static/seed/js/controllers/dataset_detail_controller.js
@@ -12,7 +12,7 @@ angular.module('BE.seed.controller.dataset_detail', [])
   function ($scope, dataset_payload, $log, dataset_service, $modal, urls) {
     $scope.dataset = dataset_payload.dataset;
 
-    $log.info({dataset_payload: dataset_payload});
+    $log.info('dataset_payload:', dataset_payload);
 
     $scope.confirm_delete = function (file) {
         var yes = confirm("Are you sure you want to PERMANENTLY delete '" + file.name + "'?");
diff --git a/seed/static/seed/js/controllers/mapping_controller.js b/seed/static/seed/js/controllers/mapping_controller.js
index 81decdfe50..fa0b273dec 100644
--- a/seed/static/seed/js/controllers/mapping_controller.js
+++ b/seed/static/seed/js/controllers/mapping_controller.js
@@ -480,6 +480,8 @@ angular.module('BE.seed.controller.mapping', [])
         1.0,  // progress multiplier
         function(data){  //success fn
           $scope.get_mapped_buildings();
+        }, function(data) {  //failure fn
+          // Do nothing
         },
         $scope.import_file  // progress bar obj
       );
diff --git a/seed/static/seed/js/controllers/menu_controller.js b/seed/static/seed/js/controllers/menu_controller.js
index 4032dd22fb..5836e6f77e 100644
--- a/seed/static/seed/js/controllers/menu_controller.js
+++ b/seed/static/seed/js/controllers/menu_controller.js
@@ -63,7 +63,7 @@ angular.module('BE.seed.controller.menu', [])
     });
     $scope.$on("$routeChangeStart", function($event, next, current) {
         $scope.menu.loading = next.controller === "mapping_controller";
-    })
+    });
     $scope.$on("$routeChangeSuccess", function() {
         $scope.menu.loading = false;
         $scope.menu.route_load_error = false;
diff --git a/seed/static/seed/js/directives/beUploader.js b/seed/static/seed/js/directives/beUploader.js
index 458669bf29..b3d99fda97 100644
--- a/seed/static/seed/js/directives/beUploader.js
+++ b/seed/static/seed/js/directives/beUploader.js
@@ -11,7 +11,7 @@
  *              `message` - string - options: "upload_submitted",
  *              "upload_in_progress", "upload_complete", and "invalid_extension"
  *              `filename` - string name of the file uploaded
- *              `progress` - JS object with keys `loaded` and `total` wehere
+ *              `progress` - JS object with keys `loaded` and `total` where
  *                           `loaded` / `total` * 100.0 is the percent uploaded
  *  importrecord - int or string - id of import record or dataset
  *  
@@ -111,7 +111,7 @@ var makeS3Uploader = function(scope, element, attrs, filename) {
          * onComplete: overloaded callback that calls the callback defined
          * in the element attribute unless the upload failed, which will
          * fire a window alert. Passes as arguments to the callback
-         * a message indicating upload has copmleted, "upload_complete", and
+         * a message indicating upload has completed, "upload_complete", and
          * the filename. 
          */
         onComplete: function(id, fileName, responseJSON) {
@@ -242,7 +242,7 @@ var makeFileSystemUploader = function(scope, element, attrs, filename) {
              * onComplete: overloaded callback that calls the callback defined
              * in the element attribute unless the upload failed, which will
              * fire a window alert. Passes as arguments to the callback
-             * a message indicating upload has copmleted, "upload_complete", and
+             * a message indicating upload has completed, "upload_complete", and
              * the filename. 
              */
             onComplete: function(id, fileName, responseJSON) {
diff --git a/seed/static/seed/js/filters/stripImportPrefix.js b/seed/static/seed/js/filters/stripImportPrefix.js
index 32dbb2a52d..4f824a5b4d 100644
--- a/seed/static/seed/js/filters/stripImportPrefix.js
+++ b/seed/static/seed/js/filters/stripImportPrefix.js
@@ -10,11 +10,11 @@ angular.module('stripImportPrefix', []).filter('stripImportPrefix', [
   function($filter) {
     /** ids are sometime prefixed by the Import Record id.
     * e.g. import 28 would prefix all assessor data ids with 'IMP28-' and 
-    *      stripImportPrefix would stip out the 'IMP28-'s from the html and only
+    *      stripImportPrefix would strip out the 'IMP28-'s from the html and only
     *      display the ids. 
     *
     * Usage: building.id = "IMP12-007"
-    *        HTML: <span> {{ buidling.id | stripImportPrefix }} </span>
+    *        HTML: <span> {{ building.id | stripImportPrefix }} </span>
     *         compiles to: <span> 007 </span>
     *        JS  : stripImportPrefix(building.id)
     *         returns: "007"
diff --git a/seed/static/seed/js/services/uploader_service.js b/seed/static/seed/js/services/uploader_service.js
index a08fa2bad3..a58a35c424 100644
--- a/seed/static/seed/js/services/uploader_service.js
+++ b/seed/static/seed/js/services/uploader_service.js
@@ -115,28 +115,29 @@ angular.module('BE.seed.service.uploader', []).factory('uploader_service', [
      * @param {number} offset: where to start the progress bar
      * @param {number} multiplier: multiplier for progress val
      * @param {fn} success_fn: function to call when progress is done
+     * @param {fn} failure_fn: function to call when progress is done and the result was not success
      * @param {obj} progress_bar_obj: progress bar object, attr 'progress'
      *   is set with the progress
      */
-    uploader_factory.check_progress_loop = function(progress_key, offset, multiplier, success_fn, progress_bar_obj, debug) {
+    uploader_factory.check_progress_loop = function(progress_key, offset, multiplier, success_fn, failure_fn, progress_bar_obj, debug) {
         if (typeof debug === 'undefined') {
-          debug = false;
+            debug = false;
         }
         uploader_factory.check_progress(progress_key).then(function (data){
-          if (debug) {
-            console.log({progress: data.progress});
-          }
-          var stop = $timeout(function(){
-              progress_bar_obj.progress = (data.progress * multiplier) + offset;
-              if (data.progress < 100) {
-                uploader_factory.check_progress_loop(progress_key, offset, multiplier, success_fn, progress_bar_obj, debug);
-              } else {
-                  success_fn(data);
-              }
-          }, 750);
-        }, function (data, status) {
-          // reject promise
-          console.log(data, status);
+            if (debug) {
+                console.log({progress: data.progress});
+            }
+            var stop = $timeout(function(){
+                progress_bar_obj.progress = (data.progress * multiplier) + offset;
+                if (data.progress < 100) {
+                    uploader_factory.check_progress_loop(progress_key, offset, multiplier, success_fn, failure_fn, progress_bar_obj, debug);
+                } else {
+                    success_fn(data);
+                }
+            }, 750);
+        }, function (data) {
+            // reject promise
+            failure_fn(data);
         });
     };
 
diff --git a/seed/static/seed/partials/data_upload_modal.html b/seed/static/seed/partials/data_upload_modal.html
index 1632793a28..eb771dabeb 100644
--- a/seed/static/seed/partials/data_upload_modal.html
+++ b/seed/static/seed/partials/data_upload_modal.html
@@ -10,6 +10,7 @@ <h4 class="modal-title" ng-switch-when="8">{$ matched_buildings|number:0 $} buil
     <h4 class="modal-title" ng-switch-when="9">Add files to {$ dataset.name $}.</h4>
     <h4 class="modal-title" ng-switch-when="10">{$ step_10_title|titleCase $}</h4>
     <h4 class="modal-title" ng-switch-when="11">Confirm Save Mappings?</h4>
+    <h4 class="modal-title" ng-switch-when="12">Error Processing Data</h4>
 </div>
 <div class="modal-body no_bottom_padding" ng-switch on="step.number">
 	<!-- Step 1 -->
@@ -29,8 +30,8 @@ <h4 class="modal-title" ng-switch-when="11">Confirm Save Mappings?</h4>
 	<div class="data_upload_steps" ng-switch-when="2">
 	    <div class="row">
 	    	<div class="alert alert-danger alert-dismissable" ng-show="uploader.invalid_extension_alert">
-		    <button type="button" class="close" ng-click="uploader.invalid_extension_alert = false" aria-hidden="true">&times;</button>
-		    <strong>Sorry!</strong> SEED doesn't currently support that file format. Only <strong>.csv</strong> files are supported.
+		        <button type="button" class="close" ng-click="uploader.invalid_extension_alert = false" aria-hidden="true">&times;</button>
+		        <strong>Sorry!</strong> SEED doesn't currently support that file format. Only <strong>.csv</strong>, <strong>.xls</strong>, <strong>.xlsx</strong>, and <strong>.xml</strong> files are supported.
 		    </div>
 		    <div class="form-group col-lg-12 col-sm-12">
 		    	<div class="row">
@@ -50,7 +51,7 @@ <h4 class="modal-title" ng-switch-when="11">Confirm Save Mappings?</h4>
 	    <div class="row" ng-hide="uploader.in_progress">
 		    <div class="col-lg-12 col-sm-12">
 		    	<div>
-		    		<p>File types supported: <strong>.csv</strong>, <strong>.xls</strong> and <strong>.xlsx</strong> and <strong>.xml</strong>.</p> 
+		    		<p>File types supported: <strong>.csv</strong>, <strong>.xls</strong>, <strong>.xlsx</strong>, and <strong>.xml</strong>.</p>
 		    		<p><strong>Note:</strong> multi-tabbed MS Excel files are not currently supported.</p>
 		    	</div>
 		    </div>
@@ -70,7 +71,7 @@ <h4 class="modal-title" ng-switch-when="11">Confirm Save Mappings?</h4>
 	    <div class="row">
 	    	<div class="alert alert-danger alert-dismissable" ng-show="uploader.invalid_extension_alert">
 		    	<button type="button" class="close" data-dismiss="alert" aria-hidden="true">&times;</button>
-		    	<strong>Sorry!</strong> SEED doesn't currently support that file format. Only .csv, .xls, .xlsx files are supported.
+		    	<strong>Sorry!</strong> SEED doesn't currently support that file format. Only <strong>.csv</strong>, <strong>.xls</strong>, <strong>.xlsx</strong>, and <strong>.xml</strong> files are supported.
 		    </div>
 		    <div class="form-group col-lg-12 col-sm-12">
 		        <div be-uploader sourcetype="Portfolio Raw" importrecord="dataset.id" buttontext="Upload your energy data file(s)" eventfunc="uploaderfunc(message, file, progress)" ng-hide="uploader.in_progress"></div>
@@ -151,6 +152,17 @@ <h4 class="modal-title" ng-switch-when="11">Confirm Save Mappings?</h4>
             </div>
 		</div>
 	</div>
+	<!-- Step 12: Error Processing Data  -->
+	<div class="data_upload_steps" ng-switch-when="12">
+		<div class="row">
+		    <div class="col-lg-12 col-sm-12">
+		    	<div>
+		    		<p>An error occurred while processing the file. Please ensure that your file meets the required specifications.</p>
+		    		<pre ng-class="{'pre-scrollable': step_12_error_message.length >= 300}" ng-show="step_12_error_message">{$ step_12_error_message $}</pre>
+		    	</div>
+		    </div>
+	    </div>
+	</div>
 </div>
 
 <div class="modal-footer" ng-switch on="step.number">
diff --git a/seed/static/seed/partials/dataset_detail.html b/seed/static/seed/partials/dataset_detail.html
index f7c2d42cb1..fdcdc58483 100644
--- a/seed/static/seed/partials/dataset_detail.html
+++ b/seed/static/seed/partials/dataset_detail.html
@@ -33,9 +33,9 @@ <h1>{$ dataset.name $}</h1>
                                 <td>    
                                     <a href="javascript:void(0);" class="delete_link" ng-click="confirm_delete(f)"><i class="fa fa-trash-o"></i></a>
                                 </td>
-                                <td class="is_aligned_right">{$ f.num_rows $}</td>                                
-                                <td><a role="button" class="btn btn-sm btn-primary" ng-href="#/data/mapping/{$ f.id $}">{$ f.number_of_mappings $} Data Mapping</a></td>
-                                <td><a role="button" class="btn btn-sm btn-primary" ng-href="#/data/matching/{$ f.id $}">{$ f.number_of_matchings $} Data Matching</a></td>
+                                <td class="is_aligned_right">{$ f.num_rows || 0 $}</td>
+                                <td><a role="button" class="btn btn-sm btn-primary" ng-href="#/data/mapping/{$ f.id $}" ng-disabled="!f.num_rows">{$ f.number_of_mappings $} Data Mapping</a></td>
+                                <td><a role="button" class="btn btn-sm btn-primary" ng-href="#/data/matching/{$ f.id $}" ng-disabled="!f.num_rows">{$ f.number_of_matchings $} Data Matching</a></td>
                             </tr>
                         </tbody>
                     </table>
diff --git a/seed/tasks.py b/seed/tasks.py
index cf52889f21..85dc8762c4 100644
--- a/seed/tasks.py
+++ b/seed/tasks.py
@@ -8,6 +8,9 @@
 import string
 import operator
 import os
+import traceback
+
+from _csv import Error
 
 from django.core.mail import send_mail
 from django.conf import settings
@@ -21,6 +24,7 @@
 from django.core.urlresolvers import reverse_lazy
 
 from celery.task import task, chord
+from celery.utils.log import get_task_logger
 
 from audit_logs.models import AuditLog
 from landing.models import SEEDUser as User
@@ -71,6 +75,8 @@
 from . import exporter
 
 
+logger = get_task_logger(__name__)
+
 # Maximum number of possible matches under which we'll allow a system match.
 MAX_SEARCH = 5
 # Minimum confidence of two buildings being related.
@@ -607,7 +613,7 @@ def finish_raw_save(results, file_pk):
     import_file.raw_save_done = True
     import_file.save()
     prog_key = get_prog_key('save_raw_data', file_pk)
-    cache.set(prog_key, 100)
+    cache.set(prog_key, {'status': 'success', 'progress': 100})
 
 
 def cache_first_rows(import_file, parser):
@@ -626,9 +632,13 @@ def cache_first_rows(import_file, parser):
 
     validation_rows = []
     for i in range(5):
-        row = rows.next()
-        if row:
-            validation_rows.append(row)
+        try:
+            row = rows.next()
+            if row:
+                validation_rows.append(row)
+        except StopIteration:
+            """Less than 5 rows in file"""
+            break
 
     #This is a fix for issue #24 to use original field order when importing
     #This is ultimately not the correct place for this fix.  The correct fix 
@@ -638,21 +648,20 @@ def cache_first_rows(import_file, parser):
     #But until we can patch the mcm code this should fix the issue.
     local_reader = parser.reader
     if isinstance(local_reader, reader.ExcelParser):
-        first_row = local_reader.sheet.row_values(local_reader.header_row)        
+        first_row = local_reader.sheet.row_values(local_reader.header_row)
     elif isinstance(local_reader, reader.CSVParser):
-        first_row = local_reader.csvreader.fieldnames        
+        first_row = local_reader.csvreader.fieldnames
         first_row = [local_reader._clean_super(x) for x in first_row]
     else:
         #default to the original behavior if a new type of parser for lack of anything better
         first_row = rows.next().keys()
-    
+
     tmp = []
     for r in validation_rows:
         tmp.append(ROW_DELIMITER.join([str(r[x]) for x in first_row]))
-    
-        
+
     import_file.cached_second_to_fifth_row = "\n".join(tmp)
-    
+
     if first_row:
         first_row = ROW_DELIMITER.join(first_row)
     import_file.cached_first_row = first_row or ''
@@ -694,36 +703,59 @@ def _save_raw_green_button_data(file_pk, *args, **kwargs):
 @lock_and_track
 def _save_raw_data(file_pk, *args, **kwargs):
     """Chunk up the CSV and save data into the DB raw."""
-    import_file = ImportFile.objects.get(pk=file_pk)
-
-    if import_file.raw_save_done:
-        return {'status': 'warning', 'message': 'raw data already saved'}
-
-    if import_file.source_type == "Green Button Raw":
-        return _save_raw_green_button_data(file_pk, *args, **kwargs)
-
-    parser = reader.MCMParser(import_file.local_file)
-    cache_first_rows(import_file, parser)
-    rows = parser.next()
-    import_file.num_rows = 0
 
+    result = {'status': 'success', 'progress': 100}
     prog_key = get_prog_key('save_raw_data', file_pk)
-
-    tasks = []
-    for chunk in batch(rows, 100):
-        import_file.num_rows += len(chunk)
-        tasks.append(_save_raw_data_chunk.subtask((chunk, file_pk, prog_key)))
-
-    tasks = add_cache_increment_parameter(tasks)
-    import_file.num_columns = parser.num_columns()
-    import_file.save()
-
-    if tasks:
-        chord(tasks, interval=15)(finish_raw_save.subtask([file_pk]))
-    else:
-        finish_raw_save.task(file_pk)
-
-    return {'status': 'success'}
+    try:
+        import_file = ImportFile.objects.get(pk=file_pk)
+
+        if import_file.raw_save_done:
+            result['status'] = 'warning'
+            result['message'] = 'Raw data already saved'
+            cache.set(prog_key, result)
+            return result
+
+        if import_file.source_type == "Green Button Raw":
+            return _save_raw_green_button_data(file_pk, *args, **kwargs)
+
+        parser = reader.MCMParser(import_file.local_file)
+        cache_first_rows(import_file, parser)
+        rows = parser.next()
+        import_file.num_rows = 0
+
+        tasks = []
+        for chunk in batch(rows, 100):
+            import_file.num_rows += len(chunk)
+            tasks.append(_save_raw_data_chunk.subtask((chunk, file_pk, prog_key)))
+
+        tasks = add_cache_increment_parameter(tasks)
+        import_file.num_columns = parser.num_columns()
+        import_file.save()
+
+        if tasks:
+            chord(tasks, interval=15)(finish_raw_save.subtask([file_pk]))
+        else:
+            finish_raw_save.task(file_pk)
+
+    except StopIteration:
+        result['status'] = 'error'
+        result['message'] = 'StopIteration Exception'
+        result['stacktrace'] = traceback.format_exc()
+    except Error as e:
+        result['status'] = 'error'
+        result['message'] = 'File Content Error: ' + e.message
+        result['stacktrace'] = traceback.format_exc()
+    except KeyError as e:
+        result['status'] = 'error'
+        result['message'] = 'Invalid Column Name: "' + e.message + '"'
+        result['stacktrace'] = traceback.format_exc()
+    except Exception as e:
+        result['status'] = 'error'
+        result['message'] = 'Unhandled Error: ' + e.message
+        result['stacktrace'] = traceback.format_exc()
+
+    cache.set(prog_key, result)
+    return result
 
 
 @task
@@ -777,7 +809,7 @@ def handle_results(results, b_idx, can_rev_idx, unmatched_list, user_pk):
 @task
 @lock_and_track
 def match_buildings(file_pk, user_pk):
-    """kicks off system matching, returns progress key"""
+    """kicks off system matching, returns progress key #NL -- this seems to return a JSON--not a progress key?"""
     import_file = ImportFile.objects.get(pk=file_pk)
     if import_file.matching_done:
         prog_key = get_prog_key('match_buildings', file_pk)
@@ -925,7 +957,7 @@ def _findMatches(un_m_address,canonical_buildings_addresses):
     for cb in canonical_buildings_addresses:
         if un_m_address.lower()==cb.lower(): #this second lower may be obsolete now
             match_list.append((un_m_address, 1))
-    return  match_list    
+    return match_list
 
 
 @task
diff --git a/seed/views/main.py b/seed/views/main.py
index 6eca027b14..fa73e754f0 100644
--- a/seed/views/main.py
+++ b/seed/views/main.py
@@ -1928,10 +1928,16 @@ def progress(request):
 
     progress_key = json.loads(request.body).get('progress_key')
 
-    return {
-        'progress_key': progress_key,
-        'progress': cache.get(progress_key) or 0
-    }
+    if cache.get(progress_key):
+        result = cache.get(progress_key)
+        result['progress_key'] = progress_key
+        return result
+    else:
+        return {
+            'progress_key': progress_key,
+            'progress': 0,
+            'status': 'waiting'
+        }
 
 
 @api_endpoint
@@ -1946,7 +1952,7 @@ def update_building(request):
     :PUT:
 
         {
-        'organization_id': organzation id,
+        'organization_id': organization id,
         'building':
             {
             'canonical_building': The canonical building ID

From cd5ef87ca3319d4602c4b06743c365ad50ab4d4d Mon Sep 17 00:00:00 2001
From: Nicholas Long <nicholas.long@nrel.gov>
Date: Mon, 4 May 2015 16:53:54 -0600
Subject: [PATCH 12/22] add dump to gitignore

---
 .gitignore | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/.gitignore b/.gitignore
index acdedceca9..501a16a28b 100644
--- a/.gitignore
+++ b/.gitignore
@@ -45,4 +45,5 @@ src/
 /seed/static/vendors/bower_components/fine-uploader/
 docs/build/
 .project
-.pydevproject
\ No newline at end of file
+.pydevproject
+dump.rdb

From 0fb6fa79f50b9048af4ba6ed21784cf4200b2f64 Mon Sep 17 00:00:00 2001
From: Phil Ngo <ngo.phil@gmail.com>
Date: Mon, 11 May 2015 11:14:04 -0500
Subject: [PATCH 13/22] add basic structure for showing green button files

---
 green_button/xml_importer.py                  |   6 +-
 .../controllers/building_detail_controller.js |   9 ++
 .../static/seed/partials/building_detail.html |   1 +
 .../partials/building_energy_section.html     | 106 ++++++------------
 4 files changed, 46 insertions(+), 76 deletions(-)

diff --git a/green_button/xml_importer.py b/green_button/xml_importer.py
index 9c5909e5aa..9275b1dc08 100644
--- a/green_button/xml_importer.py
+++ b/green_button/xml_importer.py
@@ -119,7 +119,7 @@ def interval_data(reading_xml_data):
     :returns: dictionary representing a time series reading with keys
     'cost', 'value', 'start_time', and 'duration'.
     """
-    cost = reading_xml_data['cost']
+    cost = reading_xml_data.get('cost')
     value = reading_xml_data['value']
 
     time_period = reading_xml_data['timePeriod']
@@ -155,8 +155,8 @@ def meter_data(raw_meter_meta):
     # this function currently assumes those types are present and does
     # not check for any other types
 
-    currency = params_data['currency']
-    power_of_ten_multiplier = params_data['powerOfTenMultiplier']
+    currency = params_data.get('currency')
+    power_of_ten_multiplier = params_data.get('powerOfTenMultiplier')
     uom = params_data['uom']
 
     result = {
diff --git a/seed/static/seed/js/controllers/building_detail_controller.js b/seed/static/seed/js/controllers/building_detail_controller.js
index bbc78c6fbd..c99e95f6c7 100644
--- a/seed/static/seed/js/controllers/building_detail_controller.js
+++ b/seed/static/seed/js/controllers/building_detail_controller.js
@@ -32,6 +32,15 @@ angular.module('BE.seed.controller.building_detail', [])
     $scope.building_copy = {};
     $scope.data_columns = [];
     $scope.audit_logs = audit_payload.audit_logs;
+    $scope.green_button_filenames = [];
+
+    // gather green button filenames
+    building_payload.imported_buildings.forEach(function(e) {
+        if (e.source_type == 5) { // GREEN_BUTTON_RAW
+            $scope.green_button_filenames.push(e.import_file_name);
+        }
+    });
+
     // set the tab
     $scope.section = $location.hash();
     /**
diff --git a/seed/static/seed/partials/building_detail.html b/seed/static/seed/partials/building_detail.html
index cf5bbc3867..a882b6d696 100644
--- a/seed/static/seed/partials/building_detail.html
+++ b/seed/static/seed/partials/building_detail.html
@@ -14,6 +14,7 @@ <h1>{$ building.address_line_1 $}</h1>
         <a ng-href="" style="cursor: pointer;" ng-class="{active: section == 'building' || !section}" ng-click="set_location('building')">Building Info</a>
         <a ng-href="" style="cursor: pointer;" ng-class="{active: section == 'projects'}" ng-click="set_location('projects')">Projects</a>
         <a ng-href="" style="cursor: pointer;" ng-class="{active: section == 'audit'}" ng-click="set_location('audit')">Log &amp Notes</a>
+        <a ng-href="" style="cursor: pointer;" ng-class="{active: section == 'energy'}" ng-click="set_location('energy')">Energy</a>
     </div>
 </div>
 <div ng-include="urls.static_url + 'seed/partials/building_detail_section.html'" ng-show="section=='building' || !section"></div>
diff --git a/seed/static/seed/partials/building_energy_section.html b/seed/static/seed/partials/building_energy_section.html
index c78c3f877d..cf01e3feac 100644
--- a/seed/static/seed/partials/building_energy_section.html
+++ b/seed/static/seed/partials/building_energy_section.html
@@ -1,77 +1,37 @@
 <div class="section">
-    <div class="section_header_container">
-        <div class="section_header fixed_height_short has_no_padding">
-            <div class="section_action_container left">
-            	<h2><i class="fa fa-lightbulb-o"></i> Energy Data</h2>
-            </div>
-            <div class="section_action_container right" ng-hide="building.edit_form_showing">
-                <a href="javascript:void(0);" ng-click="building.edit_form_showing = true; save_building_state()" ng-show="user_role !== 'viewer'" ><i class="fa fa-pencil"></i> Edit</a>
-            </div>
-            <div class="section_action_container right section_action_btn" ng-show="building.edit_form_showing">
-            	<a roll="button" class="btn btn-default btn-sm" href="javascript:void(0);" ng-click="building.edit_form_showing = false; restore_building()">Cancel</a>
-				<a roll="button" class="btn btn-primary btn-sm" href="javascript:void(0);" ng-click="building.edit_form_showing = false; save_building()">Save Changes</a>
-            </div>
-        </div>
+  <div class="section_header_container">
+    <div class="section_header fixed_height_short has_no_padding">
+      <div class="section_action_container left">
+        <h2><i class="fa fa-lightbulb-o"></i> Energy Data</h2>
+      </div>
+      <div class="section_action_container right" ng-hide="building.edit_form_showing">
+        <a href="javascript:void(0);" ng-click="building.edit_form_showing = true; save_building_state()"
+                                      ng-show="user_role !== 'viewer'" ><i class="fa fa-pencil"></i> Edit</a>
+      </div>
+      <div class="section_action_container right section_action_btn" ng-show="building.edit_form_showing">
+        <a role="button" class="btn btn-default btn-sm" href="javascript:void(0);"
+                                                        ng-click="building.edit_form_showing = false; restore_building()">Cancel</a>
+        <a role="button" class="btn btn-primary btn-sm" href="javascript:void(0);"
+                                                        ng-click="building.edit_form_showing = false; save_building()">Save Changes</a>
+      </div>
     </div>
-    <div class="section_content_container">
-        <div class="section_content">
-            <div class="table_list_container">
-                <table class="table table-striped table_highlight_first">
-                    <thead>
-                        <tr>
-                            <th>Field</th>
-                            <th>Master</th>
-                            <th ng-repeat="i in imported_buildings" ng-class="{'is_not_master': !i.is_master && building.edit_form_showing, 'is_master': i.is_master && building.edit_form_showing}">
-                                <span ng-hide="building.edit_form_showing">{$ i.import_file_name $}</span> 
-                                <a href="javascript:void(0);" ng-click="make_source_default(i)" ng-show="building.edit_form_showing">
-                                    <span>{$ i.import_file_name $}</span> 
-                                </a>
-                            </th>
-                        </tr>
-                    </thead>
-                    <tbody>
-                        <tr ng-repeat="f in energy_fields">
-                            <td>{$ f.title $}</td>
-                            <td>
-                                <span ng-hide="building.edit_form_showing" ng-if="!f.extra_data && f.type == 'string'">{$ building[f.sort_column] $}</span>
-                                <span ng-hide="building.edit_form_showing" ng-if="!f.extra_data && f.type == 'date'">{$ building[f.sort_column] | date:'shortDate' $}</span>
-                                <span ng-hide="building.edit_form_showing" ng-if="!f.extra_data && f.type == 'number'">{$ building[f.sort_column] | number:f.num_digits $}</span>
-                                <span ng-hide="building.edit_form_showing" ng-if="!f.extra_data && f.type == 'popover'"><a rel="popover" popover="{$ building[f.sort_column] $}" role="button" popover-title="{$ f.title $}" popover-placement="top"><i class="fa fa-exclamation-triangle" ng-show="building[f.sort_column]"></i></a></span>
-
-                                <span ng-hide="building.edit_form_showing" ng-if="f.extra_data">{$ building.extra_data[f.sort_column] | number:0 $}</span>
-                                <div ng-show="building.edit_form_showing" ng-if="!f.extra_data">
-                                    <input class="form-control input-sm" id="edit_tax_lot_id" type="text" name="tax_lot_id" ng-model="building[f.sort_column]" ng-change="set_self_as_source(f.sort_column, f.extra_data)"/>
-                                </div>
-                                <div ng-show="building.edit_form_showing" ng-if="f.extra_data">
-                                    <input class="form-control input-sm" id="edit_tax_lot_id" type="text" name="tax_lot_id" ng-model="building.extra_data[f.sort_column]" ng-change="set_self_as_source(f.sort_column, f.extra_data)"/>
-                                </div>
-                            </td>
-                           
-                            <td ng-repeat="i in imported_buildings" ng-class="{'is_not_master': (building[f.sort_column + '_source'] != i.id && (building.extra_data_sources[f.sort_column] && building.extra_data_sources[f.sort_column] != i.id)) && building.edit_form_showing, 'is_master':(building[f.sort_column + '_source'] == i.id || building.extra_data_sources[f.sort_column] == i.id) && building.edit_form_showing }">
-                                <span ng-hide="building.edit_form_showing" ng-if="!f.extra_data && f.type == 'string'">{$ i[f.sort_column] $}</span>
-                                <span ng-hide="building.edit_form_showing" ng-if="!f.extra_data && f.type == 'date'">{$ i[f.sort_column] | date:'shortDate' $}</span>
-                                <span ng-hide="building.edit_form_showing" ng-if="!f.extra_data && f.type == 'number'">{$ i[f.sort_column] | number:f.num_digits $}</span>
-                                <span ng-hide="building.edit_form_showing" ng-if="!f.extra_data && f.type == 'popover'"><a rel="popover" popover="{$ i[f.sort_column] $}" role="button" popover-title="{$ f.title $}" popover-placement="top"><i class="fa fa-exclamation-triangle" ng-show="i[f.sort_column]"></i></a></span>
-                                <span ng-hide="building.edit_form_showing" ng-if="f.extra_data">{$ i.extra_data[f.sort_column] | number:f.num_digits $}</span>
-                                <a ng-if="!f.extra_data" href="javascript:void(0);" ng-show="building.edit_form_showing && i[f.sort_column] != null" ng-click="set_building_attribute(i, f.sort_column)">
-                                    <span ng-if="!f.extra_data && f.type == 'string'">{$ i[f.sort_column] $}</span>
-                                    <span ng-if="!f.extra_data && f.type == 'date'">{$ i[f.sort_column] | date:'shortDate' $}</span>
-                                    <span ng-if="!f.extra_data && f.type == 'number'">{$ i[f.sort_column] | number:f.num_digits $}</span>
-                                    
-                                    <span ng-if="f.extra_data">{$ i.extra_data[f.sort_column] | number:f.num_digits $}</span>
-                                </a>
-                                <a ng-if="f.extra_data" href="javascript:void(0);" ng-show="building.edit_form_showing && i.extra_data[f.sort_column]" ng-click="set_building_attribute(i, f.sort_column, true)">
-                                    <span ng-if="!f.extra_data && f.type == 'string'" ng-show="building.extra_data_sources[f.sort_column] == i.id">{$ i[f.sort_column] $}</span>
-                                    <span ng-if="!f.extra_data && f.type == 'date'" ng-show="building.extra_data_sources[f.sort_column] == i.id">{$ i[f.sort_column] | date:'shortDate' $}</span>
-                                    <span ng-if="!f.extra_data && f.type == 'number'" ng-show="building.extra_data_sources[f.sort_column] == i.id">{$ i[f.sort_column] | number:f.num_digits $}</span>
-                                    
-                                    <span ng-if="f.extra_data">{$ i.extra_data[f.sort_column] | number:f.num_digits $}</span>
-                                </a>
-                            </td>                      
-                        </tr>
-                    </tbody>
-                </table>
-            </div>
-        </div>
+  </div>
+  <div class="section_content_container">
+    <div class="section_content">
+      <div class="table_list_container">
+        <table class="table table-striped table_highlight_first">
+          <thead>
+            <tr>
+              <th>Uploaded Green Button Files</th>
+            </tr>
+          </thead>
+          <tbody>
+            <tr ng-repeat="f in green_button_filenames">
+              <td>{$ f $}</td>
+            </tr>
+          </tbody>
+        </table>
+      </div>
     </div>
+  </div>
 </div>

From a437b36e87fe3b33f2892dc977fe43d3bf962738 Mon Sep 17 00:00:00 2001
From: Phil Ngo <ngo.phil@gmail.com>
Date: Mon, 11 May 2015 14:51:23 -0500
Subject: [PATCH 14/22] add green button xml files to get_ancestors, clean up
 partial

---
 seed/models.py                                             | 7 ++++---
 .../seed/js/controllers/building_detail_controller.js      | 2 +-
 seed/static/seed/partials/building_energy_section.html     | 3 +++
 3 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/seed/models.py b/seed/models.py
index 49a9638b1a..e34bb8cb5a 100644
--- a/seed/models.py
+++ b/seed/models.py
@@ -152,15 +152,16 @@ def get_ancestors(building):
        source_type {
            2: ASSESSED_BS,
            3: PORTFOLIO_BS,
-           4: COMPOSITE_BS
+           4: COMPOSITE_BS,
+           6: GREEN_BUTTON_BS
        }
 
        :param building: BuildingSnapshot inst.
        :returns: list of BuildingSnapshot inst., ancestors of building
     """
     ancestors = []
-    parents = building.parents.filter(source_type__in=[2, 3, 4])
-    ancestors.extend(parents.filter(source_type__in=[2, 3]))
+    parents = building.parents.filter(source_type__in=[2, 3, 4, 6])
+    ancestors.extend(parents.filter(source_type__in=[2, 3, 6]))
     for p in parents:
         ancestors.extend(get_ancestors(p))
     return ancestors
diff --git a/seed/static/seed/js/controllers/building_detail_controller.js b/seed/static/seed/js/controllers/building_detail_controller.js
index c99e95f6c7..c67c93ffef 100644
--- a/seed/static/seed/js/controllers/building_detail_controller.js
+++ b/seed/static/seed/js/controllers/building_detail_controller.js
@@ -36,7 +36,7 @@ angular.module('BE.seed.controller.building_detail', [])
 
     // gather green button filenames
     building_payload.imported_buildings.forEach(function(e) {
-        if (e.source_type == 5) { // GREEN_BUTTON_RAW
+        if (e.source_type == 6) { // GREEN_BUTTON_BS
             $scope.green_button_filenames.push(e.import_file_name);
         }
     });
diff --git a/seed/static/seed/partials/building_energy_section.html b/seed/static/seed/partials/building_energy_section.html
index cf01e3feac..3c7bee74c6 100644
--- a/seed/static/seed/partials/building_energy_section.html
+++ b/seed/static/seed/partials/building_energy_section.html
@@ -26,6 +26,9 @@ <h2><i class="fa fa-lightbulb-o"></i> Energy Data</h2>
             </tr>
           </thead>
           <tbody>
+            <tr ng-show="!green_button_filenames.length">
+              <td>There are no green button files for this building</td>
+            </tr>
             <tr ng-repeat="f in green_button_filenames">
               <td>{$ f $}</td>
             </tr>

From 5f3412f0f462e80a02d5d21689d66f9028cff791 Mon Sep 17 00:00:00 2001
From: Nicholas Serra <nicks@ydekproductions.com>
Date: Mon, 11 May 2015 17:03:56 -0400
Subject: [PATCH 15/22] JSON field exact and null searches

---
 seed/search.py           |  80 +++++++++++++++++++----------
 seed/tests/test_views.py | 108 +++++++++++++++++++++++++++++++++++++++
 2 files changed, 162 insertions(+), 26 deletions(-)

diff --git a/seed/search.py b/seed/search.py
index ed95383fd9..b82f8082d9 100644
--- a/seed/search.py
+++ b/seed/search.py
@@ -185,21 +185,30 @@ def is_column(k, columns):
         sanitized = strip_suffixes(k, ['__lt', '__gt', '__lte', '__gte'])
         if sanitized in columns:
             return True
-        else:
-            return False
+        return False
+
+    def is_string_query(q):
+        return isinstance(q, basestring)
+
+    def is_exact_match(q):
+        if is_string_query(q):
+            return re.match(r"""^(["'])(.+)\1$""", q)
+        return False
+
+    def is_empty_match(q):
+        if is_string_query(q):
+            return re.match(r"""^(["'])\1$""", q)
+        return False
 
     # Build query as Q objects so we can AND and OR.
     query_filters = Q()
     for k, v in other_params.iteritems():
         in_columns = is_column(k, db_columns)
-        if in_columns and k != 'q' and v is not None:
-
-            # Is this query a string?
-            is_string_query = isinstance(v, basestring)
+        if in_columns and k != 'q' and v:
 
             # Is this query surrounded by matching quotes?
-            exact_match = re.match(r"""^(["'])(.+)\1$""", v) if is_string_query else False
-            empty_match = re.match(r"""^(["'])\1$""", v) if is_string_query else False
+            exact_match = is_exact_match(v)
+            empty_match = is_empty_match(v)
 
             if exact_match:
                 query_filters &= Q(**{"%s__exact" % k: exact_match.group(2)})
@@ -219,28 +228,47 @@ def is_column(k, columns):
 
     # handle extra_data with json_query
     for k, v in other_params.iteritems():
-        if (not is_column(k, db_columns)) and k != 'q' and v != '':
-            if k.endswith(('__gt', '__gte')):
+        if (not is_column(k, db_columns)) and k != 'q' and v:
+
+            # Is this query surrounded by matching quotes?
+            exact_match = is_exact_match(v)
+            empty_match = is_empty_match(v)
+
+
+            # If querying for empty matches, do a hack-y 'contains' query on
+            # the json field to check if the field exists. We're checking 
+            # existence because empty mapped fields are not saved in the
+            # extra_data json field if they contain no data.
+            #
+            # When we bump to Django 1.7, we can switch to the newer
+            # django-pgjson package, and use the new "HAS" operator syntax.
+            # - nicholasserra
+            if empty_match:
+                queryset = queryset.exclude(extra_data__contains='"%s":' % k)
+                continue
+
+            conditions = {
+                'value': v
+            }
+
+            if exact_match:
+                conditions['value'] = exact_match.group(2)
+                conditions['key_cast'] = 'text'
+            elif k.endswith(('__gt', '__gte')):
                 k = strip_suffixes(k, ['__gt', '__gte'])
-                cond = '>'
-                key_cast = 'float'
+                conditions['cond'] = '>'
+                conditions['key_cast'] = 'float'
             elif k.endswith(('__lt', '__lte')):
                 k = strip_suffixes(k, ['__lt', '__lte'])
-                cond = '<'
-                key_cast = 'float'
+                conditions['cond'] = '<'
+                conditions['key_cast'] = 'float'
             else:
-                cond = 'LIKE'
-                key_cast = 'text'
-                v = "%{0}%".format(v)
-            case_insensitive = key_cast == 'text'
-
-            queryset = queryset.json_query(
-                k,
-                cond=cond,
-                key_cast=key_cast,
-                value=v,
-                case_insensitive=case_insensitive,
-            )
+                conditions['cond'] = 'LIKE'
+                conditions['key_cast'] = 'text'
+                conditions['value'] = "%{0}%".format(v)
+                conditions['case_insensitive'] = True
+
+            queryset = queryset.json_query(k, **conditions)
 
     return queryset
 
diff --git a/seed/tests/test_views.py b/seed/tests/test_views.py
index 5b31ec366a..081ee0b76f 100644
--- a/seed/tests/test_views.py
+++ b/seed/tests/test_views.py
@@ -740,6 +740,114 @@ def test_search_empty_column(self):
         self.assertEqual(data['buildings'][0]['address_line_1'], '')
         self.assertEqual(data['buildings'][0]['pk'], b1.pk)
 
+    def test_search_extra_data_exact_match(self):
+        """Exact match on extra_data json keys"""
+        # Uppercase
+        cb1 = CanonicalBuilding(active=True)
+        cb1.save()
+        b1 = SEEDFactory.building_snapshot(
+            canonical_building=cb1,
+            extra_data={'testing': 'TEST'}
+        )
+        cb1.canonical_snapshot = b1
+        cb1.save()
+        b1.super_organization = self.org
+        b1.save()
+
+        # Lowercase
+        cb2 = CanonicalBuilding(active=True)
+        cb2.save()
+        b2 = SEEDFactory.building_snapshot(
+            canonical_building=cb2,
+            extra_data={'testing': 'test'}
+        )
+        cb2.canonical_snapshot = b2
+        cb2.save()
+        b2.super_organization = self.org
+        b2.save()
+
+        url = reverse_lazy("seed:search_buildings")
+        post_data = {
+            'filter_params': {
+                'testing': '"TEST"'
+            },
+            'number_per_page': 10,
+            'order_by': '',
+            'page': 1,
+            'q': '',
+            'sort_reverse': False,
+            'project_id': None,
+        }
+
+        # act
+        response = self.client.post(
+            url,
+            content_type='application/json',
+            data=json.dumps(post_data)
+        )
+        json_string = response.content
+        data = json.loads(json_string)
+
+        # assert
+        self.assertEqual(data['status'], 'success')
+        self.assertEqual(data['number_matching_search'], 1)
+        self.assertEqual(len(data['buildings']), 1)
+        self.assertEqual(data['buildings'][0]['pk'], b1.pk)
+
+    def test_search_extra_data_non_existent_column(self):
+        """Empty match on extra_data json keys"""
+        # Empty column
+        cb1 = CanonicalBuilding(active=True)
+        cb1.save()
+        b1 = SEEDFactory.building_snapshot(
+            canonical_building=cb1,
+            extra_data={}
+        )
+        cb1.canonical_snapshot = b1
+        cb1.save()
+        b1.super_organization = self.org
+        b1.save()
+
+        # Populated column
+        cb2 = CanonicalBuilding(active=True)
+        cb2.save()
+        b2 = SEEDFactory.building_snapshot(
+            canonical_building=cb2,
+            extra_data={'testing': 'test'}
+        )
+        cb2.canonical_snapshot = b2
+        cb2.save()
+        b2.super_organization = self.org
+        b2.save()
+
+        url = reverse_lazy("seed:search_buildings")
+        post_data = {
+            'filter_params': {
+                'testing': '""'
+            },
+            'number_per_page': 10,
+            'order_by': '',
+            'page': 1,
+            'q': '',
+            'sort_reverse': False,
+            'project_id': None,
+        }
+
+        # act
+        response = self.client.post(
+            url,
+            content_type='application/json',
+            data=json.dumps(post_data)
+        )
+        json_string = response.content
+        data = json.loads(json_string)
+
+        # assert
+        self.assertEqual(data['status'], 'success')
+        self.assertEqual(data['number_matching_search'], 1)
+        self.assertEqual(len(data['buildings']), 1)
+        self.assertEqual(data['buildings'][0]['pk'], b1.pk)
+
     def test_apply_label_to_project_buildings(self):
         """
         Tests applying a label to each building in a project. In the UI

From e670014215a901be016af32aac6292fd99a30e4c Mon Sep 17 00:00:00 2001
From: Phil Ngo <ngo.phil@gmail.com>
Date: Mon, 11 May 2015 16:37:57 -0500
Subject: [PATCH 16/22] add test for updated get_ancestors (through
 get_building endpoint)

---
 seed/tests/test_views.py | 33 +++++++++++++++++++++++++++++++++
 1 file changed, 33 insertions(+)

diff --git a/seed/tests/test_views.py b/seed/tests/test_views.py
index 89c3093397..11d5d7fb15 100644
--- a/seed/tests/test_views.py
+++ b/seed/tests/test_views.py
@@ -996,6 +996,39 @@ def test_get_building_with_deleted_dataset(self):
             places=1,
         )
 
+    def test_get_building_imported_buildings_includes_green_button(self):
+        # arrange
+        self.parent_2.source_type = 6
+        self.parent_2.save()
+        child = save_snapshot_match(self.parent_1.pk, self.parent_2.pk)
+
+        url = reverse_lazy("seed:get_building")
+        get_data = {
+            'building_id': child.canonical_building.pk,
+            'organization_id': self.org.pk,
+        }
+
+        # act
+        response = self.client.get(
+            url,
+            get_data,
+            content_type='application/json',
+        )
+        json_string = response.content
+        data = json.loads(json_string)
+
+        self.assertEqual(2,len(data['imported_buildings']))
+
+        # both parents link to their import file
+        self.assertEqual(
+            data['imported_buildings'][0]['import_file'],
+            self.import_file_1.pk
+        )
+        self.assertEqual(
+            data['imported_buildings'][1]['import_file'],
+            self.import_file_2.pk
+        )
+
     def test_update_building_audit_log(self):
         """tests that a building update logs an audit_log"""
         # arrange

From f550c991d1f422c140d42b7b02a6806566c0c9ba Mon Sep 17 00:00:00 2001
From: Alex Swindler <Alex.Swindler@nrel.gov>
Date: Tue, 12 May 2015 08:42:47 -0600
Subject: [PATCH 17/22] Making progress processing backwards-compatible until
 all progress endpoints have been updated.

---
 seed/views/main.py | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/seed/views/main.py b/seed/views/main.py
index fa73e754f0..87de09e6de 100644
--- a/seed/views/main.py
+++ b/seed/views/main.py
@@ -1930,6 +1930,9 @@ def progress(request):
 
     if cache.get(progress_key):
         result = cache.get(progress_key)
+        # The following if statement can be removed once all progress endpoints have been updated to the new json syntax
+        if type(result) != dict:
+            result = {'progress': result}
         result['progress_key'] = progress_key
         return result
     else:

From 766dae381c77aa1219122b5c83b9954c250f3c7d Mon Sep 17 00:00:00 2001
From: Nicholas Serra <nicks@ydekproductions.com>
Date: Tue, 12 May 2015 16:54:16 -0400
Subject: [PATCH 18/22] Set filter params in sessionStorage

---
 seed/static/seed/js/seed.js                   | 27 ++++++++++++-------
 .../static/seed/js/services/search_service.js | 25 +++++++++++------
 2 files changed, 35 insertions(+), 17 deletions(-)

diff --git a/seed/static/seed/js/seed.js b/seed/static/seed/js/seed.js
index 27e0c37b79..fd7ef9b6d9 100644
--- a/seed/static/seed/js/seed.js
+++ b/seed/static/seed/js/seed.js
@@ -254,17 +254,26 @@ SEED_app.config(['$routeProvider', function ($routeProvider) {
             templateUrl: static_url + 'seed/partials/buildings.html',
             resolve: {
                 'search_payload': ['building_services', '$route', function(building_services, $route){
-                    var params = $route.current.params;
-                    var q = params.q || "";
-
-                    // Check session storage for order and sort values.
-                    var orderBy = (typeof(Storage) !== "undefined" && sessionStorage.getItem('seedBuildingOrderBy') !== null) ?
-                        sessionStorage.getItem('seedBuildingOrderBy') : "";
+                    // Defaults
+                    var q = $route.current.params.q || "";
+                    var orderBy = "";
+                    var sortReverse = false;
+                    var params = {};
 
-                    var sortReverse = (typeof(Storage) !== "undefined" && sessionStorage.getItem('seedBuildingSortReverse') !== null) ?
-                        JSON.parse(sessionStorage.getItem('seedBuildingSortReverse')) : false;
+                    // Check session storage for order, sort, and filter values.
+                    if (typeof(Storage) !== "undefined") {
+                        if (sessionStorage.getItem('seedBuildingOrderBy') !== null) {
+                            orderBy = sessionStorage.getItem('seedBuildingOrderBy');
+                        }
+                        if (sessionStorage.getItem('seedBuildingSortReverse') !== null) {
+                            sortReverse = JSON.parse(sessionStorage.getItem('seedBuildingSortReverse'));
+                        }
+                        if (sessionStorage.getItem('seedBuildingFilterParams') !== null) {
+                            params = JSON.parse(sessionStorage.getItem('seedBuildingFilterParams'));
+                        }
+                    }
 
-                    // params: (query, number_per_page, page_number, order_by, sort_reverse, other_params, project_id)
+                    // params: (query, number_per_page, page_number, order_by, sort_reverse, filter_params, project_id)
                     return building_services.search_buildings(q, 10, 1, orderBy, sortReverse, params, null);
                 }],
                 'default_columns': ['user_service', function(user_service){
diff --git a/seed/static/seed/js/services/search_service.js b/seed/static/seed/js/services/search_service.js
index 6a78b1faae..7af90fa419 100644
--- a/seed/static/seed/js/services/search_service.js
+++ b/seed/static/seed/js/services/search_service.js
@@ -80,13 +80,19 @@ angular.module('BE.seed.service.search', [])
 
     search_service.init_storage = function () {
         // Check session storage for order and sort values.
-        if (typeof(Storage) !== "undefined" && sessionStorage.getItem('seedBuildingOrderBy') !== null) {
-            saas.order_by = sessionStorage.getItem('seedBuildingOrderBy');
-            saas.sort_column = sessionStorage.getItem('seedBuildingOrderBy');
-        }
+        if (typeof(Storage) !== "undefined") {
+            if (sessionStorage.getItem('seedBuildingOrderBy') !== null){
+                saas.order_by = sessionStorage.getItem('seedBuildingOrderBy');
+                saas.sort_column = sessionStorage.getItem('seedBuildingOrderBy');
+            }
+
+            if (sessionStorage.getItem('seedBuildingSortReverse') !== null) {
+                saas.sort_reverse = JSON.parse(sessionStorage.getItem('seedBuildingSortReverse'));
+            }
 
-        if (typeof(Storage) !== "undefined" && sessionStorage.getItem('seedBuildingSortReverse') !== null) {
-            saas.sort_reverse = JSON.parse(sessionStorage.getItem('seedBuildingSortReverse'));
+            if (sessionStorage.getItem('seedBuildingFilterParams') !== null) {
+                saas.filter_params = JSON.parse(sessionStorage.getItem('seedBuildingFilterParams'));
+            }
         }
     };
 
@@ -171,8 +177,11 @@ angular.module('BE.seed.service.search', [])
      * filter_search: triggerd when a filter param changes
      */
     search_service.filter_search = function() {
-       this.current_page = 1;
-       this.search_buildings();
+        this.current_page = 1;
+        this.search_buildings();
+        if (typeof(Storage) !== "undefined") {
+            sessionStorage.setItem('seedBuildingFilterParams', JSON.stringify(this.filter_params));
+        }
     };
 
 

From 10a0060a42b9dbc17bcbf6f2292dc137f3ed884f Mon Sep 17 00:00:00 2001
From: Miles Clark <mmc@obispo.com>
Date: Mon, 18 May 2015 08:09:13 -0700
Subject: [PATCH 19/22] Revert "Issue #12 - Save building filter params in
 sessionStorage"

---
 seed/static/seed/js/seed.js                   | 27 +++++++------------
 .../static/seed/js/services/search_service.js | 25 ++++++-----------
 2 files changed, 17 insertions(+), 35 deletions(-)

diff --git a/seed/static/seed/js/seed.js b/seed/static/seed/js/seed.js
index fd7ef9b6d9..27e0c37b79 100644
--- a/seed/static/seed/js/seed.js
+++ b/seed/static/seed/js/seed.js
@@ -254,26 +254,17 @@ SEED_app.config(['$routeProvider', function ($routeProvider) {
             templateUrl: static_url + 'seed/partials/buildings.html',
             resolve: {
                 'search_payload': ['building_services', '$route', function(building_services, $route){
-                    // Defaults
-                    var q = $route.current.params.q || "";
-                    var orderBy = "";
-                    var sortReverse = false;
-                    var params = {};
+                    var params = $route.current.params;
+                    var q = params.q || "";
 
-                    // Check session storage for order, sort, and filter values.
-                    if (typeof(Storage) !== "undefined") {
-                        if (sessionStorage.getItem('seedBuildingOrderBy') !== null) {
-                            orderBy = sessionStorage.getItem('seedBuildingOrderBy');
-                        }
-                        if (sessionStorage.getItem('seedBuildingSortReverse') !== null) {
-                            sortReverse = JSON.parse(sessionStorage.getItem('seedBuildingSortReverse'));
-                        }
-                        if (sessionStorage.getItem('seedBuildingFilterParams') !== null) {
-                            params = JSON.parse(sessionStorage.getItem('seedBuildingFilterParams'));
-                        }
-                    }
+                    // Check session storage for order and sort values.
+                    var orderBy = (typeof(Storage) !== "undefined" && sessionStorage.getItem('seedBuildingOrderBy') !== null) ?
+                        sessionStorage.getItem('seedBuildingOrderBy') : "";
+
+                    var sortReverse = (typeof(Storage) !== "undefined" && sessionStorage.getItem('seedBuildingSortReverse') !== null) ?
+                        JSON.parse(sessionStorage.getItem('seedBuildingSortReverse')) : false;
 
-                    // params: (query, number_per_page, page_number, order_by, sort_reverse, filter_params, project_id)
+                    // params: (query, number_per_page, page_number, order_by, sort_reverse, other_params, project_id)
                     return building_services.search_buildings(q, 10, 1, orderBy, sortReverse, params, null);
                 }],
                 'default_columns': ['user_service', function(user_service){
diff --git a/seed/static/seed/js/services/search_service.js b/seed/static/seed/js/services/search_service.js
index 7af90fa419..6a78b1faae 100644
--- a/seed/static/seed/js/services/search_service.js
+++ b/seed/static/seed/js/services/search_service.js
@@ -80,19 +80,13 @@ angular.module('BE.seed.service.search', [])
 
     search_service.init_storage = function () {
         // Check session storage for order and sort values.
-        if (typeof(Storage) !== "undefined") {
-            if (sessionStorage.getItem('seedBuildingOrderBy') !== null){
-                saas.order_by = sessionStorage.getItem('seedBuildingOrderBy');
-                saas.sort_column = sessionStorage.getItem('seedBuildingOrderBy');
-            }
-
-            if (sessionStorage.getItem('seedBuildingSortReverse') !== null) {
-                saas.sort_reverse = JSON.parse(sessionStorage.getItem('seedBuildingSortReverse'));
-            }
+        if (typeof(Storage) !== "undefined" && sessionStorage.getItem('seedBuildingOrderBy') !== null) {
+            saas.order_by = sessionStorage.getItem('seedBuildingOrderBy');
+            saas.sort_column = sessionStorage.getItem('seedBuildingOrderBy');
+        }
 
-            if (sessionStorage.getItem('seedBuildingFilterParams') !== null) {
-                saas.filter_params = JSON.parse(sessionStorage.getItem('seedBuildingFilterParams'));
-            }
+        if (typeof(Storage) !== "undefined" && sessionStorage.getItem('seedBuildingSortReverse') !== null) {
+            saas.sort_reverse = JSON.parse(sessionStorage.getItem('seedBuildingSortReverse'));
         }
     };
 
@@ -177,11 +171,8 @@ angular.module('BE.seed.service.search', [])
      * filter_search: triggerd when a filter param changes
      */
     search_service.filter_search = function() {
-        this.current_page = 1;
-        this.search_buildings();
-        if (typeof(Storage) !== "undefined") {
-            sessionStorage.setItem('seedBuildingFilterParams', JSON.stringify(this.filter_params));
-        }
+       this.current_page = 1;
+       this.search_buildings();
     };
 
 

From 0044b1006215cd8b43451dd05d8d760765c7cff9 Mon Sep 17 00:00:00 2001
From: Phil Ngo <ngo.phil@gmail.com>
Date: Mon, 18 May 2015 11:16:02 -0500
Subject: [PATCH 20/22] handle case in which the child node is not a
 source_type COMPOSITE_BS node.

---
 seed/views/main.py | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/seed/views/main.py b/seed/views/main.py
index 87de09e6de..2093de277f 100644
--- a/seed/views/main.py
+++ b/seed/views/main.py
@@ -457,6 +457,11 @@ def get_building(request):
     building_dict = building.to_dict(exportable_field_names)
 
     ancestors = get_ancestors(building)
+
+    # Add child node (in case it hasn't yet been matched with any other
+    # buildings). When this happens, ancestors should also be the empty list.
+    if building.source_type in [ASSESSED_BS, PORTFOLIO_BS, GREEN_BUTTON_BS]:
+        ancestors.append(building)
     imported_buildings_list = []
     for b in ancestors:
         d = b.to_dict(exportable_field_names)

From f89ec38ffab557cc6deade6ec31c1ca7f7ca6f73 Mon Sep 17 00:00:00 2001
From: Miles Clark <mmc@obispo.com>
Date: Tue, 19 May 2015 15:59:03 +0000
Subject: [PATCH 21/22] update version number to 1.1.5

---
 seed/static/seed/partials/about.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/seed/static/seed/partials/about.html b/seed/static/seed/partials/about.html
index b0aefb9d10..7048270c77 100644
--- a/seed/static/seed/partials/about.html
+++ b/seed/static/seed/partials/about.html
@@ -25,7 +25,7 @@ <h2>Development Team:</h2>
           <p>Software developer: <a href="http://www.buildingenergy.com/">Building Energy</a></p>                                                                                                                                                                               
 
           <h3>Version</h3>
-          <p>1.1.4</p>
+          <p>1.1.5</p>
 
         </div>
       </div>

From 9edbdbc22099cf7618b5bdfe45f6ff5a28dac565 Mon Sep 17 00:00:00 2001
From: Miles Clark <mmc@obispo.com>
Date: Wed, 20 May 2015 15:18:48 +0000
Subject: [PATCH 22/22] Manual merge of loading indicator patches

---
 .../seed/js/controllers/menu_controller.js    |  3 ++
 seed/templates/seed/index.html                |  3 +-
 seed/views/main.py                            | 28 +++++++++++++------
 3 files changed, 24 insertions(+), 10 deletions(-)

diff --git a/seed/static/seed/js/controllers/menu_controller.js b/seed/static/seed/js/controllers/menu_controller.js
index fafe714fb2..4764984966 100644
--- a/seed/static/seed/js/controllers/menu_controller.js
+++ b/seed/static/seed/js/controllers/menu_controller.js
@@ -50,10 +50,12 @@ angular.module('BE.seed.controller.menu', [])
     $scope.menu.create_project_error = false;
     $scope.menu.create_project_error_message = "";
     $scope.saving_indicator = false;
+    $scope.menu.loading = false;
     $scope.menu.route_load_error = false;
     $scope.menu.user = {};
 
     $scope.$on("$routeChangeError", function(event, current, previous, rejection) {
+	$scope.menu.loading = false;
         $scope.menu.route_load_error = true;
         if (rejection === "not authorized" || rejection === "Your page could not be located!") {
             $scope.menu.error_message = rejection;
@@ -63,6 +65,7 @@ angular.module('BE.seed.controller.menu', [])
         $scope.menu.loading = next.controller === "mapping_controller";
     });
     $scope.$on("$routeChangeSuccess", function() {
+	$scope.menu.loading = false;
         $scope.menu.route_load_error = false;
     });
     $scope.$on('app_error', function(event, data){
diff --git a/seed/templates/seed/index.html b/seed/templates/seed/index.html
index 128f9cd83d..31dd015c03 100644
--- a/seed/templates/seed/index.html
+++ b/seed/templates/seed/index.html
@@ -20,7 +20,8 @@
                         {$ menu.error_message || 'There was an error loading the page' $}
                     </div>
                 </div>
-                <div data-ng-view="" id="ng-view"></div>
+                <div class="section_tab_container" ng-show="menu.loading"><p>Please wait while your data is loaded...</p></div>
+                <div ng-hide="menu.loading" data-ng-view="" id="ng-view"></div>
             </div>
             
             {% include "seed/_footer.html" %}
diff --git a/seed/views/main.py b/seed/views/main.py
index 7395ace12b..0c6221fd6f 100644
--- a/seed/views/main.py
+++ b/seed/views/main.py
@@ -1152,15 +1152,25 @@ def get_column_mapping_suggestions(request):
     field_mappings = get_mappable_types()
     field_names = field_mappings.keys()
     column_types = {}
-    for c in Column.objects.filter(
-        Q(mapped_mappings__super_organization=org_id) |
-        Q(organization__isnull=True)
-    ).exclude(
-        # mappings get created to mappable types
-        # but we deal with them manually so don't
-        # include them here
-        column_name__in=field_names
-    ):
+
+    # for c in Column.objects.filter(
+    #     Q(mapped_mappings__super_organization=org_id) |
+    #     Q(organization__isnull=True)
+    # ).exclude(
+    #     # mappings get created to mappable types
+    #     # but we deal with them manually so don't
+    #     # include them here
+    #     column_name__in=field_names
+    # ):
+
+    # Note on exclude:
+    # mappings get created to mappable types but we deal with them manually
+    # so don't include them here
+    columns = Column.objects.select_related('unit').prefetch_related('schemas') \
+                                                   .filter(Q(mapped_mappings__super_organization=org_id) | Q(organization__isnull=True)) \
+                                                   .exclude(column_name__in=field_names)
+
+    for c in columns:
         if c.unit:
             unit = c.unit.get_unit_type_display()
         else: