make sure we allow the user to display multiple document types in DiagnosticReport and DocumentReference.
fixing PDF height issue: missing px suffix. fixes #341
This commit is contained in:
parent
36bf113336
commit
99d72d9b02
|
@ -4,7 +4,7 @@
|
||||||
type="{{displayModel?.content_type}}"
|
type="{{displayModel?.content_type}}"
|
||||||
[style]="{
|
[style]="{
|
||||||
width: '100%',
|
width: '100%',
|
||||||
height: height
|
height: height + 'px'
|
||||||
}"
|
}"
|
||||||
/>
|
/>
|
||||||
</div>
|
</div>
|
||||||
|
|
|
@ -16,7 +16,21 @@
|
||||||
<fhir-ui-table [displayModel]="displayModel" [tableData]="tableData"></fhir-ui-table>
|
<fhir-ui-table [displayModel]="displayModel" [tableData]="tableData"></fhir-ui-table>
|
||||||
|
|
||||||
<div *ngIf="!showDetails">
|
<div *ngIf="!showDetails">
|
||||||
<fhir-binary *ngFor="let attachmentModel of displayModel.presented_form" [attachmentModel]="attachmentModel" [attachmentSourceId]="displayModel?.source_id" ></fhir-binary>
|
|
||||||
|
<ng-container *ngIf="displayModel?.presented_form?.length > 1; else showSingle">
|
||||||
|
<ul ngbNav #nav="ngbNav" [(activeId)]="active" class="nav-tabs">
|
||||||
|
<li *ngFor="let attachmentModel of displayModel.presented_form; index as i" [ngbNavItem]="i">
|
||||||
|
<a ngbNavLink>{{attachmentModel.contentType}}</a>
|
||||||
|
<ng-template ngbNavContent>
|
||||||
|
<fhir-binary [attachmentModel]="attachmentModel" [attachmentSourceId]="displayModel?.source_id" ></fhir-binary>
|
||||||
|
</ng-template>
|
||||||
|
</li>
|
||||||
|
</ul>
|
||||||
|
<div [ngbNavOutlet]="nav" class="mt-2"></div>
|
||||||
|
</ng-container>
|
||||||
|
<ng-template #showSingle>
|
||||||
|
<fhir-binary *ngIf="displayModel?.presented_form?.length == 1" [attachmentModel]="displayModel?.presented_form?.[0]" [attachmentSourceId]="displayModel?.source_id" ></fhir-binary>
|
||||||
|
</ng-template>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
<div *ngIf="showDetails" class="card-footer">
|
<div *ngIf="showDetails" class="card-footer">
|
||||||
|
|
|
@ -3,7 +3,7 @@ import {FhirCardComponentInterface} from '../../fhir-card/fhir-card-component-in
|
||||||
import {TableRowItem, TableRowItemDataType} from '../../common/table/table-row-item';
|
import {TableRowItem, TableRowItemDataType} from '../../common/table/table-row-item';
|
||||||
import {Router, RouterModule} from '@angular/router';
|
import {Router, RouterModule} from '@angular/router';
|
||||||
import {DiagnosticReportModel} from '../../../../../lib/models/resources/diagnostic-report-model';
|
import {DiagnosticReportModel} from '../../../../../lib/models/resources/diagnostic-report-model';
|
||||||
import {NgbCollapseModule} from '@ng-bootstrap/ng-bootstrap';
|
import {NgbCollapseModule, NgbNavModule} from '@ng-bootstrap/ng-bootstrap';
|
||||||
import {CommonModule} from '@angular/common';
|
import {CommonModule} from '@angular/common';
|
||||||
import {BadgeComponent} from '../../common/badge/badge.component';
|
import {BadgeComponent} from '../../common/badge/badge.component';
|
||||||
import {TableComponent} from '../../common/table/table.component';
|
import {TableComponent} from '../../common/table/table.component';
|
||||||
|
@ -12,7 +12,7 @@ import {GlossaryLookupComponent} from '../../../glossary-lookup/glossary-lookup.
|
||||||
|
|
||||||
@Component({
|
@Component({
|
||||||
standalone: true,
|
standalone: true,
|
||||||
imports: [NgbCollapseModule, CommonModule, BadgeComponent, TableComponent, RouterModule, BinaryComponent, GlossaryLookupComponent],
|
imports: [NgbCollapseModule, NgbNavModule, CommonModule, BadgeComponent, TableComponent, RouterModule, BinaryComponent, GlossaryLookupComponent],
|
||||||
selector: 'fhir-diagnostic-report',
|
selector: 'fhir-diagnostic-report',
|
||||||
templateUrl: './diagnostic-report.component.html',
|
templateUrl: './diagnostic-report.component.html',
|
||||||
styleUrls: ['./diagnostic-report.component.scss']
|
styleUrls: ['./diagnostic-report.component.scss']
|
||||||
|
@ -21,6 +21,7 @@ export class DiagnosticReportComponent implements OnInit, FhirCardComponentInter
|
||||||
@Input() displayModel: DiagnosticReportModel
|
@Input() displayModel: DiagnosticReportModel
|
||||||
@Input() showDetails: boolean = true
|
@Input() showDetails: boolean = true
|
||||||
@Input() isCollapsed: boolean = false
|
@Input() isCollapsed: boolean = false
|
||||||
|
active: number = 0
|
||||||
|
|
||||||
//these are used to populate the description of the resource. May not be available for all resources
|
//these are used to populate the description of the resource. May not be available for all resources
|
||||||
resourceCode?: string;
|
resourceCode?: string;
|
||||||
|
|
|
@ -16,7 +16,21 @@
|
||||||
<fhir-ui-table [displayModel]="displayModel" [tableData]="tableData"></fhir-ui-table>
|
<fhir-ui-table [displayModel]="displayModel" [tableData]="tableData"></fhir-ui-table>
|
||||||
|
|
||||||
<div *ngIf="!showDetails">
|
<div *ngIf="!showDetails">
|
||||||
<fhir-binary *ngFor="let attachmentModel of displayModel.content" [attachmentModel]="attachmentModel" [attachmentSourceId]="displayModel?.source_id" ></fhir-binary>
|
|
||||||
|
<ng-container *ngIf="displayModel?.content?.length > 1; else showSingle">
|
||||||
|
<ul ngbNav #nav="ngbNav" [(activeId)]="active" class="nav-tabs">
|
||||||
|
<li *ngFor="let attachmentModel of displayModel.content; index as i" [ngbNavItem]="i">
|
||||||
|
<a ngbNavLink>{{attachmentModel.contentType}}</a>
|
||||||
|
<ng-template ngbNavContent>
|
||||||
|
<fhir-binary [attachmentModel]="attachmentModel" [attachmentSourceId]="displayModel?.source_id" ></fhir-binary>
|
||||||
|
</ng-template>
|
||||||
|
</li>
|
||||||
|
</ul>
|
||||||
|
<div [ngbNavOutlet]="nav" class="mt-2"></div>
|
||||||
|
</ng-container>
|
||||||
|
<ng-template #showSingle>
|
||||||
|
<fhir-binary *ngIf="displayModel?.content?.length == 1" [attachmentModel]="displayModel?.content?.[0]" [attachmentSourceId]="displayModel?.source_id" ></fhir-binary>
|
||||||
|
</ng-template>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
<div *ngIf="showDetails" class="card-footer">
|
<div *ngIf="showDetails" class="card-footer">
|
||||||
|
|
|
@ -4,7 +4,7 @@ import {TableRowItem, TableRowItemDataType} from '../../common/table/table-row-i
|
||||||
import {Router, RouterModule} from '@angular/router';
|
import {Router, RouterModule} from '@angular/router';
|
||||||
import {DocumentReferenceModel} from '../../../../../lib/models/resources/document-reference-model';
|
import {DocumentReferenceModel} from '../../../../../lib/models/resources/document-reference-model';
|
||||||
import {FhirCardComponentInterface} from '../../fhir-card/fhir-card-component-interface';
|
import {FhirCardComponentInterface} from '../../fhir-card/fhir-card-component-interface';
|
||||||
import {NgbCollapseModule} from '@ng-bootstrap/ng-bootstrap';
|
import {NgbCollapseModule, NgbNavModule} from '@ng-bootstrap/ng-bootstrap';
|
||||||
import {CommonModule} from '@angular/common';
|
import {CommonModule} from '@angular/common';
|
||||||
import {BadgeComponent} from '../../common/badge/badge.component';
|
import {BadgeComponent} from '../../common/badge/badge.component';
|
||||||
import {TableComponent} from '../../common/table/table.component';
|
import {TableComponent} from '../../common/table/table.component';
|
||||||
|
@ -13,7 +13,7 @@ import {GlossaryLookupComponent} from '../../../glossary-lookup/glossary-lookup.
|
||||||
|
|
||||||
@Component({
|
@Component({
|
||||||
standalone: true,
|
standalone: true,
|
||||||
imports: [NgbCollapseModule, CommonModule, BadgeComponent, TableComponent, RouterModule, BinaryComponent],
|
imports: [NgbCollapseModule, NgbNavModule, CommonModule, BadgeComponent, TableComponent, RouterModule, BinaryComponent],
|
||||||
selector: 'fhir-document-reference',
|
selector: 'fhir-document-reference',
|
||||||
templateUrl: './document-reference.component.html',
|
templateUrl: './document-reference.component.html',
|
||||||
styleUrls: ['./document-reference.component.scss']
|
styleUrls: ['./document-reference.component.scss']
|
||||||
|
@ -23,7 +23,8 @@ export class DocumentReferenceComponent implements OnInit, FhirCardComponentInte
|
||||||
@Input() showDetails: boolean = true
|
@Input() showDetails: boolean = true
|
||||||
@Input() isCollapsed: boolean = false
|
@Input() isCollapsed: boolean = false
|
||||||
tableData: TableRowItem[] = []
|
tableData: TableRowItem[] = []
|
||||||
|
active: number = 0
|
||||||
|
|
||||||
constructor(public changeRef: ChangeDetectorRef, public router: Router) {}
|
constructor(public changeRef: ChangeDetectorRef, public router: Router) {}
|
||||||
|
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue