lib/data/repositories/book_instance_repository.dart

@@ -3,7 +3,6 @@ import 'package:seshat/domain/models/bal.dart';
 import 'package:seshat/domain/models/book.dart';
 import 'package:seshat/domain/models/book_instance.dart';
 import 'package:seshat/domain/models/owner.dart';
-import 'package:seshat/domain/models/search_result.dart';
 import 'package:seshat/utils/result.dart';
 
 class BookInstanceRepository {
@@ -16,14 +15,6 @@ class BookInstanceRepository {
     return await _apiClient.getBookInstanceByEAN(balId, ean);
   }
 
-  Future<Result<List<SearchResult>>> getBySearch(
-    int balId,
-    String title,
-    String author,
-  ) async {
-    return await _apiClient.getBookInstanceBySearch(balId, title, author);
-  }
-
   Future<Result<BookInstance>> sendBook(
     Book book,
     Owner owner,

lib/data/services/api_client.dart

@@ -8,7 +8,6 @@ import 'package:seshat/domain/models/bal.dart';
 import 'package:seshat/domain/models/book.dart';
 import 'package:seshat/domain/models/book_instance.dart';
 import 'package:seshat/domain/models/owner.dart';
-import 'package:seshat/domain/models/search_result.dart';
 import 'package:seshat/utils/command.dart';
 import 'package:seshat/utils/result.dart';
 
@@ -285,36 +284,6 @@ class ApiClient {
  * =============================
 */
 
-  Future<Result<List<SearchResult>>> getBookInstanceBySearch(
-    int balId,
-    String title,
-    String author,
-  ) async {
-    final client = Client();
-    try {
-      final headers = await _getHeaders({"Content-Type": "application/json"});
-      final body = jsonEncode({"title": title, "author": author});
-      debugPrint("\n\n\n\n$body\n\n\n\n");
-      final response = await client.post(
-        Uri.parse("https://$apiBasePath/bal/${balId.toString()}/search"),
-        headers: headers,
-        body: body,
-      );
-      if (response.statusCode == 200) {
-        final json = jsonDecode(response.body) as List<dynamic>;
-        debugPrint("\n\n\n\nJSON : $json\n\n\n\n");
-        return Result.ok(json.map((el) => SearchResult.fromJSON(el)).toList());
-      } else {
-        throw "Unknown Error";
-      }
-    } catch (e) {
-      debugPrint("\n\n\n\nERROR: ${e.toString()}\n\n\n\n");
-      return Result.error(Exception("API $e"));
-    } finally {
-      client.close();
-    }
-  }
-
   Future<Result<List<BookInstance>>> getBookInstanceByEAN(
     int balId,
     int ean,

lib/domain/models/search_result.dart

@@ -1,16 +0,0 @@
-import 'package:seshat/domain/models/book.dart';
-import 'package:seshat/domain/models/book_instance.dart';
-
-class SearchResult {
-  SearchResult(this.instance, this.book);
-  BookInstance instance;
-  Book book;
-
-  factory SearchResult.fromJSON(Map<String, dynamic> json) {
-    BookInstance instance = BookInstance.fromJSON(json["book_instance"]);
-
-    Book book = Book.fromJSON(json["book"]);
-
-    return SearchResult(instance, book);
-  }
-}

lib/ui/sell_page/view_model/sell_view_model.dart

@@ -9,7 +9,6 @@ import 'package:seshat/domain/models/book.dart';
 import 'package:seshat/domain/models/book_instance.dart';
 import 'package:seshat/domain/models/book_stack.dart';
 import 'package:seshat/domain/models/owner.dart';
-import 'package:seshat/domain/models/search_result.dart';
 import 'package:seshat/utils/command.dart';
 import 'package:seshat/utils/result.dart';
 
@@ -94,54 +93,7 @@ class SellViewModel extends ChangeNotifier {
     notifyListeners();
   }
 
-  Future<void> searchBook(String title, String author) async {
-    Bal? bal = await _balRepository.ongoingBal();
-    isScanLoaded = false;
-    _scannedBooks.clear();
-
-    final result = await _bookInstanceRepository.getBySearch(
-      bal!.id,
-      title,
-      author,
-    );
-    switch (result) {
-      case Ok():
-        for (SearchResult searchResult in result.value) {
-          if (searchResult.instance.available == false) {
-            continue;
-          }
-          if (_soldBooks
-              .where((book) => book.instance.id == searchResult.instance.id)
-              .isNotEmpty) {
-            continue;
-          }
-          Owner owner;
-          final result2 = await _ownerRepository.getOwnerById(
-            searchResult.instance.ownerId,
-          );
-          switch (result2) {
-            case Ok():
-              owner = result2.value;
-              break;
-            case Error():
-              continue;
-          }
-          _scannedBooks.add(
-            BookStack(searchResult.book, searchResult.instance, owner),
-          );
-        }
-        break;
-      case Error():
-        break;
-    }
-
-    isScanLoaded = true;
-    notifyListeners();
-    return;
-  }
-
   Future<void> scanBook(BarcodeCapture barcode) async {
-    isScanLoaded = false;
     int ean = int.parse(barcode.barcodes.first.rawValue!);
     Bal? bal = await _balRepository.ongoingBal();
     _scannedBooks.clear();
@@ -149,17 +101,6 @@ class SellViewModel extends ChangeNotifier {
     final result = await _bookInstanceRepository.getByEan(bal!.id, ean);
     switch (result) {
       case Ok():
-        Book book;
-        final result2 = await _bookRepository.getBookById(
-          result.value.first.bookId,
-        );
-        switch (result2) {
-          case Ok():
-            book = result2.value;
-            break;
-          case Error():
-            return;
-        }
         for (BookInstance instance in result.value) {
           if (instance.available == false) {
             continue;
@@ -169,6 +110,15 @@ class SellViewModel extends ChangeNotifier {
               .isNotEmpty) {
             continue;
           }
+          Book book;
+          final result2 = await _bookRepository.getBookById(instance.bookId);
+          switch (result2) {
+            case Ok():
+              book = result2.value;
+              break;
+            case Error():
+              continue;
+          }
           Owner owner;
           final result3 = await _ownerRepository.getOwnerById(instance.ownerId);
           switch (result3) {

lib/ui/sell_page/widgets/manual_scan_popup.dart

@@ -0,0 +1,46 @@
+import 'package:flutter/material.dart';
+import 'package:mobile_scanner/mobile_scanner.dart';
+import 'package:seshat/ui/sell_page/view_model/sell_view_model.dart';
+
+class ManualScanPopup extends StatelessWidget {
+  const ManualScanPopup({
+    super.key,
+    required this.viewModel,
+    required this.controller,
+  });
+
+  final SellViewModel viewModel;
+  final MobileScannerController controller;
+
+  @override
+  Widget build(BuildContext context) {
+    return AlertDialog(
+      title: Text("Recherche manuelle"),
+      content: Column(
+        mainAxisSize: MainAxisSize.min,
+        children: [
+          TextField(
+            decoration: InputDecoration(
+              labelText: "Rechercher",
+              suffixIcon: IconButton(
+                onPressed: () {},
+                icon: Icon(Icons.arrow_forward),
+              ),
+              border: OutlineInputBorder(),
+            ),
+          ),
+          SizedBox(height: 200),
+        ],
+      ),
+      actions: [
+        TextButton(
+          onPressed: () {
+            controller.start();
+            Navigator.of(context).pop();
+          },
+          child: Text("Annuler"),
+        ),
+      ],
+    );
+  }
+}

lib/ui/sell_page/widgets/manual_search_popup.dart

@@ -1,75 +0,0 @@
-import 'package:flutter/material.dart';
-import 'package:seshat/ui/sell_page/view_model/sell_view_model.dart';
-import 'package:seshat/ui/sell_page/widgets/sell_choice_popup.dart';
-
-class ManualSearchPopup extends StatefulWidget {
-  const ManualSearchPopup({super.key, required this.viewModel});
-
-  final SellViewModel viewModel;
-
-  @override
-  State<ManualSearchPopup> createState() => _ManualSearchPopupState();
-}
-
-class _ManualSearchPopupState extends State<ManualSearchPopup> {
-  String? title = "";
-  String? author = "";
-
-  @override
-  Widget build(BuildContext context) {
-    GlobalKey<FormState> _form = GlobalKey<FormState>();
-
-    return AlertDialog(
-      title: Text("Recherche manuelle"),
-      content: Form(
-        key: _form,
-        child: Column(
-          mainAxisSize: MainAxisSize.min,
-          children: [
-            TextFormField(
-              decoration: InputDecoration(
-                labelText: "Titre",
-                border: OutlineInputBorder(),
-              ),
-              onSaved: (newValue) => setState(() {
-                title = newValue;
-              }),
-            ),
-            SizedBox(height: 10),
-            TextFormField(
-              decoration: InputDecoration(
-                labelText: "Auteur",
-                border: OutlineInputBorder(),
-              ),
-              onSaved: (newValue) => setState(() {
-                author = newValue;
-              }),
-            ),
-          ],
-        ),
-      ),
-      actions: [
-        TextButton(
-          onPressed: () {
-            Navigator.of(context).pop();
-          },
-          child: Text("Annuler"),
-        ),
-
-        ElevatedButton(
-          onPressed: () {
-            _form.currentState!.save();
-            Navigator.of(context).pop();
-            showDialog(
-              context: context,
-              builder: (context) =>
-                  SellChoicePopup(viewModel: widget.viewModel),
-            );
-            widget.viewModel.searchBook(title ?? "", author ?? "");
-          },
-          child: Text("Rechercher"),
-        ),
-      ],
-    );
-  }
-}

lib/ui/sell_page/widgets/scan_screen.dart

@@ -2,7 +2,7 @@ import 'package:flutter/material.dart';
 import 'package:flutter_svg/svg.dart';
 import 'package:mobile_scanner/mobile_scanner.dart';
 import 'package:seshat/ui/sell_page/view_model/sell_view_model.dart';
-import 'package:seshat/ui/sell_page/widgets/manual_search_popup.dart';
+import 'package:seshat/ui/sell_page/widgets/manual_scan_popup.dart';
 import 'package:seshat/ui/sell_page/widgets/sell_choice_popup.dart';
 
 class ScanScreen extends StatefulWidget {
@@ -78,8 +78,10 @@ class _ScanScreenState extends State<ScanScreen> {
                   showDialog(
                     context: context,
                     barrierDismissible: false,
-                    builder: (context) =>
+                    builder: (context) => ManualScanPopup(
-                        ManualSearchPopup(viewModel: widget.viewModel),
+                      viewModel: widget.viewModel,
+                      controller: controller,
+                    ),
                   );
                 },
                 child: Text("Vendre un livre sans scanner"),

lib/ui/sell_page/widgets/sell_page.dart

@@ -172,7 +172,6 @@ class _SellPageState extends State<SellPage> {
                                     behavior: SnackBarBehavior.floating,
                                   ),
                                 );
-                                price.clear();
                                 return;
                               },
                               icon: Icon(Icons.check),