From d23af018e7ada6d1c1f9e839788ed5e69d7f765c Mon Sep 17 00:00:00 2001 From: Jason Kulatunga Date: Sun, 3 Dec 2023 18:40:16 -0800 Subject: [PATCH] Timeline based Manual Entry form (#330) --- backend/pkg/database/gorm_common.go | 150 +++- .../database/gorm_repository_migrations.go | 30 +- backend/pkg/database/gorm_repository_test.go | 2 +- backend/pkg/database/interface.go | 13 +- backend/pkg/models/source_credential.go | 3 + backend/pkg/web/handler/background_jobs.go | 72 +- backend/pkg/web/handler/resource_fhir.go | 1 + backend/pkg/web/handler/resource_related.go | 95 +++ backend/pkg/web/handler/source.go | 87 ++- backend/pkg/web/server.go | 2 + frontend/package.json | 1 + frontend/src/app/app.component.ts | 15 +- frontend/src/app/app.module.ts | 4 + .../common/badge/badge.component.html | 0 .../common/badge/badge.component.scss | 0 .../common/badge/badge.component.spec.ts | 0 .../common/badge/badge.component.ts | 0 .../common/badge/badge.stories.ts | 2 +- .../common/table/table-row-item.spec.ts | 0 .../common/table/table-row-item.ts | 0 .../common/table/table.component.html | 0 .../common/table/table.component.scss | 0 .../common/table/table.component.spec.ts | 0 .../common/table/table.component.ts | 0 .../common/table/table.stories.ts | 2 +- .../binary-text/binary-text.component.html | 0 .../binary-text/binary-text.component.scss | 0 .../binary-text/binary-text.component.spec.ts | 0 .../binary-text/binary-text.component.ts | 0 .../binary-text/binary-text.stories.ts | 2 +- .../codable-concept.component.html | 0 .../codable-concept.component.scss | 0 .../codable-concept.component.spec.ts | 0 .../codable-concept.component.ts | 0 .../datatypes/coding/coding.component.html | 0 .../datatypes/coding/coding.component.scss | 0 .../datatypes/coding/coding.component.spec.ts | 0 .../datatypes/coding/coding.component.ts | 0 .../datatypes/dicom/dicom.component.html | 0 .../datatypes/dicom/dicom.component.scss | 0 .../datatypes/dicom/dicom.component.spec.ts | 0 .../datatypes/dicom/dicom.component.ts | 0 .../datatypes/dicom/dicom.stories.ts | 2 +- .../datatypes/html/html.component.html | 0 .../datatypes/html/html.component.scss | 0 .../datatypes/html/html.component.spec.ts | 0 .../datatypes/html/html.component.ts | 0 .../datatypes/html/html.stories.ts | 2 +- .../datatypes/img/img.component.html | 0 .../datatypes/img/img.component.scss | 0 .../datatypes/img/img.component.spec.ts | 0 .../datatypes/img/img.component.ts | 0 .../datatypes/img/img.stories.ts | 2 +- .../markdown/markdown.component.html | 0 .../markdown/markdown.component.scss | 0 .../markdown/markdown.component.spec.ts | 0 .../datatypes/markdown/markdown.component.ts | 0 .../datatypes/markdown/markdown.stories.ts | 45 ++ .../datatypes/pdf/pdf.component.html | 0 .../datatypes/pdf/pdf.component.scss | 0 .../datatypes/pdf/pdf.component.spec.ts | 0 .../datatypes/pdf/pdf.component.ts | 0 .../datatypes/pdf/pdf.stories.ts | 2 +- .../components/fhir-card/fhir-card.module.ts | 106 +++ .../fhir-card-component-interface.ts} | 3 +- .../fhir-card-outlet.directive.spec.ts} | 6 +- .../fhir-card/fhir-card-outlet.directive.ts} | 4 +- .../fhir-card/fhir-card.component.html | 1 + .../fhir-card/fhir-card.component.scss} | 0 .../fhir-card/fhir-card.component.spec.ts | 24 + .../fhir-card/fhir-card.component.ts} | 29 +- .../allergy-intolerance.component.html | 0 .../allergy-intolerance.component.scss | 0 .../allergy-intolerance.component.spec.ts | 0 .../allergy-intolerance.component.ts | 7 +- .../allergy-intolerance.stories.ts | 10 +- .../resources/binary/binary.component.html | 0 .../resources/binary/binary.component.scss | 0 .../resources/binary/binary.component.spec.ts | 0 .../resources/binary/binary.component.ts | 5 +- .../resources/binary/binary.stories.ts | 2 +- .../diagnostic-report.component.html | 0 .../diagnostic-report.component.scss | 0 .../diagnostic-report.component.spec.ts | 4 +- .../diagnostic-report.component.ts | 19 +- .../document-reference.component.html | 0 .../document-reference.component.scss | 0 .../document-reference.component.spec.ts | 5 +- .../document-reference.component.ts | 18 +- .../encounter/encounter.component.html | 19 + .../encounter/encounter.component.scss} | 0 .../encounter/encounter.component.spec.ts | 24 + .../encounter/encounter.component.ts | 50 ++ .../resources/encounter/encounter.stories.ts | 70 ++ .../fallback/fallback.component.html | 0 .../fallback/fallback.component.scss} | 0 .../fallback/fallback.component.spec.ts | 2 +- .../resources/fallback/fallback.component.ts | 10 +- .../immunization/immunization.component.html | 0 .../immunization/immunization.component.scss} | 0 .../immunization.component.spec.ts | 0 .../immunization/immunization.component.ts | 7 +- .../immunization/immunization.stories.ts | 2 +- .../location/location.component.html | 0 .../location/location.component.scss} | 0 .../location/location.component.spec.ts | 3 +- .../resources/location/location.component.ts | 6 +- .../resources/location/location.stories.ts | 59 ++ .../resources/media/media.component.html | 0 .../resources/media/media.component.scss} | 0 .../resources/media/media.component.spec.ts | 4 +- .../resources/media/media.component.ts | 17 +- .../medication-request.component.html | 0 .../medication-request.component.scss} | 0 .../medication-request.component.spec.ts | 0 .../medication-request.component.ts | 8 +- .../medication-request.stories.ts | 2 +- .../medication/medication.component.html | 0 .../medication/medication.component.scss} | 0 .../medication/medication.component.spec.ts | 0 .../medication/medication.component.ts | 7 +- .../medication/medication.stories.ts | 2 +- .../observation/observation.component.html | 0 .../observation/observation.component.scss} | 0 .../observation/observation.component.spec.ts | 3 +- .../observation/observation.component.ts | 13 +- .../observation/observation.stories.ts | 69 ++ .../organization/organization.component.html | 6 +- .../organization/organization.component.scss} | 0 .../organization.component.spec.ts | 3 +- .../organization/organization.component.ts | 2 +- .../organization/organization.stories.ts | 69 ++ .../practitioner/practitioner.component.html | 10 +- .../practitioner/practitioner.component.scss} | 0 .../practitioner.component.spec.ts | 0 .../practitioner/practitioner.component.ts | 13 +- .../practitioner/practitioner.stories.ts | 2 +- .../procedure/procedure.component.html | 0 .../procedure/procedure.component.scss} | 0 .../procedure/procedure.component.spec.ts | 0 .../procedure/procedure.component.ts | 7 +- .../resources/procedure/procedure.stories.ts | 2 +- .../datatable-adverse-event.component.ts | 15 + ...atatable-allergy-intolerance.component.ts} | 10 +- .../datatable-appointment.component.ts} | 10 +- .../datatable-binary.component.ts} | 10 +- .../datatable-care-plan.component.ts} | 10 +- .../datatable-care-team.component.ts} | 10 +- .../datatable-communication.component.ts} | 10 +- .../datatable-condition.component.ts} | 10 +- .../datatable-coverage.component.ts | 15 + .../datatable-device-request.component.ts} | 10 +- .../datatable-device.component.ts} | 10 +- .../datatable-diagnostic-report.component.ts} | 10 +- ...datatable-document-reference.component.ts} | 10 +- .../datatable-encounter.component.ts} | 10 +- ...atable-explanation-of-benefit.component.ts | 11 + .../datatable-fallback.component.html} | 8 - .../datatable-fallback.component.ts | 14 + .../datatable-generic-resource.component.html | 21 + ...datatable-generic-resource.component.scss} | 0 ...atable-generic-resource.component.spec.ts} | 12 +- .../datatable-generic-resource.component.ts} | 45 +- .../datatable-goal.component.ts | 15 + .../datatable-immunization.component.ts} | 10 +- .../datatable-location.component.ts} | 10 +- ...le-medication-administration.component.ts} | 10 +- ...datatable-medication-dispense.component.ts | 15 + ...datatable-medication-request.component.ts} | 10 +- .../datatable-medication.component.ts | 15 + .../datatable-nutrition-order.component.ts} | 10 +- .../datatable-observation.component.ts} | 10 +- .../datatable-organization.component.ts} | 10 +- .../datatable-practitioner.component.ts} | 10 +- .../datatable-procedure.component.ts} | 10 +- .../datatable-service-request.component.ts} | 10 +- .../datatable-generic-resource}/utils.ts | 3 + .../fhir-datatable/fhir-datatable.module.ts | 111 +++ .../fhir-datatable-outlet.directive.spec.ts} | 2 +- .../fhir-datatable-outlet.directive.ts} | 4 +- .../fhir-datatable.component.html | 25 + .../fhir-datatable.component.scss} | 0 .../fhir-datatable.component.spec.ts} | 16 +- .../fhir-datatable.component.ts | 182 +++++ .../list-patient/list-patient.component.html | 0 .../list-patient/list-patient.component.scss | 0 .../list-patient.component.spec.ts | 0 .../list-patient/list-patient.component.ts | 0 .../fhir-resource.component.html | 1 - .../fhir-resource.component.spec.ts | 24 - .../list-adverse-event.component.ts | 15 - .../list-coverage.component.ts | 15 - .../list-explanation-of-benefit.component.ts | 11 - .../list-fallback.component.ts | 14 - .../list-generic-resource.component.html | 32 - .../list-goal.component.ts | 15 - .../list-medication-dispense.component.ts | 15 - .../list-medication.component.ts | 15 - ...ecord-wizard-add-attachment.component.html | 40 ++ ...ecord-wizard-add-attachment.component.scss | 0 ...rd-wizard-add-attachment.component.spec.ts | 32 + ...-record-wizard-add-attachment.component.ts | 67 ++ ...al-record-wizard-add-attachment.stories.ts | 46 ++ ...record-wizard-add-encounter.component.html | 76 +++ ...record-wizard-add-encounter.component.scss | 0 ...ord-wizard-add-encounter.component.spec.ts | 31 + ...l-record-wizard-add-encounter.component.ts | 158 +++++ ...cal-record-wizard-add-encounter.stories.ts | 46 ++ ...ord-wizard-add-organization.component.html | 108 +++ ...ord-wizard-add-organization.component.scss | 0 ...-wizard-add-organization.component.spec.ts | 31 + ...ecord-wizard-add-organization.component.ts | 232 +++++++ ...-record-wizard-add-organization.stories.ts | 46 ++ ...ord-wizard-add-practitioner.component.html | 110 +++ ...ord-wizard-add-practitioner.component.scss | 0 ...-wizard-add-practitioner.component.spec.ts | 31 + ...ecord-wizard-add-practitioner.component.ts | 241 +++++++ ...-record-wizard-add-practitioner.stories.ts | 46 ++ .../medical-record-wizard.component.html | 428 ++++++++++++ .../medical-record-wizard.component.scss | 0 .../medical-record-wizard.component.spec.ts | 31 + .../medical-record-wizard.component.ts | 398 +++++++++++ .../medical-record-wizard.stories.ts | 46 ++ .../medical-record-wizard.utilities.ts | 443 ++++++++++++ .../medical-sources-card.component.ts | 2 + .../medical-sources-connected.component.html | 16 +- .../nlm-typeahead.component.spec.ts | 3 +- .../nlm-typeahead/nlm-typeahead.component.ts | 28 +- .../nlm-typeahead/nlm-typeahead.stories.ts | 169 +++++ .../report-header.component.html | 2 +- ...t-medical-history-condition.component.html | 12 +- ...ort-medical-history-condition.component.ts | 4 +- ...report-medical-history-editor.component.ts | 3 + ...tory-explanation-of-benefit.component.html | 12 +- ...istory-explanation-of-benefit.component.ts | 4 + ...ical-history-timeline-panel.component.html | 32 +- ...l-history-timeline-panel.component.spec.ts | 2 + ...edical-history-timeline-panel.component.ts | 22 +- .../resource-list.component.html | 3 - .../resource-list/resource-list.component.ts | 174 ----- frontend/src/app/components/shared.module.ts | 209 +----- .../src/app/models/fasten/resource_create.ts | 14 +- .../pages/dashboard/dashboard.component.ts | 2 +- .../medical-history.component.spec.ts | 3 +- .../medical-history.component.ts | 2 +- .../medical-sources.component.html | 2 +- .../patient-profile.component.html | 4 +- .../report-labs/report-labs.component.html | 2 +- .../resource-creator.component.html | 642 ------------------ .../resource-creator.component.ts | 460 +------------ .../resource-creator.utilities.ts | 534 --------------- .../resource-detail.component.html | 2 +- .../source-detail.component.html | 10 +- .../source-detail/source-detail.component.ts | 2 +- .../src/app/pipes/human-name.pipe.spec.ts | 8 + frontend/src/app/pipes/human-name.pipe.ts | 36 + frontend/src/app/pipes/pipes.module.ts | 8 +- .../src/app/pipes/reference-uri.pipe.spec.ts | 8 + frontend/src/app/pipes/reference-uri.pipe.ts | 18 + .../src/app/services/fasten-api.service.ts | 28 +- .../nlm-clinical-table-search.service.ts | 93 +++ frontend/src/assets/scss/custom/_modal.scss | 2 +- frontend/src/assets/scss/custom/_nav.scss | 488 ++++++------- frontend/src/assets/sources/fasten.png | Bin 0 -> 7083 bytes frontend/src/custom.scss | 55 ++ .../r4/resources/binary/exampleMarkdown.json | 9 + .../r4/resources/binary/exampleRtf.json | 9 + .../resources/diagnosticReport/example1.json | 30 +- .../models/datatypes/codable-concept-model.ts | 2 +- .../lib/models/datatypes/human-name-model.ts | 2 +- frontend/src/lib/models/factory.ts | 7 +- .../resources/diagnostic-report-model.spec.ts | 15 +- .../resources/diagnostic-report-model.ts | 2 +- .../models/resources/encounter-model.spec.ts | 9 +- .../models/resources/organization-model.ts | 5 +- .../models/resources/practitioner-model.ts | 6 +- frontend/src/lib/utils/bundle_references.ts | 43 ++ frontend/yarn.lock | 5 + go.mod | 13 +- go.sum | 26 +- 280 files changed, 5336 insertions(+), 2828 deletions(-) create mode 100644 backend/pkg/web/handler/resource_related.go rename frontend/src/app/components/{fhir => fhir-card}/common/badge/badge.component.html (100%) rename frontend/src/app/components/{fhir => fhir-card}/common/badge/badge.component.scss (100%) rename frontend/src/app/components/{fhir => fhir-card}/common/badge/badge.component.spec.ts (100%) rename frontend/src/app/components/{fhir => fhir-card}/common/badge/badge.component.ts (100%) rename frontend/src/app/components/{fhir => fhir-card}/common/badge/badge.stories.ts (96%) rename frontend/src/app/components/{fhir => fhir-card}/common/table/table-row-item.spec.ts (100%) rename frontend/src/app/components/{fhir => fhir-card}/common/table/table-row-item.ts (100%) rename frontend/src/app/components/{fhir => fhir-card}/common/table/table.component.html (100%) rename frontend/src/app/components/{fhir => fhir-card}/common/table/table.component.scss (100%) rename frontend/src/app/components/{fhir => fhir-card}/common/table/table.component.spec.ts (100%) rename frontend/src/app/components/{fhir => fhir-card}/common/table/table.component.ts (100%) rename frontend/src/app/components/{fhir => fhir-card}/common/table/table.stories.ts (98%) rename frontend/src/app/components/{fhir => fhir-card}/datatypes/binary-text/binary-text.component.html (100%) rename frontend/src/app/components/{fhir => fhir-card}/datatypes/binary-text/binary-text.component.scss (100%) rename frontend/src/app/components/{fhir => fhir-card}/datatypes/binary-text/binary-text.component.spec.ts (100%) rename frontend/src/app/components/{fhir => fhir-card}/datatypes/binary-text/binary-text.component.ts (100%) rename frontend/src/app/components/{fhir => fhir-card}/datatypes/binary-text/binary-text.stories.ts (96%) rename frontend/src/app/components/{fhir => fhir-card}/datatypes/codable-concept/codable-concept.component.html (100%) rename frontend/src/app/components/{fhir => fhir-card}/datatypes/codable-concept/codable-concept.component.scss (100%) rename frontend/src/app/components/{fhir => fhir-card}/datatypes/codable-concept/codable-concept.component.spec.ts (100%) rename frontend/src/app/components/{fhir => fhir-card}/datatypes/codable-concept/codable-concept.component.ts (100%) rename frontend/src/app/components/{fhir => fhir-card}/datatypes/coding/coding.component.html (100%) rename frontend/src/app/components/{fhir => fhir-card}/datatypes/coding/coding.component.scss (100%) rename frontend/src/app/components/{fhir => fhir-card}/datatypes/coding/coding.component.spec.ts (100%) rename frontend/src/app/components/{fhir => fhir-card}/datatypes/coding/coding.component.ts (100%) rename frontend/src/app/components/{fhir => fhir-card}/datatypes/dicom/dicom.component.html (100%) rename frontend/src/app/components/{fhir => fhir-card}/datatypes/dicom/dicom.component.scss (100%) rename frontend/src/app/components/{fhir => fhir-card}/datatypes/dicom/dicom.component.spec.ts (100%) rename frontend/src/app/components/{fhir => fhir-card}/datatypes/dicom/dicom.component.ts (100%) rename frontend/src/app/components/{fhir => fhir-card}/datatypes/dicom/dicom.stories.ts (97%) rename frontend/src/app/components/{fhir => fhir-card}/datatypes/html/html.component.html (100%) rename frontend/src/app/components/{fhir => fhir-card}/datatypes/html/html.component.scss (100%) rename frontend/src/app/components/{fhir => fhir-card}/datatypes/html/html.component.spec.ts (100%) rename frontend/src/app/components/{fhir => fhir-card}/datatypes/html/html.component.ts (100%) rename frontend/src/app/components/{fhir => fhir-card}/datatypes/html/html.stories.ts (97%) rename frontend/src/app/components/{fhir => fhir-card}/datatypes/img/img.component.html (100%) rename frontend/src/app/components/{fhir => fhir-card}/datatypes/img/img.component.scss (100%) rename frontend/src/app/components/{fhir => fhir-card}/datatypes/img/img.component.spec.ts (100%) rename frontend/src/app/components/{fhir => fhir-card}/datatypes/img/img.component.ts (100%) rename frontend/src/app/components/{fhir => fhir-card}/datatypes/img/img.stories.ts (97%) rename frontend/src/app/components/{fhir => fhir-card}/datatypes/markdown/markdown.component.html (100%) rename frontend/src/app/components/{fhir => fhir-card}/datatypes/markdown/markdown.component.scss (100%) rename frontend/src/app/components/{fhir => fhir-card}/datatypes/markdown/markdown.component.spec.ts (100%) rename frontend/src/app/components/{fhir => fhir-card}/datatypes/markdown/markdown.component.ts (100%) create mode 100644 frontend/src/app/components/fhir-card/datatypes/markdown/markdown.stories.ts rename frontend/src/app/components/{fhir => fhir-card}/datatypes/pdf/pdf.component.html (100%) rename frontend/src/app/components/{fhir => fhir-card}/datatypes/pdf/pdf.component.scss (100%) rename frontend/src/app/components/{fhir => fhir-card}/datatypes/pdf/pdf.component.spec.ts (100%) rename frontend/src/app/components/{fhir => fhir-card}/datatypes/pdf/pdf.component.ts (100%) rename frontend/src/app/components/{fhir => fhir-card}/datatypes/pdf/pdf.stories.ts (97%) create mode 100644 frontend/src/app/components/fhir-card/fhir-card.module.ts rename frontend/src/app/components/{fhir/fhir-resource/fhir-resource-component-interface.ts => fhir-card/fhir-card/fhir-card-component-interface.ts} (84%) rename frontend/src/app/components/{fhir/fhir-resource/fhir-resource-outlet.directive.spec.ts => fhir-card/fhir-card/fhir-card-outlet.directive.spec.ts} (94%) rename frontend/src/app/components/{resource-list/resource-list-outlet.directive.ts => fhir-card/fhir-card/fhir-card-outlet.directive.ts} (64%) create mode 100644 frontend/src/app/components/fhir-card/fhir-card/fhir-card.component.html rename frontend/src/app/components/{fhir/fhir-resource/fhir-resource.component.scss => fhir-card/fhir-card/fhir-card.component.scss} (100%) create mode 100644 frontend/src/app/components/fhir-card/fhir-card/fhir-card.component.spec.ts rename frontend/src/app/components/{fhir/fhir-resource/fhir-resource.component.ts => fhir-card/fhir-card/fhir-card.component.ts} (85%) rename frontend/src/app/components/{fhir => fhir-card}/resources/allergy-intolerance/allergy-intolerance.component.html (100%) rename frontend/src/app/components/{fhir => fhir-card}/resources/allergy-intolerance/allergy-intolerance.component.scss (100%) rename frontend/src/app/components/{fhir => fhir-card}/resources/allergy-intolerance/allergy-intolerance.component.spec.ts (100%) rename frontend/src/app/components/{fhir => fhir-card}/resources/allergy-intolerance/allergy-intolerance.component.ts (94%) rename frontend/src/app/components/{fhir => fhir-card}/resources/allergy-intolerance/allergy-intolerance.stories.ts (89%) rename frontend/src/app/components/{fhir => fhir-card}/resources/binary/binary.component.html (100%) rename frontend/src/app/components/{fhir => fhir-card}/resources/binary/binary.component.scss (100%) rename frontend/src/app/components/{fhir => fhir-card}/resources/binary/binary.component.spec.ts (100%) rename frontend/src/app/components/{fhir => fhir-card}/resources/binary/binary.component.ts (92%) rename frontend/src/app/components/{fhir => fhir-card}/resources/binary/binary.stories.ts (99%) rename frontend/src/app/components/{fhir => fhir-card}/resources/diagnostic-report/diagnostic-report.component.html (100%) rename frontend/src/app/components/{fhir => fhir-card}/resources/diagnostic-report/diagnostic-report.component.scss (100%) rename frontend/src/app/components/{fhir => fhir-card}/resources/diagnostic-report/diagnostic-report.component.spec.ts (82%) rename frontend/src/app/components/{fhir => fhir-card}/resources/diagnostic-report/diagnostic-report.component.ts (69%) rename frontend/src/app/components/{fhir => fhir-card}/resources/document-reference/document-reference.component.html (100%) rename frontend/src/app/components/{fhir => fhir-card}/resources/document-reference/document-reference.component.scss (100%) rename frontend/src/app/components/{fhir => fhir-card}/resources/document-reference/document-reference.component.spec.ts (80%) rename frontend/src/app/components/{fhir => fhir-card}/resources/document-reference/document-reference.component.ts (64%) create mode 100644 frontend/src/app/components/fhir-card/resources/encounter/encounter.component.html rename frontend/src/app/components/{fhir/resources/fallback/fallback.component.scss => fhir-card/resources/encounter/encounter.component.scss} (100%) create mode 100644 frontend/src/app/components/fhir-card/resources/encounter/encounter.component.spec.ts create mode 100644 frontend/src/app/components/fhir-card/resources/encounter/encounter.component.ts create mode 100644 frontend/src/app/components/fhir-card/resources/encounter/encounter.stories.ts rename frontend/src/app/components/{fhir => fhir-card}/resources/fallback/fallback.component.html (100%) rename frontend/src/app/components/{fhir/resources/immunization/immunization.component.scss => fhir-card/resources/fallback/fallback.component.scss} (100%) rename frontend/src/app/components/{fhir => fhir-card}/resources/fallback/fallback.component.spec.ts (93%) rename frontend/src/app/components/{fhir => fhir-card}/resources/fallback/fallback.component.ts (55%) rename frontend/src/app/components/{fhir => fhir-card}/resources/immunization/immunization.component.html (100%) rename frontend/src/app/components/{fhir/resources/location/location.component.scss => fhir-card/resources/immunization/immunization.component.scss} (100%) rename frontend/src/app/components/{fhir => fhir-card}/resources/immunization/immunization.component.spec.ts (100%) rename frontend/src/app/components/{fhir => fhir-card}/resources/immunization/immunization.component.ts (92%) rename frontend/src/app/components/{fhir => fhir-card}/resources/immunization/immunization.stories.ts (98%) rename frontend/src/app/components/{fhir => fhir-card}/resources/location/location.component.html (100%) rename frontend/src/app/components/{fhir/resources/media/media.component.scss => fhir-card/resources/location/location.component.scss} (100%) rename frontend/src/app/components/{fhir => fhir-card}/resources/location/location.component.spec.ts (82%) rename frontend/src/app/components/{fhir => fhir-card}/resources/location/location.component.ts (92%) create mode 100644 frontend/src/app/components/fhir-card/resources/location/location.stories.ts rename frontend/src/app/components/{fhir => fhir-card}/resources/media/media.component.html (100%) rename frontend/src/app/components/{fhir/resources/medication-request/medication-request.component.scss => fhir-card/resources/media/media.component.scss} (100%) rename frontend/src/app/components/{fhir => fhir-card}/resources/media/media.component.spec.ts (87%) rename frontend/src/app/components/{fhir => fhir-card}/resources/media/media.component.ts (63%) rename frontend/src/app/components/{fhir => fhir-card}/resources/medication-request/medication-request.component.html (100%) rename frontend/src/app/components/{fhir/resources/medication/medication.component.scss => fhir-card/resources/medication-request/medication-request.component.scss} (100%) rename frontend/src/app/components/{fhir => fhir-card}/resources/medication-request/medication-request.component.spec.ts (100%) rename frontend/src/app/components/{fhir => fhir-card}/resources/medication-request/medication-request.component.ts (92%) rename frontend/src/app/components/{fhir => fhir-card}/resources/medication-request/medication-request.stories.ts (98%) rename frontend/src/app/components/{fhir => fhir-card}/resources/medication/medication.component.html (100%) rename frontend/src/app/components/{fhir/resources/observation/observation.component.scss => fhir-card/resources/medication/medication.component.scss} (100%) rename frontend/src/app/components/{fhir => fhir-card}/resources/medication/medication.component.spec.ts (100%) rename frontend/src/app/components/{fhir => fhir-card}/resources/medication/medication.component.ts (92%) rename frontend/src/app/components/{fhir => fhir-card}/resources/medication/medication.stories.ts (98%) rename frontend/src/app/components/{fhir => fhir-card}/resources/observation/observation.component.html (100%) rename frontend/src/app/components/{fhir/resources/organization/organization.component.scss => fhir-card/resources/observation/observation.component.scss} (100%) rename frontend/src/app/components/{fhir => fhir-card}/resources/observation/observation.component.spec.ts (82%) rename frontend/src/app/components/{fhir => fhir-card}/resources/observation/observation.component.ts (88%) create mode 100644 frontend/src/app/components/fhir-card/resources/observation/observation.stories.ts rename frontend/src/app/components/{fhir => fhir-card}/resources/organization/organization.component.html (79%) rename frontend/src/app/components/{fhir/resources/practitioner/practitioner.component.scss => fhir-card/resources/organization/organization.component.scss} (100%) rename frontend/src/app/components/{fhir => fhir-card}/resources/organization/organization.component.spec.ts (82%) rename frontend/src/app/components/{fhir => fhir-card}/resources/organization/organization.component.ts (98%) create mode 100644 frontend/src/app/components/fhir-card/resources/organization/organization.stories.ts rename frontend/src/app/components/{fhir => fhir-card}/resources/practitioner/practitioner.component.html (72%) rename frontend/src/app/components/{fhir/resources/procedure/procedure.component.scss => fhir-card/resources/practitioner/practitioner.component.scss} (100%) rename frontend/src/app/components/{fhir => fhir-card}/resources/practitioner/practitioner.component.spec.ts (100%) rename frontend/src/app/components/{fhir => fhir-card}/resources/practitioner/practitioner.component.ts (88%) rename frontend/src/app/components/{fhir => fhir-card}/resources/practitioner/practitioner.stories.ts (98%) rename frontend/src/app/components/{fhir => fhir-card}/resources/procedure/procedure.component.html (100%) rename frontend/src/app/components/{list-generic-resource/list-generic-resource.component.scss => fhir-card/resources/procedure/procedure.component.scss} (100%) rename frontend/src/app/components/{fhir => fhir-card}/resources/procedure/procedure.component.spec.ts (100%) rename frontend/src/app/components/{fhir => fhir-card}/resources/procedure/procedure.component.ts (93%) rename frontend/src/app/components/{fhir => fhir-card}/resources/procedure/procedure.stories.ts (98%) create mode 100644 frontend/src/app/components/fhir-datatable/datatable-generic-resource/datatable-adverse-event.component.ts rename frontend/src/app/components/{list-generic-resource/list-allergy-intolerance.component.ts => fhir-datatable/datatable-generic-resource/datatable-allergy-intolerance.component.ts} (66%) rename frontend/src/app/components/{list-generic-resource/list-appointment.component.ts => fhir-datatable/datatable-generic-resource/datatable-appointment.component.ts} (56%) rename frontend/src/app/components/{list-generic-resource/list-binary.component.ts => fhir-datatable/datatable-generic-resource/datatable-binary.component.ts} (55%) rename frontend/src/app/components/{list-generic-resource/list-care-plan.component.ts => fhir-datatable/datatable-generic-resource/datatable-care-plan.component.ts} (64%) rename frontend/src/app/components/{list-generic-resource/list-care-team.component.ts => fhir-datatable/datatable-generic-resource/datatable-care-team.component.ts} (55%) rename frontend/src/app/components/{list-generic-resource/list-communication.component.ts => fhir-datatable/datatable-generic-resource/datatable-communication.component.ts} (56%) rename frontend/src/app/components/{list-generic-resource/list-condition.component.ts => fhir-datatable/datatable-generic-resource/datatable-condition.component.ts} (65%) create mode 100644 frontend/src/app/components/fhir-datatable/datatable-generic-resource/datatable-coverage.component.ts rename frontend/src/app/components/{list-generic-resource/list-device-request.component.ts => fhir-datatable/datatable-generic-resource/datatable-device-request.component.ts} (60%) rename frontend/src/app/components/{list-generic-resource/list-device.component.ts => fhir-datatable/datatable-generic-resource/datatable-device.component.ts} (63%) rename frontend/src/app/components/{list-generic-resource/list-diagnostic-report.component.ts => fhir-datatable/datatable-generic-resource/datatable-diagnostic-report.component.ts} (57%) rename frontend/src/app/components/{list-generic-resource/list-document-reference.component.ts => fhir-datatable/datatable-generic-resource/datatable-document-reference.component.ts} (61%) rename frontend/src/app/components/{list-generic-resource/list-encounter.component.ts => fhir-datatable/datatable-generic-resource/datatable-encounter.component.ts} (62%) create mode 100644 frontend/src/app/components/fhir-datatable/datatable-generic-resource/datatable-explanation-of-benefit.component.ts rename frontend/src/app/components/{list-generic-resource/list-fallback.component.html => fhir-datatable/datatable-generic-resource/datatable-fallback.component.html} (56%) create mode 100644 frontend/src/app/components/fhir-datatable/datatable-generic-resource/datatable-fallback.component.ts create mode 100644 frontend/src/app/components/fhir-datatable/datatable-generic-resource/datatable-generic-resource.component.html rename frontend/src/app/components/{list-patient/list-patient.component.scss => fhir-datatable/datatable-generic-resource/datatable-generic-resource.component.scss} (100%) rename frontend/src/app/components/{list-generic-resource/list-generic-resource.component.spec.ts => fhir-datatable/datatable-generic-resource/datatable-generic-resource.component.spec.ts} (61%) rename frontend/src/app/components/{list-generic-resource/list-generic-resource.component.ts => fhir-datatable/datatable-generic-resource/datatable-generic-resource.component.ts} (71%) create mode 100644 frontend/src/app/components/fhir-datatable/datatable-generic-resource/datatable-goal.component.ts rename frontend/src/app/components/{list-generic-resource/list-immunization.component.ts => fhir-datatable/datatable-generic-resource/datatable-immunization.component.ts} (57%) rename frontend/src/app/components/{list-generic-resource/list-location.component.ts => fhir-datatable/datatable-generic-resource/datatable-location.component.ts} (57%) rename frontend/src/app/components/{list-generic-resource/list-medication-administration.component.ts => fhir-datatable/datatable-generic-resource/datatable-medication-administration.component.ts} (64%) create mode 100644 frontend/src/app/components/fhir-datatable/datatable-generic-resource/datatable-medication-dispense.component.ts rename frontend/src/app/components/{list-generic-resource/list-medication-request.component.ts => fhir-datatable/datatable-generic-resource/datatable-medication-request.component.ts} (69%) create mode 100644 frontend/src/app/components/fhir-datatable/datatable-generic-resource/datatable-medication.component.ts rename frontend/src/app/components/{list-generic-resource/list-nutrition-order.component.ts => fhir-datatable/datatable-generic-resource/datatable-nutrition-order.component.ts} (58%) rename frontend/src/app/components/{list-generic-resource/list-observation.component.ts => fhir-datatable/datatable-generic-resource/datatable-observation.component.ts} (63%) rename frontend/src/app/components/{list-generic-resource/list-organization.component.ts => fhir-datatable/datatable-generic-resource/datatable-organization.component.ts} (52%) rename frontend/src/app/components/{list-generic-resource/list-practitioner.component.ts => fhir-datatable/datatable-generic-resource/datatable-practitioner.component.ts} (53%) rename frontend/src/app/components/{list-generic-resource/list-procedure.component.ts => fhir-datatable/datatable-generic-resource/datatable-procedure.component.ts} (67%) rename frontend/src/app/components/{list-generic-resource/list-service-request.component.ts => fhir-datatable/datatable-generic-resource/datatable-service-request.component.ts} (73%) rename frontend/src/app/components/{list-generic-resource => fhir-datatable/datatable-generic-resource}/utils.ts (98%) create mode 100644 frontend/src/app/components/fhir-datatable/fhir-datatable.module.ts rename frontend/src/app/components/{resource-list/resource-list-outlet.directive.spec.ts => fhir-datatable/fhir-datatable/fhir-datatable-outlet.directive.spec.ts} (72%) rename frontend/src/app/components/{fhir/fhir-resource/fhir-resource-outlet.directive.ts => fhir-datatable/fhir-datatable/fhir-datatable-outlet.directive.ts} (63%) create mode 100644 frontend/src/app/components/fhir-datatable/fhir-datatable/fhir-datatable.component.html rename frontend/src/app/components/{resource-list/resource-list.component.scss => fhir-datatable/fhir-datatable/fhir-datatable.component.scss} (100%) rename frontend/src/app/components/{resource-list/resource-list.component.spec.ts => fhir-datatable/fhir-datatable/fhir-datatable.component.spec.ts} (56%) create mode 100644 frontend/src/app/components/fhir-datatable/fhir-datatable/fhir-datatable.component.ts rename frontend/src/app/components/{ => fhir-datatable}/list-patient/list-patient.component.html (100%) create mode 100644 frontend/src/app/components/fhir-datatable/list-patient/list-patient.component.scss rename frontend/src/app/components/{ => fhir-datatable}/list-patient/list-patient.component.spec.ts (100%) rename frontend/src/app/components/{ => fhir-datatable}/list-patient/list-patient.component.ts (100%) delete mode 100644 frontend/src/app/components/fhir/fhir-resource/fhir-resource.component.html delete mode 100644 frontend/src/app/components/fhir/fhir-resource/fhir-resource.component.spec.ts delete mode 100644 frontend/src/app/components/list-generic-resource/list-adverse-event.component.ts delete mode 100644 frontend/src/app/components/list-generic-resource/list-coverage.component.ts delete mode 100644 frontend/src/app/components/list-generic-resource/list-explanation-of-benefit.component.ts delete mode 100644 frontend/src/app/components/list-generic-resource/list-fallback.component.ts delete mode 100644 frontend/src/app/components/list-generic-resource/list-generic-resource.component.html delete mode 100644 frontend/src/app/components/list-generic-resource/list-goal.component.ts delete mode 100644 frontend/src/app/components/list-generic-resource/list-medication-dispense.component.ts delete mode 100644 frontend/src/app/components/list-generic-resource/list-medication.component.ts create mode 100644 frontend/src/app/components/medical-record-wizard-add-attachment/medical-record-wizard-add-attachment.component.html create mode 100644 frontend/src/app/components/medical-record-wizard-add-attachment/medical-record-wizard-add-attachment.component.scss create mode 100644 frontend/src/app/components/medical-record-wizard-add-attachment/medical-record-wizard-add-attachment.component.spec.ts create mode 100644 frontend/src/app/components/medical-record-wizard-add-attachment/medical-record-wizard-add-attachment.component.ts create mode 100644 frontend/src/app/components/medical-record-wizard-add-attachment/medical-record-wizard-add-attachment.stories.ts create mode 100644 frontend/src/app/components/medical-record-wizard-add-encounter/medical-record-wizard-add-encounter.component.html create mode 100644 frontend/src/app/components/medical-record-wizard-add-encounter/medical-record-wizard-add-encounter.component.scss create mode 100644 frontend/src/app/components/medical-record-wizard-add-encounter/medical-record-wizard-add-encounter.component.spec.ts create mode 100644 frontend/src/app/components/medical-record-wizard-add-encounter/medical-record-wizard-add-encounter.component.ts create mode 100644 frontend/src/app/components/medical-record-wizard-add-encounter/medical-record-wizard-add-encounter.stories.ts create mode 100644 frontend/src/app/components/medical-record-wizard-add-organization/medical-record-wizard-add-organization.component.html create mode 100644 frontend/src/app/components/medical-record-wizard-add-organization/medical-record-wizard-add-organization.component.scss create mode 100644 frontend/src/app/components/medical-record-wizard-add-organization/medical-record-wizard-add-organization.component.spec.ts create mode 100644 frontend/src/app/components/medical-record-wizard-add-organization/medical-record-wizard-add-organization.component.ts create mode 100644 frontend/src/app/components/medical-record-wizard-add-organization/medical-record-wizard-add-organization.stories.ts create mode 100644 frontend/src/app/components/medical-record-wizard-add-practitioner/medical-record-wizard-add-practitioner.component.html create mode 100644 frontend/src/app/components/medical-record-wizard-add-practitioner/medical-record-wizard-add-practitioner.component.scss create mode 100644 frontend/src/app/components/medical-record-wizard-add-practitioner/medical-record-wizard-add-practitioner.component.spec.ts create mode 100644 frontend/src/app/components/medical-record-wizard-add-practitioner/medical-record-wizard-add-practitioner.component.ts create mode 100644 frontend/src/app/components/medical-record-wizard-add-practitioner/medical-record-wizard-add-practitioner.stories.ts create mode 100644 frontend/src/app/components/medical-record-wizard/medical-record-wizard.component.html create mode 100644 frontend/src/app/components/medical-record-wizard/medical-record-wizard.component.scss create mode 100644 frontend/src/app/components/medical-record-wizard/medical-record-wizard.component.spec.ts create mode 100644 frontend/src/app/components/medical-record-wizard/medical-record-wizard.component.ts create mode 100644 frontend/src/app/components/medical-record-wizard/medical-record-wizard.stories.ts create mode 100644 frontend/src/app/components/medical-record-wizard/medical-record-wizard.utilities.ts create mode 100644 frontend/src/app/components/nlm-typeahead/nlm-typeahead.stories.ts delete mode 100644 frontend/src/app/components/resource-list/resource-list.component.html delete mode 100644 frontend/src/app/components/resource-list/resource-list.component.ts delete mode 100644 frontend/src/app/pages/resource-creator/resource-creator.utilities.ts create mode 100644 frontend/src/app/pipes/human-name.pipe.spec.ts create mode 100644 frontend/src/app/pipes/human-name.pipe.ts create mode 100644 frontend/src/app/pipes/reference-uri.pipe.spec.ts create mode 100644 frontend/src/app/pipes/reference-uri.pipe.ts create mode 100644 frontend/src/assets/sources/fasten.png create mode 100644 frontend/src/lib/fixtures/r4/resources/binary/exampleMarkdown.json create mode 100644 frontend/src/lib/fixtures/r4/resources/binary/exampleRtf.json create mode 100644 frontend/src/lib/utils/bundle_references.ts diff --git a/backend/pkg/database/gorm_common.go b/backend/pkg/database/gorm_common.go index 0c6d9ca1..e6d7a8d1 100644 --- a/backend/pkg/database/gorm_common.go +++ b/backend/pkg/database/gorm_common.go @@ -5,6 +5,7 @@ import ( "encoding/json" "errors" "fmt" + sourcePkg "github.com/fastenhealth/fasten-sources/pkg" "strings" "time" @@ -39,6 +40,7 @@ func (gr *GormRepository) Close() error { // User //////////////////////////////////////////////////////////////////////////////////////////////////////////////////// +// func (gr *GormRepository) CreateUser(ctx context.Context, user *models.User) error { if err := user.HashPassword(user.Password); err != nil { return err @@ -53,6 +55,17 @@ func (gr *GormRepository) CreateUser(ctx context.Context, user *models.User) err if err != nil { return err } + + //create Fasten source credential for this user. + fastenUserCred := models.SourceCredential{ + UserID: user.ID, + SourceType: sourcePkg.SourceTypeFasten, + } + fastenUserCredResp := gr.GormClient.Create(&fastenUserCred) + if fastenUserCredResp.Error != nil { + return fastenUserCredResp.Error + } + return nil } func (gr *GormRepository) GetUserByUsername(ctx context.Context, username string) (*models.User, error) { @@ -94,10 +107,13 @@ func (gr *GormRepository) GetCurrentUser(ctx context.Context) (*models.User, err return ¤tUser, nil } +// + //////////////////////////////////////////////////////////////////////////////////////////////////////////////////// // Glossary //////////////////////////////////////////////////////////////////////////////////////////////////////////////////// +// func (gr *GormRepository) CreateGlossaryEntry(ctx context.Context, glossaryEntry *models.Glossary) error { record := gr.GormClient.WithContext(ctx).Create(glossaryEntry) if record.Error != nil { @@ -114,6 +130,8 @@ func (gr *GormRepository) GetGlossaryEntry(ctx context.Context, code string, cod return &foundGlossaryEntry, result.Error } +// + //////////////////////////////////////////////////////////////////////////////////////////////////////////////////// // Summary //////////////////////////////////////////////////////////////////////////////////////////////////////////////////// @@ -180,6 +198,8 @@ func (gr *GormRepository) GetSummary(ctx context.Context) (*models.Summary, erro // Resource //////////////////////////////////////////////////////////////////////////////////////////////////////////////////// +// + // This function will create a new resource if it does not exist, or update an existing resource if it does exist. // It will also create associations between fhir resources // This function is called directly by fasten-sources @@ -210,30 +230,54 @@ func (gr *GormRepository) UpsertRawResource(ctx context.Context, sourceCredentia //note: these associations are not reciprocal, (i.e. if Procedure references Location, Location may not reference Procedure) if rawResource.ReferencedResources != nil && len(rawResource.ReferencedResources) > 0 { for _, referencedResource := range rawResource.ReferencedResources { - parts := strings.Split(referencedResource, "/") - if len(parts) != 2 { - continue - } - relatedResource := &models.ResourceBase{ - OriginBase: models.OriginBase{ - SourceID: source.ID, - SourceResourceType: parts[0], - SourceResourceID: parts[1], - }, - RelatedResource: nil, - } - err := gr.AddResourceAssociation( - ctx, - source, - wrappedResourceModel.SourceResourceType, - wrappedResourceModel.SourceResourceID, - source, - relatedResource.SourceResourceType, - relatedResource.SourceResourceID, - ) - if err != nil { - return false, err + var relatedResource *models.ResourceBase + + if strings.HasPrefix(referencedResource, sourcePkg.FASTENHEALTH_URN_PREFIX) { + gr.Logger.Infof("parsing external urn:fastenhealth-fhir reference: %v", referencedResource) + + targetSourceId, targetResourceType, targetResourceId, err := sourcePkg.ParseReferenceUri(&referencedResource) + if err != nil { + gr.Logger.Warnf("could not parse urn:fastenhealth-fhir reference: %v", referencedResource) + continue + } + err = gr.UpsertRawResourceAssociation( + ctx, + source.ID.String(), + wrappedResourceModel.SourceResourceType, + wrappedResourceModel.SourceResourceID, + targetSourceId, + targetResourceType, + targetResourceId, + ) + if err != nil { + return false, err + } + } else { + parts := strings.Split(referencedResource, "/") + if len(parts) != 2 { + continue + } + relatedResource = &models.ResourceBase{ + OriginBase: models.OriginBase{ + SourceID: source.ID, + SourceResourceType: parts[0], + SourceResourceID: parts[1], + }, + RelatedResource: nil, + } + err := gr.AddResourceAssociation( + ctx, + source, + wrappedResourceModel.SourceResourceType, + wrappedResourceModel.SourceResourceID, + source, + relatedResource.SourceResourceType, + relatedResource.SourceResourceID, + ) + if err != nil { + return false, err + } } } } @@ -242,6 +286,44 @@ func (gr *GormRepository) UpsertRawResource(ctx context.Context, sourceCredentia } +func (gr *GormRepository) UpsertRawResourceAssociation( + ctx context.Context, + sourceId string, + sourceResourceType string, + sourceResourceId string, + targetSourceId string, + targetResourceType string, + targetResourceId string, +) error { + + if sourceId == targetSourceId && sourceResourceType == targetResourceType && sourceResourceId == targetResourceId { + gr.Logger.Warnf("cannot create self-referential association, ignoring") + return nil + } + var sourceCredential *models.SourceCredential + var targetSourceCredential *models.SourceCredential + var err error + if sourceId == targetSourceId { + sourceCredential, err = gr.GetSource(ctx, sourceId) + if err != nil { + return err + } + targetSourceCredential = sourceCredential + } else { + sourceCredential, err = gr.GetSource(ctx, sourceId) + if err != nil { + return err + } + targetSourceCredential, err = gr.GetSource(ctx, targetSourceId) + if err != nil { + return err + } + } + + //SECURITY: sourceCredential and targetSourceCredential are guaranteed to be owned by the same user, and will be confirmed within the addAssociation function + return gr.AddResourceAssociation(ctx, sourceCredential, sourceResourceType, sourceResourceId, targetSourceCredential, targetResourceType, targetResourceId) +} + // UpsertResource // this method will upsert a resource, however it will not create associations. // UPSERT operation @@ -448,10 +530,14 @@ func (gr *GormRepository) GetPatientForSources(ctx context.Context) ([]models.Re return wrappedResourceModels, results.Error } +// + //////////////////////////////////////////////////////////////////////////////////////////////////////////////////// // Resource Associations //////////////////////////////////////////////////////////////////////////////////////////////////////////////////// +// + // verifyAssociationPermission ensure that the sources are "owned" by the same user, and that the user is the current user func (gr *GormRepository) verifyAssociationPermission(ctx context.Context, sourceUserID uuid.UUID, relatedSourceUserID uuid.UUID) error { currentUser, currentUserErr := gr.GetCurrentUser(ctx) @@ -542,11 +628,14 @@ func (gr *GormRepository) FindResourceAssociationsByTypeAndId(ctx context.Contex ResourceBaseSourceID: source.ID, ResourceBaseSourceResourceType: resourceType, ResourceBaseSourceResourceID: resourceId, + RelatedResourceUserID: currentUser.ID, }). Find(&relatedResources) return relatedResources, result.Error } +// + //////////////////////////////////////////////////////////////////////////////////////////////////////////////////// // Resource Composition (Grouping) //////////////////////////////////////////////////////////////////////////////////////////////////////////////////// @@ -565,6 +654,8 @@ func (gr *GormRepository) FindResourceAssociationsByTypeAndId(ctx context.Contex // - add AddResourceAssociation for all resources linked to the Composition resource // - store the Composition resource // TODO: determine if we should be using a List Resource instead of a Composition resource +// +// Deprecated: This method has been deprecated. It has been replaced in favor of Fasten SourceCredential & associations func (gr *GormRepository) AddResourceComposition(ctx context.Context, compositionTitle string, resources []*models.ResourceBase) error { currentUser, currentUserErr := gr.GetCurrentUser(ctx) if currentUserErr != nil { @@ -718,6 +809,8 @@ func (gr *GormRepository) AddResourceComposition(ctx context.Context, compositio // SourceCredential //////////////////////////////////////////////////////////////////////////////////////////////////////////////////// +// + func (gr *GormRepository) CreateSource(ctx context.Context, sourceCreds *models.SourceCredential) error { currentUser, currentUserErr := gr.GetCurrentUser(ctx) if currentUserErr != nil { @@ -846,10 +939,10 @@ func (gr *GormRepository) GetSourceSummary(ctx context.Context, sourceId string) Table(patientTableName). First(&wrappedPatientResourceModel) - if patientResults.Error != nil { - return nil, patientResults.Error + //some sources may not have a patient resource (including the Fasten source) + if patientResults.Error == nil { + sourceSummary.Patient = &wrappedPatientResourceModel } - sourceSummary.Patient = &wrappedPatientResourceModel return sourceSummary, nil } @@ -925,10 +1018,13 @@ func (gr *GormRepository) DeleteSource(ctx context.Context, sourceId string) (in return rowsEffected, results.Error } +// + //////////////////////////////////////////////////////////////////////////////////////////////////////////////////// // Background Job //////////////////////////////////////////////////////////////////////////////////////////////////////////////////// +// func (gr *GormRepository) CreateBackgroundJob(ctx context.Context, backgroundJob *models.BackgroundJob) error { currentUser, currentUserErr := gr.GetCurrentUser(ctx) if currentUserErr != nil { @@ -1117,6 +1213,8 @@ func (gr *GormRepository) CancelAllLockedBackgroundJobsAndFail() error { } +// + //////////////////////////////////////////////////////////////////////////////////////////////////////////////////// // Utilities //////////////////////////////////////////////////////////////////////////////////////////////////////////////////// diff --git a/backend/pkg/database/gorm_repository_migrations.go b/backend/pkg/database/gorm_repository_migrations.go index affdcc7b..c957f283 100644 --- a/backend/pkg/database/gorm_repository_migrations.go +++ b/backend/pkg/database/gorm_repository_migrations.go @@ -1,8 +1,11 @@ package database import ( + "context" + "fmt" "github.com/fastenhealth/fasten-onprem/backend/pkg/models" databaseModel "github.com/fastenhealth/fasten-onprem/backend/pkg/models/database" + sourcePkg "github.com/fastenhealth/fasten-sources/pkg" "github.com/go-gormigrate/gormigrate/v2" "gorm.io/gorm" ) @@ -14,7 +17,7 @@ func (gr *GormRepository) Migrate() error { gormMigrateOptions := gormigrate.DefaultOptions gormMigrateOptions.UseTransaction = true - //use echo $(date '+%Y%m%d%H%M%S') to generate new ID's + //use "echo $(date '+%Y%m%d%H%M%S')" to generate new ID's m := gormigrate.New(gr.GormClient, gormMigrateOptions, []*gormigrate.Migration{ { ID: "20231017112246", // base database models //TODO: figure out how to version these correctly (SourceCredential is complicated) @@ -37,6 +40,31 @@ func (gr *GormRepository) Migrate() error { return databaseModel.Migrate(tx) }, }, + { + ID: "20231201122541", // Adding Fasten Source Credential for each user + Migrate: func(tx *gorm.DB) error { + + users := []models.User{} + results := tx.Find(&users) + if results.Error != nil { + return results.Error + } + for _, user := range users { + tx.Logger.Info(context.Background(), fmt.Sprintf("Creating Fasten Source Credential for user: %s", user.ID)) + + fastenUserCred := models.SourceCredential{ + UserID: user.ID, + SourceType: sourcePkg.SourceTypeFasten, + } + fastenUserCredCreateResp := tx.Create(&fastenUserCred) + if fastenUserCredCreateResp.Error != nil { + tx.Logger.Error(context.Background(), fmt.Sprintf("An error occurred creating Fasten Source Credential for user: %s", user.ID)) + return fastenUserCredCreateResp.Error + } + } + return nil + }, + }, }) if err := m.Migrate(); err != nil { diff --git a/backend/pkg/database/gorm_repository_test.go b/backend/pkg/database/gorm_repository_test.go index deb177ba..ec257f56 100644 --- a/backend/pkg/database/gorm_repository_test.go +++ b/backend/pkg/database/gorm_repository_test.go @@ -1021,7 +1021,7 @@ func (suite *RepositoryTestSuite) TestGetSummary() { {"count": int64(16), "resource_type": "Procedure"}, }, sourceSummary.ResourceTypeCounts) - require.Equal(suite.T(), 2, len(sourceSummary.Sources)) + require.Equal(suite.T(), 3, len(sourceSummary.Sources)) require.Equal(suite.T(), 2, len(sourceSummary.Patients)) } diff --git a/backend/pkg/database/interface.go b/backend/pkg/database/interface.go index c061ff06..a5ec4f2d 100644 --- a/backend/pkg/database/interface.go +++ b/backend/pkg/database/interface.go @@ -29,6 +29,8 @@ type DatabaseRepository interface { RemoveResourceAssociation(ctx context.Context, source *models.SourceCredential, resourceType string, resourceId string, relatedSource *models.SourceCredential, relatedResourceType string, relatedResourceId string) error FindResourceAssociationsByTypeAndId(ctx context.Context, source *models.SourceCredential, resourceType string, resourceId string) ([]models.RelatedResource, error) GetFlattenedResourceGraph(ctx context.Context, graphType pkg.ResourceGraphType, options models.ResourceGraphOptions) (map[string][]*models.ResourceBase, error) + + // Deprecated:This method has been deprecated. It has been replaced in favor of Fasten SourceCredential & associations AddResourceComposition(ctx context.Context, compositionTitle string, resources []*models.ResourceBase) error //UpsertProfile(context.Context, *models.Profile) error //UpsertOrganziation(context.Context, *models.Organization) error @@ -55,6 +57,15 @@ type DatabaseRepository interface { PopulateDefaultUserSettings(ctx context.Context, userId uuid.UUID) error //used by fasten-sources Clients - UpsertRawResource(ctx context.Context, sourceCredentials sourcePkg.SourceCredential, rawResource sourcePkg.RawResourceFhir) (bool, error) BackgroundJobCheckpoint(ctx context.Context, checkpointData map[string]interface{}, errorData map[string]interface{}) + UpsertRawResource(ctx context.Context, sourceCredentials sourcePkg.SourceCredential, rawResource sourcePkg.RawResourceFhir) (bool, error) + UpsertRawResourceAssociation( + ctx context.Context, + sourceId string, + sourceResourceType string, + sourceResourceId string, + targetSourceId string, + targetResourceType string, + targetResourceId string, + ) error } diff --git a/backend/pkg/models/source_credential.go b/backend/pkg/models/source_credential.go index 9b0b3341..888ea07e 100644 --- a/backend/pkg/models/source_credential.go +++ b/backend/pkg/models/source_credential.go @@ -69,6 +69,9 @@ type SourceCredential struct { func (s *SourceCredential) GetSourceType() sourcesPkg.SourceType { return s.SourceType } +func (s *SourceCredential) GetSourceId() string { + return s.ID.String() +} func (s *SourceCredential) GetClientId() string { return s.ClientId diff --git a/backend/pkg/web/handler/background_jobs.go b/backend/pkg/web/handler/background_jobs.go index cd3d2568..1e3a07fc 100644 --- a/backend/pkg/web/handler/background_jobs.go +++ b/backend/pkg/web/handler/background_jobs.go @@ -17,14 +17,65 @@ import ( "time" ) -// BackgroundJobSyncResources is a background job that syncs all FHIR resource for a given source +// This function is used to sync resources from a source (via a callback function). The BackgroundJobSyncResourcesWrapper contains the logic for registering the background job tracking the sync. +func BackgroundJobSyncResources( + parentContext context.Context, + logger *logrus.Entry, + databaseRepo database.DatabaseRepository, + sourceCred *models.SourceCredential, +) (sourceModels.UpsertSummary, error) { + return BackgroundJobSyncResourcesWrapper( + parentContext, + logger, + databaseRepo, + sourceCred, + func( + _backgroundJobContext context.Context, + _logger *logrus.Entry, + _databaseRepo database.DatabaseRepository, + _sourceCred *models.SourceCredential, + ) (sourceModels.SourceClient, sourceModels.UpsertSummary, error) { + // after creating the client, we should do a bulk import + sourceClient, err := factory.GetSourceClient(sourcePkg.GetFastenLighthouseEnv(), _sourceCred.SourceType, _backgroundJobContext, _logger, _sourceCred) + if err != nil { + resultErr := fmt.Errorf("an error occurred while initializing hub client using source credential: %w", err) + _logger.Errorln(resultErr) + return nil, sourceModels.UpsertSummary{}, resultErr + } + + summary, err := sourceClient.SyncAll(_databaseRepo) + if err != nil { + resultErr := fmt.Errorf("an error occurred while bulk importing resources from source: %w", err) + _logger.Errorln(resultErr) + return sourceClient, summary, resultErr + } + return sourceClient, summary, nil + }) +} + +// BackgroundJobSyncResourcesWrapper is a background job that syncs all FHIR resource for a given source // It is a blocking function that will return only when the sync is complete or has failed // It will create a background job and associate it with the source // It will also update the access token and refresh token if they have been updated // It will return the sync summary and error if any +// +// It's a wrapper function that takes a callback function as an argument. +// The callback function is the actual sync operation that will be run in the background (regular source or manual source) +// // TODO: run in background thread, or use https://gobyexample.com/tickers // TODO: use goroutine to truely run in the background (how will that work with DatabaseRepository, is that thread safe?) Mutex needed? -func BackgroundJobSyncResources(parentContext context.Context, logger *logrus.Entry, databaseRepo database.DatabaseRepository, sourceCred *models.SourceCredential) (sourceModels.UpsertSummary, error) { +func BackgroundJobSyncResourcesWrapper( + parentContext context.Context, + logger *logrus.Entry, + databaseRepo database.DatabaseRepository, + sourceCred *models.SourceCredential, + callbackFn func( + _backgroundJobContext context.Context, + _logger *logrus.Entry, + _databaseRepo database.DatabaseRepository, + _sourceCred *models.SourceCredential, + ) (sourceModels.SourceClient, sourceModels.UpsertSummary, error), +) (sourceModels.UpsertSummary, error) { var resultErr error var backgroundJob *models.BackgroundJob @@ -54,14 +105,6 @@ func BackgroundJobSyncResources(parentContext context.Context, logger *logrus.En //we can safely ignore this error, because we'll be updating the status of the background job again later } - // after creating the client, we should do a bulk import - sourceClient, err := factory.GetSourceClient(sourcePkg.GetFastenLighthouseEnv(), sourceCred.SourceType, backgroundJobContext, logger, sourceCred) - if err != nil { - resultErr = fmt.Errorf("an error occurred while initializing hub client using source credential: %w", err) - logger.Errorln(resultErr) - return sourceModels.UpsertSummary{}, resultErr - } - // BEGIN FINALIZER defer func() { //finalizer function - update the sync status to completed (or failed depending on the error status) @@ -124,10 +167,11 @@ func BackgroundJobSyncResources(parentContext context.Context, logger *logrus.En }() // END FINALIZER - summary, err := sourceClient.SyncAll(databaseRepo) - if err != nil { - resultErr = fmt.Errorf("an error occurred while bulk importing resources from source: %w", err) - logger.Errorln(resultErr) + var sourceClient sourceModels.SourceClient + var summary sourceModels.UpsertSummary + sourceClient, summary, resultErr = callbackFn(backgroundJobContext, logger, databaseRepo, sourceCred) + if resultErr != nil { + logger.Errorln("An error occurred while syncing resources, ignoring", resultErr) return summary, resultErr } diff --git a/backend/pkg/web/handler/resource_fhir.go b/backend/pkg/web/handler/resource_fhir.go index 534220db..aed4cd88 100644 --- a/backend/pkg/web/handler/resource_fhir.go +++ b/backend/pkg/web/handler/resource_fhir.go @@ -94,6 +94,7 @@ func GetResourceFhir(c *gin.Context) { c.JSON(http.StatusOK, gin.H{"success": true, "data": wrappedResourceModel}) } +// deprecated - using Manual Resource Wizard instead func CreateResourceComposition(c *gin.Context) { logger := c.MustGet(pkg.ContextKeyTypeLogger).(*logrus.Entry) diff --git a/backend/pkg/web/handler/resource_related.go b/backend/pkg/web/handler/resource_related.go new file mode 100644 index 00000000..cf3eaf41 --- /dev/null +++ b/backend/pkg/web/handler/resource_related.go @@ -0,0 +1,95 @@ +package handler + +import ( + "context" + "fmt" + "github.com/fastenhealth/fasten-onprem/backend/pkg" + "github.com/fastenhealth/fasten-onprem/backend/pkg/database" + "github.com/fastenhealth/fasten-onprem/backend/pkg/event_bus" + "github.com/fastenhealth/fasten-onprem/backend/pkg/models" + "github.com/fastenhealth/fasten-sources/clients/factory" + sourceModels "github.com/fastenhealth/fasten-sources/clients/models" + sourcePkg "github.com/fastenhealth/fasten-sources/pkg" + "github.com/gin-gonic/gin" + "github.com/sirupsen/logrus" + "net/http" +) + +// mimics functionality in CreateManualSource +func CreateRelatedResources(c *gin.Context) { + logger := c.MustGet(pkg.ContextKeyTypeLogger).(*logrus.Entry) + databaseRepo := c.MustGet(pkg.ContextKeyTypeDatabase).(database.DatabaseRepository) + eventBus := c.MustGet(pkg.ContextKeyTypeEventBusServer).(event_bus.Interface) + + // store the bundle file locally + bundleFile, err := storeFileLocally(c) + if err != nil { + c.JSON(http.StatusInternalServerError, gin.H{"success": false, "error": err.Error()}) + return + } + + //step 2: find a reference to the Fasten source for this user + sourceCredentials, err := databaseRepo.GetSources(c) + var fastenSourceCredential *models.SourceCredential + for _, sourceCredential := range sourceCredentials { + if sourceCredential.SourceType == sourcePkg.SourceTypeFasten { + fastenSourceCredential = &sourceCredential + break + } + } + if fastenSourceCredential == nil { + c.JSON(http.StatusInternalServerError, gin.H{"success": false, "error": "could not find Fasten source for this user"}) + return + } + + summary, err := BackgroundJobSyncResourcesWrapper( + c, + logger, + databaseRepo, + fastenSourceCredential, + func( + _backgroundJobContext context.Context, + _logger *logrus.Entry, + _databaseRepo database.DatabaseRepository, + _sourceCred *models.SourceCredential, + ) (sourceModels.SourceClient, sourceModels.UpsertSummary, error) { + + //step 3: create a "fasten" client, which we can use to parse resources to add to the database + fastenSourceClient, err := factory.GetSourceClient(sourcePkg.GetFastenLighthouseEnv(), sourcePkg.SourceTypeFasten, _backgroundJobContext, _logger, _sourceCred) + if err != nil { + resultErr := fmt.Errorf("could not create Fasten source client") + _logger.Errorln(resultErr) + return fastenSourceClient, sourceModels.UpsertSummary{}, resultErr + } + + //step 4: parse the resources from the bundle + summary, err := fastenSourceClient.SyncAllBundle(_databaseRepo, bundleFile, sourcePkg.FhirVersion401) + if err != nil { + resultErr := fmt.Errorf("an error occurred while processing bundle: %v", err) + _logger.Errorln(resultErr) + return fastenSourceClient, summary, resultErr + } + return fastenSourceClient, summary, nil + }) + + if err != nil { + c.JSON(http.StatusInternalServerError, gin.H{"success": false, "error": err.Error()}) + return + } + + //step 7 notify the event bus of the new resources + currentUser, _ := databaseRepo.GetCurrentUser(c) + err = eventBus.PublishMessage( + models.NewEventSourceComplete( + currentUser.ID.String(), + fastenSourceCredential.ID.String(), + ), + ) + + if err != nil { + logger.Warnf("ignoring: an error occurred while publishing sync complete event: %v", err) + } + + c.JSON(http.StatusOK, gin.H{"success": true, "data": summary, "source": fastenSourceCredential}) + +} diff --git a/backend/pkg/web/handler/source.go b/backend/pkg/web/handler/source.go index 414d3454..04d619ef 100644 --- a/backend/pkg/web/handler/source.go +++ b/backend/pkg/web/handler/source.go @@ -1,18 +1,21 @@ package handler import ( + "context" "fmt" "github.com/fastenhealth/fasten-onprem/backend/pkg" "github.com/fastenhealth/fasten-onprem/backend/pkg/database" "github.com/fastenhealth/fasten-onprem/backend/pkg/event_bus" "github.com/fastenhealth/fasten-onprem/backend/pkg/models" "github.com/fastenhealth/fasten-sources/clients/factory" + sourceModels "github.com/fastenhealth/fasten-sources/clients/models" sourcePkg "github.com/fastenhealth/fasten-sources/pkg" "github.com/gin-gonic/gin" "github.com/google/uuid" "github.com/sirupsen/logrus" "io/ioutil" "net/http" + "os" ) func CreateReconnectSource(c *gin.Context) { @@ -122,30 +125,17 @@ func SourceSync(c *gin.Context) { c.JSON(http.StatusOK, gin.H{"success": true, "source": sourceCred, "data": summary}) } +// mimics functionality in CreateRelatedResources +// mimics functionality in SourceSync func CreateManualSource(c *gin.Context) { logger := c.MustGet(pkg.ContextKeyTypeLogger).(*logrus.Entry) databaseRepo := c.MustGet(pkg.ContextKeyTypeDatabase).(database.DatabaseRepository) eventBus := c.MustGet(pkg.ContextKeyTypeEventBusServer).(event_bus.Interface) - // single file - file, err := c.FormFile("file") + // store the bundle file locally + bundleFile, err := storeFileLocally(c) if err != nil { - c.JSON(http.StatusInternalServerError, gin.H{"success": false, "error": "could not extract file from form"}) - return - } - fmt.Printf("Uploaded filename: %s", file.Filename) - - // create a temporary file to store this uploaded file - bundleFile, err := ioutil.TempFile("", file.Filename) - if err != nil { - c.JSON(http.StatusInternalServerError, gin.H{"success": false, "error": "could not create temp file"}) - return - } - - // Upload the file to specific bundleFile. - err = c.SaveUploadedFile(file, bundleFile.Name()) - if err != nil { - c.JSON(http.StatusInternalServerError, gin.H{"success": false, "error": "could not save temp file"}) + c.JSON(http.StatusInternalServerError, gin.H{"success": false, "error": err.Error()}) return } @@ -178,23 +168,40 @@ func CreateManualSource(c *gin.Context) { return } - manualSourceClient, err := factory.GetSourceClient(sourcePkg.GetFastenLighthouseEnv(), sourcePkg.SourceTypeManual, c, logger, &manualSourceCredential) - if err != nil { - logger.Errorln("An error occurred while initializing hub client using manual source with credential", err) - c.JSON(http.StatusInternalServerError, gin.H{"success": false}) - return - } + summary, err := BackgroundJobSyncResourcesWrapper( + c, + logger, + databaseRepo, + &manualSourceCredential, + func( + _backgroundJobContext context.Context, + _logger *logrus.Entry, + _databaseRepo database.DatabaseRepository, + _sourceCred *models.SourceCredential, + ) (sourceModels.SourceClient, sourceModels.UpsertSummary, error) { + manualSourceClient, err := factory.GetSourceClient(sourcePkg.GetFastenLighthouseEnv(), sourcePkg.SourceTypeManual, _backgroundJobContext, _logger, _sourceCred) + if err != nil { + resultErr := fmt.Errorf("an error occurred while initializing hub client using manual source with credential: %w", err) + logger.Errorln(resultErr) + return manualSourceClient, sourceModels.UpsertSummary{}, resultErr + } + + summary, err := manualSourceClient.SyncAllBundle(_databaseRepo, bundleFile, bundleType) + if err != nil { + resultErr := fmt.Errorf("an error occurred while processing bundle: %w", err) + logger.Errorln(resultErr) + return manualSourceClient, sourceModels.UpsertSummary{}, resultErr + } + return manualSourceClient, summary, nil + }) - summary, err := manualSourceClient.SyncAllBundle(databaseRepo, bundleFile, bundleType) if err != nil { - logger.Errorln("An error occurred while processing bundle", err) c.JSON(http.StatusInternalServerError, gin.H{"success": false, "error": err.Error()}) return } //publish event currentUser, _ := databaseRepo.GetCurrentUser(c) - err = eventBus.PublishMessage( models.NewEventSourceComplete( currentUser.ID.String(), @@ -260,3 +267,29 @@ func DeleteSource(c *gin.Context) { } c.JSON(http.StatusOK, gin.H{"success": true, "data": rowsEffected}) } + +// Helpers +func storeFileLocally(c *gin.Context) (*os.File, error) { + // single file + file, err := c.FormFile("file") + if err != nil { + //c.JSON(http.StatusInternalServerError, gin.H{"success": false, "error": "could not extract file from form"}) + return nil, fmt.Errorf("could not extract file from form") + } + fmt.Printf("Uploaded filename: %s", file.Filename) + + // create a temporary file to store this uploaded file + bundleFile, err := ioutil.TempFile("", file.Filename) + if err != nil { + //c.JSON(http.StatusInternalServerError, gin.H{"success": false, "error": "could not create temp file"}) + return nil, fmt.Errorf("could not create temp file") + } + + // Upload the file to specific bundleFile. + err = c.SaveUploadedFile(file, bundleFile.Name()) + if err != nil { + //c.JSON(http.StatusInternalServerError, gin.H{"success": false, "error": "could not save temp file"}) + return nil, fmt.Errorf("could not save temp file") + } + return bundleFile, nil +} diff --git a/backend/pkg/web/server.go b/backend/pkg/web/server.go index a8171b24..d5b2c58b 100644 --- a/backend/pkg/web/server.go +++ b/backend/pkg/web/server.go @@ -74,7 +74,9 @@ func (ae *AppEngine) Setup() (*gin.RouterGroup, *gin.Engine) { secure.GET("/resource/fhir", handler.ListResourceFhir) secure.POST("/resource/graph/:graphType", handler.GetResourceFhirGraph) secure.GET("/resource/fhir/:sourceId/:resourceId", handler.GetResourceFhir) + secure.POST("/resource/composition", handler.CreateResourceComposition) + secure.POST("/resource/related", handler.CreateRelatedResources) secure.GET("/dashboards", handler.GetDashboard) secure.POST("/dashboards", handler.AddDashboardLocation) diff --git a/frontend/package.json b/frontend/package.json index 22153a64..9a22fe62 100644 --- a/frontend/package.json +++ b/frontend/package.json @@ -51,6 +51,7 @@ "ngx-highlightjs": "^7.0.1", "ngx-infinite-scroll": "^14.0.0", "ngx-moment": "^6.0.2", + "parse-full-name": "^1.2.6", "rxjs": "~6.5.4", "tslib": "^2.0.0", "uuid": "^9.0.0", diff --git a/frontend/src/app/app.component.ts b/frontend/src/app/app.component.ts index d914c927..33326881 100644 --- a/frontend/src/app/app.component.ts +++ b/frontend/src/app/app.component.ts @@ -2,6 +2,7 @@ import { Component, OnInit } from '@angular/core'; import {NavigationEnd, Router} from '@angular/router'; import {Observable, of} from 'rxjs'; import {ToastService} from './services/toast.service'; +import {NgbModal} from '@ng-bootstrap/ng-bootstrap'; @Component({ selector: 'app-root', @@ -15,7 +16,11 @@ export class AppComponent implements OnInit { showHeader:boolean = false; showFooter:boolean = true; - constructor(private router: Router, private toastService: ToastService) {} + constructor( + private router: Router, + private toastService: ToastService, + private modalService: NgbModal + ) {} ngOnInit() { @@ -25,17 +30,21 @@ export class AppComponent implements OnInit { document.querySelector('body').appendChild(navbarBackdrop); //determine if we should show the header - this.router.events.subscribe(event => this.modifyHeader(event)); + this.router.events.subscribe(event => this.routerEvent(event)); } - modifyHeader(event) { + routerEvent(event) { if (event instanceof NavigationEnd) { + //modify header if (event.url?.startsWith('/auth') || event.url?.startsWith('/desktop')) { this.showHeader = false; } else { // console.log("NU") this.showHeader = true; } + + // close all open modals when route change + this.modalService.dismissAll(); } } } diff --git a/frontend/src/app/app.module.ts b/frontend/src/app/app.module.ts index e19edd2e..1dec0827 100644 --- a/frontend/src/app/app.module.ts +++ b/frontend/src/app/app.module.ts @@ -38,6 +38,8 @@ import { ExploreComponent } from './pages/explore/explore.component'; import {DirectivesModule} from './directives/directives.module'; import { DesktopCallbackComponent } from './pages/desktop-callback/desktop-callback.component'; import { BackgroundJobsComponent } from './pages/background-jobs/background-jobs.component'; +import {FhirCardModule} from './components/fhir-card/fhir-card.module'; +import {FhirDatatableModule} from './components/fhir-datatable/fhir-datatable.module'; @NgModule({ declarations: [ @@ -64,6 +66,8 @@ import { BackgroundJobsComponent } from './pages/background-jobs/background-jobs BrowserModule, FontAwesomeModule, SharedModule, + FhirCardModule, + FhirDatatableModule, AppRoutingModule, HttpClientModule, NgbModule, diff --git a/frontend/src/app/components/fhir/common/badge/badge.component.html b/frontend/src/app/components/fhir-card/common/badge/badge.component.html similarity index 100% rename from frontend/src/app/components/fhir/common/badge/badge.component.html rename to frontend/src/app/components/fhir-card/common/badge/badge.component.html diff --git a/frontend/src/app/components/fhir/common/badge/badge.component.scss b/frontend/src/app/components/fhir-card/common/badge/badge.component.scss similarity index 100% rename from frontend/src/app/components/fhir/common/badge/badge.component.scss rename to frontend/src/app/components/fhir-card/common/badge/badge.component.scss diff --git a/frontend/src/app/components/fhir/common/badge/badge.component.spec.ts b/frontend/src/app/components/fhir-card/common/badge/badge.component.spec.ts similarity index 100% rename from frontend/src/app/components/fhir/common/badge/badge.component.spec.ts rename to frontend/src/app/components/fhir-card/common/badge/badge.component.spec.ts diff --git a/frontend/src/app/components/fhir/common/badge/badge.component.ts b/frontend/src/app/components/fhir-card/common/badge/badge.component.ts similarity index 100% rename from frontend/src/app/components/fhir/common/badge/badge.component.ts rename to frontend/src/app/components/fhir-card/common/badge/badge.component.ts diff --git a/frontend/src/app/components/fhir/common/badge/badge.stories.ts b/frontend/src/app/components/fhir-card/common/badge/badge.stories.ts similarity index 96% rename from frontend/src/app/components/fhir/common/badge/badge.stories.ts rename to frontend/src/app/components/fhir-card/common/badge/badge.stories.ts index 7f453bfe..ce329367 100644 --- a/frontend/src/app/components/fhir/common/badge/badge.stories.ts +++ b/frontend/src/app/components/fhir-card/common/badge/badge.stories.ts @@ -3,7 +3,7 @@ import {BadgeComponent} from "./badge.component"; // More on how to set up stories at: https://storybook.js.org/docs/angular/writing-stories/introduction const meta: Meta = { - title: 'Fhir/Common/Badge', + title: 'Fhir Card/Common/Badge', component: BadgeComponent, decorators: [ // moduleMetadata({ diff --git a/frontend/src/app/components/fhir/common/table/table-row-item.spec.ts b/frontend/src/app/components/fhir-card/common/table/table-row-item.spec.ts similarity index 100% rename from frontend/src/app/components/fhir/common/table/table-row-item.spec.ts rename to frontend/src/app/components/fhir-card/common/table/table-row-item.spec.ts diff --git a/frontend/src/app/components/fhir/common/table/table-row-item.ts b/frontend/src/app/components/fhir-card/common/table/table-row-item.ts similarity index 100% rename from frontend/src/app/components/fhir/common/table/table-row-item.ts rename to frontend/src/app/components/fhir-card/common/table/table-row-item.ts diff --git a/frontend/src/app/components/fhir/common/table/table.component.html b/frontend/src/app/components/fhir-card/common/table/table.component.html similarity index 100% rename from frontend/src/app/components/fhir/common/table/table.component.html rename to frontend/src/app/components/fhir-card/common/table/table.component.html diff --git a/frontend/src/app/components/fhir/common/table/table.component.scss b/frontend/src/app/components/fhir-card/common/table/table.component.scss similarity index 100% rename from frontend/src/app/components/fhir/common/table/table.component.scss rename to frontend/src/app/components/fhir-card/common/table/table.component.scss diff --git a/frontend/src/app/components/fhir/common/table/table.component.spec.ts b/frontend/src/app/components/fhir-card/common/table/table.component.spec.ts similarity index 100% rename from frontend/src/app/components/fhir/common/table/table.component.spec.ts rename to frontend/src/app/components/fhir-card/common/table/table.component.spec.ts diff --git a/frontend/src/app/components/fhir/common/table/table.component.ts b/frontend/src/app/components/fhir-card/common/table/table.component.ts similarity index 100% rename from frontend/src/app/components/fhir/common/table/table.component.ts rename to frontend/src/app/components/fhir-card/common/table/table.component.ts diff --git a/frontend/src/app/components/fhir/common/table/table.stories.ts b/frontend/src/app/components/fhir-card/common/table/table.stories.ts similarity index 98% rename from frontend/src/app/components/fhir/common/table/table.stories.ts rename to frontend/src/app/components/fhir-card/common/table/table.stories.ts index 16988168..7a616fff 100644 --- a/frontend/src/app/components/fhir/common/table/table.stories.ts +++ b/frontend/src/app/components/fhir-card/common/table/table.stories.ts @@ -5,7 +5,7 @@ import {FastenDisplayModel} from "../../../../../lib/models/fasten/fasten-displa // More on how to set up stories at: https://storybook.js.org/docs/angular/writing-stories/introduction const meta: Meta = { - title: 'Fhir/Common/Table', + title: 'Fhir Card/Common/Table', component: TableComponent, decorators: [ // moduleMetadata({ diff --git a/frontend/src/app/components/fhir/datatypes/binary-text/binary-text.component.html b/frontend/src/app/components/fhir-card/datatypes/binary-text/binary-text.component.html similarity index 100% rename from frontend/src/app/components/fhir/datatypes/binary-text/binary-text.component.html rename to frontend/src/app/components/fhir-card/datatypes/binary-text/binary-text.component.html diff --git a/frontend/src/app/components/fhir/datatypes/binary-text/binary-text.component.scss b/frontend/src/app/components/fhir-card/datatypes/binary-text/binary-text.component.scss similarity index 100% rename from frontend/src/app/components/fhir/datatypes/binary-text/binary-text.component.scss rename to frontend/src/app/components/fhir-card/datatypes/binary-text/binary-text.component.scss diff --git a/frontend/src/app/components/fhir/datatypes/binary-text/binary-text.component.spec.ts b/frontend/src/app/components/fhir-card/datatypes/binary-text/binary-text.component.spec.ts similarity index 100% rename from frontend/src/app/components/fhir/datatypes/binary-text/binary-text.component.spec.ts rename to frontend/src/app/components/fhir-card/datatypes/binary-text/binary-text.component.spec.ts diff --git a/frontend/src/app/components/fhir/datatypes/binary-text/binary-text.component.ts b/frontend/src/app/components/fhir-card/datatypes/binary-text/binary-text.component.ts similarity index 100% rename from frontend/src/app/components/fhir/datatypes/binary-text/binary-text.component.ts rename to frontend/src/app/components/fhir-card/datatypes/binary-text/binary-text.component.ts diff --git a/frontend/src/app/components/fhir/datatypes/binary-text/binary-text.stories.ts b/frontend/src/app/components/fhir-card/datatypes/binary-text/binary-text.stories.ts similarity index 96% rename from frontend/src/app/components/fhir/datatypes/binary-text/binary-text.stories.ts rename to frontend/src/app/components/fhir-card/datatypes/binary-text/binary-text.stories.ts index eab09dfc..54d30f13 100644 --- a/frontend/src/app/components/fhir/datatypes/binary-text/binary-text.stories.ts +++ b/frontend/src/app/components/fhir-card/datatypes/binary-text/binary-text.stories.ts @@ -8,7 +8,7 @@ import {BinaryModel} from "../../../../../lib/models/resources/binary-model"; // More on how to set up stories at: https://storybook.js.org/docs/angular/writing-stories/introduction const meta: Meta = { - title: 'Fhir/Datatypes/BinaryText', + title: 'Fhir Card/Datatypes/BinaryText', component: BinaryTextComponent, decorators: [ // moduleMetadata({ diff --git a/frontend/src/app/components/fhir/datatypes/codable-concept/codable-concept.component.html b/frontend/src/app/components/fhir-card/datatypes/codable-concept/codable-concept.component.html similarity index 100% rename from frontend/src/app/components/fhir/datatypes/codable-concept/codable-concept.component.html rename to frontend/src/app/components/fhir-card/datatypes/codable-concept/codable-concept.component.html diff --git a/frontend/src/app/components/fhir/datatypes/codable-concept/codable-concept.component.scss b/frontend/src/app/components/fhir-card/datatypes/codable-concept/codable-concept.component.scss similarity index 100% rename from frontend/src/app/components/fhir/datatypes/codable-concept/codable-concept.component.scss rename to frontend/src/app/components/fhir-card/datatypes/codable-concept/codable-concept.component.scss diff --git a/frontend/src/app/components/fhir/datatypes/codable-concept/codable-concept.component.spec.ts b/frontend/src/app/components/fhir-card/datatypes/codable-concept/codable-concept.component.spec.ts similarity index 100% rename from frontend/src/app/components/fhir/datatypes/codable-concept/codable-concept.component.spec.ts rename to frontend/src/app/components/fhir-card/datatypes/codable-concept/codable-concept.component.spec.ts diff --git a/frontend/src/app/components/fhir/datatypes/codable-concept/codable-concept.component.ts b/frontend/src/app/components/fhir-card/datatypes/codable-concept/codable-concept.component.ts similarity index 100% rename from frontend/src/app/components/fhir/datatypes/codable-concept/codable-concept.component.ts rename to frontend/src/app/components/fhir-card/datatypes/codable-concept/codable-concept.component.ts diff --git a/frontend/src/app/components/fhir/datatypes/coding/coding.component.html b/frontend/src/app/components/fhir-card/datatypes/coding/coding.component.html similarity index 100% rename from frontend/src/app/components/fhir/datatypes/coding/coding.component.html rename to frontend/src/app/components/fhir-card/datatypes/coding/coding.component.html diff --git a/frontend/src/app/components/fhir/datatypes/coding/coding.component.scss b/frontend/src/app/components/fhir-card/datatypes/coding/coding.component.scss similarity index 100% rename from frontend/src/app/components/fhir/datatypes/coding/coding.component.scss rename to frontend/src/app/components/fhir-card/datatypes/coding/coding.component.scss diff --git a/frontend/src/app/components/fhir/datatypes/coding/coding.component.spec.ts b/frontend/src/app/components/fhir-card/datatypes/coding/coding.component.spec.ts similarity index 100% rename from frontend/src/app/components/fhir/datatypes/coding/coding.component.spec.ts rename to frontend/src/app/components/fhir-card/datatypes/coding/coding.component.spec.ts diff --git a/frontend/src/app/components/fhir/datatypes/coding/coding.component.ts b/frontend/src/app/components/fhir-card/datatypes/coding/coding.component.ts similarity index 100% rename from frontend/src/app/components/fhir/datatypes/coding/coding.component.ts rename to frontend/src/app/components/fhir-card/datatypes/coding/coding.component.ts diff --git a/frontend/src/app/components/fhir/datatypes/dicom/dicom.component.html b/frontend/src/app/components/fhir-card/datatypes/dicom/dicom.component.html similarity index 100% rename from frontend/src/app/components/fhir/datatypes/dicom/dicom.component.html rename to frontend/src/app/components/fhir-card/datatypes/dicom/dicom.component.html diff --git a/frontend/src/app/components/fhir/datatypes/dicom/dicom.component.scss b/frontend/src/app/components/fhir-card/datatypes/dicom/dicom.component.scss similarity index 100% rename from frontend/src/app/components/fhir/datatypes/dicom/dicom.component.scss rename to frontend/src/app/components/fhir-card/datatypes/dicom/dicom.component.scss diff --git a/frontend/src/app/components/fhir/datatypes/dicom/dicom.component.spec.ts b/frontend/src/app/components/fhir-card/datatypes/dicom/dicom.component.spec.ts similarity index 100% rename from frontend/src/app/components/fhir/datatypes/dicom/dicom.component.spec.ts rename to frontend/src/app/components/fhir-card/datatypes/dicom/dicom.component.spec.ts diff --git a/frontend/src/app/components/fhir/datatypes/dicom/dicom.component.ts b/frontend/src/app/components/fhir-card/datatypes/dicom/dicom.component.ts similarity index 100% rename from frontend/src/app/components/fhir/datatypes/dicom/dicom.component.ts rename to frontend/src/app/components/fhir-card/datatypes/dicom/dicom.component.ts diff --git a/frontend/src/app/components/fhir/datatypes/dicom/dicom.stories.ts b/frontend/src/app/components/fhir-card/datatypes/dicom/dicom.stories.ts similarity index 97% rename from frontend/src/app/components/fhir/datatypes/dicom/dicom.stories.ts rename to frontend/src/app/components/fhir-card/datatypes/dicom/dicom.stories.ts index 0a4a4a91..1f10aa2e 100644 --- a/frontend/src/app/components/fhir/datatypes/dicom/dicom.stories.ts +++ b/frontend/src/app/components/fhir-card/datatypes/dicom/dicom.stories.ts @@ -6,7 +6,7 @@ import {DicomComponent} from "./dicom.component"; // More on how to set up stories at: https://storybook.js.org/docs/angular/writing-stories/introduction const meta: Meta = { - title: 'Fhir/Datatypes/Dicom', + title: 'Fhir Card/Datatypes/Dicom', component: DicomComponent, decorators: [ // moduleMetadata({ diff --git a/frontend/src/app/components/fhir/datatypes/html/html.component.html b/frontend/src/app/components/fhir-card/datatypes/html/html.component.html similarity index 100% rename from frontend/src/app/components/fhir/datatypes/html/html.component.html rename to frontend/src/app/components/fhir-card/datatypes/html/html.component.html diff --git a/frontend/src/app/components/fhir/datatypes/html/html.component.scss b/frontend/src/app/components/fhir-card/datatypes/html/html.component.scss similarity index 100% rename from frontend/src/app/components/fhir/datatypes/html/html.component.scss rename to frontend/src/app/components/fhir-card/datatypes/html/html.component.scss diff --git a/frontend/src/app/components/fhir/datatypes/html/html.component.spec.ts b/frontend/src/app/components/fhir-card/datatypes/html/html.component.spec.ts similarity index 100% rename from frontend/src/app/components/fhir/datatypes/html/html.component.spec.ts rename to frontend/src/app/components/fhir-card/datatypes/html/html.component.spec.ts diff --git a/frontend/src/app/components/fhir/datatypes/html/html.component.ts b/frontend/src/app/components/fhir-card/datatypes/html/html.component.ts similarity index 100% rename from frontend/src/app/components/fhir/datatypes/html/html.component.ts rename to frontend/src/app/components/fhir-card/datatypes/html/html.component.ts diff --git a/frontend/src/app/components/fhir/datatypes/html/html.stories.ts b/frontend/src/app/components/fhir-card/datatypes/html/html.stories.ts similarity index 97% rename from frontend/src/app/components/fhir/datatypes/html/html.stories.ts rename to frontend/src/app/components/fhir-card/datatypes/html/html.stories.ts index 09d0e354..07fdc5db 100644 --- a/frontend/src/app/components/fhir/datatypes/html/html.stories.ts +++ b/frontend/src/app/components/fhir-card/datatypes/html/html.stories.ts @@ -8,7 +8,7 @@ import {HtmlComponent} from "./html.component"; // More on how to set up stories at: https://storybook.js.org/docs/angular/writing-stories/introduction const meta: Meta = { - title: 'Fhir/Datatypes/Html', + title: 'Fhir Card/Datatypes/Html', component: HtmlComponent, decorators: [ // moduleMetadata({ diff --git a/frontend/src/app/components/fhir/datatypes/img/img.component.html b/frontend/src/app/components/fhir-card/datatypes/img/img.component.html similarity index 100% rename from frontend/src/app/components/fhir/datatypes/img/img.component.html rename to frontend/src/app/components/fhir-card/datatypes/img/img.component.html diff --git a/frontend/src/app/components/fhir/datatypes/img/img.component.scss b/frontend/src/app/components/fhir-card/datatypes/img/img.component.scss similarity index 100% rename from frontend/src/app/components/fhir/datatypes/img/img.component.scss rename to frontend/src/app/components/fhir-card/datatypes/img/img.component.scss diff --git a/frontend/src/app/components/fhir/datatypes/img/img.component.spec.ts b/frontend/src/app/components/fhir-card/datatypes/img/img.component.spec.ts similarity index 100% rename from frontend/src/app/components/fhir/datatypes/img/img.component.spec.ts rename to frontend/src/app/components/fhir-card/datatypes/img/img.component.spec.ts diff --git a/frontend/src/app/components/fhir/datatypes/img/img.component.ts b/frontend/src/app/components/fhir-card/datatypes/img/img.component.ts similarity index 100% rename from frontend/src/app/components/fhir/datatypes/img/img.component.ts rename to frontend/src/app/components/fhir-card/datatypes/img/img.component.ts diff --git a/frontend/src/app/components/fhir/datatypes/img/img.stories.ts b/frontend/src/app/components/fhir-card/datatypes/img/img.stories.ts similarity index 97% rename from frontend/src/app/components/fhir/datatypes/img/img.stories.ts rename to frontend/src/app/components/fhir-card/datatypes/img/img.stories.ts index ead9fbf5..d07182c6 100644 --- a/frontend/src/app/components/fhir/datatypes/img/img.stories.ts +++ b/frontend/src/app/components/fhir-card/datatypes/img/img.stories.ts @@ -6,7 +6,7 @@ import {ImgComponent} from "./img.component"; // More on how to set up stories at: https://storybook.js.org/docs/angular/writing-stories/introduction const meta: Meta = { - title: 'Fhir/Datatypes/Img', + title: 'Fhir Card/Datatypes/Img', component: ImgComponent, decorators: [ // moduleMetadata({ diff --git a/frontend/src/app/components/fhir/datatypes/markdown/markdown.component.html b/frontend/src/app/components/fhir-card/datatypes/markdown/markdown.component.html similarity index 100% rename from frontend/src/app/components/fhir/datatypes/markdown/markdown.component.html rename to frontend/src/app/components/fhir-card/datatypes/markdown/markdown.component.html diff --git a/frontend/src/app/components/fhir/datatypes/markdown/markdown.component.scss b/frontend/src/app/components/fhir-card/datatypes/markdown/markdown.component.scss similarity index 100% rename from frontend/src/app/components/fhir/datatypes/markdown/markdown.component.scss rename to frontend/src/app/components/fhir-card/datatypes/markdown/markdown.component.scss diff --git a/frontend/src/app/components/fhir/datatypes/markdown/markdown.component.spec.ts b/frontend/src/app/components/fhir-card/datatypes/markdown/markdown.component.spec.ts similarity index 100% rename from frontend/src/app/components/fhir/datatypes/markdown/markdown.component.spec.ts rename to frontend/src/app/components/fhir-card/datatypes/markdown/markdown.component.spec.ts diff --git a/frontend/src/app/components/fhir/datatypes/markdown/markdown.component.ts b/frontend/src/app/components/fhir-card/datatypes/markdown/markdown.component.ts similarity index 100% rename from frontend/src/app/components/fhir/datatypes/markdown/markdown.component.ts rename to frontend/src/app/components/fhir-card/datatypes/markdown/markdown.component.ts diff --git a/frontend/src/app/components/fhir-card/datatypes/markdown/markdown.stories.ts b/frontend/src/app/components/fhir-card/datatypes/markdown/markdown.stories.ts new file mode 100644 index 00000000..0dd94969 --- /dev/null +++ b/frontend/src/app/components/fhir-card/datatypes/markdown/markdown.stories.ts @@ -0,0 +1,45 @@ +import type { Meta, StoryObj } from '@storybook/angular'; +import {fhirVersions} from "../../../../../lib/models/constants"; +import R4Example1Json from "../../../../../lib/fixtures/r4/resources/binary/exampleMarkdown.json"; +import {BinaryModel} from "../../../../../lib/models/resources/binary-model"; +import {MarkdownComponent} from "./markdown.component"; + +// More on how to set up stories at: https://storybook.js.org/docs/angular/writing-stories/introduction +const meta: Meta = { + title: 'Fhir Card/Datatypes/Markdown', + component: MarkdownComponent, + decorators: [ + // moduleMetadata({ + // imports: [AppModule] + // }) + // applicationConfig({ + // providers: [importProvidersFrom(AppModule)], + // }), + ], + tags: ['autodocs'], + render: (args: MarkdownComponent) => ({ + props: { + backgroundColor: null, + ...args, + }, + }), + argTypes: { + displayModel: { + control: 'object', + }, + }, +}; + +export default meta; +type Story = StoryObj; + +// More on writing stories with args: https://storybook.js.org/docs/angular/writing-stories/args +let aiDisplayModel1 = new BinaryModel(R4Example1Json, fhirVersions.R4) +aiDisplayModel1.source_id = '123-456-789' +aiDisplayModel1.source_resource_id = '123-456-789' +export const R4Example1: Story = { + args: { + displayModel: aiDisplayModel1 + } +}; + diff --git a/frontend/src/app/components/fhir/datatypes/pdf/pdf.component.html b/frontend/src/app/components/fhir-card/datatypes/pdf/pdf.component.html similarity index 100% rename from frontend/src/app/components/fhir/datatypes/pdf/pdf.component.html rename to frontend/src/app/components/fhir-card/datatypes/pdf/pdf.component.html diff --git a/frontend/src/app/components/fhir/datatypes/pdf/pdf.component.scss b/frontend/src/app/components/fhir-card/datatypes/pdf/pdf.component.scss similarity index 100% rename from frontend/src/app/components/fhir/datatypes/pdf/pdf.component.scss rename to frontend/src/app/components/fhir-card/datatypes/pdf/pdf.component.scss diff --git a/frontend/src/app/components/fhir/datatypes/pdf/pdf.component.spec.ts b/frontend/src/app/components/fhir-card/datatypes/pdf/pdf.component.spec.ts similarity index 100% rename from frontend/src/app/components/fhir/datatypes/pdf/pdf.component.spec.ts rename to frontend/src/app/components/fhir-card/datatypes/pdf/pdf.component.spec.ts diff --git a/frontend/src/app/components/fhir/datatypes/pdf/pdf.component.ts b/frontend/src/app/components/fhir-card/datatypes/pdf/pdf.component.ts similarity index 100% rename from frontend/src/app/components/fhir/datatypes/pdf/pdf.component.ts rename to frontend/src/app/components/fhir-card/datatypes/pdf/pdf.component.ts diff --git a/frontend/src/app/components/fhir/datatypes/pdf/pdf.stories.ts b/frontend/src/app/components/fhir-card/datatypes/pdf/pdf.stories.ts similarity index 97% rename from frontend/src/app/components/fhir/datatypes/pdf/pdf.stories.ts rename to frontend/src/app/components/fhir-card/datatypes/pdf/pdf.stories.ts index 3d46f357..5a129cbe 100644 --- a/frontend/src/app/components/fhir/datatypes/pdf/pdf.stories.ts +++ b/frontend/src/app/components/fhir-card/datatypes/pdf/pdf.stories.ts @@ -6,7 +6,7 @@ import {PdfComponent} from "./pdf.component"; // More on how to set up stories at: https://storybook.js.org/docs/angular/writing-stories/introduction const meta: Meta = { - title: 'Fhir/Datatypes/Pdf', + title: 'Fhir Card/Datatypes/Pdf', component: PdfComponent, decorators: [ // moduleMetadata({ diff --git a/frontend/src/app/components/fhir-card/fhir-card.module.ts b/frontend/src/app/components/fhir-card/fhir-card.module.ts new file mode 100644 index 00000000..add809fe --- /dev/null +++ b/frontend/src/app/components/fhir-card/fhir-card.module.ts @@ -0,0 +1,106 @@ +import { NgModule } from '@angular/core'; +import { CommonModule } from '@angular/common'; +import {BadgeComponent} from './common/badge/badge.component'; +import {TableComponent} from './common/table/table.component'; +import {BinaryTextComponent} from './datatypes/binary-text/binary-text.component'; +import {CodableConceptComponent} from './datatypes/codable-concept/codable-concept.component'; +import {CodingComponent} from './datatypes/coding/coding.component'; +import {DicomComponent} from './datatypes/dicom/dicom.component'; +import {HtmlComponent} from './datatypes/html/html.component'; +import {ImgComponent} from './datatypes/img/img.component'; +import {MarkdownComponent} from './datatypes/markdown/markdown.component'; +import {PdfComponent} from './datatypes/pdf/pdf.component'; +import {AllergyIntoleranceComponent} from './resources/allergy-intolerance/allergy-intolerance.component'; +import {BinaryComponent} from './resources/binary/binary.component'; +import {DiagnosticReportComponent} from './resources/diagnostic-report/diagnostic-report.component'; +import {DocumentReferenceComponent} from './resources/document-reference/document-reference.component'; +import {FallbackComponent} from './resources/fallback/fallback.component'; +import {ImmunizationComponent} from './resources/immunization/immunization.component'; +import {LocationComponent} from './resources/location/location.component'; +import {MediaComponent} from './resources/media/media.component'; +import {MedicationComponent} from './resources/medication/medication.component'; +import {MedicationRequestComponent} from './resources/medication-request/medication-request.component'; +import {ObservationComponent} from './resources/observation/observation.component'; +import {OrganizationComponent} from './resources/organization/organization.component'; +import {PractitionerComponent} from './resources/practitioner/practitioner.component'; +import {ProcedureComponent} from './resources/procedure/procedure.component'; +import {FhirCardComponent} from './fhir-card/fhir-card.component'; +import {FhirCardOutletDirective} from './fhir-card/fhir-card-outlet.directive'; +import { EncounterComponent } from './resources/encounter/encounter.component'; + + + +@NgModule({ + imports: [ + //common + CommonModule, + BadgeComponent, + //datatypes + TableComponent, + BinaryTextComponent, + CodableConceptComponent, + CodingComponent, + DicomComponent, + HtmlComponent, + ImgComponent, + MarkdownComponent, + PdfComponent, + //resources + AllergyIntoleranceComponent, + BinaryComponent, + DiagnosticReportComponent, + DocumentReferenceComponent, + EncounterComponent, + FallbackComponent, + ImmunizationComponent, + LocationComponent, + MediaComponent, + MedicationComponent, + MedicationRequestComponent, + ObservationComponent, + OrganizationComponent, + PractitionerComponent, + ProcedureComponent, + + ], + //TODO: every component in here should be migrated to a standalone component + declarations: [ + FhirCardComponent, + FhirCardOutletDirective, + + ], + exports:[ + //common + BadgeComponent, + TableComponent, + //datatypes + BinaryTextComponent, + CodableConceptComponent, + CodingComponent, + DicomComponent, + HtmlComponent, + ImgComponent, + MarkdownComponent, + PdfComponent, + //resources + AllergyIntoleranceComponent, + BinaryComponent, + DiagnosticReportComponent, + DocumentReferenceComponent, + EncounterComponent, + FallbackComponent, + ImmunizationComponent, + LocationComponent, + MediaComponent, + MedicationComponent, + MedicationRequestComponent, + ObservationComponent, + OrganizationComponent, + PractitionerComponent, + ProcedureComponent, + + FhirCardComponent, + FhirCardOutletDirective, + ] +}) +export class FhirCardModule { } diff --git a/frontend/src/app/components/fhir/fhir-resource/fhir-resource-component-interface.ts b/frontend/src/app/components/fhir-card/fhir-card/fhir-card-component-interface.ts similarity index 84% rename from frontend/src/app/components/fhir/fhir-resource/fhir-resource-component-interface.ts rename to frontend/src/app/components/fhir-card/fhir-card/fhir-card-component-interface.ts index 320a1e1b..dd70e977 100644 --- a/frontend/src/app/components/fhir/fhir-resource/fhir-resource-component-interface.ts +++ b/frontend/src/app/components/fhir-card/fhir-card/fhir-card-component-interface.ts @@ -1,9 +1,10 @@ import {FastenDisplayModel} from '../../../../lib/models/fasten/fasten-display-model'; //all Fhir Resource components must implement this Interface -export interface FhirResourceComponentInterface { +export interface FhirCardComponentInterface { displayModel: FastenDisplayModel; showDetails: boolean; + isCollapsed: boolean; //these are used to populate the description of the resource. May not be available for all resources resourceCode?: string; diff --git a/frontend/src/app/components/fhir/fhir-resource/fhir-resource-outlet.directive.spec.ts b/frontend/src/app/components/fhir-card/fhir-card/fhir-card-outlet.directive.spec.ts similarity index 94% rename from frontend/src/app/components/fhir/fhir-resource/fhir-resource-outlet.directive.spec.ts rename to frontend/src/app/components/fhir-card/fhir-card/fhir-card-outlet.directive.spec.ts index 512ab875..cb392d1d 100644 --- a/frontend/src/app/components/fhir/fhir-resource/fhir-resource-outlet.directive.spec.ts +++ b/frontend/src/app/components/fhir-card/fhir-card/fhir-card-outlet.directive.spec.ts @@ -1,4 +1,4 @@ -import { FhirResourceOutletDirective } from './fhir-resource-outlet.directive'; +import { FhirCardOutletDirective } from './fhir-card-outlet.directive'; import { ComponentFactory, ComponentRef, @@ -66,11 +66,11 @@ class TestViewContainerRef extends ViewContainerRef { } -describe('FhirResourceOutletDirective', () => { +describe('FhirCardOutletDirective', () => { it('should create an instance', () => { - const directive = new FhirResourceOutletDirective(new TestViewContainerRef()); + const directive = new FhirCardOutletDirective(new TestViewContainerRef()); expect(directive).toBeTruthy(); }); }); diff --git a/frontend/src/app/components/resource-list/resource-list-outlet.directive.ts b/frontend/src/app/components/fhir-card/fhir-card/fhir-card-outlet.directive.ts similarity index 64% rename from frontend/src/app/components/resource-list/resource-list-outlet.directive.ts rename to frontend/src/app/components/fhir-card/fhir-card/fhir-card-outlet.directive.ts index c8888430..72a1964a 100644 --- a/frontend/src/app/components/resource-list/resource-list-outlet.directive.ts +++ b/frontend/src/app/components/fhir-card/fhir-card/fhir-card-outlet.directive.ts @@ -1,9 +1,9 @@ import {Directive, ViewContainerRef} from '@angular/core'; @Directive({ - selector: '[resourceListOutlet]' + selector: '[fhirCardOutlet]' }) -export class ResourceListOutletDirective { +export class FhirCardOutletDirective { constructor(public viewContainerRef: ViewContainerRef) { } diff --git a/frontend/src/app/components/fhir-card/fhir-card/fhir-card.component.html b/frontend/src/app/components/fhir-card/fhir-card/fhir-card.component.html new file mode 100644 index 00000000..4ba99c89 --- /dev/null +++ b/frontend/src/app/components/fhir-card/fhir-card/fhir-card.component.html @@ -0,0 +1 @@ + diff --git a/frontend/src/app/components/fhir/fhir-resource/fhir-resource.component.scss b/frontend/src/app/components/fhir-card/fhir-card/fhir-card.component.scss similarity index 100% rename from frontend/src/app/components/fhir/fhir-resource/fhir-resource.component.scss rename to frontend/src/app/components/fhir-card/fhir-card/fhir-card.component.scss diff --git a/frontend/src/app/components/fhir-card/fhir-card/fhir-card.component.spec.ts b/frontend/src/app/components/fhir-card/fhir-card/fhir-card.component.spec.ts new file mode 100644 index 00000000..1213c428 --- /dev/null +++ b/frontend/src/app/components/fhir-card/fhir-card/fhir-card.component.spec.ts @@ -0,0 +1,24 @@ +import { ComponentFixture, TestBed } from '@angular/core/testing'; + +import { FhirCardComponent } from './fhir-card.component'; +import {FhirCardOutletDirective} from './fhir-card-outlet.directive'; + +describe('FhirResourceComponent', () => { + let component: FhirCardComponent; + let fixture: ComponentFixture; + + beforeEach(async () => { + await TestBed.configureTestingModule({ + declarations: [ FhirCardComponent, FhirCardOutletDirective ], + }) + .compileComponents(); + + fixture = TestBed.createComponent(FhirCardComponent); + component = fixture.componentInstance; + fixture.detectChanges(); + }); + + it('should create', () => { + expect(component).toBeTruthy(); + }); +}); diff --git a/frontend/src/app/components/fhir/fhir-resource/fhir-resource.component.ts b/frontend/src/app/components/fhir-card/fhir-card/fhir-card.component.ts similarity index 85% rename from frontend/src/app/components/fhir/fhir-resource/fhir-resource.component.ts rename to frontend/src/app/components/fhir-card/fhir-card/fhir-card.component.ts index f87df80a..02ab8bb3 100644 --- a/frontend/src/app/components/fhir/fhir-resource/fhir-resource.component.ts +++ b/frontend/src/app/components/fhir-card/fhir-card/fhir-card.component.ts @@ -9,12 +9,12 @@ import { ViewChild } from '@angular/core'; import {BinaryModel} from '../../../../lib/models/resources/binary-model'; -import {FhirResourceOutletDirective} from './fhir-resource-outlet.directive'; +import {FhirCardOutletDirective} from './fhir-card-outlet.directive'; import {ResourceType} from '../../../../lib/models/constants'; import {FallbackComponent} from '../resources/fallback/fallback.component'; import {BinaryComponent} from '../resources/binary/binary.component'; -import {FhirResourceComponentInterface} from './fhir-resource-component-interface'; +import {FhirCardComponentInterface} from './fhir-card-component-interface'; import {ImmunizationComponent} from '../resources/immunization/immunization.component'; import {AllergyIntoleranceComponent} from '../resources/allergy-intolerance/allergy-intolerance.component'; import {MedicationComponent} from '../resources/medication/medication.component'; @@ -28,21 +28,23 @@ import {MediaComponent} from '../resources/media/media.component'; import {LocationComponent} from '../resources/location/location.component'; import {OrganizationComponent} from '../resources/organization/organization.component'; import {ObservationComponent} from '../resources/observation/observation.component'; +import {EncounterComponent} from '../resources/encounter/encounter.component'; @Component({ - selector: 'fhir-resource', + selector: 'fhir-card', changeDetection: ChangeDetectionStrategy.Default, - templateUrl: './fhir-resource.component.html', - styleUrls: ['./fhir-resource.component.scss'] + templateUrl: './fhir-card.component.html', + styleUrls: ['./fhir-card.component.scss'] }) -export class FhirResourceComponent implements OnInit, OnChanges { +export class FhirCardComponent implements OnInit, OnChanges { @Input() displayModel: FastenDisplayModel @Input() showDetails: boolean = true + @Input() isCollapsed: boolean = false //location to dynamically load the displayModel - @ViewChild(FhirResourceOutletDirective, {static: true}) fhirResourceOutlet!: FhirResourceOutletDirective; + @ViewChild(FhirCardOutletDirective, {static: true}) fhirCardOutlet!: FhirCardOutletDirective; constructor() { } @@ -55,21 +57,22 @@ export class FhirResourceComponent implements OnInit, OnChanges { loadComponent() { //clear the current outlet - const viewContainerRef = this.fhirResourceOutlet.viewContainerRef; + const viewContainerRef = this.fhirCardOutlet.viewContainerRef; viewContainerRef.clear(); let componentType = this.typeLookup(this.displayModel?.source_resource_type) if(componentType != null){ console.log("Attempting to create fhir display component", this.displayModel, componentType) - const componentRef = viewContainerRef.createComponent(componentType); + const componentRef = viewContainerRef.createComponent(componentType); componentRef.instance.displayModel = this.displayModel; componentRef.instance.showDetails = this.showDetails; + componentRef.instance.isCollapsed = this.isCollapsed; componentRef.instance.markForCheck() } } - typeLookup(resourceType: ResourceType): Type { + typeLookup(resourceType: ResourceType): Type { if(!resourceType){ //dont try to render anything if the resourceType isnt set. return null @@ -114,9 +117,9 @@ export class FhirResourceComponent implements OnInit, OnChanges { case "DocumentReference": { return DocumentReferenceComponent; } - // case "Encounter": { - // return ListEncounterComponent; - // } + case "Encounter": { + return EncounterComponent; + } // case "Goal": { // return ListGoalComponent; // } diff --git a/frontend/src/app/components/fhir/resources/allergy-intolerance/allergy-intolerance.component.html b/frontend/src/app/components/fhir-card/resources/allergy-intolerance/allergy-intolerance.component.html similarity index 100% rename from frontend/src/app/components/fhir/resources/allergy-intolerance/allergy-intolerance.component.html rename to frontend/src/app/components/fhir-card/resources/allergy-intolerance/allergy-intolerance.component.html diff --git a/frontend/src/app/components/fhir/resources/allergy-intolerance/allergy-intolerance.component.scss b/frontend/src/app/components/fhir-card/resources/allergy-intolerance/allergy-intolerance.component.scss similarity index 100% rename from frontend/src/app/components/fhir/resources/allergy-intolerance/allergy-intolerance.component.scss rename to frontend/src/app/components/fhir-card/resources/allergy-intolerance/allergy-intolerance.component.scss diff --git a/frontend/src/app/components/fhir/resources/allergy-intolerance/allergy-intolerance.component.spec.ts b/frontend/src/app/components/fhir-card/resources/allergy-intolerance/allergy-intolerance.component.spec.ts similarity index 100% rename from frontend/src/app/components/fhir/resources/allergy-intolerance/allergy-intolerance.component.spec.ts rename to frontend/src/app/components/fhir-card/resources/allergy-intolerance/allergy-intolerance.component.spec.ts diff --git a/frontend/src/app/components/fhir/resources/allergy-intolerance/allergy-intolerance.component.ts b/frontend/src/app/components/fhir-card/resources/allergy-intolerance/allergy-intolerance.component.ts similarity index 94% rename from frontend/src/app/components/fhir/resources/allergy-intolerance/allergy-intolerance.component.ts rename to frontend/src/app/components/fhir-card/resources/allergy-intolerance/allergy-intolerance.component.ts index aaef1d78..8e5ddc59 100644 --- a/frontend/src/app/components/fhir/resources/allergy-intolerance/allergy-intolerance.component.ts +++ b/frontend/src/app/components/fhir-card/resources/allergy-intolerance/allergy-intolerance.component.ts @@ -1,5 +1,5 @@ import {ChangeDetectorRef, Component, Input, OnInit} from '@angular/core'; -import {FhirResourceComponentInterface} from '../../fhir-resource/fhir-resource-component-interface'; +import {FhirCardComponentInterface} from '../../fhir-card/fhir-card-component-interface'; import {TableRowItem, TableRowItemDataType} from '../../common/table/table-row-item'; import {Router, RouterModule} from '@angular/router'; import {AllergyIntoleranceModel} from '../../../../../lib/models/resources/allergy-intolerance-model'; @@ -15,11 +15,10 @@ import {TableComponent} from "../../common/table/table.component"; templateUrl: './allergy-intolerance.component.html', styleUrls: ['./allergy-intolerance.component.scss'] }) -export class AllergyIntoleranceComponent implements OnInit, FhirResourceComponentInterface { +export class AllergyIntoleranceComponent implements OnInit, FhirCardComponentInterface { @Input() displayModel: AllergyIntoleranceModel @Input() showDetails: boolean = true - - isCollapsed: boolean = false + @Input() isCollapsed: boolean = false tableData: TableRowItem[] = [] diff --git a/frontend/src/app/components/fhir/resources/allergy-intolerance/allergy-intolerance.stories.ts b/frontend/src/app/components/fhir-card/resources/allergy-intolerance/allergy-intolerance.stories.ts similarity index 89% rename from frontend/src/app/components/fhir/resources/allergy-intolerance/allergy-intolerance.stories.ts rename to frontend/src/app/components/fhir-card/resources/allergy-intolerance/allergy-intolerance.stories.ts index 6477bb29..7894bda2 100644 --- a/frontend/src/app/components/fhir/resources/allergy-intolerance/allergy-intolerance.stories.ts +++ b/frontend/src/app/components/fhir-card/resources/allergy-intolerance/allergy-intolerance.stories.ts @@ -10,7 +10,7 @@ import R4Example3Json from "../../../../../lib/fixtures/r4/resources/allergyInto // More on how to set up stories at: https://storybook.js.org/docs/angular/writing-stories/introduction const meta: Meta = { - title: 'Fhir/AllergyIntolerance', + title: 'Fhir Card/AllergyIntolerance', component: AllergyIntoleranceComponent, decorators: [ // moduleMetadata({ @@ -51,8 +51,8 @@ export const R4Example1: Story = { }; let aiDisplayModel2 = new AllergyIntoleranceModel(R4Example2Json, fhirVersions.R4) -aiDisplayModel1.source_id = '123-456-789' -aiDisplayModel1.source_resource_id = '123-456-789' +aiDisplayModel2.source_id = '123-456-789' +aiDisplayModel2.source_resource_id = '123-456-789' export const R4Example2: Story = { args: { displayModel: aiDisplayModel2 @@ -60,8 +60,8 @@ export const R4Example2: Story = { }; let aiDisplayModel3 = new AllergyIntoleranceModel(R4Example3Json, fhirVersions.R4) -aiDisplayModel1.source_id = '123-456-789' -aiDisplayModel1.source_resource_id = '123-456-789' +aiDisplayModel3.source_id = '123-456-789' +aiDisplayModel3.source_resource_id = '123-456-789' export const R4Example3: Story = { args: { displayModel: aiDisplayModel3 diff --git a/frontend/src/app/components/fhir/resources/binary/binary.component.html b/frontend/src/app/components/fhir-card/resources/binary/binary.component.html similarity index 100% rename from frontend/src/app/components/fhir/resources/binary/binary.component.html rename to frontend/src/app/components/fhir-card/resources/binary/binary.component.html diff --git a/frontend/src/app/components/fhir/resources/binary/binary.component.scss b/frontend/src/app/components/fhir-card/resources/binary/binary.component.scss similarity index 100% rename from frontend/src/app/components/fhir/resources/binary/binary.component.scss rename to frontend/src/app/components/fhir-card/resources/binary/binary.component.scss diff --git a/frontend/src/app/components/fhir/resources/binary/binary.component.spec.ts b/frontend/src/app/components/fhir-card/resources/binary/binary.component.spec.ts similarity index 100% rename from frontend/src/app/components/fhir/resources/binary/binary.component.spec.ts rename to frontend/src/app/components/fhir-card/resources/binary/binary.component.spec.ts diff --git a/frontend/src/app/components/fhir/resources/binary/binary.component.ts b/frontend/src/app/components/fhir-card/resources/binary/binary.component.ts similarity index 92% rename from frontend/src/app/components/fhir/resources/binary/binary.component.ts rename to frontend/src/app/components/fhir-card/resources/binary/binary.component.ts index 259deec3..28753ab4 100644 --- a/frontend/src/app/components/fhir/resources/binary/binary.component.ts +++ b/frontend/src/app/components/fhir-card/resources/binary/binary.component.ts @@ -1,6 +1,6 @@ import {ChangeDetectorRef, Component, Input, OnInit} from '@angular/core'; import {BinaryModel} from '../../../../../lib/models/resources/binary-model'; -import {FhirResourceComponentInterface} from '../../fhir-resource/fhir-resource-component-interface'; +import {FhirCardComponentInterface} from '../../fhir-card/fhir-card-component-interface'; import {Router, RouterModule} from '@angular/router'; import {AttachmentModel} from '../../../../../lib/models/datatypes/attachment-model'; import {FastenApiService} from '../../../../services/fasten-api.service'; @@ -37,11 +37,12 @@ import {AuthService} from "../../../../services/auth.service"; templateUrl: './binary.component.html', styleUrls: ['./binary.component.scss'] }) -export class BinaryComponent implements OnInit, FhirResourceComponentInterface { +export class BinaryComponent implements OnInit, FhirCardComponentInterface { @Input() displayModel: BinaryModel @Input() showDetails: boolean = true @Input() attachmentSourceId: string @Input() attachmentModel: AttachmentModel //can only have attachmentModel or binaryModel, not both. + @Input() isCollapsed: boolean = false loading: boolean = false constructor(public changeRef: ChangeDetectorRef, public router: Router, public fastenApi: FastenApiService) {} diff --git a/frontend/src/app/components/fhir/resources/binary/binary.stories.ts b/frontend/src/app/components/fhir-card/resources/binary/binary.stories.ts similarity index 99% rename from frontend/src/app/components/fhir/resources/binary/binary.stories.ts rename to frontend/src/app/components/fhir-card/resources/binary/binary.stories.ts index 96769c2c..912f8e20 100644 --- a/frontend/src/app/components/fhir/resources/binary/binary.stories.ts +++ b/frontend/src/app/components/fhir-card/resources/binary/binary.stories.ts @@ -18,7 +18,7 @@ import {HTTP_CLIENT_TOKEN} from '../../../../dependency-injection'; // More on how to set up stories at: https://storybook.js.org/docs/angular/writing-stories/introduction const meta: Meta = { - title: 'Fhir/Binary', + title: 'Fhir Card/Binary', component: BinaryComponent, decorators: [ moduleMetadata({ diff --git a/frontend/src/app/components/fhir/resources/diagnostic-report/diagnostic-report.component.html b/frontend/src/app/components/fhir-card/resources/diagnostic-report/diagnostic-report.component.html similarity index 100% rename from frontend/src/app/components/fhir/resources/diagnostic-report/diagnostic-report.component.html rename to frontend/src/app/components/fhir-card/resources/diagnostic-report/diagnostic-report.component.html diff --git a/frontend/src/app/components/fhir/resources/diagnostic-report/diagnostic-report.component.scss b/frontend/src/app/components/fhir-card/resources/diagnostic-report/diagnostic-report.component.scss similarity index 100% rename from frontend/src/app/components/fhir/resources/diagnostic-report/diagnostic-report.component.scss rename to frontend/src/app/components/fhir-card/resources/diagnostic-report/diagnostic-report.component.scss diff --git a/frontend/src/app/components/fhir/resources/diagnostic-report/diagnostic-report.component.spec.ts b/frontend/src/app/components/fhir-card/resources/diagnostic-report/diagnostic-report.component.spec.ts similarity index 82% rename from frontend/src/app/components/fhir/resources/diagnostic-report/diagnostic-report.component.spec.ts rename to frontend/src/app/components/fhir-card/resources/diagnostic-report/diagnostic-report.component.spec.ts index ca405c4f..288b7d37 100644 --- a/frontend/src/app/components/fhir/resources/diagnostic-report/diagnostic-report.component.spec.ts +++ b/frontend/src/app/components/fhir-card/resources/diagnostic-report/diagnostic-report.component.spec.ts @@ -2,6 +2,7 @@ import { ComponentFixture, TestBed } from '@angular/core/testing'; import { DiagnosticReportComponent } from './diagnostic-report.component'; import {NgbCollapseModule} from '@ng-bootstrap/ng-bootstrap'; +import {RouterTestingModule} from '@angular/router/testing'; describe('DiagnosticReportComponent', () => { let component: DiagnosticReportComponent; @@ -9,8 +10,7 @@ describe('DiagnosticReportComponent', () => { beforeEach(async () => { await TestBed.configureTestingModule({ - declarations: [ DiagnosticReportComponent ], - imports: [NgbCollapseModule] + imports: [NgbCollapseModule, DiagnosticReportComponent, RouterTestingModule] }) .compileComponents(); diff --git a/frontend/src/app/components/fhir/resources/diagnostic-report/diagnostic-report.component.ts b/frontend/src/app/components/fhir-card/resources/diagnostic-report/diagnostic-report.component.ts similarity index 69% rename from frontend/src/app/components/fhir/resources/diagnostic-report/diagnostic-report.component.ts rename to frontend/src/app/components/fhir-card/resources/diagnostic-report/diagnostic-report.component.ts index e0091d93..1fbb454a 100644 --- a/frontend/src/app/components/fhir/resources/diagnostic-report/diagnostic-report.component.ts +++ b/frontend/src/app/components/fhir-card/resources/diagnostic-report/diagnostic-report.component.ts @@ -1,22 +1,31 @@ import {ChangeDetectorRef, Component, Input, OnInit} from '@angular/core'; -import {FhirResourceComponentInterface} from '../../fhir-resource/fhir-resource-component-interface'; +import {FhirCardComponentInterface} from '../../fhir-card/fhir-card-component-interface'; import {TableRowItem, TableRowItemDataType} from '../../common/table/table-row-item'; -import {Router} from '@angular/router'; +import {Router, RouterModule} from '@angular/router'; import {DiagnosticReportModel} from '../../../../../lib/models/resources/diagnostic-report-model'; +import {NgbCollapseModule} from '@ng-bootstrap/ng-bootstrap'; +import {CommonModule} from '@angular/common'; +import {BadgeComponent} from '../../common/badge/badge.component'; +import {TableComponent} from '../../common/table/table.component'; +import {BinaryComponent} from '../binary/binary.component'; +import {GlossaryLookupComponent} from '../../../glossary-lookup/glossary-lookup.component'; @Component({ - selector: 'app-diagnostic-report', + standalone: true, + imports: [NgbCollapseModule, CommonModule, BadgeComponent, TableComponent, RouterModule, BinaryComponent, GlossaryLookupComponent], + selector: 'fhir-diagnostic-report', templateUrl: './diagnostic-report.component.html', styleUrls: ['./diagnostic-report.component.scss'] }) -export class DiagnosticReportComponent implements OnInit, FhirResourceComponentInterface { +export class DiagnosticReportComponent implements OnInit, FhirCardComponentInterface { @Input() displayModel: DiagnosticReportModel @Input() showDetails: boolean = true + @Input() isCollapsed: boolean = false + //these are used to populate the description of the resource. May not be available for all resources resourceCode?: string; resourceCodeSystem?: string; - isCollapsed: boolean = false tableData: TableRowItem[] = [] constructor(public changeRef: ChangeDetectorRef, public router: Router) {} diff --git a/frontend/src/app/components/fhir/resources/document-reference/document-reference.component.html b/frontend/src/app/components/fhir-card/resources/document-reference/document-reference.component.html similarity index 100% rename from frontend/src/app/components/fhir/resources/document-reference/document-reference.component.html rename to frontend/src/app/components/fhir-card/resources/document-reference/document-reference.component.html diff --git a/frontend/src/app/components/fhir/resources/document-reference/document-reference.component.scss b/frontend/src/app/components/fhir-card/resources/document-reference/document-reference.component.scss similarity index 100% rename from frontend/src/app/components/fhir/resources/document-reference/document-reference.component.scss rename to frontend/src/app/components/fhir-card/resources/document-reference/document-reference.component.scss diff --git a/frontend/src/app/components/fhir/resources/document-reference/document-reference.component.spec.ts b/frontend/src/app/components/fhir-card/resources/document-reference/document-reference.component.spec.ts similarity index 80% rename from frontend/src/app/components/fhir/resources/document-reference/document-reference.component.spec.ts rename to frontend/src/app/components/fhir-card/resources/document-reference/document-reference.component.spec.ts index 25e07158..152bc364 100644 --- a/frontend/src/app/components/fhir/resources/document-reference/document-reference.component.spec.ts +++ b/frontend/src/app/components/fhir-card/resources/document-reference/document-reference.component.spec.ts @@ -2,6 +2,7 @@ import { ComponentFixture, TestBed } from '@angular/core/testing'; import { DocumentReferenceComponent } from './document-reference.component'; import {NgbCollapseModule} from '@ng-bootstrap/ng-bootstrap'; +import {RouterTestingModule} from '@angular/router/testing'; describe('DocumentReferenceComponent', () => { let component: DocumentReferenceComponent; @@ -9,8 +10,8 @@ describe('DocumentReferenceComponent', () => { beforeEach(async () => { await TestBed.configureTestingModule({ - imports: [NgbCollapseModule], - declarations: [ DocumentReferenceComponent ] + imports: [NgbCollapseModule, DocumentReferenceComponent, RouterTestingModule], + declarations: [ ] }) .compileComponents(); diff --git a/frontend/src/app/components/fhir/resources/document-reference/document-reference.component.ts b/frontend/src/app/components/fhir-card/resources/document-reference/document-reference.component.ts similarity index 64% rename from frontend/src/app/components/fhir/resources/document-reference/document-reference.component.ts rename to frontend/src/app/components/fhir-card/resources/document-reference/document-reference.component.ts index 1965a75f..a1d1fc5b 100644 --- a/frontend/src/app/components/fhir/resources/document-reference/document-reference.component.ts +++ b/frontend/src/app/components/fhir-card/resources/document-reference/document-reference.component.ts @@ -1,19 +1,27 @@ import {ChangeDetectorRef, Component, Input, OnInit} from '@angular/core'; import {DiagnosticReportModel} from '../../../../../lib/models/resources/diagnostic-report-model'; import {TableRowItem, TableRowItemDataType} from '../../common/table/table-row-item'; -import {Router} from '@angular/router'; +import {Router, RouterModule} from '@angular/router'; import {DocumentReferenceModel} from '../../../../../lib/models/resources/document-reference-model'; -import {FhirResourceComponentInterface} from '../../fhir-resource/fhir-resource-component-interface'; +import {FhirCardComponentInterface} from '../../fhir-card/fhir-card-component-interface'; +import {NgbCollapseModule} from '@ng-bootstrap/ng-bootstrap'; +import {CommonModule} from '@angular/common'; +import {BadgeComponent} from '../../common/badge/badge.component'; +import {TableComponent} from '../../common/table/table.component'; +import {BinaryComponent} from '../binary/binary.component'; +import {GlossaryLookupComponent} from '../../../glossary-lookup/glossary-lookup.component'; @Component({ - selector: 'app-document-reference', + standalone: true, + imports: [NgbCollapseModule, CommonModule, BadgeComponent, TableComponent, RouterModule, BinaryComponent], + selector: 'fhir-document-reference', templateUrl: './document-reference.component.html', styleUrls: ['./document-reference.component.scss'] }) -export class DocumentReferenceComponent implements OnInit, FhirResourceComponentInterface { +export class DocumentReferenceComponent implements OnInit, FhirCardComponentInterface { @Input() displayModel: DocumentReferenceModel @Input() showDetails: boolean = true - isCollapsed: boolean = false + @Input() isCollapsed: boolean = false tableData: TableRowItem[] = [] constructor(public changeRef: ChangeDetectorRef, public router: Router) {} diff --git a/frontend/src/app/components/fhir-card/resources/encounter/encounter.component.html b/frontend/src/app/components/fhir-card/resources/encounter/encounter.component.html new file mode 100644 index 00000000..ef29c725 --- /dev/null +++ b/frontend/src/app/components/fhir-card/resources/encounter/encounter.component.html @@ -0,0 +1,19 @@ +
+
+
+
{{displayModel?.sort_title || displayModel?.code?.text}}
+

Start date {{displayModel?.period_start | date}}

+
+ + + + + +
+
+ +
+
+ details +
+
diff --git a/frontend/src/app/components/fhir/resources/fallback/fallback.component.scss b/frontend/src/app/components/fhir-card/resources/encounter/encounter.component.scss similarity index 100% rename from frontend/src/app/components/fhir/resources/fallback/fallback.component.scss rename to frontend/src/app/components/fhir-card/resources/encounter/encounter.component.scss diff --git a/frontend/src/app/components/fhir-card/resources/encounter/encounter.component.spec.ts b/frontend/src/app/components/fhir-card/resources/encounter/encounter.component.spec.ts new file mode 100644 index 00000000..037f79ec --- /dev/null +++ b/frontend/src/app/components/fhir-card/resources/encounter/encounter.component.spec.ts @@ -0,0 +1,24 @@ +import { ComponentFixture, TestBed } from '@angular/core/testing'; + +import { EncounterComponent } from './encounter.component'; +import {RouterTestingModule} from '@angular/router/testing'; + +describe('EncounterComponent', () => { + let component: EncounterComponent; + let fixture: ComponentFixture; + + beforeEach(async () => { + await TestBed.configureTestingModule({ + imports: [ EncounterComponent, RouterTestingModule ] + }) + .compileComponents(); + + fixture = TestBed.createComponent(EncounterComponent); + component = fixture.componentInstance; + fixture.detectChanges(); + }); + + it('should create', () => { + expect(component).toBeTruthy(); + }); +}); diff --git a/frontend/src/app/components/fhir-card/resources/encounter/encounter.component.ts b/frontend/src/app/components/fhir-card/resources/encounter/encounter.component.ts new file mode 100644 index 00000000..926bb508 --- /dev/null +++ b/frontend/src/app/components/fhir-card/resources/encounter/encounter.component.ts @@ -0,0 +1,50 @@ +import {ChangeDetectorRef, Component, Input, OnInit} from '@angular/core'; +import {NgbCollapseModule} from '@ng-bootstrap/ng-bootstrap'; +import {CommonModule} from '@angular/common'; +import {BadgeComponent} from '../../common/badge/badge.component'; +import {TableComponent} from '../../common/table/table.component'; +import {GlossaryLookupComponent} from '../../../glossary-lookup/glossary-lookup.component'; +import {Router, RouterModule} from '@angular/router'; +import {TableRowItem, TableRowItemDataType} from '../../common/table/table-row-item'; +import {FhirCardComponentInterface} from '../../fhir-card/fhir-card-component-interface'; +import {EncounterModel} from '../../../../../lib/models/resources/encounter-model'; + +@Component({ + standalone: true, + imports: [NgbCollapseModule, CommonModule, BadgeComponent, TableComponent, GlossaryLookupComponent, RouterModule], + selector: 'fhir-encounter', + templateUrl: './encounter.component.html', + styleUrls: ['./encounter.component.scss'] +}) +export class EncounterComponent implements OnInit, FhirCardComponentInterface { + @Input() displayModel: EncounterModel | null + @Input() showDetails: boolean = true + @Input() isCollapsed: boolean = false + + //these are used to populate the description of the resource. May not be available for all resources + resourceCode?: string; + resourceCodeSystem?: string; + + tableData: TableRowItem[] = [] + + constructor(public changeRef: ChangeDetectorRef, public router: Router) { } + + ngOnInit(): void { + this.tableData = [ + { + label: 'Type', + data: this.displayModel?.encounter_type?.[0], + data_type: TableRowItemDataType.CodableConcept, + enabled: !!this.displayModel?.encounter_type?.[0], + }, + { + label: 'Location', + data: this.displayModel?.location_display, + enabled: !!this.displayModel?.location_display, + }, + ]; + } + markForCheck(){ + this.changeRef.markForCheck() + } +} diff --git a/frontend/src/app/components/fhir-card/resources/encounter/encounter.stories.ts b/frontend/src/app/components/fhir-card/resources/encounter/encounter.stories.ts new file mode 100644 index 00000000..801f1a6c --- /dev/null +++ b/frontend/src/app/components/fhir-card/resources/encounter/encounter.stories.ts @@ -0,0 +1,70 @@ +import type { Meta, StoryObj } from '@storybook/angular'; +import {EncounterComponent} from "./encounter.component"; +import {EncounterModel} from "../../../../../lib/models/resources/encounter-model"; +import {fhirVersions} from "../../../../../lib/models/constants"; +import R4Example1Json from "../../../../../lib/fixtures/r4/resources/encounter/example1.json"; +import R4Example2Json from "../../../../../lib/fixtures/r4/resources/encounter/example2.json"; +import R4Example3Json from "../../../../../lib/fixtures/r4/resources/encounter/example3.json"; + + + +// More on how to set up stories at: https://storybook.js.org/docs/angular/writing-stories/introduction +const meta: Meta = { + title: 'Fhir Card/Encounter', + component: EncounterComponent, + decorators: [ + // moduleMetadata({ + // imports: [AppModule] + // }) + // applicationConfig({ + // providers: [importProvidersFrom(AppModule)], + // }), + ], + tags: ['autodocs'], + render: (args: EncounterComponent) => ({ + props: { + backgroundColor: null, + ...args, + }, + }), + argTypes: { + displayModel: { + control: 'object', + }, + showDetails: { + control: 'boolean', + } + }, +}; + +export default meta; +type Story = StoryObj; + +// More on writing stories with args: https://storybook.js.org/docs/angular/writing-stories/args +let encounterDisplayModel1 = new EncounterModel(R4Example1Json, fhirVersions.R4) +encounterDisplayModel1.source_id = '123-456-789' +encounterDisplayModel1.source_resource_id = '123-456-789' +export const R4Example1: Story = { + args: { + displayModel: encounterDisplayModel1 + } +}; + +let encounterDisplayModel2 = new EncounterModel(R4Example2Json, fhirVersions.R4) +encounterDisplayModel2.source_id = '123-456-789' +encounterDisplayModel2.source_resource_id = '123-456-789' +export const R4Example2: Story = { + args: { + displayModel: encounterDisplayModel2 + } +}; + +let encounterDisplayModel3 = new EncounterModel(R4Example3Json, fhirVersions.R4) +encounterDisplayModel3.source_id = '123-456-789' +encounterDisplayModel3.source_resource_id = '123-456-789' +export const R4Example3: Story = { + args: { + displayModel: encounterDisplayModel3 + } +}; + diff --git a/frontend/src/app/components/fhir/resources/fallback/fallback.component.html b/frontend/src/app/components/fhir-card/resources/fallback/fallback.component.html similarity index 100% rename from frontend/src/app/components/fhir/resources/fallback/fallback.component.html rename to frontend/src/app/components/fhir-card/resources/fallback/fallback.component.html diff --git a/frontend/src/app/components/fhir/resources/immunization/immunization.component.scss b/frontend/src/app/components/fhir-card/resources/fallback/fallback.component.scss similarity index 100% rename from frontend/src/app/components/fhir/resources/immunization/immunization.component.scss rename to frontend/src/app/components/fhir-card/resources/fallback/fallback.component.scss diff --git a/frontend/src/app/components/fhir/resources/fallback/fallback.component.spec.ts b/frontend/src/app/components/fhir-card/resources/fallback/fallback.component.spec.ts similarity index 93% rename from frontend/src/app/components/fhir/resources/fallback/fallback.component.spec.ts rename to frontend/src/app/components/fhir-card/resources/fallback/fallback.component.spec.ts index 3db533ce..87ee69b2 100644 --- a/frontend/src/app/components/fhir/resources/fallback/fallback.component.spec.ts +++ b/frontend/src/app/components/fhir-card/resources/fallback/fallback.component.spec.ts @@ -8,7 +8,7 @@ describe('FallbackComponent', () => { beforeEach(async () => { await TestBed.configureTestingModule({ - declarations: [ FallbackComponent ] + imports: [ FallbackComponent ] }) .compileComponents(); diff --git a/frontend/src/app/components/fhir/resources/fallback/fallback.component.ts b/frontend/src/app/components/fhir-card/resources/fallback/fallback.component.ts similarity index 55% rename from frontend/src/app/components/fhir/resources/fallback/fallback.component.ts rename to frontend/src/app/components/fhir-card/resources/fallback/fallback.component.ts index 8b41b0a9..c80e2db2 100644 --- a/frontend/src/app/components/fhir/resources/fallback/fallback.component.ts +++ b/frontend/src/app/components/fhir-card/resources/fallback/fallback.component.ts @@ -1,16 +1,22 @@ import {ChangeDetectorRef, Component, Input, OnInit} from '@angular/core'; import {BinaryModel} from '../../../../../lib/models/resources/binary-model'; import {Router} from '@angular/router'; -import {FhirResourceComponentInterface} from '../../fhir-resource/fhir-resource-component-interface'; +import {FhirCardComponentInterface} from '../../fhir-card/fhir-card-component-interface'; +import {NgbCollapseModule} from '@ng-bootstrap/ng-bootstrap'; +import {CommonModule} from '@angular/common'; +import {HighlightModule} from 'ngx-highlightjs'; @Component({ + standalone: true, + imports: [NgbCollapseModule, HighlightModule, CommonModule], selector: 'fhir-fallback', templateUrl: './fallback.component.html', styleUrls: ['./fallback.component.scss'] }) -export class FallbackComponent implements OnInit, FhirResourceComponentInterface { +export class FallbackComponent implements OnInit, FhirCardComponentInterface { @Input() displayModel: BinaryModel @Input() showDetails: boolean = true + @Input() isCollapsed: boolean = false constructor(public changeRef: ChangeDetectorRef, public router: Router) {} diff --git a/frontend/src/app/components/fhir/resources/immunization/immunization.component.html b/frontend/src/app/components/fhir-card/resources/immunization/immunization.component.html similarity index 100% rename from frontend/src/app/components/fhir/resources/immunization/immunization.component.html rename to frontend/src/app/components/fhir-card/resources/immunization/immunization.component.html diff --git a/frontend/src/app/components/fhir/resources/location/location.component.scss b/frontend/src/app/components/fhir-card/resources/immunization/immunization.component.scss similarity index 100% rename from frontend/src/app/components/fhir/resources/location/location.component.scss rename to frontend/src/app/components/fhir-card/resources/immunization/immunization.component.scss diff --git a/frontend/src/app/components/fhir/resources/immunization/immunization.component.spec.ts b/frontend/src/app/components/fhir-card/resources/immunization/immunization.component.spec.ts similarity index 100% rename from frontend/src/app/components/fhir/resources/immunization/immunization.component.spec.ts rename to frontend/src/app/components/fhir-card/resources/immunization/immunization.component.spec.ts diff --git a/frontend/src/app/components/fhir/resources/immunization/immunization.component.ts b/frontend/src/app/components/fhir-card/resources/immunization/immunization.component.ts similarity index 92% rename from frontend/src/app/components/fhir/resources/immunization/immunization.component.ts rename to frontend/src/app/components/fhir-card/resources/immunization/immunization.component.ts index 18351c03..916147a1 100644 --- a/frontend/src/app/components/fhir/resources/immunization/immunization.component.ts +++ b/frontend/src/app/components/fhir-card/resources/immunization/immunization.component.ts @@ -1,5 +1,5 @@ import {ChangeDetectorRef, Component, Input, OnInit} from '@angular/core'; -import {FhirResourceComponentInterface} from '../../fhir-resource/fhir-resource-component-interface'; +import {FhirCardComponentInterface} from '../../fhir-card/fhir-card-component-interface'; import {Router, RouterModule} from '@angular/router'; import {ImmunizationModel} from '../../../../../lib/models/resources/immunization-model'; import {TableRowItem, TableRowItemDataType} from '../../common/table/table-row-item'; @@ -16,11 +16,10 @@ import {TableComponent} from "../../common/table/table.component"; templateUrl: './immunization.component.html', styleUrls: ['./immunization.component.scss'] }) -export class ImmunizationComponent implements OnInit, FhirResourceComponentInterface { +export class ImmunizationComponent implements OnInit, FhirCardComponentInterface { @Input() displayModel: ImmunizationModel @Input() showDetails: boolean = true - - isCollapsed: boolean = false + @Input() isCollapsed: boolean = false tableData: TableRowItem[] = [] diff --git a/frontend/src/app/components/fhir/resources/immunization/immunization.stories.ts b/frontend/src/app/components/fhir-card/resources/immunization/immunization.stories.ts similarity index 98% rename from frontend/src/app/components/fhir/resources/immunization/immunization.stories.ts rename to frontend/src/app/components/fhir-card/resources/immunization/immunization.stories.ts index 0e454c35..de505a4c 100644 --- a/frontend/src/app/components/fhir/resources/immunization/immunization.stories.ts +++ b/frontend/src/app/components/fhir-card/resources/immunization/immunization.stories.ts @@ -10,7 +10,7 @@ import {ImmunizationModel} from "../../../../../lib/models/resources/immunizatio // More on how to set up stories at: https://storybook.js.org/docs/angular/writing-stories/introduction const meta: Meta = { - title: 'Fhir/Immunization', + title: 'Fhir Card/Immunization', component: ImmunizationComponent, decorators: [ // moduleMetadata({ diff --git a/frontend/src/app/components/fhir/resources/location/location.component.html b/frontend/src/app/components/fhir-card/resources/location/location.component.html similarity index 100% rename from frontend/src/app/components/fhir/resources/location/location.component.html rename to frontend/src/app/components/fhir-card/resources/location/location.component.html diff --git a/frontend/src/app/components/fhir/resources/media/media.component.scss b/frontend/src/app/components/fhir-card/resources/location/location.component.scss similarity index 100% rename from frontend/src/app/components/fhir/resources/media/media.component.scss rename to frontend/src/app/components/fhir-card/resources/location/location.component.scss diff --git a/frontend/src/app/components/fhir/resources/location/location.component.spec.ts b/frontend/src/app/components/fhir-card/resources/location/location.component.spec.ts similarity index 82% rename from frontend/src/app/components/fhir/resources/location/location.component.spec.ts rename to frontend/src/app/components/fhir-card/resources/location/location.component.spec.ts index ef7bda14..5606538c 100644 --- a/frontend/src/app/components/fhir/resources/location/location.component.spec.ts +++ b/frontend/src/app/components/fhir-card/resources/location/location.component.spec.ts @@ -1,6 +1,7 @@ import { ComponentFixture, TestBed } from '@angular/core/testing'; import { LocationComponent } from './location.component'; +import {RouterTestingModule} from '@angular/router/testing'; describe('LocationComponent', () => { let component: LocationComponent; @@ -8,7 +9,7 @@ describe('LocationComponent', () => { beforeEach(async () => { await TestBed.configureTestingModule({ - declarations: [ LocationComponent ] + imports: [ RouterTestingModule, LocationComponent ] }) .compileComponents(); diff --git a/frontend/src/app/components/fhir/resources/location/location.component.ts b/frontend/src/app/components/fhir-card/resources/location/location.component.ts similarity index 92% rename from frontend/src/app/components/fhir/resources/location/location.component.ts rename to frontend/src/app/components/fhir-card/resources/location/location.component.ts index 6d484911..9e30f5df 100644 --- a/frontend/src/app/components/fhir/resources/location/location.component.ts +++ b/frontend/src/app/components/fhir-card/resources/location/location.component.ts @@ -4,7 +4,7 @@ import {CommonModule} from '@angular/common'; import {BadgeComponent} from '../../common/badge/badge.component'; import {TableComponent} from '../../common/table/table.component'; import {Router, RouterModule} from '@angular/router'; -import {FhirResourceComponentInterface} from '../../fhir-resource/fhir-resource-component-interface'; +import {FhirCardComponentInterface} from '../../fhir-card/fhir-card-component-interface'; import {ImmunizationModel} from '../../../../../lib/models/resources/immunization-model'; import {TableRowItem, TableRowItemDataType} from '../../common/table/table-row-item'; import * as _ from 'lodash'; @@ -17,11 +17,11 @@ import {LocationModel} from '../../../../../lib/models/resources/location-model' templateUrl: './location.component.html', styleUrls: ['./location.component.scss'] }) -export class LocationComponent implements OnInit, FhirResourceComponentInterface { +export class LocationComponent implements OnInit, FhirCardComponentInterface { @Input() displayModel: LocationModel @Input() showDetails: boolean = true + @Input() isCollapsed: boolean = false - isCollapsed: boolean = false tableData: TableRowItem[] = [] constructor(public changeRef: ChangeDetectorRef, public router: Router) { } diff --git a/frontend/src/app/components/fhir-card/resources/location/location.stories.ts b/frontend/src/app/components/fhir-card/resources/location/location.stories.ts new file mode 100644 index 00000000..d1bdfbfa --- /dev/null +++ b/frontend/src/app/components/fhir-card/resources/location/location.stories.ts @@ -0,0 +1,59 @@ +import type { Meta, StoryObj } from '@storybook/angular'; +import {fhirVersions} from "../../../../../lib/models/constants"; +import R4Example1Json from "../../../../../lib/fixtures/r4/resources/location/example1.json"; +import R4Example2Json from "../../../../../lib/fixtures/r4/resources/location/example2.json"; +import {LocationComponent} from "./location.component"; +import {LocationModel} from "../../../../../lib/models/resources/location-model"; + + + +// More on how to set up stories at: https://storybook.js.org/docs/angular/writing-stories/introduction +const meta: Meta = { + title: 'Fhir Card/Location', + component: LocationComponent, + decorators: [ + // moduleMetadata({ + // imports: [AppModule] + // }) + // applicationConfig({ + // providers: [importProvidersFrom(AppModule)], + // }), + ], + tags: ['autodocs'], + render: (args: LocationComponent) => ({ + props: { + backgroundColor: null, + ...args, + }, + }), + argTypes: { + displayModel: { + control: 'object', + }, + showDetails: { + control: 'boolean', + } + }, +}; + +export default meta; +type Story = StoryObj; + +// More on writing stories with args: https://storybook.js.org/docs/angular/writing-stories/args +let r4Example1DisplayModel = new LocationModel(R4Example1Json, fhirVersions.R4) +r4Example1DisplayModel.source_id = '123-456-789' +r4Example1DisplayModel.source_resource_id = '123-456-789' +export const R4Example1: Story = { + args: { + displayModel: r4Example1DisplayModel + } +}; + +let r4Example2DisplayModel = new LocationModel(R4Example2Json, fhirVersions.R4) +r4Example2DisplayModel.source_id = '123-456-789' +r4Example2DisplayModel.source_resource_id = '123-456-789' +export const R4Example2: Story = { + args: { + displayModel: r4Example2DisplayModel + } +}; diff --git a/frontend/src/app/components/fhir/resources/media/media.component.html b/frontend/src/app/components/fhir-card/resources/media/media.component.html similarity index 100% rename from frontend/src/app/components/fhir/resources/media/media.component.html rename to frontend/src/app/components/fhir-card/resources/media/media.component.html diff --git a/frontend/src/app/components/fhir/resources/medication-request/medication-request.component.scss b/frontend/src/app/components/fhir-card/resources/media/media.component.scss similarity index 100% rename from frontend/src/app/components/fhir/resources/medication-request/medication-request.component.scss rename to frontend/src/app/components/fhir-card/resources/media/media.component.scss diff --git a/frontend/src/app/components/fhir/resources/media/media.component.spec.ts b/frontend/src/app/components/fhir-card/resources/media/media.component.spec.ts similarity index 87% rename from frontend/src/app/components/fhir/resources/media/media.component.spec.ts rename to frontend/src/app/components/fhir-card/resources/media/media.component.spec.ts index e1c57eb2..a49c0f71 100644 --- a/frontend/src/app/components/fhir/resources/media/media.component.spec.ts +++ b/frontend/src/app/components/fhir-card/resources/media/media.component.spec.ts @@ -9,9 +9,7 @@ describe('MediaComponent', () => { beforeEach(async () => { await TestBed.configureTestingModule({ - declarations: [ MediaComponent ], - imports: [NgbCollapseModule, RouterTestingModule], - + imports: [NgbCollapseModule, RouterTestingModule, MediaComponent], }) .compileComponents(); diff --git a/frontend/src/app/components/fhir/resources/media/media.component.ts b/frontend/src/app/components/fhir-card/resources/media/media.component.ts similarity index 63% rename from frontend/src/app/components/fhir/resources/media/media.component.ts rename to frontend/src/app/components/fhir-card/resources/media/media.component.ts index aa0a5acf..64ad2062 100644 --- a/frontend/src/app/components/fhir/resources/media/media.component.ts +++ b/frontend/src/app/components/fhir-card/resources/media/media.component.ts @@ -1,19 +1,26 @@ import {ChangeDetectorRef, Component, Input, OnInit} from '@angular/core'; import {DocumentReferenceModel} from '../../../../../lib/models/resources/document-reference-model'; import {TableRowItem, TableRowItemDataType} from '../../common/table/table-row-item'; -import {Router} from '@angular/router'; -import {FhirResourceComponentInterface} from '../../fhir-resource/fhir-resource-component-interface'; +import {Router, RouterModule} from '@angular/router'; +import {FhirCardComponentInterface} from '../../fhir-card/fhir-card-component-interface'; import {MediaModel} from '../../../../../lib/models/resources/media-model'; +import {NgbCollapseModule} from '@ng-bootstrap/ng-bootstrap'; +import {CommonModule} from '@angular/common'; +import {BadgeComponent} from '../../common/badge/badge.component'; +import {TableComponent} from '../../common/table/table.component'; +import {BinaryComponent} from '../binary/binary.component'; @Component({ - selector: 'app-media', + standalone: true, + imports: [NgbCollapseModule, CommonModule, BadgeComponent, TableComponent, RouterModule, BinaryComponent], + selector: 'fhir-media', templateUrl: './media.component.html', styleUrls: ['./media.component.scss'] }) -export class MediaComponent implements OnInit, FhirResourceComponentInterface{ +export class MediaComponent implements OnInit, FhirCardComponentInterface{ @Input() displayModel: MediaModel @Input() showDetails: boolean = true - isCollapsed: boolean = false + @Input() isCollapsed: boolean = false tableData: TableRowItem[] = [] constructor(public changeRef: ChangeDetectorRef, public router: Router) {} diff --git a/frontend/src/app/components/fhir/resources/medication-request/medication-request.component.html b/frontend/src/app/components/fhir-card/resources/medication-request/medication-request.component.html similarity index 100% rename from frontend/src/app/components/fhir/resources/medication-request/medication-request.component.html rename to frontend/src/app/components/fhir-card/resources/medication-request/medication-request.component.html diff --git a/frontend/src/app/components/fhir/resources/medication/medication.component.scss b/frontend/src/app/components/fhir-card/resources/medication-request/medication-request.component.scss similarity index 100% rename from frontend/src/app/components/fhir/resources/medication/medication.component.scss rename to frontend/src/app/components/fhir-card/resources/medication-request/medication-request.component.scss diff --git a/frontend/src/app/components/fhir/resources/medication-request/medication-request.component.spec.ts b/frontend/src/app/components/fhir-card/resources/medication-request/medication-request.component.spec.ts similarity index 100% rename from frontend/src/app/components/fhir/resources/medication-request/medication-request.component.spec.ts rename to frontend/src/app/components/fhir-card/resources/medication-request/medication-request.component.spec.ts diff --git a/frontend/src/app/components/fhir/resources/medication-request/medication-request.component.ts b/frontend/src/app/components/fhir-card/resources/medication-request/medication-request.component.ts similarity index 92% rename from frontend/src/app/components/fhir/resources/medication-request/medication-request.component.ts rename to frontend/src/app/components/fhir-card/resources/medication-request/medication-request.component.ts index bb7c26ef..766c91ca 100644 --- a/frontend/src/app/components/fhir/resources/medication-request/medication-request.component.ts +++ b/frontend/src/app/components/fhir-card/resources/medication-request/medication-request.component.ts @@ -1,5 +1,5 @@ import {ChangeDetectorRef, Component, Input, OnInit} from '@angular/core'; -import {FhirResourceComponentInterface} from '../../fhir-resource/fhir-resource-component-interface'; +import {FhirCardComponentInterface} from '../../fhir-card/fhir-card-component-interface'; import {TableRowItem, TableRowItemDataType} from '../../common/table/table-row-item'; import {Router, RouterModule} from '@angular/router'; import {MedicationRequestModel} from '../../../../../lib/models/resources/medication-request-model'; @@ -16,15 +16,15 @@ import {GlossaryLookupComponent} from '../../../glossary-lookup/glossary-lookup. templateUrl: './medication-request.component.html', styleUrls: ['./medication-request.component.scss'] }) -export class MedicationRequestComponent implements OnInit, FhirResourceComponentInterface { +export class MedicationRequestComponent implements OnInit, FhirCardComponentInterface { @Input() displayModel: MedicationRequestModel | null @Input() showDetails: boolean = true + @Input() isCollapsed: boolean = false + //these are used to populate the description of the resource. May not be available for all resources resourceCode?: string; resourceCodeSystem?: string; - isCollapsed: boolean = false - tableData: TableRowItem[] = [] constructor(public changeRef: ChangeDetectorRef, public router: Router) {} diff --git a/frontend/src/app/components/fhir/resources/medication-request/medication-request.stories.ts b/frontend/src/app/components/fhir-card/resources/medication-request/medication-request.stories.ts similarity index 98% rename from frontend/src/app/components/fhir/resources/medication-request/medication-request.stories.ts rename to frontend/src/app/components/fhir-card/resources/medication-request/medication-request.stories.ts index 2d593ed4..d4d0bc3a 100644 --- a/frontend/src/app/components/fhir/resources/medication-request/medication-request.stories.ts +++ b/frontend/src/app/components/fhir-card/resources/medication-request/medication-request.stories.ts @@ -11,7 +11,7 @@ import {MedicationRequestModel} from "../../../../../lib/models/resources/medica // More on how to set up stories at: https://storybook.js.org/docs/angular/writing-stories/introduction const meta: Meta = { - title: 'Fhir/MedicationRequest', + title: 'Fhir Card/MedicationRequest', component: MedicationRequestComponent, decorators: [ // moduleMetadata({ diff --git a/frontend/src/app/components/fhir/resources/medication/medication.component.html b/frontend/src/app/components/fhir-card/resources/medication/medication.component.html similarity index 100% rename from frontend/src/app/components/fhir/resources/medication/medication.component.html rename to frontend/src/app/components/fhir-card/resources/medication/medication.component.html diff --git a/frontend/src/app/components/fhir/resources/observation/observation.component.scss b/frontend/src/app/components/fhir-card/resources/medication/medication.component.scss similarity index 100% rename from frontend/src/app/components/fhir/resources/observation/observation.component.scss rename to frontend/src/app/components/fhir-card/resources/medication/medication.component.scss diff --git a/frontend/src/app/components/fhir/resources/medication/medication.component.spec.ts b/frontend/src/app/components/fhir-card/resources/medication/medication.component.spec.ts similarity index 100% rename from frontend/src/app/components/fhir/resources/medication/medication.component.spec.ts rename to frontend/src/app/components/fhir-card/resources/medication/medication.component.spec.ts diff --git a/frontend/src/app/components/fhir/resources/medication/medication.component.ts b/frontend/src/app/components/fhir-card/resources/medication/medication.component.ts similarity index 92% rename from frontend/src/app/components/fhir/resources/medication/medication.component.ts rename to frontend/src/app/components/fhir-card/resources/medication/medication.component.ts index a1f1d8a1..bc57b95c 100644 --- a/frontend/src/app/components/fhir/resources/medication/medication.component.ts +++ b/frontend/src/app/components/fhir-card/resources/medication/medication.component.ts @@ -1,5 +1,5 @@ import {ChangeDetectorRef, Component, Input, OnInit} from '@angular/core'; -import {FhirResourceComponentInterface} from '../../fhir-resource/fhir-resource-component-interface'; +import {FhirCardComponentInterface} from '../../fhir-card/fhir-card-component-interface'; import {TableRowItem, TableRowItemDataType} from '../../common/table/table-row-item'; import {Router, RouterModule} from '@angular/router'; import {MedicationModel} from '../../../../../lib/models/resources/medication-model'; @@ -17,16 +17,15 @@ import * as _ from "lodash"; templateUrl: './medication.component.html', styleUrls: ['./medication.component.scss'] }) -export class MedicationComponent implements OnInit, FhirResourceComponentInterface { +export class MedicationComponent implements OnInit, FhirCardComponentInterface { @Input() displayModel: MedicationModel @Input() showDetails: boolean = true + @Input() isCollapsed: boolean = false //these are used to populate the description of the resource. May not be available for all resources resourceCode?: string; resourceCodeSystem?: string; - isCollapsed: boolean = false - tableData: TableRowItem[] = [] constructor(public changeRef: ChangeDetectorRef, public router: Router) {} diff --git a/frontend/src/app/components/fhir/resources/medication/medication.stories.ts b/frontend/src/app/components/fhir-card/resources/medication/medication.stories.ts similarity index 98% rename from frontend/src/app/components/fhir/resources/medication/medication.stories.ts rename to frontend/src/app/components/fhir-card/resources/medication/medication.stories.ts index 89e80f1b..de4e0a7b 100644 --- a/frontend/src/app/components/fhir/resources/medication/medication.stories.ts +++ b/frontend/src/app/components/fhir-card/resources/medication/medication.stories.ts @@ -10,7 +10,7 @@ import {MedicationModel} from "../../../../../lib/models/resources/medication-mo // More on how to set up stories at: https://storybook.js.org/docs/angular/writing-stories/introduction const meta: Meta = { - title: 'Fhir/Medication', + title: 'Fhir Card/Medication', component: MedicationComponent, decorators: [ // moduleMetadata({ diff --git a/frontend/src/app/components/fhir/resources/observation/observation.component.html b/frontend/src/app/components/fhir-card/resources/observation/observation.component.html similarity index 100% rename from frontend/src/app/components/fhir/resources/observation/observation.component.html rename to frontend/src/app/components/fhir-card/resources/observation/observation.component.html diff --git a/frontend/src/app/components/fhir/resources/organization/organization.component.scss b/frontend/src/app/components/fhir-card/resources/observation/observation.component.scss similarity index 100% rename from frontend/src/app/components/fhir/resources/organization/organization.component.scss rename to frontend/src/app/components/fhir-card/resources/observation/observation.component.scss diff --git a/frontend/src/app/components/fhir/resources/observation/observation.component.spec.ts b/frontend/src/app/components/fhir-card/resources/observation/observation.component.spec.ts similarity index 82% rename from frontend/src/app/components/fhir/resources/observation/observation.component.spec.ts rename to frontend/src/app/components/fhir-card/resources/observation/observation.component.spec.ts index 9f8399ed..c4adf3ce 100644 --- a/frontend/src/app/components/fhir/resources/observation/observation.component.spec.ts +++ b/frontend/src/app/components/fhir-card/resources/observation/observation.component.spec.ts @@ -1,6 +1,7 @@ import { ComponentFixture, TestBed } from '@angular/core/testing'; import { ObservationComponent } from './observation.component'; +import {RouterTestingModule} from '@angular/router/testing'; describe('ObservationComponent', () => { let component: ObservationComponent; @@ -8,7 +9,7 @@ describe('ObservationComponent', () => { beforeEach(async () => { await TestBed.configureTestingModule({ - declarations: [ ObservationComponent ] + imports: [ ObservationComponent, RouterTestingModule ] }) .compileComponents(); diff --git a/frontend/src/app/components/fhir/resources/observation/observation.component.ts b/frontend/src/app/components/fhir-card/resources/observation/observation.component.ts similarity index 88% rename from frontend/src/app/components/fhir/resources/observation/observation.component.ts rename to frontend/src/app/components/fhir-card/resources/observation/observation.component.ts index 174be02c..6ee0c851 100644 --- a/frontend/src/app/components/fhir/resources/observation/observation.component.ts +++ b/frontend/src/app/components/fhir-card/resources/observation/observation.component.ts @@ -21,8 +21,8 @@ import {NgChartsModule} from 'ng2-charts'; export class ObservationComponent implements OnInit { @Input() displayModel: ObservationModel @Input() showDetails: boolean = true + @Input() isCollapsed: boolean = false - isCollapsed: boolean = false tableData: TableRowItem[] = [] //observation chart data @@ -103,6 +103,9 @@ export class ObservationComponent implements OnInit { constructor(public changeRef: ChangeDetectorRef, public router: Router) { } ngOnInit(): void { + if(!this.displayModel){ + return + } this.tableData.push( { label: 'Issued on', @@ -136,13 +139,13 @@ export class ObservationComponent implements OnInit { //populate chart data this.barChartLabels.push( - formatDate(this.displayModel.effective_date, "mediumDate", "en-US", undefined) + formatDate(this.displayModel?.effective_date, "mediumDate", "en-US", undefined) ) - this.barChartData[0].data = [[this.displayModel.reference_range?.[0]?.low?.value, this.displayModel.reference_range?.[0]?.high?.value]] - this.barChartData[1].data = [[this.displayModel.value_quantity_value as number, this.displayModel.value_quantity_value as number]] + this.barChartData[0].data = [[this.displayModel?.reference_range?.[0]?.low?.value, this.displayModel?.reference_range?.[0]?.high?.value]] + this.barChartData[1].data = [[this.displayModel?.value_quantity_value as number, this.displayModel?.value_quantity_value as number]] - let suggestedMax = (this.displayModel.value_quantity_value as number) * 1.1; + let suggestedMax = (this.displayModel?.value_quantity_value as number) * 1.1; this.barChartOptions.scales['x']['suggestedMax'] = suggestedMax console.log("Observation chart data: ", this.barChartData[0].data, this.barChartData[1].data) diff --git a/frontend/src/app/components/fhir-card/resources/observation/observation.stories.ts b/frontend/src/app/components/fhir-card/resources/observation/observation.stories.ts new file mode 100644 index 00000000..1693cdb9 --- /dev/null +++ b/frontend/src/app/components/fhir-card/resources/observation/observation.stories.ts @@ -0,0 +1,69 @@ +import type { Meta, StoryObj } from '@storybook/angular'; +import {fhirVersions} from "../../../../../lib/models/constants"; +import R4Example1Json from "../../../../../lib/fixtures/r4/resources/observation/example1.json"; +import R4Example2Json from "../../../../../lib/fixtures/r4/resources/observation/example2.json"; +import R4Example3Json from "../../../../../lib/fixtures/r4/resources/observation/example3.json"; +import {ObservationComponent} from "./observation.component"; +import {ObservationModel} from "../../../../../lib/models/resources/observation-model"; + + + +// More on how to set up stories at: https://storybook.js.org/docs/angular/writing-stories/introduction +const meta: Meta = { + title: 'Fhir Card/Observation', + component: ObservationComponent, + decorators: [ + // moduleMetadata({ + // imports: [AppModule] + // }) + // applicationConfig({ + // providers: [importProvidersFrom(AppModule)], + // }), + ], + tags: ['autodocs'], + render: (args: ObservationComponent) => ({ + props: { + backgroundColor: null, + ...args, + }, + }), + argTypes: { + displayModel: { + control: 'object', + }, + showDetails: { + control: 'boolean', + } + }, +}; + +export default meta; +type Story = StoryObj; + +// More on writing stories with args: https://storybook.js.org/docs/angular/writing-stories/args +let r4Example1DisplayModel = new ObservationModel(R4Example1Json, fhirVersions.R4) +r4Example1DisplayModel.source_id = '123-456-789' +r4Example1DisplayModel.source_resource_id = '123-456-789' +export const R4Example1: Story = { + args: { + displayModel: r4Example1DisplayModel + } +}; + +let r4Example2DisplayModel = new ObservationModel(R4Example2Json, fhirVersions.R4) +r4Example2DisplayModel.source_id = '123-456-789' +r4Example2DisplayModel.source_resource_id = '123-456-789' +export const R4Example2: Story = { + args: { + displayModel: r4Example2DisplayModel + } +}; + +let r4Example3DisplayModel = new ObservationModel(R4Example3Json, fhirVersions.R4) +r4Example3DisplayModel.source_id = '123-456-789' +r4Example3DisplayModel.source_resource_id = '123-456-789' +export const R4Example3: Story = { + args: { + displayModel: r4Example3DisplayModel + } +}; diff --git a/frontend/src/app/components/fhir/resources/organization/organization.component.html b/frontend/src/app/components/fhir-card/resources/organization/organization.component.html similarity index 79% rename from frontend/src/app/components/fhir/resources/organization/organization.component.html rename to frontend/src/app/components/fhir-card/resources/organization/organization.component.html index e48b81b3..4790e0b3 100644 --- a/frontend/src/app/components/fhir/resources/organization/organization.component.html +++ b/frontend/src/app/components/fhir-card/resources/organization/organization.component.html @@ -3,11 +3,7 @@
{{displayModel?.name}}
- - - - - +

A formally or informally recognized grouping of people or organizations formed for the purpose of achieving some form of collective action. Includes companies, institutions, corporations, departments, community groups, healthcare practice groups, payer/insurer, etc.

diff --git a/frontend/src/app/components/fhir/resources/practitioner/practitioner.component.scss b/frontend/src/app/components/fhir-card/resources/organization/organization.component.scss similarity index 100% rename from frontend/src/app/components/fhir/resources/practitioner/practitioner.component.scss rename to frontend/src/app/components/fhir-card/resources/organization/organization.component.scss diff --git a/frontend/src/app/components/fhir/resources/organization/organization.component.spec.ts b/frontend/src/app/components/fhir-card/resources/organization/organization.component.spec.ts similarity index 82% rename from frontend/src/app/components/fhir/resources/organization/organization.component.spec.ts rename to frontend/src/app/components/fhir-card/resources/organization/organization.component.spec.ts index 2f0e5fbe..f68bd421 100644 --- a/frontend/src/app/components/fhir/resources/organization/organization.component.spec.ts +++ b/frontend/src/app/components/fhir-card/resources/organization/organization.component.spec.ts @@ -1,6 +1,7 @@ import { ComponentFixture, TestBed } from '@angular/core/testing'; import { OrganizationComponent } from './organization.component'; +import {RouterTestingModule} from '@angular/router/testing'; describe('OrganizationComponent', () => { let component: OrganizationComponent; @@ -8,7 +9,7 @@ describe('OrganizationComponent', () => { beforeEach(async () => { await TestBed.configureTestingModule({ - declarations: [ OrganizationComponent ] + imports: [ OrganizationComponent, RouterTestingModule ] }) .compileComponents(); diff --git a/frontend/src/app/components/fhir/resources/organization/organization.component.ts b/frontend/src/app/components/fhir-card/resources/organization/organization.component.ts similarity index 98% rename from frontend/src/app/components/fhir/resources/organization/organization.component.ts rename to frontend/src/app/components/fhir-card/resources/organization/organization.component.ts index 96a70241..b7b88316 100644 --- a/frontend/src/app/components/fhir/resources/organization/organization.component.ts +++ b/frontend/src/app/components/fhir-card/resources/organization/organization.component.ts @@ -18,8 +18,8 @@ import {OrganizationModel} from '../../../../../lib/models/resources/organizatio export class OrganizationComponent implements OnInit { @Input() displayModel: OrganizationModel @Input() showDetails: boolean = true + @Input() isCollapsed: boolean = false - isCollapsed: boolean = false tableData: TableRowItem[] = [] constructor(public changeRef: ChangeDetectorRef, public router: Router) { } diff --git a/frontend/src/app/components/fhir-card/resources/organization/organization.stories.ts b/frontend/src/app/components/fhir-card/resources/organization/organization.stories.ts new file mode 100644 index 00000000..66659b5c --- /dev/null +++ b/frontend/src/app/components/fhir-card/resources/organization/organization.stories.ts @@ -0,0 +1,69 @@ +import type { Meta, StoryObj } from '@storybook/angular'; +import {fhirVersions} from "../../../../../lib/models/constants"; +import R4Example1Json from "../../../../../lib/fixtures/r4/resources/organization/example1.json"; +import R4Example2Json from "../../../../../lib/fixtures/r4/resources/organization/example2.json"; +import R4Example3Json from "../../../../../lib/fixtures/r4/resources/organization/example3.json"; +import {OrganizationComponent} from "./organization.component"; +import {OrganizationModel} from "../../../../../lib/models/resources/organization-model"; + + + +// More on how to set up stories at: https://storybook.js.org/docs/angular/writing-stories/introduction +const meta: Meta = { + title: 'Fhir Card/Organization', + component: OrganizationComponent, + decorators: [ + // moduleMetadata({ + // imports: [AppModule] + // }) + // applicationConfig({ + // providers: [importProvidersFrom(AppModule)], + // }), + ], + tags: ['autodocs'], + render: (args: OrganizationComponent) => ({ + props: { + backgroundColor: null, + ...args, + }, + }), + argTypes: { + displayModel: { + control: 'object', + }, + showDetails: { + control: 'boolean', + } + }, +}; + +export default meta; +type Story = StoryObj; + +// More on writing stories with args: https://storybook.js.org/docs/angular/writing-stories/args +let r4Example1DisplayModel = new OrganizationModel(R4Example1Json, fhirVersions.R4) +r4Example1DisplayModel.source_id = '123-456-789' +r4Example1DisplayModel.source_resource_id = '123-456-789' +export const R4Example1: Story = { + args: { + displayModel: r4Example1DisplayModel + } +}; + +let r4Example2DisplayModel = new OrganizationModel(R4Example2Json, fhirVersions.R4) +r4Example2DisplayModel.source_id = '123-456-789' +r4Example2DisplayModel.source_resource_id = '123-456-789' +export const R4Example2: Story = { + args: { + displayModel: r4Example2DisplayModel + } +}; + +let r4Example3DisplayModel = new OrganizationModel(R4Example3Json, fhirVersions.R4) +r4Example3DisplayModel.source_id = '123-456-789' +r4Example3DisplayModel.source_resource_id = '123-456-789' +export const R4Example3: Story = { + args: { + displayModel: r4Example3DisplayModel + } +}; diff --git a/frontend/src/app/components/fhir/resources/practitioner/practitioner.component.html b/frontend/src/app/components/fhir-card/resources/practitioner/practitioner.component.html similarity index 72% rename from frontend/src/app/components/fhir/resources/practitioner/practitioner.component.html rename to frontend/src/app/components/fhir-card/resources/practitioner/practitioner.component.html index 1ff00e02..f5c5f06e 100644 --- a/frontend/src/app/components/fhir/resources/practitioner/practitioner.component.html +++ b/frontend/src/app/components/fhir-card/resources/practitioner/practitioner.component.html @@ -4,12 +4,10 @@
{{displayModel?.sort_title || displayModel?.name?.[0]?.displayName}}

Date{{displayModel?.sort_date}}

- {{displayModel?.status}} - - - - - +
+ {{displayModel?.status}} + +

A person who is directly or indirectly involved in the provisioning of healthcare.

diff --git a/frontend/src/app/components/fhir/resources/procedure/procedure.component.scss b/frontend/src/app/components/fhir-card/resources/practitioner/practitioner.component.scss similarity index 100% rename from frontend/src/app/components/fhir/resources/procedure/procedure.component.scss rename to frontend/src/app/components/fhir-card/resources/practitioner/practitioner.component.scss diff --git a/frontend/src/app/components/fhir/resources/practitioner/practitioner.component.spec.ts b/frontend/src/app/components/fhir-card/resources/practitioner/practitioner.component.spec.ts similarity index 100% rename from frontend/src/app/components/fhir/resources/practitioner/practitioner.component.spec.ts rename to frontend/src/app/components/fhir-card/resources/practitioner/practitioner.component.spec.ts diff --git a/frontend/src/app/components/fhir/resources/practitioner/practitioner.component.ts b/frontend/src/app/components/fhir-card/resources/practitioner/practitioner.component.ts similarity index 88% rename from frontend/src/app/components/fhir/resources/practitioner/practitioner.component.ts rename to frontend/src/app/components/fhir-card/resources/practitioner/practitioner.component.ts index b5c3037e..a5873ace 100644 --- a/frontend/src/app/components/fhir/resources/practitioner/practitioner.component.ts +++ b/frontend/src/app/components/fhir-card/resources/practitioner/practitioner.component.ts @@ -1,5 +1,5 @@ import {ChangeDetectorRef, Component, Input, OnInit} from '@angular/core'; -import {FhirResourceComponentInterface} from '../../fhir-resource/fhir-resource-component-interface'; +import {FhirCardComponentInterface} from '../../fhir-card/fhir-card-component-interface'; import {ImmunizationModel} from '../../../../../lib/models/resources/immunization-model'; import {TableRowItem} from '../../common/table/table-row-item'; import {Router, RouterModule} from '@angular/router'; @@ -12,15 +12,14 @@ import {TableComponent} from "../../common/table/table.component"; @Component({ standalone: true, imports: [NgbCollapseModule, CommonModule, BadgeComponent, TableComponent, RouterModule], - selector: 'app-practitioner', + selector: 'fhir-practitioner', templateUrl: './practitioner.component.html', styleUrls: ['./practitioner.component.scss'] }) -export class PractitionerComponent implements OnInit, FhirResourceComponentInterface { +export class PractitionerComponent implements OnInit, FhirCardComponentInterface { @Input() displayModel: PractitionerModel | null @Input() showDetails: boolean = true - - isCollapsed: boolean = false + @Input() isCollapsed: boolean = false tableData: TableRowItem[] = [] @@ -56,8 +55,8 @@ export class PractitionerComponent implements OnInit, FhirResourceComponentInter enabled: true, }) } - if(this.displayModel?.address){ - let address = this.displayModel?.address + if(this.displayModel?.address?.length > 0){ + let address = this.displayModel?.address?.[0] let addressParts = [] if(address.line){ addressParts.push(address.line.join(' ')) diff --git a/frontend/src/app/components/fhir/resources/practitioner/practitioner.stories.ts b/frontend/src/app/components/fhir-card/resources/practitioner/practitioner.stories.ts similarity index 98% rename from frontend/src/app/components/fhir/resources/practitioner/practitioner.stories.ts rename to frontend/src/app/components/fhir-card/resources/practitioner/practitioner.stories.ts index c65812cf..cf7c2c05 100644 --- a/frontend/src/app/components/fhir/resources/practitioner/practitioner.stories.ts +++ b/frontend/src/app/components/fhir-card/resources/practitioner/practitioner.stories.ts @@ -10,7 +10,7 @@ import {PractitionerModel} from "../../../../../lib/models/resources/practitione // More on how to set up stories at: https://storybook.js.org/docs/angular/writing-stories/introduction const meta: Meta = { - title: 'Fhir/Practitioner', + title: 'Fhir Card/Practitioner', component: PractitionerComponent, decorators: [ // moduleMetadata({ diff --git a/frontend/src/app/components/fhir/resources/procedure/procedure.component.html b/frontend/src/app/components/fhir-card/resources/procedure/procedure.component.html similarity index 100% rename from frontend/src/app/components/fhir/resources/procedure/procedure.component.html rename to frontend/src/app/components/fhir-card/resources/procedure/procedure.component.html diff --git a/frontend/src/app/components/list-generic-resource/list-generic-resource.component.scss b/frontend/src/app/components/fhir-card/resources/procedure/procedure.component.scss similarity index 100% rename from frontend/src/app/components/list-generic-resource/list-generic-resource.component.scss rename to frontend/src/app/components/fhir-card/resources/procedure/procedure.component.scss diff --git a/frontend/src/app/components/fhir/resources/procedure/procedure.component.spec.ts b/frontend/src/app/components/fhir-card/resources/procedure/procedure.component.spec.ts similarity index 100% rename from frontend/src/app/components/fhir/resources/procedure/procedure.component.spec.ts rename to frontend/src/app/components/fhir-card/resources/procedure/procedure.component.spec.ts diff --git a/frontend/src/app/components/fhir/resources/procedure/procedure.component.ts b/frontend/src/app/components/fhir-card/resources/procedure/procedure.component.ts similarity index 93% rename from frontend/src/app/components/fhir/resources/procedure/procedure.component.ts rename to frontend/src/app/components/fhir-card/resources/procedure/procedure.component.ts index e73dcc10..075746a3 100644 --- a/frontend/src/app/components/fhir/resources/procedure/procedure.component.ts +++ b/frontend/src/app/components/fhir-card/resources/procedure/procedure.component.ts @@ -1,5 +1,5 @@ import {ChangeDetectorRef, Component, Input, OnInit} from '@angular/core'; -import {FhirResourceComponentInterface} from '../../fhir-resource/fhir-resource-component-interface'; +import {FhirCardComponentInterface} from '../../fhir-card/fhir-card-component-interface'; import {TableRowItem, TableRowItemDataType} from '../../common/table/table-row-item'; import {Router, RouterModule} from '@angular/router'; import {ProcedureModel} from '../../../../../lib/models/resources/procedure-model'; @@ -16,16 +16,15 @@ import {GlossaryLookupComponent} from '../../../glossary-lookup/glossary-lookup. templateUrl: './procedure.component.html', styleUrls: ['./procedure.component.scss'] }) -export class ProcedureComponent implements OnInit, FhirResourceComponentInterface { +export class ProcedureComponent implements OnInit, FhirCardComponentInterface { @Input() displayModel: ProcedureModel | null @Input() showDetails: boolean = true + @Input() isCollapsed: boolean = false //these are used to populate the description of the resource. May not be available for all resources resourceCode?: string; resourceCodeSystem?: string; - isCollapsed: boolean = false - tableData: TableRowItem[] = [] constructor(public changeRef: ChangeDetectorRef, public router: Router) {} diff --git a/frontend/src/app/components/fhir/resources/procedure/procedure.stories.ts b/frontend/src/app/components/fhir-card/resources/procedure/procedure.stories.ts similarity index 98% rename from frontend/src/app/components/fhir/resources/procedure/procedure.stories.ts rename to frontend/src/app/components/fhir-card/resources/procedure/procedure.stories.ts index 97f3e44b..4ba15539 100644 --- a/frontend/src/app/components/fhir/resources/procedure/procedure.stories.ts +++ b/frontend/src/app/components/fhir-card/resources/procedure/procedure.stories.ts @@ -10,7 +10,7 @@ import {ProcedureModel} from "../../../../../lib/models/resources/procedure-mode // More on how to set up stories at: https://storybook.js.org/docs/angular/writing-stories/introduction const meta: Meta = { - title: 'Fhir/Procedure', + title: 'Fhir Card/Procedure', component: ProcedureComponent, decorators: [ // moduleMetadata({ diff --git a/frontend/src/app/components/fhir-datatable/datatable-generic-resource/datatable-adverse-event.component.ts b/frontend/src/app/components/fhir-datatable/datatable-generic-resource/datatable-adverse-event.component.ts new file mode 100644 index 00000000..d196dd15 --- /dev/null +++ b/frontend/src/app/components/fhir-datatable/datatable-generic-resource/datatable-adverse-event.component.ts @@ -0,0 +1,15 @@ +import {Component} from '@angular/core'; +import {GenericColumnDefn, DatatableGenericResourceComponent} from './datatable-generic-resource.component'; +import {attributeXTime} from './utils'; + +@Component({ + selector: 'fhir-datatable-adverse-event', + templateUrl: './datatable-generic-resource.component.html', + styleUrls: ['./datatable-generic-resource.component.scss'] +}) +export class DatatableAdverseEventComponent extends DatatableGenericResourceComponent { + columnDefinitions: GenericColumnDefn[] = [ + { title: 'Event', versions: '*', format: 'codeableConcept', getter: a => a.event }, + { title: 'Date', versions: '*', format: 'date', getter: a => a.date } + ] +} diff --git a/frontend/src/app/components/list-generic-resource/list-allergy-intolerance.component.ts b/frontend/src/app/components/fhir-datatable/datatable-generic-resource/datatable-allergy-intolerance.component.ts similarity index 66% rename from frontend/src/app/components/list-generic-resource/list-allergy-intolerance.component.ts rename to frontend/src/app/components/fhir-datatable/datatable-generic-resource/datatable-allergy-intolerance.component.ts index 2d57781c..4d599a50 100644 --- a/frontend/src/app/components/list-generic-resource/list-allergy-intolerance.component.ts +++ b/frontend/src/app/components/fhir-datatable/datatable-generic-resource/datatable-allergy-intolerance.component.ts @@ -1,13 +1,13 @@ import {Component} from '@angular/core'; -import {GenericColumnDefn, ListGenericResourceComponent} from './list-generic-resource.component'; +import {GenericColumnDefn, DatatableGenericResourceComponent} from './datatable-generic-resource.component'; import {attributeXTime} from './utils'; @Component({ - selector: 'app-list-allergy-intolerance', - templateUrl: './list-generic-resource.component.html', - styleUrls: ['./list-generic-resource.component.scss'] + selector: 'fhir-datatable-allergy-intolerance', + templateUrl: './datatable-generic-resource.component.html', + styleUrls: ['./datatable-generic-resource.component.scss'] }) -export class ListAllergyIntoleranceComponent extends ListGenericResourceComponent { +export class DatatableAllergyIntoleranceComponent extends DatatableGenericResourceComponent { columnDefinitions: GenericColumnDefn[] = [ { title: 'Date Recorded', versions: '*', format: 'date', getter: a => a.assertedDate || a.recordedDate }, { title: 'Allergy Type', versions: '*', getter: a => a.category[0] }, // Allergy Type diff --git a/frontend/src/app/components/list-generic-resource/list-appointment.component.ts b/frontend/src/app/components/fhir-datatable/datatable-generic-resource/datatable-appointment.component.ts similarity index 56% rename from frontend/src/app/components/list-generic-resource/list-appointment.component.ts rename to frontend/src/app/components/fhir-datatable/datatable-generic-resource/datatable-appointment.component.ts index e0e372fe..119d2f1b 100644 --- a/frontend/src/app/components/list-generic-resource/list-appointment.component.ts +++ b/frontend/src/app/components/fhir-datatable/datatable-generic-resource/datatable-appointment.component.ts @@ -1,13 +1,13 @@ import {Component} from '@angular/core'; -import {GenericColumnDefn, ListGenericResourceComponent} from './list-generic-resource.component'; +import {GenericColumnDefn, DatatableGenericResourceComponent} from './datatable-generic-resource.component'; import {attributeXTime} from './utils'; @Component({ - selector: 'app-list-appointment', - templateUrl: './list-generic-resource.component.html', - styleUrls: ['./list-generic-resource.component.scss'] + selector: 'fhir-datatable-appointment', + templateUrl: './datatable-generic-resource.component.html', + styleUrls: ['./datatable-generic-resource.component.scss'] }) -export class ListAppointmentComponent extends ListGenericResourceComponent { +export class DatatableAppointmentComponent extends DatatableGenericResourceComponent { columnDefinitions: GenericColumnDefn[] = [ { title: 'Type', versions: '*', format: 'codeableConcept', getter: a => a.serviceType }, { title: 'Status', versions: '*', getter: a => a.status }, diff --git a/frontend/src/app/components/list-generic-resource/list-binary.component.ts b/frontend/src/app/components/fhir-datatable/datatable-generic-resource/datatable-binary.component.ts similarity index 55% rename from frontend/src/app/components/list-generic-resource/list-binary.component.ts rename to frontend/src/app/components/fhir-datatable/datatable-generic-resource/datatable-binary.component.ts index 4352d1e9..1a7b5a14 100644 --- a/frontend/src/app/components/list-generic-resource/list-binary.component.ts +++ b/frontend/src/app/components/fhir-datatable/datatable-generic-resource/datatable-binary.component.ts @@ -1,13 +1,13 @@ import {Component} from '@angular/core'; -import {GenericColumnDefn, ListGenericResourceComponent} from './list-generic-resource.component'; +import {GenericColumnDefn, DatatableGenericResourceComponent} from './datatable-generic-resource.component'; import {attributeXTime} from './utils'; @Component({ - selector: 'app-list-binary', - templateUrl: './list-generic-resource.component.html', - styleUrls: ['./list-generic-resource.component.scss'] + selector: 'fhir-datatable-binary', + templateUrl: './datatable-generic-resource.component.html', + styleUrls: ['./datatable-generic-resource.component.scss'] }) -export class ListBinaryComponent extends ListGenericResourceComponent { +export class DatatableBinaryComponent extends DatatableGenericResourceComponent { columnDefinitions: GenericColumnDefn[] = [ { title: 'Content-Type', versions: '*', getter: c => c.contentType }, { title: 'ID', versions: '*', getter: c => c.id }, diff --git a/frontend/src/app/components/list-generic-resource/list-care-plan.component.ts b/frontend/src/app/components/fhir-datatable/datatable-generic-resource/datatable-care-plan.component.ts similarity index 64% rename from frontend/src/app/components/list-generic-resource/list-care-plan.component.ts rename to frontend/src/app/components/fhir-datatable/datatable-generic-resource/datatable-care-plan.component.ts index f8b55109..cd18a01f 100644 --- a/frontend/src/app/components/list-generic-resource/list-care-plan.component.ts +++ b/frontend/src/app/components/fhir-datatable/datatable-generic-resource/datatable-care-plan.component.ts @@ -1,13 +1,13 @@ import {Component} from '@angular/core'; -import {GenericColumnDefn, ListGenericResourceComponent} from './list-generic-resource.component'; +import {GenericColumnDefn, DatatableGenericResourceComponent} from './datatable-generic-resource.component'; import {attributeXTime} from './utils'; @Component({ - selector: 'app-list-care-plan', - templateUrl: './list-generic-resource.component.html', - styleUrls: ['./list-generic-resource.component.scss'] + selector: 'fhir-datatable-care-plan', + templateUrl: './datatable-generic-resource.component.html', + styleUrls: ['./datatable-generic-resource.component.scss'] }) -export class ListCarePlanComponent extends ListGenericResourceComponent { +export class DatatableCarePlanComponent extends DatatableGenericResourceComponent { columnDefinitions: GenericColumnDefn[] = [ { title: 'Category', versions: '*', format: 'code', getter: c => c.category[0].coding[0] }, { title: 'Reason', versions: '*', getter: c => { diff --git a/frontend/src/app/components/list-generic-resource/list-care-team.component.ts b/frontend/src/app/components/fhir-datatable/datatable-generic-resource/datatable-care-team.component.ts similarity index 55% rename from frontend/src/app/components/list-generic-resource/list-care-team.component.ts rename to frontend/src/app/components/fhir-datatable/datatable-generic-resource/datatable-care-team.component.ts index f9a4aa11..16653b36 100644 --- a/frontend/src/app/components/list-generic-resource/list-care-team.component.ts +++ b/frontend/src/app/components/fhir-datatable/datatable-generic-resource/datatable-care-team.component.ts @@ -1,13 +1,13 @@ import {Component} from '@angular/core'; -import {GenericColumnDefn, ListGenericResourceComponent} from './list-generic-resource.component'; +import {GenericColumnDefn, DatatableGenericResourceComponent} from './datatable-generic-resource.component'; import {attributeXTime} from './utils'; @Component({ - selector: 'app-list-care-team', - templateUrl: './list-generic-resource.component.html', - styleUrls: ['./list-generic-resource.component.scss'] + selector: 'fhir-datatable-care-team', + templateUrl: './datatable-generic-resource.component.html', + styleUrls: ['./datatable-generic-resource.component.scss'] }) -export class ListCareTeamComponent extends ListGenericResourceComponent { +export class DatatableCareTeamComponent extends DatatableGenericResourceComponent { columnDefinitions: GenericColumnDefn[] = [ { title: 'Category', versions: '*', format: 'codableConcept', getter: c => c.category[0] }, { title: 'Name', versions: '*', getter: c => c.name }, diff --git a/frontend/src/app/components/list-generic-resource/list-communication.component.ts b/frontend/src/app/components/fhir-datatable/datatable-generic-resource/datatable-communication.component.ts similarity index 56% rename from frontend/src/app/components/list-generic-resource/list-communication.component.ts rename to frontend/src/app/components/fhir-datatable/datatable-generic-resource/datatable-communication.component.ts index 214051c0..d070bdd1 100644 --- a/frontend/src/app/components/list-generic-resource/list-communication.component.ts +++ b/frontend/src/app/components/fhir-datatable/datatable-generic-resource/datatable-communication.component.ts @@ -1,13 +1,13 @@ import {Component} from '@angular/core'; -import {GenericColumnDefn, ListGenericResourceComponent} from './list-generic-resource.component'; +import {GenericColumnDefn, DatatableGenericResourceComponent} from './datatable-generic-resource.component'; import {attributeXTime} from './utils'; @Component({ - selector: 'app-list-communication', - templateUrl: './list-generic-resource.component.html', - styleUrls: ['./list-generic-resource.component.scss'] + selector: 'fhir-datatable-communication', + templateUrl: './datatable-generic-resource.component.html', + styleUrls: ['./datatable-generic-resource.component.scss'] }) -export class ListCommunicationComponent extends ListGenericResourceComponent { +export class DatatableCommunicationComponent extends DatatableGenericResourceComponent { columnDefinitions: GenericColumnDefn[] = [ { title: 'Reason', versions: '*', format: 'code', getter: c => c.reasonCode[0].coding[0] }, { title: 'Sent', versions: '*', format: 'date', getter: c => c.sent }, diff --git a/frontend/src/app/components/list-generic-resource/list-condition.component.ts b/frontend/src/app/components/fhir-datatable/datatable-generic-resource/datatable-condition.component.ts similarity index 65% rename from frontend/src/app/components/list-generic-resource/list-condition.component.ts rename to frontend/src/app/components/fhir-datatable/datatable-generic-resource/datatable-condition.component.ts index 43b2eb0d..c57f6267 100644 --- a/frontend/src/app/components/list-generic-resource/list-condition.component.ts +++ b/frontend/src/app/components/fhir-datatable/datatable-generic-resource/datatable-condition.component.ts @@ -1,13 +1,13 @@ import {Component, OnInit} from '@angular/core'; -import {GenericColumnDefn, ListGenericResourceComponent, ResourceListComponentInterface} from './list-generic-resource.component'; +import {GenericColumnDefn, DatatableGenericResourceComponent, ResourceListComponentInterface} from './datatable-generic-resource.component'; import {FORMATTERS} from './utils'; @Component({ - selector: 'app-list-condition', - templateUrl: './list-generic-resource.component.html', - styleUrls: ['./list-generic-resource.component.scss'] + selector: 'fhir-datatable-condition', + templateUrl: './datatable-generic-resource.component.html', + styleUrls: ['./datatable-generic-resource.component.scss'] }) -export class ListConditionComponent extends ListGenericResourceComponent { +export class DatatableConditionComponent extends DatatableGenericResourceComponent { columnDefinitions: GenericColumnDefn[] = [ { title: 'Condition', versions: '*', format: 'codeableConcept', getter: c => c.code }, { title: 'Date of Onset', versions: '*', format: 'date', getter: c => c.onsetDateTime }, diff --git a/frontend/src/app/components/fhir-datatable/datatable-generic-resource/datatable-coverage.component.ts b/frontend/src/app/components/fhir-datatable/datatable-generic-resource/datatable-coverage.component.ts new file mode 100644 index 00000000..d876a211 --- /dev/null +++ b/frontend/src/app/components/fhir-datatable/datatable-generic-resource/datatable-coverage.component.ts @@ -0,0 +1,15 @@ +import {Component} from '@angular/core'; +import {GenericColumnDefn, DatatableGenericResourceComponent} from './datatable-generic-resource.component'; +import {attributeXTime} from './utils'; + +@Component({ + selector: 'fhir-datatable-coverage', + templateUrl: './datatable-generic-resource.component.html', + styleUrls: ['./datatable-generic-resource.component.scss'] +}) +export class DatatableCoverageComponent extends DatatableGenericResourceComponent { + columnDefinitions: GenericColumnDefn[] = [ + { title: 'Type', versions: '*', format: 'codeableConcept', getter: c => c.type }, + { title: 'Period', versions: '*', format: 'period', getter: c => c.period } + ] +} diff --git a/frontend/src/app/components/list-generic-resource/list-device-request.component.ts b/frontend/src/app/components/fhir-datatable/datatable-generic-resource/datatable-device-request.component.ts similarity index 60% rename from frontend/src/app/components/list-generic-resource/list-device-request.component.ts rename to frontend/src/app/components/fhir-datatable/datatable-generic-resource/datatable-device-request.component.ts index 54a5f4d6..5e7f8bff 100644 --- a/frontend/src/app/components/list-generic-resource/list-device-request.component.ts +++ b/frontend/src/app/components/fhir-datatable/datatable-generic-resource/datatable-device-request.component.ts @@ -1,13 +1,13 @@ import {Component} from '@angular/core'; -import {GenericColumnDefn, ListGenericResourceComponent} from './list-generic-resource.component'; +import {GenericColumnDefn, DatatableGenericResourceComponent} from './datatable-generic-resource.component'; import {attributeXTime} from './utils'; @Component({ - selector: 'app-list-device-request', - templateUrl: './list-generic-resource.component.html', - styleUrls: ['./list-generic-resource.component.scss'] + selector: 'fhir-datatable-device-request', + templateUrl: './datatable-generic-resource.component.html', + styleUrls: ['./datatable-generic-resource.component.scss'] }) -export class ListDeviceRequestComponent extends ListGenericResourceComponent { +export class DatatableDeviceRequestComponent extends DatatableGenericResourceComponent { columnDefinitions: GenericColumnDefn[] = [ { title: 'Device', versions: '*', format: 'codeableConcept', getter: d => d.codeCodeableConcept }, { title: 'Author Date', versions: '*', format: 'date', getter: d => d.authoredOn }, diff --git a/frontend/src/app/components/list-generic-resource/list-device.component.ts b/frontend/src/app/components/fhir-datatable/datatable-generic-resource/datatable-device.component.ts similarity index 63% rename from frontend/src/app/components/list-generic-resource/list-device.component.ts rename to frontend/src/app/components/fhir-datatable/datatable-generic-resource/datatable-device.component.ts index eefde082..52ecace4 100644 --- a/frontend/src/app/components/list-generic-resource/list-device.component.ts +++ b/frontend/src/app/components/fhir-datatable/datatable-generic-resource/datatable-device.component.ts @@ -1,13 +1,13 @@ import {Component} from '@angular/core'; -import {GenericColumnDefn, ListGenericResourceComponent} from './list-generic-resource.component'; +import {GenericColumnDefn, DatatableGenericResourceComponent} from './datatable-generic-resource.component'; import {attributeXTime} from './utils'; @Component({ - selector: 'app-list-device', - templateUrl: './list-generic-resource.component.html', - styleUrls: ['./list-generic-resource.component.scss'] + selector: 'fhir-datatable-device', + templateUrl: './datatable-generic-resource.component.html', + styleUrls: ['./datatable-generic-resource.component.scss'] }) -export class ListDeviceComponent extends ListGenericResourceComponent { +export class DatatableDeviceComponent extends DatatableGenericResourceComponent { columnDefinitions: GenericColumnDefn[] = [ { title: 'Device', versions: '*', getter: d => d.deviceName?.[0]?.name || d.type?.coding?.[0]?.display || d.type?.text }, { title: 'Manufacturer', versions: '*', getter: d => d.manufacturer }, diff --git a/frontend/src/app/components/list-generic-resource/list-diagnostic-report.component.ts b/frontend/src/app/components/fhir-datatable/datatable-generic-resource/datatable-diagnostic-report.component.ts similarity index 57% rename from frontend/src/app/components/list-generic-resource/list-diagnostic-report.component.ts rename to frontend/src/app/components/fhir-datatable/datatable-generic-resource/datatable-diagnostic-report.component.ts index 54e2dc1c..0150ffbc 100644 --- a/frontend/src/app/components/list-generic-resource/list-diagnostic-report.component.ts +++ b/frontend/src/app/components/fhir-datatable/datatable-generic-resource/datatable-diagnostic-report.component.ts @@ -1,13 +1,13 @@ import {Component} from '@angular/core'; -import {GenericColumnDefn, ListGenericResourceComponent} from './list-generic-resource.component'; +import {GenericColumnDefn, DatatableGenericResourceComponent} from './datatable-generic-resource.component'; import {attributeXTime} from './utils'; @Component({ - selector: 'app-list-diagnostic-report', - templateUrl: './list-generic-resource.component.html', - styleUrls: ['./list-generic-resource.component.scss'] + selector: 'fhir-datatable-diagnostic-report', + templateUrl: './datatable-generic-resource.component.html', + styleUrls: ['./datatable-generic-resource.component.scss'] }) -export class ListDiagnosticReportComponent extends ListGenericResourceComponent { +export class DatatableDiagnosticReportComponent extends DatatableGenericResourceComponent { columnDefinitions: GenericColumnDefn[] = [ { title: 'Issued', versions: '*', format: 'date', getter: d => d.issued }, { title: 'Title', versions: '*', format: 'codeableConcept', getter: d => d.code }, diff --git a/frontend/src/app/components/list-generic-resource/list-document-reference.component.ts b/frontend/src/app/components/fhir-datatable/datatable-generic-resource/datatable-document-reference.component.ts similarity index 61% rename from frontend/src/app/components/list-generic-resource/list-document-reference.component.ts rename to frontend/src/app/components/fhir-datatable/datatable-generic-resource/datatable-document-reference.component.ts index 004cf35d..ae4081e0 100644 --- a/frontend/src/app/components/list-generic-resource/list-document-reference.component.ts +++ b/frontend/src/app/components/fhir-datatable/datatable-generic-resource/datatable-document-reference.component.ts @@ -1,13 +1,13 @@ import {Component} from '@angular/core'; -import {GenericColumnDefn, ListGenericResourceComponent} from './list-generic-resource.component'; +import {GenericColumnDefn, DatatableGenericResourceComponent} from './datatable-generic-resource.component'; import {attributeXTime} from './utils'; @Component({ - selector: 'app-list-document-reference', - templateUrl: './list-generic-resource.component.html', - styleUrls: ['./list-generic-resource.component.scss'] + selector: 'fhir-datatable-document-reference', + templateUrl: './datatable-generic-resource.component.html', + styleUrls: ['./datatable-generic-resource.component.scss'] }) -export class ListDocumentReferenceComponent extends ListGenericResourceComponent { +export class DatatableDocumentReferenceComponent extends DatatableGenericResourceComponent { columnDefinitions: GenericColumnDefn[] = [ { title: 'Date', versions: '*', format: 'date', getter: d => d.date }, { title: 'Content', versions: '*', getter: d => d.content?.[0]?.attachment.title }, diff --git a/frontend/src/app/components/list-generic-resource/list-encounter.component.ts b/frontend/src/app/components/fhir-datatable/datatable-generic-resource/datatable-encounter.component.ts similarity index 62% rename from frontend/src/app/components/list-generic-resource/list-encounter.component.ts rename to frontend/src/app/components/fhir-datatable/datatable-generic-resource/datatable-encounter.component.ts index 1e3d65d5..556b7356 100644 --- a/frontend/src/app/components/list-generic-resource/list-encounter.component.ts +++ b/frontend/src/app/components/fhir-datatable/datatable-generic-resource/datatable-encounter.component.ts @@ -1,12 +1,12 @@ import {Component, OnChanges, OnInit} from '@angular/core'; -import {GenericColumnDefn, ListGenericResourceComponent, ResourceListComponentInterface} from './list-generic-resource.component'; +import {GenericColumnDefn, DatatableGenericResourceComponent, ResourceListComponentInterface} from './datatable-generic-resource.component'; @Component({ - selector: 'app-list-encounter', - templateUrl: './list-generic-resource.component.html', - styleUrls: ['./list-generic-resource.component.scss'] + selector: 'fhir-datatable-encounter', + templateUrl: './datatable-generic-resource.component.html', + styleUrls: ['./datatable-generic-resource.component.scss'] }) -export class ListEncounterComponent extends ListGenericResourceComponent { +export class DatatableEncounterComponent extends DatatableGenericResourceComponent { columnDefinitions: GenericColumnDefn[] = [ { title: 'Period', versions: '*', format: 'period', getter: e => e.period }, { title: 'Encounter', versions: '*', format: 'codeableConcept', getter: e => e.type?.[0] }, diff --git a/frontend/src/app/components/fhir-datatable/datatable-generic-resource/datatable-explanation-of-benefit.component.ts b/frontend/src/app/components/fhir-datatable/datatable-generic-resource/datatable-explanation-of-benefit.component.ts new file mode 100644 index 00000000..104ce810 --- /dev/null +++ b/frontend/src/app/components/fhir-datatable/datatable-generic-resource/datatable-explanation-of-benefit.component.ts @@ -0,0 +1,11 @@ +import {Component, OnChanges, OnInit} from '@angular/core'; +import {GenericColumnDefn, DatatableGenericResourceComponent, ResourceListComponentInterface} from './datatable-generic-resource.component'; + +@Component({ + selector: 'fhir-datatable-explanation-of-benefit', + templateUrl: './datatable-generic-resource.component.html', + styleUrls: ['./datatable-generic-resource.component.scss'] +}) +export class DatatableExplanationOfBenefitComponent extends DatatableGenericResourceComponent { + columnDefinitions: GenericColumnDefn[] = [] +} diff --git a/frontend/src/app/components/list-generic-resource/list-fallback.component.html b/frontend/src/app/components/fhir-datatable/datatable-generic-resource/datatable-fallback.component.html similarity index 56% rename from frontend/src/app/components/list-generic-resource/list-fallback.component.html rename to frontend/src/app/components/fhir-datatable/datatable-generic-resource/datatable-fallback.component.html index 01d5c5e6..33631df4 100644 --- a/frontend/src/app/components/list-generic-resource/list-fallback.component.html +++ b/frontend/src/app/components/fhir-datatable/datatable-generic-resource/datatable-fallback.component.html @@ -1,12 +1,4 @@
- - - e.id }, + { title: 'Title', versions: '*', getter: e => e.reasonCode?.[0] }, + ] +} diff --git a/frontend/src/app/components/fhir-datatable/datatable-generic-resource/datatable-generic-resource.component.html b/frontend/src/app/components/fhir-datatable/datatable-generic-resource/datatable-generic-resource.component.html new file mode 100644 index 00000000..b1b50d1e --- /dev/null +++ b/frontend/src/app/components/fhir-datatable/datatable-generic-resource/datatable-generic-resource.component.html @@ -0,0 +1,21 @@ +
+ + +
diff --git a/frontend/src/app/components/list-patient/list-patient.component.scss b/frontend/src/app/components/fhir-datatable/datatable-generic-resource/datatable-generic-resource.component.scss similarity index 100% rename from frontend/src/app/components/list-patient/list-patient.component.scss rename to frontend/src/app/components/fhir-datatable/datatable-generic-resource/datatable-generic-resource.component.scss diff --git a/frontend/src/app/components/list-generic-resource/list-generic-resource.component.spec.ts b/frontend/src/app/components/fhir-datatable/datatable-generic-resource/datatable-generic-resource.component.spec.ts similarity index 61% rename from frontend/src/app/components/list-generic-resource/list-generic-resource.component.spec.ts rename to frontend/src/app/components/fhir-datatable/datatable-generic-resource/datatable-generic-resource.component.spec.ts index 7b950786..8e148f81 100644 --- a/frontend/src/app/components/list-generic-resource/list-generic-resource.component.spec.ts +++ b/frontend/src/app/components/fhir-datatable/datatable-generic-resource/datatable-generic-resource.component.spec.ts @@ -1,17 +1,17 @@ import { ComponentFixture, TestBed } from '@angular/core/testing'; -import { ListGenericResourceComponent } from './list-generic-resource.component'; -import {HTTP_CLIENT_TOKEN} from '../../dependency-injection'; +import { DatatableGenericResourceComponent } from './datatable-generic-resource.component'; +import {HTTP_CLIENT_TOKEN} from '../../../dependency-injection'; import {HttpClient} from '@angular/common/http'; import {HttpClientTestingModule} from '@angular/common/http/testing'; describe('ListGenericResourceComponent', () => { - let component: ListGenericResourceComponent; - let fixture: ComponentFixture; + let component: DatatableGenericResourceComponent; + let fixture: ComponentFixture; beforeEach(async () => { await TestBed.configureTestingModule({ - declarations: [ ListGenericResourceComponent ], + declarations: [ DatatableGenericResourceComponent ], imports: [HttpClientTestingModule], providers: [ { @@ -22,7 +22,7 @@ describe('ListGenericResourceComponent', () => { }) .compileComponents(); - fixture = TestBed.createComponent(ListGenericResourceComponent); + fixture = TestBed.createComponent(DatatableGenericResourceComponent); component = fixture.componentInstance; fixture.detectChanges(); }); diff --git a/frontend/src/app/components/list-generic-resource/list-generic-resource.component.ts b/frontend/src/app/components/fhir-datatable/datatable-generic-resource/datatable-generic-resource.component.ts similarity index 71% rename from frontend/src/app/components/list-generic-resource/list-generic-resource.component.ts rename to frontend/src/app/components/fhir-datatable/datatable-generic-resource/datatable-generic-resource.component.ts index 8d53d522..615c8457 100644 --- a/frontend/src/app/components/list-generic-resource/list-generic-resource.component.ts +++ b/frontend/src/app/components/fhir-datatable/datatable-generic-resource/datatable-generic-resource.component.ts @@ -1,17 +1,22 @@ -import {ChangeDetectorRef, Component, Input, OnInit, ViewChild} from '@angular/core'; +import {ChangeDetectorRef, Component, EventEmitter, Input, OnInit, Output, ViewChild} from '@angular/core'; import {DatatableComponent, ColumnMode, SelectionType} from '@swimlane/ngx-datatable'; -import {ResourceFhir} from '../../models/fasten/resource_fhir'; +import {ResourceFhir} from '../../../models/fasten/resource_fhir'; import {FORMATTERS, getPath, obsValue, attributeXTime} from './utils'; -import {Router} from '@angular/router'; -import {Observable, of} from 'rxjs'; -import {map} from 'rxjs/operators'; -import {FastenApiService} from '../../services/fasten-api.service'; +import {FastenApiService} from '../../../services/fasten-api.service'; +import {FastenDisplayModel} from '../../../../lib/models/fasten/fasten-display-model'; //all Resource list components must implement this Interface export interface ResourceListComponentInterface { + //inputs resourceListType: string; totalElements: number; sourceId: string; + disabledResourceIds: string[]; + + //outputs + selectionChanged: EventEmitter + + //private functions markForCheck() } @@ -30,14 +35,16 @@ class PageInfo { } @Component({ - selector: 'app-list-generic-resource', - templateUrl: './list-generic-resource.component.html', - styleUrls: ['./list-generic-resource.component.scss'] + selector: 'fhir-datatable-generic-resource', + templateUrl: './datatable-generic-resource.component.html', + styleUrls: ['./datatable-generic-resource.component.scss'] }) -export class ListGenericResourceComponent implements OnInit, ResourceListComponentInterface { +export class DatatableGenericResourceComponent implements OnInit, ResourceListComponentInterface { @Input() totalElements: number; @Input() resourceListType: string; @Input() sourceId: string; + @Input() disabledResourceIds: string[] = []; + @Output() selectionChanged: EventEmitter = new EventEmitter(); currentPage: PageInfo = {offset: 0} // @Input() resourceList: ResourceFhir[] = [] @@ -53,7 +60,7 @@ export class ListGenericResourceComponent implements OnInit, ResourceListCompone ColumnMode = ColumnMode; SelectionType = SelectionType; - constructor(public changeRef: ChangeDetectorRef, public router: Router, public fastenApi: FastenApiService) { + constructor(public changeRef: ChangeDetectorRef, public fastenApi: FastenApiService) { } @@ -101,6 +108,7 @@ export class ListGenericResourceComponent implements OnInit, ResourceListCompone this.rows = resourceList.map((resource) => { let row = { + resource: resource, source_id: resource.source_id, source_resource_type: resource.source_resource_type, source_resource_id: resource.source_resource_id @@ -125,11 +133,20 @@ export class ListGenericResourceComponent implements OnInit, ResourceListCompone * @param selected */ onSelect({ selected }) { - console.log('Select Event', selected); - this.router.navigateByUrl(`/explore/${selected[0].source_id}/resource/${selected[0].source_resource_id}`); - + this.selectionChanged.emit(selected[0]) } + //check to see if this row should be selectable + // if the row is in the disabled list, it should not be selectable + selectCheck(): (any) => boolean { + return function(row) { + let canSelect = this.disabledResourceIds.indexOf(row.source_resource_id) === -1 + if(!canSelect){ + console.warn(`Row id '${row.source_resource_id}' is disabled, cannot select`) + } + return canSelect + }.bind(this) + } } /////////////////////////////////////////////////////////////////////////////////////// diff --git a/frontend/src/app/components/fhir-datatable/datatable-generic-resource/datatable-goal.component.ts b/frontend/src/app/components/fhir-datatable/datatable-generic-resource/datatable-goal.component.ts new file mode 100644 index 00000000..043481e8 --- /dev/null +++ b/frontend/src/app/components/fhir-datatable/datatable-generic-resource/datatable-goal.component.ts @@ -0,0 +1,15 @@ +import {Component, OnChanges, OnInit} from '@angular/core'; +import {GenericColumnDefn, DatatableGenericResourceComponent, ResourceListComponentInterface} from './datatable-generic-resource.component'; + +@Component({ + selector: 'fhir-datatable-goal', + templateUrl: './datatable-generic-resource.component.html', + styleUrls: ['./datatable-generic-resource.component.scss'] +}) +export class DatatableGoalComponent extends DatatableGenericResourceComponent { + columnDefinitions: GenericColumnDefn[] = [ + { title: 'Description', versions: '*', getter: e => e.description.text }, + { title: 'Status', versions: '*', getter: e => e.lifecycleStatus }, + { title: 'Status Reason', versions: '*', getter: e => e.statusReason }, + ] +} diff --git a/frontend/src/app/components/list-generic-resource/list-immunization.component.ts b/frontend/src/app/components/fhir-datatable/datatable-generic-resource/datatable-immunization.component.ts similarity index 57% rename from frontend/src/app/components/list-generic-resource/list-immunization.component.ts rename to frontend/src/app/components/fhir-datatable/datatable-generic-resource/datatable-immunization.component.ts index 50e10d39..c10cab12 100644 --- a/frontend/src/app/components/list-generic-resource/list-immunization.component.ts +++ b/frontend/src/app/components/fhir-datatable/datatable-generic-resource/datatable-immunization.component.ts @@ -1,12 +1,12 @@ import {Component} from '@angular/core'; -import {GenericColumnDefn, ListGenericResourceComponent} from './list-generic-resource.component'; +import {GenericColumnDefn, DatatableGenericResourceComponent} from './datatable-generic-resource.component'; @Component({ - selector: 'app-list-immunization', - templateUrl: './list-generic-resource.component.html', - styleUrls: ['./list-generic-resource.component.scss'] + selector: 'fhir-datatable-immunization', + templateUrl: './datatable-generic-resource.component.html', + styleUrls: ['./datatable-generic-resource.component.scss'] }) -export class ListImmunizationComponent extends ListGenericResourceComponent { +export class DatatableImmunizationComponent extends DatatableGenericResourceComponent { columnDefinitions: GenericColumnDefn[] = [ { title: 'Vaccine', versions: '*', format: 'codeableConcept', getter: i => i.vaccineCode }, { title: 'Status', versions: '*', getter: i => i.status }, diff --git a/frontend/src/app/components/list-generic-resource/list-location.component.ts b/frontend/src/app/components/fhir-datatable/datatable-generic-resource/datatable-location.component.ts similarity index 57% rename from frontend/src/app/components/list-generic-resource/list-location.component.ts rename to frontend/src/app/components/fhir-datatable/datatable-generic-resource/datatable-location.component.ts index 864e0ffa..1e0016ef 100644 --- a/frontend/src/app/components/list-generic-resource/list-location.component.ts +++ b/frontend/src/app/components/fhir-datatable/datatable-generic-resource/datatable-location.component.ts @@ -1,13 +1,13 @@ import {Component} from '@angular/core'; -import {GenericColumnDefn, ListGenericResourceComponent} from './list-generic-resource.component'; +import {GenericColumnDefn, DatatableGenericResourceComponent} from './datatable-generic-resource.component'; import {attributeXTime} from './utils'; @Component({ - selector: 'app-list-location', - templateUrl: './list-generic-resource.component.html', - styleUrls: ['./list-generic-resource.component.scss'] + selector: 'fhir-datatable-location', + templateUrl: './datatable-generic-resource.component.html', + styleUrls: ['./datatable-generic-resource.component.scss'] }) -export class ListLocationComponent extends ListGenericResourceComponent { +export class DatatableLocationComponent extends DatatableGenericResourceComponent { columnDefinitions: GenericColumnDefn[] = [ { title: 'Name', versions: '*', getter: d => d.name || d.alias }, { title: 'Organization', versions: '*', getter: d => d.managingOrganization?.display }, diff --git a/frontend/src/app/components/list-generic-resource/list-medication-administration.component.ts b/frontend/src/app/components/fhir-datatable/datatable-generic-resource/datatable-medication-administration.component.ts similarity index 64% rename from frontend/src/app/components/list-generic-resource/list-medication-administration.component.ts rename to frontend/src/app/components/fhir-datatable/datatable-generic-resource/datatable-medication-administration.component.ts index f61ed12e..c017869e 100644 --- a/frontend/src/app/components/list-generic-resource/list-medication-administration.component.ts +++ b/frontend/src/app/components/fhir-datatable/datatable-generic-resource/datatable-medication-administration.component.ts @@ -1,13 +1,13 @@ import {Component} from '@angular/core'; -import {GenericColumnDefn, ListGenericResourceComponent} from './list-generic-resource.component'; +import {GenericColumnDefn, DatatableGenericResourceComponent} from './datatable-generic-resource.component'; import {attributeXTime} from './utils'; @Component({ - selector: 'app-list-medication-administration', - templateUrl: './list-generic-resource.component.html', - styleUrls: ['./list-generic-resource.component.scss'] + selector: 'fhir-datatable-medication-administration', + templateUrl: './datatable-generic-resource.component.html', + styleUrls: ['./datatable-generic-resource.component.scss'] }) -export class ListMedicationAdministrationComponent extends ListGenericResourceComponent { +export class DatatableMedicationAdministrationComponent extends DatatableGenericResourceComponent { columnDefinitions: GenericColumnDefn[] = [ { title: 'Medication', versions: '*', format: 'codeableConcept', getter: m => m.medicationCodeableConcept }, { title: 'Route', versions: '*', format: 'codeableConcept', getter: m => m.dosage.route }, diff --git a/frontend/src/app/components/fhir-datatable/datatable-generic-resource/datatable-medication-dispense.component.ts b/frontend/src/app/components/fhir-datatable/datatable-generic-resource/datatable-medication-dispense.component.ts new file mode 100644 index 00000000..8fce098b --- /dev/null +++ b/frontend/src/app/components/fhir-datatable/datatable-generic-resource/datatable-medication-dispense.component.ts @@ -0,0 +1,15 @@ +import {Component} from '@angular/core'; +import {GenericColumnDefn, DatatableGenericResourceComponent} from './datatable-generic-resource.component'; +import {attributeXTime} from './utils'; + +@Component({ + selector: 'fhir-datatable-medication-dispense', + templateUrl: './datatable-generic-resource.component.html', + styleUrls: ['./datatable-generic-resource.component.scss'] +}) +export class DatatableMedicationDispenseComponent extends DatatableGenericResourceComponent { + columnDefinitions: GenericColumnDefn[] = [ + { title: 'Medication', versions: '*', format: 'code', getter: m => m.medicationCodeableConcept?.coding?.[0] }, + { title: 'Handed Over Date', versions: '*', format: 'date', getter: m => m.whenHandedOver} + ] +} diff --git a/frontend/src/app/components/list-generic-resource/list-medication-request.component.ts b/frontend/src/app/components/fhir-datatable/datatable-generic-resource/datatable-medication-request.component.ts similarity index 69% rename from frontend/src/app/components/list-generic-resource/list-medication-request.component.ts rename to frontend/src/app/components/fhir-datatable/datatable-generic-resource/datatable-medication-request.component.ts index e967f66f..6041b3b2 100644 --- a/frontend/src/app/components/list-generic-resource/list-medication-request.component.ts +++ b/frontend/src/app/components/fhir-datatable/datatable-generic-resource/datatable-medication-request.component.ts @@ -1,12 +1,12 @@ import {Component} from '@angular/core'; -import {GenericColumnDefn, ListGenericResourceComponent} from './list-generic-resource.component'; +import {GenericColumnDefn, DatatableGenericResourceComponent} from './datatable-generic-resource.component'; @Component({ - selector: 'app-list-medication-request', - templateUrl: './list-generic-resource.component.html', - styleUrls: ['./list-generic-resource.component.scss'] + selector: 'fhir-datatable-medication-request', + templateUrl: './datatable-generic-resource.component.html', + styleUrls: ['./datatable-generic-resource.component.scss'] }) -export class ListMedicationRequestComponent extends ListGenericResourceComponent { +export class DatatableMedicationRequestComponent extends DatatableGenericResourceComponent { columnDefinitions: GenericColumnDefn[] = [ { title: 'Author Date', versions: '*', format: 'date', getter: m => m.authoredOn }, { title: 'Medication', versions: '*', format: 'codeableConcept', getter: m => m.medicationCodeableConcept }, //remove drug code diff --git a/frontend/src/app/components/fhir-datatable/datatable-generic-resource/datatable-medication.component.ts b/frontend/src/app/components/fhir-datatable/datatable-generic-resource/datatable-medication.component.ts new file mode 100644 index 00000000..65b88dc7 --- /dev/null +++ b/frontend/src/app/components/fhir-datatable/datatable-generic-resource/datatable-medication.component.ts @@ -0,0 +1,15 @@ +import {Component} from '@angular/core'; +import {GenericColumnDefn, DatatableGenericResourceComponent} from './datatable-generic-resource.component'; + +@Component({ + selector: 'fhir-datatable-medication', + templateUrl: './datatable-generic-resource.component.html', + styleUrls: ['./datatable-generic-resource.component.scss'] +}) +export class DatatableMedicationComponent extends DatatableGenericResourceComponent { + columnDefinitions: GenericColumnDefn[] = [ + { title: 'Medication', versions: '*', format: 'codeableConcept', getter: c => c.code }, + { title: 'Date Prescribed', versions: '*', format: 'date', getter: c => c.authoredOn }, + { title: 'Status', 'versions': '*', getter: c => c.status } + ] +} diff --git a/frontend/src/app/components/list-generic-resource/list-nutrition-order.component.ts b/frontend/src/app/components/fhir-datatable/datatable-generic-resource/datatable-nutrition-order.component.ts similarity index 58% rename from frontend/src/app/components/list-generic-resource/list-nutrition-order.component.ts rename to frontend/src/app/components/fhir-datatable/datatable-generic-resource/datatable-nutrition-order.component.ts index 3c9427a6..92610f87 100644 --- a/frontend/src/app/components/list-generic-resource/list-nutrition-order.component.ts +++ b/frontend/src/app/components/fhir-datatable/datatable-generic-resource/datatable-nutrition-order.component.ts @@ -1,13 +1,13 @@ import {Component} from '@angular/core'; -import {GenericColumnDefn, ListGenericResourceComponent} from './list-generic-resource.component'; +import {GenericColumnDefn, DatatableGenericResourceComponent} from './datatable-generic-resource.component'; import {attributeXTime} from './utils'; @Component({ - selector: 'app-list-nutrition-order', - templateUrl: './list-generic-resource.component.html', - styleUrls: ['./list-generic-resource.component.scss'] + selector: 'fhir-datatable-nutrition-order', + templateUrl: './datatable-generic-resource.component.html', + styleUrls: ['./datatable-generic-resource.component.scss'] }) -export class ListNutritionOrderComponent extends ListGenericResourceComponent { +export class DatatableNutritionOrderComponent extends DatatableGenericResourceComponent { columnDefinitions: GenericColumnDefn[] = [ { title: 'Preference', versions: '*', format: 'code', getter: n => n.foodPreferenceModifier?.[0].coding?.[0] }, { title: 'Exclusion', versions: '*', format: 'code', getter: n => n.excludeFoodModifier?.[0].coding?.[0] }, diff --git a/frontend/src/app/components/list-generic-resource/list-observation.component.ts b/frontend/src/app/components/fhir-datatable/datatable-generic-resource/datatable-observation.component.ts similarity index 63% rename from frontend/src/app/components/list-generic-resource/list-observation.component.ts rename to frontend/src/app/components/fhir-datatable/datatable-generic-resource/datatable-observation.component.ts index 207d0dbb..323cddad 100644 --- a/frontend/src/app/components/list-generic-resource/list-observation.component.ts +++ b/frontend/src/app/components/fhir-datatable/datatable-generic-resource/datatable-observation.component.ts @@ -1,13 +1,13 @@ import {Component} from '@angular/core'; import {attributeXTime, obsValue} from './utils'; -import {GenericColumnDefn, ListGenericResourceComponent} from './list-generic-resource.component'; +import {GenericColumnDefn, DatatableGenericResourceComponent} from './datatable-generic-resource.component'; @Component({ - selector: 'app-list-observation', - templateUrl: './list-generic-resource.component.html', - styleUrls: ['./list-generic-resource.component.scss'] + selector: 'fhir-datatable-observation', + templateUrl: './datatable-generic-resource.component.html', + styleUrls: ['./datatable-generic-resource.component.scss'] }) -export class ListObservationComponent extends ListGenericResourceComponent { +export class DatatableObservationComponent extends DatatableGenericResourceComponent { columnDefinitions: GenericColumnDefn[] = [ { title: 'Issued Date', 'versions': '*', format: 'date', getter: o => o.issued }, { title: 'Effective', 'versions': '*', getter: o => attributeXTime(o,'effective') }, diff --git a/frontend/src/app/components/list-generic-resource/list-organization.component.ts b/frontend/src/app/components/fhir-datatable/datatable-generic-resource/datatable-organization.component.ts similarity index 52% rename from frontend/src/app/components/list-generic-resource/list-organization.component.ts rename to frontend/src/app/components/fhir-datatable/datatable-generic-resource/datatable-organization.component.ts index 13620765..95e45a2c 100644 --- a/frontend/src/app/components/list-generic-resource/list-organization.component.ts +++ b/frontend/src/app/components/fhir-datatable/datatable-generic-resource/datatable-organization.component.ts @@ -1,13 +1,13 @@ import {Component} from '@angular/core'; -import {GenericColumnDefn, ListGenericResourceComponent} from './list-generic-resource.component'; +import {GenericColumnDefn, DatatableGenericResourceComponent} from './datatable-generic-resource.component'; import {attributeXTime} from './utils'; @Component({ - selector: 'app-list-organization', - templateUrl: './list-generic-resource.component.html', - styleUrls: ['./list-generic-resource.component.scss'] + selector: 'fhir-datatable-organization', + templateUrl: './datatable-generic-resource.component.html', + styleUrls: ['./datatable-generic-resource.component.scss'] }) -export class ListOrganizationComponent extends ListGenericResourceComponent { +export class DatatableOrganizationComponent extends DatatableGenericResourceComponent { columnDefinitions: GenericColumnDefn[] = [ { title: 'Name', versions: '*', getter: d => d.name || d.alias?.[0] }, { title: 'Address', versions: '*', format: 'address', getter: d => d.address?.[0] }, diff --git a/frontend/src/app/components/list-generic-resource/list-practitioner.component.ts b/frontend/src/app/components/fhir-datatable/datatable-generic-resource/datatable-practitioner.component.ts similarity index 53% rename from frontend/src/app/components/list-generic-resource/list-practitioner.component.ts rename to frontend/src/app/components/fhir-datatable/datatable-generic-resource/datatable-practitioner.component.ts index bbb4dfc6..1906d54c 100644 --- a/frontend/src/app/components/list-generic-resource/list-practitioner.component.ts +++ b/frontend/src/app/components/fhir-datatable/datatable-generic-resource/datatable-practitioner.component.ts @@ -1,13 +1,13 @@ import {Component} from '@angular/core'; import {attributeXTime} from './utils'; -import {GenericColumnDefn, ListGenericResourceComponent} from './list-generic-resource.component'; +import {GenericColumnDefn, DatatableGenericResourceComponent} from './datatable-generic-resource.component'; @Component({ - selector: 'app-list-practitioner', - templateUrl: './list-generic-resource.component.html', - styleUrls: ['./list-generic-resource.component.scss'] + selector: 'fhir-datatable-practitioner', + templateUrl: './datatable-generic-resource.component.html', + styleUrls: ['./datatable-generic-resource.component.scss'] }) -export class ListPractitionerComponent extends ListGenericResourceComponent { +export class DatatablePractitionerComponent extends DatatableGenericResourceComponent { columnDefinitions: GenericColumnDefn[] = [ { title: 'Name', versions: '*', format: 'humanName', getter: p => p.name?.[0] }, { title: 'Address', versions: '*', format: 'address', getter: p => p.address?.[0] }, diff --git a/frontend/src/app/components/list-generic-resource/list-procedure.component.ts b/frontend/src/app/components/fhir-datatable/datatable-generic-resource/datatable-procedure.component.ts similarity index 67% rename from frontend/src/app/components/list-generic-resource/list-procedure.component.ts rename to frontend/src/app/components/fhir-datatable/datatable-generic-resource/datatable-procedure.component.ts index b60ffe9e..9beaf442 100644 --- a/frontend/src/app/components/list-generic-resource/list-procedure.component.ts +++ b/frontend/src/app/components/fhir-datatable/datatable-generic-resource/datatable-procedure.component.ts @@ -1,13 +1,13 @@ import {Component} from '@angular/core'; import {attributeXTime} from './utils'; -import {GenericColumnDefn, ListGenericResourceComponent} from './list-generic-resource.component'; +import {GenericColumnDefn, DatatableGenericResourceComponent} from './datatable-generic-resource.component'; @Component({ - selector: 'app-list-procedure', - templateUrl: './list-generic-resource.component.html', - styleUrls: ['./list-generic-resource.component.scss'] + selector: 'fhir-datatable-procedure', + templateUrl: './datatable-generic-resource.component.html', + styleUrls: ['./datatable-generic-resource.component.scss'] }) -export class ListProcedureComponent extends ListGenericResourceComponent { +export class DatatableProcedureComponent extends DatatableGenericResourceComponent { columnDefinitions: GenericColumnDefn[] = [ { title: 'Procedure', versions: '*', format: 'codeableConcept', getter: p => p.code }, { title: 'Performed', versions: '*', getter: p => attributeXTime(p,'performed') }, diff --git a/frontend/src/app/components/list-generic-resource/list-service-request.component.ts b/frontend/src/app/components/fhir-datatable/datatable-generic-resource/datatable-service-request.component.ts similarity index 73% rename from frontend/src/app/components/list-generic-resource/list-service-request.component.ts rename to frontend/src/app/components/fhir-datatable/datatable-generic-resource/datatable-service-request.component.ts index f8562a8b..1e3e2c27 100644 --- a/frontend/src/app/components/list-generic-resource/list-service-request.component.ts +++ b/frontend/src/app/components/fhir-datatable/datatable-generic-resource/datatable-service-request.component.ts @@ -1,13 +1,13 @@ import {Component} from '@angular/core'; -import {GenericColumnDefn, ListGenericResourceComponent} from './list-generic-resource.component'; +import {GenericColumnDefn, DatatableGenericResourceComponent} from './datatable-generic-resource.component'; import {attributeXTime} from './utils'; @Component({ - selector: 'app-list-service-request', - templateUrl: './list-generic-resource.component.html', - styleUrls: ['./list-generic-resource.component.scss'] + selector: 'fhir-datatable-service-request', + templateUrl: './datatable-generic-resource.component.html', + styleUrls: ['./datatable-generic-resource.component.scss'] }) -export class ListServiceRequestComponent extends ListGenericResourceComponent { +export class DatatableServiceRequestComponent extends DatatableGenericResourceComponent { columnDefinitions: GenericColumnDefn[] = [ // orig { title: 'Service', versions: '*', format: 'code', getter: s => s.code.coding[0] }, { title: 'Author Date', versions: '*', format: 'date', getter: s => s.authoredOn }, diff --git a/frontend/src/app/components/list-generic-resource/utils.ts b/frontend/src/app/components/fhir-datatable/datatable-generic-resource/utils.ts similarity index 98% rename from frontend/src/app/components/list-generic-resource/utils.ts rename to frontend/src/app/components/fhir-datatable/datatable-generic-resource/utils.ts index bb685bcc..23b486d0 100644 --- a/frontend/src/app/components/list-generic-resource/utils.ts +++ b/frontend/src/app/components/fhir-datatable/datatable-generic-resource/utils.ts @@ -36,6 +36,9 @@ export const FORMATTERS = { }, humanName: (humanName) => { if(!humanName) return '' + if(humanName.text){ + return humanName.text + } var nameParts = [] if(humanName.prefix) nameParts.push(humanName.prefix.join(', ')) if(humanName.given) nameParts.push(humanName.given.join(' ')) diff --git a/frontend/src/app/components/fhir-datatable/fhir-datatable.module.ts b/frontend/src/app/components/fhir-datatable/fhir-datatable.module.ts new file mode 100644 index 00000000..7953a01a --- /dev/null +++ b/frontend/src/app/components/fhir-datatable/fhir-datatable.module.ts @@ -0,0 +1,111 @@ +import { NgModule } from '@angular/core'; +import { CommonModule } from '@angular/common'; +import {DatatableAdverseEventComponent} from './datatable-generic-resource/datatable-adverse-event.component'; +import {DatatableCarePlanComponent} from './datatable-generic-resource/datatable-care-plan.component'; +import {DatatableAppointmentComponent} from './datatable-generic-resource/datatable-appointment.component'; +import {DatatableBinaryComponent} from './datatable-generic-resource/datatable-binary.component'; +import {DatatableAllergyIntoleranceComponent} from './datatable-generic-resource/datatable-allergy-intolerance.component'; +import {DatatableCareTeamComponent} from './datatable-generic-resource/datatable-care-team.component'; +import {DatatableCommunicationComponent} from './datatable-generic-resource/datatable-communication.component'; +import {DatatableConditionComponent} from './datatable-generic-resource/datatable-condition.component'; +import {DatatableCoverageComponent} from './datatable-generic-resource/datatable-coverage.component'; +import {DatatableDeviceComponent} from './datatable-generic-resource/datatable-device.component'; +import {DatatableDeviceRequestComponent} from './datatable-generic-resource/datatable-device-request.component'; +import {DatatableDiagnosticReportComponent} from './datatable-generic-resource/datatable-diagnostic-report.component'; +import {DatatableDocumentReferenceComponent} from './datatable-generic-resource/datatable-document-reference.component'; +import {DatatableEncounterComponent} from './datatable-generic-resource/datatable-encounter.component'; +import {DatatableGenericResourceComponent} from './datatable-generic-resource/datatable-generic-resource.component'; +import {DatatableGoalComponent} from './datatable-generic-resource/datatable-goal.component'; +import {DatatableImmunizationComponent} from './datatable-generic-resource/datatable-immunization.component'; +import {DatatableLocationComponent} from './datatable-generic-resource/datatable-location.component'; +import {DatatableMedicationAdministrationComponent} from './datatable-generic-resource/datatable-medication-administration.component'; +import {DatatableMedicationComponent} from './datatable-generic-resource/datatable-medication.component'; +import {DatatableMedicationDispenseComponent} from './datatable-generic-resource/datatable-medication-dispense.component'; +import {DatatableMedicationRequestComponent} from './datatable-generic-resource/datatable-medication-request.component'; +import {DatatableNutritionOrderComponent} from './datatable-generic-resource/datatable-nutrition-order.component'; +import {DatatableObservationComponent} from './datatable-generic-resource/datatable-observation.component'; +import {DatatableOrganizationComponent} from './datatable-generic-resource/datatable-organization.component'; +import {ListPatientComponent} from './list-patient/list-patient.component'; +import {DatatablePractitionerComponent} from './datatable-generic-resource/datatable-practitioner.component'; +import {DatatableProcedureComponent} from './datatable-generic-resource/datatable-procedure.component'; +import {DatatableServiceRequestComponent} from './datatable-generic-resource/datatable-service-request.component'; +import {FhirDatatableComponent} from './fhir-datatable/fhir-datatable.component'; +import {FhirDatatableOutletDirective} from './fhir-datatable/fhir-datatable-outlet.directive'; +import {DatatableFallbackComponent} from './datatable-generic-resource/datatable-fallback.component'; +import {NgxDatatableModule} from '@swimlane/ngx-datatable'; + +@NgModule({ + imports: [ + CommonModule, + NgxDatatableModule, + ], + declarations: [ + DatatableAdverseEventComponent, + DatatableAllergyIntoleranceComponent, + DatatableAppointmentComponent, + DatatableBinaryComponent, + DatatableCarePlanComponent, + DatatableCareTeamComponent, + DatatableCommunicationComponent, + DatatableConditionComponent, + DatatableCoverageComponent, + DatatableDeviceComponent, + DatatableDeviceRequestComponent, + DatatableDiagnosticReportComponent, + DatatableDocumentReferenceComponent, + DatatableEncounterComponent, + DatatableGenericResourceComponent, + DatatableGoalComponent, + DatatableImmunizationComponent, + DatatableLocationComponent, + DatatableMedicationAdministrationComponent, + DatatableMedicationComponent, + DatatableMedicationDispenseComponent, + DatatableMedicationRequestComponent, + DatatableNutritionOrderComponent, + DatatableObservationComponent, + DatatableOrganizationComponent, + ListPatientComponent, + DatatablePractitionerComponent, + DatatableProcedureComponent, + DatatableServiceRequestComponent, + FhirDatatableComponent, + FhirDatatableOutletDirective, + DatatableFallbackComponent, + ], + exports: [ + DatatableAdverseEventComponent, + DatatableAllergyIntoleranceComponent, + DatatableAppointmentComponent, + DatatableBinaryComponent, + DatatableCarePlanComponent, + DatatableCareTeamComponent, + DatatableCommunicationComponent, + DatatableConditionComponent, + DatatableCoverageComponent, + DatatableDeviceComponent, + DatatableDeviceRequestComponent, + DatatableDiagnosticReportComponent, + DatatableDocumentReferenceComponent, + DatatableEncounterComponent, + DatatableGenericResourceComponent, + DatatableGoalComponent, + DatatableImmunizationComponent, + DatatableLocationComponent, + DatatableMedicationAdministrationComponent, + DatatableMedicationComponent, + DatatableMedicationDispenseComponent, + DatatableMedicationRequestComponent, + DatatableNutritionOrderComponent, + DatatableObservationComponent, + DatatableOrganizationComponent, + ListPatientComponent, + DatatablePractitionerComponent, + DatatableProcedureComponent, + DatatableServiceRequestComponent, + FhirDatatableComponent, + FhirDatatableOutletDirective, + DatatableFallbackComponent, + ] +}) +export class FhirDatatableModule { } diff --git a/frontend/src/app/components/resource-list/resource-list-outlet.directive.spec.ts b/frontend/src/app/components/fhir-datatable/fhir-datatable/fhir-datatable-outlet.directive.spec.ts similarity index 72% rename from frontend/src/app/components/resource-list/resource-list-outlet.directive.spec.ts rename to frontend/src/app/components/fhir-datatable/fhir-datatable/fhir-datatable-outlet.directive.spec.ts index a33f2e02..9f567800 100644 --- a/frontend/src/app/components/resource-list/resource-list-outlet.directive.spec.ts +++ b/frontend/src/app/components/fhir-datatable/fhir-datatable/fhir-datatable-outlet.directive.spec.ts @@ -1,4 +1,4 @@ -import { ResourceListOutletDirective } from './resource-list-outlet.directive'; +import { FhirDatatableOutletDirective } from './fhir-datatable-outlet.directive'; // describe('ResourceListOutletDirective', () => { // it('should create an instance', () => { diff --git a/frontend/src/app/components/fhir/fhir-resource/fhir-resource-outlet.directive.ts b/frontend/src/app/components/fhir-datatable/fhir-datatable/fhir-datatable-outlet.directive.ts similarity index 63% rename from frontend/src/app/components/fhir/fhir-resource/fhir-resource-outlet.directive.ts rename to frontend/src/app/components/fhir-datatable/fhir-datatable/fhir-datatable-outlet.directive.ts index 1a35426e..dea0439a 100644 --- a/frontend/src/app/components/fhir/fhir-resource/fhir-resource-outlet.directive.ts +++ b/frontend/src/app/components/fhir-datatable/fhir-datatable/fhir-datatable-outlet.directive.ts @@ -1,9 +1,9 @@ import {Directive, ViewContainerRef} from '@angular/core'; @Directive({ - selector: '[fhirResourceOutlet]' + selector: '[fhirDatatableOutlet]' }) -export class FhirResourceOutletDirective { +export class FhirDatatableOutletDirective { constructor(public viewContainerRef: ViewContainerRef) { } diff --git a/frontend/src/app/components/fhir-datatable/fhir-datatable/fhir-datatable.component.html b/frontend/src/app/components/fhir-datatable/fhir-datatable/fhir-datatable.component.html new file mode 100644 index 00000000..3611f67c --- /dev/null +++ b/frontend/src/app/components/fhir-datatable/fhir-datatable/fhir-datatable.component.html @@ -0,0 +1,25 @@ +

{{resourceListType}}

+ + + + + + + + + + diff --git a/frontend/src/app/components/resource-list/resource-list.component.scss b/frontend/src/app/components/fhir-datatable/fhir-datatable/fhir-datatable.component.scss similarity index 100% rename from frontend/src/app/components/resource-list/resource-list.component.scss rename to frontend/src/app/components/fhir-datatable/fhir-datatable/fhir-datatable.component.scss diff --git a/frontend/src/app/components/resource-list/resource-list.component.spec.ts b/frontend/src/app/components/fhir-datatable/fhir-datatable/fhir-datatable.component.spec.ts similarity index 56% rename from frontend/src/app/components/resource-list/resource-list.component.spec.ts rename to frontend/src/app/components/fhir-datatable/fhir-datatable/fhir-datatable.component.spec.ts index f4922b2e..fe7d406d 100644 --- a/frontend/src/app/components/resource-list/resource-list.component.spec.ts +++ b/frontend/src/app/components/fhir-datatable/fhir-datatable/fhir-datatable.component.spec.ts @@ -1,20 +1,20 @@ import { ComponentFixture, TestBed } from '@angular/core/testing'; -import { ResourceListComponent } from './resource-list.component'; +import { FhirDatatableComponent } from './fhir-datatable.component'; import {HttpClientTestingModule} from '@angular/common/http/testing'; -import {ResourceListOutletDirective} from './resource-list-outlet.directive'; -import {FastenApiService} from '../../services/fasten-api.service'; -import {HTTP_CLIENT_TOKEN} from '../../dependency-injection'; +import {FhirDatatableOutletDirective} from './fhir-datatable-outlet.directive'; +import {FastenApiService} from '../../../services/fasten-api.service'; +import {HTTP_CLIENT_TOKEN} from '../../../dependency-injection'; import {HttpClient} from '@angular/common/http'; describe('ResourceListComponent', () => { - let component: ResourceListComponent; - let fixture: ComponentFixture; + let component: FhirDatatableComponent; + let fixture: ComponentFixture; beforeEach(async () => { await TestBed.configureTestingModule({ imports: [HttpClientTestingModule], - declarations: [ ResourceListComponent, ResourceListOutletDirective ], + declarations: [ FhirDatatableComponent, FhirDatatableOutletDirective ], providers: [ FastenApiService, { @@ -25,7 +25,7 @@ describe('ResourceListComponent', () => { }) .compileComponents(); - fixture = TestBed.createComponent(ResourceListComponent); + fixture = TestBed.createComponent(FhirDatatableComponent); component = fixture.componentInstance; fixture.detectChanges(); }); diff --git a/frontend/src/app/components/fhir-datatable/fhir-datatable/fhir-datatable.component.ts b/frontend/src/app/components/fhir-datatable/fhir-datatable/fhir-datatable.component.ts new file mode 100644 index 00000000..15383f41 --- /dev/null +++ b/frontend/src/app/components/fhir-datatable/fhir-datatable/fhir-datatable.component.ts @@ -0,0 +1,182 @@ +import {ChangeDetectionStrategy, Component, Input, OnChanges, OnInit, SimpleChanges, Type, ViewChild} from '@angular/core'; +import {FastenApiService} from '../../../services/fasten-api.service'; +import {Source} from '../../../models/fasten/source'; +import {DatatableAdverseEventComponent} from '../datatable-generic-resource/datatable-adverse-event.component'; +import {DatatableAllergyIntoleranceComponent} from '../datatable-generic-resource/datatable-allergy-intolerance.component'; +import {DatatableAppointmentComponent} from '../datatable-generic-resource/datatable-appointment.component'; +import {DatatableBinaryComponent} from '../datatable-generic-resource/datatable-binary.component'; +import {DatatableCarePlanComponent} from '../datatable-generic-resource/datatable-care-plan.component'; +import {DatatableCareTeamComponent} from '../datatable-generic-resource/datatable-care-team.component'; +import {DatatableCommunicationComponent} from '../datatable-generic-resource/datatable-communication.component'; +import {DatatableConditionComponent} from '../datatable-generic-resource/datatable-condition.component'; +import {DatatableCoverageComponent} from '../datatable-generic-resource/datatable-coverage.component'; +import {DatatableDeviceComponent} from '../datatable-generic-resource/datatable-device.component'; +import {DatatableDeviceRequestComponent} from '../datatable-generic-resource/datatable-device-request.component'; +import {DatatableDiagnosticReportComponent} from '../datatable-generic-resource/datatable-diagnostic-report.component'; +import {DatatableDocumentReferenceComponent} from '../datatable-generic-resource/datatable-document-reference.component'; +import {DatatableEncounterComponent} from '../datatable-generic-resource/datatable-encounter.component'; +import {DatatableFallbackComponent} from '../datatable-generic-resource/datatable-fallback.component'; +import {DatatableGenericResourceComponent, ResourceListComponentInterface} from '../datatable-generic-resource/datatable-generic-resource.component'; +import {DatatableGoalComponent} from '../datatable-generic-resource/datatable-goal.component'; +import {DatatableImmunizationComponent} from '../datatable-generic-resource/datatable-immunization.component'; +import {DatatableLocationComponent} from '../datatable-generic-resource/datatable-location.component'; +import {DatatableMedicationAdministrationComponent} from '../datatable-generic-resource/datatable-medication-administration.component'; +import {DatatableMedicationComponent} from '../datatable-generic-resource/datatable-medication.component'; +import {DatatableMedicationDispenseComponent} from '../datatable-generic-resource/datatable-medication-dispense.component'; +import {DatatableMedicationRequestComponent} from '../datatable-generic-resource/datatable-medication-request.component'; +import {DatatableNutritionOrderComponent} from '../datatable-generic-resource/datatable-nutrition-order.component'; +import {DatatableObservationComponent} from '../datatable-generic-resource/datatable-observation.component'; +import {DatatableOrganizationComponent} from '../datatable-generic-resource/datatable-organization.component'; +import {DatatablePractitionerComponent} from '../datatable-generic-resource/datatable-practitioner.component'; +import {DatatableProcedureComponent} from '../datatable-generic-resource/datatable-procedure.component'; +import {DatatableServiceRequestComponent} from '../datatable-generic-resource/datatable-service-request.component'; +import {FhirDatatableOutletDirective} from './fhir-datatable-outlet.directive'; +import {Router} from '@angular/router'; +import {FastenDisplayModel} from '../../../../lib/models/fasten/fasten-display-model'; + +@Component({ + selector: 'fhir-datatable', + changeDetection: ChangeDetectionStrategy.OnPush, + templateUrl: './fhir-datatable.component.html', + styleUrls: ['./fhir-datatable.component.scss'] +}) +export class FhirDatatableComponent implements OnInit, OnChanges { + + @Input() source: Source; + @Input() resourceListType: string; + @Input() selectedTotalElements: number; + @Input() disabledResourceIds: string[] = []; + + //location to dynamically load the resource list + @ViewChild(FhirDatatableOutletDirective, {static: true}) resourceListOutlet!: FhirDatatableOutletDirective; + + knownResourceType: boolean = true; + + constructor(public router: Router, private fastenApi: FastenApiService) { } + + ngOnInit(): void { + this.loadComponent() + } + ngOnChanges(changes: SimpleChanges) { + this.loadComponent() + } + + loadComponent() { + //clear the current outlet + const viewContainerRef = this.resourceListOutlet.viewContainerRef; + viewContainerRef.clear(); + + let componentType = this.typeLookup(this.resourceListType) + if(componentType != null){ + console.log("Attempting to create component", this.resourceListType, componentType) + const componentRef = viewContainerRef.createComponent(componentType); + componentRef.instance.totalElements = this.selectedTotalElements; + componentRef.instance.resourceListType = this.resourceListType; + componentRef.instance.sourceId = this.source.id; + componentRef.instance.markForCheck() + if(this.disabledResourceIds){ + componentRef.instance.disabledResourceIds = this.disabledResourceIds + } + + componentRef.instance.selectionChanged.subscribe((selected: FastenDisplayModel) => { + this.router.navigateByUrl(`/explore/${selected?.source_id}/resource/${selected?.source_resource_id}`); + }) + this.knownResourceType = (componentType != DatatableFallbackComponent) + } + } + + typeLookup(resourceType: string): Type { + if(!resourceType){ + //dont try to render anything if the resourceType isnt set. + return null + } + switch(resourceType) { + case "Appointment": { + return DatatableAppointmentComponent; + } + case "AllergyIntolerance": { + return DatatableAllergyIntoleranceComponent; + } + case "AdverseEvent": { + return DatatableAdverseEventComponent; + } + case "Binary": { + return DatatableBinaryComponent; + } + case "CarePlan": { + return DatatableCarePlanComponent; + } + case "CareTeam": { + return DatatableCareTeamComponent; + } + case "Communication": { + return DatatableCommunicationComponent; + } + case "Condition": { + return DatatableConditionComponent; + } + case "Coverage": { + return DatatableCoverageComponent; + } + case "Device": { + return DatatableDeviceComponent; + } + case "DeviceRequest": { + return DatatableDeviceRequestComponent; + } + case "DiagnosticReport": { + return DatatableDiagnosticReportComponent; + } + case "DocumentReference": { + return DatatableDocumentReferenceComponent; + } + case "Encounter": { + return DatatableEncounterComponent; + } + case "Goal": { + return DatatableGoalComponent; + } + case "Immunization": { + return DatatableImmunizationComponent; + } + case "Location": { + return DatatableLocationComponent; + } + case "Medication": { + return DatatableMedicationComponent; + } + case "MedicationAdministration": { + return DatatableMedicationAdministrationComponent; + } + case "MedicationDispense": { + return DatatableMedicationDispenseComponent; + } + case "MedicationRequest": { + return DatatableMedicationRequestComponent; + } + case "NutritionOrder": { + return DatatableNutritionOrderComponent; + } + case "Observation": { + return DatatableObservationComponent; + } + case "Organization": { + return DatatableOrganizationComponent; + } + case "Practitioner": { + return DatatablePractitionerComponent; + } + case "Procedure": { + return DatatableProcedureComponent; + } + case "ServiceRequest": { + return DatatableServiceRequestComponent; + } + default: { + console.warn("Unknown component type, using fallback", resourceType) + return DatatableFallbackComponent; + + } + } + } +} diff --git a/frontend/src/app/components/list-patient/list-patient.component.html b/frontend/src/app/components/fhir-datatable/list-patient/list-patient.component.html similarity index 100% rename from frontend/src/app/components/list-patient/list-patient.component.html rename to frontend/src/app/components/fhir-datatable/list-patient/list-patient.component.html diff --git a/frontend/src/app/components/fhir-datatable/list-patient/list-patient.component.scss b/frontend/src/app/components/fhir-datatable/list-patient/list-patient.component.scss new file mode 100644 index 00000000..e69de29b diff --git a/frontend/src/app/components/list-patient/list-patient.component.spec.ts b/frontend/src/app/components/fhir-datatable/list-patient/list-patient.component.spec.ts similarity index 100% rename from frontend/src/app/components/list-patient/list-patient.component.spec.ts rename to frontend/src/app/components/fhir-datatable/list-patient/list-patient.component.spec.ts diff --git a/frontend/src/app/components/list-patient/list-patient.component.ts b/frontend/src/app/components/fhir-datatable/list-patient/list-patient.component.ts similarity index 100% rename from frontend/src/app/components/list-patient/list-patient.component.ts rename to frontend/src/app/components/fhir-datatable/list-patient/list-patient.component.ts diff --git a/frontend/src/app/components/fhir/fhir-resource/fhir-resource.component.html b/frontend/src/app/components/fhir/fhir-resource/fhir-resource.component.html deleted file mode 100644 index b9aabc6a..00000000 --- a/frontend/src/app/components/fhir/fhir-resource/fhir-resource.component.html +++ /dev/null @@ -1 +0,0 @@ - diff --git a/frontend/src/app/components/fhir/fhir-resource/fhir-resource.component.spec.ts b/frontend/src/app/components/fhir/fhir-resource/fhir-resource.component.spec.ts deleted file mode 100644 index 69a5e679..00000000 --- a/frontend/src/app/components/fhir/fhir-resource/fhir-resource.component.spec.ts +++ /dev/null @@ -1,24 +0,0 @@ -import { ComponentFixture, TestBed } from '@angular/core/testing'; - -import { FhirResourceComponent } from './fhir-resource.component'; -import {FhirResourceOutletDirective} from './fhir-resource-outlet.directive'; - -describe('FhirResourceComponent', () => { - let component: FhirResourceComponent; - let fixture: ComponentFixture; - - beforeEach(async () => { - await TestBed.configureTestingModule({ - declarations: [ FhirResourceComponent, FhirResourceOutletDirective ], - }) - .compileComponents(); - - fixture = TestBed.createComponent(FhirResourceComponent); - component = fixture.componentInstance; - fixture.detectChanges(); - }); - - it('should create', () => { - expect(component).toBeTruthy(); - }); -}); diff --git a/frontend/src/app/components/list-generic-resource/list-adverse-event.component.ts b/frontend/src/app/components/list-generic-resource/list-adverse-event.component.ts deleted file mode 100644 index 0ab0c02c..00000000 --- a/frontend/src/app/components/list-generic-resource/list-adverse-event.component.ts +++ /dev/null @@ -1,15 +0,0 @@ -import {Component} from '@angular/core'; -import {GenericColumnDefn, ListGenericResourceComponent} from './list-generic-resource.component'; -import {attributeXTime} from './utils'; - -@Component({ - selector: 'app-list-adverse-event', - templateUrl: './list-generic-resource.component.html', - styleUrls: ['./list-generic-resource.component.scss'] -}) -export class ListAdverseEventComponent extends ListGenericResourceComponent { - columnDefinitions: GenericColumnDefn[] = [ - { title: 'Event', versions: '*', format: 'codeableConcept', getter: a => a.event }, - { title: 'Date', versions: '*', format: 'date', getter: a => a.date } - ] -} diff --git a/frontend/src/app/components/list-generic-resource/list-coverage.component.ts b/frontend/src/app/components/list-generic-resource/list-coverage.component.ts deleted file mode 100644 index 222ae070..00000000 --- a/frontend/src/app/components/list-generic-resource/list-coverage.component.ts +++ /dev/null @@ -1,15 +0,0 @@ -import {Component} from '@angular/core'; -import {GenericColumnDefn, ListGenericResourceComponent} from './list-generic-resource.component'; -import {attributeXTime} from './utils'; - -@Component({ - selector: 'app-list-coverage', - templateUrl: './list-generic-resource.component.html', - styleUrls: ['./list-generic-resource.component.scss'] -}) -export class ListCoverageComponent extends ListGenericResourceComponent { - columnDefinitions: GenericColumnDefn[] = [ - { title: 'Type', versions: '*', format: 'codeableConcept', getter: c => c.type }, - { title: 'Period', versions: '*', format: 'period', getter: c => c.period } - ] -} diff --git a/frontend/src/app/components/list-generic-resource/list-explanation-of-benefit.component.ts b/frontend/src/app/components/list-generic-resource/list-explanation-of-benefit.component.ts deleted file mode 100644 index 26be1b77..00000000 --- a/frontend/src/app/components/list-generic-resource/list-explanation-of-benefit.component.ts +++ /dev/null @@ -1,11 +0,0 @@ -import {Component, OnChanges, OnInit} from '@angular/core'; -import {GenericColumnDefn, ListGenericResourceComponent, ResourceListComponentInterface} from './list-generic-resource.component'; - -@Component({ - selector: 'app-list-explanation-of-benefit', - templateUrl: './list-generic-resource.component.html', - styleUrls: ['./list-generic-resource.component.scss'] -}) -export class ListExplanationOfBenefitComponent extends ListGenericResourceComponent { - columnDefinitions: GenericColumnDefn[] = [] -} diff --git a/frontend/src/app/components/list-generic-resource/list-fallback.component.ts b/frontend/src/app/components/list-generic-resource/list-fallback.component.ts deleted file mode 100644 index 17d497e1..00000000 --- a/frontend/src/app/components/list-generic-resource/list-fallback.component.ts +++ /dev/null @@ -1,14 +0,0 @@ -import {Component, OnChanges, OnInit} from '@angular/core'; -import {GenericColumnDefn, ListGenericResourceComponent, ResourceListComponentInterface} from './list-generic-resource.component'; - -@Component({ - selector: 'app-list-fallback', - templateUrl: './list-fallback.component.html', - styleUrls: ['./list-generic-resource.component.scss'] -}) -export class ListFallbackComponent extends ListGenericResourceComponent { - columnDefinitions: GenericColumnDefn[] = [ - { title: 'Id', versions: '*', getter: e => e.id }, - { title: 'Title', versions: '*', getter: e => e.reasonCode?.[0] }, - ] -} diff --git a/frontend/src/app/components/list-generic-resource/list-generic-resource.component.html b/frontend/src/app/components/list-generic-resource/list-generic-resource.component.html deleted file mode 100644 index 1d19695c..00000000 --- a/frontend/src/app/components/list-generic-resource/list-generic-resource.component.html +++ /dev/null @@ -1,32 +0,0 @@ -
- - - - - -
diff --git a/frontend/src/app/components/list-generic-resource/list-goal.component.ts b/frontend/src/app/components/list-generic-resource/list-goal.component.ts deleted file mode 100644 index fa67abad..00000000 --- a/frontend/src/app/components/list-generic-resource/list-goal.component.ts +++ /dev/null @@ -1,15 +0,0 @@ -import {Component, OnChanges, OnInit} from '@angular/core'; -import {GenericColumnDefn, ListGenericResourceComponent, ResourceListComponentInterface} from './list-generic-resource.component'; - -@Component({ - selector: 'app-list-goal', - templateUrl: './list-generic-resource.component.html', - styleUrls: ['./list-generic-resource.component.scss'] -}) -export class ListGoalComponent extends ListGenericResourceComponent { - columnDefinitions: GenericColumnDefn[] = [ - { title: 'Description', versions: '*', getter: e => e.description.text }, - { title: 'Status', versions: '*', getter: e => e.lifecycleStatus }, - { title: 'Status Reason', versions: '*', getter: e => e.statusReason }, - ] -} diff --git a/frontend/src/app/components/list-generic-resource/list-medication-dispense.component.ts b/frontend/src/app/components/list-generic-resource/list-medication-dispense.component.ts deleted file mode 100644 index c617a203..00000000 --- a/frontend/src/app/components/list-generic-resource/list-medication-dispense.component.ts +++ /dev/null @@ -1,15 +0,0 @@ -import {Component} from '@angular/core'; -import {GenericColumnDefn, ListGenericResourceComponent} from './list-generic-resource.component'; -import {attributeXTime} from './utils'; - -@Component({ - selector: 'app-list-medication-dispense', - templateUrl: './list-generic-resource.component.html', - styleUrls: ['./list-generic-resource.component.scss'] -}) -export class ListMedicationDispenseComponent extends ListGenericResourceComponent { - columnDefinitions: GenericColumnDefn[] = [ - { title: 'Medication', versions: '*', format: 'code', getter: m => m.medicationCodeableConcept?.coding?.[0] }, - { title: 'Handed Over Date', versions: '*', format: 'date', getter: m => m.whenHandedOver} - ] -} diff --git a/frontend/src/app/components/list-generic-resource/list-medication.component.ts b/frontend/src/app/components/list-generic-resource/list-medication.component.ts deleted file mode 100644 index 11ddbfd5..00000000 --- a/frontend/src/app/components/list-generic-resource/list-medication.component.ts +++ /dev/null @@ -1,15 +0,0 @@ -import {Component} from '@angular/core'; -import {GenericColumnDefn, ListGenericResourceComponent} from './list-generic-resource.component'; - -@Component({ - selector: 'app-list-medication', - templateUrl: './list-generic-resource.component.html', - styleUrls: ['./list-generic-resource.component.scss'] -}) -export class ListMedicationComponent extends ListGenericResourceComponent { - columnDefinitions: GenericColumnDefn[] = [ - { title: 'Medication', versions: '*', format: 'codeableConcept', getter: c => c.code }, - { title: 'Date Prescribed', versions: '*', format: 'date', getter: c => c.authoredOn }, - { title: 'Status', 'versions': '*', getter: c => c.status } - ] -} diff --git a/frontend/src/app/components/medical-record-wizard-add-attachment/medical-record-wizard-add-attachment.component.html b/frontend/src/app/components/medical-record-wizard-add-attachment/medical-record-wizard-add-attachment.component.html new file mode 100644 index 00000000..c086344c --- /dev/null +++ b/frontend/src/app/components/medical-record-wizard-add-attachment/medical-record-wizard-add-attachment.component.html @@ -0,0 +1,40 @@ +
+ + +
+
+ +
+
+ New Attachment Form Status: {{ newAttachmentForm.status }} +
+ +
+ + +
+

Name*

+ +
+ +
+

Category*

+ +
+
+

File Type*

+ +
+
+

File*

+
+
+ + +
+ +
+
+
+ +
diff --git a/frontend/src/app/components/medical-record-wizard-add-attachment/medical-record-wizard-add-attachment.component.scss b/frontend/src/app/components/medical-record-wizard-add-attachment/medical-record-wizard-add-attachment.component.scss new file mode 100644 index 00000000..e69de29b diff --git a/frontend/src/app/components/medical-record-wizard-add-attachment/medical-record-wizard-add-attachment.component.spec.ts b/frontend/src/app/components/medical-record-wizard-add-attachment/medical-record-wizard-add-attachment.component.spec.ts new file mode 100644 index 00000000..c133f7e3 --- /dev/null +++ b/frontend/src/app/components/medical-record-wizard-add-attachment/medical-record-wizard-add-attachment.component.spec.ts @@ -0,0 +1,32 @@ +import { ComponentFixture, TestBed } from '@angular/core/testing'; + +import { MedicalRecordWizardAddAttachmentComponent } from './medical-record-wizard-add-attachment.component'; +import {NgbActiveModal, NgbModal, NgbModalModule} from '@ng-bootstrap/ng-bootstrap'; +import {HttpClientTestingModule} from '@angular/common/http/testing'; +import {HTTP_CLIENT_TOKEN} from '../../dependency-injection'; +import {HttpClient} from '@angular/common/http'; + +describe('MedicalRecordWizardAddAttachmentComponent', () => { + let component: MedicalRecordWizardAddAttachmentComponent; + let fixture: ComponentFixture; + + beforeEach(async () => { + await TestBed.configureTestingModule({ + providers: [ NgbModal, NgbActiveModal, { + provide: HTTP_CLIENT_TOKEN, + useClass: HttpClient, + } ], + imports: [ MedicalRecordWizardAddAttachmentComponent, HttpClientTestingModule ], + declarations: [ ] + }) + .compileComponents(); + + fixture = TestBed.createComponent(MedicalRecordWizardAddAttachmentComponent); + component = fixture.componentInstance; + fixture.detectChanges(); + }); + + it('should create', () => { + expect(component).toBeTruthy(); + }); +}); diff --git a/frontend/src/app/components/medical-record-wizard-add-attachment/medical-record-wizard-add-attachment.component.ts b/frontend/src/app/components/medical-record-wizard-add-attachment/medical-record-wizard-add-attachment.component.ts new file mode 100644 index 00000000..ed39600b --- /dev/null +++ b/frontend/src/app/components/medical-record-wizard-add-attachment/medical-record-wizard-add-attachment.component.ts @@ -0,0 +1,67 @@ +import {Component, Input, OnInit} from '@angular/core'; +import {CommonModule} from '@angular/common'; +import {FormControl, FormGroup, FormsModule, ReactiveFormsModule, Validators} from '@angular/forms'; +import {NlmTypeaheadComponent} from '../nlm-typeahead/nlm-typeahead.component'; +import {HighlightModule} from 'ngx-highlightjs'; +import {NgbActiveModal, NgbTooltipModule} from '@ng-bootstrap/ng-bootstrap'; + +@Component({ + standalone: true, + imports: [ + CommonModule, + ReactiveFormsModule, + FormsModule, + NlmTypeaheadComponent, + HighlightModule, + NgbTooltipModule + ], + selector: 'app-medical-record-wizard-add-attachment', + templateUrl: './medical-record-wizard-add-attachment.component.html', + styleUrls: ['./medical-record-wizard-add-attachment.component.scss'] +}) +export class MedicalRecordWizardAddAttachmentComponent implements OnInit { + @Input() debugMode: boolean = false; + + newAttachmentForm: FormGroup + + constructor(public activeModal: NgbActiveModal) { } + + ngOnInit(): void { + this.resetAttachmentForm() + } + + submit() { + this.newAttachmentForm.markAllAsTouched() + if(this.newAttachmentForm.valid){ + this.activeModal.close(this.newAttachmentForm.getRawValue()); + } + } + + onAttachmentFileChange($event){ + console.log("onAttachmentFileChange") + let fileInput = $event.target as HTMLInputElement; + if (fileInput.files && fileInput.files[0]) { + let reader = new FileReader(); + reader.onloadend = () => { + // use a regex to remove data url part + const base64String = (reader.result as string).replace('data:', '').replace(/^.+,/, ''); + this.newAttachmentForm.get('file_content').setValue(base64String) + }; + reader.readAsDataURL(fileInput.files[0]); + this.newAttachmentForm.get('file_name').setValue(fileInput.files[0].name) + this.newAttachmentForm.get('file_size').setValue(fileInput.files[0].size) + } + } + + private resetAttachmentForm(){ + + this.newAttachmentForm = new FormGroup({ + name: new FormControl(null, Validators.required), + category: new FormControl(null, Validators.required), + file_type: new FormControl(null, Validators.required), + file_name: new FormControl(null, Validators.required), + file_content: new FormControl(null, Validators.required), + file_size: new FormControl(null), + }) + } +} diff --git a/frontend/src/app/components/medical-record-wizard-add-attachment/medical-record-wizard-add-attachment.stories.ts b/frontend/src/app/components/medical-record-wizard-add-attachment/medical-record-wizard-add-attachment.stories.ts new file mode 100644 index 00000000..26fc0aab --- /dev/null +++ b/frontend/src/app/components/medical-record-wizard-add-attachment/medical-record-wizard-add-attachment.stories.ts @@ -0,0 +1,46 @@ +import type { Meta, StoryObj } from '@storybook/angular'; +import {MedicalRecordWizardAddAttachmentComponent} from './medical-record-wizard-add-attachment.component'; +import {applicationConfig} from '@storybook/angular'; +import {NgbActiveModal} from '@ng-bootstrap/ng-bootstrap'; +import {HTTP_CLIENT_TOKEN} from '../../dependency-injection'; +import {HttpClient} from '@angular/common/http'; +import {HttpClientTestingModule} from '@angular/common/http/testing'; +import {importProvidersFrom} from '@angular/core'; + +// More on how to set up stories at: https://storybook.js.org/docs/angular/writing-stories/introduction +const meta: Meta = { + title: 'Components/MedicalRecordWizardAddAttachment', + component: MedicalRecordWizardAddAttachmentComponent, + decorators: [ + applicationConfig({ + providers: [ + importProvidersFrom(HttpClientTestingModule), + NgbActiveModal, + { + provide: HttpClient, + useClass: HttpClient + }, + { + provide: HTTP_CLIENT_TOKEN, + useClass: HttpClient, + } + ] + }), + ], + tags: ['autodocs'], + render: (args: MedicalRecordWizardAddAttachmentComponent) => ({ + props: { + backgroundColor: null, + ...args, + }, + }), + argTypes: { + }, +}; + +export default meta; +type Story = StoryObj; + +// More on writing stories with args: https://storybook.js.org/docs/angular/writing-stories/args +export const Primary: Story = {}; + diff --git a/frontend/src/app/components/medical-record-wizard-add-encounter/medical-record-wizard-add-encounter.component.html b/frontend/src/app/components/medical-record-wizard-add-encounter/medical-record-wizard-add-encounter.component.html new file mode 100644 index 00000000..35b3d017 --- /dev/null +++ b/frontend/src/app/components/medical-record-wizard-add-encounter/medical-record-wizard-add-encounter.component.html @@ -0,0 +1,76 @@ +
+ + +
+ + +
+ + +
+
+ +
+
+ New Organization Form Status: {{ newEncounterForm.status }} +
+ +
+ + +
+
+ +
+
+ + + + +
+ +
+

Encounter Type*

+ +
+
+

Start*

+ +
+
+

End

+ +
+ +
+ + +
+ +
+
+
+ + + + + +
diff --git a/frontend/src/app/components/medical-record-wizard-add-encounter/medical-record-wizard-add-encounter.component.scss b/frontend/src/app/components/medical-record-wizard-add-encounter/medical-record-wizard-add-encounter.component.scss new file mode 100644 index 00000000..e69de29b diff --git a/frontend/src/app/components/medical-record-wizard-add-encounter/medical-record-wizard-add-encounter.component.spec.ts b/frontend/src/app/components/medical-record-wizard-add-encounter/medical-record-wizard-add-encounter.component.spec.ts new file mode 100644 index 00000000..53d00a80 --- /dev/null +++ b/frontend/src/app/components/medical-record-wizard-add-encounter/medical-record-wizard-add-encounter.component.spec.ts @@ -0,0 +1,31 @@ +import { ComponentFixture, TestBed } from '@angular/core/testing'; + +import { MedicalRecordWizardAddEncounterComponent } from './medical-record-wizard-add-encounter.component'; +import {NgbActiveModal, NgbModal} from '@ng-bootstrap/ng-bootstrap'; +import {HttpClientTestingModule} from '@angular/common/http/testing'; +import {HTTP_CLIENT_TOKEN} from '../../dependency-injection'; +import {HttpClient} from '@angular/common/http'; + +describe('MedicalRecordWizardAddEncounterComponent', () => { + let component: MedicalRecordWizardAddEncounterComponent; + let fixture: ComponentFixture; + + beforeEach(async () => { + await TestBed.configureTestingModule({ + imports: [ MedicalRecordWizardAddEncounterComponent, HttpClientTestingModule ], + providers: [NgbModal, NgbActiveModal, { + provide: HTTP_CLIENT_TOKEN, + useClass: HttpClient, + }] + }) + .compileComponents(); + + fixture = TestBed.createComponent(MedicalRecordWizardAddEncounterComponent); + component = fixture.componentInstance; + fixture.detectChanges(); + }); + + it('should create', () => { + expect(component).toBeTruthy(); + }); +}); diff --git a/frontend/src/app/components/medical-record-wizard-add-encounter/medical-record-wizard-add-encounter.component.ts b/frontend/src/app/components/medical-record-wizard-add-encounter/medical-record-wizard-add-encounter.component.ts new file mode 100644 index 00000000..a9cb57a0 --- /dev/null +++ b/frontend/src/app/components/medical-record-wizard-add-encounter/medical-record-wizard-add-encounter.component.ts @@ -0,0 +1,158 @@ +import {Component, Input, OnInit} from '@angular/core'; +import {CommonModule} from '@angular/common'; +import {FormControl, FormGroup, FormsModule, ReactiveFormsModule, Validators} from '@angular/forms'; +import {NlmTypeaheadComponent} from '../nlm-typeahead/nlm-typeahead.component'; +import {HighlightModule} from 'ngx-highlightjs'; +import {NgbActiveModal, NgbDatepickerModule, NgbNavModule, NgbTooltipModule} from '@ng-bootstrap/ng-bootstrap'; +import {FhirDatatableModule} from '../fhir-datatable/fhir-datatable.module'; +import {ResourceType} from '../../../lib/models/constants'; +import {ResourceFhir} from '../../models/fasten/resource_fhir'; +import {FastenApiService} from '../../services/fasten-api.service'; +import {ResponseWrapper} from '../../models/response-wrapper'; +import {fhirModelFactory} from '../../../lib/models/factory'; +import {RecResourceRelatedDisplayModel} from '../../../lib/utils/resource_related_display_model'; +import {EncounterModel} from '../../../lib/models/resources/encounter-model'; +import {uuidV4} from '../../../lib/utils/uuid'; + +@Component({ + standalone: true, + imports: [ + CommonModule, + ReactiveFormsModule, + FormsModule, + NlmTypeaheadComponent, + HighlightModule, + NgbTooltipModule, + NgbNavModule, + FhirDatatableModule, + NgbDatepickerModule + ], + selector: 'app-medical-record-wizard-add-encounter', + templateUrl: './medical-record-wizard-add-encounter.component.html', + styleUrls: ['./medical-record-wizard-add-encounter.component.scss'] +}) +export class MedicalRecordWizardAddEncounterComponent implements OnInit { + + @Input() debugMode: boolean = false; + loading: boolean = false + activeId: string = 'find' + + //create tab options + newEncounterForm: FormGroup //ResourceCreateEncounter + + //find tab options + selectedEncounter: {source_id: string, source_resource_id: string,source_resource_type: ResourceType, resource: ResourceFhir} = null + totalEncounters: number = 0 + constructor( + public activeModal: NgbActiveModal, + private fastenApi: FastenApiService, + ) { } + + ngOnInit(): void { + this.resetEncounterForm() + + //get a count of all the known organizations + this.fastenApi.queryResources({ + "select": [], + "from": "Encounter", + "where": {}, + "aggregations": { + "count_by": {"field": "*"} + } + }).subscribe((resp: ResponseWrapper) => { + this.totalEncounters = resp.data?.[0].value + }) + } + + changeTab(id: string) { + if(this.activeId != id){ + this.activeId = id + this.resetEncounterForm() + this.selectedEncounter = null + } + } + selectionChanged(event) { + console.log("SELECTION CHANGED", event) + this.selectedEncounter = event + } + get submitEnabled() { + return (this.activeId == 'create' && this.newEncounterForm.valid) || + (this.activeId == 'find' && this.selectedEncounter != null) + } + + submit() { + if(this.activeId == 'create'){ + this.newEncounterForm.markAllAsTouched() + if(this.newEncounterForm.valid){ + this.activeModal.close({ + action: this.activeId, + data: this.encounterFormToDisplayModel(this.newEncounterForm) + }); + } + } else if(this.activeId == 'find'){ + if(this.selectedEncounter == null){ + return + } + + //get all the related resources for the selected encounter + this.loading = true + this.fastenApi.getResourceGraph(null, [{ + source_resource_type: this.selectedEncounter.source_resource_type, + source_resource_id: this.selectedEncounter.source_resource_id, + source_id: this.selectedEncounter.source_id, + }]).subscribe((graphResponse) => { + this.loading = false + + if(graphResponse.results["Encounter"]?.[0]){ + + let parsed = RecResourceRelatedDisplayModel(graphResponse.results["Encounter"]?.[0]) + let encounterDisplayModelWithRelated = parsed.displayModel as EncounterModel + + console.log("Found encounter (and related resources)", encounterDisplayModelWithRelated) + this.activeModal.close({ + action: this.activeId, + data: encounterDisplayModelWithRelated + }); + } else { + console.warn("No encounter found in graph response, falling back to selected encounter", graphResponse) + this.activeModal.close({ + action: this.activeId, + data: fhirModelFactory(this.selectedEncounter.source_resource_type, this.selectedEncounter.resource) + }); + } + }, (err) => { + this.loading = false + }) + } + } + + private encounterFormToDisplayModel(form: FormGroup): EncounterModel { + let encounter = new EncounterModel({}) + encounter.code = form.get('code').value + + if(form.get('period_start').value){ + let period_start = form.get('period_start').value + encounter.period_start = (new Date(period_start.year, period_start.month-1, period_start.day)).toISOString() + } + if(form.get('period_end').value){ + let period_end = form.get('period_end').value + encounter.period_end = (new Date(period_end.year, period_end.month-1, period_end.day)).toISOString() + } + if(!encounter.source_resource_id){ + encounter.source_resource_id = uuidV4(); + } + return encounter + } + + private resetEncounterForm(){ + + this.newEncounterForm = new FormGroup({ + id: new FormControl(null), + identifier: new FormControl([]), + code: new FormControl(null, Validators.required), + period_start: new FormControl(null, Validators.required), + period_end: new FormControl(null), + }) + + } +} diff --git a/frontend/src/app/components/medical-record-wizard-add-encounter/medical-record-wizard-add-encounter.stories.ts b/frontend/src/app/components/medical-record-wizard-add-encounter/medical-record-wizard-add-encounter.stories.ts new file mode 100644 index 00000000..341f097e --- /dev/null +++ b/frontend/src/app/components/medical-record-wizard-add-encounter/medical-record-wizard-add-encounter.stories.ts @@ -0,0 +1,46 @@ +import type { Meta, StoryObj } from '@storybook/angular'; +import {MedicalRecordWizardAddEncounterComponent} from './medical-record-wizard-add-encounter.component'; +import {applicationConfig} from '@storybook/angular'; +import {NgbActiveModal} from '@ng-bootstrap/ng-bootstrap'; +import {HTTP_CLIENT_TOKEN} from '../../dependency-injection'; +import {HttpClient} from '@angular/common/http'; +import {HttpClientTestingModule} from '@angular/common/http/testing'; +import {importProvidersFrom} from '@angular/core'; + +// More on how to set up stories at: https://storybook.js.org/docs/angular/writing-stories/introduction +const meta: Meta = { + title: 'Components/MedicalRecordWizardAddEncounter', + component: MedicalRecordWizardAddEncounterComponent, + decorators: [ + applicationConfig({ + providers: [ + importProvidersFrom(HttpClientTestingModule), + NgbActiveModal, + { + provide: HttpClient, + useClass: HttpClient + }, + { + provide: HTTP_CLIENT_TOKEN, + useClass: HttpClient, + } + ] + }), + ], + tags: ['autodocs'], + render: (args: MedicalRecordWizardAddEncounterComponent) => ({ + props: { + backgroundColor: null, + ...args, + }, + }), + argTypes: { + }, +}; + +export default meta; +type Story = StoryObj; + +// More on writing stories with args: https://storybook.js.org/docs/angular/writing-stories/args +export const Primary: Story = {}; + diff --git a/frontend/src/app/components/medical-record-wizard-add-organization/medical-record-wizard-add-organization.component.html b/frontend/src/app/components/medical-record-wizard-add-organization/medical-record-wizard-add-organization.component.html new file mode 100644 index 00000000..60c59b7d --- /dev/null +++ b/frontend/src/app/components/medical-record-wizard-add-organization/medical-record-wizard-add-organization.component.html @@ -0,0 +1,108 @@ +
+ + +
+ + +
+ + +
+
+ +
+
+ New Organization Form Status: {{ newOrganizationForm.status }} +
+ +
+ + +
+
+ +
+
+ + + + +
+
+

Name*

+
+ +
+ {{extId.type?.coding[0].code}}: {{extId.value}} +
+ + +
+

Type*

+ +
+
+

Telephone

+ +
+
+

Fax

+ +
+
+

Email

+ +
+ +
+

Address

+ +
+
+ +
+
+

City

+ +
+
+

State

+ +
+
+

Zip/Postal

+ +
+
+

Country

+ +
+ + +
+ + +
+ +
+
+
+ + +
diff --git a/frontend/src/app/components/medical-record-wizard-add-organization/medical-record-wizard-add-organization.component.scss b/frontend/src/app/components/medical-record-wizard-add-organization/medical-record-wizard-add-organization.component.scss new file mode 100644 index 00000000..e69de29b diff --git a/frontend/src/app/components/medical-record-wizard-add-organization/medical-record-wizard-add-organization.component.spec.ts b/frontend/src/app/components/medical-record-wizard-add-organization/medical-record-wizard-add-organization.component.spec.ts new file mode 100644 index 00000000..9ac412cc --- /dev/null +++ b/frontend/src/app/components/medical-record-wizard-add-organization/medical-record-wizard-add-organization.component.spec.ts @@ -0,0 +1,31 @@ +import { ComponentFixture, TestBed } from '@angular/core/testing'; + +import { MedicalRecordWizardAddOrganizationComponent } from './medical-record-wizard-add-organization.component'; +import {NgbActiveModal, NgbModal, NgbModalModule} from '@ng-bootstrap/ng-bootstrap'; +import {HttpClientTestingModule} from '@angular/common/http/testing'; +import {HTTP_CLIENT_TOKEN} from '../../dependency-injection'; +import {HttpClient} from '@angular/common/http'; + +describe('MedicalRecordWizardAddOrganizationComponent', () => { + let component: MedicalRecordWizardAddOrganizationComponent; + let fixture: ComponentFixture; + + beforeEach(async () => { + await TestBed.configureTestingModule({ + providers: [NgbModal, NgbActiveModal, { + provide: HTTP_CLIENT_TOKEN, + useClass: HttpClient, + }], + imports: [ MedicalRecordWizardAddOrganizationComponent, HttpClientTestingModule ] + }) + .compileComponents(); + + fixture = TestBed.createComponent(MedicalRecordWizardAddOrganizationComponent); + component = fixture.componentInstance; + fixture.detectChanges(); + }); + + it('should create', () => { + expect(component).toBeTruthy(); + }); +}); diff --git a/frontend/src/app/components/medical-record-wizard-add-organization/medical-record-wizard-add-organization.component.ts b/frontend/src/app/components/medical-record-wizard-add-organization/medical-record-wizard-add-organization.component.ts new file mode 100644 index 00000000..28aa7dd4 --- /dev/null +++ b/frontend/src/app/components/medical-record-wizard-add-organization/medical-record-wizard-add-organization.component.ts @@ -0,0 +1,232 @@ +import {Component, Input, OnInit} from '@angular/core'; +import {CommonModule} from '@angular/common'; +import {FormControl, FormGroup, FormsModule, ReactiveFormsModule, Validators} from '@angular/forms'; +import {NlmTypeaheadComponent} from '../nlm-typeahead/nlm-typeahead.component'; +import {HighlightModule} from 'ngx-highlightjs'; +import {NgbActiveModal, NgbNavLink, NgbNavModule, NgbTooltipModule} from '@ng-bootstrap/ng-bootstrap'; +import {FhirDatatableModule} from '../fhir-datatable/fhir-datatable.module'; +import {FastenDisplayModel} from '../../../lib/models/fasten/fasten-display-model'; +import {FastenApiService} from '../../services/fasten-api.service'; +import {ResponseWrapper} from '../../models/response-wrapper'; +import {OrganizationModel} from '../../../lib/models/resources/organization-model'; +import {CodingModel} from '../../../lib/models/datatypes/coding-model'; +import {AddressModel} from '../../../lib/models/datatypes/address-model'; +import {CodableConceptModel} from '../../../lib/models/datatypes/codable-concept-model'; +import {uuidV4} from '../../../lib/utils/uuid'; +import {fhirModelFactory} from '../../../lib/models/factory'; +import {ResourceFhir} from '../../models/fasten/resource_fhir'; +import {ResourceType} from '../../../lib/models/constants'; + +@Component({ + standalone: true, + imports: [ + CommonModule, + ReactiveFormsModule, + FormsModule, + NlmTypeaheadComponent, + HighlightModule, + NgbTooltipModule, + NgbNavModule, + FhirDatatableModule + ], + selector: 'app-medical-record-wizard-add-organization', + templateUrl: './medical-record-wizard-add-organization.component.html', + styleUrls: ['./medical-record-wizard-add-organization.component.scss'] +}) +export class MedicalRecordWizardAddOrganizationComponent implements OnInit { + @Input() debugMode: boolean = false; + @Input() disabledResourceIds: string[] = []; + + activeId: string = 'find' + + //create tab options + newOrganizationTypeaheadForm: FormGroup + newOrganizationForm: FormGroup //ResourceCreateOrganization + + //find tab options + selectedOrganization: {source_resource_id: string,source_resource_type: ResourceType, resource: ResourceFhir} = null + totalOrganizations: number = 0 + constructor( + public activeModal: NgbActiveModal, + private fastenApi: FastenApiService, + ) { } + + ngOnInit(): void { + this.resetOrganizationForm() + + //get a count of all the known organizations + this.fastenApi.queryResources({ + "select": [], + "from": "Organization", + "where": {}, + "aggregations": { + "count_by": {"field": "*"} + } + }).subscribe((resp: ResponseWrapper) => { + this.totalOrganizations = resp.data?.[0].value + }) + } + changeTab(id: string) { + if(this.activeId != id){ + this.activeId = id + this.resetOrganizationForm() + this.selectedOrganization = null + } + } + selectionChanged(event) { + console.log("SELECTION CHANGED", event) + this.selectedOrganization = event + } + get submitEnabled() { + return (this.activeId == 'create' && this.newOrganizationForm.valid) || + (this.activeId == 'find' && this.selectedOrganization != null) + } + + submit() { + if(this.activeId == 'create'){ + this.newOrganizationForm.markAllAsTouched() + if(this.newOrganizationForm.valid){ + this.activeModal.close({ + action: this.activeId, + data: this.organizationFormToDisplayModel(this.newOrganizationForm) + }); + } + } else if(this.activeId == 'find'){ + if(this.selectedOrganization != null){ + this.activeModal.close({ + action: this.activeId, + data: fhirModelFactory(this.selectedOrganization.source_resource_type, this.selectedOrganization.resource) + }); + } + } + } + + private organizationFormToDisplayModel(form: FormGroup): OrganizationModel { + let address = new AddressModel(null) + address.city = form.get('address').get('city').value + address.line = [ + form.get('address').get('line1').value, + form.get('address').get('line2').value, + ] + address.state = form.get('address').get('state').value + address.country = form.get('address').get('country').value + address.postalCode = form.get('address').get('zip').value + + let model = new OrganizationModel({}) + model.source_resource_id = form.get('id').value + model.identifier = form.get('identifier').value + model.name = form.get('name').value + model.addresses = [address] + model.telecom = [] + model.type = [] + if (form.get('phone').value) { + model.telecom.push({ + system: 'phone', + value: form.get('phone').value, + use: 'work' + }) + } + if(form.get('fax').value) { + model.telecom.push({ + system: 'fax', + value: form.get('fax').value, + use: 'work' + }) + } + if(form.get('email').value) { + model.telecom.push({ + system: 'email', + value: form.get('email').value, + use: 'work' + }) + } + if(form.get('type').value) { + let codableConcept = new CodableConceptModel({}) + codableConcept.coding = form.get('type').value.identifier + codableConcept.text = form.get('type').value.text + model.type.push(codableConcept) + } + + if(!model.source_resource_id){ + console.warn("No source_resource_id set for Organization, generating one") + model.source_resource_id = uuidV4(); + } + + return model + } + + private resetOrganizationForm(){ + this.newOrganizationTypeaheadForm = new FormGroup({ + data: new FormControl(null, Validators.required), + }) + this.newOrganizationTypeaheadForm.valueChanges.subscribe(form => { + console.log("CHANGE Organization IN MODAL", form) + let val = form.data + + if(val == null){ + //reset the dependant fields (user cleared the text box) + this.newOrganizationForm.get('id').setValue(null) + this.newOrganizationForm.get('type').setValue(null) + this.newOrganizationForm.get('identifier').setValue(null); + this.newOrganizationForm.get('phone').setValue(null); + this.newOrganizationForm.get('fax').setValue(null); + let addressGroup = this.newOrganizationForm.get('address') + addressGroup.get('line1').setValue(null) + addressGroup.get('line2').setValue(null) + addressGroup.get('city').setValue(null) + addressGroup.get('state').setValue(null) + addressGroup.get('zip').setValue(null) + addressGroup.get('country').setValue(null) + this.newOrganizationForm.get('name').setValue(null); + return + } + + if(val.id){ + this.newOrganizationForm.get('id').setValue(val.id) + } + if(val.provider_type) { + this.newOrganizationForm.get('type').setValue(val.provider_type) + } + if(val.identifier){ + this.newOrganizationForm.get('identifier').setValue(val.identifier) + } + if(val.provider_phone){ + this.newOrganizationForm.get('phone').setValue(val.provider_phone) + } + if(val.provider_fax){ + this.newOrganizationForm.get('fax').setValue(val.provider_fax) + } + if(val.provider_address){ + let addressGroup = this.newOrganizationForm.get('address') + addressGroup.get('line1').setValue(val.provider_address.line1) + addressGroup.get('line2').setValue(val.provider_address.line2) + addressGroup.get('city').setValue(val.provider_address.city) + addressGroup.get('state').setValue(val.provider_address.state) + addressGroup.get('zip').setValue(val.provider_address.zip) + addressGroup.get('country').setValue(val.provider_address.country) + } + if(val.text) { + this.newOrganizationForm.get('name').setValue(val.text) + } + }); + + this.newOrganizationForm = new FormGroup({ + id: new FormControl(null), + identifier: new FormControl([]), + name: new FormControl(null, Validators.required), + type: new FormControl(null, Validators.required), + phone: new FormControl(null, Validators.pattern('[- +()0-9]+')), + fax: new FormControl(null, Validators.pattern('[- +()0-9]+')), + email: new FormControl(null, Validators.email), + address: new FormGroup({ + line1: new FormControl(null), + line2: new FormControl(null), + city: new FormControl(null), + state: new FormControl(null), + zip: new FormControl(null), + country: new FormControl(null), + }) + }) + + } +} diff --git a/frontend/src/app/components/medical-record-wizard-add-organization/medical-record-wizard-add-organization.stories.ts b/frontend/src/app/components/medical-record-wizard-add-organization/medical-record-wizard-add-organization.stories.ts new file mode 100644 index 00000000..17f36f1f --- /dev/null +++ b/frontend/src/app/components/medical-record-wizard-add-organization/medical-record-wizard-add-organization.stories.ts @@ -0,0 +1,46 @@ +import type { Meta, StoryObj } from '@storybook/angular'; +import {MedicalRecordWizardAddOrganizationComponent} from './medical-record-wizard-add-organization.component'; +import {applicationConfig} from '@storybook/angular'; +import {NgbActiveModal} from '@ng-bootstrap/ng-bootstrap'; +import {HTTP_CLIENT_TOKEN} from '../../dependency-injection'; +import {HttpClient} from '@angular/common/http'; +import {HttpClientTestingModule} from '@angular/common/http/testing'; +import {importProvidersFrom} from '@angular/core'; + +// More on how to set up stories at: https://storybook.js.org/docs/angular/writing-stories/introduction +const meta: Meta = { + title: 'Components/MedicalRecordWizardAddOrganization', + component: MedicalRecordWizardAddOrganizationComponent, + decorators: [ + applicationConfig({ + providers: [ + importProvidersFrom(HttpClientTestingModule), + NgbActiveModal, + { + provide: HttpClient, + useClass: HttpClient + }, + { + provide: HTTP_CLIENT_TOKEN, + useClass: HttpClient, + } + ] + }), + ], + tags: ['autodocs'], + render: (args: MedicalRecordWizardAddOrganizationComponent) => ({ + props: { + backgroundColor: null, + ...args, + }, + }), + argTypes: { + }, +}; + +export default meta; +type Story = StoryObj; + +// More on writing stories with args: https://storybook.js.org/docs/angular/writing-stories/args +export const Primary: Story = {}; + diff --git a/frontend/src/app/components/medical-record-wizard-add-practitioner/medical-record-wizard-add-practitioner.component.html b/frontend/src/app/components/medical-record-wizard-add-practitioner/medical-record-wizard-add-practitioner.component.html new file mode 100644 index 00000000..4d5cab9f --- /dev/null +++ b/frontend/src/app/components/medical-record-wizard-add-practitioner/medical-record-wizard-add-practitioner.component.html @@ -0,0 +1,110 @@ +
+ + +
+ + +
+ + +
+
+ +
+
+ New Practitioner Form Status: {{ newPractitionerForm.status }} +
+ +
+ + +
+
+ +
+
+ + + + +
+
+

Name*

+
+ +
+ {{extId.type?.coding[0].code}}: {{extId.value}} +
+ +
+

Type*

+ +
+ +
+

Telephone

+ +
+
+

Fax

+ +
+
+

Email

+ +
+ +
+

Address

+ +
+
+ +
+
+

City

+ +
+
+

State

+ +
+
+

Zip/Postal

+ +
+
+

Country

+ +
+ + +
+ + +
+ +
+ + +
+
+ + +
diff --git a/frontend/src/app/components/medical-record-wizard-add-practitioner/medical-record-wizard-add-practitioner.component.scss b/frontend/src/app/components/medical-record-wizard-add-practitioner/medical-record-wizard-add-practitioner.component.scss new file mode 100644 index 00000000..e69de29b diff --git a/frontend/src/app/components/medical-record-wizard-add-practitioner/medical-record-wizard-add-practitioner.component.spec.ts b/frontend/src/app/components/medical-record-wizard-add-practitioner/medical-record-wizard-add-practitioner.component.spec.ts new file mode 100644 index 00000000..00f9a9c0 --- /dev/null +++ b/frontend/src/app/components/medical-record-wizard-add-practitioner/medical-record-wizard-add-practitioner.component.spec.ts @@ -0,0 +1,31 @@ +import { ComponentFixture, TestBed } from '@angular/core/testing'; + +import { MedicalRecordWizardAddPractitionerComponent } from './medical-record-wizard-add-practitioner.component'; +import {NgbActiveModal, NgbModal} from '@ng-bootstrap/ng-bootstrap'; +import {HttpClientTestingModule} from '@angular/common/http/testing'; +import {HTTP_CLIENT_TOKEN} from '../../dependency-injection'; +import {HttpClient} from '@angular/common/http'; + +describe('MedicalRecordWizardAddPractitionerComponent', () => { + let component: MedicalRecordWizardAddPractitionerComponent; + let fixture: ComponentFixture; + + beforeEach(async () => { + await TestBed.configureTestingModule({ + imports: [ MedicalRecordWizardAddPractitionerComponent, HttpClientTestingModule ], + providers: [ NgbActiveModal, NgbModal, { + provide: HTTP_CLIENT_TOKEN, + useClass: HttpClient, + } ], + }) + .compileComponents(); + + fixture = TestBed.createComponent(MedicalRecordWizardAddPractitionerComponent); + component = fixture.componentInstance; + fixture.detectChanges(); + }); + + it('should create', () => { + expect(component).toBeTruthy(); + }); +}); diff --git a/frontend/src/app/components/medical-record-wizard-add-practitioner/medical-record-wizard-add-practitioner.component.ts b/frontend/src/app/components/medical-record-wizard-add-practitioner/medical-record-wizard-add-practitioner.component.ts new file mode 100644 index 00000000..f115129e --- /dev/null +++ b/frontend/src/app/components/medical-record-wizard-add-practitioner/medical-record-wizard-add-practitioner.component.ts @@ -0,0 +1,241 @@ +import {Component, Input, OnInit} from '@angular/core'; +import {NgbActiveModal, NgbDatepickerModule, NgbNavModule, NgbTooltipModule, NgbTypeaheadModule} from '@ng-bootstrap/ng-bootstrap'; +import {CommonModule} from '@angular/common'; +import {FormControl, FormGroup, FormsModule, ReactiveFormsModule, Validators} from '@angular/forms'; +import {NlmTypeaheadComponent} from '../nlm-typeahead/nlm-typeahead.component'; +import {HighlightModule} from 'ngx-highlightjs'; +import {FhirDatatableModule} from '../fhir-datatable/fhir-datatable.module'; +import {ResourceType} from '../../../lib/models/constants'; +import {ResourceFhir} from '../../models/fasten/resource_fhir'; +import {FastenApiService} from '../../services/fasten-api.service'; +import {ResponseWrapper} from '../../models/response-wrapper'; +import {fhirModelFactory} from '../../../lib/models/factory'; +import {OrganizationModel} from '../../../lib/models/resources/organization-model'; +import {AddressModel} from '../../../lib/models/datatypes/address-model'; +import {CodableConceptModel} from '../../../lib/models/datatypes/codable-concept-model'; +import {uuidV4} from '../../../lib/utils/uuid'; +import {PractitionerModel} from '../../../lib/models/resources/practitioner-model'; +import {parseFullName} from 'parse-full-name' + +@Component({ + standalone: true, + imports: [ + CommonModule, + ReactiveFormsModule, + FormsModule, + NlmTypeaheadComponent, + HighlightModule, + NgbTooltipModule, + NgbNavModule, + FhirDatatableModule + ], + selector: 'app-medical-record-wizard-add-practitioner', + templateUrl: './medical-record-wizard-add-practitioner.component.html', + styleUrls: ['./medical-record-wizard-add-practitioner.component.scss'] +}) +export class MedicalRecordWizardAddPractitionerComponent implements OnInit { + @Input() debugMode: boolean = false; + @Input() disabledResourceIds: string[] = []; + + activeId: string = 'find' + + newPractitionerTypeaheadForm: FormGroup + newPractitionerForm: FormGroup //ResourceCreatePractitioner + + //find tab options + selectedPractitioner: {source_resource_id: string,source_resource_type: ResourceType, resource: ResourceFhir} = null + totalPractitioners: number = 0 + + constructor( + public activeModal: NgbActiveModal, + private fastenApi: FastenApiService, + ) { } + + ngOnInit(): void { + this.resetPractitionerForm() + + //get a count of all the known practitioners + this.fastenApi.queryResources({ + "select": [], + "from": "Practitioner", + "where": {}, + "aggregations": { + "count_by": {"field": "*"} + } + }).subscribe((resp: ResponseWrapper) => { + this.totalPractitioners = resp.data?.[0].value + }) + } + changeTab(id: string) { + if(this.activeId != id){ + this.activeId = id + this.resetPractitionerForm() + this.selectedPractitioner = null + } + } + selectionChanged(event) { + console.log("SELECTION CHANGED", event) + this.selectedPractitioner = event + } + get submitEnabled() { + return (this.activeId == 'create' && this.newPractitionerForm.valid) || + (this.activeId == 'find' && this.selectedPractitioner != null) + } + + submit() { + if(this.activeId == 'create'){ + this.newPractitionerForm.markAllAsTouched() + if(this.newPractitionerForm.valid){ + this.activeModal.close({ + action: this.activeId, + data: this.practitionerFormToDisplayModel(this.newPractitionerForm) + }); + } + } else if(this.activeId == 'find'){ + if(this.selectedPractitioner != null){ + this.activeModal.close({ + action: this.activeId, + data: fhirModelFactory(this.selectedPractitioner.source_resource_type, this.selectedPractitioner.resource) + }); + } + } + } + + private practitionerFormToDisplayModel(form: FormGroup): PractitionerModel { + let address = new AddressModel(null) + address.city = form.get('address').get('city').value + address.line = [ + form.get('address').get('line1').value, + form.get('address').get('line2').value, + ] + address.state = form.get('address').get('state').value + address.country = form.get('address').get('country').value + address.postalCode = form.get('address').get('zip').value + + let model = new PractitionerModel({}) + model.source_resource_id = form.get('id').value + model.identifier = form.get('identifier').value + model.name = [] + model.address = [address] + model.telecom = [] + model.qualification = [] + if (form.get('phone').value) { + model.telecom.push({ + system: 'phone', + value: form.get('phone').value, + use: 'work' + }) + } + if(form.get('fax').value) { + model.telecom.push({ + system: 'fax', + value: form.get('fax').value, + use: 'work' + }) + } + if(form.get('email').value) { + model.telecom.push({ + system: 'email', + value: form.get('email').value, + use: 'work' + }) + } + if(form.get('profession').value) { + model.qualification = form.get('profession').value.identifier + } + if(form.get('name').value) { + let nameParts = parseFullName(form.get('name').value) + model.name.push({ + givenName: nameParts.first, + familyName: nameParts.last, + suffix: nameParts.suffix, + textName: form.get('name').value, + use: 'official', + displayName: form.get('name').value, + }) + } + + if(!model.source_resource_id){ + console.warn("No source_resource_id set for Organization, generating one") + model.source_resource_id = uuidV4(); + } + + return model + } + + private resetPractitionerForm(){ + this.newPractitionerTypeaheadForm = new FormGroup({ + data: new FormControl(null, Validators.required), + }) + this.newPractitionerTypeaheadForm.valueChanges.subscribe(form => { + console.log("CHANGE INDIVIDUAL IN MODAL", form) + let val = form.data + if(val == null){ + //reset the dependant fields (user cleared the text box) + this.newPractitionerForm.get('id').setValue(null) + this.newPractitionerForm.get('profession').setValue(null) + this.newPractitionerForm.get('identifier').setValue(null); + this.newPractitionerForm.get('phone').setValue(null); + this.newPractitionerForm.get('fax').setValue(null); + let addressGroup = this.newPractitionerForm.get('address') + addressGroup.get('line1').setValue(null) + addressGroup.get('line2').setValue(null) + addressGroup.get('city').setValue(null) + addressGroup.get('state').setValue(null) + addressGroup.get('zip').setValue(null) + addressGroup.get('country').setValue(null) + this.newPractitionerForm.get('name').setValue(null); + return + } + + + if(val.id){ + this.newPractitionerForm.get('id').setValue(val.id) + } + if(val.provider_type){ + this.newPractitionerForm.get('profession').setValue(val.provider_type) + } + if(val.identifier){ + this.newPractitionerForm.get('identifier').setValue( val.identifier); + } + if(form.data.provider_phone){ + this.newPractitionerForm.get('phone').setValue( val.provider_phone); + } + if(val.provider_fax){ + this.newPractitionerForm.get('fax').setValue(val.provider_fax); + } + + if(val.provider_address){ + let addressGroup = this.newPractitionerForm.get('address') + addressGroup.get('line1').setValue(val.provider_address.line1) + addressGroup.get('line2').setValue(val.provider_address.line2) + addressGroup.get('city').setValue(val.provider_address.city) + addressGroup.get('state').setValue(val.provider_address.state) + addressGroup.get('zip').setValue(val.provider_address.zip) + addressGroup.get('country').setValue(val.provider_address.country) + } + if(val.text) { + this.newPractitionerForm.get('name').setValue( val.text); + } + }); + + + this.newPractitionerForm = new FormGroup({ + id: new FormControl(null), + identifier: new FormControl([]), + name: new FormControl(null, Validators.required), + profession: new FormControl(null, Validators.required), + phone: new FormControl(null, Validators.pattern('[- +()0-9]+')), + fax: new FormControl(null, Validators.pattern('[- +()0-9]+')), + email: new FormControl(null, Validators.email), + address: new FormGroup({ + line1: new FormControl(null), + line2: new FormControl(null), + city: new FormControl(null), + state: new FormControl(null), + zip: new FormControl(null), + country: new FormControl(null), + }) + }) + } +} diff --git a/frontend/src/app/components/medical-record-wizard-add-practitioner/medical-record-wizard-add-practitioner.stories.ts b/frontend/src/app/components/medical-record-wizard-add-practitioner/medical-record-wizard-add-practitioner.stories.ts new file mode 100644 index 00000000..f65e7f5d --- /dev/null +++ b/frontend/src/app/components/medical-record-wizard-add-practitioner/medical-record-wizard-add-practitioner.stories.ts @@ -0,0 +1,46 @@ +import type { Meta, StoryObj } from '@storybook/angular'; +import {MedicalRecordWizardAddPractitionerComponent} from './medical-record-wizard-add-practitioner.component'; +import {applicationConfig} from '@storybook/angular'; +import {NgbActiveModal} from '@ng-bootstrap/ng-bootstrap'; +import {HTTP_CLIENT_TOKEN} from '../../dependency-injection'; +import {HttpClient} from '@angular/common/http'; +import {HttpClientTestingModule} from '@angular/common/http/testing'; +import {importProvidersFrom} from '@angular/core'; + +// More on how to set up stories at: https://storybook.js.org/docs/angular/writing-stories/introduction +const meta: Meta = { + title: 'Components/MedicalRecordWizardAddPractitioner', + component: MedicalRecordWizardAddPractitionerComponent, + decorators: [ + applicationConfig({ + providers: [ + importProvidersFrom(HttpClientTestingModule), + NgbActiveModal, + { + provide: HttpClient, + useClass: HttpClient + }, + { + provide: HTTP_CLIENT_TOKEN, + useClass: HttpClient, + } + ] + }), + ], + tags: ['autodocs'], + render: (args: MedicalRecordWizardAddPractitionerComponent) => ({ + props: { + backgroundColor: null, + ...args, + }, + }), + argTypes: { + }, +}; + +export default meta; +type Story = StoryObj; + +// More on writing stories with args: https://storybook.js.org/docs/angular/writing-stories/args +export const Primary: Story = {}; + diff --git a/frontend/src/app/components/medical-record-wizard/medical-record-wizard.component.html b/frontend/src/app/components/medical-record-wizard/medical-record-wizard.component.html new file mode 100644 index 00000000..2b3c37e0 --- /dev/null +++ b/frontend/src/app/components/medical-record-wizard/medical-record-wizard.component.html @@ -0,0 +1,428 @@ +
+
+

Medical Record Wizard

+ +
+
+
+
+ +
+
+ +
+
+ Form Status: {{ form.status }} +
+ +
+
+
+ + Encounter + +
+
Encounter
+

+ An Encounter refers to a meeting or interaction with a healthcare provider, such as a doctor's appointment, surgery or a visit to discuss and address your health concerns +

+
+
+ +
+ +
+
+ +
+
+ + + + + + + Medications {{medications.controls.length}} + + +
+
Medications
+

+ Medications are a type of treatment, usually in the form of pills, liquids, or injections, prescribed by doctors to help your body fight off illnesses, manage symptoms, or improve overall health. +

+
+ + + + +
+
+ Medication Status: {{medicationGroup.status}} +
+
+ +
+
+
+

Medication name*

+ +
+
+

Status*

+ +
+
+

Dosage

+ +
+
+

Started*

+ +
+
+

Stopped

+ +
+
+

Why Stopped

+ +
+
+

Prescribing Practitioner*

+ +
+
+
+
+

Instructions

+ +
+
+
+
+

Attachments

+
+
+ +
+
+ + {{attachment.value.name}} ({{attachment.value.file_name}}) + +
+
+
+ +
+
+ +
+
+ + + + + + Procedures {{procedures.controls.length}} + + +
+
Major Surgeries and Implants
+

+ Surgery is a medical procedure where doctors use special tools to fix, remove, or improve something inside your body to help you feel better or get healthier. +

+
+ + + + + +
+
+ Procedure Status: {{procedureGroup.status}} +
+
+ +
+
+
+

Surgery or Implant*

+ +
+
+

When done*

+ +
+
+

Performed By

+ + +
+
+

Location

+ +
+
+

Comments

+ +
+
+
+
+

Attachments

+
+ +
+ +
+
+ + {{attachment.value.name}} ({{attachment.value.file_name}}) + +
+
+
+ + + +
+
+ +
+
+ + + + + + + Practitioners {{practitioners.controls.length}} + + +
+
Medical Practitioners
+

A practitioner is a healthcare professional, such as a doctor or nurse, who is trained and qualified to provide medical care and support to help you stay healthy or manage any health concerns you may have.

+
+ + + + + +
+ Practitioner Status: {{practitionerGroup.status}} +
+ +
+ +
+ + + + + + + +
+
+ +
+
+ + + + + + Organizations {{organizations.controls.length}} + + +
+
Medical Location/Organizations
+

A group of healthcare professionals and staff working together, like a hospital or clinic, to provide coordinated and effective care for patients +

+
+ + + + + +
+ Organization Status: {{organizationGroup.status}} +
+ +
+ +
+ + + + +
+
+ +
+
+ + + + + Lab Results + + +
+
Lab Results & Observations
+

+ Lab results are detailed reports of tests conducted on samples like blood or urine, providing important information + to your doctor about your health and helping guide the best course of action for your care. +

+
+ + + + + + + + + + + Attachments {{attachments.controls.length}} + + +
+
Notes & Attachments
+

+ Files and notes related to medications, procedures, or the current condition. +

+
+ + +
+
+ Attachment Status: {{attachmentGroup.status}} +
+
+ +
+ +
+ + +
+

Name*

+ +
+
+

Category

+ +
+
+

File Type

+ +
+
+ +
+ + +
+
+ +
+
+ + + +
+
+
+
+ + + + + + + + + + + + + + + + + + + + +
+
+ + + +
+
diff --git a/frontend/src/app/components/medical-record-wizard/medical-record-wizard.component.scss b/frontend/src/app/components/medical-record-wizard/medical-record-wizard.component.scss new file mode 100644 index 00000000..e69de29b diff --git a/frontend/src/app/components/medical-record-wizard/medical-record-wizard.component.spec.ts b/frontend/src/app/components/medical-record-wizard/medical-record-wizard.component.spec.ts new file mode 100644 index 00000000..0fa570ba --- /dev/null +++ b/frontend/src/app/components/medical-record-wizard/medical-record-wizard.component.spec.ts @@ -0,0 +1,31 @@ +import { ComponentFixture, TestBed } from '@angular/core/testing'; + +import { MedicalRecordWizardComponent } from './medical-record-wizard.component'; +import {NgbActiveModal, NgbModal} from '@ng-bootstrap/ng-bootstrap'; +import {HttpClientTestingModule} from '@angular/common/http/testing'; +import {HTTP_CLIENT_TOKEN} from '../../dependency-injection'; +import {HttpClient} from '@angular/common/http'; + +describe('MedicalRecordWizardComponent', () => { + let component: MedicalRecordWizardComponent; + let fixture: ComponentFixture; + + beforeEach(async () => { + await TestBed.configureTestingModule({ + imports: [ MedicalRecordWizardComponent, HttpClientTestingModule ], + providers: [ NgbActiveModal, NgbModal, { + provide: HTTP_CLIENT_TOKEN, + useClass: HttpClient, + } ], + }) + .compileComponents(); + + fixture = TestBed.createComponent(MedicalRecordWizardComponent); + component = fixture.componentInstance; + fixture.detectChanges(); + }); + + it('should create', () => { + expect(component).toBeTruthy(); + }); +}); diff --git a/frontend/src/app/components/medical-record-wizard/medical-record-wizard.component.ts b/frontend/src/app/components/medical-record-wizard/medical-record-wizard.component.ts new file mode 100644 index 00000000..934f8918 --- /dev/null +++ b/frontend/src/app/components/medical-record-wizard/medical-record-wizard.component.ts @@ -0,0 +1,398 @@ +import {Component, Input, OnInit} from '@angular/core'; +import {HighlightModule} from 'ngx-highlightjs'; +import { + NgbActiveModal, + NgbDatepickerModule, + NgbModal, + NgbNavModule, + NgbTooltipModule, + NgbTypeaheadModule, +} from '@ng-bootstrap/ng-bootstrap'; +import {FastenApiService} from '../../services/fasten-api.service'; +import {AbstractControl, FormArray, FormControl, FormGroup, FormsModule, ReactiveFormsModule, Validators} from '@angular/forms'; +import {NlmSearchResults} from '../../services/nlm-clinical-table-search.service'; +import {NlmTypeaheadComponent} from '../nlm-typeahead/nlm-typeahead.component'; +import {CommonModule} from '@angular/common'; +import {NgSelectModule} from '@ng-select/ng-select'; +import {ResourceCreateAttachment, ResourceCreateOrganization, ResourceCreatePractitioner} from '../../models/fasten/resource_create'; +import {uuidV4} from '../../../lib/utils/uuid'; +import { + MedicalRecordWizardAddPractitionerComponent +} from '../medical-record-wizard-add-practitioner/medical-record-wizard-add-practitioner.component'; +import { + MedicalRecordWizardAddOrganizationComponent +} from '../medical-record-wizard-add-organization/medical-record-wizard-add-organization.component'; +import { + MedicalRecordWizardAddAttachmentComponent +} from '../medical-record-wizard-add-attachment/medical-record-wizard-add-attachment.component'; +import {GenerateR4ResourceLookup, WizardFhirResourceWrapper} from './medical-record-wizard.utilities'; +import {EncounterModel} from '../../../lib/models/resources/encounter-model'; +import {SharedModule} from '../shared.module'; +import {FhirCardModule} from '../fhir-card/fhir-card.module'; +import {OrganizationModel} from '../../../lib/models/resources/organization-model'; +import {PractitionerModel} from '../../../lib/models/resources/practitioner-model'; +import {PipesModule} from '../../pipes/pipes.module'; +import { + MedicalRecordWizardAddEncounterComponent +} from '../medical-record-wizard-add-encounter/medical-record-wizard-add-encounter.component'; +import {generateReferenceUriFromResourceOrReference, internalResourceReferenceUri} from '../../../lib/utils/bundle_references'; + +import { + FhirResource, + List, Reference +} from 'fhir/r4'; + +@Component({ + standalone: true, + imports: [ + NgbNavModule, + CommonModule, + ReactiveFormsModule, + FormsModule, + NgbTypeaheadModule, + NgbDatepickerModule, + NgbTooltipModule, + NlmTypeaheadComponent, + NgSelectModule, + HighlightModule, + FhirCardModule, + PipesModule + ], + selector: 'app-medical-record-wizard', + templateUrl: './medical-record-wizard.component.html', + styleUrls: ['./medical-record-wizard.component.scss'] +}) +export class MedicalRecordWizardComponent implements OnInit { + @Input() existingEncounter: EncounterModel; + @Input() debugMode = false; + @Input() form!: FormGroup; + + active = 'encounter'; + submitWizardLoading = false; + + + constructor( + public activeModal: NgbActiveModal, + private modalService: NgbModal, + private fastenApi: FastenApiService, + ) { + + + } + + ngOnInit(): void { + this.form = new FormGroup({ + encounter: new FormGroup({ + data: new FormControl({}, Validators.required), + action: new FormControl(null), + }, Validators.required), + + medications: new FormArray([]), + procedures: new FormArray([]), + practitioners: new FormArray([]), + organizations: new FormArray([]), + attachments: new FormArray([]), + }); + + if(this.existingEncounter){ + this.addEncounter({data: this.existingEncounter, action: 'find'}); + } + } + + // + get medications(): FormArray { + return this.form.controls["medications"] as FormArray; + } + get procedures(): FormArray { + return this.form.controls["procedures"] as FormArray; + } + get practitioners(): FormArray { + return this.form.controls["practitioners"] as FormArray; + } + get organizations(): FormArray { + return this.form.controls["organizations"] as FormArray; + } + get attachments(): FormArray { + return this.form.controls["attachments"] as FormArray; + } + // + + // + deleteMedication(index: number) { + this.medications.removeAt(index); + } + deleteProcedure(index: number) { + this.procedures.removeAt(index); + } + deletePractitioner(index: number) { + this.practitioners.removeAt(index); + } + deleteOrganization(index: number) { + this.organizations.removeAt(index); + } + deleteAttachment(index: number) { + this.attachments.removeAt(index); + } + // + + // + addEncounter(openEncounterResult: WizardFhirResourceWrapper){ + let encounter = openEncounterResult.data; + this.existingEncounter = encounter; + + let clonedEncounter = this.deepClone(encounter) as EncounterModel; + clonedEncounter.related_resources = {}; + + this.form.get("encounter").get('data').setValue(clonedEncounter); + this.form.get("encounter").get('action').setValue(openEncounterResult.action); + } + + addMedication(){ + const medicationGroup = new FormGroup({ + data: new FormControl(null, Validators.required), + status: new FormControl(null, Validators.required), + dosage: new FormControl({ + value: '', disabled: true + }), + started: new FormControl(null, Validators.required), + stopped: new FormControl(null), + whystopped: new FormControl(null), + requester: new FormControl(null, Validators.required), + instructions: new FormControl(null), + attachments: new FormControl([]), + }); + + medicationGroup.get("data").valueChanges.subscribe(val => { + medicationGroup.get("dosage").enable(); + //TODO: find a way to create dependant dosage information based on medication data. + }); + + this.medications.push(medicationGroup); + } + addProcedure(){ + const procedureGroup = new FormGroup({ + data: new FormControl(null, Validators.required), + whendone: new FormControl(null, Validators.required), + performer: new FormControl(null), + location: new FormControl(null), + comment: new FormControl(''), + attachments: new FormControl([]), + }); + + this.procedures.push(procedureGroup); + } + addPractitioner(openPractitionerResult: WizardFhirResourceWrapper){ + const practitionerGroup = new FormGroup({ + data: new FormControl(openPractitionerResult.data), + action: new FormControl(openPractitionerResult.action), + + }); + this.practitioners.push(practitionerGroup); + } + addOrganization(openOrganizationResult: WizardFhirResourceWrapper) { + const organizationGroup = new FormGroup({ + data: new FormControl(openOrganizationResult.data), + action: new FormControl(openOrganizationResult.action), + }); + this.organizations.push(organizationGroup); + } + addAttachment(attachment: ResourceCreateAttachment){ + const attachmentGroup = new FormGroup({ + id: new FormControl(attachment.id, Validators.required), + name: new FormControl(attachment.name, Validators.required), + category: new FormControl(attachment.category, Validators.required), + file_type: new FormControl(attachment.file_type, Validators.required), + file_name: new FormControl(attachment.file_name, Validators.required), + file_content: new FormControl(attachment.file_content, Validators.required), + file_size: new FormControl(attachment.file_size), + }); + + this.attachments.push(attachmentGroup); + } + // + + // + openEncounterModal() { + let modalRef = this.modalService.open(MedicalRecordWizardAddEncounterComponent, { + ariaLabelledBy: 'modal-encounter', + size: 'lg', + }) + modalRef.componentInstance.debugMode = this.debugMode; + modalRef.result.then( + (result) => { + console.log('Closing, saving form', result); + // add this to the list of organization + //TODO + this.addEncounter(result); + }, + (err) => { + console.log('Closed without saving', err); + }, + ); + + } + + openPractitionerModal(formGroup?: AbstractControl, controlName?: string) { + let disabledResourceIds = []; + disabledResourceIds.push(...(this.practitioners?.value || []).map(practitioner => practitioner.data.source_resource_id)); + disabledResourceIds.push(...(this.existingEncounter?.related_resources?.['Practitioner'] || []).map(practitioner => practitioner.source_resource_id)); + + // this.resetPractitionerForm() + let modalRef = this.modalService.open(MedicalRecordWizardAddPractitionerComponent, { + ariaLabelledBy: 'modal-practitioner', + size: 'lg', + }) + modalRef.componentInstance.debugMode = this.debugMode; + modalRef.componentInstance.disabledResourceIds = disabledResourceIds; + modalRef.result.then( + (result) => { + console.log('Closing, saving form', result); + // add this to the list of organization + this.addPractitioner(result); + if(formGroup && controlName){ + //set this practitioner to the current select box + formGroup.get(controlName).setValue(generateReferenceUriFromResourceOrReference(result.data)); + } + }, + (err) => { + console.log('Closed without saving', err); + }, + ); + + } + + openOrganizationModal(formGroup?: AbstractControl, controlName?: string) { + let disabledResourceIds = []; + disabledResourceIds.push(...(this.organizations?.value || []).map(org => org.data.source_resource_id)); + disabledResourceIds.push(...(this.existingEncounter?.related_resources?.['Organization'] || []).map(org => org.source_resource_id)); + + let modalRef = this.modalService.open(MedicalRecordWizardAddOrganizationComponent, { + ariaLabelledBy: 'modal-organization', + size: 'lg', + }) + modalRef.componentInstance.debugMode = this.debugMode; + modalRef.componentInstance.disabledResourceIds = disabledResourceIds; + modalRef.result.then( + (result) => { + console.log('Closing, saving form', result); + //add this to the list of organization + this.addOrganization(result); + if(formGroup && controlName){ + //set this practitioner to the current select box + formGroup.get(controlName).setValue(generateReferenceUriFromResourceOrReference(result.data)); + } + }, + (err) => { + console.log('Closed without saving', err); + }, + ); + } + + openAttachmentModal(formGroup?: AbstractControl, controlName?: string) { + let modalRef = this.modalService.open(MedicalRecordWizardAddAttachmentComponent, { + ariaLabelledBy: 'modal-attachment', + size: 'lg' + }) + modalRef.componentInstance.debugMode = this.debugMode; + modalRef.result.then( + (result) => { + console.log('Closing, saving form', result); + //add this to the list of organization + result.id = uuidV4(); + this.addAttachment(result); + + if(formGroup && controlName){ + + //add this attachment id to the current FormArray + let controlArrayVal = formGroup.get(controlName).getRawValue(); + controlArrayVal.push(result.id) + formGroup.get(controlName).setValue(controlArrayVal); + } + }, + (err) => { + console.log('Closed without saving', err); + }, + ); + } + + // + + + onSubmit() { + console.log(this.form.getRawValue()) + this.form.markAllAsTouched() + if (this.form.valid) { + console.log('form submitted'); + this.submitWizardLoading = true; + + let resourceStorage = GenerateR4ResourceLookup(this.form.getRawValue()); + + //generate a ndjson file from the resourceList + //make sure we extract the encounter resource + + let fhirListResource = { + resourceType: 'List', + entry: [], + encounter: null, + contained: [] + } as List + + let encounter = null + for(let resourceType in resourceStorage) { + if (resourceType === 'Encounter') { + //set the encounter to the first encounter + let [encounterId] = Object.keys(resourceStorage[resourceType]) + encounter = resourceStorage[resourceType][encounterId] + + if(!(encounter.type && encounter.reference)){ + //this is not a reference + fhirListResource.contained.push(encounter) + } + continue + } + + for(let resourceId in resourceStorage[resourceType]) { + let resourceFromStorage = resourceStorage[resourceType][resourceId] + if((resourceFromStorage as Reference).type && (resourceFromStorage as Reference).reference){ + //this is a reference + fhirListResource.entry.push({ + item: { + reference: generateReferenceUriFromResourceOrReference(resourceFromStorage) + } + }) + } else { + //this is not a reference + fhirListResource.contained.push(resourceFromStorage as FhirResource) + } + } + } + + //set the encounter reference + fhirListResource.encounter = { + reference: generateReferenceUriFromResourceOrReference(encounter), + } + + this.fastenApi.createRelatedResourcesFastenSource(fhirListResource).subscribe( + (resp) => { + console.log(resp) + this.submitWizardLoading = false; + this.activeModal.close() + }, + (err) => { + console.log(err) + this.submitWizardLoading = false; + } + ) + + } + } + + + // + private deepClone(obj: any):any { + if(!obj) return obj; + return JSON.parse(JSON.stringify(obj)); + } + // + +} diff --git a/frontend/src/app/components/medical-record-wizard/medical-record-wizard.stories.ts b/frontend/src/app/components/medical-record-wizard/medical-record-wizard.stories.ts new file mode 100644 index 00000000..085a4a4a --- /dev/null +++ b/frontend/src/app/components/medical-record-wizard/medical-record-wizard.stories.ts @@ -0,0 +1,46 @@ +import type { Meta, StoryObj } from '@storybook/angular'; +import {MedicalRecordWizardComponent} from './medical-record-wizard.component'; +import {applicationConfig} from '@storybook/angular'; +import {NgbActiveModal} from '@ng-bootstrap/ng-bootstrap'; +import {HTTP_CLIENT_TOKEN} from '../../dependency-injection'; +import {HttpClient} from '@angular/common/http'; +import {HttpClientTestingModule} from '@angular/common/http/testing'; +import {importProvidersFrom} from '@angular/core'; + +// More on how to set up stories at: https://storybook.js.org/docs/angular/writing-stories/introduction +const meta: Meta = { + title: 'Components/MedicalRecordWizard', + component: MedicalRecordWizardComponent, + decorators: [ + applicationConfig({ + providers: [ + importProvidersFrom(HttpClientTestingModule), + NgbActiveModal, + { + provide: HttpClient, + useClass: HttpClient + }, + { + provide: HTTP_CLIENT_TOKEN, + useClass: HttpClient, + } + ] + }), + ], + tags: ['autodocs'], + render: (args: MedicalRecordWizardComponent) => ({ + props: { + backgroundColor: null, + ...args, + }, + }), + argTypes: { + }, +}; + +export default meta; +type Story = StoryObj; + +// More on writing stories with args: https://storybook.js.org/docs/angular/writing-stories/args +export const Primary: Story = {}; + diff --git a/frontend/src/app/components/medical-record-wizard/medical-record-wizard.utilities.ts b/frontend/src/app/components/medical-record-wizard/medical-record-wizard.utilities.ts new file mode 100644 index 00000000..aa8a67ca --- /dev/null +++ b/frontend/src/app/components/medical-record-wizard/medical-record-wizard.utilities.ts @@ -0,0 +1,443 @@ +import { + MedicalRecordWizardFormCreate, + ResourceCreateCondition, ResourceCreateAttachment, ResourceCreateMedication, + ResourceCreateOrganization, ResourceCreatePractitioner, + ResourceCreateProcedure +} from '../../models/fasten/resource_create'; +import { + Condition, + Medication, + Procedure, + Location as FhirLocation, + BundleEntry, + Resource, + Bundle, + Organization, + Practitioner, MedicationRequest, Patient, Encounter, DocumentReference, Media, DiagnosticReport, Reference, Binary, HumanName +} from 'fhir/r4'; +import {uuidV4} from '../../../lib/utils/uuid'; +import {OrganizationModel} from '../../../lib/models/resources/organization-model'; +import {PractitionerModel} from '../../../lib/models/resources/practitioner-model'; +import {EncounterModel} from '../../../lib/models/resources/encounter-model'; +import {ReferenceModel} from '../../../lib/models/datatypes/reference-model'; +import {FastenDisplayModel} from '../../../lib/models/fasten/fasten-display-model'; +import {generateReferenceUriFromResourceOrReference} from '../../../lib/utils/bundle_references'; +import {HumanNameModel} from '../../../lib/models/datatypes/human-name-model'; + +export interface WizardFhirResourceWrapper { + data: T, + action: 'find'|'create' +} + +interface ResourceStorage { + [resourceType: string]: { + [resourceId: string]: Condition | Patient | MedicationRequest | Organization | FhirLocation | Practitioner | Procedure | Encounter | DocumentReference | Media | DiagnosticReport | Binary | Reference + } +} + +export function GenerateR4ResourceLookup(resourceCreate: MedicalRecordWizardFormCreate): ResourceStorage { + let resourceStorage: ResourceStorage = {} + // resourceStorage = placeholderR4Patient(resourceStorage) + // resourceStorage = resourceCreateConditionToR4Condition(resourceStorage, resourceCreate.condition) + + resourceStorage = resourceCreateEncounterToR4Encounter(resourceStorage, resourceCreate.encounter) + + for(let attachment of resourceCreate.attachments) { + if(attachment.file_type == 'application/dicom' || + attachment.category.id == '18726-0' || //Radiology studies (set) + attachment.category.id == '27897-8' || // Neuromuscular electrophysiology studies (set) + attachment.category.id == '18748-4' // Diagnostic imaging study + ) { + //Diagnostic imaging study (DiagnosticReport -> Media) + resourceStorage = resourceAttachmentToR4DiagnosticReport(resourceStorage, attachment) + } + else { + resourceStorage = resourceAttachmentToR4DocumentReference(resourceStorage, attachment) + } + } + + for(let organization of resourceCreate.organizations) { + resourceStorage = resourceCreateOrganizationToR4Organization(resourceStorage, organization) + } + for(let practitioner of resourceCreate.practitioners) { + resourceStorage = resourceCreatePractitionerToR4Practitioner(resourceStorage, practitioner) + } + for(let medication of resourceCreate.medications) { + resourceStorage = resourceCreateMedicationToR4MedicationRequest(resourceStorage, medication) + } + for(let procedure of resourceCreate.procedures) { + resourceStorage = resourceCreateProcedureToR4Procedure(resourceStorage, procedure) + } + + + //DocumentReference -> (Optional) Binary + //DiagnosticReport -> Media + //ImagingStudy + //ImagingSelection + + + + return resourceStorage +} + +//Private methods + +// this model is based on FHIR401 Resource Encounter - http://hl7.org/fhir/R4/encounter.html +function resourceCreateEncounterToR4Encounter(resourceStorage: ResourceStorage, resourceEncounter: WizardFhirResourceWrapper): ResourceStorage { + resourceStorage['Encounter'] = resourceStorage['Encounter'] || {} + console.warn("resourceEncounter", resourceEncounter) + + if (resourceEncounter.action == 'create') { + let createdResourceEncounter = { + resourceType: 'Encounter', + id: resourceEncounter.data.source_resource_id, + serviceType: resourceEncounter.data.code, + status: "finished", + // participant: [ + // { + // individual: { + // reference: `urn:uuid:${resourceCreateProcedure.performer}` //Practitioner + // } + // } + // ], + participant: [], + period: { + start: resourceEncounter.data.period_start, + end: resourceEncounter.data.period_end, + }, + reasonReference: [], + serviceProvider: { + // reference: `urn:uuid:${resourceCreateProcedure.location}` //Organization + } + } as Encounter + resourceStorage['Encounter'][createdResourceEncounter.id] = createdResourceEncounter + } else { + let foundResourceEncounter = { + type: 'Encounter', + reference: generateReferenceUriFromResourceOrReference(resourceEncounter.data), + } + resourceStorage['Encounter'][foundResourceEncounter.reference] = foundResourceEncounter + } + + return resourceStorage +} + + + +// this model is based on FHIR401 Resource Condition - http://hl7.org/fhir/R4/condition.html +// function resourceCreateConditionToR4Condition(resourceStorage: ResourceStorage, resourceCreateCondition: ResourceCreateCondition): ResourceStorage { +// resourceStorage['Condition'] = resourceStorage['Condition'] || {} +// resourceStorage['Encounter'] = resourceStorage['Encounter'] || {} +// +// let note = [] +// if (resourceCreateCondition.description) { +// note.push({ +// text: resourceCreateCondition.description, +// }) +// } +// +// let conditionResource = { +// subject: { +// reference: `urn:uuid:${findPatient(resourceStorage).id}` //Patient +// }, +// resourceType: 'Condition', +// id: uuidV4(), +// code: { +// coding: resourceCreateCondition.data.identifier || [], +// text: resourceCreateCondition.data.identifier[0].display, +// }, +// clinicalStatus: { +// "coding": [ +// { +// "system": "http://terminology.hl7.org/CodeSystem/condition-clinical", +// "code": resourceCreateCondition.status, +// } +// ] +// }, +// onsetDateTime: `${new Date(resourceCreateCondition.started.year, resourceCreateCondition.started.month-1,resourceCreateCondition.started.day).toISOString()}`, +// abatementDateTime: resourceCreateCondition.stopped ? `${new Date(resourceCreateCondition.stopped.year,resourceCreateCondition.stopped.month-1, resourceCreateCondition.stopped.day).toISOString()}` : null, +// recordedDate: new Date().toISOString(), +// note: note +// } as Condition +// +// +// +// resourceStorage['Condition'][conditionResource.id] = conditionResource +// return resourceStorage +// } + +// this model is based on FHIR401 Resource Procedure - http://hl7.org/fhir/R4/procedure.html +function resourceCreateProcedureToR4Procedure(resourceStorage: ResourceStorage, resourceCreateProcedure: ResourceCreateProcedure): ResourceStorage { + resourceStorage['Procedure'] = resourceStorage['Procedure'] || {} + + let note = [] + if (resourceCreateProcedure.comment) { + note.push({ + text: resourceCreateProcedure.comment, + }) + } + + let encounterResource = findEncounter(resourceStorage) as Encounter | Reference + + let procedureResource = { + status: "completed", + resourceType: 'Procedure', + id: uuidV4(), + code: { + coding: resourceCreateProcedure.data.identifier || [], + text: resourceCreateProcedure.data.identifier?.[0]?.display, + }, + performedDateTime: `${new Date(resourceCreateProcedure.whendone.year, resourceCreateProcedure.whendone.month-1,resourceCreateProcedure.whendone.day).toISOString()}`, + encounter: { + reference: generateReferenceUriFromResourceOrReference(encounterResource) //Encounter + }, + report: (resourceCreateProcedure.attachments || []).map(attachmentId => { + return { + reference: `urn:uuid:${attachmentId}` //DocumentReference or DiagnosticReport + } + }), + performer: [ + { + actor: { + reference: resourceCreateProcedure.performer //Practitioner + }, + onBehalfOf: { + reference: resourceCreateProcedure.location //Organization + } + } + ], + note: note, + } as Procedure + resourceStorage['Procedure'][procedureResource.id] = procedureResource + + return resourceStorage +} + +// this model is based on FHIR401 Resource Organization - http://hl7.org/fhir/R4/organization.html +function resourceCreateOrganizationToR4Organization(resourceStorage: ResourceStorage, resourceOrganization: WizardFhirResourceWrapper): ResourceStorage { + resourceStorage['Organization'] = resourceStorage['Organization'] || {} + if (resourceOrganization.action == 'create') { + let organizationResource = { + resourceType: 'Organization', + id: resourceOrganization.data.source_resource_id, + name: resourceOrganization.data.name, + identifier: resourceOrganization.data.identifier || [], + type: resourceOrganization.data.type || [], + address: resourceOrganization.data.addresses || [], + telecom: resourceOrganization.data.telecom, + active: true, + } as Organization + + resourceStorage['Organization'][organizationResource.id] = organizationResource + } else { + let foundResourceOrganization = { + type: 'Organization', + reference: generateReferenceUriFromResourceOrReference(resourceOrganization.data), + } + resourceStorage['Organization'][foundResourceOrganization.reference] = foundResourceOrganization + } + + return resourceStorage + +} + +// this model is based on FHIR401 Resource Practitioner - http://hl7.org/fhir/R4/practitioner.html +function resourceCreatePractitionerToR4Practitioner(resourceStorage: ResourceStorage, resourcePractitioner: WizardFhirResourceWrapper): ResourceStorage { + resourceStorage['Practitioner'] = resourceStorage['Practitioner'] || {} + if (resourcePractitioner.action == 'create') { + + let humanName = [] as HumanName[] + if (resourcePractitioner.data.name) { + humanName = resourcePractitioner.data.name.map((name: HumanNameModel) => { + return { + family: name.familyName, + given: name.givenName.split(', '), + suffix: name.suffix.split(', '), + text: name.displayName, + use: 'official', + } + }) + } + + let practitionerResource = { + resourceType: 'Practitioner', + id: resourcePractitioner.data.source_resource_id, + name: humanName, + identifier: resourcePractitioner.data.identifier || [], + address: resourcePractitioner.data.address || [], + telecom: resourcePractitioner.data.telecom || [], + active: true, + } as Practitioner + + if(resourcePractitioner.data.qualification){ + practitionerResource.qualification = [{ + code: { + coding: resourcePractitioner.data.qualification || [] + }, + }] + } + + resourceStorage['Practitioner'][practitionerResource.id] = practitionerResource + } else { + let foundResourcePractitioner = { + type: 'Practitioner', + reference: generateReferenceUriFromResourceOrReference(resourcePractitioner.data), + } + resourceStorage['Practitioner'][foundResourcePractitioner.reference] = foundResourcePractitioner + } + return resourceStorage +} + +// this model is based on FHIR401 Resource Medication - https://www.hl7.org/fhir/R4/MedicationRequest.html +function resourceCreateMedicationToR4MedicationRequest(resourceStorage: ResourceStorage, resourceCreateMedication: ResourceCreateMedication): ResourceStorage { + resourceStorage['MedicationRequest'] = resourceStorage['MedicationRequest'] || {} + + let encounterResource = findEncounter(resourceStorage) as Encounter | Reference + + let medicationRequestResource = { + id: uuidV4(), + resourceType: 'MedicationRequest', + status: resourceCreateMedication.status, + statusReason: { + coding: resourceCreateMedication.whystopped?.identifier || [], + }, + intent: 'order', + medicationCodeableConcept: { + coding: resourceCreateMedication.data.identifier || [], + }, + encounter: { + reference: generateReferenceUriFromResourceOrReference(encounterResource) //Encounter + }, + authoredOn: `${new Date(resourceCreateMedication.started.year,resourceCreateMedication.started.month-1,resourceCreateMedication.started.day).toISOString()}`, + requester: { + reference: resourceCreateMedication.requester // Practitioner + }, + supportingInformation: (resourceCreateMedication.attachments || []).map((attachmentId) => { + return { + reference: `urn:uuid:${attachmentId}` //DocumentReference or DiagnosticReport + } + }), + note: [ + { + text: resourceCreateMedication.instructions, + } + ], + dispenseRequest: { + validityPeriod: { + start: `${new Date(resourceCreateMedication.started.year,resourceCreateMedication.started.month-1,resourceCreateMedication.started.day).toISOString()}`, + end: resourceCreateMedication.stopped ? `${new Date(resourceCreateMedication.stopped.year,resourceCreateMedication.stopped.month-1,resourceCreateMedication.stopped.day).toISOString()}` : null, + }, + }, + } as MedicationRequest + resourceStorage['MedicationRequest'][medicationRequestResource.id] = medicationRequestResource + + return resourceStorage +} + +function resourceAttachmentToR4DocumentReference(resourceStorage: ResourceStorage, resourceAttachment: ResourceCreateAttachment): ResourceStorage { + let encounterResource = findEncounter(resourceStorage) as Encounter | Reference + + resourceStorage['Binary'] = resourceStorage['Binary'] || {} + let binaryResource = { + id: uuidV4(), + resourceType: 'Binary', + contentType: resourceAttachment.file_type, + data: resourceAttachment.file_content, + } as Binary + resourceStorage['Binary'][binaryResource.id] = binaryResource + + resourceStorage['DocumentReference'] = resourceStorage['DocumentReference'] || {} + + let documentReferenceResource = { + id: resourceAttachment.id, + resourceType: 'DocumentReference', + status: 'current', + category: [ + { + coding: resourceAttachment.category.identifier || [], + text: resourceAttachment.category.text, + } + ], + // description: resourceAttachment.description, + content: [ + { + attachment: { + contentType: resourceAttachment.file_type, + url: `urn:uuid:${binaryResource.id}`, //Binary + title: resourceAttachment.name, + } + } + ], + context: [ + { + encounter: { + reference: generateReferenceUriFromResourceOrReference(encounterResource) //Encounter + }, + } + ] + // date: `${new Date(resourceDocumentReference.date.year,resourceDocumentReference.date.month-1,resourceDocumentReference.date.day).toISOString()}`, + } as DocumentReference + resourceStorage['DocumentReference'][documentReferenceResource.id] = documentReferenceResource + + return resourceStorage +} + +function resourceAttachmentToR4DiagnosticReport(resourceStorage: ResourceStorage, resourceAttachment: ResourceCreateAttachment): ResourceStorage { + let encounterResource = findEncounter(resourceStorage) as Encounter | Reference + + resourceStorage['Binary'] = resourceStorage['Binary'] || {} + let binaryResource = { + id: uuidV4(), + resourceType: 'Binary', + contentType: resourceAttachment.file_type, + data: resourceAttachment.file_content, + } as Binary + resourceStorage['Binary'][binaryResource.id] = binaryResource + + resourceStorage['Media'] = resourceStorage['Media'] || {} + + let mediaResource = { + id: uuidV4(), + resourceType: 'Media', + status: 'completed', + type: { + coding: resourceAttachment.category.identifier || [], + display: resourceAttachment.category.text, + }, + content: { + contentType: resourceAttachment.file_type, + url: `urn:uuid:${binaryResource.id}`, //Binary, + title: resourceAttachment.name, + }, + } as Media + resourceStorage['Media'][mediaResource.id] = mediaResource + + resourceStorage['DiagnosticReport'] = resourceStorage['DiagnosticReport'] || {} + let diagnosticReportResource = { + id: resourceAttachment.id, + resourceType: 'DiagnosticReport', + status: 'final', + code: { + coding: resourceAttachment.category.identifier || [], + }, + encounter: { + reference: generateReferenceUriFromResourceOrReference(encounterResource) //Encounter + }, + media: [ + { + link: { + reference: `urn:uuid:${mediaResource.id}` //Media + } + }, + ], + } as DiagnosticReport + resourceStorage['DiagnosticReport'][diagnosticReportResource.id] = diagnosticReportResource + + return resourceStorage +} + + +function findEncounter(resourceStorage: ResourceStorage): Encounter | Reference { + let [encounterId] = Object.keys(resourceStorage['Encounter']) + return resourceStorage['Encounter'][encounterId] as Encounter | Reference +} diff --git a/frontend/src/app/components/medical-sources-card/medical-sources-card.component.ts b/frontend/src/app/components/medical-sources-card/medical-sources-card.component.ts index aaf15792..5e1fdbd5 100644 --- a/frontend/src/app/components/medical-sources-card/medical-sources-card.component.ts +++ b/frontend/src/app/components/medical-sources-card/medical-sources-card.component.ts @@ -30,6 +30,8 @@ export class MedicalSourcesCardComponent implements OnInit { } if(sourceItem.source?.source_type == 'manual') { return 'Uploaded ' + moment(sourceItem.source?.created_at).format('MMM DD, YYYY') + } else if(sourceItem.source?.source_type == 'fasten'){ + return 'Fasten Health' } return "Unknown" } diff --git a/frontend/src/app/components/medical-sources-connected/medical-sources-connected.component.html b/frontend/src/app/components/medical-sources-connected/medical-sources-connected.component.html index 27bf1c74..21b09a6b 100644 --- a/frontend/src/app/components/medical-sources-connected/medical-sources-connected.component.html +++ b/frontend/src/app/components/medical-sources-connected/medical-sources-connected.component.html @@ -18,7 +18,7 @@
-
+
Manage Source

Existing connections can be "Synced", "Reconnected" or "Deleted"

    @@ -27,13 +27,23 @@

  • Delete - Delete all resources for this healthcare provider. This will ONLY effect data stored in Fasten

+ +
+
Fasten Health
+

This source contains all medical records that are created manually in the Fasten Health app. + It will be empty initially.

+
    +

  • Explore - View the medical records that you have created

    • +
+
+
Explore -
+
- +
diff --git a/frontend/src/app/components/nlm-typeahead/nlm-typeahead.component.spec.ts b/frontend/src/app/components/nlm-typeahead/nlm-typeahead.component.spec.ts index ea4a6bf8..95e50e61 100644 --- a/frontend/src/app/components/nlm-typeahead/nlm-typeahead.component.spec.ts +++ b/frontend/src/app/components/nlm-typeahead/nlm-typeahead.component.spec.ts @@ -13,9 +13,8 @@ describe('NlmTypeaheadComponent', () => { beforeEach(async () => { await TestBed.configureTestingModule({ imports: [ - NgbTypeaheadModule + NgbTypeaheadModule, NlmTypeaheadComponent ], - declarations: [ NlmTypeaheadComponent ], providers: [{ provide: NlmClinicalTableSearchService, useValue: jasmine.createSpyObj('NlmClinicalTableSearchService', [ diff --git a/frontend/src/app/components/nlm-typeahead/nlm-typeahead.component.ts b/frontend/src/app/components/nlm-typeahead/nlm-typeahead.component.ts index 01e78d37..4a5a8981 100644 --- a/frontend/src/app/components/nlm-typeahead/nlm-typeahead.component.ts +++ b/frontend/src/app/components/nlm-typeahead/nlm-typeahead.component.ts @@ -3,10 +3,12 @@ import {merge, Observable, ObservableInput, of, Subject} from 'rxjs'; import {catchError, debounceTime, distinctUntilChanged, filter, switchMap, tap} from 'rxjs/operators'; import {NlmClinicalTableSearchService, NlmSearchResults} from '../../services/nlm-clinical-table-search.service'; import { - ControlValueAccessor, - NgControl, + ControlValueAccessor, FormsModule, + NgControl, ReactiveFormsModule, } from '@angular/forms'; -import {NgbTypeahead} from '@ng-bootstrap/ng-bootstrap'; +import {NgbTypeahead, NgbTypeaheadModule} from '@ng-bootstrap/ng-bootstrap'; +import {CommonModule} from '@angular/common'; +import {HighlightModule} from 'ngx-highlightjs'; export enum NlmSearchType { Allergy = 'Allergy', @@ -24,11 +26,21 @@ export enum NlmSearchType { Countries = 'Countries', AttachmentFileType = 'AttachmentFileType', AttachmentCategory = 'AttachmentCategory', + EncounterClassification = 'EncounterClassification', + EncounterServiceType = 'EncounterServiceType', PrePopulated = 'PrePopulated' } @Component({ + standalone: true, + imports: [ + CommonModule, + ReactiveFormsModule, + FormsModule, + NgbTypeaheadModule, + HighlightModule, + ], selector: 'app-nlm-typeahead', templateUrl: './nlm-typeahead.component.html', styleUrls: ['./nlm-typeahead.component.scss'], @@ -92,6 +104,16 @@ export class NlmTypeaheadComponent implements ControlValueAccessor { this.openOnFocus = true this.editable = false break + case NlmSearchType.EncounterClassification: + searchOpFn = this.nlmClinicalTableSearchService.searchEncounterClassification + this.openOnFocus = true + this.editable = false + break + case NlmSearchType.EncounterServiceType: + searchOpFn = this.nlmClinicalTableSearchService.searchEncounterServiceType + this.openOnFocus = true + this.editable = false + break case NlmSearchType.Condition: searchOpFn = this.nlmClinicalTableSearchService.searchCondition break diff --git a/frontend/src/app/components/nlm-typeahead/nlm-typeahead.stories.ts b/frontend/src/app/components/nlm-typeahead/nlm-typeahead.stories.ts new file mode 100644 index 00000000..d8a1104e --- /dev/null +++ b/frontend/src/app/components/nlm-typeahead/nlm-typeahead.stories.ts @@ -0,0 +1,169 @@ +import type {Meta, StoryObj} from '@storybook/angular'; +import {applicationConfig} from '@storybook/angular'; +import {NlmSearchType, NlmTypeaheadComponent} from './nlm-typeahead.component'; +import {HttpClient, HttpClientModule} from '@angular/common/http'; +import {HTTP_CLIENT_TOKEN} from '../../dependency-injection'; +import {HttpClientTestingModule} from '@angular/common/http/testing'; +import {importProvidersFrom} from '@angular/core'; + +// More on how to set up stories at: https://storybook.js.org/docs/angular/writing-stories/introduction +const meta: Meta = { + title: 'Components/NlmTypeahead', + component: NlmTypeaheadComponent, + decorators: [ + // moduleMetadata({ + // imports: [AppModule] + // }) + applicationConfig({ + providers: [ + importProvidersFrom(HttpClientModule), + { + provide: HttpClient, + useClass: HttpClient + }, + { + provide: HTTP_CLIENT_TOKEN, + useClass: HttpClient, + } + ], + }), + ], + tags: ['autodocs'], + render: (args: NlmTypeaheadComponent) => ({ + props: { + backgroundColor: null, + ...args, + }, + }), + argTypes: { + searchType: { + control: 'text', + }, + debugMode: { + control: 'boolean', + } + }, +}; + +export default meta; +type Story = StoryObj; + +// More on writing stories with args: https://storybook.js.org/docs/angular/writing-stories/args +export const Allergy: Story = { + args: { + searchType: NlmSearchType.Allergy, + debugMode: true + } +}; + +export const AllergyReaction: Story = { + args: { + searchType: NlmSearchType.AllergyReaction, + debugMode: true + } +}; + +export const Condition: Story = { + args: { + searchType: NlmSearchType.Condition, + debugMode: true + } +}; + +export const MedicalContactIndividualProfession: Story = { + args: { + searchType: NlmSearchType.MedicalContactIndividualProfession, + debugMode: true + } +}; + +export const MedicalContactIndividual: Story = { + args: { + searchType: NlmSearchType.MedicalContactIndividual, + debugMode: true + } +}; + +export const MedicalContactOrganization: Story = { + args: { + searchType: NlmSearchType.MedicalContactOrganization, + debugMode: true + } +}; + +export const MedicalContactOrganizationType: Story = { + args: { + searchType: NlmSearchType.MedicalContactOrganizationType, + debugMode: true + } +}; + +export const Medication: Story = { + args: { + searchType: NlmSearchType.Medication, + debugMode: true + } +}; + +export const MedicationWhyStopped: Story = { + args: { + searchType: NlmSearchType.MedicationWhyStopped, + debugMode: true + } +}; + +export const Procedure: Story = { + args: { + searchType: NlmSearchType.Procedure, + debugMode: true + } +}; + +export const Vaccine: Story = { + args: { + searchType: NlmSearchType.Vaccine, + debugMode: true + } +}; + +export const Countries: Story = { + args: { + searchType: NlmSearchType.Countries, + debugMode: true + } +}; + +export const AttachmentFileType: Story = { + args: { + searchType: NlmSearchType.AttachmentFileType, + debugMode: true + } +}; + +export const AttachmentCategory: Story = { + args: { + searchType: NlmSearchType.AttachmentCategory, + debugMode: true + } +}; + +export const EncounterClassification: Story = { + args: { + searchType: NlmSearchType.EncounterClassification, + debugMode: true + } +}; + +export const EncounterServiceType: Story = { + args: { + searchType: NlmSearchType.EncounterServiceType, + debugMode: true + } +}; + +export const PrePopulated: Story = { + args: { + searchType: NlmSearchType.PrePopulated, + debugMode: true + } +}; diff --git a/frontend/src/app/components/report-header/report-header.component.html b/frontend/src/app/components/report-header/report-header.component.html index ece177ef..58723ec3 100644 --- a/frontend/src/app/components/report-header/report-header.component.html +++ b/frontend/src/app/components/report-header/report-header.component.html @@ -40,5 +40,5 @@
- + diff --git a/frontend/src/app/components/report-medical-history-condition/report-medical-history-condition.component.html b/frontend/src/app/components/report-medical-history-condition/report-medical-history-condition.component.html index 2c0656be..1d0a502d 100644 --- a/frontend/src/app/components/report-medical-history-condition/report-medical-history-condition.component.html +++ b/frontend/src/app/components/report-medical-history-condition/report-medical-history-condition.component.html @@ -31,7 +31,7 @@
- + @@ -80,14 +80,14 @@ {{medication.display }} - +
  • {{medication.title }} - +
    • @@ -101,7 +101,7 @@ {{procedure.display}} - + @@ -115,7 +115,7 @@ {{diagnosticReport.sort_title || diagnosticReport.title}} - + @@ -128,7 +128,7 @@ {{documentReference.sort_title || documentReference.title}} - + diff --git a/frontend/src/app/components/report-medical-history-condition/report-medical-history-condition.component.ts b/frontend/src/app/components/report-medical-history-condition/report-medical-history-condition.component.ts index 62c6b579..20ce53ff 100644 --- a/frontend/src/app/components/report-medical-history-condition/report-medical-history-condition.component.ts +++ b/frontend/src/app/components/report-medical-history-condition/report-medical-history-condition.component.ts @@ -15,12 +15,14 @@ import {ConditionModel} from '../../../lib/models/resources/condition-model'; import {RecResourceRelatedDisplayModel} from '../../../lib/utils/resource_related_display_model'; import {CodingModel} from '../../../lib/models/datatypes/coding-model'; +/** + * @deprecated This condition panel is no longer in use, the timeline panel allows users to view resources by encounter + */ @Component({ selector: 'app-report-medical-history-condition', templateUrl: './report-medical-history-condition.component.html', styleUrls: ['./report-medical-history-condition.component.scss'] }) - export class ReportMedicalHistoryConditionComponent implements OnInit { diff --git a/frontend/src/app/components/report-medical-history-editor/report-medical-history-editor.component.ts b/frontend/src/app/components/report-medical-history-editor/report-medical-history-editor.component.ts index fdb6c4a3..8a9f7bda 100644 --- a/frontend/src/app/components/report-medical-history-editor/report-medical-history-editor.component.ts +++ b/frontend/src/app/components/report-medical-history-editor/report-medical-history-editor.component.ts @@ -15,6 +15,9 @@ class RelatedNode { resource: ResourceFhir } +/** + * @deprecated This editor is no longer in use, the timeline panel allows users to tag resources associated with a single condition. + */ @Component({ selector: 'app-report-medical-history-editor', templateUrl: './report-medical-history-editor.component.html', diff --git a/frontend/src/app/components/report-medical-history-explanation-of-benefit/report-medical-history-explanation-of-benefit.component.html b/frontend/src/app/components/report-medical-history-explanation-of-benefit/report-medical-history-explanation-of-benefit.component.html index 81cdf80b..389b765e 100644 --- a/frontend/src/app/components/report-medical-history-explanation-of-benefit/report-medical-history-explanation-of-benefit.component.html +++ b/frontend/src/app/components/report-medical-history-explanation-of-benefit/report-medical-history-explanation-of-benefit.component.html @@ -31,7 +31,7 @@
    - + @@ -79,14 +79,14 @@ {{medication.display }} - +
  • {{medication.title}} - +
    • @@ -103,7 +103,7 @@ {{procedure.display}} - + @@ -117,7 +117,7 @@ {{diagnosticReport.title}} - + @@ -130,7 +130,7 @@ {{documentReference.sort_title}} - + diff --git a/frontend/src/app/components/report-medical-history-explanation-of-benefit/report-medical-history-explanation-of-benefit.component.ts b/frontend/src/app/components/report-medical-history-explanation-of-benefit/report-medical-history-explanation-of-benefit.component.ts index acd5f988..1789334e 100644 --- a/frontend/src/app/components/report-medical-history-explanation-of-benefit/report-medical-history-explanation-of-benefit.component.ts +++ b/frontend/src/app/components/report-medical-history-explanation-of-benefit/report-medical-history-explanation-of-benefit.component.ts @@ -15,6 +15,10 @@ import {DeviceModel} from '../../../lib/models/resources/device-model'; import {CodingModel} from '../../../lib/models/datatypes/coding-model'; import {LocationModel} from '../../../lib/models/resources/location-model'; +/** + * @deprecated This EOB panel is no longer in use, the timeline panel allows users to view resources by encounter + * TODO: this logic should be moved to the timeline panel before removal (Timeline doesnt have a visualization for EOBs) + */ @Component({ selector: 'app-report-medical-history-explanation-of-benefit', templateUrl: './report-medical-history-explanation-of-benefit.component.html', diff --git a/frontend/src/app/components/report-medical-history-timeline-panel/report-medical-history-timeline-panel.component.html b/frontend/src/app/components/report-medical-history-timeline-panel/report-medical-history-timeline-panel.component.html index b7526173..ed57edc3 100644 --- a/frontend/src/app/components/report-medical-history-timeline-panel/report-medical-history-timeline-panel.component.html +++ b/frontend/src/app/components/report-medical-history-timeline-panel/report-medical-history-timeline-panel.component.html @@ -1,7 +1,7 @@
    - {{displayModel.period_start | amDateFormat:'YYYY' }} - {{displayModel.period_start | amDateFormat:'MMM DD' }} + {{displayModel?.period_start | amDateFormat:'YYYY' }} + {{displayModel?.period_start | amDateFormat:'MMM DD' }}
    @@ -14,7 +14,7 @@
    - {{displayModel.sort_title}} + {{displayModel?.sort_title}} @@ -23,24 +23,24 @@
    - + {{practitioner.sort_title}} - + - + {{organization.sort_title}} - + - + {{location.sort_title}} - + @@ -53,14 +53,14 @@ {{medication.display }} - +
  • {{medication.title }} - +
    • @@ -74,7 +74,7 @@ {{procedure.display}} - + @@ -87,7 +87,7 @@ {{immunization.sort_title}} - + @@ -109,11 +109,11 @@ @@ -146,7 +146,7 @@
    - +
    diff --git a/frontend/src/app/components/report-medical-history-timeline-panel/report-medical-history-timeline-panel.component.spec.ts b/frontend/src/app/components/report-medical-history-timeline-panel/report-medical-history-timeline-panel.component.spec.ts index 26935c04..2080b1e6 100644 --- a/frontend/src/app/components/report-medical-history-timeline-panel/report-medical-history-timeline-panel.component.spec.ts +++ b/frontend/src/app/components/report-medical-history-timeline-panel/report-medical-history-timeline-panel.component.spec.ts @@ -1,6 +1,7 @@ import { ComponentFixture, TestBed } from '@angular/core/testing'; import { ReportMedicalHistoryTimelinePanelComponent } from './report-medical-history-timeline-panel.component'; +import {MomentModule} from 'ngx-moment'; describe('ReportMedicalHistoryTimelinePanelComponent', () => { let component: ReportMedicalHistoryTimelinePanelComponent; @@ -8,6 +9,7 @@ describe('ReportMedicalHistoryTimelinePanelComponent', () => { beforeEach(async () => { await TestBed.configureTestingModule({ + imports: [ MomentModule ], declarations: [ ReportMedicalHistoryTimelinePanelComponent ] }) .compileComponents(); diff --git a/frontend/src/app/components/report-medical-history-timeline-panel/report-medical-history-timeline-panel.component.ts b/frontend/src/app/components/report-medical-history-timeline-panel/report-medical-history-timeline-panel.component.ts index 83881c4a..a4fdae62 100644 --- a/frontend/src/app/components/report-medical-history-timeline-panel/report-medical-history-timeline-panel.component.ts +++ b/frontend/src/app/components/report-medical-history-timeline-panel/report-medical-history-timeline-panel.component.ts @@ -2,13 +2,11 @@ import {Component, Input, OnInit} from '@angular/core'; import {ResourceFhir} from '../../models/fasten/resource_fhir'; import {EncounterModel} from '../../../lib/models/resources/encounter-model'; import {RecResourceRelatedDisplayModel} from '../../../lib/utils/resource_related_display_model'; -import {LocationModel} from '../../../lib/models/resources/location-model'; -import {PractitionerModel} from '../../../lib/models/resources/practitioner-model'; -import {OrganizationModel} from '../../../lib/models/resources/organization-model'; -import {fhirModelFactory} from '../../../lib/models/factory'; -import {ResourceType} from '../../../lib/models/constants'; import {DiagnosticReportModel} from '../../../lib/models/resources/diagnostic-report-model'; import {FastenDisplayModel} from '../../../lib/models/fasten/fasten-display-model'; +import {MedicalRecordWizardComponent} from '../medical-record-wizard/medical-record-wizard.component'; +import {NgbModal} from '@ng-bootstrap/ng-bootstrap'; +import {ReportMedicalHistoryEditorComponent} from '../report-medical-history-editor/report-medical-history-editor.component'; @Component({ selector: 'app-report-medical-history-timeline-panel', @@ -19,7 +17,7 @@ export class ReportMedicalHistoryTimelinePanelComponent implements OnInit { @Input() resourceFhir: ResourceFhir displayModel: EncounterModel - constructor() { } + constructor(private modalService: NgbModal) { } ngOnInit(): void { @@ -28,11 +26,21 @@ export class ReportMedicalHistoryTimelinePanelComponent implements OnInit { } diagnosticReportLink(diagnosticReportRaw: FastenDisplayModel): string { - console.log('diagnosticReportRaw', diagnosticReportRaw) let diagnosticReport = diagnosticReportRaw as DiagnosticReportModel return diagnosticReport?.is_category_lab_report ? '/labs/report/'+ diagnosticReport?.source_id + '/' + diagnosticReport?.source_resource_type + '/' + diagnosticReport?.source_resource_id : '/explore/'+ diagnosticReport?.source_id + '/resource/' + diagnosticReport?.source_resource_id + '/' } + + openMedicalRecordWizard(): void { + + + const modalRef = this.modalService.open(MedicalRecordWizardComponent, { + // const modalRef = this.modalService.open(ReportMedicalHistoryEditorComponent, { + size: 'xl', + }); + modalRef.componentInstance.existingEncounter = this.displayModel; + } + } diff --git a/frontend/src/app/components/resource-list/resource-list.component.html b/frontend/src/app/components/resource-list/resource-list.component.html deleted file mode 100644 index 8a3b0c18..00000000 --- a/frontend/src/app/components/resource-list/resource-list.component.html +++ /dev/null @@ -1,3 +0,0 @@ -

    {{resourceListType}}

    - - diff --git a/frontend/src/app/components/resource-list/resource-list.component.ts b/frontend/src/app/components/resource-list/resource-list.component.ts deleted file mode 100644 index 727eb498..00000000 --- a/frontend/src/app/components/resource-list/resource-list.component.ts +++ /dev/null @@ -1,174 +0,0 @@ -import {ChangeDetectionStrategy, Component, Input, OnChanges, OnInit, SimpleChanges, Type, ViewChild} from '@angular/core'; -import {FastenApiService} from '../../services/fasten-api.service'; -import {Source} from '../../models/fasten/source'; -import {Observable, of} from 'rxjs'; -import {ResourceFhir} from '../../models/fasten/resource_fhir'; -import {ListAdverseEventComponent} from '../list-generic-resource/list-adverse-event.component'; -import {ListAllergyIntoleranceComponent} from '../list-generic-resource/list-allergy-intolerance.component'; -import {ListAppointmentComponent} from '../list-generic-resource/list-appointment.component'; -import {ListBinaryComponent} from '../list-generic-resource/list-binary.component'; -import {ListCarePlanComponent} from '../list-generic-resource/list-care-plan.component'; -import {ListCareTeamComponent} from '../list-generic-resource/list-care-team.component'; -import {ListCommunicationComponent} from '../list-generic-resource/list-communication.component'; -import {ListConditionComponent} from '../list-generic-resource/list-condition.component'; -import {ListCoverageComponent} from '../list-generic-resource/list-coverage.component'; -import {ListDeviceComponent} from '../list-generic-resource/list-device.component'; -import {ListDeviceRequestComponent} from '../list-generic-resource/list-device-request.component'; -import {ListDiagnosticReportComponent} from '../list-generic-resource/list-diagnostic-report.component'; -import {ListDocumentReferenceComponent} from '../list-generic-resource/list-document-reference.component'; -import {ListEncounterComponent} from '../list-generic-resource/list-encounter.component'; -import {ListFallbackComponent} from '../list-generic-resource/list-fallback.component'; -import {ListGenericResourceComponent, ResourceListComponentInterface} from '../list-generic-resource/list-generic-resource.component'; -import {ListGoalComponent} from '../list-generic-resource/list-goal.component'; -import {ListImmunizationComponent} from '../list-generic-resource/list-immunization.component'; -import {ListLocationComponent} from '../list-generic-resource/list-location.component'; -import {ListMedicationAdministrationComponent} from '../list-generic-resource/list-medication-administration.component'; -import {ListMedicationComponent} from '../list-generic-resource/list-medication.component'; -import {ListMedicationDispenseComponent} from '../list-generic-resource/list-medication-dispense.component'; -import {ListMedicationRequestComponent} from '../list-generic-resource/list-medication-request.component'; -import {ListNutritionOrderComponent} from '../list-generic-resource/list-nutrition-order.component'; -import {ListObservationComponent} from '../list-generic-resource/list-observation.component'; -import {ListOrganizationComponent} from '../list-generic-resource/list-organization.component'; -import {ListPractitionerComponent} from '../list-generic-resource/list-practitioner.component'; -import {ListProcedureComponent} from '../list-generic-resource/list-procedure.component'; -import {ListServiceRequestComponent} from '../list-generic-resource/list-service-request.component'; -import {ResourceListOutletDirective} from './resource-list-outlet.directive'; -import {ResponseWrapper} from '../../models/response-wrapper'; -import {map} from 'rxjs/operators'; - -@Component({ - selector: 'source-resource-list', - changeDetection: ChangeDetectionStrategy.OnPush, - templateUrl: './resource-list.component.html', - styleUrls: ['./resource-list.component.scss'] -}) -export class ResourceListComponent implements OnInit, OnChanges { - - @Input() source: Source; - @Input() resourceListType: string; - @Input() selectedTotalElements: number; - - //location to dynamically load the resource list - @ViewChild(ResourceListOutletDirective, {static: true}) resourceListOutlet!: ResourceListOutletDirective; - - - constructor(private fastenApi: FastenApiService) { } - - ngOnInit(): void { - this.loadComponent() - } - ngOnChanges(changes: SimpleChanges) { - this.loadComponent() - } - - loadComponent() { - //clear the current outlet - const viewContainerRef = this.resourceListOutlet.viewContainerRef; - viewContainerRef.clear(); - - let componentType = this.typeLookup(this.resourceListType) - if(componentType != null){ - console.log("Attempting to create component", this.resourceListType, componentType) - const componentRef = viewContainerRef.createComponent(componentType); - componentRef.instance.totalElements = this.selectedTotalElements; - componentRef.instance.resourceListType = this.resourceListType; - componentRef.instance.sourceId = this.source.id; - componentRef.instance.markForCheck() - } - } - - typeLookup(resourceType: string): Type { - if(!resourceType){ - //dont try to render anything if the resourceType isnt set. - return null - } - switch(resourceType) { - case "Appointment": { - return ListAppointmentComponent; - } - case "AllergyIntolerance": { - return ListAllergyIntoleranceComponent; - } - case "AdverseEvent": { - return ListAdverseEventComponent; - } - case "Binary": { - return ListBinaryComponent; - } - case "CarePlan": { - return ListCarePlanComponent; - } - case "CareTeam": { - return ListCareTeamComponent; - } - case "Communication": { - return ListCommunicationComponent; - } - case "Condition": { - return ListConditionComponent; - } - case "Coverage": { - return ListCoverageComponent; - } - case "Device": { - return ListDeviceComponent; - } - case "DeviceRequest": { - return ListDeviceRequestComponent; - } - case "DiagnosticReport": { - return ListDiagnosticReportComponent; - } - case "DocumentReference": { - return ListDocumentReferenceComponent; - } - case "Encounter": { - return ListEncounterComponent; - } - case "Goal": { - return ListGoalComponent; - } - case "Immunization": { - return ListImmunizationComponent; - } - case "Location": { - return ListLocationComponent; - } - case "Medication": { - return ListMedicationComponent; - } - case "MedicationAdministration": { - return ListMedicationAdministrationComponent; - } - case "MedicationDispense": { - return ListMedicationDispenseComponent; - } - case "MedicationRequest": { - return ListMedicationRequestComponent; - } - case "NutritionOrder": { - return ListNutritionOrderComponent; - } - case "Observation": { - return ListObservationComponent; - } - case "Organization": { - return ListOrganizationComponent; - } - case "Practitioner": { - return ListPractitionerComponent; - } - case "Procedure": { - return ListProcedureComponent; - } - case "ServiceRequest": { - return ListServiceRequestComponent; - } - default: { - console.warn("Unknown component type, using fallback", resourceType) - return ListFallbackComponent; - - } - } - } -} diff --git a/frontend/src/app/components/shared.module.ts b/frontend/src/app/components/shared.module.ts index f3e05b9d..d24ef2e8 100644 --- a/frontend/src/app/components/shared.module.ts +++ b/frontend/src/app/components/shared.module.ts @@ -1,91 +1,40 @@ import { ComponentsSidebarComponent } from './components-sidebar/components-sidebar.component'; -import { ListGenericResourceComponent,} from './list-generic-resource/list-generic-resource.component'; -import { ListPatientComponent } from './list-patient/list-patient.component'; import { NgModule } from '@angular/core'; import { NgxDatatableModule } from '@swimlane/ngx-datatable'; import { RouterModule } from '@angular/router'; import { UtilitiesSidebarComponent } from './utilities-sidebar/utilities-sidebar.component'; import {BrowserModule} from '@angular/platform-browser'; -import { AllergyIntoleranceComponent } from './fhir/resources/allergy-intolerance/allergy-intolerance.component'; -import { BadgeComponent } from './fhir/common/badge/badge.component'; -import { BinaryComponent } from './fhir/resources/binary/binary.component'; -import { BinaryTextComponent } from './fhir/datatypes/binary-text/binary-text.component'; -import { CodableConceptComponent } from './fhir/datatypes/codable-concept/codable-concept.component'; -import { CodingComponent } from './fhir/datatypes/coding/coding.component'; -import { DiagnosticReportComponent } from './fhir/resources/diagnostic-report/diagnostic-report.component'; -import { DicomComponent } from './fhir/datatypes/dicom/dicom.component'; -import { DocumentReferenceComponent } from './fhir/resources/document-reference/document-reference.component'; -import { FallbackComponent } from './fhir/resources/fallback/fallback.component'; -import { FhirResourceComponent } from './fhir/fhir-resource/fhir-resource.component'; -import { FhirResourceOutletDirective } from './fhir/fhir-resource/fhir-resource-outlet.directive'; import { GlossaryLookupComponent } from './glossary-lookup/glossary-lookup.component'; -import { HtmlComponent } from './fhir/datatypes/html/html.component'; -import { ImgComponent } from './fhir/datatypes/img/img.component'; -import { ImmunizationComponent } from './fhir/resources/immunization/immunization.component'; import { LoadingSpinnerComponent } from './loading-spinner/loading-spinner.component'; -import { MarkdownComponent } from './fhir/datatypes/markdown/markdown.component'; -import { MediaComponent } from './fhir/resources/media/media.component'; import { MedicalSourcesCardComponent } from './medical-sources-card/medical-sources-card.component'; import { MedicalSourcesCategoryLookupPipe } from './medical-sources-filter/medical-sources-category-lookup.pipe'; import { MedicalSourcesConnectedComponent } from './medical-sources-connected/medical-sources-connected.component'; import { MedicalSourcesFilterComponent } from './medical-sources-filter/medical-sources-filter.component'; -import { MedicationComponent } from './fhir/resources/medication/medication.component'; -import { MedicationRequestComponent } from './fhir/resources/medication-request/medication-request.component'; import { MomentModule } from 'ngx-moment'; import { NgChartsModule } from 'ng2-charts'; import { NlmTypeaheadComponent } from './nlm-typeahead/nlm-typeahead.component'; -import { PdfComponent } from './fhir/datatypes/pdf/pdf.component'; -import { PractitionerComponent } from './fhir/resources/practitioner/practitioner.component'; -import { ProcedureComponent } from './fhir/resources/procedure/procedure.component'; import { ReportHeaderComponent } from './report-header/report-header.component'; import { ReportLabsObservationComponent } from './report-labs-observation/report-labs-observation.component'; import { ReportMedicalHistoryConditionComponent } from './report-medical-history-condition/report-medical-history-condition.component'; import { ReportMedicalHistoryEditorComponent } from './report-medical-history-editor/report-medical-history-editor.component'; import { ReportMedicalHistoryExplanationOfBenefitComponent } from './report-medical-history-explanation-of-benefit/report-medical-history-explanation-of-benefit.component'; -import { ResourceListComponent } from './resource-list/resource-list.component'; -import { TableComponent } from './fhir/common/table/table.component'; import { ToastComponent } from './toast/toast.component'; import { TreeModule } from '@circlon/angular-tree-component'; import {FormsModule, ReactiveFormsModule} from '@angular/forms'; import {GridstackComponent} from './gridstack/gridstack.component'; import {GridstackItemComponent} from './gridstack/gridstack-item.component'; import {HighlightModule} from 'ngx-highlightjs'; -import {ListAdverseEventComponent} from './list-generic-resource/list-adverse-event.component'; -import {ListAllergyIntoleranceComponent} from './list-generic-resource/list-allergy-intolerance.component'; -import {ListAppointmentComponent} from './list-generic-resource/list-appointment.component'; -import {ListBinaryComponent} from './list-generic-resource/list-binary.component'; -import {ListCarePlanComponent} from './list-generic-resource/list-care-plan.component'; -import {ListCareTeamComponent} from './list-generic-resource/list-care-team.component'; -import {ListCommunicationComponent} from './list-generic-resource/list-communication.component'; -import {ListConditionComponent} from './list-generic-resource/list-condition.component' -import {ListCoverageComponent} from './list-generic-resource/list-coverage.component'; -import {ListDeviceComponent} from './list-generic-resource/list-device.component'; -import {ListDeviceRequestComponent} from './list-generic-resource/list-device-request.component'; -import {ListDiagnosticReportComponent} from './list-generic-resource/list-diagnostic-report.component'; -import {ListDocumentReferenceComponent} from './list-generic-resource/list-document-reference.component'; -import {ListEncounterComponent} from './list-generic-resource/list-encounter.component' -import {ListFallbackComponent} from './list-generic-resource/list-fallback.component' -import {ListGoalComponent} from './list-generic-resource/list-goal.component'; -import {ListImmunizationComponent} from './list-generic-resource/list-immunization.component' -import {ListLocationComponent} from './list-generic-resource/list-location.component' -import {ListMedicationAdministrationComponent} from './list-generic-resource/list-medication-administration.component'; -import {ListMedicationComponent} from './list-generic-resource/list-medication.component' -import {ListMedicationDispenseComponent} from './list-generic-resource/list-medication-dispense.component'; -import {ListMedicationRequestComponent} from './list-generic-resource/list-medication-request.component' -import {ListNutritionOrderComponent} from './list-generic-resource/list-nutrition-order.component'; -import {ListObservationComponent} from './list-generic-resource/list-observation.component' -import {ListOrganizationComponent} from './list-generic-resource/list-organization.component' -import {ListPractitionerComponent} from './list-generic-resource/list-practitioner.component' -import {ListProcedureComponent} from './list-generic-resource/list-procedure.component' -import {ListServiceRequestComponent} from './list-generic-resource/list-service-request.component'; -import {NgbCollapseModule, NgbModule, NgbDropdownModule, NgbAccordionModule} from '@ng-bootstrap/ng-bootstrap'; +import {NgbCollapseModule, NgbModule, NgbDropdownModule, NgbAccordionModule, NgbNavModule} from '@ng-bootstrap/ng-bootstrap'; import {PipesModule} from '../pipes/pipes.module'; -import {ResourceListOutletDirective} from './resource-list/resource-list-outlet.directive'; import {DirectivesModule} from '../directives/directives.module'; import { ReportMedicalHistoryTimelinePanelComponent } from './report-medical-history-timeline-panel/report-medical-history-timeline-panel.component'; -import { OrganizationComponent } from './fhir/resources/organization/organization.component'; -import { LocationComponent } from './fhir/resources/location/location.component'; -import { ObservationComponent } from './fhir/resources/observation/observation.component'; +import { MedicalRecordWizardComponent } from './medical-record-wizard/medical-record-wizard.component'; +import { MedicalRecordWizardAddPractitionerComponent } from './medical-record-wizard-add-practitioner/medical-record-wizard-add-practitioner.component'; +import { MedicalRecordWizardAddOrganizationComponent } from './medical-record-wizard-add-organization/medical-record-wizard-add-organization.component'; +import { MedicalRecordWizardAddAttachmentComponent } from './medical-record-wizard-add-attachment/medical-record-wizard-add-attachment.component'; +import {FhirCardModule} from './fhir-card/fhir-card.module'; +import {FhirDatatableModule} from './fhir-datatable/fhir-datatable.module'; +import { MedicalRecordWizardAddEncounterComponent } from './medical-record-wizard-add-encounter/medical-record-wizard-add-encounter.component'; @NgModule({ imports: [ @@ -96,6 +45,7 @@ import { ObservationComponent } from './fhir/resources/observation/observation.c NgbDropdownModule, NgbCollapseModule, NgbAccordionModule, + NgbNavModule, FormsModule, ReactiveFormsModule, MomentModule, @@ -104,69 +54,25 @@ import { ObservationComponent } from './fhir/resources/observation/observation.c HighlightModule, PipesModule, DirectivesModule, + FhirCardModule, + FhirDatatableModule, //standalone components - AllergyIntoleranceComponent, - BadgeComponent, - BinaryComponent, - BinaryTextComponent, - CodableConceptComponent, - CodingComponent, - DicomComponent, GlossaryLookupComponent, GridstackComponent, GridstackItemComponent, - HtmlComponent, - ImgComponent, - ImmunizationComponent, LoadingSpinnerComponent, - LocationComponent, - MarkdownComponent, - MedicationComponent, - MedicationRequestComponent, - OrganizationComponent, - ObservationComponent, - PdfComponent, - PractitionerComponent, - ProcedureComponent, - TableComponent, + MedicalRecordWizardComponent, + NlmTypeaheadComponent, + MedicalRecordWizardAddPractitionerComponent, + MedicalRecordWizardAddOrganizationComponent, + MedicalRecordWizardAddAttachmentComponent, + MedicalRecordWizardAddEncounterComponent, ], declarations: [ ComponentsSidebarComponent, UtilitiesSidebarComponent, - ListAdverseEventComponent, - ListAllergyIntoleranceComponent, - ListAppointmentComponent, - ListBinaryComponent, - ListCarePlanComponent, - ListCareTeamComponent, - ListCommunicationComponent, - ListConditionComponent, - ListCoverageComponent, - ListDeviceComponent, - ListDeviceRequestComponent, - ListDiagnosticReportComponent, - ListDocumentReferenceComponent, - ListEncounterComponent, - ListGenericResourceComponent, - ListGoalComponent, - ListImmunizationComponent, - ListLocationComponent, - ListMedicationAdministrationComponent, - ListMedicationComponent, - ListMedicationDispenseComponent, - ListMedicationRequestComponent, - ListNutritionOrderComponent, - ListObservationComponent, - ListOrganizationComponent, - ListPatientComponent, - ListPractitionerComponent, - ListProcedureComponent, - ListServiceRequestComponent, - ResourceListComponent, - ResourceListOutletDirective, - ListFallbackComponent, ToastComponent, ReportHeaderComponent, ReportMedicalHistoryEditorComponent, @@ -174,14 +80,6 @@ import { ObservationComponent } from './fhir/resources/observation/observation.c ReportLabsObservationComponent, ReportMedicalHistoryTimelinePanelComponent, - FhirResourceComponent, - FhirResourceOutletDirective, - FallbackComponent, - ListFallbackComponent, - DiagnosticReportComponent, - NlmTypeaheadComponent, - DocumentReferenceComponent, - MediaComponent, ReportMedicalHistoryExplanationOfBenefitComponent, MedicalSourcesFilterComponent, MedicalSourcesConnectedComponent, @@ -189,56 +87,14 @@ import { ObservationComponent } from './fhir/resources/observation/observation.c MedicalSourcesCardComponent, ], exports: [ - BinaryComponent, ComponentsSidebarComponent, - DiagnosticReportComponent, - DocumentReferenceComponent, - FallbackComponent, - ListFallbackComponent, - FhirResourceComponent, - FhirResourceOutletDirective, - ImmunizationComponent, - ListAdverseEventComponent, - ListAllergyIntoleranceComponent, - ListAppointmentComponent, - ListBinaryComponent, - ListCarePlanComponent, - ListCareTeamComponent, - ListCommunicationComponent, - ListConditionComponent, - ListCoverageComponent, - ListDeviceComponent, - ListDeviceRequestComponent, - ListDiagnosticReportComponent, - ListDocumentReferenceComponent, - ListEncounterComponent, - ListGenericResourceComponent, - ListGoalComponent, - ListImmunizationComponent, - ListLocationComponent, - ListMedicationAdministrationComponent, - ListMedicationComponent, - ListMedicationDispenseComponent, - ListMedicationRequestComponent, - ListNutritionOrderComponent, - ListObservationComponent, - ListOrganizationComponent, - ListPatientComponent, - ListPractitionerComponent, - ListProcedureComponent, - ListServiceRequestComponent, MedicalSourcesFilterComponent, - MedicationRequestComponent, NlmTypeaheadComponent, - PractitionerComponent, - ProcedureComponent, ReportHeaderComponent, ReportLabsObservationComponent, ReportMedicalHistoryConditionComponent, ReportMedicalHistoryEditorComponent, ReportMedicalHistoryExplanationOfBenefitComponent, - ResourceListComponent, - ResourceListOutletDirective, ToastComponent, UtilitiesSidebarComponent, MedicalSourcesCardComponent, @@ -246,26 +102,17 @@ import { ObservationComponent } from './fhir/resources/observation/observation.c ReportMedicalHistoryTimelinePanelComponent, //standalone components - AllergyIntoleranceComponent, - BadgeComponent, - BinaryComponent, - CodableConceptComponent, - CodingComponent, - GlossaryLookupComponent, - GridstackComponent, - GridstackItemComponent, - ImmunizationComponent, - LoadingSpinnerComponent, - LocationComponent, - MedicalSourcesCategoryLookupPipe, - MedicationComponent, - MedicationRequestComponent, - OrganizationComponent, - ObservationComponent, - PractitionerComponent, - ProcedureComponent, - TableComponent, - + GlossaryLookupComponent, + GridstackComponent, + GridstackItemComponent, + LoadingSpinnerComponent, + MedicalRecordWizardAddAttachmentComponent, + MedicalRecordWizardAddEncounterComponent, + MedicalRecordWizardAddOrganizationComponent, + MedicalRecordWizardAddPractitionerComponent, + MedicalRecordWizardComponent, + MedicalSourcesCategoryLookupPipe, + NlmTypeaheadComponent, ] }) diff --git a/frontend/src/app/models/fasten/resource_create.ts b/frontend/src/app/models/fasten/resource_create.ts index 3abf4631..3830f5dd 100644 --- a/frontend/src/app/models/fasten/resource_create.ts +++ b/frontend/src/app/models/fasten/resource_create.ts @@ -1,6 +1,10 @@ import {IResourceRaw} from './resource_fhir'; import {CodingModel} from '../../../lib/models/datatypes/coding-model'; import {NlmSearchResults} from '../../services/nlm-clinical-table-search.service'; +import {WizardFhirResourceWrapper} from '../../components/medical-record-wizard/medical-record-wizard.utilities'; +import {EncounterModel} from '../../../lib/models/resources/encounter-model'; +import {PractitionerModel} from '../../../lib/models/resources/practitioner-model'; +import {OrganizationModel} from '../../../lib/models/resources/organization-model'; // @@ -124,12 +128,12 @@ import {NlmSearchResults} from '../../services/nlm-clinical-table-search.service // ] // } -export interface ResourceCreate { - condition: ResourceCreateCondition, +export interface MedicalRecordWizardFormCreate { + encounter: WizardFhirResourceWrapper, "medications": ResourceCreateMedication[], "procedures": ResourceCreateProcedure[], - "practitioners": ResourceCreatePractitioner[], - "organizations": ResourceCreateOrganization[], + "practitioners": WizardFhirResourceWrapper[], + "organizations": WizardFhirResourceWrapper[], "attachments": ResourceCreateAttachment[], } @@ -168,6 +172,7 @@ export interface ResourceCreateProcedure { "attachments": ResourceCreateAttachment[], } +// @deprecated - replaced by PractitionerModel display model export interface ResourceCreatePractitioner { "id"?: string, "identifier": CodingModel[] @@ -179,6 +184,7 @@ export interface ResourceCreatePractitioner { "address": Address, } +// @deprecated - replaced by OrganizationModel display model export interface ResourceCreateOrganization { "id"?: string, "identifier": CodingModel[] diff --git a/frontend/src/app/pages/dashboard/dashboard.component.ts b/frontend/src/app/pages/dashboard/dashboard.component.ts index 6337b4fb..e3db0796 100644 --- a/frontend/src/app/pages/dashboard/dashboard.component.ts +++ b/frontend/src/app/pages/dashboard/dashboard.component.ts @@ -85,7 +85,7 @@ export class DashboardComponent implements OnInit { } isActive(source: Source){ - if(source.source_type == "manual"){ + if(source.source_type == "manual" || source.source_type == 'fasten'){ return '--' } let expiresDate = new Date(source.expires_at); diff --git a/frontend/src/app/pages/medical-history/medical-history.component.spec.ts b/frontend/src/app/pages/medical-history/medical-history.component.spec.ts index cc26be53..eaad1839 100644 --- a/frontend/src/app/pages/medical-history/medical-history.component.spec.ts +++ b/frontend/src/app/pages/medical-history/medical-history.component.spec.ts @@ -13,7 +13,7 @@ describe('MedicalHistoryComponent', () => { beforeEach(async () => { - mockedFastenApiService = jasmine.createSpyObj('FastenApiService', ['getResourceGraph']) + mockedFastenApiService = jasmine.createSpyObj('FastenApiService', ['getResources', 'getResourceGraph']) await TestBed.configureTestingModule({ declarations: [ MedicalHistoryComponent ], providers: [{ @@ -23,6 +23,7 @@ describe('MedicalHistoryComponent', () => { }) .compileComponents(); mockedFastenApiService.getResourceGraph.and.returnValue(of({"Condition":[],"Encounter":[]})); + mockedFastenApiService.getResources.and.returnValue(of([])); fixture = TestBed.createComponent(MedicalHistoryComponent); component = fixture.componentInstance; diff --git a/frontend/src/app/pages/medical-history/medical-history.component.ts b/frontend/src/app/pages/medical-history/medical-history.component.ts index 8f46696a..8e5f68cf 100644 --- a/frontend/src/app/pages/medical-history/medical-history.component.ts +++ b/frontend/src/app/pages/medical-history/medical-history.component.ts @@ -30,7 +30,7 @@ export class MedicalHistoryComponent implements OnInit { constructor( - private fastenApi: FastenApiService, + public fastenApi: FastenApiService, private modalService: NgbModal ) { } diff --git a/frontend/src/app/pages/medical-sources/medical-sources.component.html b/frontend/src/app/pages/medical-sources/medical-sources.component.html index 92a19df3..2829f13a 100644 --- a/frontend/src/app/pages/medical-sources/medical-sources.component.html +++ b/frontend/src/app/pages/medical-sources/medical-sources.component.html @@ -100,7 +100,7 @@ class="mg-b-0" externalLink>{{modalSelectedSourceListItem?.metadata.patient_access_url | shortDomain}}
    - diff --git a/frontend/src/app/pages/patient-profile/patient-profile.component.html b/frontend/src/app/pages/patient-profile/patient-profile.component.html index 2579d100..d029af66 100644 --- a/frontend/src/app/pages/patient-profile/patient-profile.component.html +++ b/frontend/src/app/pages/patient-profile/patient-profile.component.html @@ -150,7 +150,7 @@ - +

    @@ -166,7 +166,7 @@
    - + diff --git a/frontend/src/app/pages/report-labs/report-labs.component.html b/frontend/src/app/pages/report-labs/report-labs.component.html index d54c1438..3d9dba3e 100644 --- a/frontend/src/app/pages/report-labs/report-labs.component.html +++ b/frontend/src/app/pages/report-labs/report-labs.component.html @@ -15,7 +15,7 @@

    Report Info

    - +
    diff --git a/frontend/src/app/pages/resource-creator/resource-creator.component.html b/frontend/src/app/pages/resource-creator/resource-creator.component.html index 201e4152..2b269b6f 100644 --- a/frontend/src/app/pages/resource-creator/resource-creator.component.html +++ b/frontend/src/app/pages/resource-creator/resource-creator.component.html @@ -8,649 +8,7 @@

    Create a Record

    - -
    -
    - - - -
    -
    - Form Status: {{ form.status }} -
    -
    -
    - -
    Condition
    -

    - A condition is a disease, illness, or injury that needs to be managed over time. A condition may be a comorbidity (a co-occurring condition), or it may be a main diagnosis. -

    - - - -
    - Condition Status: {{form.get('condition').status}} -
    - -
    -
    -

    Medical condition*

    - -
    -
    -

    Status*

    - -
    -
    -

    Started*

    - -
    -
    -

    Stopped

    - -
    -
    - -
    -
    -

    Description/Comment

    - -
    -
    -     - -
    - -
    -
    -
    -
    -
    -
    Medications
    -

    - Medications are substances that are taken to treat or prevent disease or illness. Medications are generally characterized by their chemical composition and the way they are administered. -

    -
    -
    -
    - - -
    -
    - Medication Status: {{medicationGroup.status}} -
    -
    - -
    -
    -
    -

    Medication name*

    - -
    -
    -

    Status*

    -
    -
    -

    Dosage

    - -
    -
    -

    Started*

    - -
    -
    -

    Stopped

    - -
    -
    -

    Why Stopped

    - -
    -
    -

    Prescribing Practitioner*

    - -
    -
    -
    -
    -

    Instructions

    - -
    -
    -
    -
    -

    Attachments

    -
    -
    - -
    -
    - - {{attachment.value.name}} ({{attachment.value.file_name}}) - -
    -
    -
    -     -
    -
    - -
    -
    -
    -
    - {{collapsePanel['medication'] ? 'expand' : 'collapse'}} -
    -
    -
    -
    - -
    - - -
    -
    -
    -
    -
    -
    Major Surgeries and Implants
    -

    - Implants, devices, major surgeries and other procedures that are part of a patient's history. -

    -
    -
    -
    - -
    -
    - Procedure Status: {{procedureGroup.status}} -
    -
    - -
    -
    -
    -

    Surgery or Implant*

    - -
    -
    -

    When done*

    - -
    -
    -

    Performed By

    - -
    -
    -

    Location

    - -
    -
    -

    Comments

    - -
    -
    -
    -
    -

    Attachments

    -
    - -
    - -
    -
    - - {{attachment.value.name}} ({{attachment.value.file_name}}) - -
    -
    -
    -     - - -
    -
    - -
    -
    -
    -
    - {{collapsePanel['procedure'] ? 'expand' : 'collapse'}} -
    -
    -
    -
    - -
    - -
    -
    -
    -
    -
    -
    Medical Practitioners
    -

    Practitioners involved in the care of the patient.

    -
    -
    -
    - - -
    -
    - Practitioner Status: {{practitionerGroup.status}} -
    -
    - -
    - -
    - - -
    -

    Name*

    - -
    -
    -

    Type*

    - -
    -
    -

    Telephone

    - -
    -
    -

    Fax

    - -
    -
    -

    Email

    - -
    -
    -

    Address

    - -
    - -
    - -
    -     - -
    -
    - -
    -
    -
    - -
    - {{collapsePanel['practitioner'] ? 'expand' : 'collapse'}} -
    -
    -
    -
    - -
    - - -
    -
    -
    -
    -
    -
    Medical Location/Organizations
    -

    Locations and Organizations involved in the care of the patient. -

    -
    -
    -
    - - -
    -
    - Organization Status: {{organizationGroup.status}} -
    -
    - -
    - -
    - - -
    -

    Name*

    - -
    -
    -

    Type

    - -
    -
    -

    Telephone

    - -
    -
    -

    Fax

    - -
    -
    -

    Email

    - -
    - -
    - -
    -     - -
    -
    - -
    -
    -
    - -
    - {{collapsePanel['organization'] ? 'expand' : 'collapse'}} -
    -
    -
    -
    - -
    - -
    -
    -
    -
    -
    -
    Notes & Attachments
    -

    - Files and notes related to medications, procedures, or the current condition. -

    -
    -
    -
    - - -
    -
    - Attachment Status: {{attachmentGroup.status}} -
    -
    - -
    - -
    - - -
    -

    Name*

    - -
    -
    -

    Category

    - -
    -
    -

    File Type

    - -
    -
    - -
    -     - - - - -
    -
    - -
    -
    -
    -
    - {{collapsePanel['attachments'] ? 'expand' : 'collapse'}} -
    -
    -
    -
    - - - - - - -
    - - -
    -
    - -
    -
    - New Practitioner Form Status: {{ newPractitionerForm.status }} -
    - -
    - -
    -

    Name*

    -
    - -
    - {{extId.type?.coding[0].code}}: {{extId.value}} -
    - -
    -

    Type*

    - -
    - -
    -

    Telephone

    - -
    -
    -

    Fax

    - -
    -
    -

    Email

    - -
    - -
    -

    Address

    - -
    -
    - -
    -
    -

    City

    - -
    -
    -

    State

    - -
    -
    -

    Zip/Postal

    - -
    -
    -

    Country

    - -
    -     -     -
    -
    -
    - -
    -     - - - - -
    - - -
    -
    - -
    -
    - New Organization Form Status: {{ newOrganizationForm.status }} -
    - -
    - -
    -

    Name*

    -
    - -
    - {{extId.type?.coding[0].code}}: {{extId.value}} -
    - - -
    -

    Type*

    - -
    -
    -

    Telephone

    - -
    -
    -

    Fax

    - -
    -
    -

    Email

    - -
    - -
    -

    Address

    - -
    -
    - -
    -
    -

    City

    - -
    -
    -

    State

    - -
    -
    -

    Zip/Postal

    - -
    -
    -

    Country

    - -
    -     -     -
    -
    -
    - -
    -     - - - - -
    - - -
    -
    - -
    -
    - New Attachment Form Status: {{ newAttachmentForm.status }} -
    - -
    - - -
    -

    Name*

    - -
    - -
    -

    Category*

    - -
    -
    -

    File Type*

    - -
    -
    -

    File*

    -
    -
    - - -
    -     -
    -
    -
    - -
    -     diff --git a/frontend/src/app/pages/resource-creator/resource-creator.component.ts b/frontend/src/app/pages/resource-creator/resource-creator.component.ts index b7a3d487..07040936 100644 --- a/frontend/src/app/pages/resource-creator/resource-creator.component.ts +++ b/frontend/src/app/pages/resource-creator/resource-creator.component.ts @@ -1,464 +1,30 @@ -import {Component, Input, OnInit} from '@angular/core'; -import {AbstractControl, FormArray, FormControl, FormGroup, Validators} from '@angular/forms'; -import { ModalDismissReasons, NgbModal } from '@ng-bootstrap/ng-bootstrap'; -import { - ResourceCreateAttachment, - ResourceCreateOrganization, - ResourceCreatePractitioner, -} from '../../models/fasten/resource_create'; -import {uuidV4} from '../../../lib/utils/uuid'; -import {NlmSearchResults} from '../../services/nlm-clinical-table-search.service'; -import {GenerateR4Bundle} from './resource-creator.utilities'; -import {FastenApiService} from '../../services/fasten-api.service'; +import {Component, OnInit} from '@angular/core'; +import { NgbModal } from '@ng-bootstrap/ng-bootstrap'; + +import {MedicalRecordWizardComponent} from '../../components/medical-record-wizard/medical-record-wizard.component'; import {Router} from '@angular/router'; -export interface MedicationModel { - data: {}, - status: string, - dosage: string, - started: null, - stopped: null, - whystopped: string, - resupply: string -} - -export enum ContactType { - ContactTypeSearch = 'search', - ContactTypeManual = 'manual', -} - @Component({ selector: 'app-resource-creator', templateUrl: './resource-creator.component.html', styleUrls: ['./resource-creator.component.scss'] }) export class ResourceCreatorComponent implements OnInit { - debugMode = false; - collapsePanel: {[name: string]: boolean} = {} - - @Input() form!: FormGroup; - get isValid() { return true; } - - // model: any = { - // condition: { - // data: {}, - // status: null, - // started: null, - // stopped: null, - // description: null, - // }, - // medication: [] - // } - - - constructor(private router: Router, private modalService: NgbModal, private fastenApi: FastenApiService) { } + constructor( private modalService: NgbModal, private router: Router) { } ngOnInit(): void { - - //https://stackoverflow.com/questions/52038071/creating-nested-form-groups-using-angular-reactive-forms - //https://www.danywalls.com/creating-dynamic-forms-in-angular-a-step-by-step-guide - //https://www.telerik.com/blogs/angular-basics-creating-dynamic-forms-using-formarray-angular - //https://angular.io/guide/reactive-forms#creating-dynamic-forms - //https://angular.io/guide/dynamic-form - this.form = new FormGroup({ - condition: new FormGroup({ - data: new FormControl(null, Validators.required), - status: new FormControl(null, Validators.required), - started: new FormControl(null, Validators.required), - stopped: new FormControl(null), - description: new FormControl(null), - }), - - medications: new FormArray([]), - procedures: new FormArray([]), - practitioners: new FormArray([]), - organizations: new FormArray([]), - attachments: new FormArray([]), + const modalRef = this.modalService.open(MedicalRecordWizardComponent, { + // const modalRef = this.modalService.open(ReportMedicalHistoryEditorComponent, { + size: 'xl', }); - this.resetOrganizationForm() - // this.resetPractitionerForm() - } - - get medications(): FormArray { - return this.form.controls["medications"] as FormArray; - } - addMedication(){ - const medicationGroup = new FormGroup({ - data: new FormControl(null, Validators.required), - status: new FormControl(null, Validators.required), - dosage: new FormControl({ - value: '', disabled: true - }), - started: new FormControl(null, Validators.required), - stopped: new FormControl(null), - whystopped: new FormControl(null), - requester: new FormControl(null, Validators.required), - instructions: new FormControl(null), - attachments: new FormControl([]), - }); - - medicationGroup.get("data").valueChanges.subscribe(val => { - medicationGroup.get("dosage").enable(); - //TODO: find a way to create dependant dosage information based on medication data. - }); - - this.medications.push(medicationGroup); - } - deleteMedication(index: number) { - this.medications.removeAt(index); - } - - - get procedures(): FormArray { - return this.form.controls["procedures"] as FormArray; - } - addProcedure(){ - const procedureGroup = new FormGroup({ - data: new FormControl(null, Validators.required), - whendone: new FormControl(null, Validators.required), - performer: new FormControl(null), - location: new FormControl(null), - comment: new FormControl(''), - attachments: new FormControl([]), - }); - - this.procedures.push(procedureGroup); - } - deleteProcedure(index: number) { - this.procedures.removeAt(index); - } - - - get practitioners(): FormArray { - return this.form.controls["practitioners"] as FormArray; - } - - addPractitioner(practitioner: ResourceCreatePractitioner){ - const practitionerGroup = new FormGroup({ - id: new FormControl(practitioner.id, Validators.required), - identifier: new FormControl(practitioner.identifier), - profession: new FormControl(practitioner.profession, Validators.required), - name: new FormControl(practitioner.name, Validators.required), - phone: new FormControl(practitioner.phone, Validators.pattern('[- +()0-9]+')), - fax: new FormControl(practitioner.fax, Validators.pattern('[- +()0-9]+')), - email: new FormControl(practitioner.email, Validators.email), - address: new FormGroup({ - line1: new FormControl(practitioner.address.line1), - line2: new FormControl(practitioner.address.line2), - city: new FormControl(practitioner.address.city), - state: new FormControl(practitioner.address.state), - zip: new FormControl(practitioner.address.zip), - country: new FormControl(practitioner.address.country), - }), - }); - - this.practitioners.push(practitionerGroup); - } - - deletePractitioner(index: number) { - this.practitioners.removeAt(index); - } - - - get organizations(): FormArray { - return this.form.controls["organizations"] as FormArray; - } - - addOrganization(organization: ResourceCreateOrganization){ - const organizationGroup = new FormGroup({ - id: new FormControl(organization.id, Validators.required), - identifier: new FormControl(organization.identifier), - name: new FormControl(organization.name, Validators.required), - type: new FormControl(organization.type), - phone: new FormControl(organization.phone, Validators.pattern('[- +()0-9]+')), - fax: new FormControl(organization.fax, Validators.pattern('[- +()0-9]+')), - email: new FormControl(organization.email, Validators.email), - address: new FormControl(organization.address), - }); - - this.organizations.push(organizationGroup); - } - deleteOrganization(index: number) { - this.organizations.removeAt(index); - } - - get attachments(): FormArray { - return this.form.controls["attachments"] as FormArray; - } - - addAttachment(attachment: ResourceCreateAttachment){ - const attachmentGroup = new FormGroup({ - id: new FormControl(attachment.id, Validators.required), - name: new FormControl(attachment.name, Validators.required), - category: new FormControl(attachment.category, Validators.required), - file_type: new FormControl(attachment.file_type, Validators.required), - file_name: new FormControl(attachment.file_name, Validators.required), - file_content: new FormControl(attachment.file_content, Validators.required), - file_size: new FormControl(attachment.file_size), - }); - - this.attachments.push(attachmentGroup); - } - deleteAttachment(index: number) { - this.attachments.removeAt(index); - } - - - onSubmit() { - console.log(this.form.getRawValue()) - this.form.markAllAsTouched() - if (this.form.valid) { - console.log('form submitted'); - - let bundle = GenerateR4Bundle(this.form.getRawValue()); - - let bundleJsonStr = JSON.stringify(bundle); - let bundleBlob = new Blob([bundleJsonStr], { type: 'application/json' }); - let bundleFile = new File([ bundleBlob ], 'bundle.json'); - this.fastenApi.createManualSource(bundleFile).subscribe((resp) => { - console.log(resp) - this.router.navigate(['/medical-history']) - }) - - } - - - } - - //Modal Helpers - newPractitionerTypeaheadForm: FormGroup - newPractitionerForm: FormGroup //ResourceCreatePractitioner - - newOrganizationTypeaheadForm: FormGroup - newOrganizationForm: FormGroup //ResourceCreateOrganization - - newAttachmentForm: FormGroup - - openPractitionerModal(content, formGroup?: AbstractControl, controlName?: string) { - this.resetPractitionerForm() - this.modalService.open(content, { - ariaLabelledBy: 'modal-practitioner', - beforeDismiss: () => { - console.log("validate Practitioner form") - this.newPractitionerForm.markAllAsTouched() - this.newPractitionerTypeaheadForm.markAllAsTouched() - return this.newPractitionerForm.valid - }, - }).result.then( - () => { - console.log('Closed without saving'); - }, - () => { - console.log('Closing, saving form'); - //add this to the list of organization - let result = this.newPractitionerForm.getRawValue() - result.id = uuidV4(); - this.addPractitioner(result); - if(formGroup && controlName){ - //set this practitioner to the current select box - formGroup.get(controlName).setValue(result.id); - } - }, - ); - } - - openOrganizationModal(content, formGroup?: AbstractControl, controlName?: string) { - this.resetOrganizationForm() - - this.modalService.open(content, { - ariaLabelledBy: 'modal-organization', - beforeDismiss: () => { - console.log("validate Organization form") - this.newOrganizationForm.markAllAsTouched() - this.newOrganizationTypeaheadForm.markAllAsTouched() - return this.newOrganizationForm.valid - }, - }).result.then( - () => { - console.log('Closed without saving'); - }, - () => { - console.log('Closing, saving form'); - //add this to the list of organization - let result = this.newOrganizationForm.getRawValue() - result.id = uuidV4(); - this.addOrganization(result); - if(formGroup && controlName){ - //set this practitioner to the current select box - formGroup.get(controlName).setValue(result.id); - } - }, - ); - } - - openAttachmentModal(content, formGroup?: AbstractControl, controlName?: string) { - this.resetAttachmentForm() - - this.modalService.open(content, { - ariaLabelledBy: 'modal-attachment', - beforeDismiss: () => { - console.log("validate Attachment form") - this.newAttachmentForm.markAllAsTouched() - return this.newAttachmentForm.valid - }, - }).result.then( - () => { - console.log('Closed without saving'); - }, - () => { - console.log('Closing, saving form'); - //add this to the list of organization - let result = this.newAttachmentForm.getRawValue() - result.id = uuidV4(); - this.addAttachment(result); - - if(formGroup && controlName){ - - //add this attachment id to the current FormArray - let controlArrayVal = formGroup.get(controlName).getRawValue(); - controlArrayVal.push(result.id) - formGroup.get(controlName).setValue(controlArrayVal); - } - }, - ); - } - - private resetPractitionerForm(){ - this.newPractitionerTypeaheadForm = new FormGroup({ - data: new FormControl(null, Validators.required), - }) - this.newPractitionerTypeaheadForm.valueChanges.subscribe(form => { - console.log("CHANGE INDIVIDUAL IN MODAL", form) - let val = form.data - if(val.provider_type){ - this.newPractitionerForm.get('profession').setValue(val.provider_type) - } - if(val.identifier){ - this.newPractitionerForm.get('identifier').setValue( val.identifier); - } - if(form.data.provider_phone){ - this.newPractitionerForm.get('phone').setValue( val.provider_phone); - } - if(val.provider_fax){ - this.newPractitionerForm.get('fax').setValue(val.provider_fax); - } - - if(val.provider_address){ - let addressGroup = this.newPractitionerForm.get('address') - addressGroup.get('line1').setValue(val.provider_address.line1) - addressGroup.get('line2').setValue(val.provider_address.line2) - addressGroup.get('city').setValue(val.provider_address.city) - addressGroup.get('state').setValue(val.provider_address.state) - addressGroup.get('zip').setValue(val.provider_address.zip) - addressGroup.get('country').setValue(val.provider_address.country) - } - if(val.text) { - this.newPractitionerForm.get('name').setValue( val.text); - } - }); - - - this.newPractitionerForm = new FormGroup({ - identifier: new FormControl([]), - name: new FormControl(null, Validators.required), - profession: new FormControl(null, Validators.required), - phone: new FormControl(null, Validators.pattern('[- +()0-9]+')), - fax: new FormControl(null, Validators.pattern('[- +()0-9]+')), - email: new FormControl(null, Validators.email), - address: new FormGroup({ - line1: new FormControl(null), - line2: new FormControl(null), - city: new FormControl(null), - state: new FormControl(null), - zip: new FormControl(null), - country: new FormControl(null), - }) - }) - - - } - - private resetOrganizationForm(){ - this.newOrganizationTypeaheadForm = new FormGroup({ - data: new FormControl(null, Validators.required), - }) - this.newOrganizationTypeaheadForm.valueChanges.subscribe(form => { - console.log("CHANGE Organization IN MODAL", form) - let val = form.data - if(val.provider_type) { - this.newOrganizationForm.get('type').setValue(val.provider_type) - } - if(val.identifier){ - this.newOrganizationForm.get('identifier').setValue(val.identifier) - } - if(val.provider_phone){ - this.newOrganizationForm.get('phone').setValue(val.provider_phone) - } - if(val.provider_fax){ - this.newOrganizationForm.get('fax').setValue(val.provider_fax) - } - if(val.provider_address){ - let addressGroup = this.newOrganizationForm.get('address') - addressGroup.get('line1').setValue(val.provider_address.line1) - addressGroup.get('line2').setValue(val.provider_address.line2) - addressGroup.get('city').setValue(val.provider_address.city) - addressGroup.get('state').setValue(val.provider_address.state) - addressGroup.get('zip').setValue(val.provider_address.zip) - addressGroup.get('country').setValue(val.provider_address.country) - } - if(val.text) { - this.newOrganizationForm.get('name').setValue(val.text) - } - }); - - this.newOrganizationForm = new FormGroup({ - identifier: new FormControl([]), - name: new FormControl(null, Validators.required), - type: new FormControl(null, Validators.required), - phone: new FormControl(null, Validators.pattern('[- +()0-9]+')), - fax: new FormControl(null, Validators.pattern('[- +()0-9]+')), - email: new FormControl(null, Validators.email), - address: new FormGroup({ - line1: new FormControl(null), - line2: new FormControl(null), - city: new FormControl(null), - state: new FormControl(null), - zip: new FormControl(null), - country: new FormControl(null), - }) - }) - - } - - private resetAttachmentForm(){ - - this.newAttachmentForm = new FormGroup({ - name: new FormControl(null, Validators.required), - category: new FormControl(null, Validators.required), - file_type: new FormControl(null, Validators.required), - file_name: new FormControl(null, Validators.required), - file_content: new FormControl(null, Validators.required), - file_size: new FormControl(null), + //on close, we should redirect to the Medical history page. + modalRef.result.then((result) => { + this.router.navigate(['/medical-history']); + }).catch((error) => { + this.router.navigate(['/medical-history']); }) } - onAttachmentFileChange($event){ - console.log("onAttachmentFileChange") - let fileInput = $event.target as HTMLInputElement; - if (fileInput.files && fileInput.files[0]) { - let reader = new FileReader(); - reader.onloadend = () => { - // use a regex to remove data url part - const base64String = (reader.result as string).replace('data:', '').replace(/^.+,/, ''); - this.newAttachmentForm.get('file_content').setValue(base64String) - }; - reader.readAsDataURL(fileInput.files[0]); - this.newAttachmentForm.get('file_name').setValue(fileInput.files[0].name) - this.newAttachmentForm.get('file_size').setValue(fileInput.files[0].size) - } - } - - } diff --git a/frontend/src/app/pages/resource-creator/resource-creator.utilities.ts b/frontend/src/app/pages/resource-creator/resource-creator.utilities.ts deleted file mode 100644 index 10ec924e..00000000 --- a/frontend/src/app/pages/resource-creator/resource-creator.utilities.ts +++ /dev/null @@ -1,534 +0,0 @@ -import { - ResourceCreate, - ResourceCreateCondition, ResourceCreateAttachment, ResourceCreateMedication, - ResourceCreateOrganization, ResourceCreatePractitioner, - ResourceCreateProcedure -} from '../../models/fasten/resource_create'; -import { - Condition, - Medication, - Procedure, - Location as FhirLocation, - BundleEntry, - Bundle, - Organization, - Practitioner, MedicationRequest, Patient, Encounter, DocumentReference, Media, DiagnosticReport, Reference, Binary -} from 'fhir/r4'; -import {uuidV4} from '../../../lib/utils/uuid'; - -interface ResourceStorage { - [resourceType: string]: { - [resourceId: string]: Condition | Patient | MedicationRequest | Organization | FhirLocation | Practitioner | Procedure | Encounter | DocumentReference | Media | DiagnosticReport | Binary - } -} - - -export function GenerateR4Bundle(resourceCreate: ResourceCreate): Bundle { - let resourceStorage: ResourceStorage = {} //{"resourceType": {"resourceId": resourceData}} - resourceStorage = placeholderR4Patient(resourceStorage) - resourceStorage = resourceCreateConditionToR4Condition(resourceStorage, resourceCreate.condition) - - for(let attachment of resourceCreate.attachments) { - if(attachment.file_type == 'application/dicom' || - attachment.category.id == '18726-0' || //Radiology studies (set) - attachment.category.id == '27897-8' || // Neuromuscular electrophysiology studies (set) - attachment.category.id == '18748-4' // Diagnostic imaging study - ) { - //Diagnostic imaging study (DiagnosticReport -> Media) - resourceStorage = resourceAttachmentToR4DiagnosticReport(resourceStorage, attachment) - } - else { - resourceStorage = resourceAttachmentToR4DocumentReference(resourceStorage, attachment) - } - - } - for(let organization of resourceCreate.organizations) { - resourceStorage = resourceCreateOrganizationToR4Organization(resourceStorage, organization) - } - for(let practitioner of resourceCreate.practitioners) { - resourceStorage = resourceCreatePractitionerToR4Practitioner(resourceStorage, practitioner) - } - for(let medication of resourceCreate.medications) { - resourceStorage = resourceCreateMedicationToR4MedicationRequest(resourceStorage, medication) - } - for(let procedure of resourceCreate.procedures) { - resourceStorage = resourceCreateProcedureToR4Procedure(resourceStorage, procedure) - } - - - //DocumentReference -> (Optional) Binary - //DiagnosticReport -> Media - //ImagingStudy - //ImagingSelection - - console.log("POPULATED RESOURCE STORAGE", resourceStorage) - - let bundle = { - resourceType: 'Bundle', - type: 'transaction', - entry: [], - } as Bundle - for(let resourceType in resourceStorage) { - for(let resourceId in resourceStorage[resourceType]) { - let resource = resourceStorage[resourceType][resourceId] - bundle.entry.push({ - fullUrl: `urn:uuid:${resource.id}`, - resource: resource, - }) - } - } - - return bundle -} - -//Private methods - -function placeholderR4Patient(resourceStorage: ResourceStorage): ResourceStorage { - resourceStorage['Patient'] = resourceStorage['Patient'] || {} - let patientResource = { - resourceType: 'Patient', - id: uuidV4(), - name: [ - { - family: 'Placeholder', - given: ['Patient'], - } - ], - } as Patient - resourceStorage['Patient'][patientResource.id] = patientResource - return resourceStorage -} - -// this model is based on FHIR401 Resource Condition - http://hl7.org/fhir/R4/condition.html -function resourceCreateConditionToR4Condition(resourceStorage: ResourceStorage, resourceCreateCondition: ResourceCreateCondition): ResourceStorage { - resourceStorage['Condition'] = resourceStorage['Condition'] || {} - resourceStorage['Encounter'] = resourceStorage['Encounter'] || {} - - let note = [] - if (resourceCreateCondition.description) { - note.push({ - text: resourceCreateCondition.description, - }) - } - - let conditionResource = { - subject: { - reference: `urn:uuid:${findPatient(resourceStorage).id}` //Patient - }, - resourceType: 'Condition', - id: uuidV4(), - code: { - coding: resourceCreateCondition.data.identifier || [], - text: resourceCreateCondition.data.identifier[0].display, - }, - clinicalStatus: { - "coding": [ - { - "system": "http://terminology.hl7.org/CodeSystem/condition-clinical", - "code": resourceCreateCondition.status, - } - ] - }, - onsetDateTime: `${new Date(resourceCreateCondition.started.year, resourceCreateCondition.started.month-1,resourceCreateCondition.started.day).toISOString()}`, - abatementDateTime: resourceCreateCondition.stopped ? `${new Date(resourceCreateCondition.stopped.year,resourceCreateCondition.stopped.month-1, resourceCreateCondition.stopped.day).toISOString()}` : null, - recordedDate: new Date().toISOString(), - note: note - } as Condition - - - - resourceStorage['Condition'][conditionResource.id] = conditionResource - return resourceStorage -} - -// this model is based on FHIR401 Resource Procedure - http://hl7.org/fhir/R4/procedure.html -function resourceCreateProcedureToR4Procedure(resourceStorage: ResourceStorage, resourceCreateProcedure: ResourceCreateProcedure): ResourceStorage { - resourceStorage['Procedure'] = resourceStorage['Procedure'] || {} - - - let note = [] - if (resourceCreateProcedure.comment) { - note.push({ - text: resourceCreateProcedure.comment, - }) - } - - let encounterResource = { - resourceType: 'Encounter', - id: uuidV4(), - status: "finished", - subject: { - reference: `urn:uuid:${findPatient(resourceStorage).id}` //Patient - }, - participant: [ - { - individual: { - reference: `urn:uuid:${resourceCreateProcedure.performer}` //Practitioner - } - } - ], - period: { - start: `${new Date(resourceCreateProcedure.whendone.year, resourceCreateProcedure.whendone.month-1,resourceCreateProcedure.whendone.day).toISOString()}`, - end: `${new Date(resourceCreateProcedure.whendone.year, resourceCreateProcedure.whendone.month-1,resourceCreateProcedure.whendone.day).toISOString()}`, - }, - reasonReference: [ - { - reference: `urn:uuid:${findCondition(resourceStorage).id}` //Condition - } - ], - serviceProvider: { - reference: `urn:uuid:${resourceCreateProcedure.location}` //Organization - } - } as Encounter - resourceStorage['Encounter'][encounterResource.id] = encounterResource - - let procedureResource = { - subject: { - reference: `urn:uuid:${findPatient(resourceStorage).id}` //Patient - }, - status: "completed", - resourceType: 'Procedure', - - id: uuidV4(), - code: { - coding: resourceCreateProcedure.data.identifier || [], - text: resourceCreateProcedure.data.identifier[0].display, - }, - performedDateTime: `${new Date(resourceCreateProcedure.whendone.year, resourceCreateProcedure.whendone.month-1,resourceCreateProcedure.whendone.day).toISOString()}`, - encounter: { - reference: `urn:uuid:${encounterResource.id}` //Encounter - }, - reasonReference: [ - { - reference: `urn:uuid:${findCondition(resourceStorage).id}` //Condition - } - ], - report: (resourceCreateProcedure.attachments || []).map(attachmentId => { - return { - reference: `urn:uuid:${attachmentId}` //DocumentReference or DiagnosticReport - } - }), - performer: [ - { - actor: { - reference: `urn:uuid:${resourceCreateProcedure.performer}` //Practitioner - }, - onBehalfOf: { - reference: `urn:uuid:${resourceCreateProcedure.location}` //Organization - } - } - ], - note: note, - } as Procedure - resourceStorage['Procedure'][procedureResource.id] = procedureResource - - return resourceStorage -} - -// this model is based on FHIR401 Resource Organization - http://hl7.org/fhir/R4/organization.html -function resourceCreateOrganizationToR4Organization(resourceStorage: ResourceStorage, resourceCreateOrganization: ResourceCreateOrganization): ResourceStorage { - resourceStorage['Organization'] = resourceStorage['Organization'] || {} - - let telecom = [] - if (resourceCreateOrganization.phone) { - telecom.push({ - system: 'phone', - value: resourceCreateOrganization.phone, - }) - } - if (resourceCreateOrganization.fax) { - telecom.push({ - system: 'fax', - value: resourceCreateOrganization.fax, - }) - } - if (resourceCreateOrganization.email) { - telecom.push({ - system: 'email', - value: resourceCreateOrganization.email, - }) - } - - let organizationResource = { - resourceType: 'Organization', - id: resourceCreateOrganization.id, - name: resourceCreateOrganization.name, - identifier: resourceCreateOrganization.identifier || [], - type: [ - { - coding: resourceCreateOrganization.type.identifier || [], - } - ], - address: [ - { - line: [resourceCreateOrganization.address.line1, resourceCreateOrganization.address.line2], - city: resourceCreateOrganization.address.city, - state: resourceCreateOrganization.address.state, - postalCode: resourceCreateOrganization.address.zip, - country: resourceCreateOrganization.address.country, - } - ], - telecom: telecom, - active: true, - } as Organization - - resourceStorage['Organization'][organizationResource.id] = organizationResource - return resourceStorage - -} - -// this model is based on FHIR401 Resource Practitioner - http://hl7.org/fhir/R4/practitioner.html -function resourceCreatePractitionerToR4Practitioner(resourceStorage: ResourceStorage, resourceCreatePractitioner: ResourceCreatePractitioner): ResourceStorage { - resourceStorage['Practitioner'] = resourceStorage['Practitioner'] || {} - let telecom = [] - if (resourceCreatePractitioner.phone) { - telecom.push({ - system: 'phone', - value: resourceCreatePractitioner.phone, - }) - } - if (resourceCreatePractitioner.fax) { - telecom.push({ - system: 'fax', - value: resourceCreatePractitioner.fax, - }) - } - if (resourceCreatePractitioner.email) { - telecom.push({ - system: 'email', - value: resourceCreatePractitioner.email, - }) - } - let qualification = [] - if(resourceCreatePractitioner.profession){ - qualification.push({ - code: { - coding: resourceCreatePractitioner.profession.identifier || [], - } - }) - } - - resourceCreatePractitioner.name.split(" ") - - let practitionerResource = { - resourceType: 'Practitioner', - id: resourceCreatePractitioner.id, - name: [ - { - text: resourceCreatePractitioner.name, - }, - ], - identifier: resourceCreatePractitioner.identifier || [], - address: [ - { - line: [resourceCreatePractitioner.address.line1, resourceCreatePractitioner.address.line2], - city: resourceCreatePractitioner.address.city, - state: resourceCreatePractitioner.address.state, - postalCode: resourceCreatePractitioner.address.zip, - country: resourceCreatePractitioner.address.country, - } - ], - telecom: telecom, - active: true, - qualification: qualification - } as Practitioner - - resourceStorage['Practitioner'][practitionerResource.id] = practitionerResource - return resourceStorage -} - -// this model is based on FHIR401 Resource Medication - https://www.hl7.org/fhir/R4/MedicationRequest.html -function resourceCreateMedicationToR4MedicationRequest(resourceStorage: ResourceStorage, resourceCreateMedication: ResourceCreateMedication): ResourceStorage { - resourceStorage['MedicationRequest'] = resourceStorage['MedicationRequest'] || {} - - let encounterResource = { - resourceType: 'Encounter', - id: uuidV4(), - status: "finished", - subject: { - reference: `urn:uuid:${findPatient(resourceStorage).id}` //Patient - }, - participant: [ - { - individual: { - reference: `urn:uuid:${resourceCreateMedication.requester}` //Practitioner - } - } - ], - period: { - start: `${new Date(resourceCreateMedication.started.year, resourceCreateMedication.started.month-1,resourceCreateMedication.started.day).toISOString()}`, - end: resourceCreateMedication.stopped ? `${new Date(resourceCreateMedication.stopped.year, resourceCreateMedication.stopped.month-1,resourceCreateMedication.stopped.day).toISOString()}` : null, - }, - reasonReference: [ - { - reference: `urn:uuid:${findCondition(resourceStorage).id}` //Condition - } - ], - } as Encounter - resourceStorage['Encounter'][encounterResource.id] = encounterResource - - let medicationRequestResource = { - id: uuidV4(), - resourceType: 'MedicationRequest', - status: resourceCreateMedication.status, - statusReason: { - coding: resourceCreateMedication.whystopped.identifier || [], - }, - intent: 'order', - medicationCodeableConcept: { - coding: resourceCreateMedication.data.identifier || [], - }, - subject: { - reference: `urn:uuid:${findPatient(resourceStorage).id}` //Patient - }, - encounter: { - reference: `urn:uuid:${encounterResource.id}` //Encounter - }, - authoredOn: `${new Date(resourceCreateMedication.started.year,resourceCreateMedication.started.month-1,resourceCreateMedication.started.day).toISOString()}`, - requester: { - reference: `urn:uuid:${resourceCreateMedication.requester}` // Practitioner - }, - supportingInformation: (resourceCreateMedication.attachments || []).map((attachmentId) => { - return { - reference: `urn:uuid:${attachmentId}` //DocumentReference or DiagnosticReport - } - }), - reasonReference: [ - { - reference: `urn:uuid:${findCondition(resourceStorage).id}` //Condition - }, - ], - note: [ - { - text: resourceCreateMedication.instructions, - } - ], - dispenseRequest: { - validityPeriod: { - start: `${new Date(resourceCreateMedication.started.year,resourceCreateMedication.started.month-1,resourceCreateMedication.started.day).toISOString()}`, - end: resourceCreateMedication.stopped ? `${new Date(resourceCreateMedication.stopped.year,resourceCreateMedication.stopped.month-1,resourceCreateMedication.stopped.day).toISOString()}` : null, - }, - }, - } as MedicationRequest - resourceStorage['MedicationRequest'][medicationRequestResource.id] = medicationRequestResource - - return resourceStorage -} - -function resourceAttachmentToR4DocumentReference(resourceStorage: ResourceStorage, resourceAttachment: ResourceCreateAttachment): ResourceStorage { - resourceStorage['Binary'] = resourceStorage['Binary'] || {} - let binaryResource = { - id: uuidV4(), - resourceType: 'Binary', - contentType: resourceAttachment.file_type, - data: resourceAttachment.file_content, - } as Binary - resourceStorage['Binary'][binaryResource.id] = binaryResource - - - resourceStorage['DocumentReference'] = resourceStorage['DocumentReference'] || {} - - let documentReferenceResource = { - id: resourceAttachment.id, - resourceType: 'DocumentReference', - status: 'current', - category: [ - { - coding: resourceAttachment.category.identifier || [], - text: resourceAttachment.category.text, - } - ], - // description: resourceAttachment.description, - subject: { - reference: `urn:uuid:${findPatient(resourceStorage).id}` //Patient - }, - content: [ - { - attachment: { - contentType: resourceAttachment.file_type, - url: `urn:uuid:${binaryResource.id}`, //Binary - title: resourceAttachment.name, - } - } - ], - context: [ - { - related: [ - { - reference: `urn:uuid:${findCondition(resourceStorage).id}` //Condition - } - ] - } - ] - // date: `${new Date(resourceDocumentReference.date.year,resourceDocumentReference.date.month-1,resourceDocumentReference.date.day).toISOString()}`, - } as DocumentReference - resourceStorage['DocumentReference'][documentReferenceResource.id] = documentReferenceResource - - return resourceStorage -} - -function resourceAttachmentToR4DiagnosticReport(resourceStorage: ResourceStorage, resourceAttachment: ResourceCreateAttachment): ResourceStorage { - resourceStorage['Binary'] = resourceStorage['Binary'] || {} - let binaryResource = { - id: uuidV4(), - resourceType: 'Binary', - contentType: resourceAttachment.file_type, - data: resourceAttachment.file_content, - } as Binary - resourceStorage['Binary'][binaryResource.id] = binaryResource - - resourceStorage['Media'] = resourceStorage['Media'] || {} - - let mediaResource = { - id: uuidV4(), - resourceType: 'Media', - status: 'completed', - type: { - coding: resourceAttachment.category.identifier || [], - display: resourceAttachment.category.text, - }, - subject: { - reference: `urn:uuid:${findPatient(resourceStorage).id}` //Patient - }, - content: { - contentType: resourceAttachment.file_type, - url: `urn:uuid:${binaryResource.id}`, //Binary, - title: resourceAttachment.name, - }, - } as Media - resourceStorage['Media'][mediaResource.id] = mediaResource - - resourceStorage['DiagnosticReport'] = resourceStorage['DiagnosticReport'] || {} - let diagnosticReportResource = { - id: resourceAttachment.id, - resourceType: 'DiagnosticReport', - status: 'final', - code: { - coding: resourceAttachment.category.identifier || [], - }, - subject: { - reference: `urn:uuid:${findPatient(resourceStorage).id}` //Patient - }, - media: [ - { - link: { - reference: `urn:uuid:${mediaResource.id}` //Media - } - }, - ], - } as DiagnosticReport - resourceStorage['DiagnosticReport'][diagnosticReportResource.id] = diagnosticReportResource - - return resourceStorage -} - - -function findCondition(resourceStorage: ResourceStorage): Condition { - let [conditionId] = Object.keys(resourceStorage['Condition']) - return resourceStorage['Condition'][conditionId] as Condition -} - -function findPatient(resourceStorage: ResourceStorage): Patient { - let [patientId] = Object.keys(resourceStorage['Patient']) - return resourceStorage['Patient'][patientId] as Patient -} diff --git a/frontend/src/app/pages/resource-detail/resource-detail.component.html b/frontend/src/app/pages/resource-detail/resource-detail.component.html index 27306108..92f813fc 100644 --- a/frontend/src/app/pages/resource-detail/resource-detail.component.html +++ b/frontend/src/app/pages/resource-detail/resource-detail.component.html @@ -10,7 +10,7 @@ - +

    An error occurred while parsing FHIR resource

    diff --git a/frontend/src/app/pages/source-detail/source-detail.component.html b/frontend/src/app/pages/source-detail/source-detail.component.html index 2ed01a99..958be225 100644 --- a/frontend/src/app/pages/source-detail/source-detail.component.html +++ b/frontend/src/app/pages/source-detail/source-detail.component.html @@ -1,6 +1,6 @@
    -
    +
    @@ -37,9 +37,9 @@
    Address:
    {{getPatientAddress()}}
    ID:
    -
    {{selectedPatient?.source_resource_id}}
    +
    {{selectedPatient?.source_resource_id}}
    MRN:
    -
    {{getPatientMRN()}}
    +
    {{getPatientMRN()}}
    @@ -63,11 +63,11 @@
    - + >
    diff --git a/frontend/src/app/pages/source-detail/source-detail.component.ts b/frontend/src/app/pages/source-detail/source-detail.component.ts index 7db16301..e59934cb 100644 --- a/frontend/src/app/pages/source-detail/source-detail.component.ts +++ b/frontend/src/app/pages/source-detail/source-detail.component.ts @@ -3,7 +3,7 @@ import {ActivatedRoute, Router} from '@angular/router'; import {Source} from '../../models/fasten/source'; import {FastenApiService} from '../../services/fasten-api.service'; import {ResourceFhir} from '../../models/fasten/resource_fhir'; -import {getPath} from '../../components/list-generic-resource/utils'; +import {getPath} from '../../components/fhir-datatable/datatable-generic-resource/utils'; @Component({ selector: 'app-source-detail', diff --git a/frontend/src/app/pipes/human-name.pipe.spec.ts b/frontend/src/app/pipes/human-name.pipe.spec.ts new file mode 100644 index 00000000..bd0cf04c --- /dev/null +++ b/frontend/src/app/pipes/human-name.pipe.spec.ts @@ -0,0 +1,8 @@ +import { HumanNamePipe } from './human-name.pipe'; + +describe('HumanNamePipe', () => { + it('create an instance', () => { + const pipe = new HumanNamePipe(); + expect(pipe).toBeTruthy(); + }); +}); diff --git a/frontend/src/app/pipes/human-name.pipe.ts b/frontend/src/app/pipes/human-name.pipe.ts new file mode 100644 index 00000000..799dea2d --- /dev/null +++ b/frontend/src/app/pipes/human-name.pipe.ts @@ -0,0 +1,36 @@ +import { Pipe, PipeTransform } from '@angular/core'; +import {evaluate} from 'fhirpath'; +import {HumanNameModel} from '../../lib/models/datatypes/human-name-model'; + +@Pipe({ + name: 'humanName' +}) +export class HumanNamePipe implements PipeTransform { + + + + transform(humanNameModel: HumanNameModel | HumanNameModel[], ...args: unknown[]): unknown { + if(!humanNameModel){ + return null + } + + let names = [] + + if(Array.isArray(humanNameModel)){ + //array of values + for(let humanName of humanNameModel){ + names.push(this.getDisplayName(humanName)); + } + } else { + //single value + names.push(this.getDisplayName(humanNameModel)); + } + + return names.join(", ") + } + + getDisplayName(humanNameModel: HumanNameModel): string { + return humanNameModel.textName ? humanNameModel.textName : `${humanNameModel.givenName} ${humanNameModel.familyName}`.trim(); + } + +} diff --git a/frontend/src/app/pipes/pipes.module.ts b/frontend/src/app/pipes/pipes.module.ts index 7949cc7d..f95f1441 100644 --- a/frontend/src/app/pipes/pipes.module.ts +++ b/frontend/src/app/pipes/pipes.module.ts @@ -6,6 +6,8 @@ import {FhirPathPipe} from './fhir-path.pipe'; import {FilterPipe} from './filter.pipe'; import { ShortDomainPipe } from './short-domain.pipe'; import { DatasetLatestEntryPipe } from './dataset-latest-entry.pipe'; +import { HumanNamePipe } from './human-name.pipe'; +import { ReferenceUriPipe } from './reference-uri.pipe'; @NgModule({ declarations: [ @@ -14,6 +16,8 @@ import { DatasetLatestEntryPipe } from './dataset-latest-entry.pipe'; FilterPipe, ShortDomainPipe, DatasetLatestEntryPipe, + HumanNamePipe, + ReferenceUriPipe, ], imports: [ @@ -22,7 +26,9 @@ import { DatasetLatestEntryPipe } from './dataset-latest-entry.pipe'; FhirPathPipe, FilterPipe, ShortDomainPipe, - DatasetLatestEntryPipe + DatasetLatestEntryPipe, + HumanNamePipe, + ReferenceUriPipe ] }) export class PipesModule {} diff --git a/frontend/src/app/pipes/reference-uri.pipe.spec.ts b/frontend/src/app/pipes/reference-uri.pipe.spec.ts new file mode 100644 index 00000000..126d9d56 --- /dev/null +++ b/frontend/src/app/pipes/reference-uri.pipe.spec.ts @@ -0,0 +1,8 @@ +import { ReferenceUriPipe } from './reference-uri.pipe'; + +describe('ReferenceUriPipe', () => { + it('create an instance', () => { + const pipe = new ReferenceUriPipe(); + expect(pipe).toBeTruthy(); + }); +}); diff --git a/frontend/src/app/pipes/reference-uri.pipe.ts b/frontend/src/app/pipes/reference-uri.pipe.ts new file mode 100644 index 00000000..a2181d61 --- /dev/null +++ b/frontend/src/app/pipes/reference-uri.pipe.ts @@ -0,0 +1,18 @@ +import { Pipe, PipeTransform } from '@angular/core'; +import {generateReferenceUriFromResourceOrReference} from '../../lib/utils/bundle_references'; +import {FastenDisplayModel} from '../../lib/models/fasten/fasten-display-model'; +import {Reference, Resource} from 'fhir/r4'; + +@Pipe({ + name: 'referenceUri' +}) +export class ReferenceUriPipe implements PipeTransform { + + transform(value: FastenDisplayModel | Resource | Reference, ...args: unknown[]): unknown { + if (!value) { + return value + } + return generateReferenceUriFromResourceOrReference(value) + } + +} diff --git a/frontend/src/app/services/fasten-api.service.ts b/frontend/src/app/services/fasten-api.service.ts index 2867358a..b331faa3 100644 --- a/frontend/src/app/services/fasten-api.service.ts +++ b/frontend/src/app/services/fasten-api.service.ts @@ -26,7 +26,9 @@ import {ResourceGraphResponse} from '../models/fasten/resource-graph-response'; import { fetchEventSource } from '@microsoft/fetch-event-source'; import {BackgroundJob} from '../models/fasten/background-job'; import {SupportRequest} from '../models/fasten/support-request'; - +import { + List +} from 'fhir/r4'; @Injectable({ providedIn: 'root' }) @@ -107,6 +109,25 @@ export class FastenApiService { ); } + createRelatedResourcesFastenSource(resourceList: List): Observable { + + console.log(resourceList) + let bundleBlob = new Blob([JSON.stringify(resourceList)], { type: 'application/json' }); + let bundleFile = new File([ bundleBlob ], 'related.json', { type: 'application/json' }); + + const formData = new FormData(); + formData.append('file', bundleFile); + + return this._httpClient.post(`${GetEndpointAbsolutePath(globalThis.location, environment.fasten_api_endpoint_base)}/secure/resource/related`, formData) + .pipe( + map((response: ResponseWrapper) => { + console.log("RELATED RESOURCES RESPONSE", response) + return response.data as Source + }) + ); + } + + getSources(): Observable { return this._httpClient.get(`${GetEndpointAbsolutePath(globalThis.location, environment.fasten_api_endpoint_base)}/secure/source`) .pipe( @@ -190,6 +211,10 @@ export class FastenApiService { return this._httpClient.post(`${GetEndpointAbsolutePath(globalThis.location, environment.fasten_api_endpoint_base)}/secure/query`, query) } + // requires: + // - source_id: string + // - source_resource_type: string + // - source_resource_id: string getResourceGraph(graphType?: string, selectedResourceIds?: Partial[]): Observable { if(!graphType){ graphType = "MedicalHistory" @@ -228,6 +253,7 @@ export class FastenApiService { } //this method allows a user to manually group related FHIR resources together (conditions, encounters, etc). + // @deprecated - replaced by Create Manual Record Wizard createResourceComposition(title: string, resources: ResourceFhir[]){ return this._httpClient.post(`${GetEndpointAbsolutePath(globalThis.location, environment.fasten_api_endpoint_base)}/secure/resource/composition`, { "resources": resources, diff --git a/frontend/src/app/services/nlm-clinical-table-search.service.ts b/frontend/src/app/services/nlm-clinical-table-search.service.ts index 72159677..e25a4196 100644 --- a/frontend/src/app/services/nlm-clinical-table-search.service.ts +++ b/frontend/src/app/services/nlm-clinical-table-search.service.ts @@ -1486,4 +1486,97 @@ export class NlmClinicalTableSearchService { // return of(result) } + //https://hl7.org/fhir/r4/v3/ActEncounterCode/vs.html + //manually created for patient understanding + searchEncounterClassification(searchTerm: string): Observable { + + let searchOptions: NlmSearchResults[] = [ + { + id: "AMB", + identifier: [{ + code: "AMB", + display: "ambulatory", + system: "http://terminology.hl7.org/CodeSystem/v3-ActCode" + }], + text: "Routine Check-up or Preventive Visit" + }, + { + id: "EMER", + identifier: [{ + code: "EMER", + display: "emergency", + system: "http://terminology.hl7.org/CodeSystem/v3-ActCode" + }], + text: "Emergency Room (ER) Visit" + }, + { + id: "HH", + identifier: [{ + code: "HH", + display: "home health", + system: "http://terminology.hl7.org/CodeSystem/v3-ActCode" + }], + text: "Home Health" + }, + { + id: "IMP", + identifier: [{ + code: "IMP", + display: "inpatient encounter", + system: "http://terminology.hl7.org/CodeSystem/v3-ActCode" + }], + text: "Hospital Admission involving overnight stay, room, board, and ongoing nursing care." + }, + { + id: "SS", + identifier: [{ + code: "SS", + display: "short stay", + system: "http://terminology.hl7.org/CodeSystem/v3-ActCode" + }], + text: "Brief Hospital Admission for a predetermined period, typically less than 24 hours." + }, + { + id: "VR", + identifier: [{ + code: "VR", + display: "virtual", + system: "http://terminology.hl7.org/CodeSystem/v3-ActCode" + }], + text: "Virtual/Telemedicine Appointment" + } + ] + let result = searchTerm.length == 0 ? searchOptions : searchOptions.filter((v) => v['text'].toLowerCase().indexOf(searchTerm.toLowerCase()) > -1).slice(0, 10) + return of(result) + } + + //https://hl7.org/fhir/r4/codesystem-service-type.html + searchEncounterServiceType(searchTerm: string): Observable { + + //https://tx.fhir.org/r4/ValueSet/$expand?_format=json&filter=Referral&url=http://hl7.org/fhir/ValueSet/service-type&incomplete-ok=true + let queryParams = { + '_format': 'json', + 'filter':searchTerm, + 'url': 'http://hl7.org/fhir/ValueSet/service-type', + 'incomplete-ok': 'true' + } + + + // `https://ontology.nhs.uk/production1/fhir/` + // return this._httpClient.get(`https://tx.fhir.org/r4/ValueSet/$expand`, {params: queryParams}) + return this._httpClient.get(`https://ontology.nhs.uk/production1/fhir/ValueSet/$expand`, {params: queryParams}) + .pipe( + map((response) => { + + return (response.expansion.contains || []).map((valueSetItem):NlmSearchResults => { + return { + id: valueSetItem.code, + identifier: [valueSetItem], + text: valueSetItem.display, + } + }) + }) + ) + } + } diff --git a/frontend/src/assets/scss/custom/_modal.scss b/frontend/src/assets/scss/custom/_modal.scss index c8ea6e59..34c7fa32 100755 --- a/frontend/src/assets/scss/custom/_modal.scss +++ b/frontend/src/assets/scss/custom/_modal.scss @@ -6,7 +6,7 @@ position: fixed; top: 0; left: 0; - z-index: 1055; + z-index: 1050; display: none; width: 100%; height: 100%; diff --git a/frontend/src/assets/scss/custom/_nav.scss b/frontend/src/assets/scss/custom/_nav.scss index ea93fcd2..fdf5ef1c 100755 --- a/frontend/src/assets/scss/custom/_nav.scss +++ b/frontend/src/assets/scss/custom/_nav.scss @@ -1,269 +1,269 @@ /* ###### 4.8 Nav ###### */ - -.az-nav { - @include media-breakpoint-up(md) { align-items: center; } - - .nav-link { - display: block; - color: $gray-700; - padding: 0; - position: relative; - line-height: normal; - - @include hover-focus() { - color: $gray-900; - } - - + .nav-link { - padding-top: 12px; - margin-top: 12px; - border-top: 1px dotted $gray-500; - - @include media-breakpoint-up(md) { - padding-top: 0; - margin-top: 0; - border-top: 0; - padding-left: 15px; - margin-left: 15px; - border-left: 1px dotted $gray-500; - } - } - - &.active { color: $az-color-primary; } +@media (min-width: 768px) { + .az-nav { + align-items: center; } } +.az-nav .nav-link { + display: block; + color: #596882; + padding: 0; + position: relative; + line-height: normal; +} +.az-nav .nav-link:hover-focus() { + color: #1c273c; +} +.az-nav .nav-link + .nav-link { + padding-top: 12px; + margin-top: 12px; + border-top: 1px dotted #97a3b9; +} +@media (min-width: 768px) { + .az-nav .nav-link + .nav-link { + padding-top: 0; + margin-top: 0; + border-top: 0; + padding-left: 15px; + margin-left: 15px; + border-left: 1px dotted #97a3b9; + } +} +.az-nav .nav-link.active { + color: #5b47fb; +} .az-nav-column { flex-direction: column; - - .nav-link { - padding: 0; - height: $az-height-base; - color: $gray-900; - display: flex; - align-items: center; - justify-content: flex-start; - - i { - font-size: 24px; - line-height: 0; - width: 24px; - margin-right: 12px; - text-align: center; - @include transition($transition-base); - - &:not([class*=' tx-']) { color: $gray-600; } - - &.typcn { line-height: .9; } - } - - span { - font-weight: 400; - font-size: 11px; - color: $gray-500; - margin-left: auto; - } - - &:hover, - &:focus { - color: $gray-900; - i:not([class*=' tx-']) { color: $gray-900; } - } - - &.active { - position: relative; - - &::before { - content: ''; - position: absolute; - top: 6px; - bottom: 6px; - left: -28px; - width: 3px; - background-color: $indigo; - @include border-radius(); - display: none; - } - - &, - &:hover, - &:focus { - color: $indigo; - i { color: $indigo; } - } - } - - + .nav-link { border-top: 1px dotted $gray-400; } - } - - &.sm { - .nav-link { - font-size: $font-size-base; - font-weight: 400; - padding: 10px 0; - - i { font-size: 21px; } - } +} +.az-nav-column .nav-link { + padding: 0; + height: 38px; + color: #1c273c; + display: flex; + align-items: center; + justify-content: flex-start; +} +.az-nav-column .nav-link i { + font-size: 24px; + line-height: 0; + width: 24px; + margin-right: 12px; + text-align: center; + transition: all 0.2s ease-in-out; +} +@media (prefers-reduced-motion: reduce) { + .az-nav-column .nav-link i { + transition: none; } } - -.az-nav-dark { - .nav-link { - color: rgba(#fff, .7); - @include hover-focus() { color: #fff; } - - + .nav-link { border-color: $gray-700; } - &.active { color: $az-color-primary; } - } +.az-nav-column .nav-link i:not([class*=" tx-"]) { + color: #7987a1; +} +.az-nav-column .nav-link i.typcn { + line-height: 0.9; +} +.az-nav-column .nav-link span { + font-weight: 400; + font-size: 11px; + color: #97a3b9; + margin-left: auto; +} +.az-nav-column .nav-link:hover, .az-nav-column .nav-link:focus { + color: #1c273c; +} +.az-nav-column .nav-link:hover i:not([class*=" tx-"]), .az-nav-column .nav-link:focus i:not([class*=" tx-"]) { + color: #1c273c; +} +.az-nav-column .nav-link.active { + position: relative; +} +.az-nav-column .nav-link.active::before { + content: ""; + position: absolute; + top: 6px; + bottom: 6px; + left: -28px; + width: 3px; + background-color: #5b47fb; + border-radius: 3px; + display: none; +} +.az-nav-column .nav-link.active, .az-nav-column .nav-link.active:hover, .az-nav-column .nav-link.active:focus { + color: #5b47fb; +} +.az-nav-column .nav-link.active i, .az-nav-column .nav-link.active:hover i, .az-nav-column .nav-link.active:focus i { + color: #5b47fb; +} +.az-nav-column .nav-link + .nav-link { + border-top: 1px dotted #b4bdce; +} +.az-nav-column.sm .nav-link { + font-size: 0.875rem; + font-weight: 400; + padding: 10px 0; +} +.az-nav-column.sm .nav-link i { + font-size: 21px; } -.az-nav-colored-bg { - .nav-link { - + .nav-link { border-color: rgba(#fff, .4); } - &.active { color: #fff; } - } +.az-nav-dark .nav-link { + color: rgba(255, 255, 255, 0.7); +} +.az-nav-dark .nav-link:hover-focus() { + color: #fff; +} +.az-nav-dark .nav-link + .nav-link { + border-color: #596882; +} +.az-nav-dark .nav-link.active { + color: #5b47fb; +} + +.az-nav-colored-bg .nav-link + .nav-link { + border-color: rgba(255, 255, 255, 0.4); +} +.az-nav-colored-bg .nav-link.active { + color: #fff; } .az-nav-line { position: relative; - - .nav-link { - padding: 0; - color: $gray-700; - position: relative; - - @include hover-focus() { color: $gray-900; } - - + .nav-link { - margin-top: 15px; - - @include media-breakpoint-up(md) { - margin-top: 0; - margin-left: 30px; - } - } - - &.active { - color: $gray-900; - - &::before { - content: ''; - position: absolute; - top: 0; - bottom: 0; - left: -20px; - width: 2px; - background-color: $gray-900; - - @include media-breakpoint-up(md) { - top: auto; - bottom: -20px; - left: 0; - right: 0; - height: 2px; - width: auto; - } - } - } +} +.az-nav-line .nav-link { + padding: 0; + color: #596882; + position: relative; +} +.az-nav-line .nav-link:hover-focus() { + color: #1c273c; +} +.az-nav-line .nav-link + .nav-link { + margin-top: 15px; +} +@media (min-width: 768px) { + .az-nav-line .nav-link + .nav-link { + margin-top: 0; + margin-left: 30px; } - - &.az-nav-dark { - .nav-link { - color: rgba(#fff, .7); - @include hover-focus() { color: #fff; } - - &.active { - color: #fff; - &::before { background-color: #fff; } - } - } +} +.az-nav-line .nav-link.active { + color: #1c273c; +} +.az-nav-line .nav-link.active::before { + content: ""; + position: absolute; + top: 0; + bottom: 0; + left: -20px; + width: 2px; + background-color: #1c273c; +} +@media (min-width: 768px) { + .az-nav-line .nav-link.active::before { + top: auto; + bottom: -20px; + left: 0; + right: 0; + height: 2px; + width: auto; } } +.az-nav-line.az-nav-dark .nav-link { + color: rgba(255, 255, 255, 0.7); +} +.az-nav-line.az-nav-dark .nav-link:hover-focus() { + color: #fff; +} +.az-nav-line.az-nav-dark .nav-link.active { + color: #fff; +} +.az-nav-line.az-nav-dark .nav-link.active::before { + background-color: #fff; +} .az-nav-tabs { padding: 15px 15px 0; - background-color: $gray-300; - - .lSSlideOuter { - position: relative; - padding-left: 32px; - padding-right: 35px; - } - - .lSSlideWrapper { overflow: visible; } - - .lSAction { - > a { - display: block; - height: 40px; - top: 16px; - opacity: 1; - background-color: $gray-400; - background-image: none; - - @include hover-focus() { background-color: darken($gray-400, 5%); } - - &::before { - font-family: 'Ionicons'; - font-size: 18px; - position: absolute; - top: -4px; - left: 0; - right: 0; - bottom: 0; - display: flex; - align-items: center; - justify-content: center; - } - - &.lSPrev { - left: -32px; - &::before { content: '\f3cf'; } - } - - &.lSNext { - right: -35px; - &::before { content: '\f3d1'; } - } - - &.disabled { - background-color: $gray-200; - color: #fff; - } - } - } - - .lightSlider { display: flex; } - - .tab-item { - flex-shrink: 0; - display: block; - float: none; - min-width: 150px; - } - - .tab-link { - display: flex; - align-items: center; - justify-content: center; - padding: 10px 20px; - line-height: 1.428; - color: $gray-700; - white-space: nowrap; - background-color: $gray-200; - - @include hover-focus() { background-color: $gray-100; } - - &.active { - background-color: #fff; - color: $gray-900; - font-weight: 500; - } - } + background-color: #cdd4e0; +} +.az-nav-tabs .lSSlideOuter { + position: relative; + padding-left: 32px; + padding-right: 35px; +} +.az-nav-tabs .lSSlideWrapper { + overflow: visible; +} +.az-nav-tabs .lSAction > a { + display: block; + height: 40px; + top: 16px; + opacity: 1; + background-color: #b4bdce; + background-image: none; +} +.az-nav-tabs .lSAction > a:hover-focus() { + background-color: #a5afc4; +} +.az-nav-tabs .lSAction > a::before { + font-family: "Ionicons"; + font-size: 18px; + position: absolute; + top: -4px; + left: 0; + right: 0; + bottom: 0; + display: flex; + align-items: center; + justify-content: center; +} +.az-nav-tabs .lSAction > a.lSPrev { + left: -32px; +} +.az-nav-tabs .lSAction > a.lSPrev::before { + content: "\f3cf"; +} +.az-nav-tabs .lSAction > a.lSNext { + right: -35px; +} +.az-nav-tabs .lSAction > a.lSNext::before { + content: "\f3d1"; +} +.az-nav-tabs .lSAction > a.disabled { + background-color: #e3e7ed; + color: #fff; +} +.az-nav-tabs .lightSlider { + display: flex; +} +.az-nav-tabs .tab-item { + flex-shrink: 0; + display: block; + float: none; + min-width: 150px; +} +.az-nav-tabs .tab-link { + display: flex; + align-items: center; + justify-content: center; + padding: 10px 20px; + line-height: 1.428; + color: #596882; + white-space: nowrap; + background-color: #e3e7ed; +} +.az-nav-tabs .tab-link:hover-focus() { + background-color: #f4f5f8; +} +.az-nav-tabs .tab-link.active { + background-color: #fff; + color: #1c273c; + font-weight: 500; } .az-tab-pane { display: none; - - &.active { display: block; } +} +.az-tab-pane.active { + display: block; } diff --git a/frontend/src/assets/sources/fasten.png b/frontend/src/assets/sources/fasten.png new file mode 100644 index 0000000000000000000000000000000000000000..e0b23668997676e8ca78bd0a94e184a359634504 GIT binary patch literal 7083 zcmeHM`8!nY|JNc#XnES~OVTG>;h9L5B1UEBnPhvC(qKq341-EBDa%+ww#wK;GRR(0 zNT{(4r;w0!EMuKHbI$o5J)eK!^UL>o&UKyZyx*_;^?tqX`@Zh`p8LAyp{2Qru%MVA zA0MBvDb~oEk8d-u@owLOB3j3{ZbCns{H#sRZW?G)4nvb2H?j79e0)NCH{MNrPty;g zbgJb=+j9tlEU}UCpGbc<+|~rwmP4gEP<{rKodRVgK&dgjCl7hl`@F|tyobSH_-*ix z4=>mgBwh#oTtR{p=z#;TS#z(La~(`TPkV4?5*h4=yV~HlZ{XMYP!fd~82|>lgAjyF zj3J$^aK%d~J&qTCo9A%}oSjBGTHq2I6myq1_5*3IgK4QyL;!f*mdoWLOa}Zol()2q zkiB?QzmWGe@aK!aRabXzw-VX=j!T9^U zP#<1l7F1sW-LT`fyoH_4b6>uIcswK_g154a+;#4aC75O-T{CKVd~hE$b6S1q}@Y0%s(GWr9VokEN4nKBm9jCH&nu3KEX|Oa7`IhSq#0(g_`T( zU!%yv98z8gB}MY;=+N70xbPX27|CmW2fJBwKQ+UQ&v5Evo{uwl_ZE-6fUK`0KZg*{ z%V6~@=n54-ud9`>lC>@}xo-Lg74RnkS-mXWvL?;G+kp%mc!nUVoK*K+E4V>lEk&rWZ~i{2rwrmUMcG zM{Kk7(B1Jre*~v$Z5rV%q4Xuy+PS{P(ZRL;rL1jpf8LmX2ktCL4YA4EwY_Q>7Ld@o zog5w^EbZt?p<8VdkiIoZX)=!S`0gi~Z7nS}**jwLSW4q4uG_J~ifAI`zkDL2!`2Kq zT6{HDJcztx=kspwp2UuRxHjGLr3b@!Dm{?lZKhjxgpfGUmX|K}pP7!pl4$FL0l<`@ z*u+x-9D#N+^u3gCIZAljta0kd2hlV-wSVkC?#F755Dxn<^kh*sf}XXP<^ER^FxJ|6 zh6Dc52avdr7G118$sKm$J1*+@)SU8SL^L)`xI9D4M_BJ4sjhBE1J956VDP>faMQmn z#~H1bFsuEn=H<)_Pdl_FJ<}~Lwg^L>yl^fJ<&1_ z#@5Rcj!F!ui018PM7;ejK0c^v1W@L4No+4Md4kbN{dalg0nH8=3gPE*lBVn%5BbWp z@s6#s1fx|AlKK^_xNnARBfqB%!`Rj&cU{cw2*dcI&}zKE-YEL+?z1GdcUbY=D)AG0 zV(7cORH{Dt?Jxl-?g1nf?FH|{FH#j^6+}w_$~E5KBxO<@#{@Q;6 z+nV97nSJ=|XNU4WiQ@&)Ab9MdW+dI}OFi4@sUdLmy7!^sl7Yu`tIyUXSu;7pA2#<~ zirYR`d0DoGunnGmuoHifI4dHo8;21bFpMbjtmlsT({I6D}r^LI3(lV2q@>`Xfcje7ef*@?3cWCTKD4bgZ-P`c0(G zENg=?&OSXIH1@T{``B$F!#L#XxPMQX>(r|5ifs))`*F{VHm9ZaOr$q;u$5$aPpMV@3?gAn%4fX+qv3$*Z*-1*+@r#L zYNM?5Q&WDgbAmbQwyd@RKVWR=nkPkC6$!^}z?!B~#>JJ`Q>a|~PSSz2&q*;T%D@es zE3W)YXETbya8X(CmpB&s(-_C2`F6uT=FiRI&QWBd$G3D zqLpXHoO(Qb@FwW+76VHlhu`4I*4q5upNM)l2G#qukqq^0II=729$jW>{pNt}DEtDJ z17lE5-v;N`jo&I*aL;do6u$I#(NF5C>wkfnIk855yu1)zK!$Zpj>SiFI!BYdLocGx zx5N?mQHgwv5;=y50bpkYY{J$?VRiWMxZS_W9(U=Y38D)z#5;t+itB^(bEzvJZU}1n z@^wBsFyK9CBkHua$`w5w`$Y_^b4QQGd6WnHjzqRUDJ=;L_$su`Wo>4(E3JMcvuZ6t zI!_^v$ae*(S_UUAq+Nzmmkf$rbb{We`_|Z0Y-NbZmE*+NQuml7&P&+Gq`xzE3#(FNEH}2AlRs`GV7W*@g>#{jDs!lbN?zw#;>bOjl=j z{lUf$NTpXfUCFmsk2C7cIZ+kpOJ4_rOe^exoJJ3qz*rp9L04;e!Bs$2jS=$_3kbzb zzA+4a%kqyV=lq$KO1B5Dg`Q=9jx1r$WU78^oU%#ArR6vQMa1DpddbqoCtb*=%BsVY z58zGuYyrPheV;`8TI-U3ofNmyMm?^P&$7pKl0RAOqXnNI-mH*hjutl*t*)2%l>R;O z1+o~6$FFJ=Q0|VFWKVbh;Af?)Jd)@hjc5APCw@?gbty7*%2&y4z^l! zCw2zN-%oNzm0lFBf@OMz$6mR5Jg(d$&uZP=t;e?Gmp;ok*QU~^I?~9?CF@W?bgxMa@ zZ@A2S&WAUtGz4&A@?jU%_eH;{__&sCf9% zg}|=z8*`y=6*^t9I7%xv?M#(pix_LF@*B>{QP=X5HqQM&0 zDiA&f5hPHFEPeS#ulfKF;_?HBY%`B?x>E_D5h@p!sQzZ4l#z?hWf~(>E-da=;CHp| z>u9P0D#z;^o4%Z$VB+_pf~k>JtL>q>{!h5q;xQK-5ce^Mrg2d#sdngWM=V{wXfFEp z)2|~q4{ySgN_dB98Yj)AkVM5q9c0(I6lqg2g7%@WTwZeGFj3mWYJFs^IKK+J=+6TT z<1-lw&^|qevDE~3{HXx?^L;B+G=*-}UyxIGKn9=v288YjqnC?kkE;gp<@A*-S-gdN z%-RKvZCXx;ox_-5qnjZW<9f-VA=Wzq^J4u=>3{((TB~I35oRY|KBgUdA#4ax+zMSP z&S1r<S0-WhZx41<27Chn4beb4tQUsMF$$I zEGVH@EMuc+>?`xIsrU)#quQV`ww4aFr&A);PE9wgxIi~~2lh*s zjnvx2RF^b2R@N8|d&w|Vv&Kamm!}l`f+6?X@o&Q&>8~efJ&GNcnJ#ZqHPpWwM0V`_ z?3)?%u}`{c7C*nld_I%86Ja`V7*pXk(xhO8`efVrJ}u?z(Zu`eVXU>7_95-p52;6x z;1aQZrp!7N=E18$Dz%`1cO2lVg~idy=r(balzziwb?4@yU~g^{bP}F5zl7 zx1V3VcM0cqqu@j#wCMEygnq5+lvk{vNjF;FeycZ=X`wT5FL~Zv%PEhjwTThq#${Zs zxa$47J7N^Oid&sKlMPj#cjF5$;IAb%}A!E1D{C zM6SNPiAtaOn`kF%vucKK>%q%1tT7yGyuqipo{@C@b54oPeiPsUs{{dk9kOybUwY&_ zukP>Nj8_aj8~?+#GFPLG*2T5BY$Qa>SS}n)8vAuVLE7}h4CRk(OesIZJg65o(s9u3 zUOj(&=9OkSrU=CXdo$_gI+sJ3LF58|ouUR0a>*W9*5;Zurg>jlX~RO++Lzm-n7i~e zCR9OuwT-7Qv~J8GEy=NRos!mV_Kj{MS&**-cl}TxBUiGhjJdWbMGBdwE}@gNxBjg9 zIUPI7Xq~%MT+q+c=x{V~EGFIX0f|YP47V0d7r>u%{}RZuyeq=a2%7I%`gH~{t6t9o zQqMX~@(wYbz3VTXq75c8zMD-o%a-^hvm%Rw4S^1=b2?U18cqVG3>*PlyTd(sN^;^_ zW&+|qjrWsb9r^rKB(aPBNY@1S-2hADM~^!v@Hp! zp^nEv}eyWEA=ax*n-g=j2d?~t92iIsU6w)29n`%#7n zu279Rd*gN2{#@zwpf3hA$yqwtE zMFc0!5Fx%HQnd6I`i*eEn^U65x89GNv^8ARy>^fxVna>lcbt>AqXqz`I-iw*L$0Ym z${u|v$lGZMTsd~Do2DRDi(PG6=EM=>yjj~9zmL3n97Wc7jXDRm|7xs|Z}ux~Qja;W z>z1+~`)#z)DXGhBS$p`(A)g#6^__SDl8esS(*mcIN9%hGBV<`JOivTagtSQerKdry z$7zyAI%kZQB%k;?Ov^UK5h-VY9j*YbF*>G4110Zj@l>SXEg(#2YS2fN{4 optgroup > .divider { z-index: 1000; } +// text overflow add ellipsis +.text-overflow-ellipsis { + white-space: nowrap; + overflow: hidden; + text-overflow: ellipsis; +} + // Form Validation .form-control.ng-invalid.ng-touched { @@ -245,3 +252,51 @@ app-medical-sources-filter > .az-content-left-components:hover{ -o-transition: width 0.2s ease-in-out; transition: width 0.2s ease-in-out; } + +//Fhir Datadable +.datatable-body .datatable-body-row.active { + background-color: $indigo !important; + color: #fff; +} + +// Callouts + + +.bd-callout { + padding: 1.25rem; + margin-top: 1.25rem; + margin-bottom: 1.25rem; + border: 1px solid #eee; + border-left-width: .25rem; + border-radius: .25rem; +} + +.bd-callout h4 { + margin-top: 0; + margin-bottom: .25rem; +} + +.bd-callout p:last-child { + margin-bottom: 0; +} + +.bd-callout code { + border-radius: .25rem; +} + +.bd-callout + .bd-callout { + margin-top: -.25rem; +} + +// Variations +@mixin bs-callout-variant($color) { + border-left-color: $color; + border-left-width: .25rem; + h4 { color: $color; } +} + +.fhir-card-callout-success .card, .bd-callout-success { @include bs-callout-variant($green); } +.fhir-card-callout-info .card, .bd-callout-info { @include bs-callout-variant($cyan); } +.fhir-card-callout-warning .card, .bd-callout-warning { @include bs-callout-variant($yellow); } +.fhir-card-callout-danger .card, .bd-callout-danger { @include bs-callout-variant($red); } + diff --git a/frontend/src/lib/fixtures/r4/resources/binary/exampleMarkdown.json b/frontend/src/lib/fixtures/r4/resources/binary/exampleMarkdown.json new file mode 100644 index 00000000..33ad1a42 --- /dev/null +++ b/frontend/src/lib/fixtures/r4/resources/binary/exampleMarkdown.json @@ -0,0 +1,9 @@ +{ + "resourceType": "Binary", + "id": "example", + "contentType": "text/markdown", + "securityContext": { + "reference": "DocumentReference/example" + }, + "data": "LS0tCl9fQWR2ZXJ0aXNlbWVudCA6KV9fCgotIF9fW3BpY2FdKGh0dHBzOi8vbm9kZWNhLmdpdGh1Yi5pby9waWNhL2RlbW8vKV9fIC0gaGlnaCBxdWFsaXR5IGFuZCBmYXN0IGltYWdlCiAgcmVzaXplIGluIGJyb3dzZXIuCi0gX19bYmFiZWxmaXNoXShodHRwczovL2dpdGh1Yi5jb20vbm9kZWNhL2JhYmVsZmlzaC8pX18gLSBkZXZlbG9wZXIgZnJpZW5kbHkKICBpMThuIHdpdGggcGx1cmFscyBzdXBwb3J0IGFuZCBlYXN5IHN5bnRheC4KCllvdSB3aWxsIGxpa2UgdGhvc2UgcHJvamVjdHMhCgotLS0KCiMgaDEgSGVhZGluZyA4LSkKIyMgaDIgSGVhZGluZwojIyMgaDMgSGVhZGluZwojIyMjIGg0IEhlYWRpbmcKIyMjIyMgaDUgSGVhZGluZwojIyMjIyMgaDYgSGVhZGluZwoKCiMjIEhvcml6b250YWwgUnVsZXMKCl9fXwoKLS0tCgoqKioKCgojIyBUeXBvZ3JhcGhpYyByZXBsYWNlbWVudHMKCkVuYWJsZSB0eXBvZ3JhcGhlciBvcHRpb24gdG8gc2VlIHJlc3VsdC4KCihjKSAoQykgKHIpIChSKSAodG0pIChUTSkgKHApIChQKSArLQoKdGVzdC4uIHRlc3QuLi4gdGVzdC4uLi4uIHRlc3Q/Li4uLi4gdGVzdCEuLi4uCgohISEhISEgPz8/PyAsLCAgLS0gLS0tCgoiU21hcnR5cGFudHMsIGRvdWJsZSBxdW90ZXMiIGFuZCAnc2luZ2xlIHF1b3RlcycKCgojIyBFbXBoYXNpcwoKKipUaGlzIGlzIGJvbGQgdGV4dCoqCgpfX1RoaXMgaXMgYm9sZCB0ZXh0X18KCipUaGlzIGlzIGl0YWxpYyB0ZXh0KgoKX1RoaXMgaXMgaXRhbGljIHRleHRfCgp+flN0cmlrZXRocm91Z2h+fgoKCiMjIEJsb2NrcXVvdGVzCgoKPiBCbG9ja3F1b3RlcyBjYW4gYWxzbyBiZSBuZXN0ZWQuLi4KPj4gLi4uYnkgdXNpbmcgYWRkaXRpb25hbCBncmVhdGVyLXRoYW4gc2lnbnMgcmlnaHQgbmV4dCB0byBlYWNoIG90aGVyLi4uCj4gPiA+IC4uLm9yIHdpdGggc3BhY2VzIGJldHdlZW4gYXJyb3dzLgoKCiMjIExpc3RzCgpVbm9yZGVyZWQKCisgQ3JlYXRlIGEgbGlzdCBieSBzdGFydGluZyBhIGxpbmUgd2l0aCBgK2AsIGAtYCwgb3IgYCpgCisgU3ViLWxpc3RzIGFyZSBtYWRlIGJ5IGluZGVudGluZyAyIHNwYWNlczoKICAtIE1hcmtlciBjaGFyYWN0ZXIgY2hhbmdlIGZvcmNlcyBuZXcgbGlzdCBzdGFydDoKICAgICogQWMgdHJpc3RpcXVlIGxpYmVybyB2b2x1dHBhdCBhdAogICAgKyBGYWNpbGlzaXMgaW4gcHJldGl1bSBuaXNsIGFsaXF1ZXQKICAgIC0gTnVsbGEgdm9sdXRwYXQgYWxpcXVhbSB2ZWxpdAorIFZlcnkgZWFzeSEKCk9yZGVyZWQKCjEuIExvcmVtIGlwc3VtIGRvbG9yIHNpdCBhbWV0CjIuIENvbnNlY3RldHVyIGFkaXBpc2NpbmcgZWxpdAozLiBJbnRlZ2VyIG1vbGVzdGllIGxvcmVtIGF0IG1hc3NhCgoKMS4gWW91IGNhbiB1c2Ugc2VxdWVudGlhbCBudW1iZXJzLi4uCjEuIC4uLm9yIGtlZXAgYWxsIHRoZSBudW1iZXJzIGFzIGAxLmAKClN0YXJ0IG51bWJlcmluZyB3aXRoIG9mZnNldDoKCjU3LiBmb28KMS4gYmFyCgoKIyMgQ29kZQoKSW5saW5lIGBjb2RlYAoKSW5kZW50ZWQgY29kZQoKICAgIC8vIFNvbWUgY29tbWVudHMKICAgIGxpbmUgMSBvZiBjb2RlCiAgICBsaW5lIDIgb2YgY29kZQogICAgbGluZSAzIG9mIGNvZGUKCgpCbG9jayBjb2RlICJmZW5jZXMiCgo=" +} diff --git a/frontend/src/lib/fixtures/r4/resources/binary/exampleRtf.json b/frontend/src/lib/fixtures/r4/resources/binary/exampleRtf.json new file mode 100644 index 00000000..bfef2408 --- /dev/null +++ b/frontend/src/lib/fixtures/r4/resources/binary/exampleRtf.json @@ -0,0 +1,9 @@ +{ + "resourceType": "Binary", + "id": "example", + "contentType": "application/pdf", + "securityContext": { + "reference": "DocumentReference/example" + }, + "data": "{\rtf1\ansi\deff3\adeflang1025
{\fonttbl{\f0\froman\fprq2\fcharset0 Times New Roman;}{\f1\froman\fprq2\fcharset2 Symbol;}{\f2\fswiss\fprq2\fcharset0 Arial;}{\f3\froman\fprq2\fcharset0 Liberation Serif{\*\falt Times New Roman};}{\f4\froman\fprq2\fcharset0 Liberation Sans{\*\falt Arial};}{\f5\froman\fprq2\fcharset0 Symbol;}{\f6\froman\fprq2\fcharset0 OpenSymbol{\*\falt Arial Unicode MS};}{\f7\froman\fprq2\fcharset0 DejaVu Sans;}{\f8\froman\fprq2\fcharset0 Open Sans{\*\falt Arial};}{\f9\fnil\fprq2\fcharset0 Droid Sans Fallback;}{\f10\fnil\fprq2\fcharset0 OpenSymbol{\*\falt Arial Unicode MS};}{\f11\fnil\fprq2\fcharset0 DejaVu Sans;}{\f12\fnil\fprq2\fcharset0 Open Sans{\*\falt Arial};}{\f13\fnil\fprq2\fcharset0 FreeSans;}{\f14\fnil\fprq2\fcharset0 Symbol;}}
{\colortbl;\red0\green0\blue0;\red0\green0\blue255;\red0\green255\blue255;\red0\green255\blue0;\red255\green0\blue255;\red255\green0\blue0;\red255\green255\blue0;\red255\green255\blue255;\red0\green0\blue128;\red0\green128\blue128;\red0\green128\blue0;\red128\green0\blue128;\red128\green0\blue0;\red128\green128\blue0;\red128\green128\blue128;\red192\green192\blue192;\red0\green0\blue10;\red0\green0\blue1;}
{\stylesheet{\s0\snext0\ql\nowidctlpar\hyphpar0\ltrpar\cf17\dbch\af9\langfe2052\dbch\af13\afs24\alang1081\kerning0\loch\f3\fs24\lang1033 Normal;}
{\s1\sbasedon50\snext1\ql\nowidctlpar\hyphpar0\sb240\sa120\keepn\ltrpar\cf17\b\dbch\af9\langfe2052\dbch\af13\afs36\alang1081\ab\loch\f4\fs36\lang1033 Heading 1;}
{\s2\sbasedon50\snext2\ql\nowidctlpar\hyphpar0\sb200\sa120\keepn\ltrpar\cf17\b\dbch\af9\langfe2052\dbch\af13\afs32\alang1081\ab\loch\f4\fs32\lang1033 Heading 2;}
{\s3\sbasedon50\snext3\ql\nowidctlpar\hyphpar0\sb140\sa120\keepn\ltrpar\cf15\b\dbch\af9\langfe2052\dbch\af13\afs28\alang1081\ab\loch\f4\fs28\lang1033 Heading 3;}
{\*\cs15\snext15 WW8Num1z0;}
{\*\cs16\snext16 WW8Num1z1;}
{\*\cs17\snext17 WW8Num1z2;}
{\*\cs18\snext18 WW8Num1z3;}
{\*\cs19\snext19 WW8Num1z4;}
{\*\cs20\snext20 WW8Num1z5;}
{\*\cs21\snext21 WW8Num1z6;}
{\*\cs22\snext22 WW8Num1z7;}
{\*\cs23\snext23 WW8Num1z8;}
{\*\cs24\snext24 WW8Num2z0;}
{\*\cs25\snext25 WW8Num2z1;}
{\*\cs26\snext26 WW8Num2z2;}
{\*\cs27\snext27 WW8Num2z3;}
{\*\cs28\snext28 WW8Num2z4;}
{\*\cs29\snext29 WW8Num2z5;}
{\*\cs30\snext30 WW8Num2z6;}
{\*\cs31\snext31 WW8Num2z7;}
{\*\cs32\snext32 WW8Num2z8;}
{\*\cs33\snext33\dbch\af10\loch\f5 WW8Num3z0;}
{\*\cs34\snext34\dbch\af10\loch\f6 WW8Num3z1;}
{\*\cs35\snext35\dbch\af10\dbch\af10\loch\f6 Bullets;}
{\*\cs36\snext36\cf9\ul\ulc0\langfe255\alang255\lang255 Internet Link;}
{\*\cs37\snext37\cf13\ul\ulc0\langfe255\alang255\lang255 Visited Internet Link;}
{\*\cs38\snext38\dbch\af14 ListLabel 1;}
{\*\cs39\snext39\dbch\af10 ListLabel 2;}
{\*\cs40\snext40\b0\dbch\af14\loch\f7\fs21 ListLabel 3;}
{\*\cs41\snext41\dbch\af10 ListLabel 4;}
{\*\cs42\snext42\dbch\af10 ListLabel 5;}
{\*\cs43\snext43\dbch\af14 ListLabel 6;}
{\*\cs44\snext44\dbch\af10 ListLabel 7;}
{\*\cs45\snext45\dbch\af10 ListLabel 8;}
{\*\cs46\snext46\dbch\af14 ListLabel 9;}
{\*\cs47\snext47\dbch\af10 ListLabel 10;}
{\*\cs48\snext48\dbch\af10 ListLabel 11;}
{\*\cs49\snext49\scaps0\caps0\cf1\expnd0\expndtw0\i0\b0\dbch\af11\loch\f7\fs21 ListLabel 12;}
{\s50\sbasedon0\snext51\ql\nowidctlpar\hyphpar0\sb240\sa120\keepn\ltrpar\cf17\dbch\af9\langfe2052\dbch\af13\afs28\alang1081\loch\f4\fs28\lang1033 Heading;}
{\s51\sbasedon0\snext51\sl288\slmult1\ql\nowidctlpar\hyphpar0\sb0\sa140\ltrpar\cf17\dbch\af9\langfe2052\dbch\af13\afs24\alang1081\loch\f3\fs24\lang1033 Text Body;}
{\s52\sbasedon51\snext52\sl288\slmult1\ql\nowidctlpar\hyphpar0\sb0\sa140\ltrpar\cf17\dbch\af9\langfe2052\dbch\af13\afs24\alang1081\loch\f3\fs24\lang1033 List;}
{\s53\sbasedon0\snext53\ql\nowidctlpar\hyphpar0\sb120\sa120\noline\ltrpar\cf17\i\dbch\af9\langfe2052\dbch\af13\afs24\alang1081\ai\loch\f3\fs24\lang1033 Caption;}
{\s54\sbasedon0\snext54\ql\nowidctlpar\hyphpar0\noline\ltrpar\cf17\dbch\af9\langfe2052\dbch\af13\afs24\alang1081\loch\f3\fs24\lang1033 Index;}
{\s55\sbasedon0\snext55\ql\nowidctlpar\hyphpar0\li567\ri567\lin567\rin567\fi0\sb0\sa283\ltrpar\cf17\dbch\af9\langfe2052\dbch\af13\afs24\alang1081\loch\f3\fs24\lang1033 Quotations;}
{\s56\sbasedon50\snext56\qc\nowidctlpar\hyphpar0\sb240\sa120\keepn\ltrpar\cf17\b\dbch\af9\langfe2052\dbch\af13\afs56\alang1081\ab\loch\f4\fs56\lang1033 Title;}
{\s57\sbasedon50\snext57\qc\nowidctlpar\hyphpar0\sb60\sa120\keepn\ltrpar\cf17\dbch\af9\langfe2052\dbch\af13\afs36\alang1081\loch\f4\fs36\lang1033 Subtitle;}
{\s58\sbasedon0\snext58\ql\nowidctlpar\hyphpar0\noline\ltrpar\cf17\dbch\af9\langfe2052\dbch\af13\afs24\alang1081\loch\f3\fs24\lang1033 Table Contents;}
{\s59\sbasedon58\snext59\qc\nowidctlpar\hyphpar0\noline\ltrpar\cf17\b\dbch\af9\langfe2052\dbch\af13\afs24\alang1081\ab\loch\f3\fs24\lang1033 Table Heading;}
}{\*\listtable{\list\listtemplateid1
{\listlevel\levelnfc255\leveljc0\levelstartat1\levelfollow2{\leveltext \'00;}{\levelnumbers;}\fi-432\li792}
{\listlevel\levelnfc255\leveljc0\levelstartat1\levelfollow2{\leveltext \'00;}{\levelnumbers;}\fi-576\li936}
{\listlevel\levelnfc255\leveljc0\levelstartat1\levelfollow2{\leveltext \'00;}{\levelnumbers;}\fi-720\li1080}
{\listlevel\levelnfc255\leveljc0\levelstartat1\levelfollow2{\leveltext \'00;}{\levelnumbers;}\fi-864\li1224}
{\listlevel\levelnfc255\leveljc0\levelstartat1\levelfollow2{\leveltext \'00;}{\levelnumbers;}\fi-1008\li1368}
{\listlevel\levelnfc255\leveljc0\levelstartat1\levelfollow2{\leveltext \'00;}{\levelnumbers;}\fi-1152\li1512}
{\listlevel\levelnfc255\leveljc0\levelstartat1\levelfollow2{\leveltext \'00;}{\levelnumbers;}\fi-1296\li1656}
{\listlevel\levelnfc255\leveljc0\levelstartat1\levelfollow2{\leveltext \'00;}{\levelnumbers;}\fi-1440\li1800}
{\listlevel\levelnfc255\leveljc0\levelstartat1\levelfollow2{\leveltext \'00;}{\levelnumbers;}\fi-1584\li1944}\listid1}
{\list\listtemplateid2
{\listlevel\levelnfc23\leveljc0\levelstartat1\levelfollow0{\leveltext \'01\u61623 ?;}{\levelnumbers;}\f15\b0\dbch\af14\fi-360\li720}
{\listlevel\levelnfc23\leveljc0\levelstartat1\levelfollow0{\leveltext \'01\u9702 ?;}{\levelnumbers;}\f16\dbch\af10\fi-360\li1080}
{\listlevel\levelnfc23\leveljc0\levelstartat1\levelfollow0{\leveltext \'01\u9642 ?;}{\levelnumbers;}\f16\dbch\af10\fi-360\li1440}
{\listlevel\levelnfc23\leveljc0\levelstartat1\levelfollow0{\leveltext \'01\u61623 ?;}{\levelnumbers;}\f15\dbch\af14\fi-360\li1800}
{\listlevel\levelnfc23\leveljc0\levelstartat1\levelfollow0{\leveltext \'01\u9702 ?;}{\levelnumbers;}\f16\dbch\af10\fi-360\li2160}
{\listlevel\levelnfc23\leveljc0\levelstartat1\levelfollow0{\leveltext \'01\u9642 ?;}{\levelnumbers;}\f16\dbch\af10\fi-360\li2520}
{\listlevel\levelnfc23\leveljc0\levelstartat1\levelfollow0{\leveltext \'01\u61623 ?;}{\levelnumbers;}\f15\dbch\af14\fi-360\li2880}
{\listlevel\levelnfc23\leveljc0\levelstartat1\levelfollow0{\leveltext \'01\u9702 ?;}{\levelnumbers;}\f16\dbch\af10\fi-360\li3240}
{\listlevel\levelnfc23\leveljc0\levelstartat1\levelfollow0{\leveltext \'01\u9642 ?;}{\levelnumbers;}\f16\dbch\af10\fi-360\li3600}\listid2}
{\list\listtemplateid3
{\listlevel\levelnfc255\leveljc0\levelstartat1\levelfollow2{\leveltext \'00;}{\levelnumbers;}\fi0\li0}
{\listlevel\levelnfc255\leveljc0\levelstartat1\levelfollow2{\leveltext \'00;}{\levelnumbers;}\fi0\li0}
{\listlevel\levelnfc255\leveljc0\levelstartat1\levelfollow2{\leveltext \'00;}{\levelnumbers;}\fi0\li0}
{\listlevel\levelnfc255\leveljc0\levelstartat1\levelfollow2{\leveltext \'00;}{\levelnumbers;}\fi0\li0}
{\listlevel\levelnfc255\leveljc0\levelstartat1\levelfollow2{\leveltext \'00;}{\levelnumbers;}\fi0\li0}
{\listlevel\levelnfc255\leveljc0\levelstartat1\levelfollow2{\leveltext \'00;}{\levelnumbers;}\fi0\li0}
{\listlevel\levelnfc255\leveljc0\levelstartat1\levelfollow2{\leveltext \'00;}{\levelnumbers;}\fi0\li0}
{\listlevel\levelnfc255\leveljc0\levelstartat1\levelfollow2{\leveltext \'00;}{\levelnumbers;}\fi0\li0}
{\listlevel\levelnfc255\leveljc0\levelstartat1\levelfollow2{\leveltext \'00;}{\levelnumbers;}\fi0\li0}\listid3}
}{\listoverridetable{\listoverride\listid1\listoverridecount0\ls1}{\listoverride\listid2\listoverridecount0\ls2}{\listoverride\listid3\listoverridecount0\ls3}}{\*\generator LibreOffice/6.0.7.3$Linux_X86_64 LibreOffice_project/00m0$Build-3}{\info{\creatim\yr2017\mo8\dy2\hr11\min9}{\revtim\yr2019\mo9\dy21\hr14\min2}{\printim\yr0\mo0\dy0\hr0\min0}}{\*\userprops}\deftab709
\hyphauto0\viewscale100
{\*\pgdsctbl
{\pgdsc0\pgdscuse451\pgwsxn11906\pghsxn16838\marglsxn1134\margrsxn1134\margtsxn1134\margbsxn1134\pgdscnxt0 Default Style;}}
\formshade{\*\pgdscno0}\paperh16838\paperw11906\margl1134\margr1134\margt1134\margb1134\sectd\sbknone\sectunlocked1\pgndec\pgwsxn11906\pghsxn16838\marglsxn1134\margrsxn1134\margtsxn1134\margbsxn1134\ftnbj\ftnstart1\ftnrstcont\ftnnar\aenddoc\aftnrstcont\aftnstart1\aftnnrlc\htmautsp
{\*\ftnsep\chftnsep}\viewbksp1{\*\background{\shp{\*\shpinst{\sp{\sn shapeType}{\sv 1}}{\sp{\sn fillColor}{\sv 16777215}}}}}\pgndec\pard\plain \s56\qc\nowidctlpar\hyphpar0\sb240\sa120\keepn\ltrpar\cf17\b\dbch\af9\langfe2052\dbch\af13\afs56\alang1081\ab\loch\f4\fs56\lang1033\qc\sb240\sa120{\cbpat8\cbpat8\fs21\rtlch \ltrch\loch
Lorem ipsum }
\par \pard\plain \s51\sl288\slmult1\ql\nowidctlpar\hyphpar0\sb0\sa140\ltrpar\cf17\dbch\af9\langfe2052\dbch\af13\afs24\alang1081\loch\f3\fs24\lang1033\qj\widctlpar\sb0\sa225\scaps0\caps0\cf1\expnd0\expndtw0\i0\b0\dbch\af11\rtlch \ltrch\loch\fs21\loch\f7\hich\af7

\par \pard\plain \s1\ql\nowidctlpar\hyphpar0\sb240\sa120\keepn\ltrpar\cf17\b\dbch\af9\langfe2052\dbch\af13\afs36\alang1081\ab\loch\f4\fs36\lang1033{\listtext\pard\plain }\ilvl0\ls1 \li792\ri0\lin792\rin0\fi-432\li0\ri0\lin0\rin0\fi-432\sb240\sa120\keepn{\rtlch \ltrch\loch
Lorem ipsum dolor sit amet, consectetur adipiscing elit. Nunc ac faucibus odio. }
\par \pard\plain \s51\sl288\slmult1\ql\nowidctlpar\hyphpar0\sb0\sa140\ltrpar\cf17\dbch\af9\langfe2052\dbch\af13\afs24\alang1081\loch\f3\fs24\lang1033\qj\widctlpar\sb0\sa225\scaps0\caps0\cf1\expnd0\expndtw0\i0\b0\dbch\af11\rtlch \ltrch\loch\fs21\loch\f7\hich\af7

\par \pard\plain \s51\sl288\slmult1\ql\nowidctlpar\hyphpar0\sb0\sa140\ltrpar\cf17\dbch\af9\langfe2052\dbch\af13\afs24\alang1081\loch\f3\fs24\lang1033\qj\widctlpar\sb0\sa225{\scaps0\caps0\cf1\expnd0\expndtw0\i0\b0\dbch\af11\rtlch \ltrch\loch\fs21\loch\f7\hich\af7
Vestibulum neque massa, scelerisque sit amet ligula eu, congue molestie mi. Praesent ut varius sem. Nullam at porttitor arcu, nec lacinia nisi. Ut ac dolor vitae odio interdum condimentum. }{\scaps0\caps0\cf1\expnd0\expndtw0\i0\b\dbch\af11\ab\rtlch \ltrch\loch\fs21\loch\f7\hich\af7
Vivamus dapibus sodales ex, vitae malesuada ipsum cursus convallis. Maecenas sed egestas nulla, ac condimentum orci. }{\scaps0\caps0\cf1\expnd0\expndtw0\i0\b0\dbch\af11\rtlch \ltrch\loch\fs21\loch\f7\hich\af7
Mauris diam felis, vulputate ac suscipit et, iaculis non est. Curabitur semper arcu ac ligula semper, nec luctus nisl blandit. Integer lacinia ante ac libero lobortis imperdiet. }{\scaps0\caps0\cf1\expnd0\expndtw0\i\b0\dbch\af11\ai\rtlch \ltrch\loch\fs21\loch\f7\hich\af7
Nullam mollis convallis ipsum, ac accumsan nunc vehicula vitae. }{\scaps0\caps0\cf1\expnd0\expndtw0\i0\b0\dbch\af11\rtlch \ltrch\loch\fs21\loch\f7\hich\af7
Nulla eget justo in felis tristique fringilla. Morbi sit amet tortor quis risus auctor condimentum. Morbi in ullamcorper elit. Nulla iaculis tellus sit amet mauris tempus fringilla.}
\par \pard\plain \s51\sl288\slmult1\ql\nowidctlpar\hyphpar0\sb0\sa140\ltrpar\cf17\dbch\af9\langfe2052\dbch\af13\afs24\alang1081\loch\f3\fs24\lang1033\qj\widctlpar\sb0\sa225{\scaps0\caps0\cf1\expnd0\expndtw0\i0\b0\dbch\af11\rtlch \ltrch\loch\fs21\loch\f7\hich\af7
Maecenas mauris lectus, lobortis et purus mattis, blandit dictum tellus.}
\par \pard\plain \s51\sl288\slmult1\ql\nowidctlpar\hyphpar0\sb0\sa140\ltrpar\cf17\dbch\af9\langfe2052\dbch\af13\afs24\alang1081\loch\f3\fs24\lang1033{\listtext\pard\plain \b0\dbch\af14\loch\f7\fs21 \u61623\'3f\tab}\ilvl0\ls2 \li720\ri0\lin720\rin0\fi-360\qj\widctlpar\sb0\sa225{\scaps0\caps0\cf1\expnd0\expndtw0\i0\b\dbch\af11\ab\rtlch \ltrch\loch\fs21\loch\f7\hich\af7
Maecenas non lorem quis tellus placerat varius. }
\par \pard\plain \s51\sl288\slmult1\ql\nowidctlpar\hyphpar0\sb0\sa140\ltrpar\cf17\dbch\af9\langfe2052\dbch\af13\afs24\alang1081\loch\f3\fs24\lang1033{\listtext\pard\plain \b0\dbch\af14\loch\f7\fs21 \u61623\'3f\tab}\ilvl0\ls2 \li720\ri0\lin720\rin0\fi-360\qj\widctlpar\sb0\sa225{\scaps0\caps0\cf1\expnd0\expndtw0\i\b0\dbch\af11\ai\rtlch \ltrch\loch\fs21\loch\f7\hich\af7
Nulla facilisi. }
\par \pard\plain \s51\sl288\slmult1\ql\nowidctlpar\hyphpar0\sb0\sa140\ltrpar\cf17\dbch\af9\langfe2052\dbch\af13\afs24\alang1081\loch\f3\fs24\lang1033{\listtext\pard\plain \b0\dbch\af14\loch\f7\fs21 \u61623\'3f\tab}\ilvl0\ls2 \li720\ri0\lin720\rin0\fi-360\qj\widctlpar\sb0\sa225{\scaps0\caps0\cf1\expnd0\expndtw0\i0\ul\ulc0\b0\dbch\af11\rtlch \ltrch\loch\fs21\loch\f7\hich\af7
Aenean congue fringilla justo ut aliquam. }
\par \pard\plain \s51\sl288\slmult1\ql\nowidctlpar\hyphpar0\sb0\sa140\ltrpar\cf17\dbch\af9\langfe2052\dbch\af13\afs24\alang1081\loch\f3\fs24\lang1033{\listtext\pard\plain \b0\dbch\af14\loch\f7\fs21 \u61623\'3f\tab}\ilvl0\ls2 \li720\ri0\lin720\rin0\fi-360\qj\widctlpar\sb0\sa225{{\field{\*\fldinst HYPERLINK "https://products.office.com/en-us/word" }{\fldrslt {\cs36\cf9\ul\ulc0\langfe255\alang255\lang255\scaps0\caps0\cf1\expnd0\expndtw0\i0\b0\dbch\af11\rtlch \ltrch\loch\fs21\loch\f7\hich\af7
Mauris id ex erat. }{}}}\scaps0\caps0\cf1\expnd0\expndtw0\i0\b0\dbch\af11\rtlch \ltrch\loch\fs21\loch\f7\hich\af7
Nunc vulputate neque vitae justo facilisis, non condimentum ante sagittis. }
\par \pard\plain \s51\sl288\slmult1\ql\nowidctlpar\hyphpar0\sb0\sa140\ltrpar\cf17\dbch\af9\langfe2052\dbch\af13\afs24\alang1081\loch\f3\fs24\lang1033{\listtext\pard\plain \b0\dbch\af14\loch\f7\fs21 \u61623\'3f\tab}\ilvl0\ls2 \li720\ri0\lin720\rin0\fi-360\qj\widctlpar\sb0\sa225{\scaps0\caps0\cf1\expnd0\expndtw0\i0\b0\dbch\af11\rtlch \ltrch\loch\fs21\loch\f7\hich\af7
Morbi viverra semper lorem nec molestie. }
\par \pard\plain \s51\sl288\slmult1\ql\nowidctlpar\hyphpar0\sb0\sa140\ltrpar\cf17\dbch\af9\langfe2052\dbch\af13\afs24\alang1081\loch\f3\fs24\lang1033{\listtext\pard\plain \b0\dbch\af14\loch\f7\fs21 \u61623\'3f\tab}\ilvl0\ls2 \li720\ri0\lin720\rin0\fi-360\qj\widctlpar\sb0\sa225{\scaps0\caps0\cf1\expnd0\expndtw0\i0\b0\dbch\af11\rtlch \ltrch\loch\fs21\loch\f7\hich\af7
Maecenas tincidunt est efficitur ligula euismod, sit amet ornare est vulputate.}
\par \pard\plain \s51\sl288\slmult1\ql\nowidctlpar\hyphpar0\sb0\sa140\ltrpar\cf17\dbch\af9\langfe2052\dbch\af13\afs24\alang1081\loch\f3\fs24\lang1033\qj\widctlpar\sb0\sa225\rtlch \ltrch\loch

\par \pard\plain \s51\sl288\slmult1\ql\nowidctlpar\hyphpar0\sb0\sa140\ltrpar\cf17\dbch\af9\langfe2052\dbch\af13\afs24\alang1081\loch\f3\fs24\lang1033\qj\widctlpar\sb0\sa225\scaps0\caps0\cf1\expnd0\expndtw0\i0\b0\dbch\af11\rtlch \ltrch\loch\fs21\loch\f7\hich\af7

\par \pard\plain \s51\sl288\slmult1\ql\nowidctlpar\hyphpar0\sb0\sa140\ltrpar\cf17\dbch\af9\langfe2052\dbch\af13\afs24\alang1081\loch\f3\fs24\lang1033\qj\widctlpar\sb0\sa225\scaps0\caps0\cf1\expnd0\expndtw0\i0\b0\dbch\af11\rtlch \ltrch\loch\fs21\loch\f7\hich\af7

\par \pard\plain \s51\sl288\slmult1\ql\nowidctlpar\hyphpar0\sb0\sa140\ltrpar\cf17\dbch\af9\langfe2052\dbch\af13\afs24\alang1081\loch\f3\fs24\lang1033\qj\widctlpar\sb0\sa225{\scaps0\caps0\cf1\expnd0\expndtw0\i0\b0\dbch\af11\rtlch \ltrch\loch\fs21\loch\f7\hich\af7
In non mauris justo. Duis vehicula mi vel mi pretium, a viverra erat efficitur. Cras aliquam est ac eros varius, id iaculis dui auctor. Duis pretium neque ligula, et pulvinar mi placerat et. Nulla nec nunc sit amet nunc posuere vestibulum. Ut id neque eget tortor mattis tristique. Donec ante est, blandit sit amet tristique vel, lacinia pulvinar arcu. Pellentesque scelerisque fermentum erat, id posuere justo pulvinar ut. Cras id eros sed enim aliquam lobortis. Sed lobortis nisl ut eros efficitur tincidunt. Cras justo mi, porttitor quis mattis vel, ultricies ut purus. Ut facilisis et lacus eu cursus.}
\par \pard\plain \s51\sl288\slmult1\ql\nowidctlpar\hyphpar0\sb0\sa140\ltrpar\cf17\dbch\af9\langfe2052\dbch\af13\afs24\alang1081\loch\f3\fs24\lang1033\qj\widctlpar\sb0\sa225{\scaps0\caps0\cf1\expnd0\expndtw0\i0\b0\dbch\af11\rtlch \ltrch\loch\fs21\loch\f7\hich\af7
In eleifend velit vitae libero sollicitudin euismod. Fusce vitae vestibulum velit. Pellentesque vulputate lectus quis pellentesque commodo. Aliquam erat volutpat. Vestibulum in egestas velit. Pellentesque fermentum nisl vitae fringilla venenatis. Etiam id mauris vitae orci maximus ultricies. }
\par \pard\plain \s51\sl288\slmult1\ql\nowidctlpar\hyphpar0\sb0\sa140\ltrpar\cf17\dbch\af9\langfe2052\dbch\af13\afs24\alang1081\loch\f3\fs24\lang1033\qj\widctlpar\sb0\sa225\scaps0\caps0\cf1\expnd0\expndtw0\i0\b0\dbch\af11\rtlch \ltrch\loch\fs21\loch\f7\hich\af7

\par \pard\plain \s1\ql\nowidctlpar\hyphpar0\sb240\sa120\keepn\ltrpar\cf17\b\dbch\af9\langfe2052\dbch\af13\afs36\alang1081\ab\loch\f4\fs36\lang1033{\listtext\pard\plain }\ilvl0\ls1 \li792\ri0\lin792\rin0\fi-432\li0\ri0\lin0\rin0\fi-432\sb240\sa120\keepn{\rtlch \ltrch\loch
Cras fringilla ipsum magna, in fringilla dui commodo a.}
\par \pard\plain \s51\sl288\slmult1\ql\nowidctlpar\hyphpar0\sb0\sa140\ltrpar\cf17\dbch\af9\langfe2052\dbch\af13\afs24\alang1081\loch\f3\fs24\lang1033\qj\widctlpar\sb0\sa225\scaps0\caps0\cf1\expnd0\expndtw0\i0\b0\dbch\af11\rtlch \ltrch\loch\fs21\loch\f7\hich\af7

\par \trowd\trql\trleft53\ltrrow\trrh450\trpaddft3\trpaddt0\trpaddfl3\trpaddl0\trpaddfb3\trpaddb0\trpaddfr3\trpaddr0\clbrdrt\brdrs\brdrw5\brdrcf18\clpadfl3\clpadl55\clbrdrl\brdrs\brdrw5\brdrcf18\clpadft3\clpadt51\clbrdrb\brdrs\brdrw5\brdrcf18\clpadfb3\clpadb55\clpadfr3\clpadr55\clcbpat8\cellx770\clbrdrt\brdrs\brdrw5\brdrcf18\clpadfl3\clpadl55\clbrdrl\brdrs\brdrw5\brdrcf18\clpadft3\clpadt51\clbrdrb\brdrs\brdrw5\brdrcf18\clpadfb3\clpadb55\clpadfr3\clpadr55\clcbpat8\cellx6434\clbrdrt\brdrs\brdrw5\brdrcf18\clpadfl3\clpadl55\clbrdrl\brdrs\brdrw5\brdrcf18\clpadft3\clpadt51\clbrdrb\brdrs\brdrw5\brdrcf18\clpadfb3\clpadb55\clpadfr3\clpadr55\clcbpat8\cellx7992\clbrdrt\brdrs\brdrw5\brdrcf18\clpadfl3\clpadl55\clbrdrl\brdrs\brdrw5\brdrcf18\clpadft3\clpadt51\clbrdrb\brdrs\brdrw5\brdrcf18\clpadfb3\clpadb55\clbrdrr\brdrs\brdrw5\brdrcf18\clpadfr3\clpadr55\clcbpat8\cellx9690\pard\plain \s51\sl288\slmult1\ql\nowidctlpar\hyphpar0\sb0\sa140\ltrpar\cf17\dbch\af9\langfe2052\dbch\af13\afs24\alang1081\loch\f3\fs24\lang1033\intbl\ql\widctlpar\sb0\sa225\scaps0\caps0\cf1\expnd0\expndtw0\i0\b0\dbch\af11\rtlch \ltrch\loch\fs21\loch\f7\hich\af7
\cell\pard\plain \s51\sl288\slmult1\ql\nowidctlpar\hyphpar0\sb0\sa140\ltrpar\cf17\dbch\af9\langfe2052\dbch\af13\afs24\alang1081\loch\f3\fs24\lang1033\intbl\ql\widctlpar\sb0\sa225{\scaps0\caps0\cf1\expnd0\expndtw0\i0\b0\dbch\af11\rtlch \ltrch\loch\fs21\loch\f7\hich\af7
Lorem ipsum}\cell\pard\plain \s58\ql\nowidctlpar\hyphpar0\noline\ltrpar\cf17\dbch\af9\langfe2052\dbch\af13\afs24\alang1081\loch\f3\fs24\lang1033\intbl\ql{\dbch\af11\rtlch \ltrch\loch\fs21\loch\f7\hich\af7
Lorem ipsum}\cell\pard\plain \s58\ql\nowidctlpar\hyphpar0\noline\ltrpar\cf17\dbch\af9\langfe2052\dbch\af13\afs24\alang1081\loch\f3\fs24\lang1033\intbl\ql{\dbch\af11\rtlch \ltrch\loch\fs21\loch\f7\hich\af7
Lorem ipsum}\cell\row\pard\trowd\trql\trleft53\ltrrow\trpaddft3\trpaddt0\trpaddfl3\trpaddl0\trpaddfb3\trpaddb0\trpaddfr3\trpaddr0\clpadfl3\clpadl55\clbrdrl\brdrs\brdrw5\brdrcf18\clpadft3\clpadt51\clbrdrb\brdrs\brdrw5\brdrcf18\clpadfb3\clpadb55\clpadfr3\clpadr55\clcbpat8\cellx770\clpadfl3\clpadl55\clbrdrl\brdrs\brdrw5\brdrcf18\clpadft3\clpadt51\clbrdrb\brdrs\brdrw5\brdrcf18\clpadfb3\clpadb55\clpadfr3\clpadr55\clcbpat8\cellx6434\clpadfl3\clpadl55\clbrdrl\brdrs\brdrw5\brdrcf18\clpadft3\clpadt51\clbrdrb\brdrs\brdrw5\brdrcf18\clpadfb3\clpadb55\clpadfr3\clpadr55\clcbpat8\cellx7992\clpadfl3\clpadl55\clbrdrl\brdrs\brdrw5\brdrcf18\clpadft3\clpadt51\clbrdrb\brdrs\brdrw5\brdrcf18\clpadfb3\clpadb55\clbrdrr\brdrs\brdrw5\brdrcf18\clpadfr3\clpadr55\clcbpat8\cellx9690\pard\plain \s58\ql\nowidctlpar\hyphpar0\noline\ltrpar\cf17\dbch\af9\langfe2052\dbch\af13\afs24\alang1081\loch\f3\fs24\lang1033\intbl\ql{\dbch\af11\rtlch \ltrch\loch\fs21\loch\f7\hich\af7
1}\cell\pard\plain \s51\sl288\slmult1\ql\nowidctlpar\hyphpar0\sb0\sa140\ltrpar\cf17\dbch\af9\langfe2052\dbch\af13\afs24\alang1081\loch\f3\fs24\lang1033\intbl\ql\widctlpar\sb0\sa225{\scaps0\caps0\cf1\expnd0\expndtw0\i0\b0\dbch\af11\rtlch \ltrch\loch\fs21\loch\f7\hich\af7
In eleifend velit vitae libero sollicitudin euismod.}\cell\pard\plain \s58\ql\nowidctlpar\hyphpar0\noline\ltrpar\cf17\dbch\af9\langfe2052\dbch\af13\afs24\alang1081\loch\f3\fs24\lang1033\intbl\ql{\dbch\af11\rtlch \ltrch\loch\fs21\loch\f7\hich\af7
Lorem}\cell\pard\plain \s58\ql\nowidctlpar\hyphpar0\noline\ltrpar\cf17\dbch\af9\langfe2052\dbch\af13\afs24\alang1081\loch\f3\fs24\lang1033\intbl\ql\dbch\af11\rtlch \ltrch\loch\fs21\loch\f7\hich\af7
\cell\row\pard\trowd\trql\trleft53\ltrrow\trpaddft3\trpaddt0\trpaddfl3\trpaddl0\trpaddfb3\trpaddb0\trpaddfr3\trpaddr0\clpadfl3\clpadl55\clbrdrl\brdrs\brdrw5\brdrcf18\clpadft3\clpadt51\clbrdrb\brdrs\brdrw5\brdrcf18\clpadfb3\clpadb55\clpadfr3\clpadr55\clcbpat8\cellx770\clpadfl3\clpadl55\clbrdrl\brdrs\brdrw5\brdrcf18\clpadft3\clpadt51\clbrdrb\brdrs\brdrw5\brdrcf18\clpadfb3\clpadb55\clpadfr3\clpadr55\clcbpat8\cellx6434\clpadfl3\clpadl55\clbrdrl\brdrs\brdrw5\brdrcf18\clpadft3\clpadt51\clbrdrb\brdrs\brdrw5\brdrcf18\clpadfb3\clpadb55\clpadfr3\clpadr55\clcbpat8\cellx7992\clpadfl3\clpadl55\clbrdrl\brdrs\brdrw5\brdrcf18\clpadft3\clpadt51\clbrdrb\brdrs\brdrw5\brdrcf18\clpadfb3\clpadb55\clbrdrr\brdrs\brdrw5\brdrcf18\clpadfr3\clpadr55\clcbpat8\cellx9690\pard\plain \s58\ql\nowidctlpar\hyphpar0\noline\ltrpar\cf17\dbch\af9\langfe2052\dbch\af13\afs24\alang1081\loch\f3\fs24\lang1033\intbl\ql{\dbch\af11\rtlch \ltrch\loch\fs21\loch\f7\hich\af7
2}\cell\pard\plain \s51\sl288\slmult1\ql\nowidctlpar\hyphpar0\sb0\sa140\ltrpar\cf17\dbch\af9\langfe2052\dbch\af13\afs24\alang1081\loch\f3\fs24\lang1033\intbl\ql\widctlpar\sb0\sa225{\scaps0\caps0\cf1\expnd0\expndtw0\i0\b0\dbch\af11\rtlch \ltrch\loch\fs21\loch\f7\hich\af7
Cras fringilla ipsum magna, in fringilla dui commodo a.}\cell\pard\plain \s58\ql\nowidctlpar\hyphpar0\noline\ltrpar\cf17\dbch\af9\langfe2052\dbch\af13\afs24\alang1081\loch\f3\fs24\lang1033\intbl\ql{\dbch\af11\rtlch \ltrch\loch\fs21\loch\f7\hich\af7
Ipsum}\cell\pard\plain \s58\ql\nowidctlpar\hyphpar0\noline\ltrpar\cf17\dbch\af9\langfe2052\dbch\af13\afs24\alang1081\loch\f3\fs24\lang1033\intbl\ql\dbch\af11\rtlch \ltrch\loch\fs21\loch\f7\hich\af7
\cell\row\pard\trowd\trql\trleft53\ltrrow\trpaddft3\trpaddt0\trpaddfl3\trpaddl0\trpaddfb3\trpaddb0\trpaddfr3\trpaddr0\clpadfl3\clpadl55\clbrdrl\brdrs\brdrw5\brdrcf18\clpadft3\clpadt51\clbrdrb\brdrs\brdrw5\brdrcf18\clpadfb3\clpadb55\clpadfr3\clpadr55\clcbpat8\cellx770\clpadfl3\clpadl55\clbrdrl\brdrs\brdrw5\brdrcf18\clpadft3\clpadt51\clbrdrb\brdrs\brdrw5\brdrcf18\clpadfb3\clpadb55\clpadfr3\clpadr55\clcbpat8\cellx6434\clpadfl3\clpadl55\clbrdrl\brdrs\brdrw5\brdrcf18\clpadft3\clpadt51\clbrdrb\brdrs\brdrw5\brdrcf18\clpadfb3\clpadb55\clpadfr3\clpadr55\clcbpat8\cellx7992\clpadfl3\clpadl55\clbrdrl\brdrs\brdrw5\brdrcf18\clpadft3\clpadt51\clbrdrb\brdrs\brdrw5\brdrcf18\clpadfb3\clpadb55\clbrdrr\brdrs\brdrw5\brdrcf18\clpadfr3\clpadr55\clcbpat8\cellx9690\pard\plain \s58\ql\nowidctlpar\hyphpar0\noline\ltrpar\cf17\dbch\af9\langfe2052\dbch\af13\afs24\alang1081\loch\f3\fs24\lang1033\intbl\ql{\dbch\af11\rtlch \ltrch\loch\fs21\loch\f7\hich\af7
3}\cell\pard\plain \s51\sl288\slmult1\ql\nowidctlpar\hyphpar0\sb0\sa140\ltrpar\cf17\dbch\af9\langfe2052\dbch\af13\afs24\alang1081\loch\f3\fs24\lang1033\intbl\ql\widctlpar\sb0\sa225{\scaps0\caps0\cf1\expnd0\expndtw0\i0\b0\dbch\af11\ab\rtlch \ltrch\loch\fs21\loch\f7\hich\af7
Fusce vitae vestibulum velit. }\cell\pard\plain \s58\ql\nowidctlpar\hyphpar0\noline\ltrpar\cf17\dbch\af9\langfe2052\dbch\af13\afs24\alang1081\loch\f3\fs24\lang1033\intbl\ql{\dbch\af11\rtlch \ltrch\loch\fs21\loch\f7\hich\af7
Lorem}\cell\pard\plain \s58\ql\nowidctlpar\hyphpar0\noline\ltrpar\cf17\dbch\af9\langfe2052\dbch\af13\afs24\alang1081\loch\f3\fs24\lang1033\intbl\ql\dbch\af11\rtlch \ltrch\loch\fs21\loch\f7\hich\af7
\cell\row\pard\trowd\trql\trleft53\ltrrow\trpaddft3\trpaddt0\trpaddfl3\trpaddl0\trpaddfb3\trpaddb0\trpaddfr3\trpaddr0\clpadfl3\clpadl55\clbrdrl\brdrs\brdrw5\brdrcf18\clpadft3\clpadt51\clbrdrb\brdrs\brdrw5\brdrcf18\clpadfb3\clpadb55\clpadfr3\clpadr55\clcbpat8\cellx770\clpadfl3\clpadl55\clbrdrl\brdrs\brdrw5\brdrcf18\clpadft3\clpadt51\clbrdrb\brdrs\brdrw5\brdrcf18\clpadfb3\clpadb55\clpadfr3\clpadr55\clcbpat8\cellx6434\clpadfl3\clpadl55\clbrdrl\brdrs\brdrw5\brdrcf18\clpadft3\clpadt51\clbrdrb\brdrs\brdrw5\brdrcf18\clpadfb3\clpadb55\clpadfr3\clpadr55\clcbpat8\cellx7992\clpadfl3\clpadl55\clbrdrl\brdrs\brdrw5\brdrcf18\clpadft3\clpadt51\clbrdrb\brdrs\brdrw5\brdrcf18\clpadfb3\clpadb55\clbrdrr\brdrs\brdrw5\brdrcf18\clpadfr3\clpadr55\clcbpat8\cellx9690\pard\plain \s58\ql\nowidctlpar\hyphpar0\noline\ltrpar\cf17\dbch\af9\langfe2052\dbch\af13\afs24\alang1081\loch\f3\fs24\lang1033\intbl\ql{\dbch\af11\rtlch \ltrch\loch\fs21\loch\f7\hich\af7
4}\cell\pard\plain \s51\sl288\slmult1\ql\nowidctlpar\hyphpar0\sb0\sa140\ltrpar\cf17\dbch\af9\langfe2052\dbch\af13\afs24\alang1081\loch\f3\fs24\lang1033\intbl\ql\widctlpar\sb0\sa225{\scaps0\caps0\cf1\expnd0\expndtw0\i0\b0\dbch\af11\rtlch \ltrch\loch\fs21\loch\f7\hich\af7
Etiam vehicula luctus fermentum.}\cell\pard\plain \s58\ql\nowidctlpar\hyphpar0\noline\ltrpar\cf17\dbch\af9\langfe2052\dbch\af13\afs24\alang1081\loch\f3\fs24\lang1033\intbl\ql{\dbch\af11\rtlch \ltrch\loch\fs21\loch\f7\hich\af7
Ipsum}\cell\pard\plain \s58\ql\nowidctlpar\hyphpar0\noline\ltrpar\cf17\dbch\af9\langfe2052\dbch\af13\afs24\alang1081\loch\f3\fs24\lang1033\intbl\ql\dbch\af11\rtlch \ltrch\loch\fs21\loch\f7\hich\af7
\cell\row\pard\pard\plain \s51\sl288\slmult1\ql\nowidctlpar\hyphpar0\sb0\sa140\ltrpar\cf17\dbch\af9\langfe2052\dbch\af13\afs24\alang1081\loch\f3\fs24\lang1033\qj\widctlpar\sb0\sa225\scaps0\caps0\cf1\expnd0\expndtw0\i0\b0\dbch\af11\rtlch \ltrch\loch\fs21\loch\f7\hich\af7

\par \pard\plain \s51\sl288\slmult1\ql\nowidctlpar\hyphpar0\sb0\sa140\ltrpar\cf17\dbch\af9\langfe2052\dbch\af13\afs24\alang1081\loch\f3\fs24\lang1033\qj\widctlpar\sb0\sa225{\scaps0\caps0\cf1\expnd0\expndtw0\i0\b0\dbch\af11\rtlch \ltrch\loch\fs21\loch\f7\hich\af7
Etiam vehicula luctus fermentum. In vel metus congue, pulvinar lectus vel, fermentum dui. Maecenas ante orci, egestas ut aliquet sit amet, sagittis a magna. Aliquam ante quam, pellentesque ut dignissim quis, laoreet eget est. Aliquam erat volutpat. Class aptent taciti sociosqu ad litora torquent per conubia nostra, per inceptos himenaeos. Ut ullamcorper justo sapien, in cursus libero viverra eget. Vivamus auctor imperdiet urna, at pulvinar leo posuere laoreet. Suspendisse neque nisl, fringilla at iaculis scelerisque, ornare vel dolor. Ut et pulvinar nunc. Pellentesque fringilla mollis efficitur. Nullam venenatis commodo imperdiet. Morbi velit neque, semper quis lorem quis, efficitur dignissim ipsum. Ut ac lorem sed turpis imperdiet eleifend sit amet id sapien.}
\par \pard\plain \s51\sl288\slmult1\ql\nowidctlpar\hyphpar0\sb0\sa140\ltrpar\cf17\dbch\af9\langfe2052\dbch\af13\afs24\alang1081\loch\f3\fs24\lang1033\qj\widctlpar\sb0\sa225{\scaps0\caps0\cf1\expnd0\expndtw0\i0\b0\dbch\af12\rtlch \ltrch\loch\fs21\loch\f8\hich\af8
Maecenas non lorem quis tellus placerat varius. Nulla facilisi. Aenean congue fringilla justo ut aliquam. Mauris id ex erat. Nunc vulputate neque vitae justo facilisis, non condimentum ante sagittis. Morbi viverra semper lorem nec molestie. Maecenas tincidunt est efficitur ligula euismod, sit amet ornare est vulputate.}
\par \shpwr2\shpwrk3\shpbypara\shpbyignore\shptop0\shpbxcolumn\shpbxignore\shpleft2819\pard\plain \s51\sl288\slmult1\ql\nowidctlpar\hyphpar0\sb0\sa140\ltrpar\cf17\dbch\af9\langfe2052\dbch\af13\afs24\alang1081\loch\f3\fs24\lang1033\qj\widctlpar\sb0\sa225\rtlch \ltrch\loch
{\*\flymaincnt5\flyanchor0\flycntnt}{\shp{\*\shpinst\shpwr2\shpwrk3\shpbypara\shpbyignore\shptop0\shpbottom2660\shpbxcolumn\shpbxignore\shpleft2819\shpright6819{\sp{\sn shapeType}{\sv 75}}{\sp{\sn wzDescription}{\sv }}{\sp{\sn wzName}{\sv }}{\sp{\sn pib}{\sv {\pict\picscalex100\picscaley100\piccropl0\piccropr0\piccropt0\piccropb0\picw200\pich133\picwgoal4000\pichgoal2660\jpegblip
ffd8ffe000104a46494600010101004800480000ffe20c584943435f50524f46494c4500010100000c484c696e6f021000006d6e74725247422058595a2007ce
00020009000600310000616373704d5346540000000049454320735247420000000000000000000000000000f6d6000100000000d32d48502020000000000000
00000000000000000000000000000000000000000000000000000000000000000000000000000000001163707274000001500000003364657363000001840000
006c77747074000001f000000014626b707400000204000000147258595a00000218000000146758595a0000022c000000146258595a0000024000000014646d
6e640000025400000070646d6464000002c400000088767565640000034c0000008676696577000003d4000000246c756d69000003f8000000146d6561730000
040c0000002474656368000004300000000c725452430000043c0000080c675452430000043c0000080c625452430000043c0000080c7465787400000000436f
70797269676874202863292031393938204865776c6574742d5061636b61726420436f6d70616e79000064657363000000000000001273524742204945433631
3936362d322e31000000000000000000000012735247422049454336313936362d322e3100000000000000000000000000000000000000000000000000000000
0000000000000000000000000000000000000000000058595a20000000000000f35100010000000116cc58595a20000000000000000000000000000000005859
5a200000000000006fa2000038f50000039058595a2000000000000062990000b785000018da58595a2000000000000024a000000f840000b6cf646573630000
00000000001649454320687474703a2f2f7777772e6965632e636800000000000000000000001649454320687474703a2f2f7777772e6965632e636800000000
00000000000000000000000000000000000000000000000000000000000000000000000000000000000064657363000000000000002e4945432036313936362d
322e312044656661756c742052474220636f6c6f7572207370616365202d207352474200000000000000000000002e4945432036313936362d322e3120446566
61756c742052474220636f6c6f7572207370616365202d20735247420000000000000000000000000000000000000000000064657363000000000000002c5265
666572656e63652056696577696e6720436f6e646974696f6e20696e2049454336313936362d322e3100000000000000000000002c5265666572656e63652056
696577696e6720436f6e646974696f6e20696e2049454336313936362d322e310000000000000000000000000000000000000000000000000000766965770000
00000013a4fe00145f2e0010cf140003edcc0004130b00035c9e0000000158595a2000000000004c09560050000000571fe76d65617300000000000000010000
00000000000000000000000000000000028f0000000273696720000000004352542063757276000000000000040000000005000a000f00140019001e00230028
002d00320037003b00400045004a004f00540059005e00630068006d00720077007c00810086008b00900095009a009f00a400a900ae00b200b700bc00c100c6
00cb00d000d500db00e000e500eb00f000f600fb01010107010d01130119011f0125012b01320138013e0145014c0152015901600167016e0175017c0183018b
0192019a01a101a901b101b901c101c901d101d901e101e901f201fa0203020c0214021d0226022f02380241024b0254025d02670271027a0284028e029802a2
02ac02b602c102cb02d502e002eb02f50300030b03160321032d03380343034f035a03660372037e038a039603a203ae03ba03c703d303e003ec03f904060413
0420042d043b0448045504630471047e048c049a04a804b604c404d304e104f004fe050d051c052b053a05490558056705770586059605a605b505c505d505e5
05f6060606160627063706480659066a067b068c069d06af06c006d106e306f507070719072b073d074f076107740786079907ac07bf07d207e507f8080b081f
08320846085a086e0882089608aa08be08d208e708fb09100925093a094f09640979098f09a409ba09cf09e509fb0a110a270a3d0a540a6a0a810a980aae0ac5
0adc0af30b0b0b220b390b510b690b800b980bb00bc80be10bf90c120c2a0c430c5c0c750c8e0ca70cc00cd90cf30d0d0d260d400d5a0d740d8e0da90dc30dde
0df80e130e2e0e490e640e7f0e9b0eb60ed20eee0f090f250f410f5e0f7a0f960fb30fcf0fec1009102610431061107e109b10b910d710f511131131114f116d
118c11aa11c911e81207122612451264128412a312c312e31303132313431363138313a413c513e5140614271449146a148b14ad14ce14f01512153415561578
159b15bd15e0160316261649166c168f16b216d616fa171d17411765178917ae17d217f7181b18401865188a18af18d518fa19201945196b199119b719dd1a04
1a2a1a511a771a9e1ac51aec1b141b3b1b631b8a1bb21bda1c021c2a1c521c7b1ca31ccc1cf51d1e1d471d701d991dc31dec1e161e401e6a1e941ebe1ee91f13
1f3e1f691f941fbf1fea20152041206c209820c420f0211c2148217521a121ce21fb22272255228222af22dd230a23382366239423c223f0241f244d247c24ab
24da250925382568259725c725f726272657268726b726e827182749277a27ab27dc280d283f287128a228d429062938296b299d29d02a022a352a682a9b2acf
2b022b362b692b9d2bd12c052c392c6e2ca22cd72d0c2d412d762dab2de12e162e4c2e822eb72eee2f242f5a2f912fc72ffe3035306c30a430db3112314a3182
31ba31f2322a3263329b32d4330d3346337f33b833f1342b3465349e34d83513354d358735c235fd3637367236ae36e937243760379c37d738143850388c38c8
39053942397f39bc39f93a363a743ab23aef3b2d3b6b3baa3be83c273c653ca43ce33d223d613da13de03e203e603ea03ee03f213f613fa23fe24023406440a6
40e74129416a41ac41ee4230427242b542f7433a437d43c044034447448a44ce45124555459a45de4622466746ab46f04735477b47c04805484b489148d7491d
496349a949f04a374a7d4ac44b0c4b534b9a4be24c2a4c724cba4d024d4a4d934ddc4e254e6e4eb74f004f494f934fdd5027507150bb51065150519b51e65231
527c52c75313535f53aa53f65442548f54db5528557555c2560f565c56a956f75744579257e0582f587d58cb591a596959b85a075a565aa65af55b455b955be5
5c355c865cd65d275d785dc95e1a5e6c5ebd5f0f5f615fb36005605760aa60fc614f61a261f56249629c62f06343639763eb6440649464e9653d659265e7663d
669266e8673d679367e9683f689668ec6943699a69f16a486a9f6af76b4f6ba76bff6c576caf6d086d606db96e126e6b6ec46f1e6f786fd1702b708670e0713a
719571f0724b72a67301735d73b87414747074cc7528758575e1763e769b76f8775677b37811786e78cc792a798979e77a467aa57b047b637bc27c217c817ce1
7d417da17e017e627ec27f237f847fe5804780a8810a816b81cd8230829282f4835783ba841d848084e3854785ab860e867286d7873b879f8804886988ce8933
899989fe8a648aca8b308b968bfc8c638cca8d318d988dff8e668ece8f368f9e9006906e90d6913f91a89211927a92e3934d93b69420948a94f4955f95c99634
969f970a977597e0984c98b89924999099fc9a689ad59b429baf9c1c9c899cf79d649dd29e409eae9f1d9f8b9ffaa069a0d8a147a1b6a226a296a306a376a3e6
a456a4c7a538a5a9a61aa68ba6fda76ea7e0a852a8c4a937a9a9aa1caa8fab02ab75abe9ac5cacd0ad44adb8ae2daea1af16af8bb000b075b0eab160b1d6b24b
b2c2b338b3aeb425b49cb513b58ab601b679b6f0b768b7e0b859b8d1b94ab9c2ba3bbab5bb2ebba7bc21bc9bbd15bd8fbe0abe84beffbf7abff5c070c0ecc167
c1e3c25fc2dbc358c3d4c451c4cec54bc5c8c646c6c3c741c7bfc83dc8bcc93ac9b9ca38cab7cb36cbb6cc35ccb5cd35cdb5ce36ceb6cf37cfb8d039d0bad13c
d1bed23fd2c1d344d3c6d449d4cbd54ed5d1d655d6d8d75cd7e0d864d8e8d96cd9f1da76dafbdb80dc05dc8add10dd96de1cdea2df29dfafe036e0bde144e1cc
e253e2dbe363e3ebe473e4fce584e60de696e71fe7a9e832e8bce946e9d0ea5beae5eb70ebfbec86ed11ed9cee28eeb4ef40efccf058f0e5f172f1fff28cf319
f3a7f434f4c2f550f5def66df6fbf78af819f8a8f938f9c7fa57fae7fb77fc07fc98fd29fdbafe4bfedcff6dffffffdb00430005040404040305040404060505
06080d0808070708100b0c090d131014131210121214171d1914161c1612121a231a1c1e1f212121141924272420261d202120ffdb0043010506060807080f08
080f201512152020202020202020202020202020202020202020202020202020202020202020202020202020202020202020202020202020ffc2001108008500
c803011100021101031101ffc4001c0000010501010100000000000000000000020001030405060708ffc4001a01000301010101000000000000000000000102
0300040506ffda000c03010002100310000001cef90fb09a72952d6a75cbea4d4e63c8fb5e46b47b7ac13eefbbc600d1ab0076056ce0100416acafcf72f764c5
b2c88cb7775e3dda7264f5754ed3360db03601aa1102d6c81bcfca398411c56ce32d9d4101c847bb834e8bbcea88916beadd3e3db6907534b4989384bd3c6b57
b1dcfd09846af1ab3660044e582d96ce0b8c977982f6f3d37b5257036b9fabd4fd0f0a4558fa5e5acf3a5d3e2d4eecbbc3604bdbb9a4db0e6118183157c160f8
ac5d5a347f15a74410725d6263afe6eaf48eef09d7074996aa0a7cea3eb705d52c4e9e4f68e0af54a83b33289472ae558e432c5c3514af8776343ced624d7f9f
a3d1a27b2b798614fb94983918fcddbe1fd74c0e9e4d74deede75e4647644513222110b640a0d842bc5deb940e0149f97b7dab8d374f1985b3e945d821a0957c
a376f95fa3c359e5ed1e7f5773006e8e5132b156216c81607917b60d2a294e7185b8dbd53cdbc926255e8bdaf1d6c2a6347c89f57cf3ea72e3db9b690fbf799d
368cdd95ca265121608e056f34e8b516a62837675ea796fa5e67a4b9fa6ca6f41fa7f91e7bccf5f3d9f03ba16d27c2d5312d0b197b291d645264e9d652ba065a
6af66b2a894f30e8e9c12dae94b894e8b92d67cef4adcab6267b3f67e7208d2bad7396f84dabbcb61277424f49d5a2d869a74074899200d18311192691ea47a9
5453a1e6b75ca97edcd61e3ccf93ee36c8e00d09d1b4e85a117571eaa248c8656ab2e55467d044da33a326916bd36d293cf3aef21e9001471538fc3e857d5061
015379d829436c2eff003e769c84390442da26d20d608ead92cbeb20a9b20c4ac919908ccf21e7fbce529d6557a79bb6bf0d20451dcace54ca995321c81d9308
b1a28d9aadaef3d1759f31024aee19d779d799ee994ad49e7d274a9372b6996f64be8b7535802719f013a225866d9d73111632309e82d93054684df84e1f55ca
46c80c88a8b2d8cb315972332915b886da9914b6cfb2c61c63c50cc0be311780b366c74acd95ca8b21e05945d642b3653c0b006d19138d710ce8c810c6224766
0483163097af9b9971a73d2e08a8b2cb84a01b239078160632d85b44c076b2bae4d9958098f173833572f51cff00ffc400271000020202020005050101000000
0000000102000304110512101314152120222330310632ffda0008010100010502af2d5695cb5d26526ce5d7af51597af22a09996abbf1aea178c707337fa6eb
7a0b73ea42f9f6bc2db338bab55388bc6e341c7e34f6fc79edb8f3dab167b56346e130ccf65c5598bc7d78d67e9e62deb429d9dcdcabee7c44eb5b41e0cea82f
e5f168193fe8ec2389cff5b87fb39bbbf3d66769b982bdb2291aa8c1e19950bb1eea4d76389c2e6fa4cf0db1fa9ce9390b7cce401d0ed17e4f169b71f00c1e0c
36398c6eb1c7c3ec1e173c65e16e6ff4e5375aafa6c1779b15a24e213f10fa732916d194a68b9da70f9de93391c3afe9cf7d56ca1a5b88ad2ca1e995640338f4
e947d2dfcff418718cdce073fd462fe9cfb3ee8cc00bed16b5184ad70b854bea84f553b09dd67710b4cda45d466d268c99c6659c4cda6e4b2bee27713b4dcd89
b13719beccdb8b65f9c105b9165cd8f474984377dcdf954f835408b0148d7f90afcbdd64a33b2ae4e4b1fb5c38d768386b8cc3c6cfc756f702455c896ae96ea4
6a7c18287f36c53d2c3d71f27cc46d59735552a0dce3ff00e06364315c6b84f4f6c366e7c464ada3a56b2fed282cb120eb0d9d51722d8320c39680faca8c3954
439b54f5f5cb6faecacd8b3ad6d0e35261c1130686088ee816c46f0dcdc0e561b0c2e67dd2f6b02d64ec749f6cd88f5abcb53cbf1dee323b0eb9ca557334b4e4
7508c138dfe7c19d04d389b84fcf710dc04acb5a3a58a2d606b1c960ac1cb7193de38b9ef5c64f7bc09ef58f0729483ef16caf90e46d38eb94cb563574c2cb37
3e3c35353460b277967f31f1bcf643522e552f90130eae9e8717630f1c4f4f8f3c8a27934cf2699e5d027998c91b35046cdc833d466f9899d5c5bd1e6c78ee6e
6ccdec16962069d6043111a00c225b6082f58b6033737a9e609e66e7e49f93c3e2796860362c195608996a63d8e5aab3ecdf81f99a86a0604eb06a09a9d60dac
5bf5058ad3e3c373b426769b9b3e0c81a75759e75cb036fe9fecd6a0fa089f316c6116f9d819a9a3e3b80cdc30995b180fd0209a83e8d4226a76222d8606dc33
535e061319a7ffc40029110002020103030402020300000000000000010211031012131420210430314122324051425271ffda0008010301013f01e75b459059
50b244e58d8e71334d367a56a8f54ed32bd9c58b77c8b11b628b123d5cabc1063f5733abc875990eb6675923ac97f473a7f4473a5f44b2a6bdac3e116596633d
4cae4458f48c1cbe05e95ff90a38e3f08cb15fb445dd6597d88b2cb3e206577310f4f4f3db224a8911ff0051c6bb6cb2cb2cb225963647cb32ba88c43d22c8cb
7c2c648fdd595d97a5e965912d9bcdc6247a97f88fb704e9d13f0c9331ce9d0c631f7c74a2a8c534677e6bba24ff002858c6467ba23efbd13132cbbf04511c5c
96ce94e94dacd8cd8c51313fa322a6331ca98fbdca84c4597645511661f102f48e46998da912499e2bc11b26ace338f56cdcc7214af4cdfa98dfe3aa1310b241
7d9cd0fece7c7fd8b1d1ff0004e421c91bc721b1f91c46b47a58dd884c421116bec9414be096392d28a1c14858d0e28a4645e0b1fb5626290d9e4de5c5fc95ae
e1e48af937c5fd925e28716b4a36336338d9c6718e2977d965a290c64e7b476fe48cf69d448ea247348e591c9239246f917236c99c7238cd838b2bb28a1bd18f
4a286b4dc5eb456946d28a36238cd86c66dd1fbf5a5695a228da5e8fddb2fd9bfe4fffc400271100020201030305010101010000000000000102110312132110
3031042022415132714061ffda0008010201013f019fa66e64bd3325e9e42f4f33624912c523d2637147ac5f230aa5da9cabc0db63b12ae9815cac92349b66d2
364d9364a92fb256fc9cf6a4ad92545144f846055024210e5a4d6df81636fcb3f87a5f7631268d2513e59055148911e993f48cac4ccb1b565f6a86254868d232
ae5d18844910e1d084648e8976e86b8a1e2fc1c4998d7cafa3285d26ab921cab1232c3547b715cf4b387e4c985a22bd9432460953a174cd0d2fb504328aa272e
192969e0dc1e435a3711ad0e478766376ba648ea4557bd2b1aa20b828aa2465f06456c6868960543e04acc78235726648417831c8dc46ea2528485a0f81a50a0
38d74c5fd13fe855d19465f234c7063848795b3fd383511ff492ff00d28a170596722b39341b6cd2fecd2726a66b3273e08b6852470596597d71792bd898bd96
7c075fa3a18d53e95eca349a19a24478628d9b4cdb34234c4f81aa3fa5c054fc15d1f5a1a348e2fa210a3621ad46cc4d98fe9b31fd3661fa6d43f4d981b58cdb
c68bc68de88f39ba9fd8a66b2d76132cd46a2c691a0aaeb451c0ebaea685919b86b1648fd8e4bebda99e7ad96793495dab351657bafdb7d290e3daa1aff81c7b
147fffc40037100001020304080305090100000000000001000203112110223132041213203041517105618123339192a134404450627282b1d1e1ffda000801
0100063f02ca665652b036628de46ab1512478545576b1574ea8b5bf3599164591645902c817bb0aeb648b982a78520713bbf4dc9b96799f24760c97741e7373
e2b61f4aee3021e75dc737a84e6bacd471f671388544f2a6e39dd0296eed00b263109b337db43c329d10733357a96877533de2d4e866c13371f42811c222d98c
100534746efed982d0c71bcda70836caad935426cb9a975aee636b9a5399635d3ba6850703c09a701c954ad56299c56b72689a23a53708aa2f72f6508a94766a
29b44d652a8d280ab82a43430015ec6dd6d6a5ae76ccd55682d73bcd4f665642b2158aaaab66a90fe8a90dc7b291d0dcab064b0540aac0b2a92aacca86c9b5f5
1c955640561257627c56a8a96a93db3dcc563662b321227d148cfe3b955564c750ba85fed0aeaa8d3eaae43791d94e2682f1e6da2d6911e4f0b5ccbd13a2c8c8
d2da1b3c9557557184a996482241527c6d4eed2bed7f0615efe21ed08afc43bb4357745d31dfc153c374b3e8a70fc0e2cfd02bbe06ff009d4a1781fab9ca7a4b
2143fd2caabbae7f7bcbbfb5592af00a9c58a18cef5283585a02019a4ecc04369126eea1722b92e4b95b8aff008aec37395c820775388dd76f4064af35d0fb85
4703c19852598ac4aa2a99aad15372eae4ab6cc2bb10faabc26ab4536b95ec787457adc38375df70afe49fffc400281000030001030304020301010000000000
00011121314161105171208191a1b1c1d1e1f030f1ffda0008010100013f21350b67f11946af629e589cb0d081f4acc914840cd036363f53549a37b9ed0742d9
e0c759bac6d3c1a175adf8e8a2b47c1d90e30dbb3e0ffc01cc35bf88fd043766e9b0d8dfaf4e0e06f8285d2b3f22302d122bd28bb22e479a8adb2119c3656eca
70bd98d8fa31b2fa9b8a97ab4518af4e93ca159ccfd06f18572c323472e5c2f86216d32946c6fd7745a275309a2a63078105ee6226d8e84ea1f6b086e6658ca9
fa0084bd6fa6af819836dcc29c2d09794e8f83225facb4fb18a242e8f52b830431e0cc3178301a55a8bff1e56c15aa16bc19a7034b0cb2acaaf96265213a2d0c
4b69af49b2756a8eee784c5e9a5296a3928c2da0b29b753b2468b979c9f8fd0bbc4f725af495d188b04d56a1ca58b81b35f041265a68e53948ee41cc5b71a255
884c1806301d12d87f717baee3235941b99fd0584f032aa3a450d6178d847715eb0813685b98bf73f8cc6a19914d9b197535dd94eee4516a84eb44b0ab7b12ec
79379c8af2dab52376f68d207112435bd1de64a455e4d60909b20f818a310d01f608f7c2217bc93486bf9670508741b16bf186f59291865d19195028b2b1e9ba
c861b0740b3ca1bf94bb9a7b78b1cdae105ac41b6d77625c15ba34a8636868a3a411455e4677e84dbe45802a1acd72317f627da8e1468ecf71e97eaef23cab16
a269e4b5ca9cdb007a0978359f935135b27ec5e169921e40370a497217ba29065ca94d6b50e74dec7414cd062fd435ea9e4d29a0ccd42d7036af2356ccbe25c0
e32cb6fd0423aff8f8124c27a7bc099f426bf7326a2a5b90abadbeed3f826c2e025f26507ee37c96db35eff900ac4d5b1c1d092d887aa38b185387ba1a771ee6
a9fd1859181558e893171b3a256b125772824cad36ce61a1af8a33dd5ec7f9412fb7d1e1f92aad7e4e27b5185f14a1f7d21e4c1e95271feb22ef8f627956cc57
b929ca409cb0f28bd4c8f587d0471911453f229334e480d8c6c1c9c80d4744e2860778d0f413e469968124da57b8db6a36211f7583631db23169f03b81c8c98a
3268522b794f27784bb191289b1da44190c5f5cd121a73237664482920cfa0d2e8347a1c827dce00dc23d6e4904c793429204fa3a15137b928d223c1cb8878c3
a375a31a87ca141f507eb2b746ba309485d48592040c2d0be9d88431a8c21878e48fffda000c030100020003000000106b0631a8f6e44e0c76cfc6a197c34b9c
d5a5e0fb54038412dabf4d200da8ebcf66ea2642070e2ecb9e6ef3daaf46c64184b704900e32fd4ed133cd5d6d80b812412cbe809ae198e77100949233ff002e
20ddb23398c9b0917cb5da4fe182bd6b94f1d5ab100351287c7902e5b68139144dd8dc3e3dfbc7e8199d0098cd819fcd9cdd48ab2249280e782fc18ff9527a96
29a4292210f465cc52715aba0ea39c6ebfffc400271101010100020202010304030000000000010011213110415161207191f03081b1d1c1e1f1ffda00080103
01013f104389cc21c966bb8b6ddacdbb30e6e1760317682083f226bd220c3823aa4ead38b03fa0ff009f083a09fabc1fa37d65a708bdc374189867bb39820fcb
21cfe2c672e5900fd5f13966f2139790bd8fdce02e184441e37f003e0359e01702e4ce9c8e66d0fae3c5cd93bee548c266afa7fcda31820ba967f002116b1cae
5c401e28190d75f05360df682ce5bdd2504f71e0b2ccdf0d8847cc03a472e6757b9b1c1fa7efff0050b2596db9974cd62e4b9b74dc65294b2db6c30ca1b2cbe4
4c0b7112c96d89e3708f64e79653ee52cb2cb6db107cc11db166992afecff3f7956a1babebb1ec9336f6adf2571cf4ca665996d806b6c693e2316f81e27b2e27
df3fbc4610c28c4625c382f62678cfce4c08632d91c7814eed516ba5b08788d679e0e667cc46407d2c3d6ec246905c6cb4d5847521f5690c0507cc07b9c81663
a10cb0624b3af0294a224575e37773bee79e463d486a41f57c39f8eed92b64cb2db6cbe46123ede5053211d42e98e82dac664b938bb865bb0e522a771236dfe3
fead3ff1ff0057f2e7c1ab5768ce7af1b16c30afb453e47ac1acd36777399d38253d4bfa95f536c296deaf84c27647cdb21c42ecf036186356bc0bb2b94e4891
ebc0697dac3259b6885e00f86acbddadf56d90109ee594b2ccccc925996dbe0b3c02d41f3620b84060782ca6d999667c659e062134f231110c2b65999966dfe8
0c30dbe06186dbffc4002511010101000203000104020300000000000100111031214151a120618191b1d1c1e1f1ffda0008010201013f10eede090f86cde188
f522993dcc8e692bb9c16df12cf19659270fe33c87715e178409e6daf81ff5c06bb6036d03d36becfb6c7460fbac5870f1965924927058274c709b8fdff88c61
1f6ba664e8d58599e72cb2c9249b4f3fa20e05fd99fdff00d42110cf08009c5e3fd91b2db780b2cb2c9261f1c26cce08e118897cf01c3727e45e2d9cf32a1e9b
620820b2cb2c9274842e92463c30bf86e144125a31eac10e2ebbb20fb11041671964969772ed7a45b89642fde18390e9790f00bce9d30701071965925dec2d3d
465aca26c40fe5261b2e15a0dc9f00b098237252c6218638c25584cb1b133bb116c3a7db6794dff3e61acb6789312be7b00796cbdd9f6f1c09e586e9d41eac5b
3d65e1e5115347867833a3f69cee5f0caf575accfd96badbcbb82d59d3b0e6c1c3f90fa12f9914a60dd1bc935ead1eecedfb26b5f6bc026df0c2b82a19698585
90e5919a5911213de98888076cabb603a8b599fd5e4e136193931d3abc7026143f46c91a93c197af01f6ff008ff71ee7f25876fe4b07b3fbbc38fe565ece5384
895f778982cfc5ea58c2f58bcac1e0bacf51f68fb22d8c3ff75fbbf982f7f9b56afe63af927d30fa9ec43f4dfbad271e999725d8b320d9cee17636a7ee0bdcff
0036bd4bedc6c6a71df05e9c9d46f623ea2e4c16c84478eb852d8ec6c42a9da7e251df1bfa326ce0642f76271645bc1e235c78b3e43f6268cb4a489c6fe878ce
05267031c8f1bceb0c360c1271b6f19044ffc400261001000202010305000203000000000000010011213141516171108191a1b1c1e1d1f0f1ffda0008010100
013f106a73081d65206d754f9e528f6a31aa8a2417d25049ef0c54150cf760d9b8d3da69f12ff497a1083061b1dc4ea2a1babdc7d60e1e5f78b969955bb8c17c
acb2b91f134fd21e710016fb200a3e385383f69b3f8517b53f647b0a1e84b0b8b059901a9b0b2e817ea0bea420f58a4c3823486dfc8f7b6b65611c16e282ad41
19940776a3fb25a306218e8a7955411a7ba1a06ca6d7f04d18d4e0852ac688bd07d443d2e7a08075ac0f2d1f8ca2cd46d45cb20eb0ea2cf8c67f89627917bebe
aa0b187042585d2186a5dc2c05e652c28971c152e3858611136465f4192199999832e0c2b9ac4c7a49ceabfbb950b8fb6287494617479963f2574800f68ac954
09783a605f03907112399429a85b12565a615e6ce630c36f41a95a8b2e5c194a3a6fd414000f55b9bb0b1981613acc65db29de86f67f83efd16c4a48220950f5
a554099b5972455371298c1781e18004036730bc1bf55972e5cb9443a7de56098841cc5d79911e91f4e6acc5aa03f90fe7a54a8461182d89b65ce86c88ac30c8
962710ac42a5729c3e8692e2e22cbf51a0b0ccd9542cadc0c4036cca42a44a7c4bcd6c1b7eae5460cf6b81f16f79c28c18870d546bd23acdccb13307c59ab942
42df18cb2f1820de29e6186122303dc09c65bc23d6947183282b2f451084e2a5f8a9f76e2b35d6ae38b4d5e04afce655b61ae513f0fd967e5575d453f631516f
a06e2ba8e405e298e834be60758d11b85310e3710b2a106d48a8b5ce5091017820850bd584af37a038250c9e59596f726ea68f8ce66dd656058a7497b36d406e
1a45a95728226bd721cc1c415d8a5825059302b022e3761d0387bc52e2594ab58b51531a9530f78d4a08232c15fb91101744b218b788540f7a181e68f50f961b
bf662621fad162bb827544c5ae521f1a1a5ea092d4a4ea471431d259e9f80cc415172d6a16e501a5973f3a992b7804b4546570a2e2cfd90ce1e4e2c4bf8b9a97
8aadf785dd6bb12985f45e21535f2c3c08f0c7758f94e2bf12ed50ee131c55d897e308bb1fd4b6fcf65528176bde07af9a5e501ed0ce068e122ceed9f83679d4
6b0484094ecde6215300ad41d7fac4c933b6781b8a42f217e046258aacdbe496e20bb1b672d388e62054001cda95de51511558e3748665ca8cf4581969ced4f6
96590f78a6d5792e3fc119468afa89b9d8b648bb674da00d95e0b8ab869188f4bd40fdf68003e61d3460a2b59a8ad18ca6fd930ccbdc7e88a63c95fccb74bc0b
f6156475c2cd48991b175b90edbadb71e0081581c15742794109341b05e5d07b0cbe97b5ff00b595ed53722e09798bc63f0090b180f6250d08e82cb0643ce670
d18cb7c29cc23b12b657de39758e344c8103a071e61775a1ff00d599a4401dd36e4ed070095f113350f1275bf92a9156bfe728b1ef7fc41f47b7fa4ca01ef7fe
100cfe12ff006da75f88970b4ea2fc852a4e88fb86a7466d622be521be5ab98523ac7f0b21648ed4e52a591cd2d805f9964ca8e0b83e503d79966f50dc0bd26f
a83d1a96885ec6f8978b8b16912248d6b1122abc434dfd095a498e8c54ee864a3bd457b116f09ed2fb21c54ab168350ff12b27cebea53d81051043975300bb51
999345092c84f28330c75876435eb8260bc01e605c2e183044b8a60458c572e63c13da353dc403097c4a76107883c1021a22e6611790992753c896e44cf5aba9
1fa216094904236f31846e62ba865704e489c910b51299c4af5348458c449885f246505b4251fc881b090738778210c41070d44bc45e6386483d677263151c16
41ed0eb10c36466a0ed1259166a013094d88a6c83e210c4b2c6e12e67040992585826462a3ac5a84b89527ffd9}}}}}

\par \pard\plain \s51\sl288\slmult1\ql\nowidctlpar\hyphpar0\sb0\sa140\ltrpar\cf17\dbch\af9\langfe2052\dbch\af13\afs24\alang1081\loch\f3\fs24\lang1033\qj\widctlpar\sb0\sa225\rtlch \ltrch\loch

\par \pard\plain \s51\sl288\slmult1\ql\nowidctlpar\hyphpar0\sb0\sa140\ltrpar\cf17\dbch\af9\langfe2052\dbch\af13\afs24\alang1081\loch\f3\fs24\lang1033\qj\widctlpar\sb0\sa225\rtlch \ltrch\loch

\par \pard\plain \s51\sl288\slmult1\ql\nowidctlpar\hyphpar0\sb0\sa140\ltrpar\cf17\dbch\af9\langfe2052\dbch\af13\afs24\alang1081\loch\f3\fs24\lang1033\qj\widctlpar\sb0\sa225\rtlch \ltrch\loch

\par \pard\plain \s51\sl288\slmult1\ql\nowidctlpar\hyphpar0\sb0\sa140\ltrpar\cf17\dbch\af9\langfe2052\dbch\af13\afs24\alang1081\loch\f3\fs24\lang1033\qj\widctlpar\sb0\sa225\rtlch \ltrch\loch

\par \pard\plain \s2\ql\nowidctlpar\hyphpar0\sb200\sa120\keepn\ltrpar\cf17\b\dbch\af9\langfe2052\dbch\af13\afs32\alang1081\ab\loch\f4\fs32\lang1033{\listtext\pard\plain }\ilvl1\ls1 \li936\ri0\lin936\rin0\fi-576\rtlch \ltrch\loch

\par \pard\plain \s51\sl288\slmult1\ql\nowidctlpar\hyphpar0\sb0\sa140\ltrpar\cf17\dbch\af9\langfe2052\dbch\af13\afs24\alang1081\loch\f3\fs24\lang1033\qj\widctlpar\sb0\sa225{{\*\bkmkstart __DdeLink__109_736781840}\scaps0\caps0\cf1\expnd0\expndtw0\i0\b0\dbch\af12\rtlch \ltrch\loch\fs21\loch\f8\hich\af8{\*\bkmkend __DdeLink__109_736781840}
Maecenas non lorem quis tellus placerat varius. Nulla facilisi. Aenean congue fringilla justo ut aliquam. Mauris id ex erat. Nunc vulputate neque vitae justo facilisis, non condimentum ante sagittis. Morbi viverra semper lorem nec molestie. Maecenas tincidunt est efficitur ligula euismod, sit amet ornare est vulputate.}
\par \pard\plain \s51\sl288\slmult1\ql\nowidctlpar\hyphpar0\sb0\sa140\ltrpar\cf17\dbch\af9\langfe2052\dbch\af13\afs24\alang1081\loch\f3\fs24\lang1033\qj\widctlpar\sb0\sa225\rtlch \ltrch\loch

\par \pard\plain \s51\sl288\slmult1\ql\nowidctlpar\hyphpar0\sb0\sa140\ltrpar\cf17\dbch\af9\langfe2052\dbch\af13\afs24\alang1081\loch\f3\fs24\lang1033\qj\widctlpar\sb0\sa225{\scaps0\caps0\cf1\expnd0\expndtw0\i0\b0\dbch\af12\rtlch \ltrch\loch\fs21\loch\f8\hich\af8
In non mauris justo. Duis vehicula mi vel mi pretium, a viverra erat efficitur. Cras aliquam est ac eros varius, id iaculis dui auctor. Duis pretium neque ligula, et pulvinar mi placerat et. Nulla nec nunc sit amet nunc posuere vestibulum. Ut id neque eget tortor mattis tristique. Donec ante est, blandit sit amet tristique vel, lacinia pulvinar arcu. Pellentesque scelerisque fermentum erat, id posuere justo pulvinar ut. Cras id eros sed enim aliquam lobortis. Sed lobortis nisl ut eros efficitur tincidunt. Cras justo mi, porttitor quis mattis vel, ultricies ut purus. Ut facilisis et lacus eu cursus.}{\rtlch \ltrch\loch
In eleifend velit vitae libero sollicitudin euismod. }
\par \shpwr2\shpwrk3\shpbypara\shpbyignore\shptop0\shpbxcolumn\shpbxignore\shpleft2819\pard\plain \s51\sl288\slmult1\ql\nowidctlpar\hyphpar0\sb0\sa140\ltrpar\cf17\dbch\af9\langfe2052\dbch\af13\afs24\alang1081\loch\f3\fs24\lang1033\qj\widctlpar\sb0\sa225\rtlch \ltrch\loch
{\*\flymaincnt5\flyanchor0\flycntnt}{\shp{\*\shpinst\shpwr2\shpwrk3\shpbypara\shpbyignore\shptop0\shpbottom2660\shpbxcolumn\shpbxignore\shpleft2819\shpright6819{\sp{\sn shapeType}{\sv 75}}{\sp{\sn wzDescription}{\sv }}{\sp{\sn wzName}{\sv }}{\sp{\sn pib}{\sv {\pict\picscalex100\picscaley100\piccropl0\piccropr0\piccropt0\piccropb0\picw200\pich133\picwgoal4000\pichgoal2660\jpegblip
ffd8ffe000104a46494600010101004800480000ffe20c584943435f50524f46494c4500010100000c484c696e6f021000006d6e74725247422058595a2007ce
00020009000600310000616373704d5346540000000049454320735247420000000000000000000000000000f6d6000100000000d32d48502020000000000000
00000000000000000000000000000000000000000000000000000000000000000000000000000000001163707274000001500000003364657363000001840000
006c77747074000001f000000014626b707400000204000000147258595a00000218000000146758595a0000022c000000146258595a0000024000000014646d
6e640000025400000070646d6464000002c400000088767565640000034c0000008676696577000003d4000000246c756d69000003f8000000146d6561730000
040c0000002474656368000004300000000c725452430000043c0000080c675452430000043c0000080c625452430000043c0000080c7465787400000000436f
70797269676874202863292031393938204865776c6574742d5061636b61726420436f6d70616e79000064657363000000000000001273524742204945433631
3936362d322e31000000000000000000000012735247422049454336313936362d322e3100000000000000000000000000000000000000000000000000000000
0000000000000000000000000000000000000000000058595a20000000000000f35100010000000116cc58595a20000000000000000000000000000000005859
5a200000000000006fa2000038f50000039058595a2000000000000062990000b785000018da58595a2000000000000024a000000f840000b6cf646573630000
00000000001649454320687474703a2f2f7777772e6965632e636800000000000000000000001649454320687474703a2f2f7777772e6965632e636800000000
00000000000000000000000000000000000000000000000000000000000000000000000000000000000064657363000000000000002e4945432036313936362d
322e312044656661756c742052474220636f6c6f7572207370616365202d207352474200000000000000000000002e4945432036313936362d322e3120446566
61756c742052474220636f6c6f7572207370616365202d20735247420000000000000000000000000000000000000000000064657363000000000000002c5265
666572656e63652056696577696e6720436f6e646974696f6e20696e2049454336313936362d322e3100000000000000000000002c5265666572656e63652056
696577696e6720436f6e646974696f6e20696e2049454336313936362d322e310000000000000000000000000000000000000000000000000000766965770000
00000013a4fe00145f2e0010cf140003edcc0004130b00035c9e0000000158595a2000000000004c09560050000000571fe76d65617300000000000000010000
00000000000000000000000000000000028f0000000273696720000000004352542063757276000000000000040000000005000a000f00140019001e00230028
002d00320037003b00400045004a004f00540059005e00630068006d00720077007c00810086008b00900095009a009f00a400a900ae00b200b700bc00c100c6
00cb00d000d500db00e000e500eb00f000f600fb01010107010d01130119011f0125012b01320138013e0145014c0152015901600167016e0175017c0183018b
0192019a01a101a901b101b901c101c901d101d901e101e901f201fa0203020c0214021d0226022f02380241024b0254025d02670271027a0284028e029802a2
02ac02b602c102cb02d502e002eb02f50300030b03160321032d03380343034f035a03660372037e038a039603a203ae03ba03c703d303e003ec03f904060413
0420042d043b0448045504630471047e048c049a04a804b604c404d304e104f004fe050d051c052b053a05490558056705770586059605a605b505c505d505e5
05f6060606160627063706480659066a067b068c069d06af06c006d106e306f507070719072b073d074f076107740786079907ac07bf07d207e507f8080b081f
08320846085a086e0882089608aa08be08d208e708fb09100925093a094f09640979098f09a409ba09cf09e509fb0a110a270a3d0a540a6a0a810a980aae0ac5
0adc0af30b0b0b220b390b510b690b800b980bb00bc80be10bf90c120c2a0c430c5c0c750c8e0ca70cc00cd90cf30d0d0d260d400d5a0d740d8e0da90dc30dde
0df80e130e2e0e490e640e7f0e9b0eb60ed20eee0f090f250f410f5e0f7a0f960fb30fcf0fec1009102610431061107e109b10b910d710f511131131114f116d
118c11aa11c911e81207122612451264128412a312c312e31303132313431363138313a413c513e5140614271449146a148b14ad14ce14f01512153415561578
159b15bd15e0160316261649166c168f16b216d616fa171d17411765178917ae17d217f7181b18401865188a18af18d518fa19201945196b199119b719dd1a04
1a2a1a511a771a9e1ac51aec1b141b3b1b631b8a1bb21bda1c021c2a1c521c7b1ca31ccc1cf51d1e1d471d701d991dc31dec1e161e401e6a1e941ebe1ee91f13
1f3e1f691f941fbf1fea20152041206c209820c420f0211c2148217521a121ce21fb22272255228222af22dd230a23382366239423c223f0241f244d247c24ab
24da250925382568259725c725f726272657268726b726e827182749277a27ab27dc280d283f287128a228d429062938296b299d29d02a022a352a682a9b2acf
2b022b362b692b9d2bd12c052c392c6e2ca22cd72d0c2d412d762dab2de12e162e4c2e822eb72eee2f242f5a2f912fc72ffe3035306c30a430db3112314a3182
31ba31f2322a3263329b32d4330d3346337f33b833f1342b3465349e34d83513354d358735c235fd3637367236ae36e937243760379c37d738143850388c38c8
39053942397f39bc39f93a363a743ab23aef3b2d3b6b3baa3be83c273c653ca43ce33d223d613da13de03e203e603ea03ee03f213f613fa23fe24023406440a6
40e74129416a41ac41ee4230427242b542f7433a437d43c044034447448a44ce45124555459a45de4622466746ab46f04735477b47c04805484b489148d7491d
496349a949f04a374a7d4ac44b0c4b534b9a4be24c2a4c724cba4d024d4a4d934ddc4e254e6e4eb74f004f494f934fdd5027507150bb51065150519b51e65231
527c52c75313535f53aa53f65442548f54db5528557555c2560f565c56a956f75744579257e0582f587d58cb591a596959b85a075a565aa65af55b455b955be5
5c355c865cd65d275d785dc95e1a5e6c5ebd5f0f5f615fb36005605760aa60fc614f61a261f56249629c62f06343639763eb6440649464e9653d659265e7663d
669266e8673d679367e9683f689668ec6943699a69f16a486a9f6af76b4f6ba76bff6c576caf6d086d606db96e126e6b6ec46f1e6f786fd1702b708670e0713a
719571f0724b72a67301735d73b87414747074cc7528758575e1763e769b76f8775677b37811786e78cc792a798979e77a467aa57b047b637bc27c217c817ce1
7d417da17e017e627ec27f237f847fe5804780a8810a816b81cd8230829282f4835783ba841d848084e3854785ab860e867286d7873b879f8804886988ce8933
899989fe8a648aca8b308b968bfc8c638cca8d318d988dff8e668ece8f368f9e9006906e90d6913f91a89211927a92e3934d93b69420948a94f4955f95c99634
969f970a977597e0984c98b89924999099fc9a689ad59b429baf9c1c9c899cf79d649dd29e409eae9f1d9f8b9ffaa069a0d8a147a1b6a226a296a306a376a3e6
a456a4c7a538a5a9a61aa68ba6fda76ea7e0a852a8c4a937a9a9aa1caa8fab02ab75abe9ac5cacd0ad44adb8ae2daea1af16af8bb000b075b0eab160b1d6b24b
b2c2b338b3aeb425b49cb513b58ab601b679b6f0b768b7e0b859b8d1b94ab9c2ba3bbab5bb2ebba7bc21bc9bbd15bd8fbe0abe84beffbf7abff5c070c0ecc167
c1e3c25fc2dbc358c3d4c451c4cec54bc5c8c646c6c3c741c7bfc83dc8bcc93ac9b9ca38cab7cb36cbb6cc35ccb5cd35cdb5ce36ceb6cf37cfb8d039d0bad13c
d1bed23fd2c1d344d3c6d449d4cbd54ed5d1d655d6d8d75cd7e0d864d8e8d96cd9f1da76dafbdb80dc05dc8add10dd96de1cdea2df29dfafe036e0bde144e1cc
e253e2dbe363e3ebe473e4fce584e60de696e71fe7a9e832e8bce946e9d0ea5beae5eb70ebfbec86ed11ed9cee28eeb4ef40efccf058f0e5f172f1fff28cf319
f3a7f434f4c2f550f5def66df6fbf78af819f8a8f938f9c7fa57fae7fb77fc07fc98fd29fdbafe4bfedcff6dffffffdb00430005040404040305040404060505
06080d0808070708100b0c090d131014131210121214171d1914161c1612121a231a1c1e1f212121141924272420261d202120ffdb0043010506060807080f08
080f201512152020202020202020202020202020202020202020202020202020202020202020202020202020202020202020202020202020ffc2001108008500
c803011100021101031101ffc4001c0000010501010100000000000000000000020001030405060708ffc4001a01000301010101000000000000000000000102
0300040506ffda000c03010002100310000001cef90fb09a72952d6a75cbea4d4e63c8fb5e46b47b7ac13eefbbc600d1ab0076056ce0100416acafcf72f764c5
b2c88cb7775e3dda7264f5754ed3360db03601aa1102d6c81bcfca398411c56ce32d9d4101c847bb834e8bbcea88916beadd3e3db6907534b4989384bd3c6b57
b1dcfd09846af1ab3660044e582d96ce0b8c977982f6f3d37b5257036b9fabd4fd0f0a4558fa5e5acf3a5d3e2d4eecbbc3604bdbb9a4db0e6118183157c160f8
ac5d5a347f15a74410725d6263afe6eaf48eef09d7074996aa0a7cea3eb705d52c4e9e4f68e0af54a83b33289472ae558e432c5c3514af8776343ced624d7f9f
a3d1a27b2b798614fb94983918fcddbe1fd74c0e9e4d74deede75e4647644513222110b640a0d842bc5deb940e0149f97b7dab8d374f1985b3e945d821a0957c
a376f95fa3c359e5ed1e7f5773006e8e5132b156216c81607917b60d2a294e7185b8dbd53cdbc926255e8bdaf1d6c2a6347c89f57cf3ea72e3db9b690fbf799d
368cdd95ca265121608e056f34e8b516a62837675ea796fa5e67a4b9fa6ca6f41fa7f91e7bccf5f3d9f03ba16d27c2d5312d0b197b291d645264e9d652ba065a
6af66b2a894f30e8e9c12dae94b894e8b92d67cef4adcab6267b3f67e7208d2bad7396f84dabbcb61277424f49d5a2d869a74074899200d18311192691ea47a9
5453a1e6b75ca97edcd61e3ccf93ee36c8e00d09d1b4e85a117571eaa248c8656ab2e55467d044da33a326916bd36d293cf3aef21e9001471538fc3e857d5061
015379d829436c2eff003e769c84390442da26d20d608ead92cbeb20a9b20c4ac919908ccf21e7fbce529d6557a79bb6bf0d20451dcace54ca995321c81d9308
b1a28d9aadaef3d1759f31024aee19d779d799ee994ad49e7d274a9372b6996f64be8b7535802719f013a225866d9d73111632309e82d93054684df84e1f55ca
46c80c88a8b2d8cb315972332915b886da9914b6cfb2c61c63c50cc0be311780b366c74acd95ca8b21e05945d642b3653c0b006d19138d710ce8c810c6224766
0483163097af9b9971a73d2e08a8b2cb84a01b239078160632d85b44c076b2bae4d9958098f173833572f51cff00ffc400271000020202020005050101000000
0000000102000304110512101314152120222330310632ffda0008010100010502af2d5695cb5d26526ce5d7af51597af22a09996abbf1aea178c707337fa6eb
7a0b73ea42f9f6bc2db338bab55388bc6e341c7e34f6fc79edb8f3dab167b56346e130ccf65c5598bc7d78d67e9e62deb429d9dcdcabee7c44eb5b41e0cea82f
e5f168193fe8ec2389cff5b87fb39bbbf3d66769b982bdb2291aa8c1e19950bb1eea4d76389c2e6fa4cf0db1fa9ce9390b7cce401d0ed17e4f169b71f00c1e0c
36398c6eb1c7c3ec1e173c65e16e6ff4e5375aafa6c1779b15a24e213f10fa732916d194a68b9da70f9de93391c3afe9cf7d56ca1a5b88ad2ca1e995640338f4
e947d2dfcff418718cdce073fd462fe9cfb3ee8cc00bed16b5184ad70b854bea84f553b09dd67710b4cda45d466d268c99c6659c4cda6e4b2bee27713b4dcd89
b13719beccdb8b65f9c105b9165cd8f474984377dcdf954f835408b0148d7f90afcbdd64a33b2ae4e4b1fb5c38d768386b8cc3c6cfc756f702455c896ae96ea4
6a7c18287f36c53d2c3d71f27cc46d59735552a0dce3ff00e06364315c6b84f4f6c366e7c464ada3a56b2fed282cb120eb0d9d51722d8320c39680faca8c3954
439b54f5f5cb6faecacd8b3ad6d0e35261c1130686088ee816c46f0dcdc0e561b0c2e67dd2f6b02d64ec749f6cd88f5abcb53cbf1dee323b0eb9ca557334b4e4
7508c138dfe7c19d04d389b84fcf710dc04acb5a3a58a2d606b1c960ac1cb7193de38b9ef5c64f7bc09ef58f0729483ef16caf90e46d38eb94cb563574c2cb37
3e3c35353460b277967f31f1bcf643522e552f90130eae9e8717630f1c4f4f8f3c8a27934cf2699e5d027998c91b35046cdc833d466f9899d5c5bd1e6c78ee6e
6ccdec16962069d6043111a00c225b6082f58b6033737a9e609e66e7e49f93c3e2796860362c195608996a63d8e5aab3ecdf81f99a86a0604eb06a09a9d60dac
5bf5058ad3e3c373b426769b9b3e0c81a75759e75cb036fe9fecd6a0fa089f316c6116f9d819a9a3e3b80cdc30995b180fd0209a83e8d4226a76222d8606dc33
535e061319a7ffc40029110002020103030402020300000000000000010211031012131420210430314122324051425271ffda0008010301013f01e75b459059
50b244e58d8e71334d367a56a8f54ed32bd9c58b77c8b11b628b123d5cabc1063f5733abc875990eb6675923ac97f473a7f4473a5f44b2a6bdac3e116596633d
4cae4458f48c1cbe05e95ff90a38e3f08cb15fb445dd6597d88b2cb3e206577310f4f4f3db224a8911ff0051c6bb6cb2cb2cb225963647cb32ba88c43d22c8cb
7c2c648fdd595d97a5e965912d9bcdc6247a97f88fb704e9d13f0c9331ce9d0c631f7c74a2a8c534677e6bba24ff002858c6467ba23efbd13132cbbf04511c5c
96ce94e94dacd8cd8c51313fa322a6331ca98fbdca84c4597645511661f102f48e46998da912499e2bc11b26ace338f56cdcc7214af4cdfa98dfe3aa1310b241
7d9cd0fece7c7fd8b1d1ff0004e421c91bc721b1f91c46b47a58dd884c421116bec9414be096392d28a1c14858d0e28a4645e0b1fb5626290d9e4de5c5fc95ae
e1e48af937c5fd925e28716b4a36336338d9c6718e2977d965a290c64e7b476fe48cf69d448ea247348e591c9239246f917236c99c7238cd838b2bb28a1bd18f
4a286b4dc5eb456946d28a36238cd86c66dd1fbf5a5695a228da5e8fddb2fd9bfe4fffc400271100020201030305010101010000000000000102110312132110
3031042022415132714061ffda0008010201013f019fa66e64bd3325e9e42f4f33624912c523d2637147ac5f230aa5da9cabc0db63b12ae9815cac92349b66d2
364d9364a92fb256fc9cf6a4ad92545144f846055024210e5a4d6df81636fcb3f87a5f7631268d2513e59055148911e993f48cac4ccb1b565f6a86254868d232
ae5d18844910e1d084648e8976e86b8a1e2fc1c4998d7cafa3285d26ab921cab1232c3547b715cf4b387e4c985a22bd9432460953a174cd0d2fb504328aa272e
192969e0dc1e435a3711ad0e478766376ba648ea4557bd2b1aa20b828aa2465f06456c6868960543e04acc78235726648417831c8dc46ea2528485a0f81a50a0
38d74c5fd13fe855d19465f234c7063848795b3fd383511ff492ff00d28a170596722b39341b6cd2fecd2726a66b3273e08b6852470596597d71792bd898bd96
7c075fa3a18d53e95eca349a19a24478628d9b4cdb34234c4f81aa3fa5c054fc15d1f5a1a348e2fa210a3621ad46cc4d98fe9b31fd3661fa6d43f4d981b58cdb
c68bc68de88f39ba9fd8a66b2d76132cd46a2c691a0aaeb451c0ebaea685919b86b1648fd8e4bebda99e7ad96793495dab351657bafdb7d290e3daa1aff81c7b
147fffc40037100001020304080305090100000000000001000203112110223132041213203041517105618123339192a134404450627282b1d1e1ffda000801
0100063f02ca665652b036628de46ab1512478545576b1574ea8b5bf3599164591645902c817bb0aeb648b982a78520713bbf4dc9b96799f24760c97741e7373
e2b61f4aee3021e75dc737a84e6bacd471f671388544f2a6e39dd0296eed00b263109b337db43c329d10733357a96877533de2d4e866c13371f42811c222d98c
100534746efed982d0c71bcda70836caad935426cb9a975aee636b9a5399635d3ba6850703c09a701c954ad56299c56b72689a23a53708aa2f72f6508a94766a
29b44d652a8d280ab82a43430015ec6dd6d6a5ae76ccd55682d73bcd4f665642b2158aaaab66a90fe8a90dc7b291d0dcab064b0540aac0b2a92aacca86c9b5f5
1c955640561257627c56a8a96a93db3dcc563662b321227d148cfe3b955564c750ba85fed0aeaa8d3eaae43791d94e2682f1e6da2d6911e4f0b5ccbd13a2c8c8
d2da1b3c9557557184a996482241527c6d4eed2bed7f0615efe21ed08afc43bb4357745d31dfc153c374b3e8a70fc0e2cfd02bbe06ff009d4a1781fab9ca7a4b
2143fd2caabbae7f7bcbbfb5592af00a9c58a18cef5283585a02019a4ecc04369126eea1722b92e4b95b8aff008aec37395c820775388dd76f4064af35d0fb85
4703c19852598ac4aa2a99aad15372eae4ab6cc2bb10faabc26ab4536b95ec787457adc38375df70afe49fffc400281000030001030304020301010000000000
00011121314161105171208191a1b1c1d1e1f030f1ffda0008010100013f21350b67f11946af629e589cb0d081f4acc914840cd036363f53549a37b9ed0742d9
e0c759bac6d3c1a175adf8e8a2b47c1d90e30dbb3e0ffc01cc35bf88fd043766e9b0d8dfaf4e0e06f8285d2b3f22302d122bd28bb22e479a8adb2119c3656eca
70bd98d8fa31b2fa9b8a97ab4518af4e93ca159ccfd06f18572c323472e5c2f86216d32946c6fd7745a275309a2a63078105ee6226d8e84ea1f6b086e6658ca9
fa0084bd6fa6af819836dcc29c2d09794e8f83225facb4fb18a242e8f52b830431e0cc3178301a55a8bff1e56c15aa16bc19a7034b0cb2acaaf96265213a2d0c
4b69af49b2756a8eee784c5e9a5296a3928c2da0b29b753b2468b979c9f8fd0bbc4f725af495d188b04d56a1ca58b81b35f041265a68e53948ee41cc5b71a255
884c1806301d12d87f717baee3235941b99fd0584f032aa3a450d6178d847715eb0813685b98bf73f8cc6a19914d9b197535dd94eee4516a84eb44b0ab7b12ec
79379c8af2dab52376f68d207112435bd1de64a455e4d60909b20f818a310d01f608f7c2217bc93486bf9670508741b16bf186f59291865d19195028b2b1e9ba
c861b0740b3ca1bf94bb9a7b78b1cdae105ac41b6d77625c15ba34a8636868a3a411455e4677e84dbe45802a1acd72317f627da8e1468ecf71e97eaef23cab16
a269e4b5ca9cdb007a0978359f935135b27ec5e169921e40370a497217ba29065ca94d6b50e74dec7414cd062fd435ea9e4d29a0ccd42d7036af2356ccbe25c0
e32cb6fd0423aff8f8124c27a7bc099f426bf7326a2a5b90abadbeed3f826c2e025f26507ee37c96db35eff900ac4d5b1c1d092d887aa38b185387ba1a771ee6
a9fd1859181558e893171b3a256b125772824cad36ce61a1af8a33dd5ec7f9412fb7d1e1f92aad7e4e27b5185f14a1f7d21e4c1e95271feb22ef8f627956cc57
b929ca409cb0f28bd4c8f587d0471911453f229334e480d8c6c1c9c80d4744e2860778d0f413e469968124da57b8db6a36211f7583631db23169f03b81c8c98a
3268522b794f27784bb191289b1da44190c5f5cd121a73237664482920cfa0d2e8347a1c827dce00dc23d6e4904c793429204fa3a15137b928d223c1cb8878c3
a375a31a87ca141f507eb2b746ba309485d48592040c2d0be9d88431a8c21878e48fffda000c030100020003000000106b0631a8f6e44e0c76cfc6a197c34b9c
d5a5e0fb54038412dabf4d200da8ebcf66ea2642070e2ecb9e6ef3daaf46c64184b704900e32fd4ed133cd5d6d80b812412cbe809ae198e77100949233ff002e
20ddb23398c9b0917cb5da4fe182bd6b94f1d5ab100351287c7902e5b68139144dd8dc3e3dfbc7e8199d0098cd819fcd9cdd48ab2249280e782fc18ff9527a96
29a4292210f465cc52715aba0ea39c6ebfffc400271101010100020202010304030000000000010011213110415161207191f03081b1d1c1e1f1ffda00080103
01013f104389cc21c966bb8b6ddacdbb30e6e1760317682083f226bd220c3823aa4ead38b03fa0ff009f083a09fabc1fa37d65a708bdc374189867bb39820fcb
21cfe2c672e5900fd5f13966f2139790bd8fdce02e184441e37f003e0359e01702e4ce9c8e66d0fae3c5cd93bee548c266afa7fcda31820ba967f002116b1cae
5c401e28190d75f05360df682ce5bdd2504f71e0b2ccdf0d8847cc03a472e6757b9b1c1fa7efff0050b2596db9974cd62e4b9b74dc65294b2db6c30ca1b2cbe4
4c0b7112c96d89e3708f64e79653ee52cb2cb6db107cc11db166992afecff3f7956a1babebb1ec9336f6adf2571cf4ca665996d806b6c693e2316f81e27b2e27
df3fbc4610c28c4625c382f62678cfce4c08632d91c7814eed516ba5b08788d679e0e667cc46407d2c3d6ec246905c6cb4d5847521f5690c0507cc07b9c81663
a10cb0624b3af0294a224575e37773bee79e463d486a41f57c39f8eed92b64cb2db6cbe46123ede5053211d42e98e82dac664b938bb865bb0e522a771236dfe3
fead3ff1ff0057f2e7c1ab5768ce7af1b16c30afb453e47ac1acd36777399d38253d4bfa95f536c296deaf84c27647cdb21c42ecf036186356bc0bb2b94e4891
ebc0697dac3259b6885e00f86acbddadf56d90109ee594b2ccccc925996dbe0b3c02d41f3620b84060782ca6d999667c659e062134f231110c2b65999966dfe8
0c30dbe06186dbffc4002511010101000203000104020300000000000100111031214151a120618191b1d1c1e1f1ffda0008010201013f10eede090f86cde188
f522993dcc8e692bb9c16df12cf19659270fe33c87715e178409e6daf81ff5c06bb6036d03d36becfb6c7460fbac5870f1965924927058274c709b8fdff88c61
1f6ba664e8d58599e72cb2c9249b4f3fa20e05fd99fdff00d42110cf08009c5e3fd91b2db780b2cb2c9261f1c26cce08e118897cf01c3727e45e2d9cf32a1e9b
620820b2cb2c9274842e92463c30bf86e144125a31eac10e2ebbb20fb11041671964969772ed7a45b89642fde18390e9790f00bce9d30701071965925dec2d3d
465aca26c40fe5261b2e15a0dc9f00b098237252c6218638c25584cb1b133bb116c3a7db6794dff3e61acb6789312be7b00796cbdd9f6f1c09e586e9d41eac5b
3d65e1e5115347867833a3f69cee5f0caf575accfd96badbcbb82d59d3b0e6c1c3f90fa12f9914a60dd1bc935ead1eecedfb26b5f6bc026df0c2b82a19698585
90e5919a5911213de98888076cabb603a8b599fd5e4e136193931d3abc7026143f46c91a93c197af01f6ff008ff71ee7f25876fe4b07b3fbbc38fe565ece5384
895f778982cfc5ea58c2f58bcac1e0bacf51f68fb22d8c3ff75fbbf982f7f9b56afe63af927d30fa9ec43f4dfbad271e999725d8b320d9cee17636a7ee0bdcff
0036bd4bedc6c6a71df05e9c9d46f623ea2e4c16c84478eb852d8ec6c42a9da7e251df1bfa326ce0642f76271645bc1e235c78b3e43f6268cb4a489c6fe878ce
05267031c8f1bceb0c360c1271b6f19044ffc400261001000202010305000203000000000000010011213141516171108191a1b1c1e1d1f0f1ffda0008010100
013f106a73081d65206d754f9e528f6a31aa8a2417d25049ef0c54150cf760d9b8d3da69f12ff497a1083061b1dc4ea2a1babdc7d60e1e5f78b969955bb8c17c
acb2b91f134fd21e710016fb200a3e385383f69b3f8517b53f647b0a1e84b0b8b059901a9b0b2e817ea0bea420f58a4c3823486dfc8f7b6b65611c16e282ad41
19940776a3fb25a306218e8a7955411a7ba1a06ca6d7f04d18d4e0852ac688bd07d443d2e7a08075ac0f2d1f8ca2cd46d45cb20eb0ea2cf8c67f89627917bebe
aa0b187042585d2186a5dc2c05e652c28971c152e3858611136465f4192199999832e0c2b9ac4c7a49ceabfbb950b8fb6287494617479963f2574800f68ac954
09783a605f03907112399429a85b12565a615e6ce630c36f41a95a8b2e5c194a3a6fd414000f55b9bb0b1981613acc65db29de86f67f83efd16c4a48220950f5
a554099b5972455371298c1781e18004036730bc1bf55972e5cb9443a7de56098841cc5d79911e91f4e6acc5aa03f90fe7a54a8461182d89b65ce86c88ac30c8
962710ac42a5729c3e8692e2e22cbf51a0b0ccd9542cadc0c4036cca42a44a7c4bcd6c1b7eae5460cf6b81f16f79c28c18870d546bd23acdccb13307c59ab942
42df18cb2f1820de29e6186122303dc09c65bc23d6947183282b2f451084e2a5f8a9f76e2b35d6ae38b4d5e04afce655b61ae513f0fd967e5575d453f631516f
a06e2ba8e405e298e834be60758d11b85310e3710b2a106d48a8b5ce5091017820850bd584af37a038250c9e59596f726ea68f8ce66dd656058a7497b36d406e
1a45a95728226bd721cc1c415d8a5825059302b022e3761d0387bc52e2594ab58b51531a9530f78d4a08232c15fb91101744b218b788540f7a181e68f50f961b
bf662621fad162bb827544c5ae521f1a1a5ea092d4a4ea471431d259e9f80cc415172d6a16e501a5973f3a992b7804b4546570a2e2cfd90ce1e4e2c4bf8b9a97
8aadf785dd6bb12985f45e21535f2c3c08f0c7758f94e2bf12ed50ee131c55d897e308bb1fd4b6fcf65528176bde07af9a5e501ed0ce068e122ceed9f83679d4
6b0484094ecde6215300ad41d7fac4c933b6781b8a42f217e046258aacdbe496e20bb1b672d388e62054001cda95de51511558e3748665ca8cf4581969ced4f6
96590f78a6d5792e3fc119468afa89b9d8b648bb674da00d95e0b8ab869188f4bd40fdf68003e61d3460a2b59a8ad18ca6fd930ccbdc7e88a63c95fccb74bc0b
f6156475c2cd48991b175b90edbadb71e0081581c15742794109341b05e5d07b0cbe97b5ff00b595ed53722e09798bc63f0090b180f6250d08e82cb0643ce670
d18cb7c29cc23b12b657de39758e344c8103a071e61775a1ff00d599a4401dd36e4ed070095f113350f1275bf92a9156bfe728b1ef7fc41f47b7fa4ca01ef7fe
100cfe12ff006da75f88970b4ea2fc852a4e88fb86a7466d622be521be5ab98523ac7f0b21648ed4e52a591cd2d805f9964ca8e0b83e503d79966f50dc0bd26f
a83d1a96885ec6f8978b8b16912248d6b1122abc434dfd095a498e8c54ee864a3bd457b116f09ed2fb21c54ab168350ff12b27cebea53d81051043975300bb51
999345092c84f28330c75876435eb8260bc01e605c2e183044b8a60458c572e63c13da353dc403097c4a76107883c1021a22e6611790992753c896e44cf5aba9
1fa216094904236f31846e62ba865704e489c910b51299c4af5348458c449885f246505b4251fc881b090738778210c41070d44bc45e6386483d677263151c16
41ed0eb10c36466a0ed1259166a013094d88a6c83e210c4b2c6e12e67040992585826462a3ac5a84b89527ffd9}}}}}

\par \pard\plain \s51\sl288\slmult1\ql\nowidctlpar\hyphpar0\sb0\sa140\ltrpar\cf17\dbch\af9\langfe2052\dbch\af13\afs24\alang1081\loch\f3\fs24\lang1033\qj\widctlpar\sb0\sa225\rtlch \ltrch\loch

\par \pard\plain \s51\sl288\slmult1\ql\nowidctlpar\hyphpar0\sb0\sa140\ltrpar\cf17\dbch\af9\langfe2052\dbch\af13\afs24\alang1081\loch\f3\fs24\lang1033\qj\widctlpar\sb0\sa225\rtlch \ltrch\loch

\par \pard\plain \s51\sl288\slmult1\ql\nowidctlpar\hyphpar0\sb0\sa140\ltrpar\cf17\dbch\af9\langfe2052\dbch\af13\afs24\alang1081\loch\f3\fs24\lang1033\qj\widctlpar\sb0\sa225\rtlch \ltrch\loch

\par \pard\plain \s51\sl288\slmult1\ql\nowidctlpar\hyphpar0\sb0\sa140\ltrpar\cf17\dbch\af9\langfe2052\dbch\af13\afs24\alang1081\loch\f3\fs24\lang1033\qj\widctlpar\sb0\sa225\rtlch \ltrch\loch

\par \pard\plain \s51\sl288\slmult1\ql\nowidctlpar\hyphpar0\sb0\sa140\ltrpar\cf17\dbch\af9\langfe2052\dbch\af13\afs24\alang1081\loch\f3\fs24\lang1033\qj\widctlpar\sb0\sa225\rtlch \ltrch\loch

\par \pard\plain \s51\sl288\slmult1\ql\nowidctlpar\hyphpar0\sb0\sa140\ltrpar\cf17\dbch\af9\langfe2052\dbch\af13\afs24\alang1081\loch\f3\fs24\lang1033\qj\widctlpar\sb0\sa225{\scaps0\caps0\cf1\expnd0\expndtw0\i0\b0\dbch\af12\rtlch \ltrch\loch\fs21\loch\f8\hich\af8
Fusce vitae vestibulum velit. Pellentesque vulputate lectus quis pellentesque commodo. Aliquam erat volutpat. Vestibulum in egestas velit. Pellentesque fermentum nisl vitae fringilla venenatis. Etiam id mauris vitae orci maximus ultricies. Cras fringilla ipsum magna, in fringilla dui commodo a.}
\par \pard\plain \s51\sl288\slmult1\ql\nowidctlpar\hyphpar0\sb0\sa140\ltrpar\cf17\dbch\af9\langfe2052\dbch\af13\afs24\alang1081\loch\f3\fs24\lang1033\qj\widctlpar\sb0\sa225{\scaps0\caps0\cf1\expnd0\expndtw0\i0\b0\dbch\af12\rtlch \ltrch\loch\fs21\loch\f8\hich\af8
Etiam vehicula luctus fermentum. In vel metus congue, pulvinar lectus vel, fermentum dui. Maecenas ante orci, egestas ut aliquet sit amet, sagittis a magna. Aliquam ante quam, pellentesque ut dignissim quis, laoreet eget est. Aliquam erat volutpat. Class aptent taciti sociosqu ad litora torquent per conubia nostra, per inceptos himenaeos. Ut ullamcorper justo sapien, in cursus libero viverra eget. Vivamus auctor imperdiet urna, at pulvinar leo posuere laoreet. Suspendisse neque nisl, fringilla at iaculis scelerisque, ornare vel dolor. Ut et pulvinar nunc. Pellentesque fringilla mollis efficitur. Nullam venenatis commodo imperdiet. Morbi velit neque, semper quis lorem quis, efficitur dignissim ipsum. Ut ac lorem sed turpis imperdiet eleifend sit amet id sapien.}
\par \pard\plain \s1\ql\nowidctlpar\hyphpar0\sb240\sa120\keepn\ltrpar\cf17\b\dbch\af9\langfe2052\dbch\af13\afs36\alang1081\ab\loch\f4\fs36\lang1033{\listtext\pard\plain }\ilvl0\ls1 \li792\ri0\lin792\rin0\fi-432{\rtlch \ltrch\loch
Lorem ipsum dolor sit amet, consectetur adipiscing elit. }
\par \pard\plain \s51\sl288\slmult1\ql\nowidctlpar\hyphpar0\sb0\sa140\ltrpar\cf17\dbch\af9\langfe2052\dbch\af13\afs24\alang1081\loch\f3\fs24\lang1033\qj\widctlpar\sb0\sa225\scaps0\caps0\cf1\expnd0\expndtw0\i0\b0\dbch\af12\rtlch \ltrch\loch\fs21\loch\f8\hich\af8

\par \pard\plain \s51\sl288\slmult1\ql\nowidctlpar\hyphpar0\sb0\sa140\ltrpar\cf17\dbch\af9\langfe2052\dbch\af13\afs24\alang1081\loch\f3\fs24\lang1033\qj\widctlpar\sb0\sa225{\scaps0\caps0\cf1\expnd0\expndtw0\i0\b0\dbch\af12\rtlch \ltrch\loch\fs21\loch\f8\hich\af8
Nunc ac faucibus odio. Vestibulum neque massa, scelerisque sit amet ligula eu, congue molestie mi. Praesent ut varius sem. Nullam at porttitor arcu, nec lacinia nisi. Ut ac dolor vitae odio interdum condimentum. Vivamus dapibus sodales ex, vitae malesuada ipsum cursus convallis. Maecenas sed egestas nulla, ac condimentum orci. Mauris diam felis, vulputate ac suscipit et, iaculis non est. Curabitur semper arcu ac ligula semper, nec luctus nisl blandit. Integer lacinia ante ac libero lobortis imperdiet. Nullam mollis convallis ipsum, ac accumsan nunc vehicula vitae. Nulla eget justo in felis tristique fringilla. Morbi sit amet tortor quis risus auctor condimentum. Morbi in ullamcorper elit. Nulla iaculis tellus sit amet mauris tempus fringilla.}
\par \pard\plain \s2\ql\nowidctlpar\hyphpar0\sb200\sa120\keepn\ltrpar\cf17\b\dbch\af9\langfe2052\dbch\af13\afs32\alang1081\ab\loch\f4\fs32\lang1033{\listtext\pard\plain }\ilvl1\ls1 \li936\ri0\lin936\rin0\fi-576{\rtlch \ltrch\loch
Maecenas mauris lectus, lobortis et purus mattis, blandit dictum tellus. }
\par \pard\plain \s51\sl288\slmult1\ql\nowidctlpar\hyphpar0\sb0\sa140\ltrpar\cf17\dbch\af9\langfe2052\dbch\af13\afs24\alang1081\loch\f3\fs24\lang1033\qj\widctlpar\sb0\sa225{\scaps0\caps0\cf1\expnd0\expndtw0\i0\b0\dbch\af12\rtlch \ltrch\loch\fs21\loch\f8\hich\af8
Maecenas non lorem quis tellus placerat varius. Nulla facilisi. Aenean congue fringilla justo ut aliquam. Mauris id ex erat. Nunc vulputate neque vitae justo facilisis, non condimentum ante sagittis. Morbi viverra semper lorem nec molestie. Maecenas tincidunt est efficitur ligula euismod, sit amet ornare est vulputate.}
\par \pard\plain \s51\sl288\slmult1\ql\nowidctlpar\hyphpar0\sb0\sa140\ltrpar\cf17\dbch\af9\langfe2052\dbch\af13\afs24\alang1081\loch\f3\fs24\lang1033\qj\widctlpar\sb0\sa225\rtlch \ltrch\loch

\par \shpwr2\shpwrk3\shpbypara\shpbyignore\shptop0\shpbxcolumn\shpbxignore\shpleft2819\pard\plain \s51\sl288\slmult1\ql\nowidctlpar\hyphpar0\sb0\sa140\ltrpar\cf17\dbch\af9\langfe2052\dbch\af13\afs24\alang1081\loch\f3\fs24\lang1033\qj\widctlpar\sb0\sa225\rtlch \ltrch\loch
{\*\flymaincnt5\flyanchor0\flycntnt}{\shp{\*\shpinst\shpwr2\shpwrk3\shpbypara\shpbyignore\shptop0\shpbottom2660\shpbxcolumn\shpbxignore\shpleft2819\shpright6819{\sp{\sn shapeType}{\sv 75}}{\sp{\sn wzDescription}{\sv }}{\sp{\sn wzName}{\sv }}{\sp{\sn pib}{\sv {\pict\picscalex100\picscaley100\piccropl0\piccropr0\piccropt0\piccropb0\picw200\pich133\picwgoal4000\pichgoal2660\jpegblip
ffd8ffe000104a46494600010101004800480000ffe20c584943435f50524f46494c4500010100000c484c696e6f021000006d6e74725247422058595a2007ce
00020009000600310000616373704d5346540000000049454320735247420000000000000000000000000000f6d6000100000000d32d48502020000000000000
00000000000000000000000000000000000000000000000000000000000000000000000000000000001163707274000001500000003364657363000001840000
006c77747074000001f000000014626b707400000204000000147258595a00000218000000146758595a0000022c000000146258595a0000024000000014646d
6e640000025400000070646d6464000002c400000088767565640000034c0000008676696577000003d4000000246c756d69000003f8000000146d6561730000
040c0000002474656368000004300000000c725452430000043c0000080c675452430000043c0000080c625452430000043c0000080c7465787400000000436f
70797269676874202863292031393938204865776c6574742d5061636b61726420436f6d70616e79000064657363000000000000001273524742204945433631
3936362d322e31000000000000000000000012735247422049454336313936362d322e3100000000000000000000000000000000000000000000000000000000
0000000000000000000000000000000000000000000058595a20000000000000f35100010000000116cc58595a20000000000000000000000000000000005859
5a200000000000006fa2000038f50000039058595a2000000000000062990000b785000018da58595a2000000000000024a000000f840000b6cf646573630000
00000000001649454320687474703a2f2f7777772e6965632e636800000000000000000000001649454320687474703a2f2f7777772e6965632e636800000000
00000000000000000000000000000000000000000000000000000000000000000000000000000000000064657363000000000000002e4945432036313936362d
322e312044656661756c742052474220636f6c6f7572207370616365202d207352474200000000000000000000002e4945432036313936362d322e3120446566
61756c742052474220636f6c6f7572207370616365202d20735247420000000000000000000000000000000000000000000064657363000000000000002c5265
666572656e63652056696577696e6720436f6e646974696f6e20696e2049454336313936362d322e3100000000000000000000002c5265666572656e63652056
696577696e6720436f6e646974696f6e20696e2049454336313936362d322e310000000000000000000000000000000000000000000000000000766965770000
00000013a4fe00145f2e0010cf140003edcc0004130b00035c9e0000000158595a2000000000004c09560050000000571fe76d65617300000000000000010000
00000000000000000000000000000000028f0000000273696720000000004352542063757276000000000000040000000005000a000f00140019001e00230028
002d00320037003b00400045004a004f00540059005e00630068006d00720077007c00810086008b00900095009a009f00a400a900ae00b200b700bc00c100c6
00cb00d000d500db00e000e500eb00f000f600fb01010107010d01130119011f0125012b01320138013e0145014c0152015901600167016e0175017c0183018b
0192019a01a101a901b101b901c101c901d101d901e101e901f201fa0203020c0214021d0226022f02380241024b0254025d02670271027a0284028e029802a2
02ac02b602c102cb02d502e002eb02f50300030b03160321032d03380343034f035a03660372037e038a039603a203ae03ba03c703d303e003ec03f904060413
0420042d043b0448045504630471047e048c049a04a804b604c404d304e104f004fe050d051c052b053a05490558056705770586059605a605b505c505d505e5
05f6060606160627063706480659066a067b068c069d06af06c006d106e306f507070719072b073d074f076107740786079907ac07bf07d207e507f8080b081f
08320846085a086e0882089608aa08be08d208e708fb09100925093a094f09640979098f09a409ba09cf09e509fb0a110a270a3d0a540a6a0a810a980aae0ac5
0adc0af30b0b0b220b390b510b690b800b980bb00bc80be10bf90c120c2a0c430c5c0c750c8e0ca70cc00cd90cf30d0d0d260d400d5a0d740d8e0da90dc30dde
0df80e130e2e0e490e640e7f0e9b0eb60ed20eee0f090f250f410f5e0f7a0f960fb30fcf0fec1009102610431061107e109b10b910d710f511131131114f116d
118c11aa11c911e81207122612451264128412a312c312e31303132313431363138313a413c513e5140614271449146a148b14ad14ce14f01512153415561578
159b15bd15e0160316261649166c168f16b216d616fa171d17411765178917ae17d217f7181b18401865188a18af18d518fa19201945196b199119b719dd1a04
1a2a1a511a771a9e1ac51aec1b141b3b1b631b8a1bb21bda1c021c2a1c521c7b1ca31ccc1cf51d1e1d471d701d991dc31dec1e161e401e6a1e941ebe1ee91f13
1f3e1f691f941fbf1fea20152041206c209820c420f0211c2148217521a121ce21fb22272255228222af22dd230a23382366239423c223f0241f244d247c24ab
24da250925382568259725c725f726272657268726b726e827182749277a27ab27dc280d283f287128a228d429062938296b299d29d02a022a352a682a9b2acf
2b022b362b692b9d2bd12c052c392c6e2ca22cd72d0c2d412d762dab2de12e162e4c2e822eb72eee2f242f5a2f912fc72ffe3035306c30a430db3112314a3182
31ba31f2322a3263329b32d4330d3346337f33b833f1342b3465349e34d83513354d358735c235fd3637367236ae36e937243760379c37d738143850388c38c8
39053942397f39bc39f93a363a743ab23aef3b2d3b6b3baa3be83c273c653ca43ce33d223d613da13de03e203e603ea03ee03f213f613fa23fe24023406440a6
40e74129416a41ac41ee4230427242b542f7433a437d43c044034447448a44ce45124555459a45de4622466746ab46f04735477b47c04805484b489148d7491d
496349a949f04a374a7d4ac44b0c4b534b9a4be24c2a4c724cba4d024d4a4d934ddc4e254e6e4eb74f004f494f934fdd5027507150bb51065150519b51e65231
527c52c75313535f53aa53f65442548f54db5528557555c2560f565c56a956f75744579257e0582f587d58cb591a596959b85a075a565aa65af55b455b955be5
5c355c865cd65d275d785dc95e1a5e6c5ebd5f0f5f615fb36005605760aa60fc614f61a261f56249629c62f06343639763eb6440649464e9653d659265e7663d
669266e8673d679367e9683f689668ec6943699a69f16a486a9f6af76b4f6ba76bff6c576caf6d086d606db96e126e6b6ec46f1e6f786fd1702b708670e0713a
719571f0724b72a67301735d73b87414747074cc7528758575e1763e769b76f8775677b37811786e78cc792a798979e77a467aa57b047b637bc27c217c817ce1
7d417da17e017e627ec27f237f847fe5804780a8810a816b81cd8230829282f4835783ba841d848084e3854785ab860e867286d7873b879f8804886988ce8933
899989fe8a648aca8b308b968bfc8c638cca8d318d988dff8e668ece8f368f9e9006906e90d6913f91a89211927a92e3934d93b69420948a94f4955f95c99634
969f970a977597e0984c98b89924999099fc9a689ad59b429baf9c1c9c899cf79d649dd29e409eae9f1d9f8b9ffaa069a0d8a147a1b6a226a296a306a376a3e6
a456a4c7a538a5a9a61aa68ba6fda76ea7e0a852a8c4a937a9a9aa1caa8fab02ab75abe9ac5cacd0ad44adb8ae2daea1af16af8bb000b075b0eab160b1d6b24b
b2c2b338b3aeb425b49cb513b58ab601b679b6f0b768b7e0b859b8d1b94ab9c2ba3bbab5bb2ebba7bc21bc9bbd15bd8fbe0abe84beffbf7abff5c070c0ecc167
c1e3c25fc2dbc358c3d4c451c4cec54bc5c8c646c6c3c741c7bfc83dc8bcc93ac9b9ca38cab7cb36cbb6cc35ccb5cd35cdb5ce36ceb6cf37cfb8d039d0bad13c
d1bed23fd2c1d344d3c6d449d4cbd54ed5d1d655d6d8d75cd7e0d864d8e8d96cd9f1da76dafbdb80dc05dc8add10dd96de1cdea2df29dfafe036e0bde144e1cc
e253e2dbe363e3ebe473e4fce584e60de696e71fe7a9e832e8bce946e9d0ea5beae5eb70ebfbec86ed11ed9cee28eeb4ef40efccf058f0e5f172f1fff28cf319
f3a7f434f4c2f550f5def66df6fbf78af819f8a8f938f9c7fa57fae7fb77fc07fc98fd29fdbafe4bfedcff6dffffffdb00430005040404040305040404060505
06080d0808070708100b0c090d131014131210121214171d1914161c1612121a231a1c1e1f212121141924272420261d202120ffdb0043010506060807080f08
080f201512152020202020202020202020202020202020202020202020202020202020202020202020202020202020202020202020202020ffc2001108008500
c803011100021101031101ffc4001c0000010501010100000000000000000000020001030405060708ffc4001a01000301010101000000000000000000000102
0300040506ffda000c03010002100310000001cef90fb09a72952d6a75cbea4d4e63c8fb5e46b47b7ac13eefbbc600d1ab0076056ce0100416acafcf72f764c5
b2c88cb7775e3dda7264f5754ed3360db03601aa1102d6c81bcfca398411c56ce32d9d4101c847bb834e8bbcea88916beadd3e3db6907534b4989384bd3c6b57
b1dcfd09846af1ab3660044e582d96ce0b8c977982f6f3d37b5257036b9fabd4fd0f0a4558fa5e5acf3a5d3e2d4eecbbc3604bdbb9a4db0e6118183157c160f8
ac5d5a347f15a74410725d6263afe6eaf48eef09d7074996aa0a7cea3eb705d52c4e9e4f68e0af54a83b33289472ae558e432c5c3514af8776343ced624d7f9f
a3d1a27b2b798614fb94983918fcddbe1fd74c0e9e4d74deede75e4647644513222110b640a0d842bc5deb940e0149f97b7dab8d374f1985b3e945d821a0957c
a376f95fa3c359e5ed1e7f5773006e8e5132b156216c81607917b60d2a294e7185b8dbd53cdbc926255e8bdaf1d6c2a6347c89f57cf3ea72e3db9b690fbf799d
368cdd95ca265121608e056f34e8b516a62837675ea796fa5e67a4b9fa6ca6f41fa7f91e7bccf5f3d9f03ba16d27c2d5312d0b197b291d645264e9d652ba065a
6af66b2a894f30e8e9c12dae94b894e8b92d67cef4adcab6267b3f67e7208d2bad7396f84dabbcb61277424f49d5a2d869a74074899200d18311192691ea47a9
5453a1e6b75ca97edcd61e3ccf93ee36c8e00d09d1b4e85a117571eaa248c8656ab2e55467d044da33a326916bd36d293cf3aef21e9001471538fc3e857d5061
015379d829436c2eff003e769c84390442da26d20d608ead92cbeb20a9b20c4ac919908ccf21e7fbce529d6557a79bb6bf0d20451dcace54ca995321c81d9308
b1a28d9aadaef3d1759f31024aee19d779d799ee994ad49e7d274a9372b6996f64be8b7535802719f013a225866d9d73111632309e82d93054684df84e1f55ca
46c80c88a8b2d8cb315972332915b886da9914b6cfb2c61c63c50cc0be311780b366c74acd95ca8b21e05945d642b3653c0b006d19138d710ce8c810c6224766
0483163097af9b9971a73d2e08a8b2cb84a01b239078160632d85b44c076b2bae4d9958098f173833572f51cff00ffc400271000020202020005050101000000
0000000102000304110512101314152120222330310632ffda0008010100010502af2d5695cb5d26526ce5d7af51597af22a09996abbf1aea178c707337fa6eb
7a0b73ea42f9f6bc2db338bab55388bc6e341c7e34f6fc79edb8f3dab167b56346e130ccf65c5598bc7d78d67e9e62deb429d9dcdcabee7c44eb5b41e0cea82f
e5f168193fe8ec2389cff5b87fb39bbbf3d66769b982bdb2291aa8c1e19950bb1eea4d76389c2e6fa4cf0db1fa9ce9390b7cce401d0ed17e4f169b71f00c1e0c
36398c6eb1c7c3ec1e173c65e16e6ff4e5375aafa6c1779b15a24e213f10fa732916d194a68b9da70f9de93391c3afe9cf7d56ca1a5b88ad2ca1e995640338f4
e947d2dfcff418718cdce073fd462fe9cfb3ee8cc00bed16b5184ad70b854bea84f553b09dd67710b4cda45d466d268c99c6659c4cda6e4b2bee27713b4dcd89
b13719beccdb8b65f9c105b9165cd8f474984377dcdf954f835408b0148d7f90afcbdd64a33b2ae4e4b1fb5c38d768386b8cc3c6cfc756f702455c896ae96ea4
6a7c18287f36c53d2c3d71f27cc46d59735552a0dce3ff00e06364315c6b84f4f6c366e7c464ada3a56b2fed282cb120eb0d9d51722d8320c39680faca8c3954
439b54f5f5cb6faecacd8b3ad6d0e35261c1130686088ee816c46f0dcdc0e561b0c2e67dd2f6b02d64ec749f6cd88f5abcb53cbf1dee323b0eb9ca557334b4e4
7508c138dfe7c19d04d389b84fcf710dc04acb5a3a58a2d606b1c960ac1cb7193de38b9ef5c64f7bc09ef58f0729483ef16caf90e46d38eb94cb563574c2cb37
3e3c35353460b277967f31f1bcf643522e552f90130eae9e8717630f1c4f4f8f3c8a27934cf2699e5d027998c91b35046cdc833d466f9899d5c5bd1e6c78ee6e
6ccdec16962069d6043111a00c225b6082f58b6033737a9e609e66e7e49f93c3e2796860362c195608996a63d8e5aab3ecdf81f99a86a0604eb06a09a9d60dac
5bf5058ad3e3c373b426769b9b3e0c81a75759e75cb036fe9fecd6a0fa089f316c6116f9d819a9a3e3b80cdc30995b180fd0209a83e8d4226a76222d8606dc33
535e061319a7ffc40029110002020103030402020300000000000000010211031012131420210430314122324051425271ffda0008010301013f01e75b459059
50b244e58d8e71334d367a56a8f54ed32bd9c58b77c8b11b628b123d5cabc1063f5733abc875990eb6675923ac97f473a7f4473a5f44b2a6bdac3e116596633d
4cae4458f48c1cbe05e95ff90a38e3f08cb15fb445dd6597d88b2cb3e206577310f4f4f3db224a8911ff0051c6bb6cb2cb2cb225963647cb32ba88c43d22c8cb
7c2c648fdd595d97a5e965912d9bcdc6247a97f88fb704e9d13f0c9331ce9d0c631f7c74a2a8c534677e6bba24ff002858c6467ba23efbd13132cbbf04511c5c
96ce94e94dacd8cd8c51313fa322a6331ca98fbdca84c4597645511661f102f48e46998da912499e2bc11b26ace338f56cdcc7214af4cdfa98dfe3aa1310b241
7d9cd0fece7c7fd8b1d1ff0004e421c91bc721b1f91c46b47a58dd884c421116bec9414be096392d28a1c14858d0e28a4645e0b1fb5626290d9e4de5c5fc95ae
e1e48af937c5fd925e28716b4a36336338d9c6718e2977d965a290c64e7b476fe48cf69d448ea247348e591c9239246f917236c99c7238cd838b2bb28a1bd18f
4a286b4dc5eb456946d28a36238cd86c66dd1fbf5a5695a228da5e8fddb2fd9bfe4fffc400271100020201030305010101010000000000000102110312132110
3031042022415132714061ffda0008010201013f019fa66e64bd3325e9e42f4f33624912c523d2637147ac5f230aa5da9cabc0db63b12ae9815cac92349b66d2
364d9364a92fb256fc9cf6a4ad92545144f846055024210e5a4d6df81636fcb3f87a5f7631268d2513e59055148911e993f48cac4ccb1b565f6a86254868d232
ae5d18844910e1d084648e8976e86b8a1e2fc1c4998d7cafa3285d26ab921cab1232c3547b715cf4b387e4c985a22bd9432460953a174cd0d2fb504328aa272e
192969e0dc1e435a3711ad0e478766376ba648ea4557bd2b1aa20b828aa2465f06456c6868960543e04acc78235726648417831c8dc46ea2528485a0f81a50a0
38d74c5fd13fe855d19465f234c7063848795b3fd383511ff492ff00d28a170596722b39341b6cd2fecd2726a66b3273e08b6852470596597d71792bd898bd96
7c075fa3a18d53e95eca349a19a24478628d9b4cdb34234c4f81aa3fa5c054fc15d1f5a1a348e2fa210a3621ad46cc4d98fe9b31fd3661fa6d43f4d981b58cdb
c68bc68de88f39ba9fd8a66b2d76132cd46a2c691a0aaeb451c0ebaea685919b86b1648fd8e4bebda99e7ad96793495dab351657bafdb7d290e3daa1aff81c7b
147fffc40037100001020304080305090100000000000001000203112110223132041213203041517105618123339192a134404450627282b1d1e1ffda000801
0100063f02ca665652b036628de46ab1512478545576b1574ea8b5bf3599164591645902c817bb0aeb648b982a78520713bbf4dc9b96799f24760c97741e7373
e2b61f4aee3021e75dc737a84e6bacd471f671388544f2a6e39dd0296eed00b263109b337db43c329d10733357a96877533de2d4e866c13371f42811c222d98c
100534746efed982d0c71bcda70836caad935426cb9a975aee636b9a5399635d3ba6850703c09a701c954ad56299c56b72689a23a53708aa2f72f6508a94766a
29b44d652a8d280ab82a43430015ec6dd6d6a5ae76ccd55682d73bcd4f665642b2158aaaab66a90fe8a90dc7b291d0dcab064b0540aac0b2a92aacca86c9b5f5
1c955640561257627c56a8a96a93db3dcc563662b321227d148cfe3b955564c750ba85fed0aeaa8d3eaae43791d94e2682f1e6da2d6911e4f0b5ccbd13a2c8c8
d2da1b3c9557557184a996482241527c6d4eed2bed7f0615efe21ed08afc43bb4357745d31dfc153c374b3e8a70fc0e2cfd02bbe06ff009d4a1781fab9ca7a4b
2143fd2caabbae7f7bcbbfb5592af00a9c58a18cef5283585a02019a4ecc04369126eea1722b92e4b95b8aff008aec37395c820775388dd76f4064af35d0fb85
4703c19852598ac4aa2a99aad15372eae4ab6cc2bb10faabc26ab4536b95ec787457adc38375df70afe49fffc400281000030001030304020301010000000000
00011121314161105171208191a1b1c1d1e1f030f1ffda0008010100013f21350b67f11946af629e589cb0d081f4acc914840cd036363f53549a37b9ed0742d9
e0c759bac6d3c1a175adf8e8a2b47c1d90e30dbb3e0ffc01cc35bf88fd043766e9b0d8dfaf4e0e06f8285d2b3f22302d122bd28bb22e479a8adb2119c3656eca
70bd98d8fa31b2fa9b8a97ab4518af4e93ca159ccfd06f18572c323472e5c2f86216d32946c6fd7745a275309a2a63078105ee6226d8e84ea1f6b086e6658ca9
fa0084bd6fa6af819836dcc29c2d09794e8f83225facb4fb18a242e8f52b830431e0cc3178301a55a8bff1e56c15aa16bc19a7034b0cb2acaaf96265213a2d0c
4b69af49b2756a8eee784c5e9a5296a3928c2da0b29b753b2468b979c9f8fd0bbc4f725af495d188b04d56a1ca58b81b35f041265a68e53948ee41cc5b71a255
884c1806301d12d87f717baee3235941b99fd0584f032aa3a450d6178d847715eb0813685b98bf73f8cc6a19914d9b197535dd94eee4516a84eb44b0ab7b12ec
79379c8af2dab52376f68d207112435bd1de64a455e4d60909b20f818a310d01f608f7c2217bc93486bf9670508741b16bf186f59291865d19195028b2b1e9ba
c861b0740b3ca1bf94bb9a7b78b1cdae105ac41b6d77625c15ba34a8636868a3a411455e4677e84dbe45802a1acd72317f627da8e1468ecf71e97eaef23cab16
a269e4b5ca9cdb007a0978359f935135b27ec5e169921e40370a497217ba29065ca94d6b50e74dec7414cd062fd435ea9e4d29a0ccd42d7036af2356ccbe25c0
e32cb6fd0423aff8f8124c27a7bc099f426bf7326a2a5b90abadbeed3f826c2e025f26507ee37c96db35eff900ac4d5b1c1d092d887aa38b185387ba1a771ee6
a9fd1859181558e893171b3a256b125772824cad36ce61a1af8a33dd5ec7f9412fb7d1e1f92aad7e4e27b5185f14a1f7d21e4c1e95271feb22ef8f627956cc57
b929ca409cb0f28bd4c8f587d0471911453f229334e480d8c6c1c9c80d4744e2860778d0f413e469968124da57b8db6a36211f7583631db23169f03b81c8c98a
3268522b794f27784bb191289b1da44190c5f5cd121a73237664482920cfa0d2e8347a1c827dce00dc23d6e4904c793429204fa3a15137b928d223c1cb8878c3
a375a31a87ca141f507eb2b746ba309485d48592040c2d0be9d88431a8c21878e48fffda000c030100020003000000106b0631a8f6e44e0c76cfc6a197c34b9c
d5a5e0fb54038412dabf4d200da8ebcf66ea2642070e2ecb9e6ef3daaf46c64184b704900e32fd4ed133cd5d6d80b812412cbe809ae198e77100949233ff002e
20ddb23398c9b0917cb5da4fe182bd6b94f1d5ab100351287c7902e5b68139144dd8dc3e3dfbc7e8199d0098cd819fcd9cdd48ab2249280e782fc18ff9527a96
29a4292210f465cc52715aba0ea39c6ebfffc400271101010100020202010304030000000000010011213110415161207191f03081b1d1c1e1f1ffda00080103
01013f104389cc21c966bb8b6ddacdbb30e6e1760317682083f226bd220c3823aa4ead38b03fa0ff009f083a09fabc1fa37d65a708bdc374189867bb39820fcb
21cfe2c672e5900fd5f13966f2139790bd8fdce02e184441e37f003e0359e01702e4ce9c8e66d0fae3c5cd93bee548c266afa7fcda31820ba967f002116b1cae
5c401e28190d75f05360df682ce5bdd2504f71e0b2ccdf0d8847cc03a472e6757b9b1c1fa7efff0050b2596db9974cd62e4b9b74dc65294b2db6c30ca1b2cbe4
4c0b7112c96d89e3708f64e79653ee52cb2cb6db107cc11db166992afecff3f7956a1babebb1ec9336f6adf2571cf4ca665996d806b6c693e2316f81e27b2e27
df3fbc4610c28c4625c382f62678cfce4c08632d91c7814eed516ba5b08788d679e0e667cc46407d2c3d6ec246905c6cb4d5847521f5690c0507cc07b9c81663
a10cb0624b3af0294a224575e37773bee79e463d486a41f57c39f8eed92b64cb2db6cbe46123ede5053211d42e98e82dac664b938bb865bb0e522a771236dfe3
fead3ff1ff0057f2e7c1ab5768ce7af1b16c30afb453e47ac1acd36777399d38253d4bfa95f536c296deaf84c27647cdb21c42ecf036186356bc0bb2b94e4891
ebc0697dac3259b6885e00f86acbddadf56d90109ee594b2ccccc925996dbe0b3c02d41f3620b84060782ca6d999667c659e062134f231110c2b65999966dfe8
0c30dbe06186dbffc4002511010101000203000104020300000000000100111031214151a120618191b1d1c1e1f1ffda0008010201013f10eede090f86cde188
f522993dcc8e692bb9c16df12cf19659270fe33c87715e178409e6daf81ff5c06bb6036d03d36becfb6c7460fbac5870f1965924927058274c709b8fdff88c61
1f6ba664e8d58599e72cb2c9249b4f3fa20e05fd99fdff00d42110cf08009c5e3fd91b2db780b2cb2c9261f1c26cce08e118897cf01c3727e45e2d9cf32a1e9b
620820b2cb2c9274842e92463c30bf86e144125a31eac10e2ebbb20fb11041671964969772ed7a45b89642fde18390e9790f00bce9d30701071965925dec2d3d
465aca26c40fe5261b2e15a0dc9f00b098237252c6218638c25584cb1b133bb116c3a7db6794dff3e61acb6789312be7b00796cbdd9f6f1c09e586e9d41eac5b
3d65e1e5115347867833a3f69cee5f0caf575accfd96badbcbb82d59d3b0e6c1c3f90fa12f9914a60dd1bc935ead1eecedfb26b5f6bc026df0c2b82a19698585
90e5919a5911213de98888076cabb603a8b599fd5e4e136193931d3abc7026143f46c91a93c197af01f6ff008ff71ee7f25876fe4b07b3fbbc38fe565ece5384
895f778982cfc5ea58c2f58bcac1e0bacf51f68fb22d8c3ff75fbbf982f7f9b56afe63af927d30fa9ec43f4dfbad271e999725d8b320d9cee17636a7ee0bdcff
0036bd4bedc6c6a71df05e9c9d46f623ea2e4c16c84478eb852d8ec6c42a9da7e251df1bfa326ce0642f76271645bc1e235c78b3e43f6268cb4a489c6fe878ce
05267031c8f1bceb0c360c1271b6f19044ffc400261001000202010305000203000000000000010011213141516171108191a1b1c1e1d1f0f1ffda0008010100
013f106a73081d65206d754f9e528f6a31aa8a2417d25049ef0c54150cf760d9b8d3da69f12ff497a1083061b1dc4ea2a1babdc7d60e1e5f78b969955bb8c17c
acb2b91f134fd21e710016fb200a3e385383f69b3f8517b53f647b0a1e84b0b8b059901a9b0b2e817ea0bea420f58a4c3823486dfc8f7b6b65611c16e282ad41
19940776a3fb25a306218e8a7955411a7ba1a06ca6d7f04d18d4e0852ac688bd07d443d2e7a08075ac0f2d1f8ca2cd46d45cb20eb0ea2cf8c67f89627917bebe
aa0b187042585d2186a5dc2c05e652c28971c152e3858611136465f4192199999832e0c2b9ac4c7a49ceabfbb950b8fb6287494617479963f2574800f68ac954
09783a605f03907112399429a85b12565a615e6ce630c36f41a95a8b2e5c194a3a6fd414000f55b9bb0b1981613acc65db29de86f67f83efd16c4a48220950f5
a554099b5972455371298c1781e18004036730bc1bf55972e5cb9443a7de56098841cc5d79911e91f4e6acc5aa03f90fe7a54a8461182d89b65ce86c88ac30c8
962710ac42a5729c3e8692e2e22cbf51a0b0ccd9542cadc0c4036cca42a44a7c4bcd6c1b7eae5460cf6b81f16f79c28c18870d546bd23acdccb13307c59ab942
42df18cb2f1820de29e6186122303dc09c65bc23d6947183282b2f451084e2a5f8a9f76e2b35d6ae38b4d5e04afce655b61ae513f0fd967e5575d453f631516f
a06e2ba8e405e298e834be60758d11b85310e3710b2a106d48a8b5ce5091017820850bd584af37a038250c9e59596f726ea68f8ce66dd656058a7497b36d406e
1a45a95728226bd721cc1c415d8a5825059302b022e3761d0387bc52e2594ab58b51531a9530f78d4a08232c15fb91101744b218b788540f7a181e68f50f961b
bf662621fad162bb827544c5ae521f1a1a5ea092d4a4ea471431d259e9f80cc415172d6a16e501a5973f3a992b7804b4546570a2e2cfd90ce1e4e2c4bf8b9a97
8aadf785dd6bb12985f45e21535f2c3c08f0c7758f94e2bf12ed50ee131c55d897e308bb1fd4b6fcf65528176bde07af9a5e501ed0ce068e122ceed9f83679d4
6b0484094ecde6215300ad41d7fac4c933b6781b8a42f217e046258aacdbe496e20bb1b672d388e62054001cda95de51511558e3748665ca8cf4581969ced4f6
96590f78a6d5792e3fc119468afa89b9d8b648bb674da00d95e0b8ab869188f4bd40fdf68003e61d3460a2b59a8ad18ca6fd930ccbdc7e88a63c95fccb74bc0b
f6156475c2cd48991b175b90edbadb71e0081581c15742794109341b05e5d07b0cbe97b5ff00b595ed53722e09798bc63f0090b180f6250d08e82cb0643ce670
d18cb7c29cc23b12b657de39758e344c8103a071e61775a1ff00d599a4401dd36e4ed070095f113350f1275bf92a9156bfe728b1ef7fc41f47b7fa4ca01ef7fe
100cfe12ff006da75f88970b4ea2fc852a4e88fb86a7466d622be521be5ab98523ac7f0b21648ed4e52a591cd2d805f9964ca8e0b83e503d79966f50dc0bd26f
a83d1a96885ec6f8978b8b16912248d6b1122abc434dfd095a498e8c54ee864a3bd457b116f09ed2fb21c54ab168350ff12b27cebea53d81051043975300bb51
999345092c84f28330c75876435eb8260bc01e605c2e183044b8a60458c572e63c13da353dc403097c4a76107883c1021a22e6611790992753c896e44cf5aba9
1fa216094904236f31846e62ba865704e489c910b51299c4af5348458c449885f246505b4251fc881b090738778210c41070d44bc45e6386483d677263151c16
41ed0eb10c36466a0ed1259166a013094d88a6c83e210c4b2c6e12e67040992585826462a3ac5a84b89527ffd9}}}}}

\par \pard\plain \s51\sl288\slmult1\ql\nowidctlpar\hyphpar0\sb0\sa140\ltrpar\cf17\dbch\af9\langfe2052\dbch\af13\afs24\alang1081\loch\f3\fs24\lang1033\qj\widctlpar\sb0\sa225\rtlch \ltrch\loch

\par \pard\plain \s51\sl288\slmult1\ql\nowidctlpar\hyphpar0\sb0\sa140\ltrpar\cf17\dbch\af9\langfe2052\dbch\af13\afs24\alang1081\loch\f3\fs24\lang1033\qj\widctlpar\sb0\sa225\rtlch \ltrch\loch

\par \pard\plain \s51\sl288\slmult1\ql\nowidctlpar\hyphpar0\sb0\sa140\ltrpar\cf17\dbch\af9\langfe2052\dbch\af13\afs24\alang1081\loch\f3\fs24\lang1033\qj\widctlpar\sb0\sa225\rtlch \ltrch\loch

\par \pard\plain \s51\sl288\slmult1\ql\nowidctlpar\hyphpar0\sb0\sa140\ltrpar\cf17\dbch\af9\langfe2052\dbch\af13\afs24\alang1081\loch\f3\fs24\lang1033\qj\widctlpar\sb0\sa225\rtlch \ltrch\loch

\par \pard\plain \s51\sl288\slmult1\ql\nowidctlpar\hyphpar0\sb0\sa140\ltrpar\cf17\dbch\af9\langfe2052\dbch\af13\afs24\alang1081\loch\f3\fs24\lang1033\qj\widctlpar\sb0\sa225\rtlch \ltrch\loch

\par \pard\plain \s51\sl288\slmult1\ql\nowidctlpar\hyphpar0\sb0\sa140\ltrpar\cf17\dbch\af9\langfe2052\dbch\af13\afs24\alang1081\loch\f3\fs24\lang1033\qj\widctlpar\sb0\sa225{\scaps0\caps0\cf1\expnd0\expndtw0\i0\b0\dbch\af12\rtlch \ltrch\loch\fs21\loch\f8\hich\af8
Nunc ac faucibus odio. Vestibulum neque massa, scelerisque sit amet ligula eu, congue molestie mi. Praesent ut varius sem. Nullam at porttitor arcu, nec lacinia nisi. Ut ac dolor vitae odio interdum condimentum. Vivamus dapibus sodales ex, vitae malesuada ipsum cursus convallis. Maecenas sed egestas nulla, ac condimentum orci. Mauris diam felis, vulputate ac suscipit et, iaculis non est. Curabitur semper arcu ac ligula semper, nec luctus nisl blandit. Integer lacinia ante ac libero lobortis imperdiet. Nullam mollis convallis ipsum, ac accumsan nunc vehicula vitae. }
\par }" +} diff --git a/frontend/src/lib/fixtures/r4/resources/diagnosticReport/example1.json b/frontend/src/lib/fixtures/r4/resources/diagnosticReport/example1.json index 182ada1d..e314f13c 100644 --- a/frontend/src/lib/fixtures/r4/resources/diagnosticReport/example1.json +++ b/frontend/src/lib/fixtures/r4/resources/diagnosticReport/example1.json @@ -73,19 +73,21 @@ } ], "status": "final", - "category": { - "coding": [ - { - "system": "http://snomed.info/sct", - "code": "252275004", - "display": "Haematology test" - }, - { - "system": "http://hl7.org/fhir/v2/0074", - "code": "HM" - } - ] - }, + "category": [ + { + "coding": [ + { + "system": "http://snomed.info/sct", + "code": "252275004", + "display": "Haematology test" + }, + { + "system": "http://hl7.org/fhir/v2/0074", + "code": "HM" + } + ] + } + ], "code": { "coding": [ { @@ -126,4 +128,4 @@ } ], "conclusion": "Core lab" -} \ No newline at end of file +} diff --git a/frontend/src/lib/models/datatypes/codable-concept-model.ts b/frontend/src/lib/models/datatypes/codable-concept-model.ts index 1bef1d5d..5439ce5b 100644 --- a/frontend/src/lib/models/datatypes/codable-concept-model.ts +++ b/frontend/src/lib/models/datatypes/codable-concept-model.ts @@ -16,7 +16,7 @@ export function hasValue(data:any ): boolean { export class CodableConceptModel { text?: string - coding: CodingModel[] + coding?: CodingModel[] constructor(fhirData: any) { this.text = _.get(fhirData, 'text', ''); this.coding = _.get(fhirData, 'coding', []); diff --git a/frontend/src/lib/models/datatypes/human-name-model.ts b/frontend/src/lib/models/datatypes/human-name-model.ts index 450e7de9..7b0e587a 100644 --- a/frontend/src/lib/models/datatypes/human-name-model.ts +++ b/frontend/src/lib/models/datatypes/human-name-model.ts @@ -12,7 +12,7 @@ export class HumanNameModel { constructor(fhirData: any) { this.givenName = _.get(fhirData, 'given', []).join(', '); this.familyName = _.flatten(Array(_.get(fhirData, 'family', ''))).join(', '); - this.suffix = _.get(fhirData, 'suffix', []).join(' '); + this.suffix = _.get(fhirData, 'suffix', []).join(', '); this.textName = _.get(fhirData, 'text'); this.use = _.get(fhirData, 'use'); this.displayName = this.textName ? this.textName : `${this.givenName} ${this.familyName}`.trim(); diff --git a/frontend/src/lib/models/factory.ts b/frontend/src/lib/models/factory.ts index 3164ddd4..f7377d9e 100644 --- a/frontend/src/lib/models/factory.ts +++ b/frontend/src/lib/models/factory.ts @@ -31,7 +31,12 @@ import {ExplanationOfBenefitModel} from './resources/explanation-of-benefit-mode // import {BinaryModel} from './resources/binary-model'; -export function fhirModelFactory(modelResourceType: ResourceType, fhirResourceWrapper: any, fhirVersion: fhirVersions = fhirVersions.R4, fastenOptions?: FastenOptions): FastenDisplayModel { +export function fhirModelFactory( + modelResourceType: ResourceType, + fhirResourceWrapper: any, //this is a ResourceFhir object (database structure) + fhirVersion: fhirVersions = fhirVersions.R4, + fastenOptions?: FastenOptions +): FastenDisplayModel { let resourceModel: FastenDisplayModel switch (modelResourceType) { diff --git a/frontend/src/lib/models/resources/diagnostic-report-model.spec.ts b/frontend/src/lib/models/resources/diagnostic-report-model.spec.ts index 93c90360..551ca82b 100644 --- a/frontend/src/lib/models/resources/diagnostic-report-model.spec.ts +++ b/frontend/src/lib/models/resources/diagnostic-report-model.spec.ts @@ -18,8 +18,19 @@ describe('DiagnosticReportModel', () => { expected.status = 'final' // expected.effectiveDateTime: string | undefined expected.category_coding = [ - { system: 'http://snomed.info/sct', code: '252275004', display: 'Haematology test' }, - { system: 'http://hl7.org/fhir/v2/0074', code: 'HM' } + { + coding: [ + { + "system": "http://snomed.info/sct", + "code": "252275004", + "display": "Haematology test" + }, + { + "system": "http://hl7.org/fhir/v2/0074", + "code": "HM" + } + ] + } ] expected.code_coding = [ { system: 'http://loinc.org', code: '58410-2', display: 'Complete blood count (hemogram) panel - Blood by Automated count' } diff --git a/frontend/src/lib/models/resources/diagnostic-report-model.ts b/frontend/src/lib/models/resources/diagnostic-report-model.ts index 0c81e919..64422b38 100644 --- a/frontend/src/lib/models/resources/diagnostic-report-model.ts +++ b/frontend/src/lib/models/resources/diagnostic-report-model.ts @@ -65,7 +65,7 @@ export class DiagnosticReportModel extends FastenDisplayModel { this.performer = _.get(fhirResource, 'performer.0'); } this.has_performer = !!this.performer; - this.category_coding = _.get(fhirResource, 'category.coding'); + this.category_coding = _.get(fhirResource, 'category'); this.has_category_coding = Array.isArray(this.category_coding); this.presented_form = _.get(fhirResource, 'presentedForm', []).map((attachment: any) => { diff --git a/frontend/src/lib/models/resources/encounter-model.spec.ts b/frontend/src/lib/models/resources/encounter-model.spec.ts index 9fe2f800..2f4ee2ab 100644 --- a/frontend/src/lib/models/resources/encounter-model.spec.ts +++ b/frontend/src/lib/models/resources/encounter-model.spec.ts @@ -27,8 +27,8 @@ describe('EncounterModel', () => { it('should parse example2.json', () => { let expected = new EncounterModel({}) - expected.period_end = '2015-01-17T16:30:00+10:00' - expected.period_start = '2015-01-17T16:00:00+10:00' + expected.period_end = '2015-01-17T16:30:00Z' + expected.period_start = '2015-01-17T16:00:00Z' expected.has_participant = true expected.location_display = 'Client\'s home' // encounterType: string | undefined @@ -56,6 +56,11 @@ describe('EncounterModel', () => { expected.encounter_type = [ { coding: [ Object({ system: 'http://snomed.info/sct', code: '11429006', display: 'Consultation' }) ] } ] expected.resource_class = 'ambulatory' expected.resource_status = 'finished' + expected.reasonCode = [ + { + text: 'The patient had fever peaks over the last couple of days. He is worried about these peaks.' + } + ] expected.participant = [ { display: undefined, reference: Object({ reference: 'Practitioner/f201' }), diff --git a/frontend/src/lib/models/resources/organization-model.ts b/frontend/src/lib/models/resources/organization-model.ts index 15edd369..0985a6b0 100644 --- a/frontend/src/lib/models/resources/organization-model.ts +++ b/frontend/src/lib/models/resources/organization-model.ts @@ -13,7 +13,8 @@ export class OrganizationModel extends FastenDisplayModel { name: string|undefined addresses: AddressModel[]|undefined telecom: { system?: string, value?: string, use?: string }[]|undefined - type_codings: any[]|undefined + type: CodableConceptModel[]|undefined + type_codings: CodingModel[]|undefined constructor(fhirResource: any, fhirVersion?: fhirVersions, fastenOptions?: FastenOptions) { super(fastenOptions) @@ -27,6 +28,8 @@ export class OrganizationModel extends FastenDisplayModel { this.name = _.get(fhirResource, 'name'); this.addresses = _.get(fhirResource, 'address'); this.telecom = _.get(fhirResource, 'telecom'); + this.type = _.get(fhirResource, 'type'); + }; dstu2DTO(fhirResource:any){ this.type_codings = _.get(fhirResource, 'type.coding'); diff --git a/frontend/src/lib/models/resources/practitioner-model.ts b/frontend/src/lib/models/resources/practitioner-model.ts index 225c0dc6..66df1c07 100644 --- a/frontend/src/lib/models/resources/practitioner-model.ts +++ b/frontend/src/lib/models/resources/practitioner-model.ts @@ -20,9 +20,9 @@ export class PractitionerModel extends FastenDisplayModel { relationship: string }|undefined telecom: { system?: string, value?: string, use?: string }[]|undefined - address: AddressModel|undefined + address: AddressModel[]|undefined birthdate: string|undefined - qualification: { code: string, system: string }[]|undefined + qualification: CodingModel[]|undefined constructor(fhirResource: any, fhirVersion?: fhirVersions, fastenOptions?: FastenOptions) { super(fastenOptions) @@ -51,7 +51,7 @@ export class PractitionerModel extends FastenDisplayModel { stu3DTO(fhirResource:any){ this.name = _.get(fhirResource, 'name',[]).map((name:any): HumanNameModel => new HumanNameModel(name)); - this.address = new AddressModel(_.get(fhirResource, 'address.0')); + this.address = _.get(fhirResource, 'address', []).map((address:any): AddressModel => new AddressModel(address)); this.telecom = _.get(fhirResource, 'telecom'); }; diff --git a/frontend/src/lib/utils/bundle_references.ts b/frontend/src/lib/utils/bundle_references.ts new file mode 100644 index 00000000..2237fadc --- /dev/null +++ b/frontend/src/lib/utils/bundle_references.ts @@ -0,0 +1,43 @@ +import {FastenDisplayModel} from '../models/fasten/fasten-display-model'; +import {Reference, Resource} from 'fhir/r4'; + +//this function is used to generate an id to a resource within this bundle +export function internalResourceReferenceUri(resourceType: string, resourceId: string): string { + return `${resourceType}/${resourceId}` +} + +//this function is used to generate an id to a resource outside this bundle, but owned by the same user in another source +export function externalFastenResourceReferenceUri(sourceId: string, resourceType: string, resourceId: string): string { + return `urn:fastenhealth-fhir:${sourceId}:${resourceType}/${resourceId}` +} + +export function generateReferenceUriFromResourceOrReference(displayModelOrResourceOrReference: FastenDisplayModel | Resource | Reference): string { + if((displayModelOrResourceOrReference as Reference).reference) { + //reference from external source, eg. urn:fastenhealth-id:0000-0000-0000-0000:${source_resource_type}/${source_resource_id} + return (displayModelOrResourceOrReference as Reference).reference + } else if ( + (displayModelOrResourceOrReference as FastenDisplayModel).source_id && + (displayModelOrResourceOrReference as FastenDisplayModel).source_resource_type && + (displayModelOrResourceOrReference as FastenDisplayModel).source_resource_id + ) { + //reference from external source -- in display model format, eg. urn:fastenhealth-id:${source_id}:${source_resource_type}/${source_resource_id} + return `${externalFastenResourceReferenceUri( + (displayModelOrResourceOrReference as FastenDisplayModel).source_id, + (displayModelOrResourceOrReference as FastenDisplayModel).source_resource_type, + (displayModelOrResourceOrReference as FastenDisplayModel).source_resource_id + )}` + + } else if( + (displayModelOrResourceOrReference as FastenDisplayModel).source_resource_type && + (displayModelOrResourceOrReference as FastenDisplayModel).source_resource_id) { + //internal reference (within this bundle), eg. urn:uuid:${resource.id} + return `${internalResourceReferenceUri((displayModelOrResourceOrReference as FastenDisplayModel).source_resource_type, (displayModelOrResourceOrReference as FastenDisplayModel).source_resource_id)}` + } else if((displayModelOrResourceOrReference as Resource).id && (displayModelOrResourceOrReference as Resource).resourceType) { + //internal reference (within this bundle), eg. urn:uuid:${resource.id} + return `${internalResourceReferenceUri((displayModelOrResourceOrReference as Resource).resourceType, (displayModelOrResourceOrReference as Resource).id)}` + } else { + console.warn("Cannot determine resource id, this should not happen", displayModelOrResourceOrReference) + throw new Error("Cannot find resource id") + } +} + diff --git a/frontend/yarn.lock b/frontend/yarn.lock index 631b1c62..b50c48b9 100644 --- a/frontend/yarn.lock +++ b/frontend/yarn.lock @@ -9574,6 +9574,11 @@ parent-module@^1.0.0: dependencies: callsites "^3.0.0" +parse-full-name@^1.2.6: + version "1.2.6" + resolved "https://registry.npmjs.org/parse-full-name/-/parse-full-name-1.2.6.tgz#97e2643c0167b79ca404dab254ea79e89b025704" + integrity sha512-uIaENXJFmZfzulBndhHJayi7ZEifJ1bXKaWYmySa04EmMX7eIcsufiAgWTYiJqWRa/Sq7JWPGtCIXFAoUfF7gw== + parse-json@^5.0.0: version "5.2.0" resolved "https://registry.npmjs.org/parse-json/-/parse-json-5.2.0.tgz#c76fc66dee54231c962b22bcc8a72cf2f99753cd" diff --git a/go.mod b/go.mod index 70e22972..761ad6d7 100644 --- a/go.mod +++ b/go.mod @@ -15,7 +15,7 @@ require ( github.com/dave/jennifer v1.6.1 github.com/dominikbraun/graph v0.15.0 github.com/dop251/goja v0.0.0-20230605162241-28ee0ee714f3 - github.com/fastenhealth/fasten-sources v0.4.16 + github.com/fastenhealth/fasten-sources v0.4.18 github.com/fastenhealth/gofhir-models v0.0.6 github.com/gin-gonic/gin v1.9.0 github.com/go-gormigrate/gormigrate/v2 v2.1.1 @@ -30,15 +30,16 @@ require ( github.com/spf13/viper v1.12.0 github.com/stretchr/testify v1.8.4 github.com/urfave/cli/v2 v2.11.2 - golang.org/x/crypto v0.12.0 + golang.org/x/crypto v0.14.0 golang.org/x/exp v0.0.0-20220303212507-bbda1eaf7a17 - golang.org/x/net v0.14.0 + golang.org/x/net v0.17.0 gorm.io/datatypes v1.0.7 gorm.io/driver/sqlite v1.5.4 gorm.io/gorm v1.25.4 ) require ( + github.com/gabriel-vasile/mimetype v1.4.3 // indirect github.com/jackc/pgpassfile v1.0.0 // indirect github.com/jackc/pgservicefile v0.0.0-20221227161230-091c0ba34f0a // indirect github.com/jackc/pgx/v5 v5.4.3 // indirect @@ -101,9 +102,9 @@ require ( github.com/xrash/smetrics v0.0.0-20201216005158-039620a65673 // indirect golang.org/x/arch v0.3.0 // indirect golang.org/x/oauth2 v0.11.0 // indirect - golang.org/x/sys v0.11.0 // indirect - golang.org/x/term v0.11.0 // indirect - golang.org/x/text v0.12.0 // indirect + golang.org/x/sys v0.13.0 // indirect + golang.org/x/term v0.13.0 // indirect + golang.org/x/text v0.13.0 // indirect google.golang.org/appengine v1.6.7 // indirect google.golang.org/protobuf v1.31.0 // indirect gopkg.in/ini.v1 v1.66.4 // indirect diff --git a/go.sum b/go.sum index 6ee178f0..231ff15f 100644 --- a/go.sum +++ b/go.sum @@ -101,8 +101,8 @@ github.com/envoyproxy/go-control-plane v0.9.4/go.mod h1:6rpuAdCZL397s3pYoYcLgu1m github.com/envoyproxy/go-control-plane v0.9.7/go.mod h1:cwu0lG7PUMfa9snN8LXBig5ynNVH9qI8YYLbd1fK2po= github.com/envoyproxy/go-control-plane v0.9.9-0.20201210154907-fd9021fe5dad/go.mod h1:cXg6YxExXjJnVBQHBLXeUAgxn2UodCpnH306RInaBQk= github.com/envoyproxy/protoc-gen-validate v0.1.0/go.mod h1:iSmxcyjqTsJpI2R4NaDN7+kN2VEUnK/pcBlmesArF7c= -github.com/fastenhealth/fasten-sources v0.4.16 h1:2pfl2Ozi7nuVx3wBXrZhYnpM7hIErYkX0FBvC+JHvP8= -github.com/fastenhealth/fasten-sources v0.4.16/go.mod h1:ZO/X0+LE6gVp26mqm1oqnGePK8s9tniwuao4L3HPPiI= +github.com/fastenhealth/fasten-sources v0.4.18 h1:EAibtlSlz8m6+L0faYAANRATOV88D4AE7rdgLHF3nrE= +github.com/fastenhealth/fasten-sources v0.4.18/go.mod h1:tnvfgYG9utKCQ18+Jp26QBOO1ncwAkYx2l/XOBJqnyw= github.com/fastenhealth/gofhir-models v0.0.6 h1:yJYYaV1eJtHiGEfA1rXLsyOm/9hIi6s2cGoZzGfW1tM= github.com/fastenhealth/gofhir-models v0.0.6/go.mod h1:xB8ikGxu3bUq2b1JYV+CZpHqBaLXpOizFR0eFBCunis= github.com/fatih/color v1.7.0/go.mod h1:Zm6kSWBoL9eyXnKyktHP6abPY2pDugNf5KwzbycvMj4= @@ -111,6 +111,8 @@ github.com/fatih/color v1.13.0/go.mod h1:kLAiJbzzSOZDVNGyDpeOxJ47H46qBXwg5ILebYF github.com/frankban/quicktest v1.14.3 h1:FJKSZTDHjyhriyC81FLQ0LY93eSai0ZyR/ZIkd3ZUKE= github.com/fsnotify/fsnotify v1.5.4 h1:jRbGcIw6P2Meqdwuo0H1p6JVLbL5DHKAKlYndzMwVZI= github.com/fsnotify/fsnotify v1.5.4/go.mod h1:OVB6XrOHzAwXMpEM7uPOzcehqUV2UqJxmVXmkdnm1bU= +github.com/gabriel-vasile/mimetype v1.4.3 h1:in2uUcidCuFcDKtdcBxlR0rJ1+fsokWf+uqxgUFjbI0= +github.com/gabriel-vasile/mimetype v1.4.3/go.mod h1:d8uq/6HKRL6CGdk+aubisF/M5GcPfT7nKyLpA0lbSSk= github.com/gin-contrib/sse v0.1.0 h1:Y/yl/+YNO8GZSjAhjMsSuLt29uWRFHdHYUb5lYOV9qE= github.com/gin-contrib/sse v0.1.0/go.mod h1:RHrZQHXnP2xjPF+u1gW/2HnVO7nvIa9PG3Gm+fLHvGI= github.com/gin-gonic/gin v1.9.0 h1:OjyFBKICoexlu99ctXNR2gg+c5pKrKMuyjgARg9qeY8= @@ -455,8 +457,8 @@ golang.org/x/crypto v0.0.0-20210921155107-089bfa567519/go.mod h1:GvvjBRRGRdwPK5y golang.org/x/crypto v0.0.0-20211108221036-ceb1ce70b4fa/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc= golang.org/x/crypto v0.0.0-20220214200702-86341886e292/go.mod h1:IxCIyHEi3zRg3s0A5j5BB6A9Jmi73HwBIUl50j+osU4= golang.org/x/crypto v0.9.0/go.mod h1:yrmDGqONDYtNj3tH8X9dzUun2m2lzPa9ngI6/RUPGR0= -golang.org/x/crypto v0.12.0 h1:tFM/ta59kqch6LlvYnPa0yx5a83cL2nHflFhYKvv9Yk= -golang.org/x/crypto v0.12.0/go.mod h1:NF0Gs7EO5K4qLn+Ylc+fih8BSTeIjAP05siRnAh98yw= +golang.org/x/crypto v0.14.0 h1:wBqGXzWJW6m1XrIKlAH0Hs1JJ7+9KBwnIO8v66Q9cHc= +golang.org/x/crypto v0.14.0/go.mod h1:MVFd36DqK4CsrnJYDkBA3VC4m2GkXAM0PvzMCn4JQf4= golang.org/x/exp v0.0.0-20190121172915-509febef88a4/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA= golang.org/x/exp v0.0.0-20190306152737-a1d7652674e8/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA= golang.org/x/exp v0.0.0-20190510132918-efd6b22b2522/go.mod h1:ZjyILWgesfNpC6sMxTJOJm9Kp84zZh5NQWvqDGG3Qr8= @@ -533,8 +535,8 @@ golang.org/x/net v0.0.0-20211112202133-69e39bad7dc2/go.mod h1:9nx3DQGgdP8bBQD5qx golang.org/x/net v0.0.0-20220722155237-a158d28d115b/go.mod h1:XRhObCWvk6IyKnWLug+ECip1KBveYUHfp+8e9klMJ9c= golang.org/x/net v0.6.0/go.mod h1:2Tu9+aMcznHK/AK1HMvgo6xiTLG5rD5rZLDS+rp2Bjs= golang.org/x/net v0.10.0/go.mod h1:0qNGK6F8kojg2nk9dLZ2mShWaEBan6FAoqfSigmmuDg= -golang.org/x/net v0.14.0 h1:BONx9s002vGdD9umnlX1Po8vOZmrgH34qlHcD1MfK14= -golang.org/x/net v0.14.0/go.mod h1:PpSgVXXLK0OxS0F31C1/tv6XNguvCrnXIDrFMspZIUI= +golang.org/x/net v0.17.0 h1:pVaXccu2ozPjCXewfr1S7xza/zcXTity9cCdXQYSjIM= +golang.org/x/net v0.17.0/go.mod h1:NxSsAGuq816PNPmqtQdLE42eU2Fs7NoRIZrHJAlaCOE= golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U= golang.org/x/oauth2 v0.0.0-20190226205417-e64efc72b421/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw= golang.org/x/oauth2 v0.0.0-20190604053449-0f29369cfe45/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw= @@ -616,15 +618,15 @@ golang.org/x/sys v0.0.0-20220722155257-8c9f86f7a55f/go.mod h1:oPkhp1MJrh7nUepCBc golang.org/x/sys v0.5.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.6.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.8.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.11.0 h1:eG7RXZHdqOJ1i+0lgLgCpSXAp6M3LYlAo6osgSi0xOM= -golang.org/x/sys v0.11.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.13.0 h1:Af8nKPmuFypiUBjVoU9V20FiaFXOcuZI21p0ycVYYGE= +golang.org/x/sys v0.13.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/term v0.0.0-20201117132131-f5c789dd3221/go.mod h1:Nr5EML6q2oocZ2LXRh80K7BxOlk5/8JxuGnuhpl+muw= golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo= golang.org/x/term v0.0.0-20210927222741-03fcf44c2211/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8= golang.org/x/term v0.5.0/go.mod h1:jMB1sMXY+tzblOD4FWmEbocvup2/aLOaQEp7JmGp78k= golang.org/x/term v0.8.0/go.mod h1:xPskH00ivmX89bAKVGSKKtLOWNx2+17Eiy94tnKShWo= -golang.org/x/term v0.11.0 h1:F9tnn/DA/Im8nCwm+fX+1/eBwi4qFjRT++MhtVC4ZX0= -golang.org/x/term v0.11.0/go.mod h1:zC9APTIj3jG3FdV/Ons+XE1riIZXG4aZ4GTHiPZJPIU= +golang.org/x/term v0.13.0 h1:bb+I9cTfFazGW51MZqBVmZy7+JEJMouUHTUSKVQLBek= +golang.org/x/term v0.13.0/go.mod h1:LTmsnFJwVN6bCy1rVCoS+qHT1HhALEFxKncY3WNNh4U= golang.org/x/text v0.0.0-20170915032832-14c0d48ead0c/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= golang.org/x/text v0.3.1-0.20180807135948-17ff2d5776d2/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= @@ -636,8 +638,8 @@ golang.org/x/text v0.3.7/go.mod h1:u+2+/6zg+i71rQMx5EYifcz6MCKuco9NR6JIITiCfzQ= golang.org/x/text v0.3.8/go.mod h1:E6s5w1FMmriuDzIBO73fBruAKo1PCIq6d2Q6DHfQ8WQ= golang.org/x/text v0.7.0/go.mod h1:mrYo+phRRbMaCq/xk9113O4dZlRixOauAjOtrjsXDZ8= golang.org/x/text v0.9.0/go.mod h1:e1OnstbJyHTd6l/uOt8jFFHp6TRDWZR/bV3emEE/zU8= -golang.org/x/text v0.12.0 h1:k+n5B8goJNdU7hSvEtMUz3d1Q6D/XW4COJSJR6fN0mc= -golang.org/x/text v0.12.0/go.mod h1:TvPlkZtksWOMsz7fbANvkp4WM8x/WCo/om8BMLbz+aE= +golang.org/x/text v0.13.0 h1:ablQoSUd0tRdKxZewP80B+BaqeKJuVhuRxj/dkrun3k= +golang.org/x/text v0.13.0/go.mod h1:TvPlkZtksWOMsz7fbANvkp4WM8x/WCo/om8BMLbz+aE= golang.org/x/time v0.0.0-20181108054448-85acf8d2951c/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= golang.org/x/time v0.0.0-20190308202827-9d24e82272b4/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= golang.org/x/time v0.0.0-20191024005414-555d28b269f0/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=