From 52626e74958c79764fa17f01ff7cbb620d9d7bda Mon Sep 17 00:00:00 2001 From: WaseemAbbasi22 Date: Thu, 27 Feb 2025 09:43:52 +0300 Subject: [PATCH] ui issue fixed for verify asset details screen --- .../asset_retired/verify_asset_detail.dart | 207 +++++++++--------- 1 file changed, 104 insertions(+), 103 deletions(-) diff --git a/lib/service_request_latest/views/forms/asset_retired/verify_asset_detail.dart b/lib/service_request_latest/views/forms/asset_retired/verify_asset_detail.dart index 262478cb..c0f9942e 100644 --- a/lib/service_request_latest/views/forms/asset_retired/verify_asset_detail.dart +++ b/lib/service_request_latest/views/forms/asset_retired/verify_asset_detail.dart @@ -50,7 +50,6 @@ class _VerifyAssetDetailsState extends State with TickerProv @override void initState() { super.initState(); - } Future getFaultDescription({required int? assetId}) async { @@ -64,7 +63,7 @@ class _VerifyAssetDetailsState extends State with TickerProv void assignValues() { // ServiceRequestDetailProvider requestDetailProvider = Provider.of(context, listen: false); - // _requestDetailProvider = Provider.of(context, listen: false); + // _requestDetailProvider = Provider.of(context, listen: false); WorkOrderData currentWorkOrderData = _requestDetailProvider!.currentWorkOrder!.data!; _requestDetailProvider!.engineerUpdateWorkOrderHelperModel = EngineerUpdateWorkOrderHelperModel( workOrderId: currentWorkOrderData.requestId, @@ -116,113 +115,115 @@ class _VerifyAssetDetailsState extends State with TickerProv mainAxisAlignment: MainAxisAlignment.spaceBetween, children: [ if (widget.isEdit) ...[ - Column( - crossAxisAlignment: CrossAxisAlignment.start, - mainAxisSize: MainAxisSize.min, - children: [ - assetStatusWidget(context: context, workOrderData: requestDetailProvider.engineerUpdateWorkOrderHelperModel!), - 12.height, - ADatePicker( - label: context.translation.returnToService, - hideShadow: true, - backgroundColor: AppColor.neutral100, - date: DateTime.tryParse(requestDetailProvider.engineerUpdateWorkOrderHelperModel?.returnToService ?? ""), - formatDateWithTime: true, - onDatePicker: (selectedDate) { - showTimePicker( - context: context, - initialTime: TimeOfDay.now(), - ).then((selectedTime) { - // Handle the selected date and time here. - if (selectedTime != null) { - DateTime? selectedDateTime = DateTime( - selectedDate.year, - selectedDate.month, - selectedDate.day, - selectedTime.hour, - selectedTime.minute, - ); - // if (requestDetailProvider.engineerUpdateWorkOrderHelperModel?.returnToService != null && - // selectedDateTime.isBefore(DateTime.parse(requestDetailProvider.engineerUpdateWorkOrderHelperModel!.returnToService!))) { - // "Return To Service Date time must be greater then previous date".showToast; - // return; - // } + SingleChildScrollView( + child: Column( + crossAxisAlignment: CrossAxisAlignment.start, + mainAxisSize: MainAxisSize.min, + children: [ + assetStatusWidget(context: context, workOrderData: requestDetailProvider.engineerUpdateWorkOrderHelperModel!), + 12.height, + ADatePicker( + label: context.translation.returnToService, + hideShadow: true, + backgroundColor: AppColor.neutral100, + date: DateTime.tryParse(requestDetailProvider.engineerUpdateWorkOrderHelperModel?.returnToService ?? ""), + formatDateWithTime: true, + onDatePicker: (selectedDate) { + showTimePicker( + context: context, + initialTime: TimeOfDay.now(), + ).then((selectedTime) { + // Handle the selected date and time here. + if (selectedTime != null) { + DateTime? selectedDateTime = DateTime( + selectedDate.year, + selectedDate.month, + selectedDate.day, + selectedTime.hour, + selectedTime.minute, + ); + // if (requestDetailProvider.engineerUpdateWorkOrderHelperModel?.returnToService != null && + // selectedDateTime.isBefore(DateTime.parse(requestDetailProvider.engineerUpdateWorkOrderHelperModel!.returnToService!))) { + // "Return To Service Date time must be greater then previous date".showToast; + // return; + // } + setState(() { + requestDetailProvider.engineerUpdateWorkOrderHelperModel?.returnToService = selectedDateTime.toIso8601String(); + }); + } + }); + }, + ), + 12.height, + SingleItemDropDownMenu( + context: context, + title: context.translation.loanAvailability, + backgroundColor: AppColor.neutral100, + height: 56.toScreenHeight, + showShadow: false, + initialValue: requestDetailProvider.engineerUpdateWorkOrderHelperModel?.loanAvailability, + onSelect: (status) { + if (status != null) { + requestDetailProvider.engineerUpdateWorkOrderHelperModel?.loanAvailability = status; + if (status.value != 1) { + loanAvailabilityAsset = null; + requestDetailProvider.engineerUpdateWorkOrderHelperModel?.loanAssetId = null; + } + setState(() {}); + } + }, + ), + if (requestDetailProvider.engineerUpdateWorkOrderHelperModel?.loanAvailability?.value == 1) 8.height, + if (requestDetailProvider.engineerUpdateWorkOrderHelperModel?.loanAvailability?.value == 1) + PickAsset( + device: loanAvailabilityAsset, // ?? _serviceReport.device, + cardColor: AppColor.neutral100, + onPickAsset: (asset) { + requestDetailProvider.engineerUpdateWorkOrderHelperModel?.loanAssetId = asset.id; setState(() { - requestDetailProvider.engineerUpdateWorkOrderHelperModel?.returnToService = selectedDateTime.toIso8601String(); + loanAvailabilityAsset = asset; }); + }, + ), + 12.height, + SingleItemDropDownMenu( + context: context, + title: context.translation.failureReason, + backgroundColor: AppColor.neutral100, + height: 56.toScreenHeight, + showShadow: false, + initialValue: requestDetailProvider.engineerUpdateWorkOrderHelperModel?.failureReason, + onSelect: (value) { + if (value != null) { + requestDetailProvider.engineerUpdateWorkOrderHelperModel?.failureReason = value; } - }); - }, - ), - 12.height, - SingleItemDropDownMenu( - context: context, - title: context.translation.loanAvailability, - backgroundColor: AppColor.neutral100, - height: 56.toScreenHeight, - showShadow: false, - initialValue: requestDetailProvider.engineerUpdateWorkOrderHelperModel?.loanAvailability, - onSelect: (status) { - if (status != null) { - requestDetailProvider.engineerUpdateWorkOrderHelperModel?.loanAvailability = status; - if (status.value != 1) { - loanAvailabilityAsset = null; - requestDetailProvider.engineerUpdateWorkOrderHelperModel?.loanAssetId = null; + }, + ), + 12.height, + SingleItemDropDownMenu( + context: context, + title: context.translation.faultDescription, + backgroundColor: AppColor.neutral100, + staticData: _faults, + showShadow: false, + initialValue: requestDetailProvider.engineerUpdateWorkOrderHelperModel?.faultDescription, + onSelect: (fault) { + if (fault != null) { + requestDetailProvider.engineerUpdateWorkOrderHelperModel?.faultDescription = fault; + requestDetailProvider.engineerUpdateWorkOrderHelperModel?.solution = fault.workPerformed; + setState(() {}); } - setState(() {}); - } - }, - ), - if (requestDetailProvider.engineerUpdateWorkOrderHelperModel?.loanAvailability?.value == 1) 8.height, - if (requestDetailProvider.engineerUpdateWorkOrderHelperModel?.loanAvailability?.value == 1) - PickAsset( - device: loanAvailabilityAsset, // ?? _serviceReport.device, - cardColor: AppColor.neutral100, - onPickAsset: (asset) { - requestDetailProvider.engineerUpdateWorkOrderHelperModel?.loanAssetId = asset.id; - setState(() { - loanAvailabilityAsset = asset; - }); }, ), - 12.height, - SingleItemDropDownMenu( - context: context, - title: context.translation.failureReason, - backgroundColor: AppColor.neutral100, - height: 56.toScreenHeight, - showShadow: false, - initialValue: requestDetailProvider.engineerUpdateWorkOrderHelperModel?.failureReason, - onSelect: (value) { - if (value != null) { - requestDetailProvider.engineerUpdateWorkOrderHelperModel?.failureReason = value; - } - }, - ), - 12.height, - SingleItemDropDownMenu( - context: context, - title: context.translation.faultDescription, - backgroundColor: AppColor.neutral100, - staticData: _faults, - showShadow: false, - initialValue: requestDetailProvider.engineerUpdateWorkOrderHelperModel?.faultDescription, - onSelect: (fault) { - if (fault != null) { - requestDetailProvider.engineerUpdateWorkOrderHelperModel?.faultDescription = fault; - requestDetailProvider.engineerUpdateWorkOrderHelperModel?.solution = fault.workPerformed; - setState(() {}); - } - }, - ), - 12.height, - context.translation.solutions.heading6(context).custom(color: AppColor.neutral50), - 8.height, - requestDetailProvider.engineerUpdateWorkOrderHelperModel?.solution != null - ? requestDetailProvider.engineerUpdateWorkOrderHelperModel!.solution!.bodyText2(context).custom(color: AppColor.neutral120) - : const SizedBox(), - ], - ).toShadowContainer(context).paddingAll(16), + 12.height, + context.translation.solutions.heading6(context).custom(color: AppColor.neutral50), + 8.height, + requestDetailProvider.engineerUpdateWorkOrderHelperModel?.solution != null + ? requestDetailProvider.engineerUpdateWorkOrderHelperModel!.solution!.bodyText2(context).custom(color: AppColor.neutral120) + : const SizedBox(), + ], + ).toShadowContainer(context).paddingAll(16), + ).expanded, ] else ...[ assetStatusWidget(context: context, workOrderData: requestDetailProvider.engineerUpdateWorkOrderHelperModel!).toShadowContainer(context).paddingAll(16), ],