yaso_meth/mih-project
2
4
Fork 2
Code Issues 8 Pull Requests Actions Packages Projects Releases 1 Wiki Activity

Merge pull request #90 from yaso-meth/BUG--Calc-back-navigation

Browse Source 
require personal selected param in migh_calc
This commit is contained in:
yaso-meth
2025-03-05 10:04:26 +02:00
committed by GitHub
parent af1258803b 28bf9de41f
commit 00e3fa7505
3 changed files with 19 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
Frontend/lib/mih_packages/calculator/calculator.dart → Frontend/lib/mih_packages/calculator/mih_calculator.dart
View File

@@ -9,7 +9,11 @@ import 'package:flutter/material.dart';
import 'package:flutter_swipe_detector/flutter_swipe_detector.dart'; import 'package:flutter_swipe_detector/flutter_swipe_detector.dart';
class MIHCalculator extends StatefulWidget { class MIHCalculator extends StatefulWidget {
const MIHCalculator({super.key}); final bool personalSelected;
const MIHCalculator({
super.key,
required this.personalSelected,
});
@override @override
State<MIHCalculator> createState() => _MIHCalculatorState(); State<MIHCalculator> createState() => _MIHCalculatorState();
@@ -26,7 +30,7 @@ class _MIHCalculatorState extends State<MIHCalculator> {
Navigator.of(context).pop(); Navigator.of(context).pop();
Navigator.of(context).popAndPushNamed( Navigator.of(context).popAndPushNamed(
'/', '/',
arguments: AuthArguments(true, false), arguments: AuthArguments(widget.personalSelected, false),
); );
}, },
); );

4
Frontend/lib/mih_packages/mih_home/mih_home.dart
View File

@@ -280,7 +280,7 @@ class _MIHHomeState extends State<MIHHome> {
onTap: () { onTap: () {
Navigator.of(context).pushNamed( Navigator.of(context).pushNamed(
'/calculator', '/calculator',
//arguments: widget.signedInUser, arguments: widget.personalSelected,
); );
}, },
tileName: "Calculator", tileName: "Calculator",
@@ -486,7 +486,7 @@ class _MIHHomeState extends State<MIHHome> {
onTap: () { onTap: () {
Navigator.of(context).pushNamed( Navigator.of(context).pushNamed(
'/calculator', '/calculator',
//arguments: widget.signedInUser, arguments: widget.personalSelected,
); );
}, },
tileName: "Calculator", tileName: "Calculator",

16
Frontend/lib/mih_router/routeGenerator.dart
View File

@@ -1,6 +1,6 @@
import 'package:Mzansi_Innovation_Hub/mih_components/mih_package/test/package_test.dart'; 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/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_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/mih_policy_tos/mih_terms_of_service.dart';
import 'package:Mzansi_Innovation_Hub/mih_packages/mzansi_ai/mzansi_ai.dart'; import 'package:Mzansi_Innovation_Hub/mih_packages/mzansi_ai/mzansi_ai.dart';
@@ -308,10 +308,16 @@ class RouteGenerator {
//Calculator //Calculator
case '/calculator': case '/calculator':
return MaterialPageRoute( if (args is bool) {
settings: settings, return MaterialPageRoute(
builder: (_) => const MIHCalculator(), settings: settings,
); builder: (_) => MIHCalculator(
personalSelected: args,
),
);
}
return _errorRoute();
//===============================================================
//=============================================================== //===============================================================