test commit

lib/providers/my_items.dart

@@ -92,6 +92,7 @@ class MyItemProvider extends ChangeNotifier {
     String url = Url.getMyItems(pageNumber);
     if (filterOn) {
       if (filters!.id != '') {
+        //!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! Modify this. Filter Items by ID dos'nt work!!!!
         url += '&item_id=${filters!.id}';
       }
       if (filters!.name != '') {
@@ -124,8 +125,12 @@ class MyItemProvider extends ChangeNotifier {
           name: item['name'],
           id: item['id'].toString(),
           size: item['size'].toString(),
-          fromDate: item['transfers']['from_date'],
-          toDate: item['transfers']['to_date'],
+          fromDate: item['transfers'].isNotEmpty
+              ? item['transfers']['from_date'].toString()
+              : '',
+          toDate: item['transfers'].isNotEmpty
+              ? item['transfers']['to_date'].toString()
+              : '',
         ),
       );
     }
@@ -137,6 +142,7 @@ class MyItemProvider extends ChangeNotifier {
     String url = Url.getHospitalItems(pageNumber);
     if (filterOn) {
       if (filters!.id != '') {
+        //!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! Modify this. Filter Items by ID dos'nt work!!!!
         url += '&item_id=${filters!.id}';
       }
       if (filters!.name != '') {
@@ -158,7 +164,6 @@ class MyItemProvider extends ChangeNotifier {
     );
 
     print(response.body);
-    print(response.statusCode);
 
     var itemsData = json.decode(response.body);
 
@@ -173,8 +178,12 @@ class MyItemProvider extends ChangeNotifier {
           id: item['id'].toString(),
           size: item['size'].toString(),
           userName: item['user'] != null ? item['user']['name'] : '',
-          // fromDate: item['transfers']['from_date'],
-          // toDate: item['transfers']['to_date'],
+          fromDate: item['transfers'].isNotEmpty
+              ? item['transfers']['from_date'].toString()
+              : '',
+          toDate: item['transfers'].isNotEmpty
+              ? item['transfers']['to_date'].toString()
+              : '',
         ),
       );
     }
@@ -196,9 +205,9 @@ class MyItemProvider extends ChangeNotifier {
     for (var item in itemsData['data']) {
       originalMyItemsRequests!.add(
         MyItemResultObject(
-          name: item['name'],
-          id: item['id'].toString(),
-          size: item['size'].toString(),
+          name: item['transferable']['name'],
+          id: item['transferable']['id'].toString(),
+          size: item['transferable']['size'].toString(),
         ),
       );
     }
@@ -212,15 +221,16 @@ class MyItemProvider extends ChangeNotifier {
     );
 
     var itemsData = json.decode(response.body);
+    print(itemsData);
 
     originalHospitalItemsRequests = [];
 
     for (var item in itemsData['data']) {
       originalHospitalItemsRequests!.add(
         MyItemResultObject(
-          name: item['name'],
-          id: item['id'].toString(),
-          size: item['size'].toString(),
+          name: item['transferable']['name'].toString(),
+          id: item['transferable']['id'].toString(),
+          size: item['transferable']['size'].toString(),
           userName: item['user'] != null ? item['user']['name'] : '',
         ),
       );
@@ -247,6 +257,24 @@ class MyItemProvider extends ChangeNotifier {
     print(itemData);
   }
 
+  Future<void> repairItems(String itemId, String value) async {
+    var response = await http.post(
+      Uri.parse(Url.repairItems(itemId)),
+      body: json.encode(
+        {
+          'status': value,
+        },
+      ),
+      headers: {
+        'Authorization': User.token,
+        'X-Requested-With': 'XMLHttpRequest',
+        "Content-Type": "application/json",
+        "Accept": "application/json"
+      },
+    );
+    print(response.statusCode);
+  }
+
   Future<bool> verifyItemRequests(String id, String value) async {
     var response = await http.post(
       Uri.parse(Url.verifyItemRequests(id, value)),
@@ -260,6 +288,8 @@ class MyItemProvider extends ChangeNotifier {
     );
 
     var itemData = json.decode(response.body);
+    print(response.statusCode);
+    print(itemData);
 
     try {
       if (itemData['data']['transfers']['status'] == 'approved') {
@@ -268,6 +298,7 @@ class MyItemProvider extends ChangeNotifier {
         return false;
       }
     } catch (e) {
+      print(e);
       return false;
     }
   }

lib/providers/my_packages.dart

@@ -79,7 +79,7 @@ class MyPackageProvider extends ChangeNotifier {
   }
 
   Future<void> getMyPackages() async {
-    String url = Url.getMyItems(pageNumber);
+    String url = Url.getMyPackages(pageNumber);
     if (filterOn) {
       if (filters!.id != '') {
         url += '&package_id=${filters!.id}';
@@ -107,8 +107,12 @@ class MyPackageProvider extends ChangeNotifier {
         MyPackageResultObject(
           name: package['name'],
           id: package['id'].toString(),
-          fromDate: package['transfers']['from_date'],
-          toDate: package['transfers']['to_date'],
+          // fromDate: package['transfers'].isNotEmpty
+          //     ? package['transfers']['from_date'].toString()
+          //     : '',
+          // toDate: package['transfers'].isNotEmpty
+          //     ? package['transfers']['to_date'].toString()
+          //     : '',
         ),
       );
     }
@@ -117,7 +121,7 @@ class MyPackageProvider extends ChangeNotifier {
   }
 
   Future<void> getHospitalPackages() async {
-    String url = Url.getHospitalItems(pageNumber);
+    String url = Url.getHospitalPackages(pageNumber);
     if (filterOn) {
       if (filters!.id != '') {
         url += '&package_id=${filters!.id}';
@@ -146,8 +150,12 @@ class MyPackageProvider extends ChangeNotifier {
           name: package['name'],
           id: package['id'].toString(),
           userName: package['user'] != null ? package['user']['name'] : '',
-          fromDate: package['transfers']['from_date'],
-          toDate: package['transfers']['to_date'],
+          // fromDate: package['transfers'].isNotEmpty
+          //     ? package['transfers']['from_date'].toString()
+          //     : '',
+          // toDate: package['transfers'].isNotEmpty
+          //     ? package['transfers']['to_date'].toString()
+          //     : '',
         ),
       );
     }
@@ -156,7 +164,7 @@ class MyPackageProvider extends ChangeNotifier {
   }
 
   Future<void> getMyPackageRequests() async {
-    String url = Url.getMyItemRequests;
+    String url = Url.getMyPackageRequests;
     var response = await http.get(
       Uri.parse(url),
       headers: {'Authorization': User.token, "Accept": "application/json"},
@@ -169,15 +177,15 @@ class MyPackageProvider extends ChangeNotifier {
     for (var package in packagesData['data']) {
       originalMyPackagesRequests!.add(
         MyPackageResultObject(
-          name: package['name'],
-          id: package['id'].toString(),
+          name: package['transferable']['name'],
+          id: package['transferable']['id'].toString(),
         ),
       );
     }
   }
 
   Future<void> getHospitalPackageRequests() async {
-    String url = Url.getHospitalItemRequests;
+    String url = Url.getHospitalPackageRequests;
     var response = await http.get(
       Uri.parse(url),
       headers: {'Authorization': User.token, "Accept": "application/json"},
@@ -190,8 +198,8 @@ class MyPackageProvider extends ChangeNotifier {
     for (var package in packagesData['data']) {
       originalHospitalPackagesRequests!.add(
         MyPackageResultObject(
-          name: package['name'],
-          id: package['id'].toString(),
+          name: package['transferable']['name'],
+          id: package['transferable']['id'].toString(),
           userName: package['user'] != null ? package['user']['name'] : '',
         ),
       );
@@ -200,7 +208,7 @@ class MyPackageProvider extends ChangeNotifier {
 
   Future<void> transferPackage(String packageId, String userId) async {
     var response = await http.post(
-      Uri.parse(Url.transferItems(packageId)),
+      Uri.parse(Url.transferPackages(packageId)),
       body: json.encode(
         {
           'user_id': userId,
@@ -220,7 +228,7 @@ class MyPackageProvider extends ChangeNotifier {
 
   Future<bool> verifyPackageRequests(String id, String value) async {
     var response = await http.post(
-      Uri.parse(Url.verifyItemRequests(id, value)),
+      Uri.parse(Url.verifyPackageRequests(id, value)),
       body: json.encode({'status': value}),
       headers: {
         'Authorization': User.token,

lib/providers/users.dart

@@ -16,6 +16,8 @@ class UsersProvider extends ChangeNotifier {
   String? medicalCenterId;
 
   int? selectedUserIndex;
+  Users? selectedUserForItems;
+  Users? selectedUserForPackages;
 
   String? saveUserId;
 
@@ -66,6 +68,7 @@ class UsersProvider extends ChangeNotifier {
         ),
       );
     }
+    searchUsers('');
   }
 
   Future<String?> getUserMedicalCenter() async {