pull/143/head
haroon amjad 3 months ago
parent 210da3404c
commit e9dd2f0648

@ -675,7 +675,7 @@ var GET_PRESCRIPTION_INSTRUCTIONS_PDF = 'Services/ChatBot_Service.svc/REST/Chatb
class ApiConsts { class ApiConsts {
static const maxSmallScreen = 660; static const maxSmallScreen = 660;
static AppEnvironmentTypeEnum appEnvironmentType = AppEnvironmentTypeEnum.prod; static AppEnvironmentTypeEnum appEnvironmentType = AppEnvironmentTypeEnum.uat;
// static String baseUrl = 'https://uat.hmgwebservices.com/'; // HIS API URL UAT // static String baseUrl = 'https://uat.hmgwebservices.com/'; // HIS API URL UAT

@ -401,7 +401,6 @@ class _AppointmentPaymentPageState extends State<AppointmentPaymentPage> {
appointmentNo: widget.patientAppointmentHistoryResponseModel.appointmentNo.toString(), appointmentNo: widget.patientAppointmentHistoryResponseModel.appointmentNo.toString(),
onSuccess: (value) async { onSuccess: (value) async {
if (widget.patientAppointmentHistoryResponseModel.isLiveCareAppointment!) { if (widget.patientAppointmentHistoryResponseModel.isLiveCareAppointment!) {
//TODO: Implement LiveCare Check-In API Call
await myAppointmentsViewModel.insertLiveCareVIDARequest( await myAppointmentsViewModel.insertLiveCareVIDARequest(
clientRequestID: tamaraOrderID, clientRequestID: tamaraOrderID,
patientAppointmentHistoryResponseModel: widget.patientAppointmentHistoryResponseModel, patientAppointmentHistoryResponseModel: widget.patientAppointmentHistoryResponseModel,

@ -358,14 +358,14 @@ class AppointmentCard extends StatelessWidget {
backgroundColor: AppColors.greyColor, backgroundColor: AppColors.greyColor,
borderColor: AppColors.greyColor, borderColor: AppColors.greyColor,
textColor: AppColors.blackColor, textColor: AppColors.blackColor,
fontSize: 12.f, fontSize: 14.f,
fontWeight: FontWeight.w500, fontWeight: FontWeight.w500,
borderRadius: 12.r, borderRadius: 12.r,
padding: EdgeInsets.symmetric(horizontal: 10.w), padding: EdgeInsets.symmetric(horizontal: 10.w),
height: 40.h, height: 40.h,
icon: AppAssets.rebook_appointment_icon, icon: AppAssets.rebook_appointment_icon,
iconColor: AppColors.blackColor, iconColor: AppColors.blackColor,
iconSize: 14.h, iconSize: 16.h,
); );
} }

@ -182,7 +182,8 @@ class _ReviewAppointmentPageState extends State<ReviewAppointmentPage> {
children: [ children: [
bookAppointmentsViewModel.selectedDoctor.projectName!.toText16(isBold: true), bookAppointmentsViewModel.selectedDoctor.projectName!.toText16(isBold: true),
SizedBox(height: 8.h), SizedBox(height: 8.h),
Wrap( bookAppointmentsViewModel.appointmentNearestGateResponseModel != null
? Wrap(
direction: Axis.horizontal, direction: Axis.horizontal,
spacing: 8.w, spacing: 8.w,
runSpacing: 8.h, runSpacing: 8.h,
@ -197,7 +198,8 @@ class _ReviewAppointmentPageState extends State<ReviewAppointmentPage> {
"Nearest Gate: ${getIt.get<AppState>().isArabic() ? bookAppointmentsVM.appointmentNearestGateResponseModel!.nearestGateNumberN : bookAppointmentsVM.appointmentNearestGateResponseModel!.nearestGateNumber}") "Nearest Gate: ${getIt.get<AppState>().isArabic() ? bookAppointmentsVM.appointmentNearestGateResponseModel!.nearestGateNumberN : bookAppointmentsVM.appointmentNearestGateResponseModel!.nearestGateNumber}")
.toShimmer2(isShow: bookAppointmentsVM.isAppointmentNearestGateLoading), .toShimmer2(isShow: bookAppointmentsVM.isAppointmentNearestGateLoading),
], ],
), )
: SizedBox.shrink(),
], ],
), ),
), ),

@ -169,9 +169,9 @@ class _PrescriptionDetailPageState extends State<PrescriptionDetailPage> {
backgroundColor: AppColors.successColor.withValues(alpha: 0.15), backgroundColor: AppColors.successColor.withValues(alpha: 0.15),
borderColor: AppColors.successColor.withValues(alpha: 0.01), borderColor: AppColors.successColor.withValues(alpha: 0.01),
textColor: AppColors.successColor, textColor: AppColors.successColor,
fontSize: 14, fontSize: 14.f,
fontWeight: FontWeight.w500, fontWeight: FontWeight.w500,
borderRadius: 12, borderRadius: 12.r,
padding: EdgeInsets.fromLTRB(10, 0, 10, 0), padding: EdgeInsets.fromLTRB(10, 0, 10, 0),
height: 40.h, height: 40.h,
icon: AppAssets.download, icon: AppAssets.download,

@ -220,9 +220,9 @@ class PrescriptionItemView extends StatelessWidget {
backgroundColor: AppColors.primaryRedColor.withOpacity(0.1), backgroundColor: AppColors.primaryRedColor.withOpacity(0.1),
borderColor: AppColors.primaryRedColor.withOpacity(0.0), borderColor: AppColors.primaryRedColor.withOpacity(0.0),
textColor: AppColors.primaryRedColor, textColor: AppColors.primaryRedColor,
fontSize: 13, fontSize: 14.f,
fontWeight: FontWeight.w500, fontWeight: FontWeight.w500,
borderRadius: 12, borderRadius: 12.r,
padding: EdgeInsets.fromLTRB(10, 0, 10, 0), padding: EdgeInsets.fromLTRB(10, 0, 10, 0),
height: 40.h, height: 40.h,
).toShimmer2(isShow: isLoading), ).toShimmer2(isShow: isLoading),

@ -259,14 +259,14 @@ class _PrescriptionsListPageState extends State<PrescriptionsListPage> {
prescription.isHomeMedicineDeliverySupported! ? AppColors.successColor.withOpacity(0.15) : AppColors.greyF7Color, prescription.isHomeMedicineDeliverySupported! ? AppColors.successColor.withOpacity(0.15) : AppColors.greyF7Color,
borderColor: AppColors.successColor.withOpacity(0.01), borderColor: AppColors.successColor.withOpacity(0.01),
textColor: prescription.isHomeMedicineDeliverySupported! ? AppColors.successColor : AppColors.textColor.withOpacity(0.35), textColor: prescription.isHomeMedicineDeliverySupported! ? AppColors.successColor : AppColors.textColor.withOpacity(0.35),
fontSize: prescription.isHomeMedicineDeliverySupported! ? 14 : 12, fontSize: prescription.isHomeMedicineDeliverySupported! ? 14.f : 12.f,
fontWeight: FontWeight.w500, fontWeight: FontWeight.w500,
borderRadius: 12, borderRadius: 12.r,
padding: EdgeInsets.fromLTRB(10, 0, 10, 0), padding: EdgeInsets.fromLTRB(10, 0, 10, 0),
height: 40.h, height: 40.h,
icon: AppAssets.prescription_refill_icon, icon: AppAssets.prescription_refill_icon,
iconColor: prescription.isHomeMedicineDeliverySupported! ? AppColors.successColor : AppColors.textColor.withOpacity(0.35), iconColor: prescription.isHomeMedicineDeliverySupported! ? AppColors.successColor : AppColors.textColor.withOpacity(0.35),
iconSize: 14.h, iconSize: 16.h,
), ),
), ),
SizedBox(width: 8.h), SizedBox(width: 8.h),

@ -177,11 +177,11 @@ class AncillaryOrderCard extends StatelessWidget {
labelText: order.projectName ?? '-', labelText: order.projectName ?? '-',
).toShimmer2(isShow: isLoading), ).toShimmer2(isShow: isLoading),
// orderNo // orderNo
if (order.orderNo != null || isLoading) // if (order.orderNo != null || isLoading)
AppCustomChipWidget( // AppCustomChipWidget(
// icon: AppAssets.calendar, // // icon: AppAssets.calendar,
labelText: "${"Order# :".needTranslation}${order.orderNo ?? '-'}", // labelText: "${"Order# :".needTranslation}${order.orderNo ?? '-'}",
).toShimmer2(isShow: isLoading), // ).toShimmer2(isShow: isLoading),
// Appointment Date // Appointment Date
if (order.appointmentDate != null || isLoading) if (order.appointmentDate != null || isLoading)

Loading…
Cancel
Save