vhp-mongo-models 1.5.6 → 1.5.7

package/HouseHolds/schemas/serviceitem.js

@@ -1,46 +1,10 @@
 module.exports = [
     {
-        hhid:{type:String,default:''}, //must have a hhid
-        id:{type:String,default:''}, //must have an id, should match JONAS
-        group:{type:String,default:''},//names the type of product it is. Would like to use this instead of type
-        sysid:{type:String,default:''}, //way to link related service items
-        space:{type:String,default:''},
-        subspace:{type:String,default:''},
-        quantity:{type:Number,default:1}, //optional qty
-        notes:{type:String,default:''},
-
-        //JONAS props
-        tagid:{type:String,default:''},
-        type:{type:String,default:''},//understand what this is in jonas
-        desc:{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:''},
-        
+        sysid:{type:String,default:''},
+        quantity:{type:Number,default:1},
+        type:{type:String,default:''},
+        name:{type:String,default:''},
         location:{type:String,default:''},
-        area:{type:String,default:''},
-        
-        controls:{type:String,default:''},
-        elec:{type:String,default:''},
-        
-        filt1:{type:String,default:''},
-        filt1q:{type:Number,default:0},
-        filt2:{type:String,default:''},
-        filt2q:{type:Number,default:0},
-        filt3:{type:String,default:''},
-        filt3q:{type:Number,default:0},
-
-        warr1:{type:Number,default:0},
-        warr2:{type:Number,default:0},
-        warr3:{type:Number,default:0},
-
-        expry1:{type:Date,default:''},
-        expry2:{type:Date,default:''},
-        expry3:{type:Date,default:''},
-
-
+        notes:{type:String,default:''}
     }
 ]

package/Replacement/schemas/projects.js

@@ -39,6 +39,7 @@ let lead = new Schema({
 })
 let info = new Schema({
     pkids:{type:Array,default:[]},
+    siteinfo:{type:Object,default:{}},
     spaces:{type:Object,default:[]},
     summary:{type:Object,default:{}},
     quotes:{type:Object,default:{}},

package/Service/schemas/activeticket.js

@@ -3,21 +3,12 @@ const {aaddress}=require('../../core-models.js');
 const wo = require('./subs/jonaswo.js')
 const ticketFinal = require('./subs/final.js')
 
-
-/* TECHINFO *
-    driveTime:{type:Date,default:''},
-    startTime:{type:Date,default:''},
-    endTime:{type:Date,default:''},
-    adjustTime:{type:Number,default:0},
-    totalTime:{type:Number,default:0}
-*/
 module.exports = [
     {
         id: { type: String, default: '' },
         ref: { type: Object, default: {} },
         status: { type: String, default: 'active' },
         techs: { type: Array, default: [] },
-        techinfo: {type:Object, default:{}}, //hold all info on techs involved
         custid: {type:String, default:''},
         cat:{type:String,default:''},
         dept:{type:String,default:''},
@@ -34,9 +25,8 @@ module.exports = [
         salesrep:{type:String,default:''},
         sitems: { type: Array, default: [] },
         wo: wo,
-        todo:{type:Object, default: {}}, //this should be replaced by office
-        office: { type: Object, default: {} },//any todo items for the office
-        field: {type:Object,default:{}},//any todo items for the field
+        todo:{type:Object, default: {}},
+        office: { type: Object, default: {} },
         logs:{type:Array,default:[]}
     }
 ]

package/Service/schemas/subs/final.js

@@ -4,9 +4,13 @@ let ticketInvoice = new Schema({
     total:{type:Number,default:0},
     pricelevel:{type:String,default:''}
 })
-
-let repairEstimate = new Schema({
-    time:{type:Number,default:0}, //time to complete all repairs
+let ticketTime = new Schema({
+    driveTime:{type:Date,default:''},
+    startTime:{type:Date,default:''},
+    endTime:{type:Date,default:''},
+    adjustTime:{type:Number,default:0},
+    totalTime:{type:Number,default:0},
+    repairEstimate:{type:Number,default:0},
     revenuePerEstimate:{type:Number,default:0},
     revenuePer:{type:Number,default:0}
 })
@@ -17,15 +21,15 @@ let ticketFinal = new Schema({
     invoice:ticketInvoice,
     signature:{type:String,default:''},
     emailed:{type:Boolean,default:false},
+    officeSubmit:{type:String,default:''},
     paymentMethod:{type:String,default:''},
     returnVisit:{type:Boolean,default:false},
     returnNotes:{type:String,default:''},
     addlDetails:{type:String,default:''},
     serviceReferral:{type:Boolean,default:false},
-    repairEstimate:repairEstimate, //was ticketTime
+    ticketTime:ticketTime,
     timelog:{type:Object,default:{}},
-    officeSubmit:{type:String,default:''},
-    completedBy:{type:Array,default:[]} //change to string, and tag with the lead who completed
+    completedBy:{type:Array,default:[]}
 })
 
 module.exports = ticketFinal

package/package.json

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