From 91fb195d4f2aebfa518143383ff3ad6b2dce5033 Mon Sep 17 00:00:00 2001 From: Sikander Saleem Date: Tue, 6 May 2025 11:54:33 +0300 Subject: [PATCH 1/4] bug 860 fixed. --- lib/controllers/providers/settings/setting_provider.dart | 4 ++++ lib/views/pages/user/tasks_request/create_task_view.dart | 7 +++++++ 2 files changed, 11 insertions(+) diff --git a/lib/controllers/providers/settings/setting_provider.dart b/lib/controllers/providers/settings/setting_provider.dart index bcfeb2ed..fbbeae29 100644 --- a/lib/controllers/providers/settings/setting_provider.dart +++ b/lib/controllers/providers/settings/setting_provider.dart @@ -31,6 +31,10 @@ class SettingProvider extends ChangeNotifier { String password = ""; bool isLocalAuthEnable = false; + bool get isFlowMedical => _assetGroup?.id == 1; + + bool get isFMS => _assetGroup?.id == 2; + // Local authentication instance final LocalAuthentication auth = LocalAuthentication(); diff --git a/lib/views/pages/user/tasks_request/create_task_view.dart b/lib/views/pages/user/tasks_request/create_task_view.dart index 29723bfc..98895aea 100644 --- a/lib/views/pages/user/tasks_request/create_task_view.dart +++ b/lib/views/pages/user/tasks_request/create_task_view.dart @@ -54,6 +54,13 @@ class _CreateTaskViewState extends State with TickerProviderStat AddTaskModel? _addTaskModel = AddTaskModel(id: 0); TextEditingController commentController = TextEditingController(); + @override + void initState() { + // TODO: implement initState + super.initState(); + Provider.of(context, listen: false).reset(); + } + @override Widget build(BuildContext context) { return Scaffold( From 4e1ff56c65fb973ddf2789decbef9cb171f1a219 Mon Sep 17 00:00:00 2001 From: Sikander Saleem Date: Thu, 8 May 2025 09:53:53 +0300 Subject: [PATCH 2/4] type of alert added. --- lib/views/pages/user/tasks_request/task_request_detail_view.dart | 1 + 1 file changed, 1 insertion(+) diff --git a/lib/views/pages/user/tasks_request/task_request_detail_view.dart b/lib/views/pages/user/tasks_request/task_request_detail_view.dart index d485c6f9..680b4b6f 100644 --- a/lib/views/pages/user/tasks_request/task_request_detail_view.dart +++ b/lib/views/pages/user/tasks_request/task_request_detail_view.dart @@ -113,6 +113,7 @@ class _TaskRequestDetailsViewState extends State { Column( crossAxisAlignment: CrossAxisAlignment.start, children: [ + 'Type of alert: ${taskProvider.taskRequestModel?.typeOfAlert?.name}'.bodyText(context), 'Risk Level: ${taskProvider.taskRequestModel?.riskLevel?.name}'.bodyText(context), 'Resource: ${taskProvider.taskRequestModel?.resource?.name}'.bodyText(context) ], From e16233e64242a8fc0d6cc0f1f29598e874fd55b6 Mon Sep 17 00:00:00 2001 From: Sikander Saleem Date: Thu, 8 May 2025 09:58:46 +0300 Subject: [PATCH 3/4] Bug 877,fixed --- lib/views/pages/user/tasks_request/create_task_view.dart | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/lib/views/pages/user/tasks_request/create_task_view.dart b/lib/views/pages/user/tasks_request/create_task_view.dart index 4af8f8cb..2dc6e0bb 100644 --- a/lib/views/pages/user/tasks_request/create_task_view.dart +++ b/lib/views/pages/user/tasks_request/create_task_view.dart @@ -1,5 +1,6 @@ import 'dart:convert'; import 'dart:io'; + import 'package:flutter/material.dart'; import 'package:provider/provider.dart'; import 'package:test_sa/dashboard_latest/dashboard_provider.dart'; @@ -10,8 +11,6 @@ import 'package:test_sa/extensions/widget_extensions.dart'; import 'package:test_sa/models/device/asset.dart'; import 'package:test_sa/models/enums/user_types.dart'; import 'package:test_sa/models/lookup.dart'; -import 'package:test_sa/models/new_models/building.dart'; -import 'package:test_sa/models/new_models/floor.dart'; import 'package:test_sa/models/new_models/mapped_sites.dart'; import 'package:test_sa/models/new_models/room_model.dart'; import 'package:test_sa/models/new_models/task_request/task_request_model.dart'; @@ -29,9 +28,8 @@ import 'package:test_sa/service_request_latest/views/components/action_button/fo import 'package:test_sa/views/widgets/date_and_time/date_picker.dart'; import 'package:test_sa/views/widgets/equipment/asset_picker.dart'; import 'package:test_sa/views/widgets/images/multi_image_picker.dart'; + import '../../../../../../new_views/common_widgets/default_app_bar.dart'; -import '../../../../models/new_models/department.dart'; -import '../../../../models/new_models/site.dart'; class CreateTaskView extends StatefulWidget { static const String id = "/create-task"; @@ -295,8 +293,7 @@ class _CreateTaskViewState extends State with TickerProviderStat SingleItemDropDownMenu( context: context, height: 56.toScreenHeight, - // title: context.translation.typeofAlert, - title: 'Task Job Action', + title: 'Action Needed', showShadow: false, backgroundColor: AppColor.neutral100, showAsBottomSheet: true, From 225aa697bd04158787761d8b51c2b9ad40a12748 Mon Sep 17 00:00:00 2001 From: Sikander Saleem Date: Thu, 8 May 2025 14:24:36 +0300 Subject: [PATCH 4/4] Bug 878 fixed --- .../pages/user/tasks_request/task_request_detail_view.dart | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/lib/views/pages/user/tasks_request/task_request_detail_view.dart b/lib/views/pages/user/tasks_request/task_request_detail_view.dart index 680b4b6f..3bda567e 100644 --- a/lib/views/pages/user/tasks_request/task_request_detail_view.dart +++ b/lib/views/pages/user/tasks_request/task_request_detail_view.dart @@ -115,7 +115,8 @@ class _TaskRequestDetailsViewState extends State { children: [ 'Type of alert: ${taskProvider.taskRequestModel?.typeOfAlert?.name}'.bodyText(context), 'Risk Level: ${taskProvider.taskRequestModel?.riskLevel?.name}'.bodyText(context), - 'Resource: ${taskProvider.taskRequestModel?.resource?.name}'.bodyText(context) + 'Resource: ${taskProvider.taskRequestModel?.resource?.name}'.bodyText(context), + 'Evaluator User: ${taskProvider.taskRequestModel?.evaluatorUser?.userName}'.bodyText(context) ], ), ],