From a812b17e8cb6b0d2e3be3747cdd1ce6036e5be8b Mon Sep 17 00:00:00 2001 From: RoaaGhali98 Date: Tue, 28 Dec 2021 12:22:04 +0200 Subject: [PATCH] we fix an issues in radiology_details_page and special_lab_result_details_page --- .../special_lab_result_details_page.dart | 7 ++-- .../radiology/radiology_details_page.dart | 41 +++++++++++++++---- 2 files changed, 36 insertions(+), 12 deletions(-) diff --git a/lib/screens/patients/profile/lab_result/special_lab_result_details_page.dart b/lib/screens/patients/profile/lab_result/special_lab_result_details_page.dart index e338635a..2884947d 100644 --- a/lib/screens/patients/profile/lab_result/special_lab_result_details_page.dart +++ b/lib/screens/patients/profile/lab_result/special_lab_result_details_page.dart @@ -9,6 +9,8 @@ import 'package:doctor_app_flutter/widgets/shared/errors/error_message.dart'; import 'package:flutter/material.dart'; import 'package:flutter_html/flutter_html.dart'; +import '../../../../models/patient/profile/patient_profile_app_bar_model.dart'; + class SpecialLabResultDetailsPage extends StatelessWidget { final String resultData; final PatiantInformtion patient; @@ -22,9 +24,8 @@ class SpecialLabResultDetailsPage extends StatelessWidget { baseViewModel: model, isShowAppBar: true, backgroundColor: Theme.of(context).scaffoldBackgroundColor, - appBar: PatientProfileAppBar( - patient, - ), + patientProfileAppBarModel: PatientProfileAppBarModel( + patient:patient), body: Container( child: SingleChildScrollView( child: Column( diff --git a/lib/screens/patients/profile/radiology/radiology_details_page.dart b/lib/screens/patients/profile/radiology/radiology_details_page.dart index d03bc10c..801bbe55 100644 --- a/lib/screens/patients/profile/radiology/radiology_details_page.dart +++ b/lib/screens/patients/profile/radiology/radiology_details_page.dart @@ -13,6 +13,7 @@ import 'package:flutter/material.dart'; import 'package:url_launcher/url_launcher.dart'; import '../../../../locator.dart'; +import '../../../../models/patient/profile/patient_profile_app_bar_model.dart'; class RadiologyDetailsPage extends StatelessWidget { final FinalRadiology finalRadiology; @@ -34,16 +35,38 @@ class RadiologyDetailsPage extends StatelessWidget { lineItem: finalRadiology.invoiceLineItemNo, invoiceNo: finalRadiology.invoiceNo), builder: (_, model, widget) => AppScaffold( - appBar: PatientProfileAppBar( - patient, - appointmentDate: finalRadiology.orderDate, - doctorName: finalRadiology.doctorName, - clinic: finalRadiology.clinicDescription, - branch: finalRadiology.projectName, - profileUrl: finalRadiology.doctorImageURL, - invoiceNO: finalRadiology.invoiceNo.toString(), - isAppointmentHeader: true, + + patientProfileAppBarModel:PatientProfileAppBarModel( + + patient:patient, + appointmentDate: finalRadiology.orderDate, + doctorName: finalRadiology.doctorName, + clinic: finalRadiology.clinicDescription, + branch: finalRadiology.projectName, + profileUrl: finalRadiology.doctorImageURL, + invoiceNO: finalRadiology.invoiceNo.toString(), + isAppointmentHeader: false, ), + // appBar: PatientProfileAppBar( + // patient, + // appointmentDate: finalRadiology.orderDate, + // doctorName: finalRadiology.doctorName, + // clinic: finalRadiology.clinicDescription, + // branch: finalRadiology.projectName, + // profileUrl: finalRadiology.doctorImageURL, + // invoiceNO: finalRadiology.invoiceNo.toString(), + // isAppointmentHeader: false, + // ), + // appBar: PatientProfileAppBar( + // patient, + // appointmentDate: finalRadiology.orderDate, + // doctorName: finalRadiology.doctorName, + // clinic: finalRadiology.clinicDescription, + // branch: finalRadiology.projectName, + // profileUrl: finalRadiology.doctorImageURL, + // invoiceNO: finalRadiology.invoiceNo.toString(), + // isAppointmentHeader: true, + // ), isShowAppBar: true, baseViewModel: model, body: SingleChildScrollView(