2.2.0

lib/pages/TestPages/test_add_screen.dart

@@ -11,7 +11,6 @@ import '../../widgets/Global/internet_error.dart';
 import '../../widgets/TestResultScreens/Add/selector_box.dart';
 
 class TestResultAddScreen extends StatefulWidget {
-  // static const route = '/TestResultAddScreen';
   @override
   State<StatefulWidget> createState() {
     return _TestResultAddScreenState();
@@ -29,6 +28,7 @@ class _TestResultAddScreenState extends State<TestResultAddScreen> {
     if (isInit) {
       var testResultProviderObject =
           Provider.of<TestResultsProvider>(context, listen: false);
+      testResultProviderObject.resetTests();
       testResultProviderObject.getFilterItems().then((result) {
         for (var testType in result[1].keys) {
           testTypeVals.add(testType);
@@ -128,6 +128,10 @@ class _TestResultAddScreenState extends State<TestResultAddScreen> {
                                     } else if (result == 'access') {
                                       print('access');
                                     } else {
+                                      Provider.of<TestResultsProvider>(
+                                        context,
+                                        listen: false,
+                                      ).testCode = result;
                                       Navigator.pushNamed(
                                         context,
                                         Routes.formTestResultScreen,
@@ -174,14 +178,18 @@ class _TestResultAddScreenState extends State<TestResultAddScreen> {
                                           child: TextFormField(
                                             onChanged: (val) {
                                               if (val != '') {
-                                                setState(() {
-                                                  testTypeCTRL.text = '';
-                                                });
+                                                setState(
+                                                  () {
+                                                    testTypeCTRL.text = '';
+                                                  },
+                                                );
                                               } else {
-                                                setState(() {
-                                                  testTypeCTRL.text =
-                                                      testTypeVals[0];
-                                                });
+                                                setState(
+                                                  () {
+                                                    testTypeCTRL.text =
+                                                        testTypeVals[0];
+                                                  },
+                                                );
                                               }
                                             },
                                             controller: testCodeCTRL,

lib/pages/TestPages/test_form_page.dart

@@ -41,28 +41,30 @@ class _FormPageState extends State<FormPage> {
       setState(() {
         _isLoading = true;
       });
-      prvObject.createTestResult(values, batchId).then((result) {
-        setState(() {
-          _isLoading = false;
-        });
-        if (result == 'done') {
-          showDialog(
-            context: context,
-            builder: (ctx) => AlertDialog(
-              content: Text('Test added.'),
-              actions: <Widget>[
-                TextButton(
-                  onPressed: () {
-                    Navigator.of(ctx).pop();
-                  },
-                  child: Text('Ok'),
-                )
-              ],
-            ),
-          ).then((value) =>
-              Navigator.of(context).popAndPushNamed(Routes.testResultScreen));
-        }
-      });
+      prvObject.createTestResult(values, batchId).then(
+        (result) {
+          setState(() {
+            _isLoading = false;
+          });
+          if (result == 'done') {
+            showDialog(
+              context: context,
+              builder: (ctx) => AlertDialog(
+                content: Text('Test added.'),
+                actions: <Widget>[
+                  TextButton(
+                    onPressed: () {
+                      Navigator.of(ctx).pop();
+                    },
+                    child: Text('Ok'),
+                  )
+                ],
+              ),
+            ).then((value) =>
+                Navigator.of(context).popAndPushNamed(Routes.testResultScreen));
+          }
+        },
+      );
     }
   }