Add logic to assume Records will be successfully created, greatly increasing responsiveness when creating new records

Fix error usage and display
Remove unused manage_areas and manage_domains templates

Author: airandfingers

apps/trolls_goals/public/js/areas.js

@@ -5,6 +5,7 @@ areasModule.factory('AreaFactory', function($resource, $rootScope) {
   $rootScope.newArea = function() {
     $rootScope.new_area = new Area();
     $rootScope.new_area.prompt_for_details = false;
+    $rootScope.new_area.hidden = false;
     $rootScope.new_area.start_day = $rootScope.today;
   };
 
@@ -30,7 +31,7 @@ areasModule.factory('AreaFactory', function($resource, $rootScope) {
         $rootScope.calculateDomainAreaMap();
       }, function(response) {
         console.error(response.data.error);
-        $rootScope.area_error = response.data.error;
+        $rootScope.error = response.data.error;
       });
     }
     else {
@@ -41,7 +42,7 @@ areasModule.factory('AreaFactory', function($resource, $rootScope) {
         $rootScope.calculateDomainAreaMap();
       }, function(response) {
         console.error(response.data.error);
-        $rootScope.area_error = response.data.error;
+        $rootScope.error = response.data.error;
       });
     }
     $rootScope.newArea();
@@ -53,7 +54,7 @@ areasModule.factory('AreaFactory', function($resource, $rootScope) {
       $rootScope.handleDeletedArea(area, true);
     }, function(response) {
       console.error(response.data.error);
-      $rootScope.area_error = response.data.error;
+      $rootScope.error = response.data.error;
     });
   };
 
@@ -77,7 +78,7 @@ areasModule.factory('AreaFactory', function($resource, $rootScope) {
         if (_.isFunction(cb)) { cb(); }
       }, function(response) {
         console.error(response.data.error);
-        $rootScope.area_error = response.data.error;
+        $rootScope.error = response.data.error;
         $rootScope.areas = [];
         if (_.isFunction(cb)) { cb(); }
       });

apps/trolls_goals/public/js/domains.js

@@ -12,6 +12,7 @@ domainsModule.factory('DomainFactory', function($resource, $rootScope) {
   // Define Domain CRUD functions on $rootScope
   $rootScope.newDomain = function() {
     $rootScope.new_domain = new Domain();
+    $rootScope.new_domain.hidden = false;
   };
 
   $rootScope.getDomain = function(domain_id) {
@@ -40,7 +41,7 @@ domainsModule.factory('DomainFactory', function($resource, $rootScope) {
         $rootScope.calculateDomainAreaMap();
       }, function(response) {
         console.error(response.data.error);
-        $rootScope.domain_error = response.data.error;
+        $rootScope.error = response.data.error;
       });
     }
     else {
@@ -50,7 +51,7 @@ domainsModule.factory('DomainFactory', function($resource, $rootScope) {
         $rootScope.calculateDomainAreaMap();
       }, function(response) {
         console.error(response.data.error);
-        $rootScope.domain_error = response.data.error;
+        $rootScope.error = response.data.error;
       });
     }
     $rootScope.newDomain();
@@ -68,7 +69,7 @@ domainsModule.factory('DomainFactory', function($resource, $rootScope) {
       $rootScope.calculateDomainAreaMap();
     }, function(response) {
       console.error(response.data.error);
-      $rootScope.domain_error = response.data.error;
+      $rootScope.error = response.data.error;
     });
   };
 
@@ -84,7 +85,7 @@ domainsModule.factory('DomainFactory', function($resource, $rootScope) {
         if (_.isFunction(cb)) { cb(); }
       }, function(response) {
         console.error(response.data.error);
-        $rootScope.domain_error = response.data.error;
+        $rootScope.error = response.data.error;
         $rootScope.domains = [];
         if (_.isFunction(cb)) { cb(); }
       });

apps/trolls_goals/public/js/records.js

@@ -3,16 +3,23 @@ var recordsModule = angular.module('records', []);
 recordsModule.factory('RecordFactory', function($resource, $rootScope) {
   $rootScope.records = $rootScope.records || {};
   $rootScope.createRecord = $rootScope.createRecord || function(area_id, day) {
-    var record = { area: area_id, day: day };
+    var record = new Record();
+    record.area = area_id; 
+    record.day = day;
+    record.just_created = true;
+    var records = $rootScope.records[area_id][day] || [];
+    records.push(record);
+    $rootScope.records[area_id][day] = records;
     Record.save(record, function(r) {
       console.log('successfully added record!', r);
-      r.just_created = true;
-      var records = $rootScope.records[record.area][day] || [];
-      records.push(r);
-      $rootScope.records[record.area][day] = records;
+      record._id = r._id;
     }, function(response) {
       console.error(response.data.error);
-      scope.domain_error = response.data.error;
+      $rootScope.error = response.data.error;
+      // remove not-actually-created record
+      var records = $rootScope.records[area_id][day];
+      records = _.without(records, record);
+      $rootScope.records[area_id][day] = records;
     });
   };
 
@@ -35,7 +42,7 @@ recordsModule.factory('RecordFactory', function($resource, $rootScope) {
       console.log('successfully edited record!', r);
     }, function(response) {
       console.error(response.data.error);
-      scope.domain_error = response.data.error;
+      $rootScope.error = response.data.error;
     });
   };
 
@@ -47,7 +54,7 @@ recordsModule.factory('RecordFactory', function($resource, $rootScope) {
       });
     }, function(response) {
       console.error(response.data.error);
-      scope.domain_error = response.data.error;
+      $rootScope.error = response.data.error;
     });
   };
 

apps/trolls_goals/public/js/records_table.js

@@ -31,7 +31,7 @@ recordsTableModule.directive('recordsTable', function($rootScope, RecordFactory)
           });
         }, function(response) {
           console.error(response.data.error);
-          scope.domain_error = response.data.error;
+          $rootScope.error = response.data.error;
         });
       });
     }

apps/trolls_goals/public/tmpl/manage_areas.html

@@ -31,6 +31,16 @@
         </div>
       </div>
     </div>
+    <div id="error-wrapper" class="hidden" ng-class="{ 'has-error': error, 'hidden': ! error }">
+      <div class="help-block" ng-if="error">
+        An error occurred: {{error}}
+        <br />
+        Sorry! Please try again, or refresh the page.
+        <span class="small-grey-icon glyphicon glyphicon-remove"
+              ng-click="$root.error = null">
+        </span>
+      </div>
+    </div>
   </div>
 <% include ../../../views/foot_start %>
   <script src="/js/lib/lodash.js"></script>