diff --git a/SkyTeam/BuchungenPage.xaml.cs b/SkyTeam/BuchungenPage.xaml.cs index 936e51f..f6186ec 100644 --- a/SkyTeam/BuchungenPage.xaml.cs +++ b/SkyTeam/BuchungenPage.xaml.cs @@ -4,19 +4,16 @@ using System.Collections.ObjectModel; namespace SkyTeam { - public partial class MeineBuchungenPage : Page + public partial class BuchungenPage : Page { - public MeineBuchungenPage() + public BuchungenPage() { - - LoadBookings(); + + InitializeComponent(); } - private void LoadBookings() - { - - - } + + private void SearchBookingsButton_Click(object sender, RoutedEventArgs e) { @@ -30,7 +27,7 @@ namespace SkyTeam private void BookingsButton_Click(object sender, RoutedEventArgs e) { - ((MainWindow)Application.Current.MainWindow).MainFrame.Navigate(new MeineBuchungenPage()); + ((MainWindow)Application.Current.MainWindow).MainFrame.Navigate(new BuchungenPage()); } private void SettingsButton_Click(object sender, RoutedEventArgs e) @@ -40,7 +37,7 @@ namespace SkyTeam private void BookFlightButton_Click(object sender, RoutedEventArgs e) { - ((MainWindow)Application.Current.MainWindow).MainFrame.Navigate(new MeineBuchungenPage()); + ((MainWindow)Application.Current.MainWindow).MainFrame.Navigate(new BuchungenPage()); } private void LogoutButton_Click(object sender, RoutedEventArgs e) { @@ -57,5 +54,10 @@ namespace SkyTeam } + + private void OpenReservierungSuche_Click(object sender, RoutedEventArgs e) + { + ((MainWindow)Application.Current.MainWindow).MainFrame.Navigate(new ReservierungssuchePage()); + } } } diff --git a/SkyTeam/HomePage.xaml.cs b/SkyTeam/HomePage.xaml.cs index 810c14e..ce5ab6c 100644 --- a/SkyTeam/HomePage.xaml.cs +++ b/SkyTeam/HomePage.xaml.cs @@ -18,7 +18,7 @@ namespace SkyTeam private void BookingsButton_Click(object sender, RoutedEventArgs e) { - ((MainWindow)Application.Current.MainWindow).MainFrame.Navigate(new MeineBuchungenPage()); + ((MainWindow)Application.Current.MainWindow).MainFrame.Navigate(new BuchungenPage()); } private void SettingsButton_Click(object sender, RoutedEventArgs e) @@ -28,7 +28,7 @@ namespace SkyTeam private void BookFlightButton_Click(object sender, RoutedEventArgs e) { - ((MainWindow)Application.Current.MainWindow).MainFrame.Navigate(new MeineBuchungenPage()); + ((MainWindow)Application.Current.MainWindow).MainFrame.Navigate(new BuchungenPage()); } private void LogoutButton_Click(object sender, RoutedEventArgs e) { diff --git a/SkyTeam/LogInPage.xaml.cs b/SkyTeam/LogInPage.xaml.cs index 18c5385..e67f088 100644 --- a/SkyTeam/LogInPage.xaml.cs +++ b/SkyTeam/LogInPage.xaml.cs @@ -23,6 +23,7 @@ namespace SkyTeam public LogInPage() { InitializeComponent(); + } diff --git a/SkyTeam/MainWindow.xaml.cs b/SkyTeam/MainWindow.xaml.cs index e7c33ea..acb6674 100644 --- a/SkyTeam/MainWindow.xaml.cs +++ b/SkyTeam/MainWindow.xaml.cs @@ -8,32 +8,16 @@ namespace SkyTeam public MainWindow() { InitializeComponent(); -<<<<<<< HEAD - TestDatabaseConnection(); - } - - private void TestDatabaseConnection() - { - DataBase db = new DataBase(); - bool success = db.TestConnection(); - - if (success) - MessageBox.Show("Datenbank ist verfügbar!", "Erfolg", MessageBoxButton.OK, MessageBoxImage.Information); - else - MessageBox.Show("Probleme mit der Verbindung.", "Fehler", MessageBoxButton.OK, MessageBoxImage.Error); -======= ShowLoginPage(); } + + private void ShowLoginPage() { MainFrame.Navigate(new LogInPage()); } - public void NavigateToApp() - { - MainFrame.Navigate(new NavigationPage()); ->>>>>>> deaa68880afaf3dd53903180eef7a43c3e23056a - } + } } diff --git a/SkyTeam/SettingsPage.xaml.cs b/SkyTeam/SettingsPage.xaml.cs index db8d2da..0d3fc2a 100644 --- a/SkyTeam/SettingsPage.xaml.cs +++ b/SkyTeam/SettingsPage.xaml.cs @@ -57,7 +57,7 @@ namespace SkyTeam private void BookingsButton_Click(object sender, RoutedEventArgs e) { - ((MainWindow)Application.Current.MainWindow).MainFrame.Navigate(new MeineBuchungenPage()); + ((MainWindow)Application.Current.MainWindow).MainFrame.Navigate(new BuchungenPage()); } private void SettingsButton_Click(object sender, RoutedEventArgs e) @@ -67,7 +67,7 @@ namespace SkyTeam private void BookFlightButton_Click(object sender, RoutedEventArgs e) { - ((MainWindow)Application.Current.MainWindow).MainFrame.Navigate(new MeineBuchungenPage()); + ((MainWindow)Application.Current.MainWindow).MainFrame.Navigate(new BuchungenPage()); } private void LogoutButton_Click(object sender, RoutedEventArgs e) { diff --git a/SkyTeam/reservierungsSuche.xaml b/SkyTeam/reservierungsSuche.xaml index af06e2d..204a7aa 100644 --- a/SkyTeam/reservierungsSuche.xaml +++ b/SkyTeam/reservierungsSuche.xaml @@ -16,15 +16,21 @@ - - + + + + @@ -74,37 +80,41 @@ - - - - - - - - - - + - + + - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +