vhp-mongo-models 2.0.6 → 2.0.8

package/Document/schemas/service.js

@@ -1,3 +1,6 @@
+/*
+    {id=1}
+*/
 module.exports=[
     {
         id: { type: String, default: '' },

package/HouseHolds/schemas/serviceitem.js

@@ -10,6 +10,7 @@ module.exports = [
         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
+        tags:{type:Array,default:[]},
         
         //JONAS props
         id:{type:String,default:''}, //must have an id, should match JONAS "lineNumber"

package/Replacement/schemas/projects.js

@@ -48,6 +48,7 @@ let info = {
     joblog:{type:Object,default:{}},
     pvmaint:pvmaint,
 }
+
 /*
 info.spaces = [{
  *     id:{type:String,default:''},
@@ -60,17 +61,28 @@ info.spaces = [{
 */
 
 /** Projects Schema
-*
+*{
+  "dept": 1,
+  "hhid": 1,
+  "status": 1
+}
 *   index
 *   - id - {unique:true,name:"id"}
 */
+
+/**
+ * refs:[{work,id,type}]
+ * 
+ * types - sub | general | referral | install(s)
+ */
 module.exports=[
     {
         id: { type: String, default: '' },
         name: { type: String, default: '' },
         coid: { type:String,default:''},
         jobnum: { type: String, default: '' },
-        ref:{type:String,default:''},
+        ref:{type:String,default:''},//could be wo#
+        //woref:{type:String,default:''},
         hhid: { type: String, default: '' },
         clientfirst: { type: String, default: '' },
         clientlast: { type: String, default: '' },

package/Service/schemas/activeticket.js

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

package/Service/schemas/checklistfield.js

@@ -23,21 +23,23 @@
 */
 module.exports=[{
     id:{type:String,default:''},
-    title:{type:Object,default:{}},
-    desc:{type:String,default:''},
     building:{type:String,default:''}, // COM | RES
-    input:{type:Object,default:{}},
     //class:{type:String,default:''}, //remove is now id
-    group:{type:String,default:''},
-    subgroup:{type:String,default:''},
-    category:{type:String,default:''},
-    scoring:{type:Object,default:{}},
-    //rules:{type:Object,default:{}}
+    
     type:{type:Object,default:{}},
-    notes:{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:{}}
+    input:{type:Object,default:{}},
     required:{type:Object,default:{}},
     present:{type:Object,default:{}},
+    scoring:{type:Object,default:{}},
     calc:{type:Object,default:{}},
-    
-    rewards:{type:Boolean,default:false}
+    shared:{type:Boolean,default:true},
+    rewards:{type:Boolean,default:false},
+    notes:{type:Object,default:{}}
 },{minimize:false}]

package/Service/schemas/checklistform.js

@@ -2,16 +2,19 @@ module.exports = [{
     name:{type:String,default:''},
     title:{type:String,default:''},
     desc:{type:String,default:''},
-    sitemTags:{type:Array,default:[]},
-    included:{type:Array,default:[]},
-    categories:{type:Array,default:[]},
-    grades:{type:Array,default:[]},
+    color:{type:String,default:''},
     groups:{type:Array,default:[]},
-    sections:{type:Object,default:{}},
+    included:{type:Array,default:[]},
+    done:{type:Boolean,default:false},
+    autoadd:{type:Boolean,default:false},
+    category:{type:String,default:""},
     scored:{type:Boolean,default:false},
-    color:{type:String,default:''},
-    rewards:{type:Boolean,default:false},
     enabled:{type:Boolean,default:true},
+    tags:{type:Array,default:[]},
+    grades:{type:Array,default:[]},
     present:{type:Boolean,default:true},
-    signature:{type:Boolean,default:false}
-}]
+
+    //sitemTags:{type:Array,default:[]},
+    rewards:{type:Boolean,default:false},
+    signature:{type:Boolean,default:false},
+},{minimize:false}]

package/Service/schemas/completeticket.js

@@ -1,6 +1,9 @@
 const aticket = require('./subs/ticket.js')
 
-
+/*{
+  "hhid": 1,
+  "status": 1
+}*/
 module.exports = [
     {
         ...aticket,

package/Service/schemas/subs/final.js

@@ -1,15 +1,26 @@
-const { Schema } = require('mongoose')
-
 let ticketInvoice = {
+    paymentMethod:{type:String,default:''},
+    paymentDetails:{type:String,default:''},
     total:{type:Number,default:0},
     pricelevel:{type:String,default:''}
 }
 
 let repairEstimate = {
     time:{type:Number,default:0}, //time to complete all repairs
-    revenuePerEstimate:{type:Number,default:0},
-    revenuePer:{type:Number,default:0},
-    techCount:{type:Number,default:0}
+    techCount:{type:Number,default:0},
+    revenuePer:{type:Number,default:0}, //was revenuePerEstimate
+    //revenuePerEstimate:{type:Number,default:0},
+    //revenuePer:{type:Number,default:0},//moved to ticketTime
+}
+
+let ticketTime = {
+    techs:{type:Object,default:{}},
+    driving:{type:Number,default:0},
+    labor:{type:Number,default:0},
+    start:{type:Date,default:null},
+    end:{type:Date,default:null},
+    hours:{type:Number,default:0},
+    revenuePer:{type:Number,default:0}
 }
 
 let ticketFinal = {
@@ -19,19 +30,32 @@ let ticketFinal = {
     invoice:ticketInvoice,
     signature:{type:String,default:''},
     emailed:{type:Boolean,default:false},
-    paymentMethod:{type:String,default:''},
+    //paymentMethod:{type:String,default:''},
     returnVisit:{type:String,default:''}, //change to String, and attach return ticket id
     returnNotes:{type:String,default:''},
-    addlDetails:{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, lcoaland tag with the lead who completed
+    completedBy:{type:String,default:''}, //was type=Array
+    afterHours:{type:Boolean,default:false}
 }
 
 module.exports = ticketFinal
-
+/* conform
+    {
+        interested:{type:Bool,default:false},
+        purchased:{type:Bool,default:false},
+        details:contract
+    }
+*/
+/*
+    timelog = {
+        <tech>:[{driveTime,startTime,endTime}]
+    }
+*/
 /*
     summary = {
         approved:{

package/Service/schemas/subs/jonaswo.js

@@ -1,4 +1,3 @@
-const { Schema } = require('mongoose')
 module.exports = {
     id:{type:String,default:''},
     custcode:{type:String,default:''},

package/Service/schemas/subs/ticket.js

@@ -24,7 +24,8 @@ const ticketFinal = require('./final.js')
         startTime:{type:Date,default:''},
         endTime:{type:Date,default:''},
         adjustTime:{type:Number,default:0},
-        totalTime:{type:Number,default:0}
+        totalTime:{type:Number,default:0},
+        complete:{type:Boolean,default:false},
         revenue:{
             perHour:{type:Number,default:0}, //techs revenue per hour based on their repairs
             contribution:{type:Number,default:0} //the portion of revenue the tech worked on
@@ -33,12 +34,19 @@ const ticketFinal = require('./final.js')
 ]
 */
 
+
 /*
-    sitems = [{
-        id:{type:String,default:''}
-        descr:{type:String,default:''}
-        needReplace:{type:Boolean:default:false}
-    }]
+    repairs = {
+        <sitem.id>:[{
+            task:{type:String,default:''},
+            desc:{type:String,default:''},
+            ...other flatrate fields,
+            appr:{type:String,default:'PENDING'}, // 'YES' | 'NO'
+            done:{type:Boolean,default:false},
+            note:{type:String,default:''}
+
+        }]
+    }
 */
 module.exports = {
     id: { type: String, default: '' },

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "vhp-mongo-models",
-    "version": "2.0.6",
+    "version": "2.0.8",
     "productName": "VHP Mongo Models",
     "description": "Mongo Models library to setup Mongoose Schemas",
     "author": "VHPim",
@@ -9,9 +9,6 @@
     "main": "index.js",
     "scripts": {
     },
-    "peerDependencies": {
-      "mongoose": "^7.0.5"
-    },
     "devDependencies": {
       "jsdoc": "^4.0.3"
     }