From 12758968c9ac2be382594091a65bd14fcf271cff Mon Sep 17 00:00:00 2001 From: "hanie.khodkari" Date: Thu, 8 May 2025 22:00:41 +0330 Subject: [PATCH] Fix get test result inputs changes --- lib/pages/TestPages/test_add_screen.dart | 27 +++++++++++++++++++----- lib/pages/TestPages/test_form_page.dart | 7 ++---- lib/providers/input.dart | 12 ++--------- lib/providers/test_results.dart | 8 ++++--- 4 files changed, 31 insertions(+), 23 deletions(-) diff --git a/lib/pages/TestPages/test_add_screen.dart b/lib/pages/TestPages/test_add_screen.dart index aeee385..6d739f7 100755 --- a/lib/pages/TestPages/test_add_screen.dart +++ b/lib/pages/TestPages/test_add_screen.dart @@ -19,7 +19,9 @@ class TestResultAddScreen extends StatefulWidget { class _TestResultAddScreenState extends State { TextEditingController testTypeCTRL = new TextEditingController(); - final List testTypeVals = []; + List> testTypeMap = []; + + List testTypeVals = []; TextEditingController testCodeCTRL = new TextEditingController(); bool isInit = true; @@ -31,10 +33,16 @@ class _TestResultAddScreenState extends State { Provider.of(context, listen: false); testResultProviderObject.resetTests(); testResultProviderObject.getFilterItems().then((result) { - for (var testType in result[1].keys) { + // testTypeVals = result[1] as List>; + + // testTypeCTRL.text = testTypeVals[0].keys as String; + testTypeMap = Provider.of( + context, + listen: false, + ).testTypeMap; + for (var testType in testTypeMap[1].keys) { testTypeVals.add(testType); } - testTypeCTRL.text = testTypeVals[0]; setState(() { isInit = false; }); @@ -246,14 +254,23 @@ class _TestResultAddScreenState extends State { arguments: testCodeCTRL.text, ); } else if (testTypeCTRL.text != '') { + String? testTypeId = ''; + for (var map in testTypeMap) { + if (map.containsKey( + testTypeCTRL.text)) { + testTypeId = + map[testTypeCTRL.text]; + break; + } + } Provider.of( context, listen: false, - ).testType = testTypeCTRL.text; + ).testTypeId = testTypeId!; Navigator.pushReplacementNamed( context, Routes.formTestResultScreen, - arguments: testTypeCTRL.text, + arguments: testTypeId, ); } // print(testCode); diff --git a/lib/pages/TestPages/test_form_page.dart b/lib/pages/TestPages/test_form_page.dart index 766ff4b..b7209a6 100755 --- a/lib/pages/TestPages/test_form_page.dart +++ b/lib/pages/TestPages/test_form_page.dart @@ -74,15 +74,12 @@ class _FormPageState extends State { _isLoading = true; }); var providerObject = Provider.of(context); - String testTypeName = Provider.of(context).testType; - String testCode = Provider.of(context).testCode; + String testTypeId = Provider.of(context).testTypeId; providerObject.catchImages.clear(); Provider.of(context, listen: false) .getInputs( testResultId: '', - name: testTypeName, - uniqueCode: testCode, - testTypeId: '', + testTypeId: testTypeId, ) .then((_) { setState(() { diff --git a/lib/providers/input.dart b/lib/providers/input.dart index f93fe34..9efed9a 100755 --- a/lib/providers/input.dart +++ b/lib/providers/input.dart @@ -11,18 +11,10 @@ class Inputs with ChangeNotifier { Future getInputs({ required String testResultId, - required String name, - required String uniqueCode, required String testTypeId, }) async { - var response = await http.post( - Uri.parse(Url.getInputs), - body: { - 'test_type_id': testTypeId, - 'test_result_id': testResultId, - 'name': name, - 'unique_code': uniqueCode, - }, + var response = await http.get( + Uri.parse("${Url.getInputs}/$testTypeId"), headers: { 'Authorization': User.token, 'X-Requested-With': 'XMLHttpRequest', diff --git a/lib/providers/test_results.dart b/lib/providers/test_results.dart index 13ee75d..7b9ea10 100755 --- a/lib/providers/test_results.dart +++ b/lib/providers/test_results.dart @@ -15,12 +15,13 @@ import 'package:random_string/random_string.dart'; class TestResultsProvider with ChangeNotifier { List catchImages = []; List images = []; - String testType = ''; + String testTypeId = ''; String testCode = ''; + List> testTypeMap = []; resetTests() { testCode = ''; - testType = ''; + testTypeId = ''; } setImages() async { @@ -208,9 +209,10 @@ class TestResultsProvider with ChangeNotifier { result.add(hospitals); for (var testType in filterDatas['data']['TestTypes']) { testTypes.addAll({testType['name']: testType['id'].toString()}); + testTypeMap.add(testTypes); } result.add(testTypes); - + print("test type : ${testTypeMap}"); return result; }