2.2.0

lib/config/urls.dart

@@ -11,8 +11,6 @@ class Url {
 
   static const String getUserInfo = '$baseUrl/GetInfo';
 
-  // static const String testResults = '$baseUrl/TestResults';
-
   static const String filterItems = '$baseUrl/TestResults/ListFilterItems';
 
   static const String labelItems = '$baseUrl/GetLabels';
@@ -29,9 +27,9 @@ class Url {
 
   static const String addImage = '$baseUrl/UploadFile';
 
-  // static String getUserMedicalCenterId(int id) {
-  //   return '$baseUrl/users?medical_center_id=$id';
-  // }
+  static const String exportItems = '$baseUrl/export/items';
+
+  static const String exportPackages = '$baseUrl/export/packages';
 
   static String testResults(int id) {
     return '$baseUrl/TestResults?page=$id';

lib/models/cycles_models.dart

@@ -24,7 +24,6 @@ class CycleDetailObject extends Equatable {
   final String description;
   final String createDate;
   final String hospitalName;
-
   final String date;
   final String sterileId;
   final String cycleNumber;

lib/models/item_model.dart

@@ -8,6 +8,7 @@ class ItemResultObject extends Equatable {
   final String userName;
   final int status;
   final String? batchId;
+  final String? udi;
 
   ItemResultObject({
     required this.id,
@@ -16,6 +17,7 @@ class ItemResultObject extends Equatable {
     required this.userName,
     required this.status,
     this.batchId,
+    this.udi,
   });
 
   @override
@@ -26,6 +28,7 @@ class ItemResultObject extends Equatable {
         userName,
         status,
         batchId!,
+        udi!,
       ];
 
   @override

lib/models/label_models.dart

@@ -26,7 +26,6 @@ class LabelDetailsObject extends Equatable {
   final String package;
   final String packageId;
   final String hospitalName;
-
   final String createDate;
   final String expireDate;
   final String sterileDate;

lib/models/my_item_model.dart

@@ -1,3 +1,4 @@
+// ignore_for_file: public_member_api_docs, sort_constructors_first
 import 'package:equatable/equatable.dart';
 
 class MyItemResultObject extends Equatable {
@@ -5,20 +6,14 @@ class MyItemResultObject extends Equatable {
   final String name;
   final String size;
   final String? userName;
-  final String? fromDate;
-  final String? toDate;
   final String? requestId;
-  final String? userHistory;
 
   MyItemResultObject({
     required this.id,
     required this.name,
     required this.size,
     this.userName,
-    this.fromDate,
-    this.toDate,
     this.requestId,
-    this.userHistory,
   });
 
   @override
@@ -27,10 +22,7 @@ class MyItemResultObject extends Equatable {
         name,
         size,
         userName!,
-        fromDate!,
-        toDate!,
         requestId!,
-        userHistory!,
       ];
 
   @override
@@ -66,3 +58,32 @@ class MyItemFilterObject extends Equatable {
   @override
   bool get stringify => true;
 }
+
+class ItemHistoryObject extends Equatable {
+  final String fromDate;
+  final String toDate;
+  final String userHistoryName;
+  final String userHistoryId;
+  final String userHistoryPhon;
+  ItemHistoryObject({
+    required this.fromDate,
+    required this.toDate,
+    required this.userHistoryName,
+    required this.userHistoryId,
+    required this.userHistoryPhon,
+  });
+
+  @override
+  List<Object> get props {
+    return [
+      fromDate,
+      toDate,
+      userHistoryName,
+      userHistoryId,
+      userHistoryPhon,
+    ];
+  }
+
+  @override
+  bool get stringify => true;
+}

lib/models/my_package_model.dart

@@ -5,20 +5,14 @@ class MyPackageResultObject extends Equatable {
   final String name;
   final String createdAt;
   final String? userName;
-  final String? fromDate;
-  final String? toDate;
   final String? requestId;
-  final String? userHistory;
 
   MyPackageResultObject({
     required this.id,
     required this.name,
     required this.createdAt,
     this.userName,
-    this.fromDate,
-    this.toDate,
     this.requestId,
-    this.userHistory,
   });
 
   @override
@@ -27,10 +21,7 @@ class MyPackageResultObject extends Equatable {
         name,
         createdAt,
         userName!,
-        fromDate!,
-        toDate!,
         requestId!,
-        userHistory!,
       ];
 
   @override
@@ -60,3 +51,32 @@ class MyPackageFilterObject extends Equatable {
   @override
   bool get stringify => true;
 }
+
+class PackageHistoryObject extends Equatable {
+  final String fromDate;
+  final String toDate;
+  final String userHistoryName;
+  final String userHistoryId;
+  final String userHistoryPhon;
+  PackageHistoryObject({
+    required this.fromDate,
+    required this.toDate,
+    required this.userHistoryName,
+    required this.userHistoryId,
+    required this.userHistoryPhon,
+  });
+
+  @override
+  List<Object> get props {
+    return [
+      fromDate,
+      toDate,
+      userHistoryName,
+      userHistoryId,
+      userHistoryPhon,
+    ];
+  }
+
+  @override
+  bool get stringify => true;
+}

lib/pages/CyclePages/cycle_add_screen.dart

@@ -277,6 +277,10 @@ class _CycleAddScreenState extends State<CycleAddScreen> {
                                         initialLabelValue:
                                             cycleProvider.initialLabelValue,
                                         index: index,
+                                        hasRemoveButton:
+                                            cycleProvider.labelValues.length > 1
+                                                ? true
+                                                : false,
                                       ),
                                       itemCount:
                                           cycleProvider.labelValues.length,