diff --git a/lib/config/localized_values.dart b/lib/config/localized_values.dart index a1f63710..f30a86e5 100644 --- a/lib/config/localized_values.dart +++ b/lib/config/localized_values.dart @@ -328,7 +328,7 @@ const Map> localizedValues = { 'ar': 'لا وصفة طبية مدرجة' }, 'referTo': {'en': "Refer To", 'ar': 'محال إلى'}, - 'referredFrom': {'en': "Referred From", 'ar': 'محال من'}, + 'referredFrom': {'en': "From : ", 'ar': ' : من'}, 'branch': {'en': "Branch", 'ar': 'الفرع'}, 'chooseAppointment': {'en': "Choose Appointment", 'ar': 'اختر موعد'}, 'appointmentNo': {'en': "Appointment # : ", 'ar': '# الموعد:'}, diff --git a/lib/models/patient/patiant_info_model.dart b/lib/models/patient/patiant_info_model.dart index 8c279f7c..8903791c 100644 --- a/lib/models/patient/patiant_info_model.dart +++ b/lib/models/patient/patiant_info_model.dart @@ -1,12 +1,13 @@ // TODO : it have to be changed. class PatiantInformtion { - final List list; + final PatiantInformtion patientDetails; int genderInt; dynamic age; String appointmentDate; int appointmentNo; String appointmentType; + int appointmentTypeId; String arrivedOn; int clinicGroupId; String companyName; @@ -31,6 +32,8 @@ class PatiantInformtion { String firstNameN; String middleNameN; String lastNameN; + String fullName; + String fullNameN; int gender; String dateofBirth; String nationalityId; @@ -58,7 +61,7 @@ class PatiantInformtion { int visitTypeId; String startTimes; PatiantInformtion( - {this.list, + {this.patientDetails, this.projectId, this.clinicId, this.doctorId, @@ -96,6 +99,7 @@ class PatiantInformtion { this.startTime, this.appointmentNo, this.appointmentType, + this.appointmentTypeId, this.arrivedOn, this.clinicGroupId, this.companyName, @@ -110,6 +114,8 @@ class PatiantInformtion { this.nationality, this.patientMRN, this.visitType, + this.fullName, + this.fullNameN, this.nationalityFlagURL, this.patientStatusType, this.visitTypeId, @@ -117,6 +123,8 @@ class PatiantInformtion { factory PatiantInformtion.fromJson(Map json) => PatiantInformtion( + patientDetails: json['patientDetails'] != null ? new PatiantInformtion.fromJson(json['patientDetails']) + : null, projectId: json["ProjectID"] ?? json["projectID"], clinicId: json["ClinicID"] ?? json["clinicID"], doctorId: json["DoctorID"] ?? json["doctorID"], @@ -133,6 +141,8 @@ class PatiantInformtion { middleNameN: json["MiddleNameN"] ?? json["middleNameN"], lastNameN: json["LastNameN"] ?? json["lastNameN"], gender: json["Gender"] ?? json["gender"], + fullName: json["fullName"] ?? json["fullName"], + fullNameN: json["fullNameN"] ?? json["fullNameN"], dateofBirth: json["DateofBirth"] ?? json["dob"], nationalityId: json["NationalityID"] ?? json["nationalityID"], mobileNumber: json["MobileNumber"] ?? json["mobileNumber"], @@ -165,6 +175,7 @@ class PatiantInformtion { startTime: json["startTime"], appointmentNo: json['appointmentNo'] ?? json['AppointmentNo'], appointmentType: json['appointmentType'], + appointmentTypeId: json['appointmentTypeId'], arrivedOn: json['arrivedOn'], clinicGroupId: json['clinicGroupId'], companyName: json['companyName'], diff --git a/lib/screens/patients/profile/patient_profile_screen.dart b/lib/screens/patients/profile/patient_profile_screen.dart index 23c1d608..ef566b9f 100644 --- a/lib/screens/patients/profile/patient_profile_screen.dart +++ b/lib/screens/patients/profile/patient_profile_screen.dart @@ -73,7 +73,7 @@ class PatientProfileScreen extends StatelessWidget { color: Color(0XFFF2F2F2), child: Stack( children: [ - SingleChildScrollView( + Container( child: Column( crossAxisAlignment: CrossAxisAlignment.start, children: [ @@ -368,25 +368,27 @@ class PatientProfileScreen extends StatelessWidget { ), ), ), - Padding( - padding: const EdgeInsets.all(16.0), - child: Container( - child: Column( - children: [ - isFromSearch - ? ProfileMedicalInfoWidgetSearch( - patient: patient, - patientType: patientType, - from: from, - to: to, - ) - : ProfileMedicalInfoWidget( - patient: patient, - patientType: patientType, - from: from, - to: to, - ), - ], + Expanded( + child: Padding( + padding: const EdgeInsets.all(16.0), + child: SingleChildScrollView( + child: Column( + children: [ + isFromSearch + ? ProfileMedicalInfoWidgetSearch( + patient: patient, + patientType: patientType, + from: from, + to: to, + ) + : ProfileMedicalInfoWidget( + patient: patient, + patientType: patientType, + from: from, + to: to, + ), + ], + ), ), ), ) diff --git a/lib/screens/patients/profile/referral/my-referral-detail-screen.dart b/lib/screens/patients/profile/referral/my-referral-detail-screen.dart index 7449d970..d6d9e8b6 100644 --- a/lib/screens/patients/profile/referral/my-referral-detail-screen.dart +++ b/lib/screens/patients/profile/referral/my-referral-detail-screen.dart @@ -2,14 +2,17 @@ import 'package:doctor_app_flutter/config/size_config.dart'; import 'package:doctor_app_flutter/core/enum/viewstate.dart'; import 'package:doctor_app_flutter/core/viewModel/auth_view_model.dart'; import 'package:doctor_app_flutter/core/viewModel/patient-referral-viewmodel.dart'; +import 'package:doctor_app_flutter/icons_app/doctor_app_icons.dart'; import 'package:doctor_app_flutter/models/patient/my_referral/PendingReferral.dart'; import 'package:doctor_app_flutter/screens/base/base_view.dart'; import 'package:doctor_app_flutter/util/date-utils.dart'; import 'package:doctor_app_flutter/util/dr_app_toast_msg.dart'; +import 'package:doctor_app_flutter/util/helpers.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/patients/profile/PatientProfileButton.dart'; import 'package:doctor_app_flutter/widgets/patients/profile/profile-welcome-widget.dart'; +import 'package:doctor_app_flutter/widgets/patients/profile/profile_medical_info_widget_search.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/shared/borderedButton.dart'; @@ -42,17 +45,60 @@ class MyReferralDetailScreen extends StatelessWidget { builder: (_, model, w) => AppScaffold( baseViewModel: model, appBarTitle: TranslationBase.of(context).referPatient, + isShowAppBar: false, body: model.patientArrivalList != null && model.patientArrivalList.length > 0 ? Column( children: [ + Container( + padding: EdgeInsets.only( + left: 0, right: 5, bottom: 5, top: 5), + decoration: BoxDecoration( + color: Colors.white, + ), + child: Container( + padding: EdgeInsets.only( + left: 10, right: 10, bottom: 10), + margin: EdgeInsets.only(top: 50), + child: Column( + children: [ + Container( + padding: EdgeInsets.only(left: 12.0), + child: Row(children: [ + IconButton( + icon: Icon(Icons.arrow_back_ios), + color: Colors.black, //Colors.black, + onPressed: () => Navigator.pop(context), + ), + AppText( + (Helpers.capitalize(model.patientArrivalList[0].patientDetails.fullName)), + fontSize: SizeConfig.textMultiplier * 3, + fontWeight: FontWeight.bold, + backGroundcolor: Colors.white, + fontFamily: 'Poppins', + ), + model.patientArrivalList[0].patientDetails.gender == 1 + ? Icon( + DoctorApp.male_2, + color: Colors.blue, + ) + : Icon( + DoctorApp.female_1, + color: Colors.pink, + ), + ]), + ), + ], + ), + ), + ), Expanded( child: SingleChildScrollView( child: Container( child: Column( crossAxisAlignment: CrossAxisAlignment.start, children: [ - ProfileWelcomeWidget( + /*ProfileWelcomeWidget( AppText( authProvider.selectedClinicName != null ? authProvider.selectedClinicName @@ -63,7 +109,7 @@ class MyReferralDetailScreen extends StatelessWidget { textAlign: TextAlign.center, ), height: 100, - ), + ),*/ SizedBox( height: 16, ), @@ -80,7 +126,7 @@ class MyReferralDetailScreen extends StatelessWidget { PatientReferralItemWidget( "${pendingReferral.patientID}", patientName: pendingReferral.patientName, - referralStatus: null, + referralStatus: pendingReferral.referralStatus, isReferredTo: false, isSameBranch: pendingReferral.isReferralDoctorSameBranch, @@ -89,47 +135,14 @@ class MyReferralDetailScreen extends StatelessWidget { clinicDescription: null, remark: pendingReferral.remarksFromSource, referredOn: pendingReferral.referredOn, + patientInfo: pendingReferral, ), SizedBox( - child: GridView.count( - childAspectRatio: 1.8, - crossAxisSpacing: 8, - mainAxisSpacing: 10, - controller: new ScrollController( - keepScrollOffset: false), - shrinkWrap: true, - padding: const EdgeInsets.all(4.0), - crossAxisCount: 2, - children: [ - PatientProfileButton( - key: key, - patient: model.patientArrivalList[0], - route: MEDICAL_FILE, - nameLine1: TranslationBase.of(context) - .previewHealth, - nameLine2: TranslationBase.of(context) - .summaryReport, - icon: 'radiology-1.png'), - PatientProfileButton( - key: key, - patient: model.patientArrivalList[0], - route: LAB_ORDERS, - nameLine1: - TranslationBase.of(context).lab, - nameLine2: - TranslationBase.of(context).result, - icon: 'lab.png'), - PatientProfileButton( - key: key, - patient: model.patientArrivalList[0], - route: - VITAL_SIGN_DETAILS /*PATIENT_VITAL_SIGN*/, - nameLine1: - TranslationBase.of(context).vital, - nameLine2: - TranslationBase.of(context).signs, - icon: 'heartbeat.png'), - ], + child: ProfileMedicalInfoWidgetSearch( + patient: model.patientArrivalList[0], + patientType: "7", + from: null, + to: null, ), ), ], diff --git a/lib/screens/patients/profile/referral/my-referral-patient-screen.dart b/lib/screens/patients/profile/referral/my-referral-patient-screen.dart index a888ad3e..3cab440c 100644 --- a/lib/screens/patients/profile/referral/my-referral-patient-screen.dart +++ b/lib/screens/patients/profile/referral/my-referral-patient-screen.dart @@ -33,33 +33,13 @@ class MyReferralPatientScreen extends StatelessWidget { ) : SingleChildScrollView( child: Container( + margin: EdgeInsets.only(top: 50), + // color: Colors.white, + // height: MediaQuery.of(context).size.height, child: Column( crossAxisAlignment: CrossAxisAlignment.start, children: [ - SizedBox(height: 100), - ProfileWelcomeWidget( - AppText( - authProvider.selectedClinicName != null - ? authProvider.selectedClinicName - : authProvider.doctorProfile.clinicDescription, - fontSize: SizeConfig.textMultiplier * 1.7, - color: Colors.white, - textAlign: TextAlign.center, - ), - height: 100, - ), - SizedBox( - height: 16, - ), - Padding( - padding: const EdgeInsets.symmetric(horizontal: 16.0), - child: AppText( - TranslationBase.of(context).myReferralPatient, - color: Colors.black, - fontWeight: FontWeight.bold, - fontSize: 16, - ), - ), + // SizedBox(height: 50), ...List.generate( model.pendingReferral.length, (index) => InkWell( @@ -71,9 +51,11 @@ class MyReferralPatientScreen extends StatelessWidget { }, child: PatientReferralItemWidget( "${model.pendingReferral[index].patientID}", + patientInfo: model.pendingReferral[index], patientName: model.pendingReferral[index].patientName, - referralStatus: null, + referralStatus: + model.pendingReferral[index].referralStatus, isReferredTo: false, isSameBranch: model.pendingReferral[index] .isReferralDoctorSameBranch, diff --git a/lib/screens/patients/profile/referral/patient_referral_screen.dart b/lib/screens/patients/profile/referral/patient_referral_screen.dart index 80f30aad..adea0247 100644 --- a/lib/screens/patients/profile/referral/patient_referral_screen.dart +++ b/lib/screens/patients/profile/referral/patient_referral_screen.dart @@ -37,6 +37,7 @@ class _PatientReferralScreen extends State appBarTitle: TranslationBase.of(context).patientsreferral, body: Scaffold( extendBodyBehindAppBar: true, + // backgroundColor: Colors.white, appBar: PreferredSize( preferredSize: Size.fromHeight(65.0), child: Center( @@ -91,7 +92,8 @@ class _PatientReferralScreen extends State controller: _tabController, children: [ MyReferralPatientScreen(), - MyReferredPatient(), + ReferredPatientScreen(), + // MyReferredPatient(), ], ), ) diff --git a/lib/screens/patients/profile/referral/referred-patient-screen.dart b/lib/screens/patients/profile/referral/referred-patient-screen.dart index 323a9a9b..d6a81603 100644 --- a/lib/screens/patients/profile/referral/referred-patient-screen.dart +++ b/lib/screens/patients/profile/referral/referred-patient-screen.dart @@ -15,6 +15,7 @@ class ReferredPatientScreen extends StatelessWidget { onModelReady: (model) => model.getMyReferredPatient(), builder: (_, model, w) => AppScaffold( baseViewModel: model, + isShowAppBar: false, appBarTitle: TranslationBase.of(context).referredPatient, body: model.listMyReferredPatientModel == null || model.listMyReferredPatientModel.length == 0 diff --git a/lib/widgets/patients/patient-referral-item-widget.dart b/lib/widgets/patients/patient-referral-item-widget.dart index ee54917b..d5c1d035 100644 --- a/lib/widgets/patients/patient-referral-item-widget.dart +++ b/lib/widgets/patients/patient-referral-item-widget.dart @@ -1,6 +1,11 @@ +import 'package:doctor_app_flutter/config/size_config.dart'; +import 'package:doctor_app_flutter/models/patient/my_referral/PendingReferral.dart'; import 'package:doctor_app_flutter/util/translations_delegate_base.dart'; import 'package:doctor_app_flutter/widgets/shared/app_texts_widget.dart'; +import 'package:doctor_app_flutter/widgets/shared/card_with_bg_widget.dart'; +import 'package:flutter/cupertino.dart'; import 'package:flutter/material.dart'; +import 'package:font_awesome_flutter/font_awesome_flutter.dart'; class PatientReferralItemWidget extends StatelessWidget { final String patientName; @@ -14,6 +19,7 @@ class PatientReferralItemWidget extends StatelessWidget { final String referredOn; final String answerFromTarget; final Widget infoIcon; + final PendingReferral patientInfo; PatientReferralItemWidget( this.patientID, { @@ -27,230 +33,387 @@ class PatientReferralItemWidget extends StatelessWidget { this.referredOn, this.answerFromTarget, this.infoIcon, + this.patientInfo, }); @override Widget build(BuildContext context) { return Container( - margin: EdgeInsets.all(16.0), + margin: EdgeInsets.only(left: 16.0, right: 16.0, top: 8.0), child: Column( children: [ - Row( - children: [ - Expanded( + // TODO should be removed by mousa + // Row( + // children: [ + // Expanded( + // child: Column( + // crossAxisAlignment: CrossAxisAlignment.start, + // children: [ + // if (referralStatus != null) + // Row( + // children: [ + // AppText( + // TranslationBase.of(context).referralStatus, + // color: Colors.grey, + // fontWeight: FontWeight.bold, + // fontSize: 12, + // ), + // Container( + // color: Color(0xFF4BA821), + // padding: EdgeInsets.all(4), + // child: AppText( + // referralStatus + // /*referralStatus == "46" + // ? TranslationBase.of(context).approved + // : TranslationBase.of(context).rejected*/ + // , + // color: Colors.white, + // fontWeight: FontWeight.bold, + // fontSize: 12, + // ), + // ), + // ], + // ), + // SizedBox( + // height: 8, + // ), + // Row( + // children: [ + // AppText( + // isReferredTo + // ? "${TranslationBase.of(context).referTo}: " + // : "${TranslationBase.of(context).referredFrom}: ", + // color: Colors.grey, + // fontWeight: FontWeight.bold, + // fontSize: 12, + // ), + // AppText( + // isSameBranch + // ? TranslationBase.of(context).sameBranch + // : TranslationBase.of(context).otherBranch, + // color: Colors.black, + // fontWeight: FontWeight.bold, + // fontSize: 12, + // ), + // ], + // ), + // SizedBox( + // height: 8, + // ), + // Row( + // crossAxisAlignment: CrossAxisAlignment.start, + // children: [ + // AppText( + // "${TranslationBase.of(context).referralDoctor} : ", + // color: Colors.grey, + // fontWeight: FontWeight.bold, + // fontSize: 12, + // ), + // Expanded( + // child: AppText( + // referralDoctorName != null + // ? "${TranslationBase.of(context).dr} $referralDoctorName" + // : "-", + // color: Colors.black, + // fontWeight: FontWeight.bold, + // fontSize: 12, + // ), + // ), + // ], + // ), + // SizedBox( + // height: 8, + // ), + // if (clinicDescription != null) + // Row( + // children: [ + // AppText( + // "${TranslationBase.of(context).clinic}: ", + // color: Colors.grey, + // fontWeight: FontWeight.bold, + // fontSize: 12, + // ), + // AppText( + // clinicDescription, + // color: Colors.black, + // fontWeight: FontWeight.bold, + // fontSize: 12, + // ), + // ], + // ), + // SizedBox( + // height: 8, + // ), + // Row( + // children: [ + // AppText( + // "${TranslationBase.of(context).patientID}: ", + // color: Colors.grey, + // fontWeight: FontWeight.bold, + // fontSize: 12, + // ), + // AppText( + // patientID ?? '-', + // color: Colors.black, + // fontWeight: FontWeight.bold, + // fontSize: 12, + // ), + // ], + // ), + // SizedBox( + // height: 8, + // ), + // Row( + // children: [ + // AppText( + // "${TranslationBase.of(context).patientName}: ", + // color: Colors.grey, + // fontWeight: FontWeight.bold, + // fontSize: 12, + // ), + // AppText( + // patientName ?? '-', + // color: Colors.black, + // fontWeight: FontWeight.bold, + // fontSize: 12, + // ), + // ], + // ), + // SizedBox( + // height: 8, + // ), + // Row( + // crossAxisAlignment: CrossAxisAlignment.start, + // children: [ + // AppText( + // TranslationBase.of(context).referralRemark, + // color: Colors.grey, + // fontWeight: FontWeight.bold, + // fontSize: 12, + // ), + // Expanded( + // child: AppText( + // remark, + // color: Colors.black, + // fontWeight: FontWeight.bold, + // fontSize: 12, + // ), + // ), + // ], + // ), + // SizedBox( + // height: 8, + // ), + // Row( + // children: [ + // AppText( + // TranslationBase.of(context).referredOn, + // color: Colors.grey, + // fontWeight: FontWeight.bold, + // fontSize: 12, + // ), + // AppText( + // referredOn ?? '-', + // color: Colors.black, + // fontWeight: FontWeight.bold, + // fontSize: 12, + // ), + // ], + // ), + // if (answerFromTarget != null) + // SizedBox( + // height: 8, + // ), + // if (answerFromTarget != null) + // Row( + // children: [ + // AppText( + // TranslationBase.of(context).referralResponse, + // color: Colors.grey, + // fontWeight: FontWeight.bold, + // fontSize: 12, + // ), + // AppText( + // answerFromTarget != "" ? answerFromTarget : '-', + // color: Colors.black, + // fontWeight: FontWeight.bold, + // fontSize: 12, + // ), + // ], + // ), + // SizedBox( + // height: 16, + // ), + // ], + // ), + // ), + // if (infoIcon != null) infoIcon, + // ], + // ), + // const Divider( + // color: Color(0xffCCCCCC), + // height: 1, + // thickness: 1, + // indent: 0, + // endIndent: 0, + // ), + // SizedBox( + // height: 8, + // ), + Container( + child: CardWithBgWidget( + bgColor: referralStatus != null ? referralStatus == 'Pending' + ? Colors.orange[400] + : Colors.red[800] : Colors.grey[500], + hasBorder: false, + widget: Container( + // padding: EdgeInsets.only(left: 20, right: 0, bottom: 0), + child: InkWell( child: Column( crossAxisAlignment: CrossAxisAlignment.start, - children: [ - if (referralStatus != null) - Row( - children: [ - AppText( - TranslationBase.of(context).referralStatus, - color: Colors.grey, - fontWeight: FontWeight.bold, - fontSize: 12, - ), - Container( - color: Color(0xFF4BA821), - padding: EdgeInsets.all(4), - child: AppText( - referralStatus - /*referralStatus == "46" - ? TranslationBase.of(context).approved - : TranslationBase.of(context).rejected*/ - , - color: Colors.white, - fontWeight: FontWeight.bold, - fontSize: 12, - ), - ), - ], - ), - SizedBox( - height: 8, - ), + children: [ + Row( + mainAxisAlignment: MainAxisAlignment.spaceBetween, children: [ - AppText( - isReferredTo - ? "${TranslationBase.of(context).referTo}: " - : "${TranslationBase.of(context).referredFrom}: ", - color: Colors.grey, - fontWeight: FontWeight.bold, - fontSize: 12, + RichText( + text: new TextSpan( + style: new TextStyle( + fontSize: 2.0 * SizeConfig.textMultiplier, + color: Colors.black), + children: [ + new TextSpan( + text: referralStatus != null ? referralStatus : "", + style: TextStyle( + color: referralStatus != null ? referralStatus == 'Pending' + ? Colors.orange[400] + : Colors.red[800] : Colors.grey[500], + fontWeight: FontWeight.w700, + fontFamily: 'Poppins', + fontSize: 18)), + ], + ), ), + //TODO :ask backend to return in the standerformate AppText( - isSameBranch - ? TranslationBase.of(context).sameBranch - : TranslationBase.of(context).otherBranch, - color: Colors.black, - fontWeight: FontWeight.bold, - fontSize: 12, - ), + referredOn, + fontFamily: 'Poppins', + fontWeight: FontWeight.w600, + ) ], ), - SizedBox( - height: 8, - ), - Row( - crossAxisAlignment: CrossAxisAlignment.start, - children: [ - AppText( - "${TranslationBase.of(context).referralDoctor} : ", - color: Colors.grey, - fontWeight: FontWeight.bold, - fontSize: 12, - ), - Expanded( - child: AppText( - referralDoctorName != null - ? "${TranslationBase.of(context).dr} $referralDoctorName" - : "-", - color: Colors.black, - fontWeight: FontWeight.bold, - fontSize: 12, - ), - ), - ], + AppText( + patientInfo.patientName, + fontSize: SizeConfig.textMultiplier * 2, + fontWeight: FontWeight.bold, + backGroundcolor: Colors.white, + fontFamily: 'Poppins', ), SizedBox( - height: 8, + width: 10, ), - if (clinicDescription != null) - Row( - children: [ - AppText( - "${TranslationBase.of(context).clinic}: ", - color: Colors.grey, - fontWeight: FontWeight.bold, - fontSize: 12, - ), - AppText( - clinicDescription, - color: Colors.black, - fontWeight: FontWeight.bold, - fontSize: 12, - ), + RichText( + text: new TextSpan( + style: new TextStyle( + fontSize: 2.0 * SizeConfig.textMultiplier, + color: Colors.black), + children: [ + new TextSpan( + text: TranslationBase.of(context).fileNumber, + style: TextStyle( + fontSize: 14, fontFamily: 'Poppins')), + new TextSpan( + text: patientInfo.patientID.toString(), + style: TextStyle( + fontWeight: FontWeight.w700, + fontFamily: 'Poppins', + fontSize: 15)), ], ), - SizedBox( - height: 8, ), - Row( - children: [ - AppText( - "${TranslationBase.of(context).patientID}: ", - color: Colors.grey, - fontWeight: FontWeight.bold, - fontSize: 12, - ), - AppText( - patientID ?? '-', - color: Colors.black, - fontWeight: FontWeight.bold, - fontSize: 12, + Container( + child: RichText( + text: new TextSpan( + style: new TextStyle( + fontSize: 2.0 * SizeConfig.textMultiplier, + color: Colors.black), + children: [ + new TextSpan( + text: TranslationBase.of(context).referredFrom, + style: TextStyle( + fontSize: 14, fontFamily: 'Poppins')), + new TextSpan( + text: isSameBranch + ? TranslationBase.of(context).sameBranch + : TranslationBase.of(context).otherBranch, + style: TextStyle( + fontWeight: FontWeight.w700, + fontFamily: 'Poppins', + fontSize: 15)), + ], ), - ], - ), - SizedBox( - height: 8, + ), ), - Row( - children: [ - AppText( - "${TranslationBase.of(context).patientName}: ", - color: Colors.grey, - fontWeight: FontWeight.bold, - fontSize: 12, - ), - AppText( - patientName ?? '-', - color: Colors.black, - fontWeight: FontWeight.bold, - fontSize: 12, + Container( + child: RichText( + text: new TextSpan( + style: new TextStyle( + fontSize: 2.0 * SizeConfig.textMultiplier, + color: Colors.black), + children: [ + new TextSpan( + text: + TranslationBase.of(context).remarks + " : ", + style: TextStyle( + fontSize: 14, fontFamily: 'Poppins')), + new TextSpan( + text: patientInfo.remarksFromSource, + style: TextStyle( + fontWeight: FontWeight.w700, + fontFamily: 'Poppins', + fontSize: 15)), + ], ), - ], + ), ), SizedBox( - height: 8, + height: 20, ), - Row( - crossAxisAlignment: CrossAxisAlignment.start, + Column( children: [ - AppText( - TranslationBase.of(context).referralRemark, - color: Colors.grey, - fontWeight: FontWeight.bold, - fontSize: 12, - ), - Expanded( - child: AppText( - remark, - color: Colors.black, - fontWeight: FontWeight.bold, - fontSize: 12, + RichText( + text: TextSpan( + style: TextStyle( + fontSize: 2.0 * SizeConfig.textMultiplier, + color: Colors.black), + children: [ + TextSpan( + text: TranslationBase.of(context) + .referralDoctor + + " : ", + style: TextStyle( + fontSize: 14, fontFamily: 'Poppins')), + TextSpan( + text: referralDoctorName, + style: TextStyle( + fontWeight: FontWeight.w700, + fontFamily: 'Poppins', + fontSize: 15)), + ], ), - ), - ], - ), - SizedBox( - height: 8, - ), - Row( - children: [ - AppText( - TranslationBase.of(context).referredOn, - color: Colors.grey, - fontWeight: FontWeight.bold, - fontSize: 12, - ), - AppText( - referredOn ?? '-', - color: Colors.black, - fontWeight: FontWeight.bold, - fontSize: 12, - ), + ) ], ), - if (answerFromTarget != null) - SizedBox( - height: 8, - ), - if (answerFromTarget != null) - Row( - children: [ - AppText( - TranslationBase.of(context).referralResponse, - color: Colors.grey, - fontWeight: FontWeight.bold, - fontSize: 12, - ), - AppText( - answerFromTarget != "" ? answerFromTarget : '-', - color: Colors.black, - fontWeight: FontWeight.bold, - fontSize: 12, - ), - ], - ), - SizedBox( - height: 16, - ), + Container( + width: double.infinity, + alignment: Alignment.centerRight, + child: Icon(FontAwesomeIcons.arrowRight, + size: 25, color: Colors.black)) ], ), - ), - if (infoIcon != null) infoIcon, - ], - ), - const Divider( - color: Color(0xffCCCCCC), - height: 1, - thickness: 1, - indent: 0, - endIndent: 0, - ), - SizedBox( - height: 8, + // onTap: onTap, + )), + ), ), ], ), diff --git a/lib/widgets/patients/profile/PatientProfileButton.dart b/lib/widgets/patients/profile/PatientProfileButton.dart index 28d3b700..ad0a7bd7 100644 --- a/lib/widgets/patients/profile/PatientProfileButton.dart +++ b/lib/widgets/patients/profile/PatientProfileButton.dart @@ -88,14 +88,14 @@ class PatientProfileButton extends StatelessWidget { color: Color(0xffBBBBBB), width: 1, )), - boxShadow: [ + /*boxShadow: [ BoxShadow( color: Colors.grey.withOpacity(0.2), spreadRadius: 5, blurRadius: 7, offset: Offset(0, 3), // changes position of shadow ), - ], + ],*/ ), ); } diff --git a/lib/widgets/patients/profile/patient-page-header-widget.dart b/lib/widgets/patients/profile/patient-page-header-widget.dart index 71515b1d..ffb297b1 100644 --- a/lib/widgets/patients/profile/patient-page-header-widget.dart +++ b/lib/widgets/patients/profile/patient-page-header-widget.dart @@ -67,7 +67,7 @@ class PatientPageHeaderWidget extends StatelessWidget { height: 5, ), AppText( - patient.firstName + ' ' + patient.lastName, + patient.patientDetails.fullName != null ? patient.patientDetails.fullName : patient.firstName, color: Colors.black, fontWeight: FontWeight.bold, ), diff --git a/lib/widgets/shared/card_with_bg_widget.dart b/lib/widgets/shared/card_with_bg_widget.dart index f7fd3637..4a274529 100644 --- a/lib/widgets/shared/card_with_bg_widget.dart +++ b/lib/widgets/shared/card_with_bg_widget.dart @@ -13,8 +13,11 @@ import 'package:provider/provider.dart'; class CardWithBgWidget extends StatelessWidget { final Widget widget; + final Color bgColor; + final bool hasBorder; - CardWithBgWidget({@required this.widget}); + CardWithBgWidget( + {@required this.widget, this.bgColor, this.hasBorder = true}); @override Widget build(BuildContext context) { @@ -26,7 +29,9 @@ class CardWithBgWidget extends StatelessWidget { borderRadius: BorderRadius.all( Radius.circular(10.0), ), - border: Border.all(color: HexColor('#707070'), width: 2.0), + border: Border.all( + color: hasBorder ? HexColor('#707070') : Colors.transparent, + width: hasBorder ? 2.0 : 0), ), child: Material( borderRadius: BorderRadius.all(Radius.circular(10.0)), @@ -34,23 +39,33 @@ class CardWithBgWidget extends StatelessWidget { children: [ if (projectProvider.isArabic) Positioned( - child: Container( + child: Container( + decoration: BoxDecoration( + color: bgColor ?? HexColor('#58434F'), + + borderRadius: BorderRadius.only( + topLeft: Radius.circular(10), + bottomLeft: Radius.circular(10),),), width: 10, - color: HexColor('#58434F'), ), - bottom: 0, - top: 0, - right: 0, + bottom: 1, + top: 1, + right: 1, ) else Positioned( child: Container( + decoration: BoxDecoration( + color: bgColor ?? HexColor('#58434F'), + + borderRadius: BorderRadius.only( + topLeft: Radius.circular(10), + bottomLeft: Radius.circular(10),),), width: 10, - color: HexColor('#58434F'), ), - bottom: 0, - top: 0, - left: 0, + bottom: 1, + top: 1, + left: 1, ), Container( padding: EdgeInsets.all(15.0),