From f94f29da52b8639bee85e170e763215211dc7800 Mon Sep 17 00:00:00 2001
From: Jason Kulatunga <jason@thesparktree.com>
Date: Fri, 11 Aug 2023 16:51:07 -0600
Subject: [PATCH] cleanup html attachments. fixing attachment titles.

---
 .../app/components/fhir/datatypes/html/html.component.html    | 2 --
 .../report-medical-history-condition.component.html           | 4 ++--
 frontend/src/lib/models/resources/device-model.ts             | 2 +-
 frontend/src/lib/models/resources/document-reference-model.ts | 2 ++
 4 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/frontend/src/app/components/fhir/datatypes/html/html.component.html b/frontend/src/app/components/fhir/datatypes/html/html.component.html
index d7704387..76cef78c 100644
--- a/frontend/src/app/components/fhir/datatypes/html/html.component.html
+++ b/frontend/src/app/components/fhir/datatypes/html/html.component.html
@@ -1,3 +1 @@
-<p>html works!</p>
-
 <div [innerHTML]="contentMarkup"></div>
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 0ebbf650..5c1ce433 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
@@ -111,7 +111,7 @@
               <strong>Tests and Examinations:</strong>
               <ul>
                 <li class="cursor-pointer" [ngbPopover]="diagnosticReportPopoverContent" placement="top-left" popoverClass="card-fhir-resource-popover" *ngFor="let diagnosticReport of diagnosticReports">
-                  {{diagnosticReport.title}}
+                  {{diagnosticReport.sort_title || diagnosticReport.title}}
 
                   <ng-template #diagnosticReportPopoverContent>
                     <fhir-resource [displayModel]="diagnosticReport"></fhir-resource>
@@ -124,7 +124,7 @@
               <strong>Attachments:</strong>
               <ul>
                 <li class="cursor-pointer" [ngbPopover]="documentReferencePopoverContent" placement="top-left" popoverClass="card-fhir-resource-popover" *ngFor="let documentReference of documentReferences">
-                  {{documentReference.sort_title}}
+                  {{documentReference.sort_title || documentReference.title}}
 
                   <ng-template #documentReferencePopoverContent>
                     <fhir-resource [displayModel]="documentReference"></fhir-resource>
diff --git a/frontend/src/lib/models/resources/device-model.ts b/frontend/src/lib/models/resources/device-model.ts
index 5c2eca16..a5956482 100644
--- a/frontend/src/lib/models/resources/device-model.ts
+++ b/frontend/src/lib/models/resources/device-model.ts
@@ -29,7 +29,7 @@ export class DeviceModel extends FastenDisplayModel {
 
   commonDTO(fhirResource:any){
     this.code = _.get(fhirResource, 'type');
-    this.model = _.get(fhirResource, 'model') || _.get(fhirResource,"code.text", 'Device');
+    this.model = _.get(fhirResource, 'model') || _.get(fhirResource,"code.text") || _.get(fhirResource,"code.coding.0.display") || 'Unknown Device';
     this.status = _.get(fhirResource, 'status', '');
     this.get_type_coding = _.get(fhirResource, 'type.coding');
     this.has_type_coding = Array.isArray(this.get_type_coding);
diff --git a/frontend/src/lib/models/resources/document-reference-model.ts b/frontend/src/lib/models/resources/document-reference-model.ts
index 981b3904..b2241cc2 100644
--- a/frontend/src/lib/models/resources/document-reference-model.ts
+++ b/frontend/src/lib/models/resources/document-reference-model.ts
@@ -11,6 +11,7 @@ import {AttachmentModel} from '../datatypes/attachment-model';
 
 export class DocumentReferenceModel extends FastenDisplayModel {
   code: CodableConceptModel | undefined
+  title: string | undefined
   description: string | undefined
   status: string | undefined
   category: CodableConceptModel | undefined
@@ -37,6 +38,7 @@ export class DocumentReferenceModel extends FastenDisplayModel {
 
   commonDTO(fhirResource:any){
     this.code = _.get(fhirResource, 'type');
+    this.title = _.get(fhirResource, 'category.0.text') || _.get(fhirResource, 'category.0.coding.0.display') || _.get(fhirResource, 'type.text') || _.get(fhirResource, 'type.coding.0.display');
     this.description = _.get(fhirResource, 'description');
     this.status = _.get(fhirResource, 'status');
     this.type_coding = _.get(fhirResource, 'type.coding[0]');