Merge remote-tracking branch 'origin/main_design2.0' into main_design2.0

# Conflicts:
#	lib/new_views/pages/land_page/requests/asset_item_view.dart

lib/new_views/common_widgets/app_drawer.dart

@@ -96,6 +96,7 @@ class AppDrawer extends StatelessWidget {
               userProvider.reset();
               Navigator.of(context).pop();
               Navigator.of(context).pop();
+              Navigator.of(context).pop();
             }
           }),
           18.height,

lib/new_views/pages/land_page/requests/asset_item_view.dart

@@ -12,6 +12,9 @@ import 'package:test_sa/views/app_style/colors.dart';
 import 'package:test_sa/views/pages/device_transfer/device_transfer_details.dart';
 import 'package:test_sa/views/widgets/requests/request_status.dart';
 
+import '../../../../models/device/asset_transfer.dart';
+import '../../../../views/pages/device_transfer/device_transfer_details.dart';
+
 class AssetItemView extends StatelessWidget {
   final RequestsDetails request;
   final bool showShadow;
@@ -27,10 +30,12 @@ class AssetItemView extends StatelessWidget {
         Row(
           crossAxisAlignment: CrossAxisAlignment.start,
           children: [
-            StatusLabel(label: request.priority, textColor: AColors.getRequestStatusTextColorByName(request.priority), backgroundColor: AColors.getRequestStatusColorByName(request.priority)),
+            if(request.priority != null)
+            StatusLabel(label: request.priority??"", textColor: AColors.getRequestStatusTextColorByName(request.priority), backgroundColor: AColors.getRequestStatusColorByName(request.priority)),
             8.width,
+            //if(request.status != null)
             // StatusLabel(
-            //   label: request.status,
+            //   label: request.status??",
             //   textColor: AColors.getRequestStatusTextColorByName(request.status),
             //   backgroundColor: AColors.getRequestStatusColorByName(request.status),
             // ),
@@ -75,13 +80,7 @@ class AssetItemView extends StatelessWidget {
         ),
       ],
     ).toShadowContainer(context,showShadow: showShadow).onPress(() {
-
-      Navigator.of(context).push(MaterialPageRoute(builder: (_) => DeviceTransferDetails(model: AssetTransfer(
-        id:request.id
-
-      ))));
-
-
+      Navigator.of(context).push(MaterialPageRoute(builder: (_) => DeviceTransferDetails(model: AssetTransfer(id: request.id))));
     });
   }
 }

lib/views/pages/device_transfer/device_transfer_details.dart

@@ -76,10 +76,10 @@ class _DeviceTransferDetailsState extends State<DeviceTransferDetails> {
                                 Column(
                                   crossAxisAlignment: CrossAxisAlignment.start,
                                   children: [
-                                    _buildTextWidget('${context.translation.assetName} : ${_model.assetName}'),
-                                    _buildTextWidget('${context.translation.assetNumber} : ${_model.assetNumber}'),
-                                    _buildTextWidget('${context.translation.model} : ${_model.modelName}'),
-                                    _buildTextWidget('${context.translation.sn} : ${_model.assetSerialNo}'),
+                                    _buildTextWidget('${context.translation.assetName} : ${_model?.assetName ??""}'),
+                                    _buildTextWidget('${context.translation.assetNumber} : ${_model?.assetNumber??""}'),
+                                    _buildTextWidget('${context.translation.model} : ${_model?.modelName??""}'),
+                                    _buildTextWidget('${context.translation.sn} : ${_model?.assetSerialNo??""}'),
                                   ],
                                 ),
                                 8.height,
@@ -104,7 +104,7 @@ class _DeviceTransferDetailsState extends State<DeviceTransferDetails> {
                                 //   ],
                                 // ),
                                 1.width,
-                                Text(_model.createdOn != null ? _model.createdOn.toServiceRequestCardFormat : "",
+                                Text(_model?.createdOn != null ? _model.createdOn.toServiceRequestCardFormat : "",
                                     textAlign: TextAlign.end, style: AppTextStyles.tinyFont.copyWith(color: context.isDark ? AppColor.neutral10 : Color(0xFF3B3D4A))),
                               ],
                             ),
@@ -114,17 +114,17 @@ class _DeviceTransferDetailsState extends State<DeviceTransferDetails> {
                       // sender card
                       _buildCard(
                         isSender: true,
-                        site: _model.senderSiteName ?? "",
+                        site: _model?.senderSiteName ?? "",
 
                         /// TBD
-                        unit: _model.senderDepartmentName ?? "",
-                        comment: _model.senderComment ?? "",
+                        unit: _model?.senderDepartmentName ?? "",
+                        comment: _model?.senderComment ?? "",
 
                         /// TBD
-                        statusLabel: _model.senderMachineStatusName != null
+                        statusLabel: _model?.senderMachineStatusName != null
                             ? StatusLabel(
-                                label: _model.senderMachineStatusName,
-                                id: _model.senderMachineStatusId,
+                                label: _model?.senderMachineStatusName,
+                                id: _model?.senderMachineStatusId,
                                 textColor: AColors.getRequestStatusTextColor(getIdstatus(_model.senderMachineStatusName)),
                                 backgroundColor: AColors.getRequestStatusColor(getIdstatus(_model.senderMachineStatusName)))
                             : null,
@@ -132,17 +132,17 @@ class _DeviceTransferDetailsState extends State<DeviceTransferDetails> {
                       // receiver card
                       _buildCard(
                         isSender: false,
-                        site: _model.destSiteName ?? "",
+                        site: _model?.destSiteName ?? "",
 
                         /// TBD
-                        unit: _model.destDepartmentName ?? "",
-                        comment: _model.receiverComment ?? "",
+                        unit: _model?.destDepartmentName ?? "",
+                        comment: _model?.receiverComment ?? "",
 
                         /// TBD
-                        statusLabel: _model.receiverMachineStatusName != null
+                        statusLabel: _model?.receiverMachineStatusName != null
                             ? StatusLabel(
-                                label: _model.receiverMachineStatusName ?? "",
-                                id: _model.receiverMachineStatusId,
+                                label: _model?.receiverMachineStatusName ?? "",
+                                id: _model?.receiverMachineStatusId,
                                 textColor: AColors.getRequestStatusTextColor(getIdstatus(_model.receiverMachineStatusName)),
                                 backgroundColor: AColors.getRequestStatusColor(getIdstatus(_model.receiverMachineStatusName)))
                             : null,
@@ -181,8 +181,10 @@ class _DeviceTransferDetailsState extends State<DeviceTransferDetails> {
                 isSender ? context.translation.senderDetails.heading5(context) : context.translation.receiverDetails.heading5(context),
               ],
             ),
-            if ((_userProvider.user?.type == UsersTypes.engineer) && (isSender ? _model.senderMachineStatusName != "Closed" : _model.receiverMachineStatusName != "Closed"))
-              CircleAvatar(
+            if ((_userProvider.user?.type == UsersTypes.engineer))
+              if(isSender ? (_model?.senderMachineStatusName?.toLowerCase() != "closed" && _model?.senderMachineStatusName?.toLowerCase() != "completed")
+              : (_model?.receiverMachineStatusName?.toLowerCase() != "closed" && _model?.receiverMachineStatusName?.toLowerCase() != "completed"))
+               CircleAvatar(
                 radius: 25,
                 backgroundColor: AppColor.neutral30,
                 child: CircleAvatar(

lib/views/pages/device_transfer/update_device_transfer.dart

@@ -174,6 +174,7 @@ class _UpdateDeviceTransferState extends State<UpdateDeviceTransfer> {
                       ),
                       8.height,
                       ESignature(
+
                         title: "Signature",
                         oldSignature: widget.isSender ? widget.model.senderEngSignature : widget.model.receiverEngSignature,
                         newSignature: _signature,

lib/views/widgets/e_signature/e_signature.dart

@@ -38,6 +38,7 @@ class _ESignatureState extends State<ESignature> {
     if (widget.newSignature != null) {
       signature = widget.newSignature;
     }
+
     super.initState();
   }
 
@@ -92,7 +93,7 @@ class _ESignatureState extends State<ESignature> {
                     }),
                   ],
                 ),
-                (widget.oldSignature != null || signature != null || !_editable)
+                ((widget.oldSignature != null || signature != null) && !_editable)
                     ? Container(
                         height: 135.toScreenHeight,
                         width: MediaQuery.of(context).size.width,