From 29d83101afaf8c175f8de0cd314b512ab5f108da Mon Sep 17 00:00:00 2001 From: Sikander Saleem Date: Sun, 12 Nov 2023 11:34:09 +0300 Subject: [PATCH] statuses & date added. --- .../providers/api/all_requests_provider.dart | 2 +- .../land_page/requests/asset_item_view.dart | 20 ++++++++++- .../requests/gas_refill_item_view.dart | 33 ++++++++--------- .../land_page/requests/ppm_item_view.dart | 35 +++++++++---------- .../requests/service_request_item_view.dart | 32 ++++++++--------- lib/views/app_style/colors.dart | 2 ++ .../widgets/requests/request_status.dart | 3 +- 7 files changed, 72 insertions(+), 55 deletions(-) diff --git a/lib/controllers/providers/api/all_requests_provider.dart b/lib/controllers/providers/api/all_requests_provider.dart index 1a08fc9..1ffda6c 100644 --- a/lib/controllers/providers/api/all_requests_provider.dart +++ b/lib/controllers/providers/api/all_requests_provider.dart @@ -41,7 +41,7 @@ class AllRequestsProvider extends ChangeNotifier { "typeTransaction": [1, 2, 3, 4], "statusTransaction": [1, 2, 3], "priority": [0, 1], - "displayData": [1] + "displayData": [] }; response = await ApiManager.instance.post(URLs.getAllRequestsAndCount, body: body); 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 836406c..4b764eb 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 @@ -2,10 +2,13 @@ import 'package:flutter/material.dart'; import 'package:test_sa/controllers/api_routes/urls.dart'; import 'package:test_sa/extensions/context_extension.dart'; import 'package:test_sa/extensions/int_extensions.dart'; +import 'package:test_sa/extensions/string_extensions.dart'; 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.dart'; +import 'package:test_sa/views/app_style/colors.dart'; +import 'package:test_sa/views/widgets/requests/request_status.dart'; class AssetItemView extends StatelessWidget { final RequestsDetails request; @@ -15,9 +18,24 @@ class AssetItemView extends StatelessWidget { @override Widget build(BuildContext context) { return Column( - mainAxisAlignment: MainAxisAlignment.spaceBetween, + // mainAxisAlignment: MainAxisAlignment.spaceBetween, crossAxisAlignment: CrossAxisAlignment.start, children: [ + Row( + crossAxisAlignment: CrossAxisAlignment.start, + children: [ + StatusLabel(label: request.priority, textColor: AColors.getRequestStatusTextColorByName(request.priority), backgroundColor: AColors.getRequestStatusColorByName(request.priority)), + 8.width, + StatusLabel( + label: request.status, + textColor: AColors.getRequestStatusTextColorByName(request.status), + backgroundColor: AColors.getRequestStatusColorByName(request.status), + ), + 1.width.expanded, + Text(request.date?.toServiceRequestCardFormat ?? "", textAlign: TextAlign.end, style: AppTextStyles.tinyFont.copyWith(color: const Color(0xFF3B3D4A))), + ], + ), + 8.height, Column( crossAxisAlignment: CrossAxisAlignment.start, mainAxisSize: MainAxisSize.min, diff --git a/lib/new_views/pages/land_page/requests/gas_refill_item_view.dart b/lib/new_views/pages/land_page/requests/gas_refill_item_view.dart index 05dc164..adda122 100644 --- a/lib/new_views/pages/land_page/requests/gas_refill_item_view.dart +++ b/lib/new_views/pages/land_page/requests/gas_refill_item_view.dart @@ -5,7 +5,9 @@ import 'package:test_sa/extensions/string_extensions.dart'; 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/views/app_style/colors.dart'; import 'package:test_sa/views/app_style/sizing.dart'; +import 'package:test_sa/views/widgets/requests/request_status.dart'; class GasRefillItemView extends StatelessWidget { final RequestsDetails request; @@ -17,22 +19,21 @@ class GasRefillItemView extends StatelessWidget { return Column( crossAxisAlignment: CrossAxisAlignment.start, children: [ - // Row( - // crossAxisAlignment: CrossAxisAlignment.start, - // children: [ - // /// TBD - // // StatusLabel( - // // label: , - // // id: , - // // textColor: AColors.getPriorityStatusTextColor(), - // // backgroundColor: AColors.getPriorityStatusColor()), - // 8.width, - // StatusLabel(label: item.status.name, textColor: AColors.getRequestStatusTextColor(item.status.value), backgroundColor: AColors.getRequestStatusColor(item.status.value)), - // 1.width.expanded, - // Text(item.startDate != null ? item.startDate.toServiceRequestCardFormat : "", textAlign: TextAlign.end, style: AppTextStyles.tinyFont.copyWith(color: const Color(0xFF3B3D4A))), - // ], - // ), - // 8.height, + Row( + crossAxisAlignment: CrossAxisAlignment.start, + children: [ + StatusLabel( + label: request.priority, + // id: , + textColor: AColors.getRequestStatusTextColorByName(request.priority), + backgroundColor: AColors.getRequestStatusColorByName(request.priority)), + 8.width, + StatusLabel(label: request.status, textColor: AColors.getRequestStatusTextColorByName(request.status), backgroundColor: AColors.getRequestStatusColorByName(request.status)), + 1.width.expanded, + Text(request.date?.toServiceRequestCardFormat ?? "", textAlign: TextAlign.end, style: AppTextStyles.tinyFont.copyWith(color: const Color(0xFF3B3D4A))), + ], + ), + 8.height, Text(context.translation.gasRefillRequest, style: AppTextStyles.heading5.copyWith(color: const Color(0xFF3B3D4A))), Text( '${context.translation.gasType}: ${request.gasType}', diff --git a/lib/new_views/pages/land_page/requests/ppm_item_view.dart b/lib/new_views/pages/land_page/requests/ppm_item_view.dart index 2d6054b..b22d5d0 100644 --- a/lib/new_views/pages/land_page/requests/ppm_item_view.dart +++ b/lib/new_views/pages/land_page/requests/ppm_item_view.dart @@ -8,7 +8,9 @@ import 'package:test_sa/extensions/widget_extensions.dart'; import 'package:test_sa/models/all_requests_and_count_model.dart'; import 'package:test_sa/models/enums/user_types.dart'; import 'package:test_sa/models/visits/visit.dart'; +import 'package:test_sa/views/app_style/colors.dart'; import 'package:test_sa/views/pages/user/visits/visit_details.dart'; +import 'package:test_sa/views/widgets/requests/request_status.dart'; class PpmItemView extends StatelessWidget { final RequestsDetails request; @@ -20,24 +22,21 @@ class PpmItemView extends StatelessWidget { return Column( crossAxisAlignment: CrossAxisAlignment.start, children: [ - // Row( - // children: [ - // // StatusLabel( - // // label: visit.priority.name, - // // id: visit.priority.id, - // // textColor: AColors.getPriorityStatusTextColor(visit.priority.id), - // // backgroundColor: AColors.getPriorityStatusColor(visit.priority.id)), - // // 8.width, - // StatusLabel( - // label: visit.status.name, - // id: visit.status.id, - // textColor: AColors.getRequestStatusTextColorByName(visit.status.name), - // backgroundColor: AColors.getRequestStatusColorByName(visit.status.name), - // ), - // 1.width.expanded, - // ], - // ), - // 8.height, + Row( + crossAxisAlignment: CrossAxisAlignment.start, + children: [ + StatusLabel(label: request.priority, textColor: AColors.getRequestStatusTextColorByName(request.priority), backgroundColor: AColors.getRequestStatusColorByName(request.priority)), + 8.width, + StatusLabel( + label: request.status, + textColor: AColors.getRequestStatusTextColorByName(request.status), + backgroundColor: AColors.getRequestStatusColorByName(request.status), + ), + 1.width.expanded, + Text(request.date?.toServiceRequestCardFormat ?? "", textAlign: TextAlign.end, style: AppTextStyles.tinyFont.copyWith(color: const Color(0xFF3B3D4A))), + ], + ), + 8.height, Text("PPMs Request", style: AppTextStyles.heading5.copyWith(color: const Color(0xFF3B3D4A))), 8.height, Text( diff --git a/lib/new_views/pages/land_page/requests/service_request_item_view.dart b/lib/new_views/pages/land_page/requests/service_request_item_view.dart index 0c8bec4..343dc50 100644 --- a/lib/new_views/pages/land_page/requests/service_request_item_view.dart +++ b/lib/new_views/pages/land_page/requests/service_request_item_view.dart @@ -1,10 +1,12 @@ import 'package:flutter/material.dart'; import 'package:test_sa/extensions/context_extension.dart'; import 'package:test_sa/extensions/int_extensions.dart'; +import 'package:test_sa/extensions/string_extensions.dart'; 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/views/app_style/colors.dart'; +import 'package:test_sa/views/widgets/requests/request_status.dart'; class ServiceRequestItemView extends StatelessWidget { final RequestsDetails request; @@ -17,21 +19,17 @@ class ServiceRequestItemView extends StatelessWidget { mainAxisSize: MainAxisSize.min, crossAxisAlignment: CrossAxisAlignment.start, children: [ - // Row( - // crossAxisAlignment: CrossAxisAlignment.start, - // children: [ - // StatusLabel( - // label: request.priority.name, - // id: request.priority.id, - // textColor: AColors.getPriorityStatusTextColor(request.priority.id), - // backgroundColor: AColors.getPriorityStatusColor(request.priority.id)), - // 8.width, - // StatusLabel(label: request.statusLabel, textColor: AColors.getRequestStatusTextColor(request.statusValue), backgroundColor: AColors.getRequestStatusColor(request.statusValue)), - // 1.width.expanded, - // Text(request.date.toServiceRequestCardFormat, textAlign: TextAlign.end, style: AppTextStyles.tinyFont.copyWith(color: const Color(0xFF3B3D4A))), - // ], - // ), - // 8.height, + Row( + crossAxisAlignment: CrossAxisAlignment.start, + children: [ + StatusLabel(label: request.priority, textColor: AColors.getRequestStatusTextColorByName(request.priority), backgroundColor: AColors.getRequestStatusColorByName(request.priority)), + 8.width, + StatusLabel(label: request.status, textColor: AColors.getRequestStatusTextColorByName(request.status), backgroundColor: AColors.getRequestStatusColorByName(request.status)), + 1.width.expanded, + Text(request.date.toServiceRequestCardFormat, textAlign: TextAlign.end, style: AppTextStyles.tinyFont.copyWith(color: const Color(0xFF3B3D4A))), + ], + ), + 8.height, Text(context.translation.serviceRequest, style: AppTextStyles.heading5.copyWith(color: const Color(0xFF3B3D4A))), Text( '${context.translation.assetName}: ${request.assetName}', @@ -66,6 +64,6 @@ class ServiceRequestItemView extends StatelessWidget { ], ), ], - ).toShadowContainer(context).onPress(() { }); + ).toShadowContainer(context).onPress(() {}); } } diff --git a/lib/views/app_style/colors.dart b/lib/views/app_style/colors.dart index e323f7c..a3752f3 100644 --- a/lib/views/app_style/colors.dart +++ b/lib/views/app_style/colors.dart @@ -36,6 +36,8 @@ class AColors { return AColors.statusYellow; case "high priority": return AColors.statusRed; + // case "low priority": + // return AColors.statusGreen; default: return AColors.white; } diff --git a/lib/views/widgets/requests/request_status.dart b/lib/views/widgets/requests/request_status.dart index 9cfb069..f1b8f88 100644 --- a/lib/views/widgets/requests/request_status.dart +++ b/lib/views/widgets/requests/request_status.dart @@ -11,7 +11,7 @@ class StatusLabel extends StatelessWidget { final Color textColor; final bool isPriority; - StatusLabel({Key key, this.id, this.label, this.backgroundColor, this.textColor, this.isPriority = false}) : super(key: key); + StatusLabel({Key key, this.id=0, this.label, this.backgroundColor, this.textColor, this.isPriority = false}) : super(key: key); @override Widget build(BuildContext context) { @@ -23,7 +23,6 @@ class StatusLabel extends StatelessWidget { if (label.toLowerCase() == 'Closed'.toLowerCase()) label = context.translation.closed; if (label.toLowerCase() == 'Waiting for quotation'.toLowerCase()) label = context.translation.waitingForQuotation; - print("label:$label:$id"); return Container( padding: const EdgeInsets.symmetric(vertical: 6, horizontal: 10), decoration: ShapeDecoration(