fixing pagination.

frontend/src/app/components/fhir-card/datatypes/dicom/dicom.component.html

@@ -68,6 +68,7 @@ <h4 class="modal-title" id="modal-basic-title">DICOM tags</h4>
  class="mr-auto"
  [collectionSize]="metaData.length"
  [(page)]="tagsPage"
+ [maxSize]="15"
  [pageSize]="tagsPageSize"
  (pageChange)="refreshTags()"
  >

frontend/src/app/components/fhir-card/resources/observation/observation.component.ts

@@ -137,10 +137,13 @@ export class ObservationComponent implements OnInit {
 
 
  //populate chart data
-
- this.barChartLabels.push(
- formatDate(this.displayModel?.effective_date, "mediumDate", "en-US", undefined)
- )
+ if(this.displayModel?.effective_date) {
+ this.barChartLabels.push(
+ formatDate(this.displayModel?.effective_date, "mediumDate", "en-US", undefined)
+ )
+ } else {
+ this.barChartLabels.push("")
+ }
 
  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]]

frontend/src/app/components/medical-record-wizard/medical-record-wizard.utilities.ts

@@ -13,7 +13,7 @@ import {
  Resource,
  Bundle,
  Organization,
- Practitioner, MedicationRequest, Patient, Encounter, DocumentReference, Media, DiagnosticReport, Reference, Binary, HumanName
+ Practitioner, MedicationRequest, Patient, Encounter, DocumentReference, Media, DiagnosticReport, Reference, Binary, HumanName, Observation
 } from 'fhir/r4';
 import {uuidV4} from '../../../lib/utils/uuid';
 import {OrganizationModel} from '../../../lib/models/resources/organization-model';
@@ -24,14 +24,14 @@ import {FastenDisplayModel} from '../../../lib/models/fasten/fasten-display-mode
 import {generateReferenceUriFromResourceOrReference} from '../../../lib/utils/bundle_references';
 import {HumanNameModel} from '../../../lib/models/datatypes/human-name-model';
 
-export interface WizardFhirResourceWrapper<T extends OrganizationModel | PractitionerModel | EncounterModel> {
+export interface WizardFhirResourceWrapper<T extends OrganizationModel | PractitionerModel | EncounterModel | Bundle> {
  data: T,
  action: 'find'|'create'
 }
 
 interface ResourceStorage {
  [resourceType: string]: {
- [resourceId: string]: Condition | Patient | MedicationRequest | Organization | FhirLocation | Practitioner | Procedure | Encounter | DocumentReference | Media | DiagnosticReport | Binary | Reference
+ [resourceId: string]: Condition | Patient | MedicationRequest | Organization | FhirLocation | Practitioner | Procedure | Encounter | DocumentReference | Media | DiagnosticReport | Binary | Observation | Reference
  }
 }
 
@@ -72,6 +72,9 @@ export function GenerateR4ResourceLookup(resourceCreate: MedicalRecordWizardForm
 
  //DocumentReference -> (Optional) Binary
  //DiagnosticReport -> Media
+ for(let labresult of resourceCreate.labresults) {
+ resourceStorage = resourceCreateLabResultsToR4DiagnosticReports(resourceStorage, labresult)
+ }
  //ImagingStudy
  //ImagingSelection
 
@@ -436,6 +439,24 @@ function resourceAttachmentToR4DiagnosticReport(resourceStorage: ResourceStorage
  return resourceStorage
 }
 
+function resourceCreateLabResultsToR4DiagnosticReports(resourceStorage: ResourceStorage, resourceLabResult: WizardFhirResourceWrapper<Bundle>): ResourceStorage {
+ resourceLabResult.data.entry.forEach((entry) => {
+
+ if (entry.resource.resourceType === 'Observation') {
+ resourceStorage['Observation'] = resourceStorage['Observation'] || {}
+ let resource = entry.resource as Observation
+ resourceStorage['Observation'][resource.id] = resource
+ } else if (entry.resource.resourceType === 'DiagnosticReport') {
+ resourceStorage['DiagnosticReport'] = resourceStorage['DiagnosticReport'] || {}
+ let resource = entry.resource as DiagnosticReport
+ resourceStorage['DiagnosticReport'][resource.id] = resource
+ } else {
+ console.log('Unknown resource type: ', entry.resource.resourceType)
+ }
+ })
+ return resourceStorage
+}
+
 
 function findEncounter(resourceStorage: ResourceStorage): Encounter | Reference {
  let [encounterId] = Object.keys(resourceStorage['Encounter'])

frontend/src/app/pages/medical-history/medical-history.component.html

@@ -47,6 +47,7 @@ <h1 class="az-dashboard-title">Condition</h1>
  [collectionSize]="allEncountersIds.length"
  [(page)]="currentPage"
  [pageSize]="pageSize"
+ [maxSize]="15"
  (pageChange)="pageChange()"
  >
  </ngb-pagination>

frontend/src/app/pages/report-labs/report-labs.component.html

@@ -71,6 +71,7 @@ <h1 class="az-dashboard-title">Observations</h1>
  <div class="col-12 d-flex justify-content-center flex-nowrap">
  <ngb-pagination
  [collectionSize]="allObservationGroups.length"
+ [maxSize]="15"
  [(page)]="currentPage"
  [pageSize]="pageSize"
  (pageChange)="populateObservationsForCurrentPage()"