From 28bf9de41f7cd512e7748a8e60295822e550b914 Mon Sep 17 00:00:00 2001 From: Yasien Mac Mini Date: Wed, 5 Mar 2025 09:52:28 +0200 Subject: [PATCH] reuire personal selected param in migh_calc --- .../{calculator.dart => mih_calculator.dart} | 8 ++++++-- Frontend/lib/mih_packages/mih_home/mih_home.dart | 4 ++-- Frontend/lib/mih_router/routeGenerator.dart | 16 +++++++++++----- 3 files changed, 19 insertions(+), 9 deletions(-) rename Frontend/lib/mih_packages/calculator/{calculator.dart => mih_calculator.dart} (96%) diff --git a/Frontend/lib/mih_packages/calculator/calculator.dart b/Frontend/lib/mih_packages/calculator/mih_calculator.dart similarity index 96% rename from Frontend/lib/mih_packages/calculator/calculator.dart rename to Frontend/lib/mih_packages/calculator/mih_calculator.dart index 3da3edfc..72555d9c 100644 --- a/Frontend/lib/mih_packages/calculator/calculator.dart +++ b/Frontend/lib/mih_packages/calculator/mih_calculator.dart @@ -9,7 +9,11 @@ import 'package:flutter/material.dart'; import 'package:flutter_swipe_detector/flutter_swipe_detector.dart'; class MIHCalculator extends StatefulWidget { - const MIHCalculator({super.key}); + final bool personalSelected; + const MIHCalculator({ + super.key, + required this.personalSelected, + }); @override State createState() => _MIHCalculatorState(); @@ -26,7 +30,7 @@ class _MIHCalculatorState extends State { Navigator.of(context).pop(); Navigator.of(context).popAndPushNamed( '/', - arguments: AuthArguments(true, false), + arguments: AuthArguments(widget.personalSelected, false), ); }, ); diff --git a/Frontend/lib/mih_packages/mih_home/mih_home.dart b/Frontend/lib/mih_packages/mih_home/mih_home.dart index 8708ca5a..2e4f0ab3 100644 --- a/Frontend/lib/mih_packages/mih_home/mih_home.dart +++ b/Frontend/lib/mih_packages/mih_home/mih_home.dart @@ -280,7 +280,7 @@ class _MIHHomeState extends State { onTap: () { Navigator.of(context).pushNamed( '/calculator', - //arguments: widget.signedInUser, + arguments: widget.personalSelected, ); }, tileName: "Calculator", @@ -486,7 +486,7 @@ class _MIHHomeState extends State { onTap: () { Navigator.of(context).pushNamed( '/calculator', - //arguments: widget.signedInUser, + arguments: widget.personalSelected, ); }, tileName: "Calculator", diff --git a/Frontend/lib/mih_router/routeGenerator.dart b/Frontend/lib/mih_router/routeGenerator.dart index b26bfbc5..e69e8450 100644 --- a/Frontend/lib/mih_router/routeGenerator.dart +++ b/Frontend/lib/mih_router/routeGenerator.dart @@ -1,6 +1,6 @@ import 'package:Mzansi_Innovation_Hub/mih_components/mih_package/test/package_test.dart'; import 'package:Mzansi_Innovation_Hub/mih_packages/calendar/mzansi_calendar.dart'; -import 'package:Mzansi_Innovation_Hub/mih_packages/calculator/calculator.dart'; +import 'package:Mzansi_Innovation_Hub/mih_packages/calculator/mih_calculator.dart'; import 'package:Mzansi_Innovation_Hub/mih_packages/mih_policy_tos/mih_privacy_polocy.dart'; import 'package:Mzansi_Innovation_Hub/mih_packages/mih_policy_tos/mih_terms_of_service.dart'; import 'package:Mzansi_Innovation_Hub/mih_packages/mzansi_ai/mzansi_ai.dart'; @@ -308,10 +308,16 @@ class RouteGenerator { //Calculator case '/calculator': - return MaterialPageRoute( - settings: settings, - builder: (_) => const MIHCalculator(), - ); + if (args is bool) { + return MaterialPageRoute( + settings: settings, + builder: (_) => MIHCalculator( + personalSelected: args, + ), + ); + } + return _errorRoute(); + //=============================================================== //===============================================================