diff --git a/lib/models/new_models/work_order_detail_model.dart b/lib/models/new_models/work_order_detail_model.dart index 10be7e76..166ed9b6 100644 --- a/lib/models/new_models/work_order_detail_model.dart +++ b/lib/models/new_models/work_order_detail_model.dart @@ -289,21 +289,25 @@ class WorkOrderAsset { WorkOrderAsset({ required this.id, required this.assetNumber, + required this.assetSerialNo, }); int? id; String? assetNumber; + String? assetSerialNo; factory WorkOrderAsset.fromJson(Map json) { return WorkOrderAsset( id: json["id"], assetNumber: json["assetNumber"], + assetSerialNo: json["assetSerialNo"], ); } Map toJson() => { "id": id, "assetNumber": assetNumber, + "assetSerialNo": assetSerialNo, }; } diff --git a/lib/modules/cm_module/views/components/service_request_detail_view.dart b/lib/modules/cm_module/views/components/service_request_detail_view.dart index ecb1c39f..0215b6ad 100644 --- a/lib/modules/cm_module/views/components/service_request_detail_view.dart +++ b/lib/modules/cm_module/views/components/service_request_detail_view.dart @@ -189,10 +189,10 @@ class _ServiceRequestDetailViewState extends State { '${context.translation.assetNumber}: ${workOrder.asset!.assetNumber}', style: AppTextStyles.bodyText.copyWith(color: context.isDark ? AppColor.neutral10 : AppColor.neutral120), ), - // Text( - // '${context.translation.equipmentStatus}: ${workOrder.defectType?.name}', // todo ask ahmed - // style: AppTextStyles.bodyText.copyWith(color: context.isDark ? AppColor.neutral10 : AppColor.neutral20), - // ), + Text( + '${context.translation.serialNo}: ${workOrder.asset!.assetSerialNo}', + style: AppTextStyles.bodyText.copyWith(color: context.isDark ? AppColor.neutral10 : AppColor.neutral120), + ), Text( '${context.translation.manufacture}: ${workOrder.manufacturer?.name?.cleanupWhitespace?.capitalizeFirstOfEach}', style: AppTextStyles.bodyText.copyWith(color: context.isDark ? AppColor.neutral10 : AppColor.neutral120), diff --git a/lib/modules/cm_module/views/components/verify_arrival_view.dart b/lib/modules/cm_module/views/components/verify_arrival_view.dart index 6c55c953..73d171a2 100644 --- a/lib/modules/cm_module/views/components/verify_arrival_view.dart +++ b/lib/modules/cm_module/views/components/verify_arrival_view.dart @@ -148,7 +148,7 @@ class _VerifyArrivalViewState extends State { break; case 3: await requestDetailProvider.sendOtp(workOrderId: requestDetailProvider.currentWorkOrder!.data!.requestId!); - Navigator.pushReplacement( + Navigator.push( context, MaterialPageRoute(builder: (context) => const VerifyOtpView()), ); diff --git a/lib/modules/cm_module/views/components/verify_otp_view.dart b/lib/modules/cm_module/views/components/verify_otp_view.dart index 63346dcf..25705f96 100644 --- a/lib/modules/cm_module/views/components/verify_otp_view.dart +++ b/lib/modules/cm_module/views/components/verify_otp_view.dart @@ -56,6 +56,7 @@ class VerifyOtpView extends StatelessWidget { await requestDetailProvider.engineerConfirmArrival( workOrderId: requestDetailProvider.currentWorkOrder!.data!.requestId!, verificationTypeId: 3, photoInfo: '', otp: pin, assetNo: ''); Navigator.pop(context); + Navigator.pop(context); requestDetailProvider.startTimer(); Navigator.pop(context); } else { @@ -109,7 +110,7 @@ class VerifyOtpView extends StatelessWidget { 3.height, InkWell( onTap: () { - //other method check.. + Navigator.pop(context); }, child: Text( context.translation.checkOutOtherMethods, diff --git a/lib/new_views/pages/land_page/requests/service_request_item_view.dart b/lib/new_views/pages/land_page/requests/service_request_item_view.dart index 7d18b013..0fac59f4 100644 --- a/lib/new_views/pages/land_page/requests/service_request_item_view.dart +++ b/lib/new_views/pages/land_page/requests/service_request_item_view.dart @@ -119,6 +119,7 @@ class ServiceRequestItemView extends StatelessWidget { // '${context.translation.requestType}: ${requestDetails!.requestType}'.bodyText(context), 'CM Number: ${requestDetails!.requestNo}'.bodyText(context), '${context.translation.assetNumber}: ${requestDetails!.assetNo}'.bodyText(context), + '${context.translation.serialNo}: ${requestDetails!.assetSN}'.bodyText(context), '${context.translation.assetName}: ${requestDetails!.assetName?.cleanupWhitespace.capitalizeFirstOfEach}'.bodyText(context), 8.height, Row(