vhp-mongo-models 2.1.72 → 2.1.73

package/HouseHolds/schemas/checklist.js

@@ -1,17 +1,18 @@
 module.exports = [{
     id:{type:String,default:''}, //unique for THIS checklist
-    coid:{type:String,default:''},
-    hhid:{type:String,default:''},
-    work:{type:String,default:""}, //just an array of work.id
-    custcode:{type:String,default:''},
     name:{type:String,default:''}, //what checklist was used
     title:{type:String,default:''},
+    coid:{type:String,default:''},
+    hhid:{type:String,default:''},
+    work:{type:String,default:''}, //just an array of work.id
     sitems:{type:Array,default:[]}, //of service item ["ids"]
     scoring:{
         list:{type:Object,default:{}},
         score:{type:Object,default:{}},
     },
     fields:{type:Object,default:{}}, //to hold all of the checklist values
-    notes:{type:Object,default:{}},
-    signature:{type:String,default:''}
+    notes:{type:Object,default:{}},//notes matching the field "id"
+    signature:{type:String,default:''},
+    tags:{type:Array,default:[]}, //only the tags peformed
+    categories:{type:Array,default:[]} //the workorder categories
 },{minimize:false}]

package/HouseHolds/schemas/client.js

@@ -7,8 +7,8 @@
 module.exports = [
     {
         phone: { type: String, default: '' }, // id
-        type:{type:String,default:'owner'}, // owner | occupant
-        roles:{type:Array,default:[]},// options AP | maintenance | reception | sales
+        type:{type:String,default:'occupant'}, // owner | occupant
+        roles:{type:Array,default:[]},// options resident | AP | maintenance | reception | sales
         custName:{type:String,default:''},
         clientfirst: { type: String, default: '' },
         clientlast: { type: String, default: '' },
@@ -19,7 +19,6 @@ module.exports = [
         lastInteraction: { type: String, default: '' },
         salesRep: { type: String, default: '' },
         
-        
         //remove
         contactName:{type:String,default:''},
         lead:{type:String,default:''},

package/HouseHolds/schemas/home.js

@@ -4,7 +4,7 @@
 */
 module.exports = [{
     hhid: { type: String, default: '' },
-    type: {type:String,default:''},//COM | RES
+    type: {type:String, default: ''},//COM | RES
     street: { type: String, default: '' },
     unit: { type: String, default: '' },
     city: { type: String, default: '' },
@@ -13,7 +13,8 @@ module.exports = [{
 
     custid: { type: String, default: '' }, //phone number / billTo
     occupants: { type: Array, default: [] },
-    jonascodes: {type:Array, default:[]}, //new add
+    jonascodes: {type:Array, default: []}, //new add
+    billto: {type:Boolean,default: false}, //if it is a billing address for other homes
     salesRep:{type:String,default:''},
 
     location: {
@@ -28,12 +29,8 @@ module.exports = [{
             }
         }
     },
-    utilities: {
-        type: Object, default: {
-            eleccomp: '',
-            gascomp: ''
-        }
-    },
+
+    utilities: {type:Array,default:[]},// gas | electric | water | etc
     measurements: { type: Object, default: {} },
     features: {
         elecService: {
@@ -70,21 +67,14 @@ module.exports = [{
         rooms: { type: Number, default: 0 }
     },
     spaces: { type: Array, default: [] },
-
-    //remove
-    billTo: { type: Boolean, default: false },
-    froot: { type: String, default: '' }
 },
 { minimize: false }
 ]
 /**
- * jonascodes = [{coid:{type:String,default:''},custcode:{type:String,default:''}}]
+ * jonascodes = [{
+ *      coid:{type:String,default:''},
+ *      custcode:{type:String,default:''},
+ *      billto:{type:String,default:''}
+ * }]
  * 
- * contacts = [
- *  {
- *      role:{type:String,default:''},
- *      phone:{type:String,default:''},
- *      email:{type:String,default:''}
- *  }
- * ]
  */

package/HouseHolds/schemas/lead.js

@@ -12,7 +12,7 @@ module.exports = [
         clientfirst:{type:String, default:''},
         clientlast:{type:String, default:''},
 
-        status:{type:String,default:'CHILD'}, //PARENT | CHILD
+        status:{type:String,default:'PARENT'}, //PARENT | CHILD
         parent:{type:String,default:''},
         children:{type:Array,default:[]},
 

package/HouseHolds/schemas/serviceitem.js

@@ -3,10 +3,7 @@ module.exports = [
         //VHP ADD fields
         hhid:{type:String,default:''}, //must have a hhid
         group:{type:String,default:''},//names the type of product it is. Would like to use this instead of type
-        system:{type:String,default:''}, //way to link related service items
-        space:{type:String,default:''},
         considerreplace:{type:Date,default:''},
-        subspace:{type:String,default:''},
         quantity:{type:Number,default:1}, //optional qty
         notes:{type:Array,default:[]},// for better history {tech:'',date:'',ticketId:''}
         edits:{type:Object,defualt:{}}, //to track all of the fields that have been changed since sync
@@ -20,13 +17,13 @@ module.exports = [
         descr:{type:String,default:''},
         status:{type:String,default:''},//should be 'A' for active. Need to find other codes. Match JONAS
         insdate:{type:Date,default:''},
-
+        
         model:{type:String,default:''},
         serial:{type:String,default:''},
         manf:{type:String,default:''},
         
         location:{type:String,default:''},//remove, same as space / sub space
-        area:{type:String,default:''},//remove, same as space / sub space
+        area:{type:String,default:''},//
         
         controls:{type:String,default:''},
         elec:{type:String,default:''},
@@ -38,7 +35,7 @@ module.exports = [
         expry1:{type:Date,default:''},
         expry2:{type:Date,default:''},
         expry3:{type:Date,default:''},
-
+        
         //Custom Info
         filt1:{type:String,default:''},
         filt1q:{type:String,default:'0'},
@@ -46,6 +43,11 @@ module.exports = [
         filt2q:{type:String,default:'0'},
         filt3:{type:String,default:''},
         filt3q:{type:String,default:''}
+        
+        
+        // system:{type:String,default:''}, //way to link related service items
+        // space:{type:String,default:''},
+        // subspace:{type:String,default:''},
     },
     {minimize:false}
 ]

package/Replacement/schemas/projects.js

@@ -59,11 +59,7 @@ module.exports = [
         name: { type: String, default: '' },
         coid: { type: String, default: '' },
         jobnum: { type: String, default: '' },
-        ref: { type: String, default: '' },
         hhid: { type: String, default: '' },
-        clientfirst: { type: String, default: '' },
-        clientlast: { type: String, default: '' },
-        ...aaddress,
         ...acontact,
         estimator: { type: String, default: 'unassigned' },
         schedule: { type: Array, default: [] },
@@ -77,8 +73,12 @@ module.exports = [
         info: info,
         contracts: { type: Array, default: [] },
         lead: lead,
-        refs: { type: Array, default: [] },
-        froot: { type: String, default: '' }
+        refs: { type: Array, default: [] }, //do we need?
+        froot: { type: String, default: '' },
+        //joblog to be added to flat
+        
+        ...aaddress, //remove
+        // ref: { type: String, default: '' },
     },
     {
         toJSON: { virtuals: true },

package/Service/schemas/activeticket.js

@@ -5,7 +5,7 @@ module.exports = [
     {
         ...aticket,
         status: { type: String, default: 'active' },
-        documents: { type: Array, default: [] },
+        documents: { type: Array, default: [] }, //remove?
         approval:{type:String,default:'PREPARING'}, // SENT | APPROVED
         approvalCode:{type:String,default:''}
     },{minimize:false}

package/Service/schemas/checklistfield.js

@@ -24,22 +24,16 @@
 module.exports=[{
     id:{type:String,default:''},
     building:{type:String,default:''}, // COM | RES
-    //class:{type:String,default:''}, //remove is now id
-    
-    type:{type:Object,default:{}},
-    title:{type:Object,default:{}},
     desc:{type:String,default:''},
     
-    //group:{type:String,default:''},
-    //subgroup:{type:String,default:''},
-    //category:{type:String,default:''},
-    //rules:{type:Object,default:{}}
+    //all of the below are organized {<thing>:<associated thing per that thing>}
+    title:{type:Object,default:{}},
+    type:{type:Object,default:{}},
+    tags:{type:Object,default:{}},
     input:{type:Object,default:{}},
     required:{type:Object,default:{}},
     present:{type:Object,default:{}},
     scoring:{type:Object,default:{}},
     calc:{type:Object,default:{}},
-    shared:{type:Boolean,default:true},
-    rewards:{type:Boolean,default:false},
     notes:{type:Object,default:{}}
 },{minimize:false}]

package/Service/schemas/checklistform.js

@@ -1,22 +1,22 @@
 module.exports = [{
     name:{type:String,default:''},
     title:{type:String,default:''},
+    coid:{type:String,default:''}, //what company can use it, none means all
+    depts:{type:Array,default:[]}, //what departments can use them, none means all
+    categories:{type:Array,default:[]}, //the workorder categories from JONAS
+    building:{type:String,default:''}, //RES | COM
     desc:{type:String,default:''},
-    color:{type:String,default:''},
-    groups:{type:Array,default:[]},
+    
     included:{type:Array,default:[]},
-    done:{type:Boolean,default:false},
-    autoadd:{type:Boolean,default:false},
-    category:{type:String,default:""},
+    tags:{type:Array,default:[]}, //a way to filter field.tag
+    color:{type:String,default:''},
+    scoring:{type:Array,default:[]}, //was categories 
     scored:{type:Boolean,default:false},
-    enabled:{type:Boolean,default:true},
-    tags:{type:Array,default:[]},
-    types:{type:Array,default:[]},
     grades:{type:Array,default:[]},
+    
+    autoadd:{type:Boolean,default:false}, //jobinfo...
+    finish:{type:Boolean,default:false},
+    enabled:{type:Boolean,default:true}, //whether its active
     present:{type:Boolean,default:true},
-    building:{type:String,default:''}, //RES | COM
-
-    //sitemTags:{type:Array,default:[]},
-    rewards:{type:Boolean,default:false},
-    signature:{type:Boolean,default:false},
+    signature:{type:Boolean,default:false} //if a signature is required to complete
 },{minimize:false}]

package/Service/schemas/subs/final.js

@@ -15,7 +15,7 @@ let repairEstimate = {
 }
 
 let ticketTime = {
-    techs:{type:Object,default:{}},
+    techs:{type:Number,default:0},
     driving:{type:Number,default:0},
     labor:{type:Number,default:0},
     start:{type:Date,default:''},
@@ -40,15 +40,15 @@ let ticketFinal = {
     returnNotes:{type:String,default:''},
     repairEstimate:repairEstimate, //was ticketTime
     ticketTime:ticketTime,
-    officeSubmit:{type:String,default:''},
     completedBy:{type:String,default:''}, //was type=Array
     afterHours:{type:Boolean,default:false},
     
     
     showReplacement:{type:Boolean,default:false}, //may not need
     serviceReferral:{type:Boolean,default:false}, //may not need
-
-
+    
+    
+    // officeSubmit:{type:String,default:''},
     //addlDetails:{type:String,default:''},
     //timelog:{type:Object,default:{}},
     //paymentMethod:{type:String,default:''},

package/Service/schemas/subs/ticket.js

@@ -57,10 +57,12 @@ const ticketFinal = require('./final.js')
 */
 module.exports = {
     id: { type: String, default: '' }, // <00><wonum>
+    wonum:{type:String,default:''}, //the wonum from jonas. relative to the the company 
+    coid:{type:String,default:''},
+    hhid:{type:String,default:''},
+    returnVisit:{type:String,default:''},//used for the ticket returning for's id
     ref: { type: Object, default: {} },
     custid: {type:String, default:''},
-    coid:{type:String,default:''},
-    wonum:{type:String,default:''}, //the wonum from jonas. relative to the the company 
     cat:{type:String,default:''}, //converted cat from jonas. Orginal cat can be found in wo.cat
     dept:{type:String,default:''},
 
@@ -70,21 +72,18 @@ module.exports = {
 
     salesrep:{type:String,default:''},
     
-    hhid:{type:String,default:''},
-    ...aaddress, //do not need?
-    
+    sitems: { type: Array, default: [] },
     checks: { type: Object, default: {} },
     repairs: { type: Object, default: {} },
-    sitems: { type: Array, default: [] },
-
-    todo: {type:Object,default:{}},//used for all todos in workflow.
-    //remove the following and merge into 'todo' with a type
-    office: { type: Object, default: {} },//any todo items for the office
-    field: {type:Object,default:{}},//any todo items for the field
-
+    
+    todo: {type:Object,default:{}},//was office
     final: ticketFinal,
-    contract: { type: Object, default: {} }, // the contract attached to the client. Should move off of WO into separate query
-
+    
     wo: wo,
-    logs:{type:Array,default:[]} //match with project datelog. Would like it to stay as "logs" though
+    logs:{type:Array,default:[]}, //match with project datelog. Would like it to stay as "logs" though
+    
+    //Remove
+    contract: { type: Object, default: {} }, // the contract attached to the client. Should move off of WO into separate query
+    // office: { type: Object, default: {} },//any todo items for the office
+    // field: {type:Object,default:{}},//any todo items for the field
 }

package/core-models.js

@@ -6,6 +6,8 @@ let addressCore={
     zip: { type: String, default: '' }
 }
 let contactCore={
+    clientfirst: { type: String, default: '' },
+    clientlast: { type: String, default: '' },
     contact:{type:String,default:''}, //
     phone:{type:String,default:''},
     email:{type:String,default:''}

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "vhp-mongo-models",
-    "version": "2.1.72",
+    "version": "2.1.73",
     "productName": "VHP Mongo Models",
     "description": "Mongo Models library to setup Mongoose Schemas",
     "author": "VHPim",