vhp-mongo-models 1.7.3 → 2.0.1

package/HouseHolds/schemas/checklist.js

@@ -4,7 +4,6 @@ module.exports = [{
     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:''},
     sitems:{type:Array,default:[]}, //of service item ["ids"]
     scoring:{
         list:{type:Object,default:{}},

package/HouseHolds/schemas/checklists.js

@@ -0,0 +1,8 @@
+module.exports = [{
+    id:{type:String,default:''}, //what checklist was used
+    name:{type:String,default:''}, //optional name for THIS checklist
+    work:{type:Array,default:[]},
+    hhid:{type:String,default:''},
+    sitems:{type:Array,default:[]},//of service item ids
+    checks:{type:Object,default:{}} //to hold all of the checklist values
+}]

package/HouseHolds/schemas/client.js

@@ -7,7 +7,7 @@
 module.exports = [
     {
         coid:{type:String,default:''},
-        custCode : {type:String,default:''},
+        custCode : {type:String,default:''}, //link in Jonas
         type:{type:String,default:'owner'}, // Owners | Occupants
         billTo:{type:String,default:''},
         custName:{type:String,default:''},

package/HouseHolds/schemas/home.js

@@ -1,5 +1,14 @@
 
 /** Home Schema
+ * 
+ * spaces = [{
+ *     id:{type:String,default:''},
+ *     title:{type:String,default:''}
+ *     subspaces:{type:String,default:[{
+ *          id:{type:String,default:''},
+ *          title:{type:String,default:''}
+ *     }]}
+ * }]
 *
 *   index
 *   - hhid - {unique:true,name:"hhid"}

package/HouseHolds/schemas/serviceitem.js

@@ -1,15 +1,8 @@
-/*
-    notes = [{
-        tech:{type:String,default:''},
-        date:{type:Date,default:null},
-        work:{type:String,default:''},
-        note:{type:String,default:''}
-    }]
-*/
 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:''},
         subspace:{type:String,default:''},
@@ -20,8 +13,8 @@ module.exports = [
         //JONAS props
         id:{type:String,default:''}, //must have an id, should match JONAS "lineNumber"
         custcode:{type:String,default:''}, //linked custcode in JONAS
-        type:{type:String,default:''},//FU CU C etc
         tagid:{type:String,default:''},
+        type:{type:String,default:''},//understand what this is in jonas
         descr:{type:String,default:''},
         status:{type:String,default:''},//should be 'A' for active. Need to find other codes. Match JONAS
         insdate:{type:Date,default:''},

package/Pricing/pricing.js

@@ -5,5 +5,6 @@ module.exports={
     PricingBEE:new Schema(...require('./schemas/pricingbee.js')),
     Pricing300:new Schema(...require('./schemas/pricing300.js')),
     Addition:new Schema(...require('./schemas/additions.js')),
-    Finance:new Schema(...require('./schemas/financing.js'))
+    Finance:new Schema(...require('./schemas/financing.js')),
+    Discount:new Schema(...require('./schemas/discounts.js'))
 }

package/Pricing/schemas/additions.js

@@ -2,15 +2,24 @@ module.exports=[
     {
         name:{type:String,default:''}, // pricebook / collection name
         notes:{type:String,default:''}, // versioned | table
-        cat:{type:String,default:''}, // pkid | update date?
-        type:{type:String,default:''},
+        type:{type:String,default:''}, // the quote type ex. hvac | envelope | window
+        cat:{type:String,default:''}, // department provided groupings
         mfg:{type:String,default:''},
         model:{type:String,default:''},
-        settings:{type:String,default:''},
-        location:{type:Array,default:[]},
         labor:{type:Number,default:0},
         laborpart:{type:Number,default:0},
-        price:{type:Number,default:0},
-        pricededuct:{type:Number,default:0}
+        settings:{type:Object,default:{}},
+        pricededuct:{type:Number,default:0}, //price to take off
+        pricesale:{type:Number,default:0},
+        userCreated:{type:Boolean,default:false}, //may not need, is really for gui
+        tiers:{type:Array,default:[]} //may not need, is really for gui
     }
 ]
+
+/*
+    settings = {
+
+        location:{type:Array,default:[]},
+        swap:{type:Array,default:[]}
+    }
+*/

package/Pricing/schemas/discounts.js

@@ -0,0 +1,14 @@
+
+module.exports=[
+    {
+       name:{type:String,default:''}, //unique
+       type:{type:String,default:'instant'}, // instant | postpurchase | credit
+       unit:{type:String,default:'dollar'}, // dollar | percent
+       level:{type:String,default:'tier'}, // tier | solution | project
+       amount:{type:Number,default:0},
+       source:{type:String,default:''}, //needs further explaining to id the purpose
+       notes:{type:String,default:''},
+       userCreated:{type:Boolean,default:false}, //may not need, is really for gui
+       tiers:{type:Array,default:[]} //may not need, is really for gui
+    }
+]

package/Pricing/schemas/financing.js

@@ -1,8 +1,18 @@
+
+/*
+manf:[{
+    manufacturer:{type:String,default:''},
+    promoRate:{type:Number,default:''},
+    credit:{type:Number,default:''}
+}]
+*/
 module.exports=[
     {
-        code:{type:String,default:''}, // pricebook / collection name
+        code:{type:String,default:''}, //the financing code
         stdRate:{type:String,default:''}, // versioned | table
         pymntFactor:{type:String,default:''}, // pkid | update date?
+        dept:{type:Array,default:''},
+        term:{type:String,default:''},
         desc:{type:String,default:''},
         min:{type:Number,default:0},
         max:{type:Number,default:0},

package/Replacement/schemas/contracts.js

@@ -0,0 +1,71 @@
+
+
+/*
+    constracts = [{
+        contractid: contractid,                            
+        jobnum: project.jobnum || '',                 
+        jobname: project.name || '',                        
+        solname: solution.name || '',
+        name: solution.name || '',
+        version: false,
+        strtdate: null,
+        solddate: null,
+        sold: sold,
+        estimator: project.estimator || '',
+        dept: project.dept,
+        type: solution.type || '',                             // not editable; helps determine which templates to use [string]
+        path: path,
+        hhid: project.hhid || '',                           // not editable; not shown anywhere
+        custcode: project.custid || '',                  // not editable
+        projectid: project.id || '',
+        customer: {                                   // all editable (besides longCity and fullName) [strings]
+            clientFirst: project.clientfirst,
+            clientLast: project.clientlast,
+            name: `${project.clientfirst} ${project.clientlast}` || project.clientfirst || project.clientlast,
+            street: project.street,
+            unit: project.unit,
+            city: project.city,
+            state: project.state,
+            zip: project.zip,
+            longCity: project.city + ', ' + project.state + ' ' + project.zip,
+            phone: project.phone,
+            email: project.email
+        },
+        general:{
+            net:0,
+            projid:'',
+            contractid:'',
+            dept:''
+        },
+        subs:[],                                     //list
+        finance: {
+            billto: '',                              // editable (searchable?) [string]
+
+            net: 0,                                  // editable [price]
+
+            downAmount: 0,                           // editable [price]
+            downDate: '',                            // editable [date]
+            downVia: '',                             // editable ( check number | card last 4 | cash ) [string]
+
+            financed: financed,
+            fincode: '',                             // editable [string]
+            finAmount: 0,                            // editable [price]
+            finTerm: 0,                              // referenced from fintable via finCode string [number]
+            finAPR: '',                              // referenced from fintable via finCode string [string]
+
+            dueComplete: 0                           // calculation (net - downAmount- dueComplete) [price]
+        },
+        discounts: [],
+        additions: [],
+        notes: '',
+        terms: {                                     // not editable; not shown on editor or preview, shown on print; gathered from table in settings [string]
+            financing: '',
+            collections: ''
+        },
+        solution: {                                 // editablilty will depend on solution. will be blank if STANDARD contract
+            //windows:[]
+            //envelope:[]
+            //vhc:[]
+        }
+    }]
+*/

package/Replacement/schemas/projects.js

@@ -10,8 +10,12 @@ const { aaddress, acontact } = require('../../core-models.js');
  *  photos:{type:Boolean},
  *  scheduled:{type:Boolean}
  * }]
- */     
-let pvmaint = new Schema({
+ */
+
+/**
+ * 
+ */
+let pvmaint = {
     contractNum:{type:String,default:''},
     rewardNum:{type:String,default:''},
     jobref:{type:String,default:''},
@@ -22,9 +26,8 @@ let pvmaint = new Schema({
     state:{type:String,default:''},
     zip:{type:String,default:''},
     visits:{type:Array,default:[]}
-
-})
-let lead = new Schema({
+}
+let lead = {
     apptdate:{type:Date,default:''},
     type:{type:String,default:''},
     prstdate:{type:Date,default:''},
@@ -36,16 +39,26 @@ let lead = new Schema({
     generator:{type:String,default:''},
     soldAmount:{type:Number,default:0},
     paid:{type:Date,default:''}
-})
-let info = new Schema({
+}
+let info = {
     pkids:{type:Array,default:[]},
-    siteinfo:{type:Object,default:{}},
-    spaces:{type:Object,default:[]},
+    spaces:{type:Array,default:[]},
     summary:{type:Object,default:{}},
     quotes:{type:Object,default:{}},
     joblog:{type:Object,default:{}},
     pvmaint:pvmaint,
-})
+}
+/*
+info.spaces = [{
+ *     id:{type:String,default:''},
+ *     title:{type:String,default:''}
+ *     subspaces:{type:String,default:[{
+ *          id:{type:String,default:''},
+ *          title:{type:String,default:''}
+ *     }]}
+ * }]]
+*/
+
 /** Projects Schema
 *
 *   index

package/Replacement/schemas/quote.js

@@ -0,0 +1,38 @@
+/*
+Quotes are currently held in project.info.quotes={
+    <quoteType>:{
+        coid:string
+        type:string
+        solutions:array
+    }
+}
+
+const aquote = {
+  coid: 'string',
+  type: 'string',
+  solutions: []
+}
+
+const asolution = {
+  name: 'string',
+  tiers: [],
+  space: 'string',
+  subspace: 'string',
+  details: 'object',  // ie 'access point', 'heat load'
+  strategy: 'string',
+  additions: [],
+  discounts: [],
+  summary: {          // main access point to 'get' information on the quote
+    tiers: [],      // calculated totals for each option (base + additions + discounts + etc)
+    path: [],         // 'path' to the selected option
+    contractid: 'string',
+    finance: {}
+  }
+}
+
+const atier= {     
+  name: '',
+  {productInfo}
+}
+
+*/

package/Service/schemas/activeticket.js

@@ -1,32 +1,12 @@
 
-const {aaddress}=require('../../core-models.js');
-const wo = require('./subs/jonaswo.js')
-const ticketFinal = require('./subs/final.js')
+const aticket = require('./subs/ticket.js')
 
 module.exports = [
     {
-        id: { type: String, default: '' },
-        ref: { type: Object, default: {} },
+        ...aticket,
         status: { type: String, default: 'active' },
-        techs: { type: Array, default: [] },
-        custid: {type:String, default:''},
-        cat:{type:String,default:''},
-        dept:{type:String,default:''},
-        hhid:{type:String,default:''},
-
-        ...aaddress,
         documents: { type: Array, default: [] },
-
-        checks: { type: Array, default: [] },
-        conform: { type: Object, default: {} },
-        contract: { type: Object, default: {} },
-        final: ticketFinal,
-        repairs: { type: Array, default: [] },
-        salesrep:{type:String,default:''},
-        sitems: { type: Array, default: [] },
-        wo: wo,
-        todo:{type:Object, default: {}},
-        office: { type: Object, default: {} },
-        logs:{type:Array,default:[]}
-    }
+        approval:{type:String,default:'WORKING'}, // WORKING | SENT | APPROVED
+        approvalCode:{type:String,default:''}
+    },{minimize:false}
 ]

package/Service/schemas/checklistfield.js

@@ -20,7 +20,7 @@
 
     
 */
-module.exports=[{
+module.export=[{
     id:{type:String,default:''},
     title:{type:String,default:''},
     desc:{type:String,default:''},

package/Service/schemas/completeticket.js

@@ -1,32 +1,10 @@
+const aticket = require('./subs/ticket.js')
 
-const {aaddress}=require('../../core-models.js');
-const wo = require('./subs/jonaswo.js')
-const ticketFinal = require('./subs/final.js')
 
 module.exports = [
     {
-        id: { type: String, default: '' },
-        ref: { type: Object, default: {} },
+        ...aticket,
         status: { type: String, default: 'complete' }, // active, complete, archived
-        techs: { type: Array, default: [] },
-        custid: {type:String, default:''},
-        cat:{type:String,default:''},
-        dept:{type:String,default:''},
-        hhid:{type:String,default:''},
-        documents: { type: Array, default: [] },
-
-        ...aaddress,
-
-        checks: { type: Array, default: [] },
-        conform: { type: Object, default: {} },
-        contract: { type: Object, default: {} },
-        final: ticketFinal,
-        repairs: { type: Array, default: [] },
-        salesrep:{type:String,default:''},
-        sitems: { type: Array, default: [] },
-        wo: wo,
-        todo:{type:Object, default: {}}, //remove
-        office: { type: Array, default: [] },
-        logs:{type:Array,default:[]}
-    }
+        documents: { type: Array, default: [] } //could get rid of
+    },{minimize:false}
 ]

package/Service/schemas/subs/final.js

@@ -1,35 +1,61 @@
 const { Schema } = require('mongoose')
 
-let ticketInvoice = new Schema({
+let ticketInvoice = {
     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 = {
+    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},
+    techCount:{type:Number,default:0}
+}
 
-let ticketFinal = new Schema({
+let ticketFinal = {
     showReplacement:{type:Boolean,default:false},
+    summary:{type:Object,default:{}}, //a static version of the presentation
     conform:{type:Object,default:{}},
     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, lcoaland tag with the lead who completed
+}
+
+module.exports = ticketFinal
 
-module.exports = ticketFinal
+/*
+    summary = {
+        approved:{
+            name:{type:String,default:''},
+            signature:{type:String,default:''}
+        }
+        total:{
+            mprice:{type:Number,default:0},
+            rprice:{type:Number,default:0},
+            msavings:{type:Number,default:0},
+            rsavings:{type:Number,default:0}
+        }
+        repairs:{
+            <sitem.id>:[{
+                repair:{
+                    task:{type:String,default:''}
+                    appr:{type:String,default:''} // YES | NO | RETURNFOR 
+                }
+                pricing:{
+                    <pl1>:{type:Number,default:0},
+                    <pl2>:{type:Number,default:0},
+                    ...
+                }
+            }]
+        }
+    }
+*/

package/Service/schemas/subs/jonaswo.js

@@ -1,5 +1,5 @@
 const { Schema } = require('mongoose')
-module.exports = new Schema({
+module.exports = {
     id:{type:String,default:''},
     custcode:{type:String,default:''},
     contactname:{type:String,default:''},
@@ -35,4 +35,4 @@ module.exports = new Schema({
     timecomplete:{type:String,default:''},
     datecompletesched:{type:Date,default:''},
     timecompletesched:{type:String,default:''}
-})
+}

package/Service/schemas/subs/ticket.js

@@ -0,0 +1,71 @@
+const {aaddress}=require('../../../core-models.js');
+const wo = require('./jonaswo.js')
+const ticketFinal = require('./final.js')
+
+/* TECHINFO *
+[
+    <user>:{
+        name:{type:String,default:''},
+        assigned:{
+            <sitem.id>:{
+                id:{type:String,default:''}, //the service item id
+                name:{type:String,default:''},
+                type:{type:String,default:''}, //describes the 
+                done:{type:String,default:false} //WORKING | READY | COMPLETE
+                work:{type:Array,default:[{
+                    id:{type:String,default:''}, //the service item id
+                    name:{type:String,default:''},
+                    type:{type:String,default:''}, //describes the 
+                    done:{type:String,default:false} //WORKING | READY | COMPLETE
+                }]}
+            }
+        }]},
+        driveTime:{type:Date,default:''},
+        startTime:{type:Date,default:''},
+        endTime:{type:Date,default:''},
+        adjustTime:{type:Number,default:0},
+        totalTime:{type:Number,default:0}
+        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
+        }
+    }
+]
+*/
+
+/*
+    sitems = [{
+        id:{type:String,default:''}
+        descr:{type:String,default:''}
+        needReplace:{type:Boolean:default:false}
+    }]
+*/
+module.exports = {
+    id: { type: String, default: '' },
+    ref: { type: Object, default: {} },
+    custid: {type:String, default:''},
+    cat:{type:String,default:''}, //converted cat from jonas. Orginal cat can be found in wo.cat
+    dept:{type:String,default:''},
+
+    techs: { type: Array, default: [] },
+    techinfo: {type:Object, default:{}}, //hold all info on techs involved
+    salesrep:{type:String,default:''},
+    
+    hhid:{type:String,default:''},
+    ...aaddress, //do not need?
+    
+    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
+
+    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
+}

package/package.json

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