diff --git a/lib/dashboard_latest/widgets/request_category_fragment.dart b/lib/dashboard_latest/widgets/request_category_fragment.dart index e46c844a..ef40a6df 100644 --- a/lib/dashboard_latest/widgets/request_category_fragment.dart +++ b/lib/dashboard_latest/widgets/request_category_fragment.dart @@ -22,29 +22,31 @@ class RequestCategoryFragment extends StatelessWidget { return Consumer(builder: (context, dashboardProvider, child) { bool isNurse = (Provider.of(context, listen: false).user?.type) == UsersTypes.normal_user; return Column(mainAxisSize: MainAxisSize.min, crossAxisAlignment: CrossAxisAlignment.start, children: [ - !isNurse - ? Column( - children: [ - Row( - mainAxisAlignment: MainAxisAlignment.spaceBetween, - children: [ - context.translation.allWorkOrder.heading4(context), - GestureDetector( - onTap: () { - dashboardProvider.isShowDashBoardCalendar = !dashboardProvider.isShowDashBoardCalendar; - }, - child: dashboardProvider.isShowDashBoardCalendar ? AppAsset.listIcon.toSvgAsset() : AppAsset.calendarIcon.toSvgAsset()) - ], - ), - dashboardProvider.isShowDashBoardCalendar - ? Padding( - padding: EdgeInsets.only(top: 12.toScreenHeight), - child: const WeeklyCalendarFragment(), - ) - : const SizedBox(), - ], - ).paddingOnly(start: 16, end: 16) - : context.translation.allWorkOrder.heading4(context).paddingOnly(start: 16, end: 16), + //TODO uncommit this to get the calendar card.. + // !isNurse + // ? Column( + // children: [ + // Row( + // mainAxisAlignment: MainAxisAlignment.spaceBetween, + // children: [ + // context.translation.allWorkOrder.heading4(context), + // GestureDetector( + // onTap: () { + // dashboardProvider.isShowDashBoardCalendar = !dashboardProvider.isShowDashBoardCalendar; + // }, + // child: dashboardProvider.isShowDashBoardCalendar ? AppAsset.listIcon.toSvgAsset() : AppAsset.calendarIcon.toSvgAsset()) + // ], + // ), + // dashboardProvider.isShowDashBoardCalendar + // ? Padding( + // padding: EdgeInsets.only(top: 12.toScreenHeight), + // child: const WeeklyCalendarFragment(), + // ) + // : const SizedBox(), + // ], + // ).paddingOnly(start: 16, end: 16) + // : + context.translation.allWorkOrder.heading4(context).paddingOnly(start: 16, end: 16), getTabs( requestsProvider: dashboardProvider, context: context, diff --git a/lib/service_request_latest/views/components/bottom_sheets/service_request_bottomsheet.dart b/lib/service_request_latest/views/components/bottom_sheets/service_request_bottomsheet.dart index 5127c053..d76e9f7f 100644 --- a/lib/service_request_latest/views/components/bottom_sheets/service_request_bottomsheet.dart +++ b/lib/service_request_latest/views/components/bottom_sheets/service_request_bottomsheet.dart @@ -282,20 +282,20 @@ class ServiceRequestBottomSheet { buttonColor: AppColor.primary10, loading: false, onPressed: () async { - // if (requestDetailProvider.currentWorkOrder?.data?.nextStep!.workOrderNextStepEnum == WorkOrderNextStepEnum.eArrived) { - // requestDetailProvider.updateNeedVisitHelperModel(NeedVisitHelperModel( - // workOrderId: requestDetailProvider.needVisitHelperModel?.workOrderId, - // visitDate: requestDetailProvider.needVisitHelperModel?.visitDate, - // comment: requestDetailProvider.needVisitHelperModel?.comment, - // )); - // requestDetailProvider.engineerUpdateNeedVisit(); - // } else { - // requestDetailProvider.needVisitHelperModel?.workOrderId = requestDetailProvider.currentWorkOrder!.data!.requestId; - // requestDetailProvider.engineerNeedVisit(); - // requestDetailProvider.needVisitHelperModel = NeedVisitHelperModel(); - // } - Navigator.pop(context); - initialVisitReminderBottomSheet(context: context); + if (requestDetailProvider.currentWorkOrder?.data?.nextStep!.workOrderNextStepEnum == WorkOrderNextStepEnum.eArrived) { + requestDetailProvider.updateNeedVisitHelperModel(NeedVisitHelperModel( + workOrderId: requestDetailProvider.needVisitHelperModel?.workOrderId, + visitDate: requestDetailProvider.needVisitHelperModel?.visitDate, + comment: requestDetailProvider.needVisitHelperModel?.comment, + )); + requestDetailProvider.engineerUpdateNeedVisit(); + } else { + requestDetailProvider.needVisitHelperModel?.workOrderId = requestDetailProvider.currentWorkOrder!.data!.requestId; + requestDetailProvider.engineerNeedVisit(); + requestDetailProvider.needVisitHelperModel = NeedVisitHelperModel(); + } + Navigator.pop(context); + // initialVisitReminderBottomSheet(context: context); // }, ),