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 aae73285..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"; @@ -53,6 +51,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( @@ -288,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, 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 d04be149..10f121a1 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,8 +113,10 @@ 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) + 'Resource: ${taskProvider.taskRequestModel?.resource?.name}'.bodyText(context), + 'Evaluator User: ${taskProvider.taskRequestModel?.evaluatorUser?.userName}'.bodyText(context) ], ), ],