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

added missing information on task detail page and also added value for task on dashboard list

Browse Source
design_3.0_task_module_new
WaseemAbbasi22 6 months ago
parent 71a0ead92c
commit cf30e72926
3 changed files with 110 additions and 38 deletions
Show Stats Download Patch File Download Diff File

64
lib/dashboard_latest/widgets/request_category_list.dart
Unescape Escape View File

@ -8,6 +8,7 @@ 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_item_view.dart';
class RequestCategoryList extends StatelessWidget {
final List<Data> list;
@ -34,28 +35,49 @@ class RequestCategoryList extends StatelessWidget {
}
Widget _buildRequestItem(Data request) {
bool isServiceRequest = request.transactionNo == 1;
bool isGasRefill = request.transactionNo == 2;
bool isAssetTransfer = request.transactionNo == 3;
bool isPPMs = request.transactionNo == 4;
bool isRecurrentTask = request.transactionNo == 5;
if (isServiceRequest) {
return ServiceRequestItemView(requestData: request);
} else if (isGasRefill) {
return GasRefillItemView(requestData: request);
} else if (isPPMs) {
// bool isServiceRequest = request.transactionNo == 1;
// bool isGasRefill = request.transactionNo == 2;
// bool isAssetTransfer = request.transactionNo == 3;
// bool isPPMs = request.transactionNo == 4;
// bool isRecurrentTask = request.transactionNo == 5;
switch(request.transactionNo){
case 1:
return ServiceRequestItemView(requestData: request);
case 2:
return GasRefillItemView(requestData: request);
case 3:
return AssetItemView(requestData: request);
case 4:
return PpmItemView(requestData: request);
} else if (isAssetTransfer) {
return AssetItemView(requestData: request);
} else if (isRecurrentTask) {
return RecurrentWoItemView(requestData: request);
} else {
return Container(
height: 100,
width: double.infinity,
color: Colors.grey,
);
case 5:
return RecurrentWoItemView(requestData: request);
case 6:
return TaskRequestItemView(requestData: request,);
default:
return Container(
height: 100,
width: double.infinity,
color: Colors.grey,
);
}
// if (isServiceRequest) {
// return ServiceRequestItemView(requestData: request);
// } else if (isGasRefill) {
// return GasRefillItemView(requestData: request);
// } else if (isPPMs) {
// return PpmItemView(requestData: request);
// } else if (isAssetTransfer) {
// return AssetItemView(requestData: request);
// } else if (isRecurrentTask) {
// return RecurrentWoItemView(requestData: request);
// } else {
// return Container(
// height: 100,
// width: double.infinity,
// color: Colors.grey,
// );
// }
}
}

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

@ -94,15 +94,14 @@ class _TaskRequestDetailsViewState extends State<TaskRequestDetailsView> {
],
),
8.height,
if (taskProvider.taskRequestModel?.taskType?.isInstallation == true) ...[installationWidget(taskModel: taskProvider.taskRequestModel!)],
if (taskProvider.taskRequestModel?.taskType?.isRecallAndAlert == true) ...[
assetDetails(taskModel: taskProvider.taskRequestModel!),
if (taskProvider.taskRequestModel?.taskType?.relatedTo?.value == 1) ...[
assetDetails(taskModel: taskProvider.taskRequestModel!),
],
if (taskProvider.taskRequestModel?.taskType?.isInstallation == true) ...[installationWidget(taskModel: taskProvider.taskRequestModel!)],
if (taskProvider.taskRequestModel?.taskType?.relatedTo?.value == 2) ...[
linkWithLocationWidget(taskModel: taskProvider.taskRequestModel!),
],
8.height,
const Divider().defaultStyle(context),
Text(
"Task Details".addTranslation,
style: AppTextStyles.heading4.copyWith(color: context.isDark ? AppColor.neutral30 : AppColor.neutral50),
@ -111,8 +110,14 @@ class _TaskRequestDetailsViewState extends State<TaskRequestDetailsView> {
'${context.translation.taskNo}: ${widget.requestDetails?.requestNo ?? "-"}'.bodyText(context),
if (taskProvider.taskRequestModel?.taskType?.isRecallAndAlert == true) ...[
recallAlertTypeWidget(taskModel: taskProvider.taskRequestModel!),
Column(
crossAxisAlignment: CrossAxisAlignment.start,
children: [
'Risk Level: ${taskProvider.taskRequestModel?.riskLevel?.name}'.bodyText(context),
'Resource: ${taskProvider.taskRequestModel?.resource?.name}'.bodyText(context)
],
),
],
if (taskProvider.taskRequestModel?.callComment != null) ...[
const Divider().defaultStyle(context),
Text(
@ -150,8 +155,7 @@ class _TaskRequestDetailsViewState extends State<TaskRequestDetailsView> {
return Column(
crossAxisAlignment: CrossAxisAlignment.start,
children: [
assetDetails(taskModel: taskModel),
const Divider().defaultStyle(context),
const Divider().defaultStyle(context),
Text(
"Site Details".addTranslation,
style: AppTextStyles.heading4.copyWith(color: context.isDark ? AppColor.neutral30 : AppColor.neutral50),
@ -188,7 +192,7 @@ class _TaskRequestDetailsViewState extends State<TaskRequestDetailsView> {
),
'${context.translation.site}: ${taskModel.site?.name ?? "-"}'.bodyText(context),
'${context.translation.building}: ${taskModel.building?.name ?? "-"}'.bodyText(context),
'${context.translation.floor}: ${taskModel.floor?.name?? "-"}'.bodyText(context),
'${context.translation.floor}: ${taskModel.floor?.name ?? "-"}'.bodyText(context),
'${context.translation.department}: ${taskModel.department?.name ?? "-"}'.bodyText(context),
'${context.translation.room}: ${taskModel.room?.name ?? "-"}'.bodyText(context),
],
@ -218,14 +222,7 @@ class _TaskRequestDetailsViewState extends State<TaskRequestDetailsView> {
if (taskModel.typeOfAlert != null) {
switch (taskModel.typeOfAlert!.value) {
case 1:
return Column(
mainAxisSize: MainAxisSize.min,
crossAxisAlignment: CrossAxisAlignment.start,
children: [
'${context.translation.acknowledge}: ${taskModel.isUserAcknowledge ?? "-"}'.bodyText(context),
'Risk Level: ${taskModel.riskLevel?.name}'.bodyText(context),
'Resource: ${taskModel.resource?.name}'.bodyText(context)],
);
return '${context.translation.acknowledge}: ${taskModel.isUserAcknowledge ?? "-"}'.bodyText(context);
case 2:
return Column(
mainAxisSize: MainAxisSize.min,

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

@ -6,6 +6,7 @@ import 'package:test_sa/extensions/text_extensions.dart';
import 'package:test_sa/extensions/widget_extensions.dart';
import 'package:test_sa/models/all_requests_and_count_model.dart';
import 'package:test_sa/models/device/asset_transfer.dart';
import 'package:test_sa/models/lookup.dart';
import 'package:test_sa/models/new_models/dashboard_detail.dart';
import 'package:test_sa/models/plan_preventive_visit/plan_preventive_visit_model.dart';
import 'package:test_sa/new_views/app_style/app_color.dart';
@ -23,6 +24,58 @@ class TaskRequestItemView extends StatelessWidget {
@override
Widget build(BuildContext context) {
if (requestData != null) {
return Column(
crossAxisAlignment: CrossAxisAlignment.start,
children: [
Row(
crossAxisAlignment: CrossAxisAlignment.start,
children: [
StatusLabel(
label: requestData!.priorityName!,
textColor: AppColor.getRequestStatusTextColorByName(context, requestData!.priorityName!),
backgroundColor: AppColor.getRequestStatusColorByName(context, requestData!.priorityName!),
),
8.width,
StatusLabel(
label: requestData!.statusName!,
textColor: AppColor.getRequestStatusTextColorByName(context, requestData!.statusName!),
backgroundColor: AppColor.getRequestStatusColorByName(context, requestData!.statusName!),
),
1.width.expanded,
Text(
requestData!.transactionDate?.toServiceRequestCardFormat ?? "",
textAlign: TextAlign.end,
style: AppTextStyles.tinyFont.copyWith(color: context.isDark ? AppColor.neutral10 : AppColor.neutral50),
),
],
),
8.height,
(requestData?.typeTransaction ?? context.translation.taskRequest).heading5(context),
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,
Row(
mainAxisSize: MainAxisSize.min,
children: [
Text(
context.translation.viewDetails,
style: AppTextStyles.bodyText.copyWith(color: AppColor.blueStatus(context)),
),
4.width,
Icon(Icons.arrow_forward, color: AppColor.blueStatus(context), size: 14)
],
),
],
).toShadowContainer(context, withShadow: showShadow).onPress(() async {
Navigator.of(context).push(MaterialPageRoute(
builder: (_) => TaskRequestDetailsView(
taskId: requestData!.id!,
requestDetails: RequestsDetails(nameOfType: requestData?.nameOfType, status: requestData?.statusName, priority: requestData?.priorityName, date: requestData?.transactionDate),
)));
});
}
return Column(
crossAxisAlignment: CrossAxisAlignment.start,
children: [

Write Preview
Loading…
Cancel
Save