From 547eb430dbb7df3ba96e62ec46598b1fbb12301a Mon Sep 17 00:00:00 2001 From: mosazaid Date: Thu, 26 Aug 2021 15:27:11 +0300 Subject: [PATCH] working on lab result detail page --- lib/config/config.dart | 4 +- .../profile/lab_result/LabResultWidget.dart | 39 ++++++++++--------- .../MedicalReportDetailPage.dart | 2 + 3 files changed, 24 insertions(+), 21 deletions(-) diff --git a/lib/config/config.dart b/lib/config/config.dart index 42d9f7c8..c483f6f0 100644 --- a/lib/config/config.dart +++ b/lib/config/config.dart @@ -5,8 +5,8 @@ const ONLY_NUMBERS = "[0-9]"; const ONLY_LETTERS = "[a-zA-Z &'\"]"; const ONLY_DATE = "[0-9/]"; const BASE_URL_LIVE_CARE = 'https://livecare.hmg.com/'; -const BASE_URL = 'https://hmgwebservices.com/'; -// const BASE_URL = 'https://uat.hmgwebservices.com/'; +// const BASE_URL = 'https://hmgwebservices.com/'; +const BASE_URL = 'https://uat.hmgwebservices.com/'; const PHARMACY_ITEMS_URL = "Services/Lists.svc/REST/GetPharmcyItems_Region_enh"; const PHARMACY_LIST_URL = "Services/Patients.svc/REST/GetPharmcyList"; const PATIENT_PROGRESS_NOTE_URL = "Services/DoctorApplication.svc/REST/GetProgressNoteForInPatient"; diff --git a/lib/screens/patients/profile/lab_result/LabResultWidget.dart b/lib/screens/patients/profile/lab_result/LabResultWidget.dart index 82894002..47c9925b 100644 --- a/lib/screens/patients/profile/lab_result/LabResultWidget.dart +++ b/lib/screens/patients/profile/lab_result/LabResultWidget.dart @@ -45,25 +45,6 @@ class LabResultWidget extends StatelessWidget { Row( children: [ AppText(filterName), - InkWell( - onTap: (){ - Navigator.push( - context, - FadePage( - page: LabResultHistoryPage( - filterName: filterName, - patientLabOrder: patientLabOrder, - patient: patient, - ), - ), - ); - }, - child: AppText( - " (show details)", - color: Colors.blue, - fontSize: 12, - ), - ), ], ), InkWell( @@ -138,7 +119,27 @@ class LabResultWidget extends StatelessWidget { ...List.generate( patientLabResultList.length, (index) => Column( + crossAxisAlignment: CrossAxisAlignment.start, children: [ + InkWell( + onTap: (){ + Navigator.push( + context, + FadePage( + page: LabResultHistoryPage( + filterName: patientLabResultList[index].description, + patientLabOrder: patientLabOrder, + patient: patient, + ), + ), + ); + }, + child: AppText( + " (show details)", + color: Colors.blue, + fontSize: 12, + ), + ), Row( children: [ Expanded( diff --git a/lib/screens/patients/profile/medical_report/MedicalReportDetailPage.dart b/lib/screens/patients/profile/medical_report/MedicalReportDetailPage.dart index ab24f8e0..8984fa04 100644 --- a/lib/screens/patients/profile/medical_report/MedicalReportDetailPage.dart +++ b/lib/screens/patients/profile/medical_report/MedicalReportDetailPage.dart @@ -75,6 +75,8 @@ class MedicalReportDetailPage extends StatelessWidget { ), ), child: Html( + + data: medicalReport.reportDataHtml ?? "" ), ) : Container(