requests improvements

design_3.0_internal_audit_module
Sikander Saleem 1 year ago
parent b76a0bc53a
commit a55ef11780

@ -44,7 +44,7 @@ class RequestCategoryList extends StatelessWidget {
bool isPPMs = request.transactionNo == 4; bool isPPMs = request.transactionNo == 4;
if (isServiceRequest) { if (isServiceRequest) {
return ServiceRequestItemView(request); return ServiceRequestItemView(requestData: request);
// } else if (isGasRefill) { // } else if (isGasRefill) {
// return GasRefillItemView(request); // return GasRefillItemView(request);
// } else if (isPPMs) { // } else if (isPPMs) {

@ -135,7 +135,7 @@ class _LandPageState extends State<LandPage> {
selectedIndex: currentPageIndex, selectedIndex: currentPageIndex,
onPressed: (index) { onPressed: (index) {
bool isEngineer = _userProvider!.user!.type == UsersTypes.engineer; bool isEngineer = _userProvider!.user!.type == UsersTypes.engineer;
if(!isEngineer&&index==2){ if(!isEngineer&&index==2) {
Navigator.push(context, MaterialPageRoute(builder: (context)=>const CreateNewRequest())); Navigator.push(context, MaterialPageRoute(builder: (context)=>const CreateNewRequest()));
} }
if (index == (!isEngineer ? 4 : 3)) { if (index == (!isEngineer ? 4 : 3)) {

@ -13,13 +13,16 @@ import '../../../../views/widgets/requests/request_status.dart';
import '../../../app_style/app_color.dart'; import '../../../app_style/app_color.dart';
class AssetItemView extends StatelessWidget { class AssetItemView extends StatelessWidget {
final Data request; final Data? requestData;
final RequestsDetails? requestDetails;
final bool showShadow; final bool showShadow;
const AssetItemView(this.request, {Key? key, this.showShadow = true}) : super(key: key); const AssetItemView({Key? key, this.requestData, this.requestDetails, this.showShadow = true}) : super(key: key);
@override @override
Widget build(BuildContext context) { Widget build(BuildContext context) {
if (requestData!=null) {
return Column( return Column(
// mainAxisAlignment: MainAxisAlignment.spaceBetween, // mainAxisAlignment: MainAxisAlignment.spaceBetween,
crossAxisAlignment: CrossAxisAlignment.start, crossAxisAlignment: CrossAxisAlignment.start,
@ -27,11 +30,11 @@ class AssetItemView extends StatelessWidget {
Row( Row(
crossAxisAlignment: CrossAxisAlignment.start, crossAxisAlignment: CrossAxisAlignment.start,
children: [ children: [
if (request.priorityName != null) if (requestData!.priorityName != null)
StatusLabel( StatusLabel(
label: request.priorityName ?? "", label: requestData!.priorityName ?? "",
textColor: AppColor.getRequestStatusTextColorByName(context, request.priorityName!), textColor: AppColor.getRequestStatusTextColorByName(context, requestData!.priorityName!),
backgroundColor: AppColor.getRequestStatusColorByName(context, request.priorityName!), backgroundColor: AppColor.getRequestStatusColorByName(context, requestData!.priorityName!),
), ),
// 8.width, // 8.width,
// if (request.status != null) // if (request.status != null)
@ -41,7 +44,8 @@ class AssetItemView extends StatelessWidget {
// backgroundColor: AppColor.getRequestStatusColorByName(context, request.status), // backgroundColor: AppColor.getRequestStatusColorByName(context, request.status),
// ), // ),
1.width.expanded, 1.width.expanded,
Text(request.transactionDate?.toServiceRequestCardFormat ?? "", textAlign: TextAlign.end, style: AppTextStyles.tinyFont.copyWith(color: context.isDark ? AppColor.neutral10 : AppColor.neutral50)), Text(requestData!.transactionDate?.toServiceRequestCardFormat ?? "",
textAlign: TextAlign.end, style: AppTextStyles.tinyFont.copyWith(color: context.isDark ? AppColor.neutral10 : AppColor.neutral50)),
], ],
), ),
8.height, 8.height,
@ -52,8 +56,66 @@ class AssetItemView extends StatelessWidget {
context.translation.deviceTransferRequest.heading5(context), 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
request.statusName!.replaceAll("=", ":").bodyText(context), requestData!.statusName!.replaceAll("=", ":").bodyText(context),
'${context.translation.requestNo}: ${request.requestNo}'.bodyText(context), '${context.translation.requestNo}: ${requestData!.requestNo}'.bodyText(context),
],
),
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, showShadow: showShadow).onPress(() {
Navigator.of(context).push(MaterialPageRoute(builder: (_) => DeviceTransferDetails(model: AssetTransfer(id: requestData!.id!))));
});
}
if(requestDetails!=null) {
return Column(
// mainAxisAlignment: MainAxisAlignment.spaceBetween,
crossAxisAlignment: CrossAxisAlignment.start,
children: [
Row(
crossAxisAlignment: CrossAxisAlignment.start,
children: [
if (requestDetails!.priority != null)
StatusLabel(
label: requestDetails!.priority ?? "",
textColor: AppColor.getRequestStatusTextColorByName(context, requestDetails!.priority!),
backgroundColor: AppColor.getRequestStatusColorByName(context, requestDetails!.priority!),
),
// 8.width,
// if (request.status != null)
// StatusLabel(
// label: request.status ?? "",
// textColor: AppColor.getRequestStatusTextColorByName(context, request.status),
// backgroundColor: AppColor.getRequestStatusColorByName(context, request.status),
// ),
1.width.expanded,
Text(requestDetails!.date?.toServiceRequestCardFormat ?? "", textAlign: TextAlign.end, style: AppTextStyles.tinyFont.copyWith(color: context.isDark ? AppColor.neutral10 : AppColor.neutral50)),
],
),
8.height,
Column(
crossAxisAlignment: CrossAxisAlignment.start,
mainAxisSize: MainAxisSize.min,
children: [
context.translation.deviceTransferRequest.heading5(context),
"${context.translation.from} : ${requestDetails!.siteTransferFrom?.cleanupWhitespace?.capitalizeFirstOfEach}".bodyText(context),
"${context.translation.to} : ${requestDetails!.siteTransferTo?.cleanupWhitespace?.capitalizeFirstOfEach}".bodyText(context),
requestDetails!.status!.replaceAll("=", ":").bodyText(context),
'${context.translation.requestNo}: ${requestDetails!.requestNo}'.bodyText(context),
], ],
), ),
Row( Row(
@ -73,7 +135,10 @@ 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!)))); Navigator.of(context).push(MaterialPageRoute(builder: (_) => DeviceTransferDetails(model: AssetTransfer(id: requestDetails!.id!))));
}); });
} }
return SizedBox();
}
} }

@ -13,13 +13,15 @@ import '../../../../views/widgets/requests/request_status.dart';
import '../../../app_style/app_color.dart'; import '../../../app_style/app_color.dart';
class GasRefillItemView extends StatelessWidget { class GasRefillItemView extends StatelessWidget {
final Data request; final Data? requestData;
final RequestsDetails? requestDetails;
final bool showShadow; final bool showShadow;
const GasRefillItemView(this.request, {Key? key, this.showShadow = true}) : super(key: key); const GasRefillItemView({Key? key, this.requestDetails, this.requestData, this.showShadow = true}) : super(key: key);
@override @override
Widget build(BuildContext context) { Widget build(BuildContext context) {
if(requestData!=null) {
return Column( return Column(
crossAxisAlignment: CrossAxisAlignment.start, crossAxisAlignment: CrossAxisAlignment.start,
children: [ children: [
@ -27,25 +29,26 @@ class GasRefillItemView extends StatelessWidget {
crossAxisAlignment: CrossAxisAlignment.start, crossAxisAlignment: CrossAxisAlignment.start,
children: [ children: [
StatusLabel( StatusLabel(
label: request.priorityName!, label: requestData!.priorityName!,
textColor: AppColor.getRequestStatusTextColorByName(context, request.priorityName!), textColor: AppColor.getRequestStatusTextColorByName(context, requestData!.priorityName!),
backgroundColor: AppColor.getRequestStatusColorByName(context, request.priorityName!), backgroundColor: AppColor.getRequestStatusColorByName(context, requestData!.priorityName!),
), ),
8.width, 8.width,
StatusLabel( StatusLabel(
label: request.statusName!, label: requestData!.statusName!,
textColor: AppColor.getRequestStatusTextColorByName(context, request.statusName!), textColor: AppColor.getRequestStatusTextColorByName(context, requestData!.statusName!),
backgroundColor: AppColor.getRequestStatusColorByName(context, request.statusName!), backgroundColor: AppColor.getRequestStatusColorByName(context, requestData!.statusName!),
), ),
1.width.expanded, 1.width.expanded,
Text(request.transactionDate?.toServiceRequestCardFormat ?? "", textAlign: TextAlign.end, style: AppTextStyles.tinyFont.copyWith(color: context.isDark ? AppColor.neutral10 : AppColor.neutral50)), Text(requestData!.transactionDate?.toServiceRequestCardFormat ?? "",
textAlign: TextAlign.end, style: AppTextStyles.tinyFont.copyWith(color: context.isDark ? AppColor.neutral10 : AppColor.neutral50)),
], ],
), ),
8.height, 8.height,
context.translation.gasRefillRequest.heading5(context), context.translation.gasRefillRequest.heading5(context),
// '${context.translation.gasType}: ${request.gasType}'.bodyText(context), // todo ask ahmed // '${context.translation.gasType}: ${request.gasType}'.bodyText(context), // todo ask ahmed
// '${context.translation.site}: ${request.site?.cleanupWhitespace.capitalizeFirstOfEach}'.bodyText(context),// todo ask ahmed // '${context.translation.site}: ${request.site?.cleanupWhitespace.capitalizeFirstOfEach}'.bodyText(context),// todo ask ahmed
'${context.translation.requestNo}: ${request.requestNo}'.bodyText(context), '${context.translation.requestNo}: ${requestData!.requestNo}'.bodyText(context),
8.height, 8.height,
Row( Row(
mainAxisSize: MainAxisSize.min, mainAxisSize: MainAxisSize.min,
@ -69,12 +72,74 @@ class GasRefillItemView extends StatelessWidget {
Navigator.of(context).push( Navigator.of(context).push(
MaterialPageRoute( MaterialPageRoute(
builder: (_) => GasRefillDetailsPage( builder: (_) => GasRefillDetailsPage(
priority: request.priorityName, priority: requestData!.priorityName,
date: request.transactionDate!, date: requestData!.transactionDate!,
model: GasRefillModel(id: request.id), model: GasRefillModel(id: requestData!.id),
), ),
), ),
); );
}); });
} }
if(requestDetails!=null) {
return Column(
crossAxisAlignment: CrossAxisAlignment.start,
children: [
Row(
crossAxisAlignment: CrossAxisAlignment.start,
children: [
StatusLabel(
label: requestDetails!.priority!,
textColor: AppColor.getRequestStatusTextColorByName(context, requestDetails!.priority!),
backgroundColor: AppColor.getRequestStatusColorByName(context, requestDetails!.priority!),
),
8.width,
StatusLabel(
label: requestDetails!.status!,
textColor: AppColor.getRequestStatusTextColorByName(context, requestDetails!.status!),
backgroundColor: AppColor.getRequestStatusColorByName(context, requestDetails!.status!),
),
1.width.expanded,
Text(requestDetails!.date?.toServiceRequestCardFormat ?? "", textAlign: TextAlign.end, style: AppTextStyles.tinyFont.copyWith(color: context.isDark ? AppColor.neutral10 : AppColor.neutral50)),
],
),
8.height,
context.translation.gasRefillRequest.heading5(context),
'${context.translation.gasType}: ${requestDetails!.gasType}'.bodyText(context),
'${context.translation.site}: ${requestDetails!.site?.cleanupWhitespace?.capitalizeFirstOfEach}'.bodyText(context),
'${context.translation.requestNo}: ${requestDetails!.requestNo}'.bodyText(context),
8.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, showShadow: showShadow).onPress(() {
Navigator.of(context).push(
MaterialPageRoute(
builder: (_) => GasRefillDetailsPage(
priority: requestDetails!.priority!,
date: requestDetails!.date,
model: GasRefillModel(id: requestDetails!.id),
),
),
);
});
}
return SizedBox();
}
} }

@ -12,13 +12,16 @@ import '../../../../views/pages/user/ppm/ppm_details_page.dart';
import '../../../../views/widgets/requests/request_status.dart'; import '../../../../views/widgets/requests/request_status.dart';
class PpmItemView extends StatelessWidget { class PpmItemView extends StatelessWidget {
final Data request; final Data? requestData;
final RequestsDetails? requestDetails;
final bool showShadow; final bool showShadow;
const PpmItemView(this.request, {Key? key, this.showShadow = true}) : super(key: key); const PpmItemView( {Key? key,this.requestData,this.requestDetails, this.showShadow = true}) : super(key: key);
@override @override
Widget build(BuildContext context) { Widget build(BuildContext context) {
if(requestData!=null) {
return Column( return Column(
crossAxisAlignment: CrossAxisAlignment.start, crossAxisAlignment: CrossAxisAlignment.start,
children: [ children: [
@ -26,19 +29,19 @@ class PpmItemView extends StatelessWidget {
crossAxisAlignment: CrossAxisAlignment.start, crossAxisAlignment: CrossAxisAlignment.start,
children: [ children: [
StatusLabel( StatusLabel(
label: request.priorityName!, label: requestData!.priorityName!,
textColor: AppColor.getRequestStatusTextColorByName(context, request.priorityName!), textColor: AppColor.getRequestStatusTextColorByName(context, requestData!.priorityName!),
backgroundColor: AppColor.getRequestStatusColorByName(context, request.priorityName!), backgroundColor: AppColor.getRequestStatusColorByName(context, requestData!.priorityName!),
), ),
8.width, 8.width,
StatusLabel( StatusLabel(
label: request.statusName!, label: requestData!.statusName!,
textColor: AppColor.getRequestStatusTextColorByName(context, request.statusName!), textColor: AppColor.getRequestStatusTextColorByName(context, requestData!.statusName!),
backgroundColor: AppColor.getRequestStatusColorByName(context, request.statusName!), backgroundColor: AppColor.getRequestStatusColorByName(context, requestData!.statusName!),
), ),
1.width.expanded, 1.width.expanded,
Text( Text(
request.transactionDate?.toServiceRequestCardFormat ?? "", requestData!.transactionDate?.toServiceRequestCardFormat ?? "",
textAlign: TextAlign.end, textAlign: TextAlign.end,
style: AppTextStyles.tinyFont.copyWith(color: context.isDark ? AppColor.neutral10 : AppColor.neutral50), style: AppTextStyles.tinyFont.copyWith(color: context.isDark ? AppColor.neutral10 : AppColor.neutral50),
), ),
@ -47,10 +50,60 @@ class PpmItemView extends StatelessWidget {
8.height, 8.height,
context.translation.ppmRequest.heading5(context), context.translation.ppmRequest.heading5(context),
8.height, 8.height,
'${context.translation.assetNumber}: ${request.assetNumber}'.bodyText(context), '${context.translation.assetNumber}: ${requestData!.assetNumber}'.bodyText(context),
// '${context.translation.assetSN}: ${request.assetSN}'.bodyText(context),//todo ask ahmed // '${context.translation.assetSN}: ${request.assetSN}'.bodyText(context),//todo ask ahmed
// '${context.translation.code}: ${request.code}'.bodyText(context), // '${context.translation.code}: ${request.code}'.bodyText(context),
'${context.translation.requestNo}: ${request.requestNo}'.bodyText(context), '${context.translation.requestNo}: ${requestData!.requestNo}'.bodyText(context),
16.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, showShadow: showShadow).onPress(() {
// Navigator.of(context).push(MaterialPageRoute(builder: (_) => PpmDetailsPage(request: request)));
});
}
if(requestDetails!=null) {
return Column(
crossAxisAlignment: CrossAxisAlignment.start,
children: [
Row(
crossAxisAlignment: CrossAxisAlignment.start,
children: [
StatusLabel(
label: requestDetails!.priority!,
textColor: AppColor.getRequestStatusTextColorByName(context, requestDetails!.priority!),
backgroundColor: AppColor.getRequestStatusColorByName(context, requestDetails!.priority!),
),
8.width,
StatusLabel(
label: requestDetails!.status!,
textColor: AppColor.getRequestStatusTextColorByName(context, requestDetails!.status!),
backgroundColor: AppColor.getRequestStatusColorByName(context, requestDetails!.status!),
),
1.width.expanded,
Text(
requestDetails!.date?.toServiceRequestCardFormat ?? "",
textAlign: TextAlign.end,
style: AppTextStyles.tinyFont.copyWith(color: context.isDark ? AppColor.neutral10 : AppColor.neutral50),
),
],
),
8.height,
context.translation.ppmRequest.heading5(context),
8.height,
'${context.translation.assetNumber}: ${requestDetails!.assetNo}'.bodyText(context),
'${context.translation.assetSN}: ${requestDetails!.assetSN}'.bodyText(context),
// '${context.translation.code}: ${request.code}'.bodyText(context),
'${context.translation.requestNo}: ${requestDetails!.requestNo}'.bodyText(context),
16.height, 16.height,
Row( Row(
mainAxisSize: MainAxisSize.min, mainAxisSize: MainAxisSize.min,
@ -65,7 +118,11 @@ class PpmItemView extends StatelessWidget {
), ),
], ],
).toShadowContainer(context, showShadow: showShadow).onPress(() { ).toShadowContainer(context, showShadow: showShadow).onPress(() {
//Navigator.of(context).push(MaterialPageRoute(builder: (_) => PpmDetailsPage(request: request))); Navigator.of(context).push(MaterialPageRoute(builder: (_) => PpmDetailsPage(request: requestDetails!)));
}); });
} }
return SizedBox();
}
} }

@ -1,6 +1,5 @@
import 'package:flutter/material.dart'; import 'package:flutter/material.dart';
import 'package:test_sa/extensions/int_extensions.dart'; import 'package:test_sa/extensions/int_extensions.dart';
import 'package:test_sa/models/all_requests_and_count_model.dart';
import 'package:test_sa/models/new_models/dashboard_detail.dart'; import 'package:test_sa/models/new_models/dashboard_detail.dart';
import 'package:test_sa/new_views/app_style/app_color.dart'; import 'package:test_sa/new_views/app_style/app_color.dart';
import 'package:test_sa/new_views/pages/land_page/requests/asset_item_view.dart'; import 'package:test_sa/new_views/pages/land_page/requests/asset_item_view.dart';
@ -50,13 +49,13 @@ class RequestPaginatedListview extends StatelessWidget {
bool isPPMs = request.transactionNo == 4; bool isPPMs = request.transactionNo == 4;
if (isServiceRequest) { if (isServiceRequest) {
return ServiceRequestItemView(request); return ServiceRequestItemView(requestData: request);
} else if (isGasRefill) { } else if (isGasRefill) {
return GasRefillItemView(request); return GasRefillItemView(requestData: request);
} else if (isPPMs) { } else if (isPPMs) {
return PpmItemView(request); return PpmItemView(requestData: request);
} else if (isAssetTransfer) { } else if (isAssetTransfer) {
return AssetItemView(request); return AssetItemView(requestData: request);
} else { } else {
return Container( return Container(
height: 100, height: 100,

@ -5,6 +5,7 @@ import 'package:test_sa/extensions/int_extensions.dart';
import 'package:test_sa/extensions/string_extensions.dart'; import 'package:test_sa/extensions/string_extensions.dart';
import 'package:test_sa/extensions/text_extensions.dart'; import 'package:test_sa/extensions/text_extensions.dart';
import 'package:test_sa/extensions/widget_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/new_models/dashboard_detail.dart'; import 'package:test_sa/models/new_models/dashboard_detail.dart';
import 'package:test_sa/service_request_latest/views/request_detail_main_view.dart'; import 'package:test_sa/service_request_latest/views/request_detail_main_view.dart';
@ -12,13 +13,15 @@ import '../../../../views/widgets/requests/request_status.dart';
import '../../../app_style/app_color.dart'; import '../../../app_style/app_color.dart';
class ServiceRequestItemView extends StatelessWidget { class ServiceRequestItemView extends StatelessWidget {
final Data request; final Data? requestData;
final RequestsDetails? requestDetails;
final bool showShadow; final bool showShadow;
const ServiceRequestItemView(this.request, {Key? key, this.showShadow = true}) : super(key: key); const ServiceRequestItemView({Key? key, this.requestData, this.requestDetails, this.showShadow = true}) : super(key: key);
@override @override
Widget build(BuildContext context) { Widget build(BuildContext context) {
if (requestData != null) {
return Column( return Column(
mainAxisSize: MainAxisSize.min, mainAxisSize: MainAxisSize.min,
crossAxisAlignment: CrossAxisAlignment.start, crossAxisAlignment: CrossAxisAlignment.start,
@ -27,27 +30,27 @@ class ServiceRequestItemView extends StatelessWidget {
crossAxisAlignment: CrossAxisAlignment.start, crossAxisAlignment: CrossAxisAlignment.start,
children: [ children: [
StatusLabel( StatusLabel(
label: request.priorityName!, label: requestData!.priorityName!,
textColor: AppColor.getRequestStatusTextColorByName(context, request.priorityName!), textColor: AppColor.getRequestStatusTextColorByName(context, requestData!.priorityName!),
backgroundColor: AppColor.getRequestStatusColorByName(context, request.priorityName!), backgroundColor: AppColor.getRequestStatusColorByName(context, requestData!.priorityName!),
), ),
8.width, 8.width,
StatusLabel( StatusLabel(
label: request.statusName!, label: requestData!.statusName!,
textColor: AppColor.getRequestStatusTextColorByName(context, request.statusName!), textColor: AppColor.getRequestStatusTextColorByName(context, requestData!.statusName!),
backgroundColor: AppColor.getRequestStatusColorByName(context, request.statusName!), backgroundColor: AppColor.getRequestStatusColorByName(context, requestData!.statusName!),
), ),
1.width.expanded, 1.width.expanded,
Text(request.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)),
], ],
), ),
8.height, 8.height,
context.translation.serviceRequest.heading5(context), context.translation.serviceRequest.heading5(context),
'${context.translation.assetName}: ${request.assetName?.cleanupWhitespace.capitalizeFirstOfEach}'.bodyText(context), '${context.translation.assetName}: ${requestData!.assetName?.cleanupWhitespace.capitalizeFirstOfEach}'.bodyText(context),
// '${context.translation.assetNumber}: ${request.assetNo}'.bodyText(context), // '${context.translation.assetNumber}: ${request.assetNo}'.bodyText(context),
'${context.translation.requestType}: ${request.requestTypeName}'.bodyText(context), '${context.translation.requestType}: ${requestData!.requestTypeName}'.bodyText(context),
'${context.translation.requestNo}: ${request.requestNo}'.bodyText(context), '${context.translation.requestNo}: ${requestData!.requestNo}'.bodyText(context),
8.height, 8.height,
Row( Row(
// mainAxisSize: MainAxisSize.min, // mainAxisSize: MainAxisSize.min,
@ -67,11 +70,61 @@ class ServiceRequestItemView extends StatelessWidget {
), ),
], ],
).toShadowContainer(context, showShadow: showShadow).onPress(() { ).toShadowContainer(context, showShadow: showShadow).onPress(() {
//Older code... Navigator.of(context).push(MaterialPageRoute(builder: (_) => RequestDetailMain(requestId: requestData!.id!)));
print('request id i got is ${request.id!}');
Navigator.of(context).push(MaterialPageRoute(builder: (_) => RequestDetailMain(requestId: request.id!)));
// Navigator.of(context).push(MaterialPageRoute(
// builder: (_) => const HistoryLogView()));
}); });
} }
if (requestDetails != null) {
return Column(
mainAxisSize: MainAxisSize.min,
crossAxisAlignment: CrossAxisAlignment.start,
children: [
Row(
crossAxisAlignment: CrossAxisAlignment.start,
children: [
StatusLabel(
label: requestDetails!.priority,
textColor: AppColor.getRequestStatusTextColorByName(context, requestDetails!.priority),
backgroundColor: AppColor.getRequestStatusColorByName(context, requestDetails!.priority),
),
8.width,
StatusLabel(
label: requestDetails!.status,
textColor: AppColor.getRequestStatusTextColorByName(context, requestDetails!.status),
backgroundColor: AppColor.getRequestStatusColorByName(context, requestDetails!.status),
),
1.width.expanded,
Text(requestDetails!.date!.toServiceRequestCardFormat, textAlign: TextAlign.end, style: AppTextStyles.tinyFont.copyWith(color: context.isDark ? AppColor.neutral10 : AppColor.neutral50)),
],
),
8.height,
context.translation.serviceRequest.heading5(context),
'${context.translation.assetName}: ${requestDetails!.assetName?.cleanupWhitespace?.capitalizeFirstOfEach}'.bodyText(context),
'${context.translation.assetNumber}: ${requestDetails!.assetNo}'.bodyText(context),
'${context.translation.requestType}: ${requestDetails!.requestType}'.bodyText(context),
'${context.translation.requestNo}: ${requestDetails!.requestNo}'.bodyText(context),
8.height,
Row(
// mainAxisSize: MainAxisSize.min,
mainAxisAlignment: MainAxisAlignment.spaceBetween,
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, showShadow: showShadow).onPress(() {
Navigator.of(context).push(MaterialPageRoute(builder: (_) => RequestDetailMain(requestId: requestDetails!.id!)));
});
}
return SizedBox();
}
} }

@ -4,6 +4,10 @@ import 'package:test_sa/extensions/context_extension.dart';
import 'package:test_sa/extensions/int_extensions.dart'; import 'package:test_sa/extensions/int_extensions.dart';
import 'package:test_sa/extensions/widget_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/all_requests_and_count_model.dart';
import 'package:test_sa/new_views/pages/land_page/requests/asset_item_view.dart';
import 'package:test_sa/new_views/pages/land_page/requests/gas_refill_item_view.dart';
import 'package:test_sa/new_views/pages/land_page/requests/ppm_item_view.dart';
import 'package:test_sa/new_views/pages/land_page/requests/service_request_item_view.dart';
import 'package:test_sa/views/widgets/loaders/no_data_found.dart'; import 'package:test_sa/views/widgets/loaders/no_data_found.dart';
class RequestItemViewList extends StatelessWidget { class RequestItemViewList extends StatelessWidget {
@ -26,24 +30,19 @@ class RequestItemViewList extends StatelessWidget {
bool isAssetTransfer = list[index].nameOfType == "AssetTransfer"; bool isAssetTransfer = list[index].nameOfType == "AssetTransfer";
bool isPPMs = list[index].nameOfType == "PPMs"; bool isPPMs = list[index].nameOfType == "PPMs";
return Container( return isServiceRequest
? ServiceRequestItemView(requestDetails: list[index])
: isGasRefill
? GasRefillItemView(requestDetails: list[index])
: isPPMs
? PpmItemView(requestDetails: list[index])
: isAssetTransfer
? AssetItemView(requestDetails: list[index])
: Container(
height: 100, height: 100,
width: double.infinity, width: double.infinity,
color: Colors.grey, color: Colors.grey,
); );
// return isServiceRequest
// ? ServiceRequestItemView(list[index])
// : isGasRefill
// ? GasRefillItemView(list[index])
// : isPPMs
// ? PpmItemView(list[index])
// : isAssetTransfer
// ? AssetItemView(list[index])
// : Container(
// height: 100,
// width: double.infinity,
// color: Colors.grey,
// );
}, },
separatorBuilder: (cxt, index) => 8.height, separatorBuilder: (cxt, index) => 8.height,
itemCount: isLoading ? 6 : list.length); itemCount: isLoading ? 6 : list.length);

@ -76,10 +76,6 @@ class _RequestDetailMainState extends State<RequestDetailMain> {
TabBarView( TabBarView(
children: [ children: [
WorkOrderDetailView(), WorkOrderDetailView(),
// RequestDetailView(
// serviceRequest: ServiceRequest(id: requestId.toString()),
// fromTabView: true,
// ),
const HistoryLogView(), const HistoryLogView(),
], ],
).expanded, ).expanded,

@ -32,6 +32,7 @@ class GasRefillDetailsPage extends StatefulWidget {
class _GasRefillDetailsPageState extends State<GasRefillDetailsPage> { class _GasRefillDetailsPageState extends State<GasRefillDetailsPage> {
GasRefillModel _model = GasRefillModel(gazRefillDetails: []); GasRefillModel _model = GasRefillModel(gazRefillDetails: []);
late UserProvider _userProvider; late UserProvider _userProvider;
late GasRefillProvider gasRefillProvider;
final bool _isLoading = false; final bool _isLoading = false;
final GlobalKey<FormState> _formKey = GlobalKey<FormState>(); final GlobalKey<FormState> _formKey = GlobalKey<FormState>();
@ -47,7 +48,7 @@ class _GasRefillDetailsPageState extends State<GasRefillDetailsPage> {
@override @override
Widget build(BuildContext context) { Widget build(BuildContext context) {
_userProvider = Provider.of<UserProvider>(context); _userProvider = Provider.of<UserProvider>(context);
GasRefillProvider gasRefillProvider = Provider.of<GasRefillProvider>(context); gasRefillProvider = Provider.of<GasRefillProvider>(context);
return Scaffold( return Scaffold(
appBar: DefaultAppBar(title: context.translation.gasRefillDetails), appBar: DefaultAppBar(title: context.translation.gasRefillDetails),
@ -70,7 +71,7 @@ class _GasRefillDetailsPageState extends State<GasRefillDetailsPage> {
], ],
); );
} }
return NoDataFound(message: context.translation.noDataFound); return NoDataFound(message: context.translation.noDataFound).center;
}, },
), ),
), ),

Loading…
Cancel
Save