vhp-mongo-models 1.5.5 → 1.5.6-DEV

package/HouseHolds/schemas/serviceitem.js

@@ -1,10 +1,46 @@
 module.exports = [
     {
-        sysid:{type:String,default:''},
-        quantity:{type:Number,default:1},
-        type:{type:String,default:''},
-        name:{type:String,default:''},
+        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:''},
+        
         location:{type:String,default:''},
-        notes:{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:''},
+
+
     }
 ]

package/Service/schemas/activeticket.js

@@ -3,12 +3,30 @@ const {aaddress}=require('../../core-models.js');
 const wo = require('./subs/jonaswo.js')
 const ticketFinal = require('./subs/final.js')
 
+
+/* TECHINFO *
+[
+    <user>:{
+        name:{type:String,default:''},
+        assigned:{type:Array,default:[{
+            id:{type:String,default:''}, //the service item id
+            done:{type:Boolean,default:false}
+        }]},
+        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:''},
@@ -25,8 +43,9 @@ module.exports = [
         salesrep:{type:String,default:''},
         sitems: { type: Array, default: [] },
         wo: wo,
-        todo:{type:Object, default: {}},
-        office: { type: Object, default: {} },
+        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
         logs:{type:Array,default:[]}
     }
 ]

package/Service/schemas/subs/final.js

@@ -4,13 +4,9 @@ let ticketInvoice = new Schema({
     total:{type:Number,default:0},
     pricelevel:{type:String,default:''}
 })
-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},
+
+let repairEstimate = new Schema({
+    time:{type:Number,default:0}, //time to complete all repairs
     revenuePerEstimate:{type:Number,default:0},
     revenuePer:{type:Number,default:0}
 })
@@ -21,15 +17,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},
+    returnVisit:{type:String,default:''}, //change to String, and attach return ticket id
     returnNotes:{type:String,default:''},
     addlDetails:{type:String,default:''},
     serviceReferral:{type:Boolean,default:false},
-    ticketTime:ticketTime,
+    repairEstimate:repairEstimate, //was ticketTime
     timelog:{type:Object,default:{}},
-    completedBy:{type:Array,default:[]}
+    officeSubmit:{type:String,default:''},
+    completedBy:{type:Array,default:[]} //change to string, and tag with the lead who completed
 })
 
 module.exports = ticketFinal

package/Service/schemas/subs/ticket.js

@@ -0,0 +1,16 @@
+const {aaddress}=require('../../../core-models.js');
+const wo = require('./jonaswo.js')
+const ticketFinal = require('./final.js')
+
+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:''},
+    hhid:{type:String,default:''},
+    ...aaddress,
+}

package/package.json

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