vhp-mongo-models 2.0.5 → 2.0.7

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,7 +61,11 @@ info.spaces = [{
 */
 
 /** Projects Schema
-*
+*{
+  "dept": 1,
+  "hhid": 1,
+  "status": 1
+}
 *   index
 *   - id - {unique:true,name:"id"}
 */

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:'WORKING'}, // WORKING | SENT | APPROVED
+        approval:{type:String,default:'PREPARING'}, // SENT | APPROVED
         approvalCode:{type:String,default:''}
     },{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

@@ -8,9 +8,18 @@ let ticketInvoice = {
 let repairEstimate = {
     time:{type:Number,default:0}, //time to complete all repairs
     revenuePerEstimate:{type:Number,default:0},
-    revenuePer:{type:Number,default:0},
+    revenuePer:{type:Number,default:0},//moved to ticketTime
     techCount:{type:Number,default:0}
 }
+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 = {
     showReplacement:{type:Boolean,default:false},
@@ -25,13 +34,19 @@ let ticketFinal = {
     addlDetails:{type:String,default:''},
     serviceReferral:{type:Boolean,default:false},
     repairEstimate:repairEstimate, //was ticketTime
+    ticketTime:ticketTime, //may merge with repairEstimate
     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
-
+/*
+    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
@@ -40,6 +41,20 @@ const ticketFinal = require('./final.js')
         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: '' },
     ref: { type: Object, default: {} },

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "vhp-mongo-models",
-    "version": "2.0.5",
+    "version": "2.0.7",
     "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"
     }