From b295256d664da0493f39dfd1e8dc3f5bd804538c Mon Sep 17 00:00:00 2001 From: nextwo <1234> Date: Tue, 14 Nov 2023 17:28:07 +0300 Subject: [PATCH] When log out, it keeps loading , On asset transfer, on complete & close , dont show edit button, Signature issue on update asset. On calendar weekly swipe data calling issue. Also on monthly --- lib/new_views/common_widgets/app_drawer.dart | 1 + .../land_page/requests/asset_item_view.dart | 13 ++++-- .../device_transfer_details.dart | 40 ++++++++++--------- .../update_device_transfer.dart | 1 + .../widgets/e_signature/e_signature.dart | 3 +- 5 files changed, 35 insertions(+), 23 deletions(-) diff --git a/lib/new_views/common_widgets/app_drawer.dart b/lib/new_views/common_widgets/app_drawer.dart index 1c61ef00..4fe20427 100644 --- a/lib/new_views/common_widgets/app_drawer.dart +++ b/lib/new_views/common_widgets/app_drawer.dart @@ -91,6 +91,7 @@ class AppDrawer extends StatelessWidget { userProvider.reset(); Navigator.of(context).pop(); Navigator.of(context).pop(); + Navigator.of(context).pop(); } }), 18.height, diff --git a/lib/new_views/pages/land_page/requests/asset_item_view.dart b/lib/new_views/pages/land_page/requests/asset_item_view.dart index 153c7b33..18e57961 100644 --- a/lib/new_views/pages/land_page/requests/asset_item_view.dart +++ b/lib/new_views/pages/land_page/requests/asset_item_view.dart @@ -10,6 +10,9 @@ import 'package:test_sa/models/device/asset.dart'; import 'package:test_sa/views/app_style/colors.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; @@ -25,10 +28,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), ), @@ -72,6 +77,8 @@ class AssetItemView extends StatelessWidget { ], ), ], - ).toShadowContainer(context,showShadow: showShadow).onPress(() {}); + ).toShadowContainer(context,showShadow: showShadow).onPress(() { + Navigator.of(context).push(MaterialPageRoute(builder: (_) => DeviceTransferDetails(model: AssetTransfer(id: request.id)))); + }); } } diff --git a/lib/views/pages/device_transfer/device_transfer_details.dart b/lib/views/pages/device_transfer/device_transfer_details.dart index 81636434..932c8afc 100644 --- a/lib/views/pages/device_transfer/device_transfer_details.dart +++ b/lib/views/pages/device_transfer/device_transfer_details.dart @@ -76,10 +76,10 @@ class _DeviceTransferDetailsState extends State { 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 { // ], // ), 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 { // 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 { // 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 { 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( diff --git a/lib/views/pages/device_transfer/update_device_transfer.dart b/lib/views/pages/device_transfer/update_device_transfer.dart index bf01a34a..d1142d0f 100644 --- a/lib/views/pages/device_transfer/update_device_transfer.dart +++ b/lib/views/pages/device_transfer/update_device_transfer.dart @@ -174,6 +174,7 @@ class _UpdateDeviceTransferState extends State { ), 8.height, ESignature( + title: "Signature", oldSignature: widget.isSender ? widget.model.senderEngSignature : widget.model.receiverEngSignature, newSignature: _signature, diff --git a/lib/views/widgets/e_signature/e_signature.dart b/lib/views/widgets/e_signature/e_signature.dart index 7974e81d..86e40b5b 100644 --- a/lib/views/widgets/e_signature/e_signature.dart +++ b/lib/views/widgets/e_signature/e_signature.dart @@ -38,6 +38,7 @@ class _ESignatureState extends State { if (widget.newSignature != null) { signature = widget.newSignature; } + super.initState(); } @@ -92,7 +93,7 @@ class _ESignatureState extends State { }), ], ), - (widget.oldSignature != null || signature != null || !_editable) + ((widget.oldSignature != null || signature != null) && !_editable) ? Container( height: 135.toScreenHeight, width: MediaQuery.of(context).size.width,