@dhyasama/totem-models 6.0.0 → 6.2.0

package/lib/Organization.js

@@ -213,41 +213,52 @@ module.exports = function(mongoose, config) {
             color: { type: String, trim: true }
           }],
 
-          voting: {
-            active: { type: Boolean, default: false },
-            votes: [{
-              name: { type: String, trim: true },
-              value: { type: Number }
-            }]
-          },
-
-          sectors: {
-            active: { type: Boolean, default: false }
-          },
-
           customFields: [{
 
-            custom: { type: Boolean },
-
             // Data stored on deals will be accessed with this key
             // It must follow standard js variable naming rules
             // Whenever possible, just use the label and replace spaces with underscore
             // Will not be displayed
-            permanentKey: { type: String, trim: true, required: true },
+            // Changing it after data is in the system will make data inaccessible
+            key: { type: String, trim: true, required: true },
 
             // User friendly text, will be displayed
             label: { type: String, trim: true, required: true },
 
             // Dictates the type of control rendered on form
             // Also impacts data validation
-            type: { type: String, enum: ['Text', 'Checkbox', 'Single select', 'Multiple select'], required: true },
+            type: { type: String, enum: ['Text', 'Number', 'Tags', 'Poll', 'Checkbox', 'Single select', 'Multiple select'], required: true },
+
+            // These will be the choices in polls, single-selects and multi-selects
+            options: [{
+
+              // This is the option shown to users
+              label: { type: String, trim: true, required: true },
 
-            // These will be the values in single- and multi-selects
-            selectValues: [{ type: String, trim: true }],
+              // This is the value that gets stored
+              value: { type: String, trim: true, required: true },
 
+              // This is used to validate and aggregate answers for polls
+              type: { type: String, enum: ['String', 'Number', 'Boolean'] }
+
+            }],
+
+            // For controlling display on web pages
             display: {
+
+              // Sets the order to render fields
               order: { type: Number },
+
+              // Sets the number of columns for this property to span on the deals list
+              colspan: 2,
+
+              // Optionally include as an option on the deal filter
+              showOnFilter: {},
+
+              // Optionally show or hide fields on deals list
+              // Fields are always shown on org pages and in edit forms
               showOnList: { type: Boolean }
+
             }
 
           }]

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dhyasama/totem-models",
-  "version": "6.0.0",
+  "version": "6.2.0",
   "author": "Jason Reynolds",
   "license": "UNLICENSED",
   "description": "Models for Totem platform",
@@ -14,14 +14,14 @@
   "dependencies": {
     "@dhyasama/ffvc-crypto": "^1.0.0",
     "@dhyasama/ffvc-geoip": "^1.0.0",
-    "@dhyasama/ffvc-s3": "^1.0.0",
-    "@dhyasama/ffvc-utilities": "^2.5.1",
+    "@dhyasama/ffvc-s3": "^1.1.0",
+    "@dhyasama/ffvc-utilities": "^2.6.2",
     "async": "^2.6.1",
     "awesome-phonenumber": "^1.0.14",
     "bcrypt": "^0.8.0",
     "bluebird": "^3.5.3",
     "escape-string-regexp": "^1.0.5",
-    "moment": "^2.22.2",
+    "moment": "^2.23.0",
     "mongoose-deep-populate": "^3.0.0",
     "mongoose-filter-denormalize": "^0.2.1",
     "mongoose-post-find": "0.0.2",

package/.npmignore

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