3 files changed, 18 insertions, 15 deletions
diff --git a/lib/pages/agenda_page.dart b/lib/pages/agenda_page.dart
index eca39fe..26eb877 100644
--- a/lib/pages/agenda_page.dart
+++ b/lib/pages/agenda_page.dart
@@ -1,10 +1,12 @@
 import 'package:carousel_slider/carousel_slider.dart';
 import 'package:flutter/material.dart';
 import 'package:in_date_utils/in_date_utils.dart' as DateUtilities;
+import 'package:training_planner/events/RefreshWeekEvent.dart';
 import 'package:training_planner/main.dart';
 import 'package:training_planner/pages/home_page.dart';
 import 'package:training_planner/shift.dart';
 import 'package:training_planner/style/style.dart';
+import 'package:training_planner/utils/date.dart';
 import 'package:training_planner/widgets/agenda_week.dart';
 
 class AgendaPage extends StatefulWidget {
@@ -76,7 +78,15 @@ class _AgendaPageState extends State<AgendaPage> {
           break;
       }
 
-      await shiftProvider.addShift(Shift(start: dayOfWeek, type: type));
+      bool success =
+          await shiftProvider.addShift(Shift(start: dayOfWeek, type: type));
+      if (!success) {
+        messageService.showMessage(
+            context,
+            '\'' +
+                DateHelper.getWeekdayNameFull(dayOfWeek.weekday) +
+                '\' is al ingepland');
+      }
     }
   }
 
@@ -98,7 +108,6 @@ class _AgendaPageState extends State<AgendaPage> {
       child: Text("Ok"),
       onPressed: () async {
         await addShiftsFromDialog();
-        setState(() {});
         Navigator.pop(context);
       },
     );
@@ -221,12 +230,7 @@ class _AgendaPageState extends State<AgendaPage> {
       floatingActionButton: FloatingActionButton(
         onPressed: () async {
           await showAddShiftDialog();
-          Navigator.pushReplacement(
-              context,
-              MaterialPageRoute(
-                  builder: (BuildContext context) => HomePage(
-                        agendaWeekNr: currentSelectedPageIndex,
-                      )));
+          eventBus.fire(RefreshWeekEvent());
         },
         backgroundColor: Style.titleColor,
         child: const Icon(Icons.add),
diff --git a/lib/pages/home_page.dart b/lib/pages/home_page.dart
index 6b81451..3b57a0f 100644
--- a/lib/pages/home_page.dart
+++ b/lib/pages/home_page.dart
@@ -31,6 +31,10 @@ class _HomePageState extends State<HomePage> {
   void _onItemTapped(int index) {
     setState(() {
       widget.agendaWeekNr = 0;
+      _widgetOptions = <Widget>[
+        new AgendaPage(agendaWeekNr: widget.agendaWeekNr),
+        new LogbookPage(),
+      ];
       _selectedIndex = index;
     });
   }
diff --git a/lib/pages/logbook_page.dart b/lib/pages/logbook_page.dart
index 0849cda..a9ef211 100644
--- a/lib/pages/logbook_page.dart
+++ b/lib/pages/logbook_page.dart
@@ -106,14 +106,9 @@ class _LogbookPageState extends State<LogbookPage> {
                 Text('Gewerkt: ' +
                     month.totalWorkedTime.inHours.toString() +
                     ' uur'),
-                Text('Verdiend: ' +
+                Text('Verdiend: €' +
                     month.expectedSalary.toStringAsFixed(2) +
-                    (month.shifts.isNotEmpty
-                        ? ' (' +
-                            (month.shifts[0].getMinutePayRate() * 60)
-                                .toStringAsFixed(2) +
-                            '/uur)'
-                        : '')),
+                    ' (schatting)'),
                 Padding(padding: EdgeInsets.only(left: 5, bottom: 5, right: 5)),
               ],
             ),