From 2c2e968c91a8f3078e7d7b11fc04c5f135409fdd Mon Sep 17 00:00:00 2001 From: Sikander Saleem Date: Sun, 14 Jan 2024 15:24:37 +0300 Subject: [PATCH] replace new with in progress for engineer --- .../land_page/dashboard_fragments/requests_fragment.dart | 5 ++++- lib/new_views/pages/land_page/requests_list_page.dart | 6 +++++- 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/lib/new_views/pages/land_page/dashboard_fragments/requests_fragment.dart b/lib/new_views/pages/land_page/dashboard_fragments/requests_fragment.dart index 3e758d90..ed6538a2 100644 --- a/lib/new_views/pages/land_page/dashboard_fragments/requests_fragment.dart +++ b/lib/new_views/pages/land_page/dashboard_fragments/requests_fragment.dart @@ -1,11 +1,13 @@ import 'package:flutter/material.dart'; import 'package:provider/provider.dart'; +import 'package:test_sa/controllers/api_routes/api_manager.dart'; import 'package:test_sa/controllers/providers/api/all_requests_provider.dart'; import 'package:test_sa/controllers/providers/api/notifications_provider.dart'; import 'package:test_sa/extensions/context_extension.dart'; import 'package:test_sa/extensions/int_extensions.dart'; import 'package:test_sa/extensions/text_extensions.dart'; import 'package:test_sa/extensions/widget_extensions.dart'; +import 'package:test_sa/models/enums/user_types.dart'; import 'package:test_sa/new_views/app_style/app_color.dart'; import 'package:test_sa/new_views/common_widgets/app_floating_action_button.dart'; import 'package:test_sa/new_views/pages/land_page/requests_list_page.dart'; @@ -39,7 +41,8 @@ class RequestsFragment extends StatelessWidget { context.isDark ? AppColor.redStatus(context) : AppColor.red50, ), gridItem(snapshot.overdueRequests?.total?.count, "overdue", context.translation.overdue, context, snapshot.isOverdueLoading, 1, AppColor.yellowStatus(context)), - gridItem(snapshot.openRequests?.total?.count, "new_request", context.translation.newR, context, snapshot.isOpenLoading, 2, AppColor.primary40), + gridItem(snapshot.openRequests?.total?.count, "new_request", ApiManager.instance.user.type == UsersTypes.engineer ? context.translation.inProgress : context.translation.newR, context, + snapshot.isOpenLoading, 2, AppColor.primary40), gridItem(snapshot.completedRequests?.total?.count, "complete_request", context.translation.completed, context, snapshot.isCompleteLoading, 3, AppColor.greenStatus(context)), ], ), diff --git a/lib/new_views/pages/land_page/requests_list_page.dart b/lib/new_views/pages/land_page/requests_list_page.dart index 50308edc..f4796c18 100644 --- a/lib/new_views/pages/land_page/requests_list_page.dart +++ b/lib/new_views/pages/land_page/requests_list_page.dart @@ -1,8 +1,10 @@ import 'package:flutter/material.dart'; import 'package:provider/provider.dart'; +import 'package:test_sa/controllers/api_routes/api_manager.dart'; import 'package:test_sa/controllers/providers/api/all_requests_provider.dart'; import 'package:test_sa/extensions/context_extension.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/new_views/common_widgets/default_app_bar.dart'; import 'package:test_sa/new_views/pages/land_page/widgets/request_item_view_list.dart'; @@ -14,12 +16,14 @@ class RequestsListPage extends StatelessWidget { @override Widget build(BuildContext context) { + bool isEngineer = ApiManager.instance.user.type == UsersTypes.engineer; + String title = index == 0 ? context.translation.highPriority : index == 1 ? context.translation.overdue : index == 2 - ? context.translation.newR + ? (isEngineer ? context.translation.inProgress : context.translation.newR) : index == 3 ? context.translation.completed : "";