diff --git a/lib/controllers/api_routes/urls.dart b/lib/controllers/api_routes/urls.dart index 10ea73dd..42facf90 100644 --- a/lib/controllers/api_routes/urls.dart +++ b/lib/controllers/api_routes/urls.dart @@ -406,6 +406,7 @@ class URLs { static get getLoanPeriod => "$_baseUrl/Lookups/GetLookup?lookupEnum=3051"; static get getMedDepartmentBasedOnSite => "$_baseUrl/TRAFDataSource/GetDepartmentBasedOnSite"; + static get getFlowMedicalDepartments => "$_baseUrl/FlowDepartments/All"; static get getLoanById => '$_baseUrl/Loan/GetLoanById'; static get getIncidentById => '$_baseUrl/Incident/GetIncidentById'; diff --git a/lib/main.dart b/lib/main.dart index 1d64b423..957e9211 100644 --- a/lib/main.dart +++ b/lib/main.dart @@ -40,6 +40,7 @@ import 'package:test_sa/modules/cx_module/chat/chat_provider.dart'; import 'package:test_sa/modules/demo_module/create_demo_request_page.dart'; import 'package:test_sa/modules/demo_module/demo_period_lookup_provider.dart'; import 'package:test_sa/modules/demo_module/demo_provider.dart'; +import 'package:test_sa/modules/incident_module/flow_medical_department_provider.dart'; import 'package:test_sa/modules/incident_module/incident_provider.dart'; import 'package:test_sa/modules/internal_audit_module/pages/equipment_internal_audit/create_equipment_internal_audit_form.dart'; import 'package:test_sa/modules/internal_audit_module/pages/system_internal_audit/create_system_internal_audit_form.dart'; @@ -334,6 +335,7 @@ class MyApp extends StatelessWidget { ChangeNotifierProvider(create: (_) => LoanProvider()), ChangeNotifierProvider(create: (_) => LoanPeriodProvider()), ChangeNotifierProvider(create: (_) => MedicalDepartmentProvider()), + ChangeNotifierProvider(create: (_) => FlowMedicalDepartmentProvider()), ChangeNotifierProvider(create: (_) => AssetDeliveryProvider()), ChangeNotifierProvider(create: (_) => CostCenterProvider()), ChangeNotifierProvider(create: (_) => PowerSupplyTypeProvider()), diff --git a/lib/modules/incident_module/create_incident_request_page.dart b/lib/modules/incident_module/create_incident_request_page.dart index 71d6e3a8..e8790342 100644 --- a/lib/modules/incident_module/create_incident_request_page.dart +++ b/lib/modules/incident_module/create_incident_request_page.dart @@ -36,6 +36,7 @@ import 'package:test_sa/views/widgets/images/multi_image_picker.dart'; import '../../models/new_models/department.dart'; import '../../new_views/swipe_module/dialoge/info_dialog.dart'; +import 'flow_medical_department_provider.dart'; import 'incident_attachment_model.dart'; class CreateIncidentRequestPage extends StatefulWidget { @@ -76,7 +77,7 @@ class _CreateIncidentRequestPageState extends State { void initState() { super.initState(); payload["id"] = 0; - payload["isFromMobile"] = 0; + payload["isFromMobile"] = true; payload["requestorUserId"] = context.userProvider.user!.userID; payload["requestorSiteId"] = context.userProvider.user!.clientId; } @@ -296,7 +297,7 @@ class _CreateIncidentRequestPageState extends State { }, ), 8.height, - SingleItemDropDownMenu( + SingleItemDropDownMenu( context: context, title: "Employee Department", showShadow: false, diff --git a/lib/modules/incident_module/flow_medical_department_provider.dart b/lib/modules/incident_module/flow_medical_department_provider.dart new file mode 100644 index 00000000..f2aa746b --- /dev/null +++ b/lib/modules/incident_module/flow_medical_department_provider.dart @@ -0,0 +1,32 @@ +import 'dart:convert'; + +import 'package:http/http.dart'; +import 'package:test_sa/controllers/api_routes/api_manager.dart'; +import 'package:test_sa/controllers/api_routes/urls.dart'; +import 'package:test_sa/modules/loan_module/models/medical_department_model.dart'; +import 'package:test_sa/providers/loading_list_notifier.dart'; + +class FlowMedicalDepartmentProvider extends LoadingListNotifier { + @override + Future getData({int? id}) async { + if (loading == true) return -2; + loading = true; + notifyListeners(); + try { + Response response = await ApiManager.instance.get(URLs.getFlowMedicalDepartments); + stateCode = response.statusCode; + if (response.statusCode >= 200 && response.statusCode < 300) { + List categoriesListJson = json.decode(response.body)["data"]; + items = categoriesListJson.map((item) => MedicalDepartmentModel.fromJson(item)).toList(); + } + loading = false; + notifyListeners(); + return response.statusCode; + } catch (error) { + loading = false; + stateCode = -1; + notifyListeners(); + return -1; + } + } +} diff --git a/lib/modules/incident_module/incident_detail_page.dart b/lib/modules/incident_module/incident_detail_page.dart index ea9f9b1f..2b7f43ef 100644 --- a/lib/modules/incident_module/incident_detail_page.dart +++ b/lib/modules/incident_module/incident_detail_page.dart @@ -41,7 +41,7 @@ class IncidentDetailPage extends StatelessWidget { appBar: const DefaultAppBar(title: "Request Details"), body: SafeArea( child: FutureBuilder( - future: Provider.of(context, listen: false).getIncidentById(97), + future: Provider.of(context, listen: false).getIncidentById(incidentId), builder: (BuildContext context, AsyncSnapshot snapshot) { if (snapshot.connectionState == ConnectionState.waiting) return const CircularProgressIndicator(color: AppColor.primary10).center; if (snapshot.data == null) return const NoDataFound().center; diff --git a/lib/modules/incident_module/incident_item_view.dart b/lib/modules/incident_module/incident_item_view.dart index ff4db6fa..52838fb3 100644 --- a/lib/modules/incident_module/incident_item_view.dart +++ b/lib/modules/incident_module/incident_item_view.dart @@ -89,6 +89,7 @@ class IncidentItemView extends StatelessWidget { 8.height, infoWidget(label: context.translation.requestType, value: requestDetails!.requestType, context: context), infoWidget(label: "Incident No", value: requestDetails!.requestNo, context: context), + infoWidget(label: context.translation.assetName, value: requestDetails!.assetName, context: context), infoWidget(label: context.translation.site, value: requestDetails!.site, context: context), 8.height, Row(