Haroon6138
/
HMG_Patient_App_New
1
0
Fork 0
Code Issues Pull Requests 1 Packages Projects Releases Wiki Activity

updates

Browse Source
pull/28/head
haroon amjad 2 months ago
parent 41ca0e27d9
commit 9fbb8c3418
3 changed files with 59 additions and 54 deletions
Show Stats Download Patch File Download Diff File

47
lib/presentation/appointments/appointment_details_page.dart
Unescape Escape View File

@ -66,33 +66,34 @@ class _AppointmentDetailsPageState extends State<AppointmentDetailsPage> {
Expanded( Expanded(
child: CollapsingListView( child: CollapsingListView(
title: "Appointment Details".needTranslation, title: "Appointment Details".needTranslation,
report: () {},
child: SingleChildScrollView( child: SingleChildScrollView(
child: Column( child: Column(
crossAxisAlignment: CrossAxisAlignment.start, crossAxisAlignment: CrossAxisAlignment.start,
children: [ children: [
Row( // Row(
mainAxisAlignment: MainAxisAlignment.spaceBetween, // mainAxisAlignment: MainAxisAlignment.spaceBetween,
children: [ // children: [
"Appointment Details".needTranslation.toText20(isBold: true), // "Appointment Details".needTranslation.toText20(isBold: true),
if (AppointmentType.isArrived(widget.patientAppointmentHistoryResponseModel)) // if (AppointmentType.isArrived(widget.patientAppointmentHistoryResponseModel))
CustomButton( // CustomButton(
text: "Report".needTranslation, // text: "Report".needTranslation,
onPressed: () {}, // onPressed: () {},
backgroundColor: AppColors.secondaryLightRedColor, // backgroundColor: AppColors.secondaryLightRedColor,
borderColor: AppColors.secondaryLightRedColor, // borderColor: AppColors.secondaryLightRedColor,
textColor: AppColors.primaryRedColor, // textColor: AppColors.primaryRedColor,
fontSize: 14, // fontSize: 14,
fontWeight: FontWeight.w500, // fontWeight: FontWeight.w500,
borderRadius: 12, // borderRadius: 12,
padding: EdgeInsets.fromLTRB(10, 0, 10, 0), // padding: EdgeInsets.fromLTRB(10, 0, 10, 0),
height: 40.h, // height: 40.h,
iconSize: 16.h, // iconSize: 16.h,
icon: AppAssets.report_icon, // icon: AppAssets.report_icon,
iconColor: AppColors.primaryRedColor, // iconColor: AppColors.primaryRedColor,
) // )
], // ],
), // ),
SizedBox(height: 24.h), // SizedBox(height: 24.h),
AppointmentDoctorCard( AppointmentDoctorCard(
patientAppointmentHistoryResponseModel: widget.patientAppointmentHistoryResponseModel, patientAppointmentHistoryResponseModel: widget.patientAppointmentHistoryResponseModel,
onAskDoctorTap: () {}, onAskDoctorTap: () {},

1
lib/presentation/appointments/my_appointments_page.dart
Unescape Escape View File

@ -97,7 +97,6 @@ class _MyAppointmentsPageState extends State<MyAppointmentsPage> {
child: AnimatedContainer( child: AnimatedContainer(
duration: Duration(milliseconds: 300), duration: Duration(milliseconds: 300),
curve: Curves.easeInOut, curve: Curves.easeInOut,
margin: EdgeInsets.symmetric(vertical: 8.h),
decoration: RoundedRectangleBorder().toSmoothCornerDecoration(color: AppColors.whiteColor, borderRadius: 24.h, hasShadow: true), decoration: RoundedRectangleBorder().toSmoothCornerDecoration(color: AppColors.whiteColor, borderRadius: 24.h, hasShadow: true),
child: AppointmentCard( child: AppointmentCard(
patientAppointmentHistoryResponseModel: myAppointmentsVM.patientAppointmentsHistoryList[index], patientAppointmentHistoryResponseModel: myAppointmentsVM.patientAppointmentsHistoryList[index],

65
lib/presentation/insurance/insurance_home_page.dart
Unescape Escape View File

@ -40,47 +40,52 @@ class _InsuranceHomePageState extends State<InsuranceHomePage> {
@override @override
Widget build(BuildContext context) { Widget build(BuildContext context) {
insuranceViewModel = Provider.of<InsuranceViewModel>(context); insuranceViewModel = Provider.of<InsuranceViewModel>(context, listen: false);
return Scaffold( return Scaffold(
backgroundColor: AppColors.bgScaffoldColor, backgroundColor: AppColors.bgScaffoldColor,
body: CollapsingListView( body: CollapsingListView(
title: "${LocaleKeys.insurance.tr(context: context)} ${LocaleKeys.updateInsurance.tr(context: context)}", title: "${LocaleKeys.insurance.tr(context: context)} ${LocaleKeys.updateInsurance.tr(context: context)}",
history: () {
insuranceViewModel.setIsInsuranceHistoryLoading(true);
insuranceViewModel.getPatientInsuranceCardHistory();
showCommonBottomSheet(context,
child: InsuranceHistory(), callBackFunc: (str) {}, title: "", height: ResponsiveExtension.screenHeight * 0.65, isCloseButtonVisible: false, isFullScreen: false);
},
child: SingleChildScrollView( child: SingleChildScrollView(
child: Consumer<InsuranceViewModel>(builder: (context, insuranceVM, child) { child: Consumer<InsuranceViewModel>(builder: (context, insuranceVM, child) {
return Column( return Column(
crossAxisAlignment: CrossAxisAlignment.start, crossAxisAlignment: CrossAxisAlignment.start,
children: [ children: [
Row( // Row(
mainAxisAlignment: MainAxisAlignment.spaceBetween, // mainAxisAlignment: MainAxisAlignment.spaceBetween,
children: [ // children: [
"${LocaleKeys.insurance.tr(context: context)} ${LocaleKeys.updateInsurance.tr(context: context)}".toText24(isBold: true), // "${LocaleKeys.insurance.tr(context: context)} ${LocaleKeys.updateInsurance.tr(context: context)}".toText24(isBold: true),
CustomButton( // CustomButton(
icon: AppAssets.insurance_history_icon, // icon: AppAssets.insurance_history_icon,
iconColor: AppColors.primaryRedColor, // iconColor: AppColors.primaryRedColor,
iconSize: 21.h, // iconSize: 21.h,
text: LocaleKeys.history.tr(context: context), // text: LocaleKeys.history.tr(context: context),
onPressed: () { // onPressed: () {
insuranceVM.setIsInsuranceHistoryLoading(true); // },
insuranceVM.getPatientInsuranceCardHistory(); // backgroundColor: AppColors.primaryRedColor.withOpacity(0.1),
showCommonBottomSheet(context, // borderColor: AppColors.primaryRedColor.withOpacity(0.0),
child: InsuranceHistory(), callBackFunc: (str) {}, title: "", height: ResponsiveExtension.screenHeight * 0.65, isCloseButtonVisible: false, isFullScreen: false); // textColor: AppColors.primaryRedColor,
}, // fontSize: 14,
backgroundColor: AppColors.primaryRedColor.withOpacity(0.1), // fontWeight: FontWeight.w600,
borderColor: AppColors.primaryRedColor.withOpacity(0.0), // borderRadius: 12,
textColor: AppColors.primaryRedColor, // padding: EdgeInsets.fromLTRB(10, 0, 10, 0),
fontSize: 14, // height: 40.h,
fontWeight: FontWeight.w600, // ),
borderRadius: 12, // ],
padding: EdgeInsets.fromLTRB(10, 0, 10, 0), // ).paddingSymmetrical(24.h, 24.h),
height: 40.h,
),
],
).paddingSymmetrical(24.h, 24.h),
insuranceVM.isInsuranceLoading insuranceVM.isInsuranceLoading
? const MoviesShimmerWidget().paddingSymmetrical(24.h, 0) ? const MoviesShimmerWidget().paddingSymmetrical(24.h, 0)
: PatientInsuranceCard( : Padding(
insuranceCardDetailsModel: insuranceVM.patientInsuranceList.first, padding: EdgeInsets.only(top: 24.h),
isInsuranceExpired: DateTime.now().isAfter(DateUtil.convertStringToDate(insuranceVM.patientInsuranceList.first.cardValidTo))), child: PatientInsuranceCard(
insuranceCardDetailsModel: insuranceVM.patientInsuranceList.first,
isInsuranceExpired: DateTime.now().isAfter(DateUtil.convertStringToDate(insuranceVM.patientInsuranceList.first.cardValidTo))),
),
], ],
); );
}), }),

Write Preview
Loading…
Cancel
Save