1 files changed, 7 insertions, 9 deletions
diff --git a/lib/pages/agenda_page.dart b/lib/pages/agenda_page.dart
index 55c7360..a273cd0 100644
--- a/lib/pages/agenda_page.dart
+++ b/lib/pages/agenda_page.dart
@@ -9,10 +9,12 @@ import 'package:training_planner/widgets/agenda_week.dart';
 import 'package:flutter_local_notifications/flutter_local_notifications.dart';
 
 class AgendaPage extends StatefulWidget {
+  final int agendaWeekNr;
+
   @override
   _AgendaPageState createState() => _AgendaPageState();
 
-  const AgendaPage({Key? key}) : super(key: key);
+  const AgendaPage({Key? key, required this.agendaWeekNr}) : super(key: key);
 }
 
 class _AgendaPageState extends State<AgendaPage> {
@@ -28,10 +30,12 @@ class _AgendaPageState extends State<AgendaPage> {
   initState() {
     super.initState();
 
+    weekToStartAt = widget.agendaWeekNr;
     weeks = getWeeks();
 
     currentSelectedPageIndex = weekToStartAt;
     currentSelectedPageNr = weekNrs[weekToStartAt];
+    currentSelectedWeek = dateTimes[weekToStartAt];
   }
 
   List<Widget> getWeeks() {
@@ -52,7 +56,7 @@ class _AgendaPageState extends State<AgendaPage> {
 
       bool isCurrentWeek = false;
       if (mondayOfWeek == firstDayOfCurrentWeek) {
-        weekToStartAt = i;
+        if (weekToStartAt == 0) weekToStartAt = i;
         isCurrentWeek = true;
       }
 
@@ -102,13 +106,7 @@ class _AgendaPageState extends State<AgendaPage> {
                       pageIndex: currentSelectedPageIndex,
                       mondayOfWeek: currentSelectedWeek,
                     )),
-          ).then((val) => {
-                setState(() {
-                  weeks = getWeeks();
-                  currentSelectedPageIndex = weekToStartAt;
-                  currentSelectedPageNr = weekNrs[weekToStartAt];
-                })
-              });
+          );
         },
         backgroundColor: Style.titleColor,
         child: const Icon(Icons.add),