Added path navigation to edit

+ Added navigation to edit page for ugeplanner +Added navigation to edit page for week plan selector - The edit week plan selector page does not work
aau-giraf · Nov 29, 2023 · e2f0578 · e2f0578
1 parent 9f7da51
commit e2f0578
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 7 deletions.
diff --git a/lib/screens/weekplan_screen.dart b/lib/screens/weekplan_screen.dart
@@ -14,6 +14,7 @@ import 'package:weekplanner/models/enums/app_bar_icons_enum.dart';
 import 'package:weekplanner/models/enums/weekplan_mode.dart';
 import 'package:weekplanner/models/user_week_model.dart';
 import 'package:weekplanner/routes.dart';
+import 'package:weekplanner/screens/new_weekplan_screen.dart';
 import 'package:weekplanner/screens/settings_screens/settings_screen.dart';
 import 'package:weekplanner/widgets/bottom_app_bar_button_widget.dart';
 import 'package:weekplanner/widgets/giraf_app_bar_widget.dart';
@@ -150,7 +151,7 @@ class WeekplanScreen extends StatelessWidget {
                               color: Colors.black,
                               icon: const Icon(Icons.create_outlined, size: 50),
                               onPressed: () {
-                                ///_pushEditWeekPlan(context); //Does not work yet
+                                Routes().push(context, NewWeekplanScreen());
                               },
                             ),
                           ),

diff --git a/lib/screens/weekplan_selector_screen.dart b/lib/screens/weekplan_selector_screen.dart
@@ -467,8 +467,10 @@ class _WeekplanSelectorScreenState extends State<WeekplanSelectorScreen> {
       bloc.loadPictogramById(weekplan.thumbnail.id);
     }
 
+
     if (isMarked) {
-       /// _pushEditWeekPlan(context); //Det virker men man siden bliver mærkelig
+
+       _pushEditWeekPlan(context); //Det virker men siden bliver mærkelig
       return Container(
           decoration: BoxDecoration(
             border: Border.all(color: theme.GirafColors.black, width: 5),
@@ -487,6 +489,7 @@ class _WeekplanSelectorScreenState extends State<WeekplanSelectorScreen> {
         current,
       );
     }
+
   }
 
   Widget _buildWeekplanCard(BuildContext context, WeekModel weekplan,
@@ -601,7 +604,7 @@ class _WeekplanSelectorScreenState extends State<WeekplanSelectorScreen> {
     );
   }
 
-
+/*
   /// Builds the BottomAppBar when in edit mode
   BottomAppBar _buildBottomAppBar(BuildContext context) {
     return BottomAppBar(
@@ -649,7 +652,7 @@ class _WeekplanSelectorScreenState extends State<WeekplanSelectorScreen> {
       ],
     ));
   }
-
+*/
 
 
   Future<void> _pushEditWeekPlan(BuildContext context) async {
@@ -675,12 +678,12 @@ class _WeekplanSelectorScreenState extends State<WeekplanSelectorScreen> {
     if (markedCount < 1) {
       return;
     }
+
     await Routes().push<WeekModel>(
       context,
-      EditWeekPlanScreen(
+      NewWeekplanScreen(
         user: widget._user,
-        weekModel: widget._weekBloc.getMarkedWeekModels()[0],
-        selectorBloc: widget._weekBloc,
+        existingWeekPlans: widget._weekBloc.weekNameModels,
       ),
     ).then((WeekModel newWeek) {
       widget._weekBloc.load(widget._user, true);