Skip to content

Add a DateTimeInterval #244

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
dczulada wants to merge 8 commits into
base: master
Choose a base branch
from
Draft

Add a DateTimeInterval #244

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
6777b84
Add a DateTimeInterval
dczulada Sep 25, 2025
13c8567
add import resolver
dczulada Oct 10, 2025
a7581e3
dist and browser
dczulada Oct 10, 2025
4824a5c
eslint config
dczulada Oct 10, 2025
3ebca73
another config update
dczulada Oct 10, 2025
93859a2
turn off
dczulada Oct 10, 2025
14ad487
add unit test
dczulada Oct 10, 2025
61c02f9
shorter paths
dczulada Oct 10, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions .eslintrc.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@
"max-len": ["error", {"code": 200, "ignoreComments": true}],
"no-multiple-empty-lines": "off",
"import/extensions": "off",
"import/no-unresolved": "off",
"max-classes-per-file": "off",
"operator-linebreak": "off",
"no-else-return": "off",
Expand Down
4 changes: 2 additions & 2 deletions app/assets/javascripts/AllergyIntolerance.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ const mongoose = require('mongoose/browser');
const { IdentifierSchema } = require('./attributes/Identifier');
const { DataElementSchema } = require('./basetypes/DataElement');
const Code = require('./basetypes/Code');
const Interval = require('./basetypes/Interval');
const DateTimeInterval = require('./basetypes/DateTimeInterval');
const Quantity = require('./basetypes/Quantity');
const DateTime = require('./basetypes/DateTime');
const QDMDate = require('./basetypes/QDMDate');
Expand All @@ -21,7 +21,7 @@ const [Number, String] = [

const AllergyIntoleranceSchema = DataElementSchema({
authorDatetime: DateTime,
prevalencePeriod: Interval,
prevalencePeriod: DateTimeInterval,
type: Code,
severity: Code,
recorder: [AnyEntity],
Expand Down
4 changes: 2 additions & 2 deletions app/assets/javascripts/AssessmentPerformed.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ const mongoose = require('mongoose/browser');
const { IdentifierSchema } = require('./attributes/Identifier');
const { DataElementSchema } = require('./basetypes/DataElement');
const Code = require('./basetypes/Code');
const Interval = require('./basetypes/Interval');
const DateTimeInterval = require('./basetypes/DateTimeInterval');
const Quantity = require('./basetypes/Quantity');
const DateTime = require('./basetypes/DateTime');
const QDMDate = require('./basetypes/QDMDate');
Expand All @@ -22,7 +22,7 @@ const [Number, String] = [
const AssessmentPerformedSchema = DataElementSchema({
authorDatetime: DateTime,
relevantDatetime: DateTime,
relevantPeriod: Interval,
relevantPeriod: DateTimeInterval,
negationRationale: Code,
reason: Code,
method: Code,
Expand Down
4 changes: 2 additions & 2 deletions app/assets/javascripts/CareGoal.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ const mongoose = require('mongoose/browser');
const { IdentifierSchema } = require('./attributes/Identifier');
const { DataElementSchema } = require('./basetypes/DataElement');
const Code = require('./basetypes/Code');
const Interval = require('./basetypes/Interval');
const DateTimeInterval = require('./basetypes/DateTimeInterval');
const Quantity = require('./basetypes/Quantity');
const DateTime = require('./basetypes/DateTime');
const QDMDate = require('./basetypes/QDMDate');
Expand All @@ -21,7 +21,7 @@ const [Number, String] = [

const CareGoalSchema = DataElementSchema({
statusDate: QDMDate,
relevantPeriod: Interval,
relevantPeriod: DateTimeInterval,
relatedTo: [String],
targetOutcome: Any,
performer: [AnyEntity],
Expand Down
4 changes: 2 additions & 2 deletions app/assets/javascripts/Diagnosis.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ const mongoose = require('mongoose/browser');
const { IdentifierSchema } = require('./attributes/Identifier');
const { DataElementSchema } = require('./basetypes/DataElement');
const Code = require('./basetypes/Code');
const Interval = require('./basetypes/Interval');
const DateTimeInterval = require('./basetypes/DateTimeInterval');
const Quantity = require('./basetypes/Quantity');
const DateTime = require('./basetypes/DateTime');
const QDMDate = require('./basetypes/QDMDate');
Expand All @@ -21,7 +21,7 @@ const [Number, String] = [

const DiagnosisSchema = DataElementSchema({
authorDatetime: DateTime,
prevalencePeriod: Interval,
prevalencePeriod: DateTimeInterval,
anatomicalLocationSite: Code,
severity: Code,
recorder: [AnyEntity],
Expand Down
4 changes: 2 additions & 2 deletions app/assets/javascripts/DiagnosticStudyPerformed.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ const mongoose = require('mongoose/browser');
const { IdentifierSchema } = require('./attributes/Identifier');
const { DataElementSchema } = require('./basetypes/DataElement');
const Code = require('./basetypes/Code');
const Interval = require('./basetypes/Interval');
const DateTimeInterval = require('./basetypes/DateTimeInterval');
const Quantity = require('./basetypes/Quantity');
const DateTime = require('./basetypes/DateTime');
const QDMDate = require('./basetypes/QDMDate');
Expand All @@ -22,7 +22,7 @@ const [Number, String] = [
const DiagnosticStudyPerformedSchema = DataElementSchema({
authorDatetime: DateTime,
relevantDatetime: DateTime,
relevantPeriod: Interval,
relevantPeriod: DateTimeInterval,
reason: Code,
result: Any,
resultDatetime: DateTime,
Expand Down
4 changes: 2 additions & 2 deletions app/assets/javascripts/EncounterPerformed.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ const mongoose = require('mongoose/browser');
const { IdentifierSchema } = require('./attributes/Identifier');
const { DataElementSchema } = require('./basetypes/DataElement');
const Code = require('./basetypes/Code');
const Interval = require('./basetypes/Interval');
const DateTimeInterval = require('./basetypes/DateTimeInterval');
const Quantity = require('./basetypes/Quantity');
const DateTime = require('./basetypes/DateTime');
const QDMDate = require('./basetypes/QDMDate');
Expand All @@ -23,7 +23,7 @@ const EncounterPerformedSchema = DataElementSchema({
authorDatetime: DateTime,
admissionSource: Code,
class: Code,
relevantPeriod: Interval,
relevantPeriod: DateTimeInterval,
dischargeDisposition: Code,
facilityLocations: [FacilityLocationSchema],
diagnoses: [DiagnosisComponentSchema],
Expand Down
4 changes: 2 additions & 2 deletions app/assets/javascripts/InterventionPerformed.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ const mongoose = require('mongoose/browser');
const { IdentifierSchema } = require('./attributes/Identifier');
const { DataElementSchema } = require('./basetypes/DataElement');
const Code = require('./basetypes/Code');
const Interval = require('./basetypes/Interval');
const DateTimeInterval = require('./basetypes/DateTimeInterval');
const Quantity = require('./basetypes/Quantity');
const DateTime = require('./basetypes/DateTime');
const QDMDate = require('./basetypes/QDMDate');
Expand All @@ -22,7 +22,7 @@ const [Number, String] = [
const InterventionPerformedSchema = DataElementSchema({
authorDatetime: DateTime,
relevantDatetime: DateTime,
relevantPeriod: Interval,
relevantPeriod: DateTimeInterval,
reason: Code,
result: Any,
status: Code,
Expand Down
3 changes: 2 additions & 1 deletion app/assets/javascripts/LaboratoryTestPerformed.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ const mongoose = require('mongoose/browser');
const { IdentifierSchema } = require('./attributes/Identifier');
const { DataElementSchema } = require('./basetypes/DataElement');
const Code = require('./basetypes/Code');
const DateTimeInterval = require('./basetypes/DateTimeInterval');
const Interval = require('./basetypes/Interval');
const Quantity = require('./basetypes/Quantity');
const DateTime = require('./basetypes/DateTime');
Expand All @@ -22,7 +23,7 @@ const [Number, String] = [
const LaboratoryTestPerformedSchema = DataElementSchema({
authorDatetime: DateTime,
relevantDatetime: DateTime,
relevantPeriod: Interval,
relevantPeriod: DateTimeInterval,
status: Code,
method: Code,
result: Any,
Expand Down
4 changes: 2 additions & 2 deletions app/assets/javascripts/MedicationActive.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ const mongoose = require('mongoose/browser');
const { IdentifierSchema } = require('./attributes/Identifier');
const { DataElementSchema } = require('./basetypes/DataElement');
const Code = require('./basetypes/Code');
const Interval = require('./basetypes/Interval');
const DateTimeInterval = require('./basetypes/DateTimeInterval');
const Quantity = require('./basetypes/Quantity');
const DateTime = require('./basetypes/DateTime');
const QDMDate = require('./basetypes/QDMDate');
Expand All @@ -21,7 +21,7 @@ const [Number, String] = [

const MedicationActiveSchema = DataElementSchema({
relevantDatetime: DateTime,
relevantPeriod: Interval,
relevantPeriod: DateTimeInterval,
dosage: Quantity,
frequency: Code,
route: Code,
Expand Down
4 changes: 2 additions & 2 deletions app/assets/javascripts/MedicationAdministered.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ const mongoose = require('mongoose/browser');
const { IdentifierSchema } = require('./attributes/Identifier');
const { DataElementSchema } = require('./basetypes/DataElement');
const Code = require('./basetypes/Code');
const Interval = require('./basetypes/Interval');
const DateTimeInterval = require('./basetypes/DateTimeInterval');
const Quantity = require('./basetypes/Quantity');
const DateTime = require('./basetypes/DateTime');
const QDMDate = require('./basetypes/QDMDate');
Expand All @@ -22,7 +22,7 @@ const [Number, String] = [
const MedicationAdministeredSchema = DataElementSchema({
authorDatetime: DateTime,
relevantDatetime: DateTime,
relevantPeriod: Interval,
relevantPeriod: DateTimeInterval,
dosage: Quantity,
frequency: Code,
route: Code,
Expand Down
4 changes: 2 additions & 2 deletions app/assets/javascripts/MedicationDispensed.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ const mongoose = require('mongoose/browser');
const { IdentifierSchema } = require('./attributes/Identifier');
const { DataElementSchema } = require('./basetypes/DataElement');
const Code = require('./basetypes/Code');
const Interval = require('./basetypes/Interval');
const DateTimeInterval = require('./basetypes/DateTimeInterval');
const Quantity = require('./basetypes/Quantity');
const DateTime = require('./basetypes/DateTime');
const QDMDate = require('./basetypes/QDMDate');
Expand All @@ -22,7 +22,7 @@ const [Number, String] = [
const MedicationDispensedSchema = DataElementSchema({
authorDatetime: DateTime,
relevantDatetime: DateTime,
relevantPeriod: Interval,
relevantPeriod: DateTimeInterval,
refills: Number,
dosage: Quantity,
supply: Quantity,
Expand Down
4 changes: 2 additions & 2 deletions app/assets/javascripts/MedicationOrder.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ const mongoose = require('mongoose/browser');
const { IdentifierSchema } = require('./attributes/Identifier');
const { DataElementSchema } = require('./basetypes/DataElement');
const Code = require('./basetypes/Code');
const Interval = require('./basetypes/Interval');
const DateTimeInterval = require('./basetypes/DateTimeInterval');
const Quantity = require('./basetypes/Quantity');
const DateTime = require('./basetypes/DateTime');
const QDMDate = require('./basetypes/QDMDate');
Expand All @@ -21,7 +21,7 @@ const [Number, String] = [

const MedicationOrderSchema = DataElementSchema({
authorDatetime: DateTime,
relevantPeriod: Interval,
relevantPeriod: DateTimeInterval,
refills: Number,
dosage: Quantity,
supply: Quantity,
Expand Down
4 changes: 2 additions & 2 deletions app/assets/javascripts/Participation.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ const mongoose = require('mongoose/browser');
const { IdentifierSchema } = require('./attributes/Identifier');
const { DataElementSchema } = require('./basetypes/DataElement');
const Code = require('./basetypes/Code');
const Interval = require('./basetypes/Interval');
const DateTimeInterval = require('./basetypes/DateTimeInterval');
const Quantity = require('./basetypes/Quantity');
const DateTime = require('./basetypes/DateTime');
const QDMDate = require('./basetypes/QDMDate');
Expand All @@ -20,7 +20,7 @@ const [Number, String] = [
];

const ParticipationSchema = DataElementSchema({
participationPeriod: Interval,
participationPeriod: DateTimeInterval,
qdmTitle: { type: String, default: 'Participation' },
hqmfOid: { type: String, default: '2.16.840.1.113883.10.20.28.4.130' },
qdmCategory: { type: String, default: 'participation' },
Expand Down
4 changes: 2 additions & 2 deletions app/assets/javascripts/PatientCharacteristicClinicalTrialParticipant.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ const mongoose = require('mongoose/browser');
const { IdentifierSchema } = require('./attributes/Identifier');
const { DataElementSchema } = require('./basetypes/DataElement');
const Code = require('./basetypes/Code');
const Interval = require('./basetypes/Interval');
const DateTimeInterval = require('./basetypes/DateTimeInterval');
const Quantity = require('./basetypes/Quantity');
const DateTime = require('./basetypes/DateTime');
const QDMDate = require('./basetypes/QDMDate');
Expand All @@ -21,7 +21,7 @@ const [Number, String] = [

const PatientCharacteristicClinicalTrialParticipantSchema = DataElementSchema({
reason: Code,
relevantPeriod: Interval,
relevantPeriod: DateTimeInterval,
qdmTitle: { type: String, default: 'Patient Characteristic Clinical Trial Participant' },
hqmfOid: { type: String, default: '2.16.840.1.113883.10.20.28.4.6' },
qrdaOid: { type: String, default: '2.16.840.1.113883.10.20.24.3.51' },
Expand Down
4 changes: 2 additions & 2 deletions app/assets/javascripts/PatientCharacteristicPayer.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ const mongoose = require('mongoose/browser');
const { IdentifierSchema } = require('./attributes/Identifier');
const { DataElementSchema } = require('./basetypes/DataElement');
const Code = require('./basetypes/Code');
const Interval = require('./basetypes/Interval');
const DateTimeInterval = require('./basetypes/DateTimeInterval');
const Quantity = require('./basetypes/Quantity');
const DateTime = require('./basetypes/DateTime');
const QDMDate = require('./basetypes/QDMDate');
Expand All @@ -20,7 +20,7 @@ const [Number, String] = [
];

const PatientCharacteristicPayerSchema = DataElementSchema({
relevantPeriod: Interval,
relevantPeriod: DateTimeInterval,
qdmTitle: { type: String, default: 'Patient Characteristic Payer' },
hqmfOid: { type: String, default: '2.16.840.1.113883.10.20.28.4.58' },
qdmCategory: { type: String, default: 'patient_characteristic' },
Expand Down
4 changes: 2 additions & 2 deletions app/assets/javascripts/PhysicalExamPerformed.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ const mongoose = require('mongoose/browser');
const { IdentifierSchema } = require('./attributes/Identifier');
const { DataElementSchema } = require('./basetypes/DataElement');
const Code = require('./basetypes/Code');
const Interval = require('./basetypes/Interval');
const DateTimeInterval = require('./basetypes/DateTimeInterval');
const Quantity = require('./basetypes/Quantity');
const DateTime = require('./basetypes/DateTime');
const QDMDate = require('./basetypes/QDMDate');
Expand All @@ -22,7 +22,7 @@ const [Number, String] = [
const PhysicalExamPerformedSchema = DataElementSchema({
authorDatetime: DateTime,
relevantDatetime: DateTime,
relevantPeriod: Interval,
relevantPeriod: DateTimeInterval,
reason: Code,
method: Code,
result: Any,
Expand Down
4 changes: 2 additions & 2 deletions app/assets/javascripts/ProcedurePerformed.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ const mongoose = require('mongoose/browser');
const { IdentifierSchema } = require('./attributes/Identifier');
const { DataElementSchema } = require('./basetypes/DataElement');
const Code = require('./basetypes/Code');
const Interval = require('./basetypes/Interval');
const DateTimeInterval = require('./basetypes/DateTimeInterval');
const Quantity = require('./basetypes/Quantity');
const DateTime = require('./basetypes/DateTime');
const QDMDate = require('./basetypes/QDMDate');
Expand All @@ -22,7 +22,7 @@ const [Number, String] = [
const ProcedurePerformedSchema = DataElementSchema({
authorDatetime: DateTime,
relevantDatetime: DateTime,
relevantPeriod: Interval,
relevantPeriod: DateTimeInterval,
reason: Code,
method: Code,
result: Any,
Expand Down
4 changes: 2 additions & 2 deletions app/assets/javascripts/SubstanceAdministered.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ const mongoose = require('mongoose/browser');
const { IdentifierSchema } = require('./attributes/Identifier');
const { DataElementSchema } = require('./basetypes/DataElement');
const Code = require('./basetypes/Code');
const Interval = require('./basetypes/Interval');
const DateTimeInterval = require('./basetypes/DateTimeInterval');
const Quantity = require('./basetypes/Quantity');
const DateTime = require('./basetypes/DateTime');
const QDMDate = require('./basetypes/QDMDate');
Expand All @@ -22,7 +22,7 @@ const [Number, String] = [
const SubstanceAdministeredSchema = DataElementSchema({
authorDatetime: DateTime,
relevantDatetime: DateTime,
relevantPeriod: Interval,
relevantPeriod: DateTimeInterval,
dosage: Quantity,
frequency: Code,
route: Code,
Expand Down
4 changes: 2 additions & 2 deletions app/assets/javascripts/SubstanceOrder.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ const mongoose = require('mongoose/browser');
const { IdentifierSchema } = require('./attributes/Identifier');
const { DataElementSchema } = require('./basetypes/DataElement');
const Code = require('./basetypes/Code');
const Interval = require('./basetypes/Interval');
const DateTimeInterval = require('./basetypes/DateTimeInterval');
const Quantity = require('./basetypes/Quantity');
const DateTime = require('./basetypes/DateTime');
const QDMDate = require('./basetypes/QDMDate');
Expand All @@ -21,7 +21,7 @@ const [Number, String] = [

const SubstanceOrderSchema = DataElementSchema({
authorDatetime: DateTime,
relevantPeriod: Interval,
relevantPeriod: DateTimeInterval,
reason: Code,
dosage: Quantity,
supply: Quantity,
Expand Down
4 changes: 2 additions & 2 deletions app/assets/javascripts/Symptom.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ const mongoose = require('mongoose/browser');
const { IdentifierSchema } = require('./attributes/Identifier');
const { DataElementSchema } = require('./basetypes/DataElement');
const Code = require('./basetypes/Code');
const Interval = require('./basetypes/Interval');
const DateTimeInterval = require('./basetypes/DateTimeInterval');
const Quantity = require('./basetypes/Quantity');
const DateTime = require('./basetypes/DateTime');
const QDMDate = require('./basetypes/QDMDate');
Expand All @@ -20,7 +20,7 @@ const [Number, String] = [
];

const SymptomSchema = DataElementSchema({
prevalencePeriod: Interval,
prevalencePeriod: DateTimeInterval,
severity: Code,
recorder: [AnyEntity],
qdmTitle: { type: String, default: 'Symptom' },
Expand Down
4 changes: 2 additions & 2 deletions app/assets/javascripts/attributes/FacilityLocation.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
const mongoose = require('mongoose/browser');

const Code = require('../basetypes/Code');
const Interval = require('../basetypes/Interval');
const DateTimeInterval = require('../basetypes/DateTimeInterval');
const Quantity = require('../basetypes/Quantity');
const DateTime = require('../basetypes/DateTime');
const QDMDate = require('../basetypes/QDMDate');
Expand All @@ -15,7 +15,7 @@ const [Number, String] = [

const FacilityLocationSchema = new mongoose.Schema({
code: Code,
locationPeriod: Interval,
locationPeriod: DateTimeInterval,
qdmVersion: { type: String, default: '5.6' },
_type: { type: String, default: 'QDM::FacilityLocation' },

Expand Down
Loading