2.2.0

lib/providers/my_items.dart

@@ -19,7 +19,7 @@ class MyItemProvider extends ChangeNotifier {
   List<MyItemResultObject>? originalMyItemsRequests;
   List<MyItemResultObject>? originalHospitalItemsRequests;
 
-  List<MyItemResultObject>? originalItemHistory;
+  List<ItemHistoryObject>? itemHistory;
 
   MyItemFilterObject? filters = MyItemFilterObject(
     id: '',
@@ -120,7 +120,7 @@ class MyItemProvider extends ChangeNotifier {
       originalMyItems = [];
     }
 
-    for (var item in itemsData['data']) {
+    for (var item in itemsData['data']['data']) {
       originalMyItems!.add(
         MyItemResultObject(
           name: item['name'],
@@ -157,15 +157,13 @@ class MyItemProvider extends ChangeNotifier {
       headers: {'Authorization': User.token, "Accept": "application/json"},
     );
 
-    print(response.body);
-
     var itemsData = json.decode(response.body);
 
     if (pageNumber == 1) {
       originalHospitalItems = [];
     }
 
-    for (var item in itemsData['data']) {
+    for (var item in itemsData['data']['data']) {
       originalHospitalItems!.add(
         MyItemResultObject(
           name: item['name'],
@@ -188,28 +186,22 @@ class MyItemProvider extends ChangeNotifier {
 
     var itemsData = json.decode(response.body)['data'];
 
-    String fromDate = '';
-    String toDate = '';
-    String userHistory = '';
+    itemHistory = [];
+
     for (var transfer in itemsData['transfers']) {
-      fromDate =
-          transfer['from_date'] != null ? transfer['from_date'].toString() : '';
-      toDate =
-          transfer['to_date'] != null ? transfer['to_date'].toString() : '';
-      userHistory = transfer['user']['name'].toString();
-    }
-    if (itemsData.isNotEmpty) {
-      originalItemHistory!.add(
-        MyItemResultObject(
-          name: itemsData['name'],
-          id: itemsData['id'].toString(),
-          size: itemsData['size'].toString(),
-          fromDate: fromDate,
-          toDate: toDate,
-          userHistory: userHistory,
+      itemHistory!.add(
+        ItemHistoryObject(
+          fromDate: transfer['from_date'] != null
+              ? transfer['from_date'].toString()
+              : '',
+          toDate: transfer['to_date'] != null
+              ? transfer['to_date'].toString()
+              : 'Now',
+          userHistoryName: transfer['user']['name'].toString(),
+          userHistoryId: transfer['user']['id'].toString(),
+          userHistoryPhon: transfer['user']['cell_number'].toString(),
         ),
       );
-      originalItemHistory!.reversed.toList();
     }
   }