2.2.0

lib/pages/PackagePages/package_add_screen.dart

@@ -24,6 +24,7 @@ class _PackageAddScreenState extends State<PackageAddScreen> {
   // TextEditingController udiCTRL = new TextEditingController();
   TextEditingController nameCTRL = new TextEditingController();
   TextEditingController dateCTRL = new TextEditingController();
+
   final _form = GlobalKey<FormState>();
   bool isInit = true;
   PackageFilterObject? filters;
@@ -47,6 +48,23 @@ class _PackageAddScreenState extends State<PackageAddScreen> {
         (result) {
           setState(
             () {
+              // itemVals = [
+              //   {'id': '', 'name-udi': ''}
+              // ];
+              // for (var item in result) {
+              //   itemVals.add(item);
+              //   packageProviderObject.itemVals = itemVals;
+              // }
+              // initialItemValue.text = itemVals[1]['name-udi'];
+              // packageProviderObject.initialItemValue = initialItemValue.text;
+
+              // itemVals.forEach(
+              //   (item) {
+              //     if (item['id'] == '') {
+              //       selectedItemsCTRL.text = item['name']!;
+              //     }
+              //   },
+              // );
               isInit = false;
             },
           );
@@ -215,6 +233,13 @@ class _PackageAddScreenState extends State<PackageAddScreen> {
                                         initialItemValue:
                                             packageProvider.initialItemValue,
                                         index: index,
+                                        filteredItems:
+                                            packageProvider.filteredItems!,
+                                        hasRemoveButton:
+                                            packageProvider.itemValues.length >
+                                                    1
+                                                ? true
+                                                : false,
                                       ),
                                       itemCount:
                                           packageProvider.itemValues.length,

lib/pages/PackagePages/package_detail_screen.dart

@@ -1,3 +1,4 @@
+import 'package:cssd/config/routes.dart';
 import 'package:cssd/models/package_model.dart';
 import 'package:cssd/providers/packages.dart';
 import 'package:cssd/widgets/PackageScreens/Details/package_detail_box.dart';
@@ -8,12 +9,6 @@ import '../../providers/connectivity.dart';
 import '../../widgets/Global/internet_error.dart';
 
 class PackageDetailScreen extends StatefulWidget {
-  final String? testResultId;
-
-  PackageDetailScreen({
-    this.testResultId,
-  });
-
   @override
   _PackageDetailScreenState createState() => _PackageDetailScreenState();
 }
@@ -80,6 +75,15 @@ class _PackageDetailScreenState extends State<PackageDetailScreen> {
                         : PackageDetailsDataBox(
                             datas: datas!,
                             deviceBlockSize: _deviceBlockSize,
+                            goToAddLabelPage: () {
+                              Navigator.pushNamed(
+                                context,
+                                Routes.labelAddScreen,
+                                arguments: {
+                                  "id": datas!.id,
+                                },
+                              );
+                            },
                           )
                 : ConnectionErrorBox();
           },