2.1.0

lib/providers/items.dart

@@ -182,6 +182,8 @@ class ItemProvider extends ChangeNotifier {
       'Authorization': User.token,
     });
 
+    print(response.body);
+
     if (response.statusCode == 200) {
       items!.removeWhere((item) {
         return item.id.toString() == id;

lib/providers/labels.dart

@@ -86,8 +86,9 @@ class LabelsProvider extends ChangeNotifier {
     List<String> result = [];
     var filterDatas = json.decode(response.body);
     for (var package in filterDatas['data']) {
-      result.add(
-          "${package['name']} - ${package['udi'] != null ? package['udi'] : ''}");
+      // result.add(
+      //     "${package['name']} - ${package['package_id'] != null ? package['package_id'] : ''}");
+      result.add(package['id'].toString());
     }
     packageVals = result;
     initialPackageValue = packageVals[0];
@@ -98,9 +99,12 @@ class LabelsProvider extends ChangeNotifier {
     return result;
   }
 
-  Future<void> createLabelResult(lotNumber, cycleNumber, sterileDate, package,
+  Future<void> createLabelResult(lotNumber, cycleNumber, sterileDate, packages,
       expireDate, sterilizerId) async {
-    // print(labs);
+    List<Map<String, Object>> pkgs = [];
+    for (var package in packages) {
+      pkgs.add({'name': '', 'id': package});
+    }
     var response = await http.post(Uri.parse(Url.createLabelResult),
         body: json.encode(
           {
@@ -109,7 +113,7 @@ class LabelsProvider extends ChangeNotifier {
             'sterilizer_id': sterilizerId,
             'cycle_number': cycleNumber,
             'lot_number': lotNumber,
-            'package_id': package['id']
+            'package_id': pkgs,
           },
         ),
         headers: {
@@ -118,7 +122,6 @@ class LabelsProvider extends ChangeNotifier {
           "Content-Type": "application/json",
           "Accept": "application/json"
         });
-
     print(response.body);
   }
 
@@ -127,7 +130,7 @@ class LabelsProvider extends ChangeNotifier {
     lotNumber,
     cycleNumber,
     sterileDate,
-    package,
+    // package,
     expireDate,
     sterilizerId,
   ) async {
@@ -139,7 +142,7 @@ class LabelsProvider extends ChangeNotifier {
         'sterilizer_id': sterilizerId,
         'cycle_number': cycleNumber,
         'lot_number': lotNumber,
-        'package_id': package['id'],
+        // 'package_id': package['id'],
       },
     );
     var response = await http.put(Uri.parse(Url.updateLabelResult(id)),
@@ -150,7 +153,7 @@ class LabelsProvider extends ChangeNotifier {
             'sterilizer_id': sterilizerId,
             'cycle_number': cycleNumber,
             'lot_number': lotNumber,
-            'package_id': package['id'],
+            // 'package_id': package['id'],
             // 'package': {
             //   'id': package['id'],
             //   'name': package['name'],

lib/providers/my_packages.dart

@@ -24,7 +24,7 @@ class MyPackageProvider extends ChangeNotifier {
   MyPackageFilterObject? filters = MyPackageFilterObject(
     id: '',
     name: '',
-    udi: '',
+    // udi: '',
   );
   int pageNumber = 1;
   void resetPageNumber() => pageNumber = 1;
@@ -64,15 +64,15 @@ class MyPackageProvider extends ChangeNotifier {
   void setFilters(
     id,
     name,
-    udi,
+    // udi,
   ) {
     pageNumber = 1;
     filters = MyPackageFilterObject(
       id: id,
       name: name,
-      udi: udi,
+      // udi: udi,
     );
-    if (filters!.id == '' && filters!.name == '' && filters!.udi == '') {
+    if (filters!.id == '' && filters!.name == '') {
       filterOn = false;
     } else {
       filterOn = true;
@@ -89,9 +89,9 @@ class MyPackageProvider extends ChangeNotifier {
       if (filters!.name != '') {
         url += '&name=${filters!.name}';
       }
-      if (filters!.udi != '') {
-        url += '&udi=${filters!.udi}';
-      }
+      // if (filters!.udi != '') {
+      //   url += '&package_id=${filters!.udi}';
+      // }
     }
     var response = await http.get(
       Uri.parse(url),
@@ -126,9 +126,9 @@ class MyPackageProvider extends ChangeNotifier {
       if (filters!.name != '') {
         url += '&name=${filters!.name}';
       }
-      if (filters!.udi != '') {
-        url += '&udi=${filters!.udi}';
-      }
+      // if (filters!.udi != '') {
+      //   url += '&package_id=${filters!.udi}';
+      // }
     }
     var response = await http.get(
       Uri.parse(url),

lib/providers/packages.dart

@@ -44,7 +44,7 @@ class PackageProvider extends ChangeNotifier {
     id: '',
     hospital: '',
     name: '',
-    udi: '',
+    // udi: '',
   );
   int pageNumber = 1;
   void resetPageNumber() => pageNumber = 1;
@@ -87,6 +87,7 @@ class PackageProvider extends ChangeNotifier {
     List<String> result = [];
     var filterData = json.decode(response.body);
     for (var item in filterData['data']) {
+      // result.add("${item['name']} - ${item['udi'] != null ? item['udi'] : ''}");
       result.add(item['id'].toString());
     }
     itemVals = result;
@@ -100,22 +101,22 @@ class PackageProvider extends ChangeNotifier {
 
   Future<void> createPackageResult(
     name,
-    udi,
+    // udi,
     items,
     note,
   ) async {
-    List<Map<String, Object>> items = [];
+    List<Map<String, Object>> itms = [];
     for (var item in items) {
-      items.add({'name': '', 'id': item});
+      itms.add({'id': item});
     }
     var response = await http.post(
       Uri.parse(Url.createPackageResult),
       body: json.encode(
         {
           'note': note,
-          'items': items,
+          'items': itms,
           'name': name,
-          'udi': udi,
+          // 'package_id': udi,
         },
       ),
       headers: {
@@ -132,7 +133,7 @@ class PackageProvider extends ChangeNotifier {
   Future<void> updatePackageResult(
     id,
     name,
-    udi,
+    // udi,
     description,
     items,
   ) async {
@@ -143,14 +144,14 @@ class PackageProvider extends ChangeNotifier {
     print({
       'note': description,
       'name': name,
-      'udi': udi,
+      // 'package_id': udi,
       'items': items,
     });
     var response = await http.put(Uri.parse(Url.updatePackageResult(id)),
         body: json.encode(
           {
             'name': name,
-            'udi': udi,
+            // 'package_id': udi,
             'note': description,
             'items': items,
           },
@@ -186,19 +187,16 @@ class PackageProvider extends ChangeNotifier {
     id,
     name,
     hospital,
-    udi,
+    // udi,
   ) {
     pageNumber = 1;
     filters = PackageFilterObject(
       id: id,
       name: name,
       hospital: hospital,
-      udi: udi,
+      // udi: udi,
     );
-    if (filters!.id == '' &&
-        filters!.name == '' &&
-        filters!.hospital == '' &&
-        filters!.udi != '') {
+    if (filters!.id == '' && filters!.name == '' && filters!.hospital == '') {
       filterOn = false;
     } else {
       filterOn = true;
@@ -229,9 +227,9 @@ class PackageProvider extends ChangeNotifier {
       if (filters!.hospital != '') {
         url += '&medical_center_id=${filters!.hospital}';
       }
-      if (filters!.udi != '') {
-        url += '&udi=${filters!.udi}';
-      }
+      // if (filters!.udi != '') {
+      //   url += '&package_id=${filters!.udi}';
+      // }
     }
     var response = await http.get(
       Uri.parse(url),
@@ -270,7 +268,7 @@ class PackageProvider extends ChangeNotifier {
         description: 'null',
         createDate: '2020-07-14 13:50:42',
         hospitalName: 'null',
-        udi: 'null',
+        // udi: 'null',
         items: [],
       );
     }
@@ -284,7 +282,7 @@ class PackageProvider extends ChangeNotifier {
       id: data['id'].toString(),
       name: data['name'] != null ? data['name'] : '',
       description: data['note'] != null ? data['note'] : '',
-      udi: data['udi'] != null ? data['udi'] : '',
+      // udi: data['package_id'] != null ? data['package_id'] : '',
       createDate: data['created_at'] != null ? data['created_at'] : '',
       hospitalName:
           data['user'] != null ? data['user']['medical_center']['name'] : '',