app/assets/javascripts/MedicationActive.js in cqm-models-1.0.3 vs app/assets/javascripts/MedicationActive.js in cqm-models-1.1.1.0

@@ -1,31 +1,40 @@
-const mongoose = require('mongoose');
+const mongoose = require('mongoose/browser');
+
+const { IdSchema } = require('./Id');
 const { DataElementSchema } = require('./basetypes/DataElement');
 const Code = require('./basetypes/Code');
 const Interval = require('./basetypes/Interval');
 const Quantity = require('./basetypes/Quantity');
 const DateTime = require('./basetypes/DateTime');
-const { ComponentSchema } = require('./Component');
-const { FacilityLocationSchema } = require('./FacilityLocation');
-const { IdSchema } = require('./Id');
 const Any = require('./basetypes/Any');
+const { ComponentSchema } = require('./attributes/Component');
+const { FacilityLocationSchema } = require('./attributes/FacilityLocation');
 
+
 const [Number, String] = [
   mongoose.Schema.Types.Number,
   mongoose.Schema.Types.String,
 ];
 
 const MedicationActiveSchema = DataElementSchema({
   relevantPeriod: Interval,
   dosage: Quantity,
   frequency: Code,
   route: Code,
-  hqmfOid: { type: String, default: '2.16.840.1.113883.10.20.28.3.44' },
+  qdmTitle: { type: String, default: 'Medication, Active' },
+  hqmfOid: { type: String, default: '2.16.840.1.113883.10.20.28.4.44' },
   qdmCategory: { type: String, default: 'medication' },
   qdmStatus: { type: String, default: 'active' },
   qdmVersion: { type: String, default: '5.4' },
-  _type: { type: String, default: 'MedicationActive' },
+  _type: { type: String, default: 'QDM::MedicationActive' },
 
 });
 
 module.exports.MedicationActiveSchema = MedicationActiveSchema;
-module.exports.MedicationActive = mongoose.model('MedicationActive', MedicationActiveSchema);
+class MedicationActive extends mongoose.Document {
+  constructor(object) {
+    super(object, MedicationActiveSchema);
+    this._type = 'QDM::MedicationActive';
+  }
+}
+module.exports.MedicationActive = MedicationActive;