diff --git a/lib/screens/patients/profile/referral/referred-patient-screen.dart b/lib/screens/patients/profile/referral/referred-patient-screen.dart index b859d965..e33bd2f7 100644 --- a/lib/screens/patients/profile/referral/referred-patient-screen.dart +++ b/lib/screens/patients/profile/referral/referred-patient-screen.dart @@ -1,10 +1,12 @@ import 'package:doctor_app_flutter/core/viewModel/patient-referral-viewmodel.dart'; import 'package:doctor_app_flutter/screens/base/base_view.dart'; +import 'package:doctor_app_flutter/screens/patients/profile/referral/referred_patient_detail.dart'; import 'package:doctor_app_flutter/util/date-utils.dart'; import 'package:doctor_app_flutter/util/translations_delegate_base.dart'; import 'package:doctor_app_flutter/widgets/patients/patient-referral-item-widget.dart'; import 'package:doctor_app_flutter/widgets/shared/app_scaffold_widget.dart'; import 'package:doctor_app_flutter/widgets/shared/app_texts_widget.dart'; +import 'package:doctor_app_flutter/widgets/transitions/fade_page.dart'; import 'package:flutter/material.dart'; class ReferredPatientScreen extends StatelessWidget { @@ -20,24 +22,25 @@ class ReferredPatientScreen extends StatelessWidget { body: model.listMyReferredPatientModel == null || model.listMyReferredPatientModel.length == 0 ? Center( - child: Column( - crossAxisAlignment: CrossAxisAlignment.center, - children: [ - Container( - height: 100, - ), - Image.asset('assets/images/no-data.png'), - Padding( - padding: const EdgeInsets.all(8.0), - child: AppText( - TranslationBase.of(context).referralEmptyMsg, - color: Theme.of(context).errorColor, + child: Column( + crossAxisAlignment: CrossAxisAlignment.center, + children: [ + Container( + height: 100, + ), + Image.asset('assets/images/no-data.png'), + Padding( + padding: const EdgeInsets.all(8.0), + child: AppText( + TranslationBase.of(context).referralEmptyMsg, + color: Theme.of(context).errorColor, + ), + ) + ], ), ) - ], - ), - ) - : SingleChildScrollView(// DoctorApplication.svc/REST/GtMyReferredPatient + : SingleChildScrollView( + // DoctorApplication.svc/REST/GtMyReferredPatient child: Container( margin: EdgeInsets.only(top: 70), child: Column( @@ -51,30 +54,57 @@ class ReferredPatientScreen extends StatelessWidget { // ), ...List.generate( model.listMyReferredPatientModel.length, - (index) => - PatientReferralItemWidget( - referralStatus: "${model.getReferralStatusNameByCode(model.getReferredPatientItem(index).referralStatus, context)}", - referralStatusCode: model.getReferredPatientItem(index).referralStatus, - patientName: "${model.getReferredPatientItem(index).firstName} ${model.getReferredPatientItem(index).middleName} ${model.getReferredPatientItem(index).lastName}", - patientGender: model.getReferredPatientItem(index).gender, - referredDate: DateUtils.convertDateFromServerFormat(model.getReferredPatientItem(index).referralDate, "dd/MM/yyyy"), - referredTime: " ", - patientID: - "${model.getReferredPatientItem(index).patientID}", - isSameBranch: model.getReferredPatientItem(index) - .isReferralDoctorSameBranch, - isReferral: false, - remark: - model.getReferredPatientItem(index).referringDoctorRemarks, - nationality: model.getReferredPatientItem(index) - .nationalityName, - nationalityFlag: - model.getReferredPatientItem(index).nationalityFlagURL, - doctorAvatar: - model.getReferredPatientItem(index).doctorImageURL, - referralDoctorName: "Dr. ${model.getReferredPatientItem(index).referralDoctorName}", - clinicDescription: model.getReferredPatientItem(index).referralClinicDescription, - ), + (index) => InkWell( + onTap: () { + Navigator.push( + context, + FadePage( + page: ReferredPatientDetailScreen( + model.getReferredPatientItem(index)), + ), + ); + }, + child: PatientReferralItemWidget( + referralStatus: + "${model.getReferralStatusNameByCode(model.getReferredPatientItem(index).referralStatus, context)}", + referralStatusCode: model + .getReferredPatientItem(index) + .referralStatus, + patientName: + "${model.getReferredPatientItem(index).firstName} ${model.getReferredPatientItem(index).middleName} ${model.getReferredPatientItem(index).lastName}", + patientGender: + model.getReferredPatientItem(index).gender, + referredDate: DateUtils.convertDateFromServerFormat( + model + .getReferredPatientItem(index) + .referralDate, + "dd/MM/yyyy"), + referredTime: " ", + patientID: + "${model.getReferredPatientItem(index).patientID}", + isSameBranch: model + .getReferredPatientItem(index) + .isReferralDoctorSameBranch, + isReferral: false, + remark: model + .getReferredPatientItem(index) + .referringDoctorRemarks, + nationality: model + .getReferredPatientItem(index) + .nationalityName, + nationalityFlag: model + .getReferredPatientItem(index) + .nationalityFlagURL, + doctorAvatar: model + .getReferredPatientItem(index) + .doctorImageURL, + referralDoctorName: + "Dr. ${model.getReferredPatientItem(index).referralDoctorName}", + clinicDescription: model + .getReferredPatientItem(index) + .referralClinicDescription, + ), + ), ), ], ), diff --git a/lib/screens/patients/profile/referral/referred_patient_detail.dart b/lib/screens/patients/profile/referral/referred_patient_detail.dart new file mode 100644 index 00000000..484df7b7 --- /dev/null +++ b/lib/screens/patients/profile/referral/referred_patient_detail.dart @@ -0,0 +1,15 @@ +import 'package:doctor_app_flutter/models/patient/my_referral/my_referred_patient_model.dart'; +import 'package:flutter/material.dart'; + +class ReferredPatientDetailScreen extends StatelessWidget { + + final MyReferredPatientModel referredPatient; + + ReferredPatientDetailScreen(this.referredPatient); + + @override + Widget build(BuildContext context) { + return Container(); + } + +}