@dhyasama/totem-models 6.3.5 → 6.3.7

package/.npmignore

@@ -0,0 +1,14 @@
+lib-cov
+*.seed
+*.log
+*.csv
+*.dat
+*.out
+*.pid
+*.gz
+
+npm-debug.log
+node_modules
+
+.DS_Store
+.idea

package/lib/Organization.js

@@ -215,8 +215,8 @@ module.exports = function(mongoose, config) {
 
           standardFields: {
 
-            // active set to false will keep the field out of system for customer, i.e., off list page, org page deal section and deal edit form
-            // if a field is active, it will show up on the org page deal section and deal edit form. there is no way to hide it in those places.
+            // Standard fields are always "on" in the system
+            // They can be configured in how they work on the deal list page
             // order for standard fields only sets the order on the list page. their position is fixed on the org page deal section and edit form.
             // order is co-mingled with order for custom fields
             // colspan is for the number of columns the field should take up on the list page
@@ -224,7 +224,6 @@ module.exports = function(mongoose, config) {
             // showOnList controls if the field will be on deal list page
 
             fundraise: {
-              active: { type: Boolean, default: true },
               order: { type: Number, default: 99 },
               colspan: { type: Number, default: 1 },
               showOnFilter: { type: Boolean, default: true },
@@ -232,7 +231,6 @@ module.exports = function(mongoose, config) {
             },
 
             sources: {
-              active: { type: Boolean, default: true },
               order: { type: Number, default: 99 },
               colspan: { type: Number, default: 1 },
               showOnFilter: { type: Boolean, default: true },
@@ -240,7 +238,6 @@ module.exports = function(mongoose, config) {
             },
 
             referrers: {
-              active: { type: Boolean, default: true },
               order: { type: Number, default: 99 },
               colspan: { type: Number, default: 1 },
               showOnFilter: { type: Boolean, default: true },
@@ -248,7 +245,6 @@ module.exports = function(mongoose, config) {
             },
 
             resources: {
-              active: { type: Boolean, default: true },
               order: { type: Number, default: 99 },
               colspan: { type: Number, default: 1 },
               showOnFilter: { type: Boolean, default: true },
@@ -282,7 +278,7 @@ module.exports = function(mongoose, config) {
               // This is the value that gets stored
               value: { type: String, trim: true, required: true },
 
-              // This is used to validate and aggregate answers for polls
+              // This is used to aggregate answers for polls
               type: { type: String, enum: ['String', 'Number', 'Boolean'], required: true }
 
             }],
@@ -297,7 +293,7 @@ module.exports = function(mongoose, config) {
               // colspan is for the number of columns the field should take up on the list page
               colspan: { type: Number, default: 1 },
 
-              // showFilter controls whether values are extracted and used in filtering options on list page
+              // showOnFilter controls whether values are extracted and used in filtering options on list page
               showOnFilter: { type: Boolean, default: true },
 
               // showOnList controls if the field will be on deal list page
@@ -501,11 +497,10 @@ module.exports = function(mongoose, config) {
 
   });
 
-  Organization.virtual('customer.deals.columns').get(function () {
+  Organization.virtual('customer.deals.fields').get(function () {
 
     // Combine ever-present fields, standard fields and custom fields into a single list and sort by column order
     // Fundraise is actually two fields, so multiply the order by ten to make room for the extra field
-    // Returns tuples of name/order
 
     var self = this;
 
@@ -514,15 +509,12 @@ module.exports = function(mongoose, config) {
     // Defaulting to off so it will be immediately apparent the customer hasn't been properly configured
     standardFields = standardFields || {
       fundraise: {
-        active: false,
         showOnList: false
       },
       sources: {
-        active: false,
         showOnList: false
       },
       referrers: {
-        active: false,
         showOnList: false
       }
     };
@@ -531,27 +523,31 @@ module.exports = function(mongoose, config) {
     var result = [];
 
     // Add the standard fields that are active
-    if (standardFields.fundraise.active && standardFields.fundraise.showOnList) {
+    if (standardFields.fundraise.showOnList) {
       result.push({
         name: 'Fundraise Amount',
-        order: standardFields.fundraise.order * 10
+        order: standardFields.fundraise.order * 10,
+        colspan: standardFields.fundraise.colspan
       }, {
         name: 'Fundraise Valuation',
-        order: standardFields.fundraise.order * 10 + 1
+        order: standardFields.fundraise.order * 10 + 1,
+        colspan: standardFields.fundraise.colspan
       });
     }
 
-    if (standardFields.sources.active && standardFields.sources.showOnList) {
+    if (standardFields.sources.showOnList) {
       result.push({
         name: 'Source',
-        order: standardFields.sources.order * 10
+        order: standardFields.sources.order * 10,
+        colspan: standardFields.fundraise.colspan
       });
     }
 
-    if (standardFields.referrers.active && standardFields.referrers.showOnList) {
+    if (standardFields.referrers.showOnList) {
       result.push({
         name: 'Referrers',
-        order: standardFields.referrers.order * 10
+        order: standardFields.referrers.order * 10,
+        colspan: standardFields.fundraise.colspan
       });
     }
 
@@ -560,7 +556,8 @@ module.exports = function(mongoose, config) {
       if (field.display.showOnList) {
         result.push({
           name: field.label,
-          order: field.display.order * 10
+          order: field.display.order * 10,
+          colspan: field.display.colspan
         });
       }
     });
@@ -568,15 +565,6 @@ module.exports = function(mongoose, config) {
     // Sort the combined standard and custom fields
     result = _.sortBy(result, function(item) { return item.order; });
 
-    // Put the ever-present fields at the beginning
-    result.unshift({
-      name: 'Company',
-      order: 0
-    }, {
-      name: 'Stage',
-      order: 1
-    });
-
     // Now that we have all fields combined and ordered, make column order zero-indexed and gap-free
     result = _.map(result, function(item, index) {
       item.order = index;