From 42677a72b3663027db05f5561f9eaaf8923c1034 Mon Sep 17 00:00:00 2001 From: WaseemAbbasi22 Date: Wed, 28 Jan 2026 16:14:07 +0300 Subject: [PATCH] improvements --- .../demo_module/create_demo_request_page.dart | 73 ------------------- .../demo_module/evaluation_form_page.dart | 3 +- .../demo_module/provider/demo_provider.dart | 20 +++-- .../my_request/my_requests_page.dart | 1 + 4 files changed, 15 insertions(+), 82 deletions(-) diff --git a/lib/modules/demo_module/create_demo_request_page.dart b/lib/modules/demo_module/create_demo_request_page.dart index 3569e33c..55e0547a 100644 --- a/lib/modules/demo_module/create_demo_request_page.dart +++ b/lib/modules/demo_module/create_demo_request_page.dart @@ -254,40 +254,6 @@ class _CreateDemoRequestPageState extends State with Tick setState(() {}); }, ), - // SingleItemDropDownMenu( - // context: context, - // title: context.translation.site, - // initialValue: _demoFormModel.site, - // showShadow: false, - // validator: (value) { - // if (value == null) return "Please select a site"; - // return null; - // }, - // backgroundColor: AppColor.fieldBgColor(context), - // showAsBottomSheet: true, - // onSelect: (value) { - // _demoFormModel.site = value; - // setState(() {}); - // }, - // ), - // 8.height, - // SingleItemDropDownMenu( - // context: context, - // title: context.translation.department, - // showShadow: false, - // validator: (value) { - // if (value == null) return "Please select a department"; - // return null; - // }, - // showAsBottomSheet: true, - // initialValue: _demoFormModel.department, - // requestById: context.userProvider.user?.clientId, - // backgroundColor: AppColor.fieldBgColor(context), - // onSelect: (value) { - // _demoFormModel.department = value; - // setState(() {}); - // }, - // ), ]; } @@ -494,44 +460,6 @@ class _CreateDemoRequestPageState extends State with Tick _demoFormModel.vendorRepresentativeName = value; }, ), - // SingleItemDropDownMenu( - // context: context, - // title: 'Vendor Name'.addTranslation, - // backgroundColor: AppColor.fieldBgColor(context), - // initialValue: _demoFormModel.vendor, - // showAsBottomSheet: true, - // showShadow: false, - // showCancel: true, - // onSelect: (person) { - // _demoFormModel.vendor = person; - // _demoFormModel.supEngineer = null; - // vendorPhoneController.text = person?.contact ?? ''; - // vendorEmailController.text = person?.email ?? ''; - // setState(() {}); - // }, - // ), - // 8.height, - // SingleItemDropDownMenu( - // context: context, - // backgroundColor: _demoFormModel.vendor?.suppliername == null - // ? context.isDark - // ? AppColor.neutral20 - // : AppColor.neutral40 - // : AppColor.fieldBgColor(context), - // title: "Representative Name".addTranslation, - // showShadow: false, - // enabled: _demoFormModel.vendor?.suppPersons?.isNotEmpty ?? false, - // staticData: _demoFormModel.vendor?.suppPersons, - // showAsBottomSheet: true, - // initialValue: _demoFormModel.supEngineer == null ? null : SuppPersons.fromJson(_demoFormModel.supEngineer?.toJson()), - // onSelect: (suppPerson) { - // if (suppPerson != null) { - // _demoFormModel.supEngineer = SuppEngineerWorkOrders.fromJson(suppPerson.toJson()); - // - // setState(() {}); - // } - // }, - // ), 8.height, AppTextFormField( // controller: vendorPhoneController, @@ -570,7 +498,6 @@ class _CreateDemoRequestPageState extends State with Tick _demoFormModel.demoAttachment = []; for (var item in attachments) { String fileName = CMRequestUtils.isLocalUrl(item.name ?? '') ? ("${item.name ?? ''.split("/").last}|${base64Encode(File(item.name ?? '').readAsBytesSync())}") : item.name ?? ''; - //Todo need to change from static attachmentTypeId lookUp value from lookup 4104... _demoFormModel.demoAttachment?.add(DemoAttachments(id: 0, attachmentName: fileName, demoRequestId: 0,documentTypeId: 7748)); } Utils.showLoading(context); diff --git a/lib/modules/demo_module/evaluation_form_page.dart b/lib/modules/demo_module/evaluation_form_page.dart index d0b627e1..aec84a74 100644 --- a/lib/modules/demo_module/evaluation_form_page.dart +++ b/lib/modules/demo_module/evaluation_form_page.dart @@ -8,8 +8,7 @@ import 'package:test_sa/extensions/widget_extensions.dart'; import 'package:test_sa/helper/utils.dart'; import 'package:test_sa/models/lookup.dart'; import 'package:test_sa/modules/cm_module/views/components/action_button/footer_action_button.dart'; -import 'package:test_sa/modules/demo_module/demo_provider.dart'; -import 'package:test_sa/modules/loan_module/provider/loan_provider.dart'; +import 'package:test_sa/modules/demo_module/provider/demo_provider.dart'; import 'package:test_sa/new_views/app_style/app_color.dart'; import 'package:test_sa/new_views/common_widgets/app_filled_button.dart'; import 'package:test_sa/new_views/common_widgets/app_text_form_field.dart'; diff --git a/lib/modules/demo_module/provider/demo_provider.dart b/lib/modules/demo_module/provider/demo_provider.dart index 065ef0b1..002a06f8 100644 --- a/lib/modules/demo_module/provider/demo_provider.dart +++ b/lib/modules/demo_module/provider/demo_provider.dart @@ -1,20 +1,13 @@ -import 'dart:developer'; import 'package:flutter/cupertino.dart'; import 'package:fluttertoast/fluttertoast.dart'; 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/models/new_models/building.dart'; -import 'package:test_sa/models/new_models/floor.dart'; import 'package:test_sa/models/new_models/site.dart'; -import 'package:test_sa/modules/demo_module/models/demo_form_model.dart'; import 'package:test_sa/modules/demo_module/models/demo_request_model.dart'; -import 'package:test_sa/modules/loan_module/models/loan_request_model.dart'; import 'dart:convert'; -import '../../../models/new_models/department.dart'; - class DemoProvider extends ChangeNotifier { Future addDemoRequest(Map body) async { try { @@ -113,6 +106,19 @@ class DemoProvider extends ChangeNotifier { notifyListeners(); return siteObj; } + Future addDemoTrialOutcome(Map body) async { + try { + Response response = await ApiManager.instance.post(URLs.addDemoTrialOutcome, body: body, showToast: false); + if (response.statusCode >= 200 && response.statusCode < 300) { + String message = (jsonDecode(response.body)["data"] ?? "") + " " + (jsonDecode(response.body)["message"] ?? ""); + Fluttertoast.showToast(msg: message ?? "", toastLength: Toast.LENGTH_LONG); + return true; + } + return false; + } catch (error) { + return false; + } + } // Future getSiteData({ // required num? siteId, diff --git a/lib/new_views/pages/land_page/my_request/my_requests_page.dart b/lib/new_views/pages/land_page/my_request/my_requests_page.dart index 66ea1661..2d2f5b3f 100644 --- a/lib/new_views/pages/land_page/my_request/my_requests_page.dart +++ b/lib/new_views/pages/land_page/my_request/my_requests_page.dart @@ -76,6 +76,7 @@ class _MyRequestsPageState extends State { requestsList.add(Request(12, "Loan Equipment")); if (context.userProvider.isAssessor) { + requestsList = [ Request(null, context.translation.allWorkOrder), Request(15, 'Demo Request'),