device predication implemented

lib/controllers/providers/api/devices_provider.dart

@@ -10,6 +10,7 @@ import 'package:test_sa/controllers/api_routes/http_status_manger.dart';
 import 'package:test_sa/controllers/api_routes/urls.dart';
 import 'package:test_sa/models/device/asset_by_id_model.dart';
 import 'package:test_sa/models/device/asset_search.dart';
+import 'package:test_sa/models/device/predict_device_model.dart';
 import 'package:test_sa/models/generic_attachment_model.dart';
 import 'package:test_sa/models/lookup.dart';
 import 'package:test_sa/models/user.dart';
@@ -259,31 +260,30 @@ class AssetProvider extends ChangeNotifier {
     }
   }
 
-  Future<bool> predictDevice(File imageFile) async {
+  Future<PredictDeviceResponse?> predictDevice(File image) async {
-    late Response response;
-
     try {
       final files = <Future<MultipartFile>>[
         MultipartFile.fromPath(
           'file',
-          imageFile.path,
+          image.path,
         ),
       ];
-      log('Uploading file: ${files.first.runtimeType}');
+
-      response = await ApiManager.instance.multiPart(
+      final response = await ApiManager.instance.multiPart(
         URLs.predictDevice,
         body: {},
         files: files,
       );
 
       if (response.statusCode >= 200 && response.statusCode < 300) {
-        return true;
+        final responseData = json.decode(response.body)['data'];
+        return PredictDeviceResponse.fromJson(responseData);
+      }else{
+        return null;
       }
-
-      return false;
     } catch (error) {
-      log('error: $error');
+      debugPrint('error i got in predictDevice: $error');
-      return false;
+      return null;
     }
   }
 }

lib/models/device/predict_device_model.dart

@@ -13,10 +13,10 @@ class PredictDeviceResponse {
     success = json['success'];
     timestamp = json['timestamp'];
 
-    if (json['PredictedAsset'] != null) {
+    if (json['predictedAsset'] != null) {
       predictedAsset = <PredictedAsset>[];
 
-      for (var item in json['PredictedAsset']) {
+      for (var item in json['predictedAsset']) {
         predictedAsset!.add(
           PredictedAsset.fromJson(item),
         );
@@ -28,7 +28,7 @@ class PredictDeviceResponse {
     return {
       'success': success,
       'timestamp': timestamp,
-      'PredictedAsset':
+      'predictedAsset':
       predictedAsset?.map((e) => e.toJson()).toList(),
     };
   }

lib/views/widgets/equipment/my_assets_page.dart

@@ -1,5 +1,5 @@
+import 'dart:developer';
 import 'dart:io';
-
 import 'package:flutter/cupertino.dart';
 import 'package:flutter/material.dart';
 import 'package:image_picker/image_picker.dart';
@@ -12,13 +12,16 @@ import 'package:test_sa/extensions/context_extension.dart';
 import 'package:test_sa/extensions/int_extensions.dart';
 import 'package:test_sa/extensions/text_extensions.dart';
 import 'package:test_sa/extensions/widget_extensions.dart';
+import 'package:test_sa/models/device/predict_device_model.dart';
 import 'package:test_sa/modules/tm_module/device_transfer/device_filter_screen.dart';
 import 'package:test_sa/modules/tm_module/device_transfer/device_search_screen.dart';
 import 'package:test_sa/modules/export_module/pages/export_form_view.dart';
 import 'package:test_sa/modules/export_module/models/export_module_type.dart';
+import 'package:test_sa/new_views/common_widgets/app_lazy_loading.dart';
 import 'package:test_sa/views/widgets/equipment/asset_detail_page.dart';
 import 'package:test_sa/views/widgets/equipment/asset_item_gridview.dart';
 import 'package:test_sa/views/widgets/equipment/asset_item_listview.dart';
+import 'package:test_sa/views/widgets/equipment/predict_device_list.dart';
 import 'package:test_sa/views/widgets/loaders/lazy_loading.dart';
 import 'package:test_sa/views/widgets/loaders/loading_manager.dart';
 import 'package:test_sa/views/widgets/loaders/no_data_found.dart';
@@ -685,8 +688,17 @@ class _MyAssetsPageState extends State<MyAssetsPage> with SingleTickerProviderSt
 
   Future<void> _uploadImage(File imageFile) async {
     try {
-      await _devicesProvider.predictDevice(imageFile);
+      showDialog(context: context, barrierDismissible: false, builder: (context) => const AppLazyLoading());
-      //PredictDeviceView
+      PredictDeviceResponse? response = await _devicesProvider.predictDevice(imageFile);
+      Navigator.pop(context);
+      if (response != null && response.success == true) {
+        final List<PredictedAsset> predictedAssetList = response.predictedAsset ?? [];
+        if (predictedAssetList.isNotEmpty) {
+          Navigator.push(context, MaterialPageRoute(builder: (context) => PredictDeviceView(predictedAsset: predictedAssetList)));
+        } else {
+          debugPrint('No Predicted asset found in the response.');
+        }
+      }
     } catch (e) {
       debugPrint('Upload error: $e');
     }

lib/views/widgets/equipment/predict_device_item_grid_view.dart

@@ -17,8 +17,8 @@ class PredictDeviceItemGridView extends StatelessWidget {
   @override
   Widget build(BuildContext context) {
     return Column(
-      mainAxisAlignment: MainAxisAlignment.spaceBetween,
       crossAxisAlignment: CrossAxisAlignment.start,
+      mainAxisSize: MainAxisSize.min,
       children: [
         Text(
           device.assetName!.cleanupWhitespace.capitalizeFirstOfEach,
@@ -26,29 +26,12 @@ class PredictDeviceItemGridView extends StatelessWidget {
           overflow: TextOverflow.ellipsis,
           style: AppTextStyles.bodyText.copyWith(color: AppColor.textStyleColor(context)),
         ),
-        Column(
-          crossAxisAlignment: CrossAxisAlignment.start,
-          mainAxisSize: MainAxisSize.min,
-          children: [
         InfoTextWidget(label: context.translation.assetNumber, value: device.metadata?.assetNumber),
         InfoTextWidget(label: 'Matching Percentage', value: device.confidencePercent),
         InfoTextWidget(label: context.translation.oracleCode, value: device.metadata?.oracleCode),
         InfoTextWidget(label: context.translation.site, value: device.metadata?.siteName),
-            InfoTextWidget(label: context.translation.department, value: device.metadata?.departmentName),
+        InfoTextWidget(label: context.translation.department, value: device.metadata?.departmentName,showArrow: true,),
-          ],
-        ).expanded,
-        Row(
-          mainAxisSize: MainAxisSize.min,
-          children: [
-            Text(
-              'View Details',
-              style: AppTextStyles.bodyText2.copyWith(color: AppColor.primary10),
-            ),
-            4.width,
-            const Icon(Icons.arrow_forward, color: AppColor.primary10, size: 14)
-          ],
-        ),
       ],
-    ).expanded.onPress(() => onPressed(device)).toShadowContainer(context);
+    ).onPress(() => onPressed(device)).toShadowContainer(context);
   }
 }

lib/views/widgets/equipment/predict_device_item_view.dart

@@ -21,35 +21,15 @@ class PredictDeviceItemView extends StatelessWidget {
     return Column(
       mainAxisAlignment: MainAxisAlignment.spaceBetween,
       crossAxisAlignment: CrossAxisAlignment.start,
-      children: [
-        Column(
-          crossAxisAlignment: CrossAxisAlignment.start,
-          mainAxisSize: MainAxisSize.min,
       children: [
         InfoHeaderWidget(device.assetName!.cleanupWhitespace),
         4.height,
         InfoTextWidget(label: context.translation.assetNumber, value: device.metadata?.assetNumber),
-            InfoTextWidget(label: 'Matching Percentage', value: device.confidencePercent),
+        InfoTextWidget(label: 'Confidence Percentage', value: device.confidencePercent),
         InfoTextWidget(label: context.translation.oracleCode, value: device.metadata?.oracleCode),
         InfoTextWidget(label: context.translation.site, value: device.metadata?.siteName),
-            InfoTextWidget(label: context.translation.department, value: device.metadata?.departmentName),
+        InfoTextWidget(label: context.translation.department, value: device.metadata?.departmentName,showArrow: true,),
-          ],
-        ),
-        Align(
-            alignment: Alignment.bottomRight,
-            child: selectButton ??
-                Row(
-                  mainAxisSize: MainAxisSize.min,
-                  children: [
-                    Text(
-                      context.translation.viewDetails,
-                      style: AppTextStyles.bodyText2.copyWith(color: AppColor.primary10),
-                    ),
-                    4.width,
-                    const Icon(Icons.arrow_forward, color: AppColor.primary10, size: 14)
-                  ],
-                ))
       ],
-    ).expanded.toShadowContainer(context, borderColor: isSelected ? AppColor.primary10 : Colors.transparent).onPress(() => onPressed(device));
+    ).toShadowContainer(context, borderColor: isSelected ? AppColor.primary10 : Colors.transparent).onPress(() => onPressed(device));
   }
 }

lib/views/widgets/equipment/predict_device_list.dart

@@ -13,7 +13,7 @@ import 'package:test_sa/views/widgets/equipment/predict_device_item_view.dart';
 import 'package:test_sa/views/widgets/loaders/no_data_found.dart';
 
 class PredictDeviceView extends StatefulWidget {
-  static const String id = "/single-device-Picker";
+  static const String id = "/predict_device_view";
   List<PredictedAsset> predictedAsset;
 
   PredictDeviceView({Key? key, required this.predictedAsset}) : super(key: key);
@@ -63,13 +63,7 @@ class _PredictDeviceViewState extends State<PredictDeviceView> with SingleTicker
           ),
         ],
       ),
-      body: SafeArea(
+      body: Stack(
-        child: Column(
-          children: [
-            Expanded(
-                child: widget.predictedAsset.isEmpty
-                    ? NoDataFound(message: context.translation.noDeviceFound).center
-                    : Stack(
               children: [
                 AnimatedSwitcher(
                   duration: const Duration(milliseconds: 500),
@@ -114,7 +108,8 @@ class _PredictDeviceViewState extends State<PredictDeviceView> with SingleTicker
                                 child: PredictDeviceItemView(
                                   device: widget.predictedAsset[itemIndex],
                                   onPressed: (device) {
-                                              Navigator.of(context).pushNamed(AssetDetailPage.id, arguments: device.assetId);
+                                    //We are not getting asset id in response only have serial number
+                                    // Navigator.of(context).pushNamed(AssetDetailPage.id, arguments: device.assetId);
                                   },
                                 ),
                               ),
@@ -123,7 +118,11 @@ class _PredictDeviceViewState extends State<PredictDeviceView> with SingleTicker
                         )
                       : GridView.builder(
                           key: const ValueKey('grid_view'),
-                                    gridDelegate: const SliverGridDelegateWithFixedCrossAxisCount(crossAxisCount: 2, childAspectRatio: 188 / 261, crossAxisSpacing: 12, mainAxisSpacing: 12),
+                          gridDelegate: const SliverGridDelegateWithFixedCrossAxisCount(
+                              crossAxisCount: 2,
+                              crossAxisSpacing: 12,
+                              childAspectRatio: 1.5,
+                              mainAxisSpacing: 12),
                           itemCount: widget.predictedAsset.length,
                           padding: const EdgeInsets.all(16),
                           itemBuilder: (context, index) {
@@ -161,7 +160,8 @@ class _PredictDeviceViewState extends State<PredictDeviceView> with SingleTicker
                                 child: PredictDeviceItemGridView(
                                   device: widget.predictedAsset[index],
                                   onPressed: (device) {
-                                              Navigator.of(context).pushNamed(AssetDetailPage.id, arguments: device.assetId);
+                                    //We are not getting asset id in response only have serial number
+                                    // Navigator.of(context).pushNamed(AssetDetailPage.id, arguments: device.assetId);
                                   },
                                 ),
                               ),
@@ -169,12 +169,8 @@ class _PredictDeviceViewState extends State<PredictDeviceView> with SingleTicker
                           },
                         ),
                 ),
-                          if (_devicesProvider.isLoading) Align(alignment: Alignment.bottomCenter, child: CircularProgressIndicator().paddingOnly(top: 16, bottom: 16)),
-                        ],
-                      )),
               ],
             ),
-      ),
     );
   }
 }