2.2.0

lib/pages/MyItemsPages/Result/my_items_mine_screen.dart

@@ -218,10 +218,12 @@ class _MyItemsMineScreenState extends State<MyItemsMineScreen> {
                                         items:
                                             itemResults.hospitalItems?[index],
                                         push: () {
-                                          Navigator.pushNamed(context,
-                                              Routes.myItemsHistoryScreen,
-                                              arguments: itemResults
-                                                  .hospitalItems?[index]);
+                                          Navigator.pushNamed(
+                                            context,
+                                            Routes.myItemsHistoryScreen,
+                                            arguments: itemResults
+                                                .hospitalItems?[index],
+                                          );
                                         },
                                       );
                                     }

lib/pages/MyItemsPages/my_items_history_screen.dart

@@ -2,6 +2,7 @@ import 'package:cssd/models/my_item_model.dart';
 import 'package:cssd/providers/auth.dart';
 import 'package:cssd/providers/my_items.dart';
 import 'package:cssd/widgets/MyItemsScreens/History/my_items_history_date_widget.dart';
+import 'package:cssd/widgets/MyItemsScreens/History/user_item_history_box.dart';
 import 'package:cssd/widgets/MyItemsScreens/Result/my_items_data_box_widget.dart';
 
 import '../../config/routes.dart';
@@ -26,6 +27,7 @@ class _MyItemsHistoryScreenState extends State<MyItemsHistoryScreen> {
   bool _isInit = true;
   ScrollController? sc;
   MyItemResultObject? itemData;
+  ItemHistoryObject? historyData;
 
   @override
   void initState() {
@@ -117,8 +119,8 @@ class _MyItemsHistoryScreenState extends State<MyItemsHistoryScreen> {
                         ),
                         Expanded(
                           child: Consumer<MyItemProvider>(
-                            builder: (context, userResults, child) {
-                              return userResults.isloading
+                            builder: (context, itemResults, child) {
+                              return itemResults.isloading
                                   ? Center(
                                       child: CircularProgressIndicator(
                                         color: Colors.black,
@@ -132,15 +134,18 @@ class _MyItemsHistoryScreenState extends State<MyItemsHistoryScreen> {
                                       itemBuilder: (context, index) {
                                         return Column(
                                           children: [
-                                            ItemHistoryDate(
-                                              deviceBlockSize: _deviceBlockSize,
-                                              items: itemData!,
-                                            ),
                                             SizedBox(
                                               height: 20.0,
                                             ),
-                                            Text(
-                                              itemData!.userHistory.toString(),
+                                            ItemHistoryDate(
+                                              deviceBlockSize: _deviceBlockSize,
+                                              items: itemResults
+                                                  .itemHistory![index],
+                                            ),
+                                            UserItemDataBox(
+                                              deviceBlockSize: _deviceBlockSize,
+                                              user: itemResults
+                                                  .itemHistory![index],
                                             ),
                                             SizedBox(
                                               height: 20.0,
@@ -148,13 +153,13 @@ class _MyItemsHistoryScreenState extends State<MyItemsHistoryScreen> {
                                           ],
                                         );
                                       },
-                                      itemCount: userResults
-                                          .originalItemHistory!.length,
+                                      itemCount:
+                                          itemResults.itemHistory!.length,
                                       shrinkWrap: true,
                                     );
                             },
                           ),
-                        )
+                        ),
                       ],
                     ),
                   )

lib/pages/MyItemsPages/my_items_transfer_screen.dart

@@ -45,6 +45,7 @@ class _ItemsTransferScreenState extends State<ItemsTransferScreen> {
       itemData =
           ModalRoute.of(context)!.settings.arguments as ItemDetailObject?;
       var userResults = Provider.of<UsersProvider>(context);
+      userResults.resetSelectedUser();
       userResults.setLoading();
       String medicalCenterId =
           await userResults.getUserMedicalCenter() as String;
@@ -121,6 +122,7 @@ class _ItemsTransferScreenState extends State<ItemsTransferScreen> {
                             text: 'user',
                             text2: 'name or ID',
                             deviceBlockSize: _deviceBlockSize,
+                            textInputType: TextInputType.name,
                             onChanged: (value) {
                               Provider.of<UsersProvider>(context, listen: false)
                                   .searchUsers(value);