lib/generate_models.rb in cqm-models-0.8.4 vs lib/generate_models.rb in cqm-models-1.0.0
- old
+ new
@@ -14,10 +14,11 @@
TYPE_LOOKUP_RB = {
'System.DateTime': 'DateTime',
'System.Integer': 'Integer',
'System.Quantity': 'Quantity',
'System.Code': 'Code',
+ 'QDM.Id': 'Id',
'System.Any': 'Any',
'interval<System.DateTime>': 'Interval',
'interval<System.Quantity>': 'Interval',
'list<QDM.Component>': 'Array',
'System.String': 'String',
@@ -35,10 +36,11 @@
'System.DateTime': 'DateTime',
'System.Integer': 'Number',
'System.Quantity': 'Quantity',
'System.Code': 'Code',
'System.Any': 'Any',
+ 'QDM.Id': 'IdSchema',
'interval<System.DateTime>': 'Interval',
'interval<System.Quantity>': 'Interval',
'list<QDM.Component>': '[]',
'System.String': 'String',
'list<QDM.Id>': '[]',
@@ -125,11 +127,11 @@
# Create Ruby models
extra_fields_rb = [
'hqmfOid:String',
'qrdaOid:String',
- 'category:String',
+ 'qdmCategory:String',
'qdmStatus:String',
'qdmVersion:String'
]
base_module = 'QDM::'
base_module = 'Test::QDM::' if IS_TEST
@@ -153,11 +155,11 @@
file_path = 'app/assets/javascripts/'
file_path = 'tmp/' if IS_TEST
extra_fields_js = [
{ name: 'hqmfOid', type: 'System.String' },
{ name: 'qrdaOid', type: 'System.String' },
- { name: 'category', type: 'System.String' },
+ { name: 'qdmCategory', type: 'System.String' },
{ name: 'qdmStatus', type: 'System.String' },
{ name: 'qdmVersion', type: 'System.String' },
{ name: '_type', type: 'System.String' }
]
datatype_custom_templates = {
@@ -223,19 +225,19 @@
else
contents.gsub!(/ field :qrdaOid, type: String\n/, '') # Don't include this field
end
# Add category
- if oids[dc_name].present? && oids[dc_name]['category'].present?
- contents.gsub!(/ field :category, type: String\n/, " field :category, type: String, default: '#{oids[dc_name]['category']}'\n")
+ if oids[dc_name].present? && oids[dc_name]['qdm_category'].present?
+ contents.gsub!(/ field :qdmCategory, type: String\n/, " field :qdmCategory, type: String, default: '#{oids[dc_name]['qdm_category']}'\n")
else
- contents.gsub!(/ field :category, type: String\n/, '') # Don't include this field
+ contents.gsub!(/ field :qdmCategory, type: String\n/, '') # Don't include this field
end
# Add status
- if oids[dc_name].present? && oids[dc_name]['status'].present?
- contents.gsub!(/ field :qdmStatus, type: String\n/, " field :qdmStatus, type: String, default: '#{oids[dc_name]['status']}'\n")
+ if oids[dc_name].present? && oids[dc_name]['qdm_status'].present?
+ contents.gsub!(/ field :qdmStatus, type: String\n/, " field :qdmStatus, type: String, default: '#{oids[dc_name]['qdm_status']}'\n")
else
contents.gsub!(/ field :qdmStatus, type: String\n/, '') # Don't include this field
end
# Make relatedTo embeds_many instead of field
@@ -270,18 +272,18 @@
else
contents.gsub!(/ qrdaOid: String,\n/, '') # Don't include this field
end
# Add category
- if oids[dc_name].present? && oids[dc_name]['category'].present?
- contents.gsub!(/ category: String,\n/, " category: { type: String, default: '#{oids[dc_name]['category']}' },\n")
+ if oids[dc_name].present? && oids[dc_name]['qdm_category'].present?
+ contents.gsub!(/ qdmCategory: String,\n/, " qdmCategory: { type: String, default: '#{oids[dc_name]['qdm_category']}' },\n")
else
- contents.gsub!(/ category: String,\n/, '') # Don't include this field
+ contents.gsub!(/ qdmCategory: String,\n/, '') # Don't include this field
end
# Add status
- if oids[dc_name].present? && oids[dc_name]['status'].present?
- contents.gsub!(/ qdmStatus: String,\n/, " qdmStatus: { type: String, default: '#{oids[dc_name]['status']}' },\n")
+ if oids[dc_name].present? && oids[dc_name]['qdm_status'].present?
+ contents.gsub!(/ qdmStatus: String,\n/, " qdmStatus: { type: String, default: '#{oids[dc_name]['qdm_status']}' },\n")
else
contents.gsub!(/ qdmStatus: String,\n/, '') # Don't include this field
end
# Add class