diff --git a/lib/views/appoinments/update_appointment_page.dart b/lib/views/appoinments/update_appointment_page.dart index 2c0904c..be3edd5 100644 --- a/lib/views/appoinments/update_appointment_page.dart +++ b/lib/views/appoinments/update_appointment_page.dart @@ -43,11 +43,9 @@ class _UpdateAppointmentPageState extends State { print('servicePaymentStatus: ${appointmentListModel.servicePaymentStatus}'); print( 'appointmentPaymentStatusEnum: ' - '${appointmentListModel.appointmentPaymentStatusEnum}', + '${appointmentListModel.appointmentPaymentStatusEnum}', ); - print('paymentType: ${appointmentListModel.paymentType}'); - print('amountRem: ${appointmentListModel.remainingAmount}'); - print('=========================================='); + if (appointmentsVM.state == ViewState.busy) { return const Center(child: CircularProgressIndicator()); } else { @@ -83,6 +81,7 @@ class _UpdateAppointmentPageState extends State { ); }, ), + ], ], ), diff --git a/lib/views/branch_management/branch/branch_detail_page.dart b/lib/views/branch_management/branch/branch_detail_page.dart index bc34a58..aa36a55 100644 --- a/lib/views/branch_management/branch/branch_detail_page.dart +++ b/lib/views/branch_management/branch/branch_detail_page.dart @@ -120,9 +120,13 @@ class _BranchDetailPageState extends State { }, ); } else if (widget.branchData.branchStatus == BranchStatusEnum.pending) { - actionWidget = pendingApprovalAction(pendingText: LocaleKeys.approvalPending.tr(),); + actionWidget = pendingApprovalAction( + pendingText: LocaleKeys.approvalPending.tr(), + ); } else if (widget.branchData.branchStatus == BranchStatusEnum.deactivated) { - actionWidget = pendingApprovalAction(pendingText: LocaleKeys.activateNow.tr(),); + actionWidget = pendingApprovalAction( + pendingText: LocaleKeys.activateNow.tr(), + ); } else if (widget.branchData.branchStatus == BranchStatusEnum.rejected) { actionWidget = Column( children: [ @@ -175,8 +179,11 @@ class _BranchDetailPageState extends State { Row( mainAxisAlignment: MainAxisAlignment.spaceBetween, children: [ - (isArabic ? (serviceVM.categories[pIndex].categoryNameN ?? serviceVM.categories[pIndex].categoryName) - : serviceVM.categories[pIndex].categoryName).toString().toText(fontSize: 16), + Expanded( + child: (isArabic ? (serviceVM.categories[pIndex].categoryNameN ?? serviceVM.categories[pIndex].categoryName) : serviceVM.categories[pIndex].categoryName) + .toString() + .toText(fontSize: 16), + ), // isArabic // ? serviceVM.categories[pIndex].categoryNameN.toString().toText(fontSize: 14, maxLines: 2) // : serviceVM.categories[pIndex].categoryName.toString().toText(fontSize: 14, maxLines: 2), @@ -382,8 +389,6 @@ class _BranchDetailPageState extends State { ] else ...[ ListView.separated( itemBuilder: (context, pIndex) { - print("Category English ===== ${serviceVM.categories[pIndex].categoryName}"); - print("Category Arabic ===== ${serviceVM.categories[pIndex].categoryNameN}"); return buildServiceTileWidget(pIndex, serviceVM).onPress(() { serviceVM.categories[pIndex].branchId = widget.branchData.id.toString(); serviceVM.categories[pIndex].branchName = widget.branchData.branchName.toString();