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

updates

Browse Source
pull/337/head
haroon amjad 1 week ago
parent 3dd4665f6e
commit e64f147f49
6 changed files with 65 additions and 41 deletions
Show Stats Download Patch File Download Diff File

4
lib/core/api/api_client.dart
Unescape Escape View File

@ -210,8 +210,8 @@ class ApiClientImp implements ApiClient {
body['TokenID'] = "@dm!n"; body['TokenID'] = "@dm!n";
} }
body['TokenID'] = "@dm!n"; // body['TokenID'] = "@dm!n";
// body['PatientID'] = 255375; // body['PatientID'] = 4769748;
// body['PatientID'] = 89754444; // body['PatientID'] = 89754444;
// body['PatientTypeID'] = 1; // body['PatientTypeID'] = 1;
// body['PatientOutSA'] = 0; // body['PatientOutSA'] = 0;

7
lib/features/my_appointments/my_appointments_view_model.dart
Unescape Escape View File

@ -588,7 +588,12 @@ class MyAppointmentsViewModel extends ChangeNotifier {
final result = await myAppointmentsRepo.confirmAppointment(patientAppointmentHistoryResponseModel: patientAppointmentHistoryResponseModel); final result = await myAppointmentsRepo.confirmAppointment(patientAppointmentHistoryResponseModel: patientAppointmentHistoryResponseModel);
result.fold( result.fold(
(failure) async => await errorHandlerService.handleError(failure: failure), // (failure) async => await errorHandlerService.handleError(failure: failure),
(failure) async {
if(onError != null) {
onError(failure.message);
}
},
(apiResponse) { (apiResponse) {
if (apiResponse.messageStatus == 2) { if (apiResponse.messageStatus == 2) {
onError!(apiResponse.errorMessage!); onError!(apiResponse.errorMessage!);

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

@ -1216,6 +1216,16 @@ class _AppointmentDetailsPageState extends State<AppointmentDetailsPage> {
isDismissible: false, isDismissible: false,
isFullScreen: false, isFullScreen: false,
isSuccessDialog: true); isSuccessDialog: true);
},
onError: (err) {
LoaderBottomSheet.hideLoader();
showCommonBottomSheetWithoutHeight(
context,
child: Utils.getErrorWidget(loadingText: err),
callBackFunc: () {},
isFullScreen: false,
isCloseButtonVisible: true,
);
}); });
// LoaderBottomSheet.hideLoader(); // LoaderBottomSheet.hideLoader();
case 15: case 15:

8
lib/presentation/appointments/appointment_payment_page.dart
Unescape Escape View File

@ -232,8 +232,8 @@ class _AppointmentPaymentPageState extends State<AppointmentPaymentPage> {
"0", "0",
widget.patientAppointmentHistoryResponseModel.isLiveCareAppointment! ? "true" : "false", widget.patientAppointmentHistoryResponseModel.isLiveCareAppointment! ? "true" : "false",
widget.patientAppointmentHistoryResponseModel.appointmentDate!, widget.patientAppointmentHistoryResponseModel.appointmentDate!,
widget.patientAppointmentHistoryResponseModel.appointmentNo!, widget.patientAppointmentHistoryResponseModel.appointmentNo.toString(),
widget.patientAppointmentHistoryResponseModel.doctorID!, widget.patientAppointmentHistoryResponseModel.doctorID.toString(),
transactionID: transID, transactionID: transID,
fileNumber: appState.getAuthenticatedUser()!.patientId.toString(), fileNumber: appState.getAuthenticatedUser()!.patientId.toString(),
orderDescription: "Appointment Payment", orderDescription: "Appointment Payment",
@ -455,8 +455,8 @@ class _AppointmentPaymentPageState extends State<AppointmentPaymentPage> {
"0", "0",
widget.patientAppointmentHistoryResponseModel.isLiveCareAppointment! ? "true" : "false", widget.patientAppointmentHistoryResponseModel.isLiveCareAppointment! ? "true" : "false",
widget.patientAppointmentHistoryResponseModel.appointmentDate!, widget.patientAppointmentHistoryResponseModel.appointmentDate!,
widget.patientAppointmentHistoryResponseModel.appointmentNo!, widget.patientAppointmentHistoryResponseModel.appointmentNo.toString(),
widget.patientAppointmentHistoryResponseModel.doctorID!, widget.patientAppointmentHistoryResponseModel.doctorID.toString(),
transactionID: transID, transactionID: transID,
fileNumber: appState.getAuthenticatedUser()!.patientId.toString(), fileNumber: appState.getAuthenticatedUser()!.patientId.toString(),
amount: myAppointmentsViewModel.patientAppointmentShareResponseModel!.patientShareWithTax!.toString(), amount: myAppointmentsViewModel.patientAppointmentShareResponseModel!.patientShareWithTax!.toString(),

9
lib/presentation/blood_donation/widgets/select_gender_widget.dart
Unescape Escape View File

@ -57,9 +57,12 @@ class SelectGenderWidget extends StatelessWidget {
), ),
], ],
).paddingSymmetrical(16.h, 16.h).onPress(() { ).paddingSymmetrical(16.h, 16.h).onPress(() {
final genderValue = isArabic final genderValue =
? GenderTypeEnum.values[index].typeAr // isArabic
: GenderTypeEnum.values[index].type; // ? GenderTypeEnum.values[index].typeAr
// :
GenderTypeEnum.values[index].type;
bloodDonationViewModel.onGenderChange(genderValue); bloodDonationViewModel.onGenderChange(genderValue);
Navigator.of(context).pop(); Navigator.of(context).pop();
})); }));

68
lib/presentation/home/landing_page.dart
Unescape Escape View File

@ -448,31 +448,31 @@ class _LandingPageState extends State<LandingPage> {
: SizedBox.shrink(), : SizedBox.shrink(),
// Offers And Discounts Carousel - Auto-scrolling from right to left // Offers And Discounts Carousel - Auto-scrolling from right to left
appState.isAuthenticated && appState.isEnabledOffersAndDiscountsCarousel // appState.isAuthenticated && appState.isEnabledOffersAndDiscountsCarousel
? Column( // ? Column(
children: [ // children: [
SizedBox(height: 12.h), // SizedBox(height: 12.h),
Row( // Row(
mainAxisAlignment: MainAxisAlignment.spaceBetween, // mainAxisAlignment: MainAxisAlignment.spaceBetween,
children: [ // children: [
("${LocaleKeys.offers.tr(context: context)} & ${LocaleKeys.discount.tr(context: context)}").toText16(isBold: true), // ("${LocaleKeys.offers.tr(context: context)} & ${LocaleKeys.discount.tr(context: context)}").toText16(isBold: true),
Row( // Row(
children: [ // children: [
LocaleKeys.viewAll.tr(context: context).toText14(color: AppColors.primaryRedColor, isBold: true), // LocaleKeys.viewAll.tr(context: context).toText14(color: AppColors.primaryRedColor, isBold: true),
SizedBox(width: 2.h), // SizedBox(width: 2.h),
Icon(Icons.arrow_forward_ios, color: AppColors.primaryRedColor, size: 14.h), // Icon(Icons.arrow_forward_ios, color: AppColors.primaryRedColor, size: 14.h),
], // ],
), // ),
], // ],
).paddingSymmetrical(24.h, 0.h).onPress(() { // ).paddingSymmetrical(24.h, 0.h).onPress(() {
Navigator.of(context).push(CustomPageRoute(page: OffersAndDiscountsPage())); // Navigator.of(context).push(CustomPageRoute(page: OffersAndDiscountsPage()));
}), // }),
SizedBox(height: 16.h), // SizedBox(height: 16.h),
OffersAndDiscountsCarousel().paddingSymmetrical(24.h, 0.h), // OffersAndDiscountsCarousel().paddingSymmetrical(24.h, 0.h),
SizedBox(height: 18.h), // SizedBox(height: 18.h),
], // ],
) // )
: SizedBox.shrink(), // : SizedBox.shrink(),
appState.isAuthenticated appState.isAuthenticated
? Column( ? Column(
@ -516,7 +516,7 @@ class _LandingPageState extends State<LandingPage> {
), ),
).paddingSymmetrical(24.h, 16.h) ).paddingSymmetrical(24.h, 16.h)
: myAppointmentsVM.patientAppointmentsHistoryList.isNotEmpty : myAppointmentsVM.patientAppointmentsHistoryList.isNotEmpty
? myAppointmentsVM.patientAppointmentsHistoryList.length == 1 ? myAppointmentsVM.patientAppointmentsHistoryList.length == 1 && !immediateLiveCareVM.patientHasPendingLiveCareRequest
? Container( ? Container(
decoration: RoundedRectangleBorder().toSmoothCornerDecoration( decoration: RoundedRectangleBorder().toSmoothCornerDecoration(
color: AppColors.whiteColor, color: AppColors.whiteColor,
@ -536,9 +536,11 @@ class _LandingPageState extends State<LandingPage> {
height: isTablet ? 290.h : 255.h, height: isTablet ? 290.h : 255.h,
child: ListView.separated( child: ListView.separated(
scrollDirection: Axis.horizontal, scrollDirection: Axis.horizontal,
itemCount: myAppointmentsVM.patientAppointmentsHistoryList.length < 3 itemCount: () {
? myAppointmentsVM.patientAppointmentsHistoryList.length final int baseCount =
: 3, myAppointmentsVM.patientAppointmentsHistoryList.length + (immediateLiveCareVM.patientHasPendingLiveCareRequest ? 1 : 0);
return baseCount < 3 ? baseCount : 3;
}(),
shrinkWrap: true, shrinkWrap: true,
padding: EdgeInsets.only(left: 16.h, right: 16.h), padding: EdgeInsets.only(left: 16.h, right: 16.h),
itemBuilder: (context, index) { itemBuilder: (context, index) {
@ -571,10 +573,14 @@ class _LandingPageState extends State<LandingPage> {
height: 255.h + 20 + 30, // itemHeight + shadow padding (10 top + 10 bottom) + pagination dots space height: 255.h + 20 + 30, // itemHeight + shadow padding (10 top + 10 bottom) + pagination dots space
child: Builder( child: Builder(
builder: (context) { builder: (context) {
final int baseAppointmentCount = myAppointmentsVM.patientAppointmentsHistoryList.length;
final int liveCareCount = immediateLiveCareVM.patientHasPendingLiveCareRequest ? 1 : 0;
final int totalCount = baseAppointmentCount + liveCareCount;
final int swiperItemCount = myAppointmentsVM.isMyAppointmentsLoading final int swiperItemCount = myAppointmentsVM.isMyAppointmentsLoading
? 3 ? 3
: myAppointmentsVM.patientAppointmentsHistoryList.length < 3 : totalCount < 3
? myAppointmentsVM.patientAppointmentsHistoryList.length ? totalCount
: 3; : 3;
final bool isArabic = appState.isArabic(); final bool isArabic = appState.isArabic();
return Swiper( return Swiper(

Write Preview
Loading…
Cancel
Save