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

ui improvements & task details added on details screen

Browse Source
design_3.0_task_module_new
Sikander Saleem 6 months ago
parent 68ee5d9da7
commit 5b3d746b14
8 changed files with 24 additions and 15 deletions
Show Stats Download Patch File Download Diff File

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

@ -59,6 +59,7 @@ class DeviceItemView extends StatelessWidget {
'${context.translation.requestNo}: ${requestData!.requestNo}'.bodyText(context),
],
),
8.height,
Row(
mainAxisSize: MainAxisSize.min,
children: [
@ -111,14 +112,16 @@ class DeviceItemView extends StatelessWidget {
crossAxisAlignment: CrossAxisAlignment.start,
mainAxisSize: MainAxisSize.min,
children: [
'${context.translation.requestNo}: ${requestDetails!.requestNo}'.bodyText(context),
(requestDetails?.nameOfType ?? context.translation.deviceTransferRequest).heading5(context),
8.height,
'${context.translation.requestNo}: ${requestDetails!.requestNo}'.bodyText(context),
"${context.translation.from} : ${requestDetails!.siteTransferFrom?.cleanupWhitespace.capitalizeFirstOfEach}".bodyText(context),
"${context.translation.to} : ${requestDetails!.siteTransferTo?.cleanupWhitespace.capitalizeFirstOfEach}".bodyText(context),
requestDetails!.status!.replaceAll("=", ":").bodyText(context),
],
),
8.height,
Row(
mainAxisSize: MainAxisSize.min,
children: [

1
lib/new_views/pages/land_page/requests/gas_refill_item_view.dart
Unescape Escape View File

@ -108,6 +108,7 @@ class GasRefillItemView extends StatelessWidget {
),
8.height,
(requestDetails?.nameOfType ?? context.translation.gasRefillRequest).heading5(context),
8.height,
'${context.translation.gasType}: ${requestDetails!.gasType}'.bodyText(context),
'${context.translation.site}: ${requestDetails!.site?.cleanupWhitespace?.capitalizeFirstOfEach}'.bodyText(context),
'${context.translation.requestNo}: ${requestDetails!.requestNo}'.bodyText(context),

4
lib/new_views/pages/land_page/requests/ppm_item_view.dart
Unescape Escape View File

@ -54,7 +54,7 @@ class PpmItemView extends StatelessWidget {
// '${context.translation.assetSN}: ${request.assetSN}'.bodyText(context),//todo ask ahmed
// '${context.translation.code}: ${request.code}'.bodyText(context),
'PM No: ${requestData!.requestNo}'.bodyText(context),
16.height,
8.height,
Row(
mainAxisSize: MainAxisSize.min,
children: [
@ -105,7 +105,7 @@ class PpmItemView extends StatelessWidget {
'${context.translation.assetSN}: ${requestDetails!.assetSN}'.bodyText(context),
// '${context.translation.code}: ${request.code}'.bodyText(context),
'PM No: ${requestDetails!.requestNo}'.bodyText(context),
16.height,
8.height,
Row(
mainAxisSize: MainAxisSize.min,
children: [

4
lib/new_views/pages/land_page/requests/recurrent_wo_item_view.dart
Unescape Escape View File

@ -53,7 +53,7 @@ class RecurrentWoItemView extends StatelessWidget {
// '${context.translation.assetSN}: ${request.assetSN}'.bodyText(context),//todo ask ahmed
// '${context.translation.code}: ${request.code}'.bodyText(context),
'${context.translation.taskNo}: ${requestData!.requestNo}'.bodyText(context),
16.height,
8.height,
Row(
mainAxisSize: MainAxisSize.min,
children: [
@ -103,7 +103,7 @@ class RecurrentWoItemView extends StatelessWidget {
'${context.translation.site}: ${requestDetails!.site}'.bodyText(context),
// '${context.translation.code}: ${request.code}'.bodyText(context),
'${context.translation.taskNo}: ${requestDetails!.requestNo}'.bodyText(context),
16.height,
8.height,
Row(
mainAxisSize: MainAxisSize.min,
children: [

11
lib/new_views/pages/land_page/requests/request_paginated_listview.dart
Unescape Escape View File

@ -7,6 +7,8 @@ import 'package:test_sa/new_views/pages/land_page/requests/gas_refill_item_view.
import 'package:test_sa/new_views/pages/land_page/requests/ppm_item_view.dart';
import 'package:test_sa/new_views/pages/land_page/requests/recurrent_wo_item_view.dart';
import 'package:test_sa/new_views/pages/land_page/requests/service_request_item_view.dart';
import 'package:test_sa/views/pages/user/tasks_request/task_request_detail_view.dart';
import 'package:test_sa/views/pages/user/tasks_request/task_request_item_view.dart';
class RequestPaginatedListview extends StatelessWidget {
final List<Data> list;
@ -18,7 +20,6 @@ class RequestPaginatedListview extends StatelessWidget {
@override
Widget build(BuildContext context) {
return ListView.separated(
itemCount: list.length < totalCount ? list.length + 1 : list.length,
controller: scrollController,
@ -50,12 +51,10 @@ class RequestPaginatedListview extends StatelessWidget {
bool isAssetTransfer = request.transactionNo == 3;
bool isPPMs = request.transactionNo == 4;
bool isRecurrentTask = request.transactionNo == 5;
bool isTask = request.transactionNo == 6;
if (isServiceRequest) {
return ServiceRequestItemView(
requestData: request,
refreshData: false,
);
return ServiceRequestItemView(requestData: request, refreshData: false);
} else if (isGasRefill) {
return GasRefillItemView(requestData: request);
} else if (isPPMs) {
@ -64,6 +63,8 @@ class RequestPaginatedListview extends StatelessWidget {
return DeviceItemView(requestData: request);
} else if (isRecurrentTask) {
return RecurrentWoItemView(requestData: request);
} else if (isTask) {
return TaskRequestItemView(requestData: request);
} else {
return Container(
height: 100,

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

@ -111,8 +111,12 @@ class _DeviceTransferDetailsState extends State<DeviceTransferDetails> {
_buildTextWidget(_model!.comment!),
],
if (_attachments.isNotEmpty) ...[
8.height,
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(),
]

4
lib/views/pages/user/tasks_request/task_request_detail_view.dart
Unescape Escape View File

@ -106,8 +106,8 @@ class _TaskRequestDetailsViewState extends State<TaskRequestDetailsView> {
"Task Details".addTranslation,
style: AppTextStyles.heading4.copyWith(color: context.isDark ? AppColor.neutral30 : AppColor.neutral50),
),
'${context.translation.taskType}: ${widget.requestDetails?.nameOfType ?? "-"}'.bodyText(context),
'${context.translation.taskNo}: ${widget.requestDetails?.requestNo ?? "-"}'.bodyText(context),
'${context.translation.taskType}: ${taskModel?.taskType?.typeName ?? "-"}'.bodyText(context),
'${context.translation.taskNo}: ${taskModel?.taskJobNo ?? "-"}'.bodyText(context),
if (taskProvider.taskRequestModel?.taskType?.isRecallAndAlert == true) ...[
recallAlertTypeWidget(taskModel: taskProvider.taskRequestModel!),
Column(

4
lib/views/pages/user/tasks_request/task_request_item_view.dart
Unescape Escape View File

@ -55,7 +55,7 @@ class TaskRequestItemView extends StatelessWidget {
infoWidget(label: context.translation.requestNo, value: requestData?.requestNo, context: context),
infoWidget(label: context.translation.assetName, value: requestData?.assetName, context: context),
infoWidget(label: context.translation.assetNo, value: requestData?.assetNumber, context: context),
12.height,
8.height,
Row(
mainAxisSize: MainAxisSize.min,
children: [
@ -109,7 +109,7 @@ class TaskRequestItemView extends StatelessWidget {
infoWidget(label: context.translation.assetNo, value: requestDetails!.assetNo, context: context),
infoWidget(label: context.translation.assetSN, value: requestDetails!.assetSN, context: context),
infoWidget(label: context.translation.site, value: requestDetails!.site, context: context),
12.height,
8.height,
Row(
mainAxisSize: MainAxisSize.min,
children: [

Write Preview
Loading…
Cancel
Save