Haroon6138
/
cloudsolutions-atoms
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 11 Wiki Activity

renaming done as per pdf shared

Browse Source
design_3.0_task_module_new
WaseemAbbasi22 6 months ago
parent 1900715559
commit 7b57ca54c3
14 changed files with 138 additions and 133 deletions
Show Stats Download Patch File Download Diff File

8
lib/controllers/api_routes/urls.dart
Unescape Escape View File

@ -4,11 +4,11 @@ class URLs {
static const String appReleaseBuildNumber = "15"; static const String appReleaseBuildNumber = "15";
// static const host1 = "https://atomsm.hmg.com"; // production url // static const host1 = "https://atomsm.hmg.com"; // production url
static const host1 = "https://atomsmdev.hmg.com"; // local DEV url // static const host1 = "https://atomsmdev.hmg.com"; // local DEV url
// static const host1 = "https://atomsmuat.hmg.com"; // local UAT url static const host1 = "https://atomsmuat.hmg.com"; // local UAT url
// static String _baseUrl = "$_host/mobile"; static String _baseUrl = "$_host/mobile";
static final String _baseUrl = "$_host/v2/mobile"; // new V2 apis // static final String _baseUrl = "$_host/v2/mobile"; // new V2 apis
// static final String _baseUrl = "$_host/mobile"; // host local UAT // static final String _baseUrl = "$_host/mobile"; // host local UAT
// static final String _baseUrl = "$_host/v3/mobile"; // new V3 apis // static final String _baseUrl = "$_host/v3/mobile"; // new V3 apis

6
lib/l10n/app_ar.arb
Unescape Escape View File

@ -549,5 +549,9 @@
"part": "جزء", "part": "جزء",
"creationDate": "تاريخ الإنشاء", "creationDate": "تاريخ الإنشاء",
"transferType": "نوع النقل", "transferType": "نوع النقل",
"createdBy": "تم الإنشاء بواسطة" "createdBy": "تم الإنشاء بواسطة",
"trNumber": "رقم طلب النقل",
"workOrderDetails": "تفاصيل أمر العمل",
"woNumber": "رقم أمر العمل",
"contactInfo": "معلومات الاتصال"
} }

8
lib/l10n/app_en.arb
Unescape Escape View File

@ -315,7 +315,7 @@
"youHaveToAddRequests": "You have to add requests", "youHaveToAddRequests": "You have to add requests",
"createdSuccessfully": "Created successfully", "createdSuccessfully": "Created successfully",
"failedToCompleteRequest": "Failed to complete request", "failedToCompleteRequest": "Failed to complete request",
"assetNo": "Asset No.", "assetNo": "Asset No",
"manufacture": "Manufacture", "manufacture": "Manufacture",
"serialNo": "Serial No", "serialNo": "Serial No",
"pickAsset": "Pick Asset", "pickAsset": "Pick Asset",
@ -549,5 +549,9 @@
"rejectionDetails": "Rejection Details", "rejectionDetails": "Rejection Details",
"part": "Part", "part": "Part",
"creationDate": "Creation Date", "creationDate": "Creation Date",
"createdBy": "Created BY" "createdBy": "Created BY",
"trNumber": "TR Number",
"workOrderDetails": "Work Order Details",
"woNumber": "WO Number",
"contactInfo": "Contact Info"
} }

1
lib/models/new_models/dashboard_detail.dart
Unescape Escape View File

@ -60,6 +60,7 @@ class Data {
Data({this.id, this.typeTransaction, this.nameOfType,this.transactionDate, this.statusName, this.priorityName, this.isHighPriority, this.assetName, this.assetNumber, this.requestTypeName, this.requestNo,this.transactionNo}); Data({this.id, this.typeTransaction, this.nameOfType,this.transactionDate, this.statusName, this.priorityName, this.isHighPriority, this.assetName, this.assetNumber, this.requestTypeName, this.requestNo,this.transactionNo});
Data.fromJson(Map<String, dynamic> json) { Data.fromJson(Map<String, dynamic> json) {
id = json['id']; id = json['id'];
typeTransaction = json['typeTransaction']; typeTransaction = json['typeTransaction'];
transactionDate = json['transactionDate']; transactionDate = json['transactionDate'];

2
lib/models/search_all_requests_model.dart
Unescape Escape View File

@ -51,7 +51,7 @@ abstract class SearchAllRequestsBaseModel {
class SearchByRequestNumberModel extends SearchAllRequestsBaseModel { class SearchByRequestNumberModel extends SearchAllRequestsBaseModel {
SearchByRequestNumberModel(BuildContext context, {TextEditingController? controller, String? value}) // Parameters now nullable SearchByRequestNumberModel(BuildContext context, {TextEditingController? controller, String? value}) // Parameters now nullable
: super(context, controller: controller, label: "${context.translation.requestNo}.", value: value); : super(context, controller: controller, label: context.translation.woNumber, value: value);
} }
class SearchByAssetNameModel extends SearchAllRequestsBaseModel { class SearchByAssetNameModel extends SearchAllRequestsBaseModel {

7
lib/modules/cm_module/views/components/service_request_detail_view.dart
Unescape Escape View File

@ -222,13 +222,10 @@ class _ServiceRequestDetailViewState extends State<ServiceRequestDetailView> {
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.requesterName}: ${workOrder.workOrderCreatedBy?.userName ?? "-"}', '${context.translation.createdBy}: ${workOrder.workOrderCreatedBy?.userName ?? "-"}',
style: AppTextStyles.bodyText.copyWith(color: context.isDark ? AppColor.neutral10 : AppColor.neutral120), style: AppTextStyles.bodyText.copyWith(color: context.isDark ? AppColor.neutral10 : AppColor.neutral120),
), ),
Text(
'Requested Date: ${workOrder.requestedDate!.toString().toServiceRequestDetailsFormat}',
style: AppTextStyles.bodyText.copyWith(color: context.isDark ? AppColor.neutral30 : AppColor.neutral120),
),
Text( Text(
'${context.translation.arrivedDate}: ${workOrder.iHaveArrivedDate != null ? workOrder.iHaveArrivedDate.toString().toServiceRequestDetailsFormat : '-'}', '${context.translation.arrivedDate}: ${workOrder.iHaveArrivedDate != null ? workOrder.iHaveArrivedDate.toString().toServiceRequestDetailsFormat : '-'}',
style: AppTextStyles.bodyText.copyWith(color: context.isDark ? AppColor.neutral30 : AppColor.neutral120), style: AppTextStyles.bodyText.copyWith(color: context.isDark ? AppColor.neutral30 : AppColor.neutral120),

2
lib/new_views/pages/land_page/create_request-type_bottomsheet.dart
Unescape Escape View File

@ -94,7 +94,7 @@ class CreateRequestModel {
} else { } else {
list.add(CreateRequestModel(context.translation.correctiveMaintenance, "add_icon", CreateNewRequest.id)); list.add(CreateRequestModel(context.translation.correctiveMaintenance, "add_icon", CreateNewRequest.id));
list.add(CreateRequestModel(context.translation.gasRefill, "add_icon", GasRefillRequestForm.routeName)); list.add(CreateRequestModel(context.translation.gasRefill, "add_icon", GasRefillRequestForm.routeName));
list.add(CreateRequestModel(context.translation.deviceTransfer, "add_icon", CreateDeviceTransferRequest.id)); list.add(CreateRequestModel(context.translation.transferAsset, "add_icon", CreateDeviceTransferRequest.id));
list.add(CreateRequestModel(context.translation.task, "add_icon", CreateTaskView.id)); list.add(CreateRequestModel(context.translation.task, "add_icon", CreateTaskView.id));
} }
return list; return list;

3
lib/new_views/pages/land_page/my_request/all_requests_filter_page.dart
Unescape Escape View File

@ -46,7 +46,6 @@ class _AllRequestsFilterPageState extends State<AllRequestsFilterPage> {
@override @override
Widget build(BuildContext context) { Widget build(BuildContext context) {
print('i am here...');
bool isEngineer = (Provider.of<UserProvider>(context, listen: false).user?.type) == UsersTypes.engineer; bool isEngineer = (Provider.of<UserProvider>(context, listen: false).user?.type) == UsersTypes.engineer;
if (search == null) { if (search == null) {
search = SearchAllRequestsModel( search = SearchAllRequestsModel(
@ -62,7 +61,7 @@ class _AllRequestsFilterPageState extends State<AllRequestsFilterPage> {
final types = { final types = {
context.translation.correctiveMaintenance: 1, context.translation.correctiveMaintenance: 1,
context.translation.gasRefill: 2, context.translation.gasRefill: 2,
context.translation.deviceTransfer: 3, context.translation.transferAsset: 3,
context.translation.preventiveMaintenance: 4, context.translation.preventiveMaintenance: 4,
context.translation.task: 6, context.translation.task: 6,
}; };

1
lib/new_views/pages/land_page/my_request/all_requests_search_page.dart
Unescape Escape View File

@ -111,6 +111,7 @@ class _AllRequestsSearchPageState extends State<AllRequestsSearchPage> {
controller: search!.searchBySelectedValue?.controller, controller: search!.searchBySelectedValue?.controller,
labelText: search!.searchBySelectedValue?.label, labelText: search!.searchBySelectedValue?.label,
textInputType: search!.searchBySelectedValue?.inputType, textInputType: search!.searchBySelectedValue?.inputType,
labelStyle: AppTextStyles.bodyText2,
onChange: (text) { onChange: (text) {
search!.searchBySelectedValue?.controller?.text = text; search!.searchBySelectedValue?.controller?.text = text;
search!.searchBySelectedValue?.controller?.selection = TextSelection.fromPosition(TextPosition(offset: search!.searchBySelectedValue!.controller!.text.length)); search!.searchBySelectedValue?.controller?.selection = TextSelection.fromPosition(TextPosition(offset: search!.searchBySelectedValue!.controller!.text.length));

4
lib/new_views/pages/land_page/my_request/my_requests_page.dart
Unescape Escape View File

@ -34,8 +34,8 @@ class _MyRequestsPageState extends State<MyRequestsPage> {
requestsList = [ requestsList = [
context.translation.allWorkOrder, context.translation.allWorkOrder,
context.translation.correctiveMaintenance, context.translation.correctiveMaintenance,
context.translation.gasRefillRequest, context.translation.gasRefill,
context.translation.deviceTransferRequest, context.translation.transferAsset,
context.translation.preventiveMaintenance, context.translation.preventiveMaintenance,
context.translation.recurrentWo, context.translation.recurrentWo,
context.translation.taskRequest, context.translation.taskRequest,

37
lib/new_views/pages/land_page/requests/device_item_view.dart
Unescape Escape View File

@ -35,13 +35,13 @@ class DeviceItemView extends StatelessWidget {
textColor: AppColor.getRequestStatusTextColorByName(context, requestData!.priorityName!), textColor: AppColor.getRequestStatusTextColorByName(context, requestData!.priorityName!),
backgroundColor: AppColor.getRequestStatusColorByName(context, requestData!.priorityName!), backgroundColor: AppColor.getRequestStatusColorByName(context, requestData!.priorityName!),
), ),
// 8.width, 8.width,
// if (request.status != null) if (requestData?.statusName != null)
// StatusLabel( StatusLabel(
// label: request.status ?? "", label: requestData?.statusName ?? "",
// textColor: AppColor.getRequestStatusTextColorByName(context, request.status), textColor: AppColor.getRequestStatusTextColorByName(context, requestData?.statusName),
// backgroundColor: AppColor.getRequestStatusColorByName(context, request.status), backgroundColor: AppColor.getRequestStatusColorByName(context, requestData?.statusName),
// ), ),
1.width.expanded, 1.width.expanded,
Text(requestData!.transactionDate?.toServiceRequestCardFormat ?? "", Text(requestData!.transactionDate?.toServiceRequestCardFormat ?? "",
textAlign: TextAlign.end, style: AppTextStyles.tinyFont.copyWith(color: context.isDark ? AppColor.neutral10 : AppColor.neutral50)), textAlign: TextAlign.end, style: AppTextStyles.tinyFont.copyWith(color: context.isDark ? AppColor.neutral10 : AppColor.neutral50)),
@ -55,7 +55,7 @@ class DeviceItemView extends StatelessWidget {
(requestData?.typeTransaction ?? context.translation.deviceTransferRequest).heading5(context), (requestData?.typeTransaction ?? context.translation.deviceTransferRequest).heading5(context),
// "${context.translation.from} : ${request.siteTransferFrom?.cleanupWhitespace.capitalizeFirstOfEach}".bodyText(context), // todo ask ahmed // "${context.translation.from} : ${request.siteTransferFrom?.cleanupWhitespace.capitalizeFirstOfEach}".bodyText(context), // todo ask ahmed
// "${context.translation.to} : ${request.siteTransferTo?.cleanupWhitespace.capitalizeFirstOfEach}".bodyText(context),// todo ask ahmed // "${context.translation.to} : ${request.siteTransferTo?.cleanupWhitespace.capitalizeFirstOfEach}".bodyText(context),// todo ask ahmed
requestData!.statusName!.replaceAll("=", ":").bodyText(context), // requestData!.statusName!.replaceAll("=", ":").bodyText(context),
'${context.translation.requestNo}: ${requestData!.requestNo}'.bodyText(context), '${context.translation.requestNo}: ${requestData!.requestNo}'.bodyText(context),
], ],
), ),
@ -95,13 +95,13 @@ class DeviceItemView extends StatelessWidget {
textColor: AppColor.getRequestStatusTextColorByName(context, requestDetails!.priority!), textColor: AppColor.getRequestStatusTextColorByName(context, requestDetails!.priority!),
backgroundColor: AppColor.getRequestStatusColorByName(context, requestDetails!.priority!), backgroundColor: AppColor.getRequestStatusColorByName(context, requestDetails!.priority!),
), ),
// 8.width, 8.width,
// if (request.status != null) if (requestDetails?.status != null)
// StatusLabel( StatusLabel(
// label: request.status ?? "", label: requestDetails?.status ?? "",
// textColor: AppColor.getRequestStatusTextColorByName(context, request.status), textColor: AppColor.getRequestStatusTextColorByName(context, requestDetails?.status),
// backgroundColor: AppColor.getRequestStatusColorByName(context, request.status), backgroundColor: AppColor.getRequestStatusColorByName(context, requestDetails?.status),
// ), ),
1.width.expanded, 1.width.expanded,
Text(requestDetails!.date?.toServiceRequestCardFormat ?? "", Text(requestDetails!.date?.toServiceRequestCardFormat ?? "",
textAlign: TextAlign.end, style: AppTextStyles.tinyFont.copyWith(color: context.isDark ? AppColor.neutral10 : AppColor.neutral50)), textAlign: TextAlign.end, style: AppTextStyles.tinyFont.copyWith(color: context.isDark ? AppColor.neutral10 : AppColor.neutral50)),
@ -114,11 +114,10 @@ class DeviceItemView extends StatelessWidget {
children: [ children: [
(requestDetails?.nameOfType ?? context.translation.deviceTransferRequest).heading5(context), (requestDetails?.nameOfType ?? context.translation.deviceTransferRequest).heading5(context),
8.height, 8.height,
'${context.translation.requestNo}: ${requestDetails!.requestNo}'.bodyText(context), '${context.translation.trNumber}: ${requestDetails!.requestNo}'.bodyText(context),
"${context.translation.from} : ${requestDetails!.siteTransferFrom?.cleanupWhitespace.capitalizeFirstOfEach}".bodyText(context), "${context.translation.from} : ${requestDetails!.siteTransferFrom?.cleanupWhitespace.capitalizeFirstOfEach}".bodyText(context),
"${context.translation.to} : ${requestDetails!.siteTransferTo?.cleanupWhitespace.capitalizeFirstOfEach}".bodyText(context), "${context.translation.to} : ${requestDetails!.siteTransferTo?.cleanupWhitespace.capitalizeFirstOfEach}".bodyText(context),
requestDetails!.status!.replaceAll("=", ":").bodyText(context), // requestDetails!.status!.replaceAll("=", ":").bodyText(context),
], ],
), ),
8.height, 8.height,
@ -143,6 +142,6 @@ class DeviceItemView extends StatelessWidget {
}); });
} }
return SizedBox(); return const SizedBox();
} }
} }

151
lib/views/pages/device_transfer/device_transfer_details.dart
Unescape Escape View File

@ -47,7 +47,7 @@ class _DeviceTransferDetailsState extends State<DeviceTransferDetails> {
_userProvider ??= Provider.of<UserProvider>(context); _userProvider ??= Provider.of<UserProvider>(context);
return Scaffold( return Scaffold(
appBar: DefaultAppBar(title: context.translation.deviceTransferDetails), appBar: DefaultAppBar(title: context.translation.transferDetails),
key: _scaffoldKey, key: _scaffoldKey,
body: SafeArea( body: SafeArea(
child: FutureBuilder( child: FutureBuilder(
@ -69,59 +69,17 @@ class _DeviceTransferDetailsState extends State<DeviceTransferDetails> {
child: SingleChildScrollView( child: SingleChildScrollView(
child: Column( child: Column(
children: [ children: [
Row( Column(
crossAxisAlignment: CrossAxisAlignment.start, crossAxisAlignment: CrossAxisAlignment.stretch,
children: [ children: [
Column( Row(
crossAxisAlignment: CrossAxisAlignment.stretch,
children: [ children: [
Text( StatusLabel(
"Transfer Details".addTranslation, label: _model?.transferType?.name,
style: AppTextStyles.heading6.copyWith(color: context.isDark ? AppColor.neutral30 : AppColor.neutral50), id: _model?.transferType?.id?.toInt(),
), textColor: AppColor.getRequestStatusTextColorByName(context, _model?.transferType?.name),
_buildTextWidget('${context.translation.requestNo} : ${_model?.transferCode ?? ""}'), backgroundColor: AppColor.getRequestStatusColorByName(context, _model?.transferType?.name),
_buildTextWidget('${context.translation.transferType} : ${_model?.transferType?.name ?? ""}'),
_buildTextWidget('${context.translation.createdBy} : ${_model?.name ?? ""}'),
const Divider().defaultStyle(context),
Text(
"Asset Info".addTranslation,
style: AppTextStyles.heading6.copyWith(color: context.isDark ? AppColor.neutral30 : AppColor.neutral50),
),
_buildTextWidget('${context.translation.assetName} : ${_model?.assetName?.cleanupWhitespace.capitalizeFirstOfEach ?? ""}'),
_buildTextWidget('${context.translation.assetNumber} : ${_model?.assetNumber ?? ""}'),
_buildTextWidget('${context.translation.model} : ${_model?.modelName ?? ""}'),
_buildTextWidget('${context.translation.sn} : ${_model?.assetSerialNo ?? ""}'),
Column(
crossAxisAlignment: CrossAxisAlignment.start,
children: [
_contactInfo(),
if ((_model?.comment ?? "").isNotEmpty) ...[
const Divider().defaultStyle(context),
Text(
"Comments".addTranslation,
style: AppTextStyles.heading6.copyWith(color: context.isDark ? AppColor.neutral30 : AppColor.neutral50),
),
8.height,
_buildTextWidget(_model!.comment!),
],
if (_attachments.isNotEmpty) ...[
const Divider().defaultStyle(context),
Text(
"Attachments".addTranslation,
style: AppTextStyles.heading6.copyWith(color: context.isDark ? AppColor.neutral30 : AppColor.neutral50),
),
8.height,
FilesList(images: _model?.assetTransferAttachments?.map((e) => URLs.getFileUrl(e.attachmentName ?? '') ?? '').toList() ?? []),
//attachmentWidget(),
]
],
), ),
],
).expanded,
Column(
crossAxisAlignment: CrossAxisAlignment.end,
children: [
1.width,
Text( Text(
_model?.createdOn != null ? _model!.createdOn!.toServiceRequestCardFormat : "", _model?.createdOn != null ? _model!.createdOn!.toServiceRequestCardFormat : "",
textAlign: TextAlign.end, textAlign: TextAlign.end,
@ -129,20 +87,47 @@ class _DeviceTransferDetailsState extends State<DeviceTransferDetails> {
), ),
], ],
), ),
8.height,
context.translation.callDetails.heading6(context).custom(color: context.isDark ? AppColor.neutral30 : AppColor.neutral50),
_buildTextWidget('${context.translation.trNumber} : ${_model?.transferCode ?? "-"}'),
_buildTextWidget('${context.translation.createdBy} : ${_model?.name ?? "-"}'),
const Divider().defaultStyle(context),
context.translation.assetInformation.heading6(context).custom(color: context.isDark ? AppColor.neutral30 : AppColor.neutral50),
_buildTextWidget('${context.translation.assetName} : ${_model?.assetName?.cleanupWhitespace.capitalizeFirstOfEach ?? ""}'),
_buildTextWidget('${context.translation.assetNumber} : ${_model?.assetNumber ?? "-"}'),
_buildTextWidget('${context.translation.model} : ${_model?.modelName ?? "-"}'),
_buildTextWidget('${context.translation.sn} : ${_model?.assetSerialNo ?? "-"}'),
_buildTextWidget('${context.translation.site} : ${_model?.senderSiteName ?? "-"}'),
_buildTextWidget('${context.translation.building} : ${_model?.senderBuildingName ?? "-"}'),
_buildTextWidget('${context.translation.floor} : ${_model?.senderFloorName ?? "-"}'),
_buildTextWidget('${context.translation.department} : ${_model?.senderDepartmentName ?? "-"}'),
Column(
crossAxisAlignment: CrossAxisAlignment.start,
children: [
_contactInfo(),
if ((_model?.comment ?? "").isNotEmpty) ...[
const Divider().defaultStyle(context),
context.translation.callComments.heading6(context).custom(color: context.isDark ? AppColor.neutral30 : AppColor.neutral50),
8.height,
_buildTextWidget(_model!.comment!),
],
if (_attachments.isNotEmpty) ...[
const Divider().defaultStyle(context),
Text(
"Attachments".addTranslation,
style: AppTextStyles.heading6.copyWith(color: context.isDark ? AppColor.neutral30 : AppColor.neutral50),
),
8.height,
FilesList(images: _model?.assetTransferAttachments?.map((e) => URLs.getFileUrl(e.attachmentName ?? '') ?? '').toList() ?? []),
//attachmentWidget(),
]
],
),
], ],
).toShadowContainer(context), ).toShadowContainer(context),
8.height, 8.height,
if (_model?.transferType?.value == 1) ...[ if (_model?.transferType?.value == 1) ...[
_internalRequestDetailsCard( _internalRequestDetailsCard()
statusLabel: _model?.senderMachineStatusName != null
? StatusLabel(
label: _model!.senderMachineStatusName!,
id: _model!.senderMachineStatusId!.toInt(),
textColor: AppColor.getRequestStatusTextColorByName(context, _model!.senderMachineStatusName!),
backgroundColor: AppColor.getRequestStatusColorByName(context, _model!.senderMachineStatusName!),
)
: null,
)
] else ...[ ] else ...[
// sender card // sender card
_buildCard( _buildCard(
@ -151,6 +136,7 @@ class _DeviceTransferDetailsState extends State<DeviceTransferDetails> {
dept: _model?.senderDepartmentName?.cleanupWhitespace.capitalizeFirstOfEach ?? "", dept: _model?.senderDepartmentName?.cleanupWhitespace.capitalizeFirstOfEach ?? "",
building: _model?.senderBuildingName?.cleanupWhitespace.capitalizeFirstOfEach ?? "", building: _model?.senderBuildingName?.cleanupWhitespace.capitalizeFirstOfEach ?? "",
floor: _model?.senderFloorName?.cleanupWhitespace.capitalizeFirstOfEach ?? "", floor: _model?.senderFloorName?.cleanupWhitespace.capitalizeFirstOfEach ?? "",
assignTo: _model?.senderAssignedEmployeeName,
comment: _model?.senderComment ?? "", comment: _model?.senderComment ?? "",
statusLabel: _model?.senderMachineStatusName != null statusLabel: _model?.senderMachineStatusName != null
? StatusLabel( ? StatusLabel(
@ -169,6 +155,7 @@ class _DeviceTransferDetailsState extends State<DeviceTransferDetails> {
dept: _model?.destDepartmentName?.cleanupWhitespace.capitalizeFirstOfEach ?? "", dept: _model?.destDepartmentName?.cleanupWhitespace.capitalizeFirstOfEach ?? "",
building: _model?.destBuildingName?.cleanupWhitespace.capitalizeFirstOfEach ?? "", building: _model?.destBuildingName?.cleanupWhitespace.capitalizeFirstOfEach ?? "",
floor: _model?.destFloorName?.cleanupWhitespace.capitalizeFirstOfEach ?? "", floor: _model?.destFloorName?.cleanupWhitespace.capitalizeFirstOfEach ?? "",
assignTo: _model?.receiverAssignedEmployeeName,
comment: _model?.receiverComment ?? "", comment: _model?.receiverComment ?? "",
statusLabel: _model?.receiverMachineStatusName != null statusLabel: _model?.receiverMachineStatusName != null
? StatusLabel( ? StatusLabel(
@ -198,7 +185,7 @@ class _DeviceTransferDetailsState extends State<DeviceTransferDetails> {
return text.bodyText(context); return text.bodyText(context);
} }
_internalRequestDetailsCard({StatusLabel? statusLabel}) { _internalRequestDetailsCard() {
bool isCurrentEngineerEligibleForEdit = _model?.senderAssignedEmployeeId == _userProvider!.user?.userID; bool isCurrentEngineerEligibleForEdit = _model?.senderAssignedEmployeeId == _userProvider!.user?.userID;
bool isCurrentRequestEditAble = (!(_model?.senderMachineStatusValue == 3)); bool isCurrentRequestEditAble = (!(_model?.senderMachineStatusValue == 3));
return Column( return Column(
@ -210,8 +197,23 @@ class _DeviceTransferDetailsState extends State<DeviceTransferDetails> {
Column( Column(
crossAxisAlignment: CrossAxisAlignment.start, crossAxisAlignment: CrossAxisAlignment.start,
children: [ children: [
statusLabel ?? Container(), Row(
if (statusLabel != null) 8.height, children: [
StatusLabel(
label: _model!.senderMachineStatusName!,
id: _model!.senderMachineStatusId!.toInt(),
textColor: AppColor.getRequestStatusTextColorByName(context, _model!.senderMachineStatusName!),
backgroundColor: AppColor.getRequestStatusColorByName(context, _model!.senderMachineStatusName!),
),
// 8.width,
// StatusLabel(
// label: _model?.transferType?.name,
// id: _model?.transferType?.id?.toInt(),
// textColor: AppColor.getRequestStatusTextColorByName(context, _model?.transferType?.name),
// backgroundColor: AppColor.getRequestStatusColorByName(context, _model?.transferType?.name),
// )
],
),
], ],
), ),
if ((_userProvider!.user?.type == UsersTypes.engineer)) if ((_userProvider!.user?.type == UsersTypes.engineer))
@ -224,14 +226,15 @@ class _DeviceTransferDetailsState extends State<DeviceTransferDetails> {
}), }),
], ],
), ),
context.translation.details.heading5(context), 8.height,
infoText(label: context.translation.site, value: _model?.senderSiteName), context.translation.workOrderDetails.heading5(context),
infoText(label: "Sender Building".addTranslation, value: _model?.senderBuildingName), infoText(label: context.translation.destinationSite, value: _model?.senderSiteName),
infoText(label: "Sender Floor".addTranslation, value: _model?.senderFloorName), // infoText(label: "Sender Building".addTranslation, value: _model?.senderBuildingName),
infoText(label: "Sender Department".addTranslation, value: _model?.senderDepartmentName), // infoText(label: "Sender Floor".addTranslation, value: _model?.senderFloorName),
infoText(label: "Receiver Building".addTranslation, value: _model?.destBuildingName), // infoText(label: "Sender Department".addTranslation, value: _model?.senderDepartmentName),
infoText(label: "Receiver Floor".addTranslation, value: _model?.destFloorName), infoText(label: "Building".addTranslation, value: _model?.destBuildingName),
infoText(label: "Receiver Department".addTranslation, value: _model?.destDepartmentName), infoText(label: "Floor".addTranslation, value: _model?.destFloorName),
infoText(label: "Department".addTranslation, value: _model?.destDepartmentName),
if (_model!.senderComment != null && _model!.senderComment!.isNotEmpty) ...[ if (_model!.senderComment != null && _model!.senderComment!.isNotEmpty) ...[
8.height, 8.height,
const Divider().defaultStyle(context), const Divider().defaultStyle(context),
@ -245,11 +248,10 @@ class _DeviceTransferDetailsState extends State<DeviceTransferDetails> {
).toShadowContainer(context); ).toShadowContainer(context);
} }
_buildCard({required String site, String? building, String? dept, String? floor, required String comment, required bool isSender, StatusLabel? statusLabel}) { _buildCard({required String site, String? building, String? dept, String? floor, required String comment, required bool isSender, StatusLabel? statusLabel, String? assignTo}) {
bool isCurrentEngineerEligibleForEdit = isSender ? _model?.senderAssignedEmployeeId == _userProvider!.user?.userID : _model?.receiverAssignedEmployeeId == _userProvider!.user?.userID; bool isCurrentEngineerEligibleForEdit = isSender ? _model?.senderAssignedEmployeeId == _userProvider!.user?.userID : _model?.receiverAssignedEmployeeId == _userProvider!.user?.userID;
bool isCurrentRequestClosed = isSender ? ((_model?.senderMachineStatusValue == 3)) : ((_model?.receiverMachineStatusValue == 3)); bool isCurrentRequestClosed = isSender ? ((_model?.senderMachineStatusValue == 3)) : ((_model?.receiverMachineStatusValue == 3));
return Column( return Column(
crossAxisAlignment: CrossAxisAlignment.start, crossAxisAlignment: CrossAxisAlignment.start,
children: [ children: [
@ -283,6 +285,7 @@ class _DeviceTransferDetailsState extends State<DeviceTransferDetails> {
infoText(label: context.translation.building, value: building), infoText(label: context.translation.building, value: building),
infoText(label: context.translation.floor, value: floor), infoText(label: context.translation.floor, value: floor),
infoText(label: context.translation.department, value: dept), infoText(label: context.translation.department, value: dept),
infoText(label: context.translation.assignedTo, value: assignTo),
if (comment.isNotEmpty) ...[ if (comment.isNotEmpty) ...[
8.height, 8.height,
const Divider().defaultStyle(context), const Divider().defaultStyle(context),

37
lib/views/pages/user/gas_refill/gas_refill_details.dart
Unescape Escape View File

@ -82,7 +82,6 @@ class _GasRefillDetailsPageState extends State<GasRefillDetailsPage> {
}, },
label: context.translation.updateRequest, label: context.translation.updateRequest,
).paddingAll(16) ).paddingAll(16)
] ]
//TODO need to uncomment this to enable nurse edit gas refill request. //TODO need to uncomment this to enable nurse edit gas refill request.
// else if (_model.status!.value! == 0) ...[ // else if (_model.status!.value! == 0) ...[
@ -136,12 +135,9 @@ class _GasRefillDetailsPageState extends State<GasRefillDetailsPage> {
], ],
), ),
8.height, 8.height,
// context.translation.gasRefillRequest.heading5(context), context.translation.callDetails.heading6(context).custom(color: context.isDark ? AppColor.neutral30 : AppColor.neutral50),
Text(
"Request Details".addTranslation,
style: AppTextStyles.heading6.copyWith(color: context.isDark ? AppColor.neutral30 : AppColor.neutral50),
),
infoText(label: context.translation.requestNo, value: gasRefillModel.gasRefillNo), infoText(label: context.translation.requestNo, value: gasRefillModel.gasRefillNo),
infoText(label: context.translation.createdBy, value: gasRefillModel.name),
infoText(label: context.translation.gasType, value: gasRefillModel.gasRefillDetails?[0].gasType?.name), infoText(label: context.translation.gasType, value: gasRefillModel.gasRefillDetails?[0].gasType?.name),
infoText(label: context.translation.cylinderType, value: gasRefillModel.gasRefillDetails?[0].cylinderType?.name), infoText(label: context.translation.cylinderType, value: gasRefillModel.gasRefillDetails?[0].cylinderType?.name),
infoText(label: context.translation.cylinderSize, value: gasRefillModel.gasRefillDetails?[0].cylinderSize?.name), infoText(label: context.translation.cylinderSize, value: gasRefillModel.gasRefillDetails?[0].cylinderSize?.name),
@ -150,14 +146,15 @@ class _GasRefillDetailsPageState extends State<GasRefillDetailsPage> {
infoText(label: context.translation.floor, value: gasRefillModel.floor?.name), infoText(label: context.translation.floor, value: gasRefillModel.floor?.name),
infoText(label: context.translation.department, value: gasRefillModel.department?.name), infoText(label: context.translation.department, value: gasRefillModel.department?.name),
infoText(label: context.translation.requestedQuantity, value: gasRefillModel.gasRefillDetails?[0].requestedQty.toString()), infoText(label: context.translation.requestedQuantity, value: gasRefillModel.gasRefillDetails?[0].requestedQty.toString()),
infoText(label: context.translation.deliveredQuantity, value: gasRefillModel.gasRefillDetails![0].deliverdQty.toString()), //need to confirm contact info form backend..
const Divider().defaultStyle(context), const Divider().defaultStyle(context),
Text( context.translation.contactInfo.heading6(context).custom(color: context.isDark ? AppColor.neutral30 : AppColor.neutral50),
"Created By".addTranslation,
style: AppTextStyles.heading6.copyWith(color: context.isDark ? AppColor.neutral30 : AppColor.neutral50),
),
infoText(label: context.translation.employeeId, value: gasRefillModel.employeeId), infoText(label: context.translation.employeeId, value: gasRefillModel.employeeId),
infoText(label: context.translation.name, value: gasRefillModel.name), infoText(label: context.translation.name, value: gasRefillModel.name),
const Divider().defaultStyle(context),
context.translation.workOrderDetails.heading6(context).custom(color: context.isDark ? AppColor.neutral30 : AppColor.neutral50),
infoText(label: context.translation.deliveredQuantity, value: gasRefillModel.gasRefillDetails![0].deliverdQty.toString()),
if (gasRefillModel.techComment?.isNotEmpty ?? false) infoText(label: context.translation.technicalComment, value: gasRefillModel.techComment),
8.height, 8.height,
if (gasRefillModel.comment?.isNotEmpty ?? false) ...[ if (gasRefillModel.comment?.isNotEmpty ?? false) ...[
const Divider().defaultStyle(context), const Divider().defaultStyle(context),
@ -168,15 +165,15 @@ class _GasRefillDetailsPageState extends State<GasRefillDetailsPage> {
gasRefillModel.comment!.bodyText(context), gasRefillModel.comment!.bodyText(context),
8.height, 8.height,
], ],
if (gasRefillModel.techComment?.isNotEmpty ?? false) ...[ // if (gasRefillModel.techComment?.isNotEmpty ?? false) ...[
const Divider().defaultStyle(context), // const Divider().defaultStyle(context),
Text( // Text(
"Technical Comments".addTranslation, // "Technical Comments".addTranslation,
style: AppTextStyles.heading6.copyWith(color: context.isDark ? AppColor.neutral30 : AppColor.neutral50), // style: AppTextStyles.heading6.copyWith(color: context.isDark ? AppColor.neutral30 : AppColor.neutral50),
), // ),
gasRefillModel.techComment!.bodyText(context), // gasRefillModel.techComment!.bodyText(context),
8.height, // 8.height,
], // ],
if (_attachments.isNotEmpty) ...[ if (_attachments.isNotEmpty) ...[
const Divider().defaultStyle(context), const Divider().defaultStyle(context),
Text( Text(

4
pubspec.lock
Unescape Escape View File

@ -1337,10 +1337,10 @@ packages:
dependency: "direct main" dependency: "direct main"
description: description:
name: safe_device name: safe_device
sha256: "953aeac3486180df9118a1a3f5fb842d84015e8aa6f2607edeb5fb881b67a669" sha256: f4930fe80ef28d047d3e600a318d1549732a8910d2b4342e7fd785aea2b1453e
url: "https://pub.dev" url: "https://pub.dev"
source: hosted source: hosted
version: "1.2.0" version: "1.2.1"
share_plus: share_plus:
dependency: "direct main" dependency: "direct main"
description: description:

Write Preview
Loading…
Cancel
Save