otp verification improved, serial no added

design_3.0_dark_mode
Sikander Saleem 8 months ago
parent 616ce9b630
commit a2e5a8a588

@ -289,21 +289,25 @@ class WorkOrderAsset {
WorkOrderAsset({ WorkOrderAsset({
required this.id, required this.id,
required this.assetNumber, required this.assetNumber,
required this.assetSerialNo,
}); });
int? id; int? id;
String? assetNumber; String? assetNumber;
String? assetSerialNo;
factory WorkOrderAsset.fromJson(Map<String, dynamic> json) { factory WorkOrderAsset.fromJson(Map<String, dynamic> json) {
return WorkOrderAsset( return WorkOrderAsset(
id: json["id"], id: json["id"],
assetNumber: json["assetNumber"], assetNumber: json["assetNumber"],
assetSerialNo: json["assetSerialNo"],
); );
} }
Map<String, dynamic> toJson() => { Map<String, dynamic> toJson() => {
"id": id, "id": id,
"assetNumber": assetNumber, "assetNumber": assetNumber,
"assetSerialNo": assetSerialNo,
}; };
} }

@ -189,10 +189,10 @@ class _ServiceRequestDetailViewState extends State<ServiceRequestDetailView> {
'${context.translation.assetNumber}: ${workOrder.asset!.assetNumber}', '${context.translation.assetNumber}: ${workOrder.asset!.assetNumber}',
style: AppTextStyles.bodyText.copyWith(color: context.isDark ? AppColor.neutral10 : AppColor.neutral120), style: AppTextStyles.bodyText.copyWith(color: context.isDark ? AppColor.neutral10 : AppColor.neutral120),
), ),
// Text( Text(
// '${context.translation.equipmentStatus}: ${workOrder.defectType?.name}', // todo ask ahmed '${context.translation.serialNo}: ${workOrder.asset!.assetSerialNo}',
// style: AppTextStyles.bodyText.copyWith(color: context.isDark ? AppColor.neutral10 : AppColor.neutral20), style: AppTextStyles.bodyText.copyWith(color: context.isDark ? AppColor.neutral10 : AppColor.neutral120),
// ), ),
Text( Text(
'${context.translation.manufacture}: ${workOrder.manufacturer?.name?.cleanupWhitespace?.capitalizeFirstOfEach}', '${context.translation.manufacture}: ${workOrder.manufacturer?.name?.cleanupWhitespace?.capitalizeFirstOfEach}',
style: AppTextStyles.bodyText.copyWith(color: context.isDark ? AppColor.neutral10 : AppColor.neutral120), style: AppTextStyles.bodyText.copyWith(color: context.isDark ? AppColor.neutral10 : AppColor.neutral120),

@ -148,7 +148,7 @@ class _VerifyArrivalViewState extends State<VerifyArrivalView> {
break; break;
case 3: case 3:
await requestDetailProvider.sendOtp(workOrderId: requestDetailProvider.currentWorkOrder!.data!.requestId!); await requestDetailProvider.sendOtp(workOrderId: requestDetailProvider.currentWorkOrder!.data!.requestId!);
Navigator.pushReplacement( Navigator.push(
context, context,
MaterialPageRoute(builder: (context) => const VerifyOtpView()), MaterialPageRoute(builder: (context) => const VerifyOtpView()),
); );

@ -56,6 +56,7 @@ class VerifyOtpView extends StatelessWidget {
await requestDetailProvider.engineerConfirmArrival( await requestDetailProvider.engineerConfirmArrival(
workOrderId: requestDetailProvider.currentWorkOrder!.data!.requestId!, verificationTypeId: 3, photoInfo: '', otp: pin, assetNo: ''); workOrderId: requestDetailProvider.currentWorkOrder!.data!.requestId!, verificationTypeId: 3, photoInfo: '', otp: pin, assetNo: '');
Navigator.pop(context); Navigator.pop(context);
Navigator.pop(context);
requestDetailProvider.startTimer(); requestDetailProvider.startTimer();
Navigator.pop(context); Navigator.pop(context);
} else { } else {
@ -109,7 +110,7 @@ class VerifyOtpView extends StatelessWidget {
3.height, 3.height,
InkWell( InkWell(
onTap: () { onTap: () {
//other method check.. Navigator.pop(context);
}, },
child: Text( child: Text(
context.translation.checkOutOtherMethods, context.translation.checkOutOtherMethods,

@ -119,6 +119,7 @@ class ServiceRequestItemView extends StatelessWidget {
// '${context.translation.requestType}: ${requestDetails!.requestType}'.bodyText(context), // '${context.translation.requestType}: ${requestDetails!.requestType}'.bodyText(context),
'CM Number: ${requestDetails!.requestNo}'.bodyText(context), 'CM Number: ${requestDetails!.requestNo}'.bodyText(context),
'${context.translation.assetNumber}: ${requestDetails!.assetNo}'.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), '${context.translation.assetName}: ${requestDetails!.assetName?.cleanupWhitespace.capitalizeFirstOfEach}'.bodyText(context),
8.height, 8.height,
Row( Row(

Loading…
Cancel
Save