device transfer

# Conflicts:
#	lib/l10n/app_ar.arb
#	lib/l10n/app_en.arb

lib/controllers/providers/api/asset_transfer_provider.dart

@@ -150,92 +150,11 @@ class AssetTransferProvider extends ChangeNotifier {
   }
 
   Future<int> updateRequest({
-    @required String host,
-    @required User user,
-    @required bool isSender,
-    @required int requestId,
-    @required AssetTransfer oldModel,
-    @required AssetTransfer newModel,
+    @required AssetTransfer assetTransfer,
   }) async {
-    Map<String, dynamic> body = {
-      "id": oldModel.id,
-      // "assetId": oldModel.device.id ?? "",
-      // "senderSiteId": oldModel.sender.client.id,
-      // "destSiteId": oldModel.receiver.client.id,
-      // "destDepartmentId": oldModel.receiver.department.id,
-    };
-
-    if (isSender) {
-      body.addAll({
-        // "senderSiteId": newModel.client.id,
-        // "senderDepartmentId": newModel.department.id,
-        // "senderAssignedEmployeeId": newModel.userId,
-        // "senderMachineStatusId": newModel.status.id,
-        // "senderComment": newModel.comment,
-        // "senderWorkingHours": newModel.workingHours,
-        // "senderStartDate": newModel.timer?.startAt?.toIso8601String(),
-        // "senderEndDate": newModel.timer?.endAt?.toIso8601String(),
-        // "senderTravelingHours": newModel.travelingHours,
-        // "senderEngSignature": newModel.engSignature,
-        // if (newModel?.attachments?.isNotEmpty ?? false)
-        //   "senderAttachments":
-        //       newModel?.attachments?.map((file) => {"attachmentName": _isLocalUrl(file.path) ? ("${file.path.split("/").last}|${base64Encode(file.readAsBytesSync())}") : file.path})?.toList(),
-        // "destSiteId": oldModel.receiver.client?.id,
-        // "destDepartmentId": oldModel.receiver.department?.id,
-        // "destBuildingId": oldModel.device?.destBuildingId,
-        // "destFloorId": oldModel.device?.destFloorId,
-        // "destRoom": oldModel.device?.destRoom,
-        // "receiverAssignedEmployeeId": oldModel.receiver.userId,
-        // "receiverMachineStatusId": oldModel.receiver.status.id ?? "",
-        // "receiverComment": oldModel.receiver.comment,
-        // "receiverWorkingHours": oldModel.receiver.workingHours,
-        // "receiverStartDate": oldModel.receiver.timer?.startAt?.toIso8601String(),
-        // "receiverEndDate": oldModel.receiver.timer?.endAt?.toIso8601String(),
-        // "receiverTravelingHours": oldModel.receiver?.travelingHours,
-        // "receiverEngSignature": oldModel.receiver?.engSignature,
-        // if (oldModel.receiver?.attachments?.isNotEmpty ?? false)
-        //   "receiverAttachments": oldModel.receiver?.attachments
-        //       ?.map((file) => {"attachmentName": _isLocalUrl(file.path) ? ("${file.path.split("/").last}|${base64Encode(file.readAsBytesSync())}") : file.path})
-        //       ?.toList(),
-      });
-    } else {
-      body.addAll({
-        // "senderSiteId": oldModel.sender.client.id,
-        // "senderDepartmentId": oldModel.sender.department.id,
-        // "senderAssignedEmployeeId": oldModel.sender.userId,
-        // "senderMachineStatusId": oldModel.sender.status.id,
-        // "senderComment": oldModel.sender.comment,
-        // "senderWorkingHours": oldModel.sender.workingHours,
-        // "senderStartDate": oldModel.sender.timer?.startAt?.toIso8601String(),
-        // "senderEndDate": oldModel.sender.timer?.endAt?.toIso8601String(),
-        // "senderTravelingHours": oldModel.sender?.travelingHours,
-        // "senderEngSignature": oldModel.sender?.engSignature,
-        // if (oldModel.sender?.attachments?.isNotEmpty ?? false)
-        //   "senderAttachments":
-        //       oldModel.sender?.attachments?.map((file) => {"attachmentName": _isLocalUrl(file.path) ? ("${file.path.split("/").last}|${base64Encode(file.readAsBytesSync())}") : file.path})?.toList(),
-        // "destSiteId": newModel.client?.id,
-        // "destDepartmentId": newModel.department?.id,
-        // "destBuildingId": oldModel.device?.destBuildingId,
-        // "destFloorId": oldModel.device?.destFloorId,
-        // "destRoom": oldModel.device?.destRoom,
-        // "receiverAssignedEmployeeId": newModel.userId,
-        // "receiverMachineStatusId": newModel.status?.id ?? "",
-        // "receiverComment": newModel.comment,
-        // "receiverWorkingHours": newModel.workingHours,
-        // "receiverStartDate": newModel.timer?.startAt?.toIso8601String(),
-        // "receiverEndDate": newModel.timer?.endAt?.toIso8601String(),
-        // "receiverTravelingHours": newModel.travelingHours,
-        // "receiverEngSignature": newModel.engSignature,
-        // if (newModel?.attachments?.isNotEmpty ?? false)
-        //   "receiverAttachments":
-        //       newModel?.attachments?.map((file) => {"attachmentName": _isLocalUrl(file.path) ? ("${file.path.split("/").last}|${base64Encode(file.readAsBytesSync())}") : file.path})?.toList(),
-      });
-    }
-    //body.addAll(newModel.toJson(isSender));
-    log(body?.toString());
     Response response;
     try {
-      response = await ApiManager.instance.put(URLs.updateDeviceTransfer, body: body);
+      response = await ApiManager.instance.put(URLs.updateDeviceTransfer, body: assetTransfer.toJson());
 
       print(response.body);
       // print("${newModel.engSignature}.png");

lib/l10n/app_ar.arb

@@ -274,6 +274,13 @@
   "requestedThrough" : "الطلب عبر",
   "typeOfRequest" : "نوع الطلب",
   "assetDetails" : "تفاصيل الجهاز",
+  "deviceTransfer" : "نقل جهاز ",
+  "deviceTransferRequest" : "طلب نقل جهاز ",
+  "deviceTransferDetails" : "تفاصيل نقل جهاز ",
+  "transferDetails" : "تفاصيل النقل" ,
+  "senderDetails" : "تفاصيل المرسل",
+  "receiverDetails" : "تفاصيل المستقبل",
+  "assetDetails" : "تفاصيل الجهاز",
   "searchBy" : "إبحث بـ",
   "searchByDesc" : "إبحث بأي من المعايير التالية",
   "location" : "الموقع",
@@ -296,5 +303,6 @@
   "assignAssistant" : "تعيين مساعد",
   "partNo" : "الجزء رقم",
   "engSign" : "توقيع المهندس",
+  "requesterName" : "اسم الطالب",
   "updateWorkOrder" : "تعديل طلب العمل"
 }

lib/l10n/app_en.arb

@@ -278,6 +278,13 @@
   "receiverDetails" : "Receiver Details",
   "requestedThrough" : "Requested Through",
   "typeOfRequest" : "Type of Request",
+  "deviceTransfer" : "Device Transfer",
+  "deviceTransferRequest" : "Device Transfer Request",
+  "deviceTransferDetails" : "Device Transfer Details",
+  "transferDetails" : "Transfer Details" ,
+  "senderDetails" :"Sender Details",
+  "receiverDetails" :"Receiver Details",
+  "typeOfRequest" : "Type of Request",
   "searchBy" : "Search by",
   "searchByDesc" : "Search by any of the following criteria",
   "location" : "Location",
@@ -300,5 +307,7 @@
   "assignAssistant" : "Assign Assistant",
   "partNo" : "Part No.",
   "engSign" : "Engineer Signature",
+  "requesterName" : "Requester Name",
   "updateWorkOrder" : "Update Work Order"
+
 }

lib/models/device/asset_transfer.dart

@@ -39,6 +39,32 @@ class AssetTransfer {
     this.receiverTravelingHours,
     this.receiverEngSignature,
     this.receiverAttachments,
+    this.assetNumber,
+  this.assetName,
+  this.manufacturerName,
+  this.modelName,
+  this.assetSerialNo,
+  this.destDepartmentName,
+  this.destBuildingName,
+  this.applied,
+  this.createdOn,
+  this.destFloorName,
+  this.destSiteName,
+  this.manufacturerId,
+  this.modelId,
+  this.modifiedOn,
+  this.receiverAssignedEmployeeName,
+  this.receiverEngSignatureUrl,
+  this.receiverMachineStatusName,
+  this.senderAssignedEmployeeName,
+  this.senderBuildingName,
+  this.senderDepartmentName,
+  this.senderEngSignatureUrl,
+  this.senderFloorName,
+  this.senderMachineStatusName,
+  this.senderSiteName,
+  this.supplierId,
+  this.supplierName
   });
 
   AssetTransfer.fromJson(dynamic json) {
@@ -84,11 +110,44 @@ class AssetTransfer {
         receiverAttachments.add(AssetTransferAttachment.fromJson(v));
       });
     }
+    assetNumber= json['assetNumber'];
+    assetName= json['assetName'];
+    manufacturerName= json['manufacturerName'];
+    modelName= json['modelName'];
+    assetSerialNo= json['assetSerialNo'];
+    destDepartmentName= json['destDepartmentName'];
+    destBuildingName= json['destBuildingName'];
+    applied= json['applied'];
+    createdOn= json['createdOn'];
+    destFloorName= json['destFloorName'];
+    destSiteName= json['destSiteName'];
+    manufacturerId= json['manufacturerId'];
+    modelId= json['modelId'];
+    modifiedOn= json['modifiedOn'];
+    receiverAssignedEmployeeName= json['receiverAssignedEmployeeName'];
+    receiverEngSignatureUrl= json['receiverEngSignatureUrl'];
+    receiverMachineStatusName= json['receiverMachineStatusName'];
+    senderAssignedEmployeeName= json['senderAssignedEmployeeName'];
+    senderBuildingName= json['senderBuildingName'];
+    senderDepartmentName= json['senderDepartmentName'];
+    senderEngSignatureUrl= json['senderEngSignatureUrl'];
+    senderFloorName= json['senderFloorName'];
+    senderMachineStatusName= json['senderMachineStatusName'];
+    senderSiteName= json['senderSiteName'];
+    supplierId= json['supplierId'];
+    supplierName= json['supplierName'];
   }
   num id;
   num transferNo;
   String transferCode;
+  String assetSerialNo;
   num assetId;
+  String assetNumber;
+  String assetName;
+  int modelId;
+  String modelName;
+  int manufacturerId;
+  String manufacturerName;
   num destSiteId;
   num destBuildingId;
   num destFloorId;
@@ -117,6 +176,26 @@ class AssetTransfer {
   String receiverTravelingHours;
   String receiverEngSignature;
   List<AssetTransferAttachment> receiverAttachments;
+  num supplierId;
+  String supplierName;
+  String destSiteName;
+  String destBuildingName;
+  String destFloorName;
+  String destDepartmentName;
+  String senderSiteName;
+  String senderBuildingName;
+  String senderFloorName;
+  String senderDepartmentName;
+  String senderAssignedEmployeeName;
+  String senderMachineStatusName;
+  String senderEngSignatureUrl;
+  String receiverAssignedEmployeeName;
+  String receiverMachineStatusName;
+  String receiverEngSignatureUrl;
+  bool applied;
+  String createdOn;
+  String modifiedOn;
+
   AssetTransfer copyWith({
     num id,
     num transferNo,
@@ -150,6 +229,33 @@ class AssetTransfer {
     String receiverTravelingHours,
     String receiverEngSignature,
     List<AssetTransferAttachment> receiverAttachments,
+    num supplierId,
+    String supplierName,
+    String destSiteName,
+    String destBuildingName,
+    String destFloorName,
+    String destDepartmentNam,
+    String senderSiteName,
+    String senderBuildingName,
+    String senderFloorName,
+    String senderDepartmentName,
+    String senderAssignedEmployeeName,
+    String senderMachineStatusName,
+    String senderEngSignatureUrl,
+    String receiverAssignedEmployeeName,
+    String receiverMachineStatusName,
+    String receiverEngSignatureUrl,
+    bool applied,
+    String createdOn,
+    String modifiedOn,
+    String assetSerialNo,
+    String assetNumber,
+    String assetName,
+    int modelId,
+    String modelName,
+    int manufacturerId,
+    String manufacturerName,
+    String destDepartmentName
   }) =>
       AssetTransfer(
         id: id ?? this.id,
@@ -184,6 +290,32 @@ class AssetTransfer {
         receiverTravelingHours: receiverTravelingHours ?? this.receiverTravelingHours,
         receiverEngSignature: receiverEngSignature ?? this.receiverEngSignature,
         receiverAttachments: receiverAttachments ?? this.receiverAttachments,
+           supplierId : supplierId?? this.supplierId,
+           supplierName: supplierName??this.supplierName,
+           destSiteName: destSiteName??this.destSiteName,
+           destBuildingName: destBuildingName?? this.destBuildingName,
+           destFloorName: destFloorName??this.destFloorName,
+           destDepartmentName: destDepartmentName?? this.destDepartmentName,
+           senderSiteName: senderSiteName??this.senderSiteName,
+           senderBuildingName: senderBuildingName??this.senderBuildingName,
+           senderFloorName: senderFloorName??this.senderFloorName,
+           senderDepartmentName: senderDepartmentName??this.senderDepartmentName,
+           senderAssignedEmployeeName: senderAssignedEmployeeName??this.senderAssignedEmployeeName,
+           senderMachineStatusName: senderMachineStatusName??this.senderMachineStatusName,
+           senderEngSignatureUrl: senderEngSignatureUrl??this.senderEngSignatureUrl,
+           receiverAssignedEmployeeName: receiverAssignedEmployeeName?? this.receiverAssignedEmployeeName,
+           receiverMachineStatusName: receiverMachineStatusName??this.receiverMachineStatusName,
+           receiverEngSignatureUrl: receiverEngSignatureUrl??this.receiverEngSignatureUrl,
+           applied: applied??this.applied,
+           createdOn: createdOn?? this.createdOn,
+           modifiedOn: modifiedOn??this.modifiedOn,
+           assetSerialNo:assetSerialNo??this.assetSerialNo,
+           assetNumber:assetNumber??this.assetNumber,
+           assetName:assetName??this.assetName,
+           modelId:modelId??this.modelId,
+           modelName:modelName??this.modelName,
+           manufacturerId:manufacturerId??this.manufacturerId,
+           manufacturerName:manufacturerName??this.manufacturerName
       );
   Map<String, dynamic> toJson() {
     final map = <String, dynamic>{};
@@ -223,6 +355,32 @@ class AssetTransfer {
     if (receiverAttachments != null) {
       map['receiverAttachments'] = receiverAttachments.map((v) => v.toJson()).toList();
     }
+    map["supplierId"] = supplierId;
+    map["supplierName"] =supplierName;
+    map["destSiteName"] =destSiteName;
+    map["destBuildingName"] =destBuildingName;
+    map["destFloorName"] =destFloorName;
+    map["destDepartmentName"] =destDepartmentName;
+    map["senderSiteName"] =senderSiteName;
+    map["senderBuildingName"] = senderBuildingName;
+    map["senderFloorName"] = senderFloorName;
+    map["senderDepartmentName"] = senderDepartmentName;
+    map["senderAssignedEmployeeName"] = senderAssignedEmployeeName;
+    map["senderMachineStatusName"] = senderMachineStatusName;
+    map["senderEngSignatureUrl"] = senderEngSignatureUrl;
+    map["receiverAssignedEmployeeName"] = receiverAssignedEmployeeName;
+    map["receiverMachineStatusName"] = receiverMachineStatusName;
+    map["receiverEngSignatureUrl"] = receiverEngSignatureUrl;
+    map["applied"] = applied;
+    map["createdOn"] = createdOn;
+    map["modifiedOn"] = modifiedOn;
+    map["assetSerialNo"] =assetSerialNo;
+    map["assetNumber"] =assetNumber;
+    map["assetName"] =assetName;
+    map["modelId"] =modelId;
+    map["modelName"] =modelName;
+    map["manufacturerId"] =manufacturerId;
+    map["manufacturerName"] =manufacturerName;
     return map;
   }
 
@@ -267,6 +425,71 @@ class AssetTransfer {
     return map;
   }
 
+
+
+  fromDetails(AssetTransfer assetTransfer){
+
+        id= assetTransfer.id;
+        transferNo=assetTransfer.transferNo;
+        transferCode= assetTransfer.transferCode;
+        assetId=assetTransfer.assetId;
+        destSiteId= assetTransfer.destSiteId;
+        destBuildingId=assetTransfer.destBuildingId;
+        destFloorId=assetTransfer.destFloorId;
+        destDepartmentId= assetTransfer.destDepartmentId;
+        destRoom=assetTransfer.destRoom;
+        senderSiteId=assetTransfer.senderSiteId;
+        senderBuildingId=assetTransfer.senderBuildingId;
+        senderFloorId=assetTransfer.senderFloorId;
+        senderDepartmentId=assetTransfer.senderDepartmentId;
+        senderRoom=assetTransfer.senderRoom;
+        senderAssignedEmployeeId= assetTransfer.senderAssignedEmployeeId;
+        senderMachineStatusId=assetTransfer.senderMachineStatusId;
+        senderComment=assetTransfer.senderComment;
+        senderStartDate= assetTransfer.senderStartDate;
+        senderEndDate= assetTransfer.senderEndDate;
+        senderWorkingHours= assetTransfer.senderWorkingHours;
+        senderTravelingHours= assetTransfer.senderTravelingHours;
+        senderEngSignature=assetTransfer.senderEngSignature;
+        senderAttachments=assetTransfer.senderAttachments;
+        receiverAssignedEmployeeId=assetTransfer.receiverAssignedEmployeeId;
+        receiverMachineStatusId= assetTransfer.receiverMachineStatusId;
+        receiverComment= assetTransfer.receiverComment;
+        receiverStartDate=assetTransfer.receiverStartDate;
+        receiverEndDate= assetTransfer.receiverEndDate;
+        receiverWorkingHours= assetTransfer.receiverWorkingHours;
+        receiverTravelingHours= assetTransfer.receiverTravelingHours;
+        receiverEngSignature= assetTransfer.receiverEngSignature;
+        receiverAttachments=assetTransfer.receiverAttachments;
+        supplierId =assetTransfer.supplierId;
+        supplierName=assetTransfer.supplierName;
+        destSiteName=assetTransfer.destSiteName;
+        destBuildingName=assetTransfer.destBuildingName;
+        destFloorName=assetTransfer.destFloorName;
+        destDepartmentName=assetTransfer.destDepartmentName;
+        senderSiteName=assetTransfer.senderSiteName;
+        senderBuildingName=assetTransfer.senderBuildingName;
+        senderFloorName=assetTransfer.senderFloorName;
+        senderDepartmentName=assetTransfer.senderDepartmentName;
+        senderAssignedEmployeeName=assetTransfer.senderAssignedEmployeeName;
+        senderMachineStatusName= assetTransfer.senderMachineStatusName;
+        senderEngSignatureUrl= assetTransfer.senderEngSignatureUrl;
+        receiverAssignedEmployeeName=assetTransfer.receiverAssignedEmployeeName;
+        receiverMachineStatusName=assetTransfer.receiverMachineStatusName;
+        receiverEngSignatureUrl=assetTransfer.receiverEngSignatureUrl;
+        applied=assetTransfer.applied;
+        createdOn= assetTransfer.createdOn;
+        modifiedOn= assetTransfer.modifiedOn;
+        assetSerialNo=assetTransfer.assetSerialNo;
+        assetNumber=assetTransfer.assetNumber;
+        assetName=assetTransfer.assetName;
+        modelId=assetTransfer.modelId;
+        modelName=assetTransfer.modelName;
+        manufacturerId=assetTransfer.manufacturerId;
+        manufacturerName=assetTransfer.manufacturerName;
+  }
+
+
   Future<bool> validate(BuildContext context) async {
     if (assetId == null) {
       await Fluttertoast.showToast(msg: "${context.translation.youHaveToSelect} ${context.translation.device}");

lib/views/pages/device_transfer/device_transfer_details.dart

@@ -1,19 +1,28 @@
 import 'package:flutter/material.dart';
+import 'package:flutter_svg/svg.dart';
 import 'package:provider/provider.dart';
 import 'package:test_sa/controllers/localization/localization.dart';
 import 'package:test_sa/controllers/providers/api/asset_transfer_provider.dart';
 import 'package:test_sa/controllers/providers/api/user_provider.dart';
 import 'package:test_sa/extensions/context_extension.dart';
+import 'package:test_sa/extensions/int_extensions.dart';
+import 'package:test_sa/extensions/string_extensions.dart';
+import 'package:test_sa/extensions/widget_extensions.dart';
 import 'package:test_sa/models/device/asset_transfer.dart';
 import 'package:test_sa/views/app_style/colors.dart';
 import 'package:test_sa/views/app_style/sizing.dart';
+import 'package:test_sa/views/pages/device_transfer/update_device_transfer.dart';
 import 'package:test_sa/views/widgets/buttons/app_back_button.dart';
 import 'package:test_sa/views/widgets/buttons/app_small_button.dart';
 import 'package:test_sa/views/widgets/loaders/app_loading.dart';
 import 'package:test_sa/views/widgets/loaders/loading_manager.dart';
 import 'package:test_sa/views/widgets/requests/info_row.dart';
 
+import '../../../extensions/text_extensions.dart';
 import '../../../models/enums/user_types.dart';
+import '../../../new_views/app_style/app_color.dart';
+import '../../../new_views/common_widgets/default_app_bar.dart';
+import '../../widgets/requests/request_status.dart';
 
 class DeviceTransferDetails extends StatefulWidget {
   final AssetTransfer model;
@@ -26,8 +35,6 @@ class DeviceTransferDetails extends StatefulWidget {
 
 class _DeviceTransferDetailsState extends State<DeviceTransferDetails> {
   AssetTransfer _model;
-  bool _isSender = false;
-  bool _isReceiver = false;
   UserProvider _userProvider;
   bool _isLoading = false;
   final GlobalKey<FormState> _formKey = GlobalKey<FormState>();
@@ -46,6 +53,7 @@ class _DeviceTransferDetailsState extends State<DeviceTransferDetails> {
   @override
   Widget build(BuildContext context) {
     return Scaffold(
+      appBar: DefaultAppBar(title: context.translation.deviceTransferDetails),
       key: _scaffoldKey,
       body: SafeArea(
         child: FutureBuilder(
@@ -55,8 +63,6 @@ class _DeviceTransferDetailsState extends State<DeviceTransferDetails> {
               return const ALoading();
             } else {
               _userProvider = Provider.of<UserProvider>(context);
-              // _isSender = _userProvider.user.userID == _model.sender?.userId;
-              // _isReceiver = _userProvider.user.userID == _model.receiver?.userId;
               return Form(
                 key: _formKey,
                 child: LoadingManager(
@@ -66,129 +72,74 @@ class _DeviceTransferDetailsState extends State<DeviceTransferDetails> {
                   onRefresh: () async {},
                   child: Column(
                     children: [
-                      Container(
-                        color: Theme.of(context).colorScheme.primary,
-                        padding: const EdgeInsets.symmetric(horizontal: 0, vertical: 4),
-                        child: Row(
-                          children: [
-                            const ABackButton(),
-                            Expanded(
-                              child: Center(
-                                child: Text(
-                                  context.translation.details,
-                                  style: Theme.of(context).textTheme.headline6.copyWith(color: AColors.white, fontStyle: FontStyle.italic),
-                                ),
-                              ),
-                            ),
-                            const SizedBox(width: 58),
-                          ],
-                        ),
-                      ),
-                      Expanded(
-                        child: SingleChildScrollView(
-                          padding: EdgeInsets.all(16 * AppStyle.getScaleFactor(context)),
-                          child: Column(
+                      _buildDetailsCard(
+                          Column(
                             crossAxisAlignment: CrossAxisAlignment.start,
                             children: [
-                              RequestInfoRow(
-                                title: "Transfer Id",
-                                info: "_model.title?.toString()",
-                              ),
-                              RequestInfoRow(
-                                title: context.translation.assetName,
-                                info: "_model.device.assetName",
-                              ),
-                              RequestInfoRow(
-                                title: context.translation.assetSN,
-                                info: "_model.device.serialNumber",
-                              ),
-                              RequestInfoRow(
-                                title: context.translation.assetNumber,
-                                info: "_model.device.number",
-                              ),
-                              RequestInfoRow(
-                                title: context.translation.destinationSite,
-                                info: "_model.device.destSiteName",
-                              ),
-                              RequestInfoRow(
-                                title: context.translation.building,
-                                info: " _model.device.destBuildingName",
-                              ),
-                              RequestInfoRow(
-                                title: context.translation.floor,
-                                info: "_model.device.destFloor",
-                              ),
-                              RequestInfoRow(
-                                title: context.translation.department,
-                                info: "_model.device.destDepartmentName",
-                              ),
-                              RequestInfoRow(
-                                title: context.translation.room,
-                                info: "_model.device.destRoom",
-                              ),
-                              RequestInfoRow(
-                                title: context.translation.actions,
-                                info: "",
-                              ),
-                              const SizedBox(height: 8),
                               Row(
+                                crossAxisAlignment: CrossAxisAlignment.start,
+                                mainAxisAlignment: MainAxisAlignment.spaceBetween,
                                 children: [
-                                  Expanded(
-                                    child: Text("Sender", style: Theme.of(context).textTheme.headline6),
+                                  Row(
+                                    children: [
+                                      /// TBD
+                                      // StatusLabel(
+                                      //     label: "",
+                                      //     id: 0,
+                                      //     textColor: AColors.getPriorityStatusTextColor(0),
+                                      //     backgroundColor: AColors.getPriorityStatusColor(0)),
+                                      8.width,
+                                      /// TBD
+                                      //StatusLabel(label: '', textColor: AColors.getRequestStatusTextColor(0), backgroundColor: AColors.getRequestStatusColor(0)),
+                                    ],
                                   ),
-                                  if (_userProvider.user?.type == UsersTypes.engineer)
-                                    ASmallButton(
-                                      text: context.translation.edit,
-                                      // onPressed: (_isSender)
-                                      //     ? (_model.sender.status?.name == "Closed"
-                                      //         ? null
-                                      //         : () {
-                                      //             Navigator.of(context).push(MaterialPageRoute(
-                                      //                 builder: (_) => UpdateDeviceTransfer(
-                                      //                       model: _model,
-                                      //                       isSender: true,
-                                      //                     )));
-                                      //           })
-                                      //     : null,
-                                    ),
+                                  1.width.expanded,
+                                  Text(widget.model.createdOn != null ?widget.model.createdOn.toServiceRequestCardFormat:"", textAlign: TextAlign.end, style: AppTextStyles.tinyFont.copyWith(color: const Color(0xFF3B3D4A))),
                                 ],
                               ),
-                              const SizedBox(height: 12),
-                              // DeviceTransferInfoSection(
-                              //   info: _model.sender,
-                              //   isSender: true,
-                              // ),
-                              const SizedBox(height: 8),
-                              Row(
+                              8.height,
+                              Text(context.translation.transferDetails, style: AppTextStyles.heading5.copyWith(color: const Color(0xFF3B3D4A))),
+                              8.height,
+                              Column(
+                                crossAxisAlignment: CrossAxisAlignment.start,
                                 children: [
-                                  Expanded(
-                                    child: Text("Receiver", style: Theme.of(context).textTheme.headline6),
-                                  ),
-                                  if (_userProvider.user?.type == UsersTypes.engineer)
-                                    ASmallButton(
-                                      text: context.translation.edit,
-                                      // onPressed: (_isReceiver)
-                                      //     ? (_model.receiver.status?.name == "Closed"
-                                      //         ? null
-                                      //         : () {
-                                      //             Navigator.of(context).push(MaterialPageRoute(
-                                      //                 builder: (_) => UpdateDeviceTransfer(
-                                      //                       model: _model,
-                                      //                       isSender: false,
-                                      //                     )));
-                                      //           })
-                                      //     : null,
-                                    ),
+                                  _buildTextWidget('${context.translation.assetName} : ${_model.assetName}'),
+                                  _buildTextWidget('${context.translation.assetNumber} : ${_model.assetNumber}'),
+                                  _buildTextWidget('${context.translation.model} : ${_model.modelName}'),
+                                  _buildTextWidget('${context.translation.sn} : ${_model.assetSerialNo}'),
                                 ],
                               ),
-                              const SizedBox(height: 12),
-                              // DeviceTransferInfoSection(
-                              //   info: _model.receiver,
-                              //   isSender: false,
-                              // ),
+                              8.height,
                             ],
-                          ),
-                        ),
+                          ).paddingAll(14)
+                      ),
+                      // sender card
+                      _buildCard(
+                        isSender: true,
+                        site: _model.senderSiteName??"",
+                        /// TBD
+                        unit: _model.senderDepartmentName??"",
+                        comment: _model.senderComment??"",
+                        /// TBD
+                        statusLabel: _model.senderMachineStatusName != null? StatusLabel(
+                            label: _model.senderMachineStatusName,
+                            id: _model.senderMachineStatusId,
+                            textColor: AColors.getRequestStatusTextColor(getIdstatus(_model.senderMachineStatusName)),
+                            backgroundColor: AColors.getRequestStatusColor(getIdstatus(_model.senderMachineStatusName))):null,
+                      ),
+                      // receiver card
+                      _buildCard(
+                          isSender: false,
+                          site: _model.destSiteName??"",
+                        /// TBD
+                          unit: _model.destDepartmentName??"",
+                          comment: _model.receiverComment??"",
+                        /// TBD
+                        statusLabel: _model.receiverMachineStatusName != null ? StatusLabel(
+                            label: _model.receiverMachineStatusName??"",
+                            id: _model.receiverMachineStatusId,
+                            textColor: AColors.getRequestStatusTextColor(getIdstatus(_model.receiverMachineStatusName)),
+                            backgroundColor: AColors.getRequestStatusColor(getIdstatus(_model.receiverMachineStatusName))):null,
                       ),
                     ],
                   ),
@@ -200,4 +151,107 @@ class _DeviceTransferDetailsState extends State<DeviceTransferDetails> {
       ),
     );
   }
+
+  _buildDetailsCard(Widget widget){
+    return Container(
+      decoration: BoxDecoration(
+        color: Colors.white,
+        borderRadius: BorderRadius.circular(AppStyle.getBorderRadius(context)),
+      ),
+      child: widget,
+    ).paddingOnly(top: 14, start: 14, end: 14);
+  }
+
+  _buildTextWidget(String text){
+    return Text(
+      text, style: AppTextStyles.bodyText.copyWith(color: Color(0xFF757575)),
+    );
+  }
+
+  _buildCard({@required String site, @required String unit, @required String comment, @required bool isSender, StatusLabel statusLabel}){
+    return Container(
+      decoration: BoxDecoration(
+        color: Colors.white,
+        borderRadius: BorderRadius.circular(AppStyle.getBorderRadius(context)),
+      ),
+      child: Column(
+        crossAxisAlignment: CrossAxisAlignment.start,
+        children: [
+          Row(
+            mainAxisAlignment: MainAxisAlignment.spaceBetween,
+            children: [
+              Column(
+                crossAxisAlignment: CrossAxisAlignment.start,
+                children: [
+                  statusLabel??Container(),
+                  8.height,
+                  Text(isSender?context.translation.senderDetails:context.translation.receiverDetails,
+                      style: AppTextStyles.heading5.copyWith(color: const Color(0xFF3B3D4A))),
+                ],
+              ),
+              if (_userProvider.user?.type == UsersTypes.engineer)
+                CircleAvatar(
+                  radius: 25,
+                  backgroundColor: AppColor.neutral30,
+                  child: CircleAvatar(
+                    radius: 24,
+                    backgroundColor: Colors.white,
+                    child: Padding(
+                      padding: const EdgeInsets.only(left: 3.0),
+                      child: SvgPicture.asset('assets/images/update.svg'),
+                    ),
+                  ),
+                ).onPress(
+                  isSender ? _model.senderMachineStatusName == "Closed"
+                          ? null
+                          : () {
+                              Navigator.of(context).push(MaterialPageRoute(
+                                  builder: (_) => UpdateDeviceTransfer(
+                                        model: _model,
+                                        isSender: isSender,
+                                      )));
+                            }
+                      : _model.receiverMachineStatusName == "Closed"
+                      ? null
+                      : () {
+                    Navigator.of(context).push(MaterialPageRoute(
+                        builder: (_) => UpdateDeviceTransfer(
+                          model: _model,
+                          isSender: isSender,
+                        )));
+                  }),
+
+            ],
+          ),
+          Column(
+            crossAxisAlignment: CrossAxisAlignment.start,
+            children: [
+              _buildTextWidget('${context.translation.site} : $site'),
+              _buildTextWidget('${context.translation.unite} : $unit'),
+              8.height,
+              const Divider(color: Color(0xFFEAF1F4), height: 1, thickness: 1),
+              8.height,
+              _buildTextWidget(comment),
+            ],
+          ),
+          8.height,
+        ],
+      ).paddingAll(14),
+    ).paddingOnly(top: 14, start: 14, end: 14);
+  }
+  
+  int getIdstatus(String status){
+    switch(status){
+      case "Closed":
+        return 3 ;
+        break;
+      case "Open":
+        return 1 ;
+        break;
+      case "In Progress":
+        return 2;
+        break;
+    }
+}
+
 }

lib/views/pages/device_transfer/track_device_transfer.dart

@@ -3,11 +3,13 @@ import 'package:provider/provider.dart';
 import 'package:test_sa/controllers/providers/api/asset_transfer_provider.dart';
 import 'package:test_sa/controllers/providers/api/user_provider.dart';
 import 'package:test_sa/controllers/providers/settings/setting_provider.dart';
+import 'package:test_sa/extensions/context_extension.dart';
 import 'package:test_sa/views/app_style/colors.dart';
 import 'package:test_sa/views/widgets/buttons/app_back_button.dart';
 import 'package:test_sa/views/widgets/device_trancfer/device_transfer_list.dart';
 import 'package:test_sa/views/widgets/loaders/loading_manager.dart';
 
+import '../../../new_views/common_widgets/default_app_bar.dart';
 import '../../widgets/buttons/app_icon_button.dart';
 
 class TrackDeviceTransferPage extends StatefulWidget {
@@ -31,6 +33,7 @@ class _TrackDeviceTransferPageState extends State<TrackDeviceTransferPage> with
     _settingProvider = Provider.of<SettingProvider>(context);
 
     return Scaffold(
+      appBar: DefaultAppBar(title: context.translation.deviceTransfer),
       body: SafeArea(
         child: LoadingManager(
           isLoading: _deviceTransferProvider.isLoading,
@@ -47,52 +50,6 @@ class _TrackDeviceTransferPageState extends State<TrackDeviceTransferPage> with
             children: [
               Column(
                 children: [
-                  Container(
-                    color: AColors.primaryColor,
-                    padding: const EdgeInsets.symmetric(horizontal: 0, vertical: 4),
-                    child: Column(
-                      children: [
-                        Row(
-                          children: [
-                            const ABackButton(),
-                            Expanded(
-                              child: Center(
-                                child: Text(
-                                  "Asset Transfer",
-                                  style: Theme.of(context).textTheme.headline6.copyWith(color: AColors.white, fontStyle: FontStyle.italic),
-                                ),
-                              ),
-                            ),
-                            AIconButton(
-                              iconData: Icons.search,
-                              color: AColors.secondaryColor,
-                              buttonSize: 42,
-                              backgroundColor: AColors.white,
-                              onPressed: () async {
-                                // DeviceTransferSearch temp = await showModalBottomSheet(
-                                //   context: context,
-                                //   isScrollControlled: true,
-                                //   builder: (context) {
-                                //     return AssetTransferSearchDialog(initialSearchValue: _deviceTransferProvider.deviceTransferSearch);
-                                //   },
-                                // );
-                                // if (temp != null) {
-                                //   _deviceTransferProvider.deviceTransferSearch = temp;
-                                //   _deviceTransferProvider.reset();
-                                //   setState(() {});
-                                //   await _deviceTransferProvider.getRequests(
-                                //     user: _userProvider.user,
-                                //     host: _settingProvider.host,
-                                //   );
-                                // }
-                              },
-                            ),
-                            const SizedBox(width: 16),
-                          ],
-                        ),
-                      ],
-                    ),
-                  ),
                   Expanded(
                     child: DeviceTransferList(
                       nextPage: _deviceTransferProvider.nextPage,

lib/views/pages/device_transfer/update_device_transfer.dart

@@ -1,18 +1,32 @@
+import 'dart:convert';
+
 import 'package:flutter/foundation.dart';
 import 'package:flutter/material.dart';
+import 'package:fluttertoast/fluttertoast.dart';
 import 'package:provider/provider.dart';
 import 'package:test_sa/controllers/providers/api/asset_transfer_provider.dart';
 import 'package:test_sa/controllers/providers/api/user_provider.dart';
 import 'package:test_sa/controllers/providers/settings/setting_provider.dart';
 import 'package:test_sa/extensions/context_extension.dart';
+import 'package:test_sa/extensions/int_extensions.dart';
+import 'package:test_sa/extensions/widget_extensions.dart';
 import 'package:test_sa/models/device/asset_transfer.dart';
 import 'package:test_sa/models/subtitle.dart';
+import 'package:test_sa/new_views/common_widgets/app_filled_button.dart';
 import 'package:test_sa/views/app_style/sizing.dart';
 import 'package:test_sa/views/widgets/buttons/app_button.dart';
 import 'package:test_sa/views/widgets/loaders/loading_manager.dart';
 import 'package:test_sa/views/widgets/titles/app_sub_title.dart';
 
 import '../../../../controllers/localization/localization.dart';
+import '../../../controllers/validator/validator.dart';
+import '../../../extensions/text_extensions.dart';
+import '../../../models/lookup.dart';
+import '../../../new_views/common_widgets/app_text_form_field.dart';
+import '../../../new_views/common_widgets/default_app_bar.dart';
+import '../../../new_views/common_widgets/single_item_drop_down_menu.dart';
+import '../../../providers/gas_request_providers/gas_status_provider.dart';
+import '../../widgets/e_signature/e_signature.dart';
 
 class UpdateDeviceTransfer extends StatefulWidget {
   final AssetTransfer model;
@@ -32,7 +46,7 @@ class _UpdateDeviceTransferState extends State<UpdateDeviceTransfer> {
   Uint8List _signature;
   AssetTransferProvider _deviceTransferProvider;
   final TextEditingController _requestedQuantityController = TextEditingController();
-  // final DeviceTransferInfo _formModel = DeviceTransferInfo(attachments: []);
+  final AssetTransfer _formModel = AssetTransfer();
   final GlobalKey<FormState> _formKey = GlobalKey<FormState>();
   final GlobalKey<ScaffoldState> _scaffoldKey = GlobalKey<ScaffoldState>();
 
@@ -46,7 +60,7 @@ class _UpdateDeviceTransferState extends State<UpdateDeviceTransfer> {
     //   return false;
     // }
     _validate = true;
-    if (!_formKey.currentState.validate()) {
+    if (!(_formKey.currentState.validate())) {
       setState(() {});
       return false;
     }
@@ -54,17 +68,17 @@ class _UpdateDeviceTransferState extends State<UpdateDeviceTransfer> {
 
     _isLoading = true;
     setState(() {});
-    // int status = await _deviceTransferProvider.updateRequest(
-    //     user: _userProvider.user, host: _settingProvider.host, requestId: widget.model.id, isSender: widget.isSender, newModel: _formModel, oldModel: widget.model);
-    // _isLoading = false;
-    // setState(() {});
-    // if (status >= 200 && status < 300) {
-    //   Fluttertoast.showToast(
-    //     msg: context.translation.successfulRequestMessage,
-    //   );
-    //   _validate = false;
-    //   Navigator.of(context).pop();
-    // }
+    int status = await _deviceTransferProvider.updateRequest(
+      assetTransfer: _formModel);
+    _isLoading = false;
+    setState(() {});
+    if (status >= 200 && status < 300) {
+      Fluttertoast.showToast(
+        msg: context.translation.successfulRequestMessage,
+      );
+      _validate = false;
+      Navigator.of(context).pop();
+    }
   }
 
   // @override
@@ -74,7 +88,7 @@ class _UpdateDeviceTransferState extends State<UpdateDeviceTransfer> {
 
   @override
   void initState() {
-    // _formModel.fromDetails(widget.isSender ? widget.model.sender : widget.model.receiver, withSignature: false);
+    _formModel.fromDetails(widget.model);
     super.initState();
   }
 
@@ -90,136 +104,139 @@ class _UpdateDeviceTransferState extends State<UpdateDeviceTransfer> {
     _settingProvider = Provider.of<SettingProvider>(context);
     _deviceTransferProvider = Provider.of<AssetTransferProvider>(context, listen: false);
     return Scaffold(
+      appBar: DefaultAppBar(title: context.translation.updateRequest),
       key: _scaffoldKey,
-      body: Form(
-        key: _formKey,
-        child: SafeArea(
-          child: LoadingManager(
-            isLoading: _isLoading,
-            isFailedLoading: false,
-            stateCode: 200,
-            onRefresh: () async {},
-            child: SingleChildScrollView(
-              padding: EdgeInsets.all(12 * AppStyle.getScaleFactor(context)),
-              child: Column(
-                crossAxisAlignment: CrossAxisAlignment.start,
-                children: [
-                  Center(
-                    child: Padding(
-                      padding: const EdgeInsets.all(8.0),
-                      child: Text(
-                        "Edit Transfer Asset",
-                        style: Theme.of(context).textTheme.headline5.copyWith(color: Theme.of(context).primaryColor, fontSize: 28, fontWeight: FontWeight.bold),
+      body: SafeArea(
+        child: LoadingManager(
+          isLoading: _isLoading,
+          isFailedLoading: false,
+          stateCode: 200,
+          onRefresh: () async {},
+          child: Form(
+            key: _formKey,
+            child: Column(
+              children: [
+                SingleChildScrollView(
+                  padding: EdgeInsets.all(12 * AppStyle.getScaleFactor(context)),
+                  child: Column(
+                    crossAxisAlignment: CrossAxisAlignment.start,
+                    children: [
+                      _buildCard(),
+                      8.height,
+                      AppTextFormField(
+                      initialValue: widget.isSender? _formModel.senderTravelingHours:_formModel.receiverTravelingHours,
+                      labelText: context.translation.travelingHours,
+                        onSaved:(value){
+                          widget.isSender? _formModel.senderTravelingHours
+                              : _formModel.receiverTravelingHours= value;
+                          //_formModel?.workingHours = double.tryParse(value);
+                          //     _formModel.travelingHours = value;
+                        },
+                        textInputType: TextInputType.number,
+                        validator: (value) => Validator.isNumeric(value) ? null : "allow numbers only",
                       ),
-                    ),
-                  ),
-                  const SizedBox(
-                    height: 8,
-                  ),
-                  ASubTitle("Comment"),
+                      8.height,
+                      AppTextFormField(
+                        labelText: context.translation.workingHours,
+                        initialValue: widget.isSender?_formModel.senderWorkingHours:_formModel.receiverWorkingHours,
+                        onSaved:(value){
+                          widget.isSender?
+                          _formModel?.senderWorkingHours = value:_formModel?.receiverWorkingHours = value;
+                          //       _formModel.timer = timer;
+                          //       _formModel.workingHours = (((timer?.durationInSecond ?? 0) / 60) / 60)?.toStringAsFixed(2) ?? "0";
+                        },
+                        textInputType: TextInputType.number,
+                        validator: (value) => Validator.isNumeric(value) ? null : "allow numbers only",
+                      ),
+                      8.height,
+                      ///TBD
+                      Consumer<GasStatusProvider>(builder: (context, snapshot, _){
+                        return SingleItemDropDownMenu<Lookup,GasStatusProvider >(
+                          context: context,
+                          title: context.translation.reportStatus,
+                          initialValue: snapshot.items?.firstWhere((element) => element.name == (widget.isSender?_formModel.senderMachineStatusName:_formModel.receiverMachineStatusName), orElse: () => null),
+                          onSelect: (value) {
+                            if(widget.isSender) {
+                              _formModel.senderMachineStatusName=value.name;
+                              _formModel.senderMachineStatusId=value.id;
+                              print("${value.id}");
+                            }else{
+                              _formModel.receiverMachineStatusName=value.name;
+                              _formModel.receiverMachineStatusId=value.id;
+                            }
+                            setState(() {});
+                          },
+                        );
+                      }),
+                      8.height,
+                      AppTextFormField(
+                        initialValue: widget.isSender?_formModel.senderComment:_formModel.receiverComment,
+                        labelText: context.translation.comments,
+                        textInputType: TextInputType.multiline,
+                        alignLabelWithHint: true,
+                        onSaved: (value){
+                          widget.isSender?
+                         _formModel.senderComment = value:_formModel.receiverComment=value;
+                        },
+                      ),
+                      8.height,
+                      ESignature(
+                        title: "Signature",
+                        oldSignature: widget.isSender ? widget.model.senderEngSignature : widget.model.receiverEngSignature,
+                        newSignature: _signature,
+                        onSaved: (signature) {
+                          _signature = signature;
+                          if (signature == null || signature.isEmpty) return;
+                          widget.isSender? _formModel.senderEngSignature = "${DateTime.now().toIso8601String()}.png|${base64Encode(signature)}":
+                          _formModel.receiverEngSignature = "${DateTime.now().toIso8601String()}.png|${base64Encode(signature)}";
 
-                  const SizedBox(
-                    height: 4,
-                  ),
-                  // ATextFormField(
-                  //   initialValue: _formModel?.comment,
-                  //   textAlign: TextAlign.center,
-                  //   style: Theme.of(context).textTheme.subtitle1,
-                  //   textInputType: TextInputType.text,
-                  //   onSaved: (value) {
-                  //     _formModel.comment = value;
-                  //   },
-                  // ),
-                  const SizedBox(
-                    height: 8,
-                  ),
-                  ASubTitle(context.translation.travelingHours),
-                  const SizedBox(
-                    height: 4,
-                  ),
-                  // ATextFormField(
-                  //   initialValue: _formModel?.travelingHours,
-                  //   textAlign: TextAlign.center,
-                  //   style: Theme.of(context).textTheme.subtitle1,
-                  //   textInputType: TextInputType.number,
-                  //   onSaved: (value) {
-                  //     _formModel.travelingHours = value;
-                  //   },
-                  // ),
-                  const SizedBox(
-                    height: 16,
-                  ),
-                  ASubTitle(context.translation.workingHours),
-                  const SizedBox(height: 8),
-                  Row(
-                    children: [
-                      // Expanded(
-                      //   child: AppTimer(
-                      //     timer: _formModel.timer,
-                      //     onChange: (timer) async {
-                      //       _formModel.timer = timer;
-                      //       _formModel.workingHours = (((timer?.durationInSecond ?? 0) / 60) / 60)?.toStringAsFixed(2) ?? "0";
-                      //       return true;
-                      //     },
-                      //   ),
-                      // ),
+                           base64Encode(signature);
+                        },
+                      ),
                     ],
                   ),
-                  const SizedBox(height: 16),
-                  ASubTitle(context.translation.status),
-                  const SizedBox(
-                    height: 4,
-                  ),
-                  // AssetStatusMenu(
-                  //   initialValue: _formModel.status,
-                  //   onSelect: (status) {
-                  //     if (status == null) return;
-                  //     _formModel.status = status;
-                  //     setState(() {});
-                  //   },
-                  // ),
-                  const SizedBox(
-                    height: 16,
-                  ),
-                  // MultiFilesPicker(
-                  //   label: "Attachments",
-                  //   files: _formModel.attachments,
-                  // ),
-                  const SizedBox(
-                    height: 16,
+                ).expanded,
+                Padding(
+                  padding: const EdgeInsets.all(16.0),
+                  child: AppFilledButton(
+                    label: context.translation.update,
+                    onPressed: _update,
                   ),
-                  const ASubTitle("Signature"),
-                  // if(_validate && _formModel.signature == null)
-                  //   ASubTitle(_subtitle.requiredWord,color: Colors.red,),
-                  const SizedBox(
-                    height: 4,
-                  ),
-                  // ESignature(
-                  //   oldSignature: widget.isSender ? widget.model.sender.engSignature : widget.model.receiver.engSignature,
-                  //   newSignature: _signature,
-                  //   onSaved: (signature) {
-                  //     _signature = signature;
-                  //     if (signature == null || signature.isEmpty) return;
-                  //     _formModel.engSignature = "${DateTime.now().toIso8601String()}.png|${base64Encode(signature)}";
-                  //     // base64Encode(signature);
-                  //   },
-                  // ),
-                  Padding(
-                    padding: const EdgeInsets.all(16.0),
-                    child: AButton(
-                      text: context.translation.update,
-                      onPressed: _update,
-                    ),
-                  ),
-                  const SizedBox(
-                    height: 100,
-                  )
-                ],
-              ),
+                ),
+              ],
             ),
           ),
         ),
       ),
     );
   }
+
+  _buildCard(){
+    return Container(
+      width: MediaQuery.of(context).size.width,
+      decoration: ShapeDecoration(
+        color: Colors.white,
+        shape: RoundedRectangleBorder(
+          borderRadius: BorderRadius.circular(15),
+        ),
+        shadows: const [BoxShadow(color: Color(0x07000000), blurRadius: 14, offset: Offset(0, 0), spreadRadius: 0)],
+      ),
+      child: Column(
+        crossAxisAlignment: CrossAxisAlignment.start,
+        children: [
+          Text(context.translation.transferDetails, style: AppTextStyles.heading5.copyWith(color: const Color(0xFF3B3D4A))),
+          8.height,
+          Text(
+            '${context.translation.assetName}: ${_formModel.assetName}',
+            style: AppTextStyles.bodyText.copyWith(color: Color(0xFF757575)),
+          ),
+          ///TBD
+          Text(
+            '${context.translation.requesterName}: ',
+            style: AppTextStyles.bodyText.copyWith(color: Color(0xFF757575)),
+          ),
+        ],
+      ).paddingAll(16),
+    );
+  }
 }

lib/views/pages/user/gas_refill/request_gas_refill.dart

@@ -1,4 +1,3 @@
-import 'dart:convert';
 
 import 'package:flutter/material.dart';
 import 'package:fluttertoast/fluttertoast.dart';
@@ -13,20 +12,9 @@ import 'package:test_sa/extensions/int_extensions.dart';
 import 'package:test_sa/extensions/widget_extensions.dart';
 import 'package:test_sa/models/lookup.dart';
 import 'package:test_sa/models/timer_model.dart';
-import 'package:test_sa/views/app_style/sizing.dart';
-import 'package:test_sa/views/widgets/app_text_form_field.dart';
-import 'package:test_sa/views/widgets/buttons/app_button.dart';
-import 'package:test_sa/views/widgets/gas_refill/building_type_menu.dart';
-import 'package:test_sa/views/widgets/gas_refill/department_type_menu.dart';
-import 'package:test_sa/views/widgets/gas_refill/floor_type_menu.dart';
-import 'package:test_sa/views/widgets/gas_refill/gas_refill_create_details_item.dart';
-import 'package:test_sa/views/widgets/hospitals/hospital_auto_complete_field_new.dart';
+import 'package:test_sa/new_views/common_widgets/app_filled_button.dart';
 import 'package:test_sa/views/widgets/loaders/loading_manager.dart';
-import 'package:test_sa/views/widgets/status/gas_refill/gas_cylinder_size.dart';
-import 'package:test_sa/views/widgets/status/gas_refill/gas_cylinder_type.dart';
-import 'package:test_sa/views/widgets/status/gas_refill/gas_status.dart';
-import 'package:test_sa/views/widgets/status/gas_refill/gas_type.dart';
-import 'package:test_sa/views/widgets/titles/app_sub_title.dart';
+
 
 import '../../../../controllers/providers/api/hospitals_provider.dart';
 import '../../../../extensions/text_extensions.dart';
@@ -69,7 +57,7 @@ class _RequestGasRefillState extends State<RequestGasRefill> {
   void initState() {
     super.initState();
     if (widget.gasRefillModel != null) {
-      _formModel = widget.gasRefillModel;
+      _formModel.fromGasRefillModel(widget.gasRefillModel);
     }
   }
 
@@ -83,22 +71,7 @@ class _RequestGasRefillState extends State<RequestGasRefill> {
       if (!(await _addNewModel(context))) return;
     }
 
-    //_isLoading = true;
     setState(() {});
-    // if (widget.gasRefillModel != null) {
-    //   if  (!(await _formModel.validate(context))) {
-    //     _isLoading = false;
-    //     setState(() {});
-    //     return;
-    //   }
-    // }
-    //if(!(_formKey.currentState.validate())) return;
-    // if (_gasRefillProvider.department?.name == null) {
-    //   ScaffoldMessenger.of(context).showSnackBar(const SnackBar(content: Text("Select department")));
-    //   _isLoading = false;
-    //   setState(() {});
-    //   return;
-    // }
 
     int status = widget.gasRefillModel == null
         ? null /*await _gasRefillProvider.createModel(
@@ -199,11 +172,10 @@ class _RequestGasRefillState extends State<RequestGasRefill> {
             isFailedLoading: false,
             stateCode: 200,
             onRefresh: () async {},
-            child: SingleChildScrollView(
-              child: Column(
-                mainAxisAlignment: MainAxisAlignment.spaceBetween,
-                children: [
-                  Column(
+            child: Column(
+              children: [
+                SingleChildScrollView(
+                  child: Column(
                     children: [
                       Container(
                         width: MediaQuery.of(context).size.width,
@@ -219,6 +191,7 @@ class _RequestGasRefillState extends State<RequestGasRefill> {
                           children: [
                             Text(context.translation.gasRefill, style: AppTextStyles.heading5.copyWith(color: const Color(0xFF3B3D4A))),
                             8.height,
+                            /// TBD
                             Text(
                               'Gas Request:',
                               style: AppTextStyles.bodyText.copyWith(color: Color(0xFF757575)),
@@ -252,7 +225,7 @@ class _RequestGasRefillState extends State<RequestGasRefill> {
                       SingleItemDropDownMenu<Lookup,GasStatusProvider >(
                         context: context,
                         title: context.translation.reportStatus,
-                        initialValue: _formModel.status,
+                        initialValue: widget.gasRefillModel.status,
                         onSelect: (value) {
                           _formModel.status=value;
                         },
@@ -278,13 +251,13 @@ class _RequestGasRefillState extends State<RequestGasRefill> {
                         },
                       ),
                     ],
-                  ).paddingAll(16),
-                  AButton(
-                    text: widget.gasRefillModel == null ? context.translation.submit : context.translation.update,
-                    onPressed:()async{_onSubmit.call(context);},
-                  ).paddingAll(16),
-                ],
-              ),
+                  ).paddingAll(16)
+                ).expanded,
+                AppFilledButton(
+                  label: widget.gasRefillModel == null ? context.translation.submit : context.translation.update,
+                  onPressed:()async{_onSubmit.call(context);},
+                ).paddingAll(16),
+              ],
             )
            ),
         ),

lib/views/widgets/device_trancfer/device_transfer_item.dart

@@ -1,13 +1,15 @@
 import 'package:flutter/material.dart';
-import 'package:provider/provider.dart';
-import 'package:test_sa/controllers/localization/localization.dart';
-import 'package:test_sa/controllers/providers/api/user_provider.dart';
 import 'package:test_sa/extensions/context_extension.dart';
+import 'package:test_sa/extensions/int_extensions.dart';
+import 'package:test_sa/extensions/string_extensions.dart';
+import 'package:test_sa/extensions/widget_extensions.dart';
 import 'package:test_sa/models/device/asset_transfer.dart';
-import 'package:test_sa/models/subtitle.dart';
-import 'package:test_sa/models/user.dart';
 import 'package:test_sa/views/app_style/sizing.dart';
 
+import '../../../extensions/text_extensions.dart';
+import '../../app_style/colors.dart';
+import '../requests/request_status.dart';
+
 class DeviceTransferItem extends StatelessWidget {
   final int index;
   final AssetTransfer item;
@@ -17,21 +19,18 @@ class DeviceTransferItem extends StatelessWidget {
 
   @override
   Widget build(BuildContext context) {
-    User _user = Provider.of<UserProvider>(context, listen: false).user;
-    Color itemColor = index % 2 == 0 ? Theme.of(context).colorScheme.primary : Theme.of(context).colorScheme.onPrimary;
-    Color onItemColor = index % 2 != 0 ? Theme.of(context).colorScheme.primary : Theme.of(context).colorScheme.onPrimary;
 
     return Padding(
       padding: const EdgeInsets.symmetric(vertical: 4),
       child: ElevatedButton(
-        style: ElevatedButton.styleFrom(
-          padding: EdgeInsets.symmetric(vertical: 8, horizontal: 8),
-          backgroundColor: itemColor,
-          shape: RoundedRectangleBorder(
-            borderRadius: BorderRadius.circular(AppStyle.getBorderRadius(context)),
+          style: ElevatedButton.styleFrom(
+            elevation: 0,
+            padding: const EdgeInsets.symmetric(vertical: 8, horizontal: 8),
+            backgroundColor: Colors.white,
+            shape: RoundedRectangleBorder(
+              borderRadius: BorderRadius.circular(AppStyle.getBorderRadius(context)),
+            ),
           ),
-        ),
-        //padding: EdgeInsets.symmetric(vertical: 8,horizontal: 8),
         onPressed: () {
           onPressed(item);
         },
@@ -39,115 +38,49 @@ class DeviceTransferItem extends StatelessWidget {
           crossAxisAlignment: CrossAxisAlignment.start,
           children: [
             Row(
+              crossAxisAlignment: CrossAxisAlignment.start,
+              children: [
+                /// TBD
+                // StatusLabel(
+                //     label: '',
+                //     id: 0,
+                //     textColor: AColors.getPriorityStatusTextColor(0),
+                //     backgroundColor: AColors.getPriorityStatusColor(0)),
+                8.width,
+                /// TBD
+                //StatusLabel(label: '', textColor: AColors.getRequestStatusTextColor(0), backgroundColor: AColors.getRequestStatusColor(0)),
+                1.width.expanded,
+                Text(item.createdOn != null ?item.createdOn.toServiceRequestCardFormat:"", textAlign: TextAlign.end, style: AppTextStyles.tinyFont.copyWith(color: const Color(0xFF3B3D4A))),
+              ],
+            ),
+            8.height,
+            Text(context.translation.deviceTransferRequest, style: AppTextStyles.heading5.copyWith(color: const Color(0xFF3B3D4A))),
+            Text(
+              '${context.translation.from} : ${item.senderAssignedEmployeeName}',
+              style: AppTextStyles.bodyText.copyWith(color: Color(0xFF757575)),
+            ),
+            Text(
+              '${context.translation.to} : ${item.receiverAssignedEmployeeName}',
+              style: AppTextStyles.bodyText.copyWith(color: Color(0xFF757575)),
+            ),
+            8.height,
+            Row(
+              mainAxisSize: MainAxisSize.min,
               children: [
-                Expanded(
-                  child: Column(
-                    crossAxisAlignment: CrossAxisAlignment.start,
-                    children: [
-                      Text(
-                        /*item.title ??*/ "-----",
-                        style: Theme.of(context).textTheme.headline6.copyWith(color: onItemColor, fontSize: 16, fontWeight: FontWeight.bold),
-                      ),
-                      Divider(
-                        color: onItemColor,
-                      ),
-                      Text(
-                        /*item.asset?.number ??*/ "-----",
-                        style: Theme.of(context).textTheme.headline6.copyWith(color: onItemColor, fontSize: 16, fontWeight: FontWeight.bold),
-                      ),
-                      Divider(
-                        color: onItemColor,
-                      ),
-                      Text(
-                        /*item.asset.assetName ??*/ "",
-                        style: Theme.of(context).textTheme.headline6.copyWith(color: onItemColor, fontSize: 16, fontWeight: FontWeight.bold),
-                      ),
-                      Divider(
-                        color: onItemColor,
-                      ),
-                      Row(
-                        children: [
-                          Expanded(
-                            child: Text(
-                              context.translation.from,
-                              style: Theme.of(context).textTheme.subtitle2.copyWith(
-                                    color: onItemColor,
-                                  ),
-                            ),
-                          ),
-                          // StatusLabel(
-                          //   backgroundColor: AColors.getRequestStatusColor(item.sender.status?.id),
-                          //   label: item.sender.status?.name,
-                          // )
-                        ],
-                      ),
-                      //const SizedBox(height: 8,),
-                      // Row(
-                      //   children: [
-                      //     Expanded(
-                      //       child: Text(
-                      //         item.sender.client.name,
-                      //         style: Theme.of(context).textTheme.subtitle2.copyWith(
-                      //               color: onItemColor,
-                      //             ),
-                      //       ),
-                      //     ),
-                      //   ],
-                      // ),
-                      // if (item.sender.department.id != null)
-                      //   Text(
-                      //     item.sender.department.name,
-                      //     style: Theme.of(context).textTheme.bodySmall.copyWith(
-                      //           color: onItemColor,
-                      //         ),
-                      //   ),
-                      Divider(
-                        color: onItemColor,
-                      ),
-                      // Row(
-                      //   children: [
-                      //     Expanded(
-                      //       child: Text(
-                      //         context.translation.to,
-                      //         style: Theme.of(context).textTheme.subtitle2.copyWith(
-                      //               color: onItemColor,
-                      //             ),
-                      //       ),
-                      //     ),
-                      //     StatusLabel(
-                      //       backgroundColor: AColors.getRequestStatusColor(item.receiver.status?.id),
-                      //       label: item.receiver.status?.name,
-                      //     )
-                      //   ],
-                      // ),
-                      // //const SizedBox(height: 8,),
-                      // Row(
-                      //   children: [
-                      //     Expanded(
-                      //       child: Text(
-                      //         item.receiver.client.name,
-                      //         style: Theme.of(context).textTheme.subtitle2.copyWith(
-                      //               color: onItemColor,
-                      //             ),
-                      //       ),
-                      //     ),
-                      //   ],
-                      // ),
-                      // if (item.receiver.department.id != null)
-                      //   Text(
-                      //     item.receiver.department.name,
-                      //     style: Theme.of(context).textTheme.bodySmall.copyWith(
-                      //           color: onItemColor,
-                      //         ),
-                      //   ),
-                      //Divider(color: onItemColor,),
-                    ],
-                  ),
+                Text(
+                  'View Details',
+                  style: AppTextStyles.bodyText.copyWith(color: const Color(0xFF4A8DB7)),
                 ),
+                4.width,
+                const Icon(
+                  Icons.arrow_forward,
+                  color: Color(0xFF4A8DB7),
+                  size: 14,
+                )
               ],
             ),
           ],
-        ),
+        )
       ),
     );
   }