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

Compare commits

base: Haroon6138:4f6dbb79cd899e84cababb5d69856a041b92e896
Branches Tags
Haroon6138:haroon_dev
Haroon6138:Main_App_Replacement
Haroon6138:master
Haroon6138:inpatient_services
Haroon6138:dev_sultan
Haroon6138:live_activities
Haroon6138:CR-19328-LiveCare-Enhancements
Haroon6138:offers_discounts
Haroon6138:faiz_dev_tools_imp
Haroon6138:notification_center_id_Dev_sultan
Haroon6138:lab_result_changes
Haroon6138:faiz_dev
Haroon6138:faiz_dev_symptoms_checker
Haroon6138:dev_aamir
Haroon6138:symtomcheckers
Haroon6138:Android_16_KB_page_size
Haroon6138:changes
Haroon6138:maptype
Haroon6138:lab-graph
Haroon6138:dev_sikander
Haroon6138:ambulance_selection_change
Haroon6138:watch_integration
Haroon6138:reminer
Haroon6138:labs_graph_pdf
Haroon6138:translation-context
Haroon6138:faiz_dev_dark_mode
Haroon6138:calender_pacakge_changes
Haroon6138:calender_package
Haroon6138:fatima
Haroon6138:unware-clinic-bottomsheet
Haroon6138:main
Haroon6138:ambulance_service
Haroon6138:hospital_filter
Haroon6138:lab-result-changes
Haroon6138:calender_reminder
Haroon6138:ambulance_ui
..
compare: Haroon6138:3dd4665f6e785939de18eb58c2eee0129c0492f6
Branches Tags
Haroon6138:haroon_dev
Haroon6138:Main_App_Replacement
Haroon6138:master
Haroon6138:inpatient_services
Haroon6138:dev_sultan
Haroon6138:live_activities
Haroon6138:CR-19328-LiveCare-Enhancements
Haroon6138:offers_discounts
Haroon6138:faiz_dev_tools_imp
Haroon6138:notification_center_id_Dev_sultan
Haroon6138:lab_result_changes
Haroon6138:faiz_dev
Haroon6138:faiz_dev_symptoms_checker
Haroon6138:dev_aamir
Haroon6138:symtomcheckers
Haroon6138:Android_16_KB_page_size
Haroon6138:changes
Haroon6138:maptype
Haroon6138:lab-graph
Haroon6138:dev_sikander
Haroon6138:ambulance_selection_change
Haroon6138:watch_integration
Haroon6138:reminer
Haroon6138:labs_graph_pdf
Haroon6138:translation-context
Haroon6138:faiz_dev_dark_mode
Haroon6138:calender_pacakge_changes
Haroon6138:calender_package
Haroon6138:fatima
Haroon6138:unware-clinic-bottomsheet
Haroon6138:main
Haroon6138:ambulance_service
Haroon6138:hospital_filter
Haroon6138:lab-result-changes
Haroon6138:calender_reminder
Haroon6138:ambulance_ui

No commits in common. '4f6dbb79cd899e84cababb5d69856a041b92e896' and '3dd4665f6e785939de18eb58c2eee0129c0492f6' have entirely different histories.
4f6dbb79cd ... 3dd4665f6e

6 changed files with 41 additions and 65 deletions
Show Stats

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'] = 4769748; // body['PatientID'] = 255375;
// 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,12 +588,7 @@ 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,16 +1216,6 @@ 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.toString(), widget.patientAppointmentHistoryResponseModel.appointmentNo!,
widget.patientAppointmentHistoryResponseModel.doctorID.toString(), widget.patientAppointmentHistoryResponseModel.doctorID!,
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.toString(), widget.patientAppointmentHistoryResponseModel.appointmentNo!,
widget.patientAppointmentHistoryResponseModel.doctorID.toString(), widget.patientAppointmentHistoryResponseModel.doctorID!,
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,12 +57,9 @@ class SelectGenderWidget extends StatelessWidget {
), ),
], ],
).paddingSymmetrical(16.h, 16.h).onPress(() { ).paddingSymmetrical(16.h, 16.h).onPress(() {
final genderValue = final genderValue = isArabic
// isArabic ? GenderTypeEnum.values[index].typeAr
// ? GenderTypeEnum.values[index].typeAr : GenderTypeEnum.values[index].type;
// :
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 && !immediateLiveCareVM.patientHasPendingLiveCareRequest ? myAppointmentsVM.patientAppointmentsHistoryList.length == 1
? Container( ? Container(
decoration: RoundedRectangleBorder().toSmoothCornerDecoration( decoration: RoundedRectangleBorder().toSmoothCornerDecoration(
color: AppColors.whiteColor, color: AppColors.whiteColor,
@ -536,11 +536,9 @@ 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: () { itemCount: myAppointmentsVM.patientAppointmentsHistoryList.length < 3
final int baseCount = ? myAppointmentsVM.patientAppointmentsHistoryList.length
myAppointmentsVM.patientAppointmentsHistoryList.length + (immediateLiveCareVM.patientHasPendingLiveCareRequest ? 1 : 0); : 3,
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) {
@ -573,14 +571,10 @@ 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
: totalCount < 3 : myAppointmentsVM.patientAppointmentsHistoryList.length < 3
? totalCount ? myAppointmentsVM.patientAppointmentsHistoryList.length
: 3; : 3;
final bool isArabic = appState.isArabic(); final bool isArabic = appState.isArabic();
return Swiper( return Swiper(

Write Preview
Loading…
Cancel
Save