Merge pull request 'fixed update tender intenders after in details updated and web issues inmobile and tablet' (#76) from some_fixes into main

Reviewed-on: https://repo.ravanertebat.com/TM/tm_app/pulls/76

lib/core/config/dependencies.dart

@@ -84,17 +84,18 @@ List<SingleChildWidget> get viewModels {
     ChangeNotifierProvider(
       create: (context) => HomeViewModel(homeRepository: context.read()),
     ),
+    ChangeNotifierProvider(
+      create: (context) => TendersViewModel(tendersRepository: context.read()),
+    ),
     ChangeNotifierProvider(
       create:
           (context) => TenderDetailViewModel(
             tenderDetailRepository: context.read(),
             tendersRepository: context.read(),
+            tendersViewModel: context.read(),
           ),
     ),
 
-    ChangeNotifierProvider(
-      create: (context) => TendersViewModel(tendersRepository: context.read()),
-    ),
     ChangeNotifierProvider(
       create:
           (context) =>

lib/view_models/profile_view_model.dart

@@ -93,7 +93,7 @@ class ProfileViewModel with ChangeNotifier {
 
     switch (result) {
       case Ok<LogoutResponse>():
-        _authViewModel.localLogout();
+        await _authViewModel.localLogout();
         _loggedOut = true;
         break;
       case Error<LogoutResponse>():

lib/view_models/tender_detail_view_model.dart

@@ -8,16 +8,20 @@ import 'package:tm_app/data/services/model/tender_detail_response/tender_detail_
 import '../data/services/model/tender_approvals_by_id_response/tender_approvals_by_id_response.dart';
 import '../data/services/model/tender_approvals_data/tender_approvals_data.dart';
 import '../data/services/model/tender_approvals_toggle_response/tender_approvals_toggle_response.dart';
+import 'tenders_view_model.dart';
 
 class TenderDetailViewModel with ChangeNotifier {
   final TenderDetailRepository _tenderDetailRepository;
   final TendersRepository _tendersRepository;
+  final TendersViewModel _tendersViewModel;
 
   TenderDetailViewModel({
     required TenderDetailRepository tenderDetailRepository,
     required TendersRepository tendersRepository,
+    required TendersViewModel tendersViewModel,
   }) : _tenderDetailRepository = tenderDetailRepository,
-       _tendersRepository = tendersRepository;
+       _tendersRepository = tendersRepository,
+       _tendersViewModel = tendersViewModel;
 
   bool _isLoading = false;
   bool _isSubmitApprovalLoading = false;
@@ -114,6 +118,10 @@ class TenderDetailViewModel with ChangeNotifier {
     notifyListeners();
   }
 
+  void updateTenderApprovals(String tenderId) {
+    _tendersViewModel.getTenderApprovals(tenderId);
+  }
+
   Future<void> getTenderApprovals(String tenderId) async {
     _errorMessage = null;
     notifyListeners();

lib/views/detail/pages/detail_desktop_page.dart

@@ -10,7 +10,6 @@ import 'package:tm_app/views/detail/widgets/tender_detail_header.dart';
 
 import '../../../core/constants/strings.dart';
 import '../../../view_models/home_view_model.dart';
-import '../../../view_models/tenders_view_model.dart';
 import '../../shared/desktop_navigation_widget.dart';
 
 class TenderDetailDesktopPage extends StatefulWidget {
@@ -81,7 +80,9 @@ class _TenderDetailDesktopPageState extends State<TenderDetailDesktopPage> {
     return PopScope(
       onPopInvokedWithResult: (didPop, result) {
         WidgetsBinding.instance.addPostFrameCallback((_) {
-          context.read<TendersViewModel>().getTenderApprovals(widget.tenderId);
+          context.read<TenderDetailViewModel>().updateTenderApprovals(
+            widget.tenderId,
+          );
         });
       },
       child: Scaffold(

lib/views/detail/pages/detail_mobile_page.dart

@@ -1,3 +1,4 @@
+import 'package:flutter/foundation.dart';
 import 'package:flutter/material.dart';
 import 'package:provider/provider.dart';
 import 'package:tm_app/core/constants/strings.dart';
@@ -73,7 +74,17 @@ class _TenderDetailMobilePageState extends State<TenderDetailMobilePage> {
 
   @override
   Widget build(BuildContext context) {
-    return Scaffold(
+    return PopScope(
+      onPopInvokedWithResult: (didPop, result) {
+        if (kIsWeb) {
+          WidgetsBinding.instance.addPostFrameCallback((_) {
+            context.read<TenderDetailViewModel>().updateTenderApprovals(
+              widget.tenderId,
+            );
+          });
+        }
+      },
+      child: Scaffold(
         backgroundColor: AppColors.backgroundColor,
         appBar: appBar(context: context, title: AppStrings.tenderDetailTitle),
         body: Consumer<TenderDetailViewModel>(
@@ -110,6 +121,7 @@ class _TenderDetailMobilePageState extends State<TenderDetailMobilePage> {
             );
           },
         ),
+      ),
     );
   }
 }

lib/views/detail/pages/detail_tablet_page.dart

@@ -1,3 +1,4 @@
+import 'package:flutter/foundation.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_svg/flutter_svg.dart';
 import 'package:go_router/go_router.dart';
@@ -79,8 +80,18 @@ class _TenderDetailTabletPageState extends State<TenderDetailTabletPage> {
   @override
   Widget build(BuildContext context) {
     final GlobalKey<ScaffoldState> key = GlobalKey();
-    return Scaffold(
+    return PopScope(
+      onPopInvokedWithResult: (didPop, result) {
+        if (kIsWeb) {
+          WidgetsBinding.instance.addPostFrameCallback((_) {
+            context.read<TenderDetailViewModel>().updateTenderApprovals(
+              widget.tenderId,
+            );
+          });
+        }
+      },
       key: key,
+      child: Scaffold(
         backgroundColor: AppColors.backgroundColor,
         appBar: PreferredSize(
           preferredSize: const Size.fromHeight(64),
@@ -165,6 +176,7 @@ class _TenderDetailTabletPageState extends State<TenderDetailTabletPage> {
             );
           },
         ),
+      ),
     );
   }
 }