adding explore functionality to header.
make sure explore resource list has a pointer cursor. when report header doesnt return a patient, handle gracefully. when explore page has no connected sources, correctly display empty page.
This commit is contained in:
parent
303621faf5
commit
ad83fa7ae1
|
@ -66,6 +66,8 @@ web:
|
||||||
path: ./dist
|
path: ./dist
|
||||||
database:
|
database:
|
||||||
location: 'fasten.db'
|
location: 'fasten.db'
|
||||||
|
cache:
|
||||||
|
location: ''
|
||||||
log:
|
log:
|
||||||
file: '' #absolute or relative paths allowed, eg. web.log
|
file: '' #absolute or relative paths allowed, eg. web.log
|
||||||
level: INFO
|
level: INFO
|
||||||
|
|
|
@ -20,6 +20,9 @@
|
||||||
<li class="nav-item" ngbDropdown [ngClass]="{ 'active': labs?.isActive }">
|
<li class="nav-item" ngbDropdown [ngClass]="{ 'active': labs?.isActive }">
|
||||||
<a routerLink="/labs" routerLinkActive="active" #labs="routerLinkActive" class="nav-link"><fa-icon [icon]="['fas', 'heart-pulse']"></fa-icon> Labs</a>
|
<a routerLink="/labs" routerLinkActive="active" #labs="routerLinkActive" class="nav-link"><fa-icon [icon]="['fas', 'heart-pulse']"></fa-icon> Labs</a>
|
||||||
</li>
|
</li>
|
||||||
|
<li class="nav-item" ngbDropdown [ngClass]="{ 'active': explore?.isActive }">
|
||||||
|
<a routerLink="/explore" routerLinkActive="active" #explore="routerLinkActive" class="nav-link"><fa-icon [icon]="['fas', 'folder-tree']"></fa-icon> Explore</a>
|
||||||
|
</li>
|
||||||
<li class="nav-item" ngbDropdown [ngClass]="{ 'active': sources?.isActive }">
|
<li class="nav-item" ngbDropdown [ngClass]="{ 'active': sources?.isActive }">
|
||||||
<a routerLink="/sources" routerLinkActive="active" #sources="routerLinkActive" class="nav-link"><fa-icon [icon]="['fas', 'hospital']"></fa-icon> Sources</a>
|
<a routerLink="/sources" routerLinkActive="active" #sources="routerLinkActive" class="nav-link"><fa-icon [icon]="['fas', 'hospital']"></fa-icon> Sources</a>
|
||||||
</li>
|
</li>
|
||||||
|
|
|
@ -23,15 +23,16 @@ export class ReportHeaderComponent implements OnInit {
|
||||||
this.fastenApi.getResources("Patient").subscribe(results => {
|
this.fastenApi.getResources("Patient").subscribe(results => {
|
||||||
console.log(results)
|
console.log(results)
|
||||||
this.patient = results[0]
|
this.patient = results[0]
|
||||||
|
if(!this.patient) return
|
||||||
|
|
||||||
let primaryCareId = fhirpath.evaluate(this.patient.resource_raw, "Patient.generalPractitioner.reference.first()")
|
let primaryCareId = fhirpath.evaluate(this.patient?.resource_raw, "Patient.generalPractitioner.reference.first()")
|
||||||
console.log("GP:", primaryCareId)
|
console.log("GP:", primaryCareId)
|
||||||
if(primaryCareId){
|
if(primaryCareId){
|
||||||
let primaryCareIdStr = primaryCareId.join("")
|
let primaryCareIdStr = primaryCareId.join("")
|
||||||
let primaryCareIdParts = primaryCareIdStr.split("/")
|
let primaryCareIdParts = primaryCareIdStr.split("/")
|
||||||
if(primaryCareIdParts.length == 2) {
|
if(primaryCareIdParts.length == 2) {
|
||||||
console.log(primaryCareIdParts)
|
console.log(primaryCareIdParts)
|
||||||
this.fastenApi.getResources(primaryCareIdParts[0], this.patient.source_id, primaryCareIdParts[1]).subscribe(primaryResults => {
|
this.fastenApi.getResources(primaryCareIdParts[0], this.patient?.source_id, primaryCareIdParts[1]).subscribe(primaryResults => {
|
||||||
if (primaryResults.length > 0){
|
if (primaryResults.length > 0){
|
||||||
this.primaryCare = new PractitionerModel(primaryResults[0].resource_raw)
|
this.primaryCare = new PractitionerModel(primaryResults[0].resource_raw)
|
||||||
}
|
}
|
||||||
|
|
|
@ -6,8 +6,7 @@
|
||||||
<report-header [reportHeaderTitle]="'Explore'" [reportHeaderSubTitle]="'Explore your Medical Records'"></report-header>
|
<report-header [reportHeaderTitle]="'Explore'" [reportHeaderSubTitle]="'Explore your Medical Records'"></report-header>
|
||||||
|
|
||||||
<ng-container [ngTemplateOutlet]="loading ? isLoadingTemplate :
|
<ng-container [ngTemplateOutlet]="loading ? isLoadingTemplate :
|
||||||
(connectedSources.length == 0) ? emptyReport :
|
(connectedSources.length == 0) ? emptyReport : report"></ng-container>
|
||||||
report"></ng-container>
|
|
||||||
|
|
||||||
<ng-template #report>
|
<ng-template #report>
|
||||||
<div class="row">
|
<div class="row">
|
||||||
|
|
|
@ -33,6 +33,8 @@ export class ExploreComponent implements OnInit {
|
||||||
}
|
}
|
||||||
this.loading = false
|
this.loading = false
|
||||||
})
|
})
|
||||||
|
if(connectedSources.length == 0) this.loading = false
|
||||||
|
|
||||||
}, error => {
|
}, error => {
|
||||||
this.loading = false
|
this.loading = false
|
||||||
})
|
})
|
||||||
|
|
|
@ -56,7 +56,7 @@
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
<ul class="list-group">
|
<ul class="list-group">
|
||||||
<li *ngFor="let resourceGroup of resourceTypeCounts | keyvalue" (click)="selectResourceType(resourceGroup.key)" class="list-group-item d-flex justify-content-between align-items-center">
|
<li *ngFor="let resourceGroup of resourceTypeCounts | keyvalue" (click)="selectResourceType(resourceGroup.key)" class="list-group-item d-flex justify-content-between align-items-center cursor-pointer">
|
||||||
{{resourceGroup.key}} <span class="badge badge-primary badge-pill">{{resourceGroup.value}}</span>
|
{{resourceGroup.key}} <span class="badge badge-primary badge-pill">{{resourceGroup.value}}</span>
|
||||||
</li>
|
</li>
|
||||||
</ul>
|
</ul>
|
||||||
|
|
Loading…
Reference in New Issue