Index: Application/Riskeer/src/Application.Riskeer/App.xaml.cs
===================================================================
diff -u -r60fdecbbb5c03aaaa9326ebd7cb9b224ad991947 -r5d59491a99d3e9ae9d65b24a8774d1db96e57f4f
--- Application/Riskeer/src/Application.Riskeer/App.xaml.cs (.../App.xaml.cs) (revision 60fdecbbb5c03aaaa9326ebd7cb9b224ad991947)
+++ Application/Riskeer/src/Application.Riskeer/App.xaml.cs (.../App.xaml.cs) (revision 5d59491a99d3e9ae9d65b24a8774d1db96e57f4f)
@@ -123,8 +123,9 @@
var settings = new GuiCoreSettings
{
- SupportEmailAddress = "www.helpdeskwater.nl",
- SupportPhoneNumber = "+31 (0)88-797 7102",
+ SupportWebsiteAddressUrl = "https://www.helpdeskwater.nl/onderwerpen/applicaties-modellen/applicaties-per/omgevings/omgevings/riskeer/",
+ SupportEmailAddressUrl = "https://www.helpdeskwater.nl/onderwerpen/applicaties-modellen/applicaties-per/omgevings/omgevings/riskeer/contact/vraag-ringtoets/",
+ SupportPhoneNumberUrl = "https://www.helpdeskwater.nl/secundaire-navigatie/contact/",
MainWindowTitle = "Riskeer",
ManualFilePath = "Gebruikershandleiding Riskeer 21.1.1.pdf"
};
Index: Core/Gui/src/Core.Gui/Commands/MainWindowCommands.cs
===================================================================
diff -u -r8339a812e145eab080917a65ceb6d27472b7c076 -r5d59491a99d3e9ae9d65b24a8774d1db96e57f4f
--- Core/Gui/src/Core.Gui/Commands/MainWindowCommands.cs (.../MainWindowCommands.cs) (revision 8339a812e145eab080917a65ceb6d27472b7c076)
+++ Core/Gui/src/Core.Gui/Commands/MainWindowCommands.cs (.../MainWindowCommands.cs) (revision 5d59491a99d3e9ae9d65b24a8774d1db96e57f4f)
@@ -67,5 +67,20 @@
/// The command for opening the user manual.
///
public static readonly ICommand OpenUserManualCommand = new RoutedCommand();
+
+ ///
+ /// The command for opening the helpdesk water website.
+ ///
+ public static readonly ICommand OpenHelpdeskWaterWebsiteCommand = new RoutedCommand();
+
+ ///
+ /// The command for opening the helpdesk water call information website.
+ ///
+ public static readonly ICommand CallHelpdeskWaterWebsiteCommand = new RoutedCommand();
+
+ ///
+ /// The command for opening the helpdesk water email information website.
+ ///
+ public static readonly ICommand EmailHelpdeskWaterWebsiteCommand = new RoutedCommand();
}
}
\ No newline at end of file
Index: Core/Gui/src/Core.Gui/Forms/Backstage/BackstageViewModel.cs
===================================================================
diff -u -r6f2f24378f372a8b22b5e5fa2b6987a804e3f7f6 -r5d59491a99d3e9ae9d65b24a8774d1db96e57f4f
--- Core/Gui/src/Core.Gui/Forms/Backstage/BackstageViewModel.cs (.../BackstageViewModel.cs) (revision 6f2f24378f372a8b22b5e5fa2b6987a804e3f7f6)
+++ Core/Gui/src/Core.Gui/Forms/Backstage/BackstageViewModel.cs (.../BackstageViewModel.cs) (revision 5d59491a99d3e9ae9d65b24a8774d1db96e57f4f)
@@ -21,6 +21,7 @@
using System;
using System.ComponentModel;
+using System.Diagnostics;
using System.Runtime.CompilerServices;
using System.Windows.Input;
using Core.Gui.Commands;
@@ -33,6 +34,7 @@
///
public class BackstageViewModel : INotifyPropertyChanged
{
+ private readonly GuiCoreSettings settings;
private IBackstagePageViewModel selectedViewModel;
private bool infoSelected;
private bool supportSelected;
@@ -54,16 +56,36 @@
throw new ArgumentNullException(nameof(settings));
}
+ this.settings = settings;
+
InfoViewModel = new InfoViewModel();
AboutViewModel = new AboutViewModel(settings.MainWindowTitle, version);
SupportViewModel = new SupportViewModel();
+ OpenHelpdeskWaterWebsiteCommand = new RelayCommand(OnOpenHelpdeskWaterWebsite);
+ EmailHelpdeskWaterSupportCommand = new RelayCommand(OnEmailHelpdeskWaterSupport);
+ CallHelpdeskWaterSupportCommand = new RelayCommand(OnCallHelpdeskWaterSupport);
SetSelectedViewModelCommand = new RelayCommand(OnSetCurrentViewModel);
SelectedViewModel = InfoViewModel;
}
///
+ /// Gets the open Helpdesk water website command.
+ ///
+ public ICommand OpenHelpdeskWaterWebsiteCommand { get; }
+
+ ///
+ /// Gets the open Helpdesk Water support command.
+ ///
+ public ICommand EmailHelpdeskWaterSupportCommand { get; }
+
+ ///
+ /// Gets the call Helpdesk Water support command.
+ ///
+ public ICommand CallHelpdeskWaterSupportCommand { get; }
+
+ ///
/// Gets the command to set the selected view model.
///
public ICommand SetSelectedViewModelCommand { get; }
@@ -157,6 +179,21 @@
SupportSelected = selectedViewModel is SupportViewModel;
}
+ private void OnOpenHelpdeskWaterWebsite(object obj)
+ {
+ Process.Start(settings.SupportWebsiteAddressUrl);
+ }
+
+ private void OnEmailHelpdeskWaterSupport(object obj)
+ {
+ Process.Start(settings.SupportEmailAddressUrl);
+ }
+
+ private void OnCallHelpdeskWaterSupport(object obj)
+ {
+ Process.Start(settings.SupportPhoneNumberUrl);
+ }
+
private void OnSetCurrentViewModel(object obj)
{
SelectedViewModel = (IBackstagePageViewModel) obj;
Index: Core/Gui/src/Core.Gui/Forms/Backstage/SupportBackstagePage.xaml
===================================================================
diff -u -r34219ecd23ac9062bbada84f001cafe8899a2cd9 -r5d59491a99d3e9ae9d65b24a8774d1db96e57f4f
--- Core/Gui/src/Core.Gui/Forms/Backstage/SupportBackstagePage.xaml (.../SupportBackstagePage.xaml) (revision 34219ecd23ac9062bbada84f001cafe8899a2cd9)
+++ Core/Gui/src/Core.Gui/Forms/Backstage/SupportBackstagePage.xaml (.../SupportBackstagePage.xaml) (revision 5d59491a99d3e9ae9d65b24a8774d1db96e57f4f)
@@ -26,6 +26,7 @@
xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
xmlns:backstage="clr-namespace:Core.Gui.Forms.Backstage"
+ xmlns:commands="clr-namespace:Core.Gui.Commands"
mc:Ignorable="d"
d:DataContext="{d:DesignInstance IsDesignTimeCreatable=False, Type={x:Type backstage:SupportViewModel}}">
@@ -130,19 +131,22 @@
Hierbij wordt intensief samengewerkt met diverse organisatieonderdelen zowel binnen Rijkswaterstaat als daar buiten. Op deze manier kan de helpdesk uw vragen snel en efficiƫnt beantwoorden, waarbij optimaal gebruik wordt gemaakt van de beschikbare kennis." />
-
+
Index: Core/Gui/src/Core.Gui/Forms/MainWindow/MainWindow.xaml
===================================================================
diff -u -r6f2f24378f372a8b22b5e5fa2b6987a804e3f7f6 -r5d59491a99d3e9ae9d65b24a8774d1db96e57f4f
--- Core/Gui/src/Core.Gui/Forms/MainWindow/MainWindow.xaml (.../MainWindow.xaml) (revision 6f2f24378f372a8b22b5e5fa2b6987a804e3f7f6)
+++ Core/Gui/src/Core.Gui/Forms/MainWindow/MainWindow.xaml (.../MainWindow.xaml) (revision 5d59491a99d3e9ae9d65b24a8774d1db96e57f4f)
@@ -55,6 +55,12 @@
Command="{Binding Path=OpenLogFileCommand, RelativeSource={RelativeSource Mode=FindAncestor, AncestorType=metro:MetroWindow}}" />
+
+
+
Index: Core/Gui/src/Core.Gui/Forms/MainWindow/MainWindow.xaml.cs
===================================================================
diff -u -r6f2f24378f372a8b22b5e5fa2b6987a804e3f7f6 -r5d59491a99d3e9ae9d65b24a8774d1db96e57f4f
--- Core/Gui/src/Core.Gui/Forms/MainWindow/MainWindow.xaml.cs (.../MainWindow.xaml.cs) (revision 6f2f24378f372a8b22b5e5fa2b6987a804e3f7f6)
+++ Core/Gui/src/Core.Gui/Forms/MainWindow/MainWindow.xaml.cs (.../MainWindow.xaml.cs) (revision 5d59491a99d3e9ae9d65b24a8774d1db96e57f4f)
@@ -345,8 +345,8 @@
var aboutDialog = new SplashScreen.SplashScreen
{
VersionText = SettingsHelper.Instance.ApplicationVersion,
- SupportEmail = settings.FixedSettings.SupportEmailAddress,
- SupportPhoneNumber = settings.FixedSettings.SupportPhoneNumber,
+ SupportEmail = settings.FixedSettings.SupportEmailAddressUrl,
+ SupportPhoneNumber = settings.FixedSettings.SupportPhoneNumberUrl,
AllowsTransparency = false,
WindowStyle = WindowStyle.SingleBorderWindow,
Title = Properties.Resources.About_DisplayName,
Index: Core/Gui/src/Core.Gui/Settings/GuiCoreSettings.cs
===================================================================
diff -u -r434415295de74c310ce6d3cdd0100c28838cf9ea -r5d59491a99d3e9ae9d65b24a8774d1db96e57f4f
--- Core/Gui/src/Core.Gui/Settings/GuiCoreSettings.cs (.../GuiCoreSettings.cs) (revision 434415295de74c310ce6d3cdd0100c28838cf9ea)
+++ Core/Gui/src/Core.Gui/Settings/GuiCoreSettings.cs (.../GuiCoreSettings.cs) (revision 5d59491a99d3e9ae9d65b24a8774d1db96e57f4f)
@@ -27,22 +27,27 @@
public class GuiCoreSettings
{
///
- /// Gets or sets the support email address to show in the graphical user interface.
+ /// Gets or sets the support website address url.
///
- public string SupportEmailAddress { get; set; }
+ public string SupportWebsiteAddressUrl { get; set; }
+
+ ///
+ /// Gets or sets the support email address url.
+ ///
+ public string SupportEmailAddressUrl { get; set; }
///
- /// Gets or sets the support phone number to show in the graphical user interface.
+ /// Gets or sets the support phone number url.
///
- public string SupportPhoneNumber { get; set; }
+ public string SupportPhoneNumberUrl { get; set; }
///
- /// Gets or sets the title to show in the main window of the graphical user interface.
+ /// Gets or sets the title of the main window.
///
public string MainWindowTitle { get; set; }
///
- /// Gets or sets the path of the manual file to use in the graphical interface.
+ /// Gets or sets the path of the manual file.
///
public string ManualFilePath { get; set; }
}
Index: Core/Gui/test/Core.Gui.Test/Commands/MainWindowCommandsTest.cs
===================================================================
diff -u -r8339a812e145eab080917a65ceb6d27472b7c076 -r5d59491a99d3e9ae9d65b24a8774d1db96e57f4f
--- Core/Gui/test/Core.Gui.Test/Commands/MainWindowCommandsTest.cs (.../MainWindowCommandsTest.cs) (revision 8339a812e145eab080917a65ceb6d27472b7c076)
+++ Core/Gui/test/Core.Gui.Test/Commands/MainWindowCommandsTest.cs (.../MainWindowCommandsTest.cs) (revision 5d59491a99d3e9ae9d65b24a8774d1db96e57f4f)
@@ -40,6 +40,9 @@
ICommand toggleBackstageCommand = MainWindowCommands.ToggleBackstageCommand;
ICommand openLogFileCommand = MainWindowCommands.OpenLogFileCommand;
ICommand openUserManualCommand = MainWindowCommands.OpenUserManualCommand;
+ ICommand openHelpdeskWaterWebsiteCommand = MainWindowCommands.OpenHelpdeskWaterWebsiteCommand;
+ ICommand callHelpdeskWaterWebsiteCommand = MainWindowCommands.CallHelpdeskWaterWebsiteCommand;
+ ICommand emailHelpdeskWaterWebsiteCommand = MainWindowCommands.EmailHelpdeskWaterWebsiteCommand;
// Assert
Assert.IsInstanceOf(newProjectCommand);
@@ -50,6 +53,9 @@
Assert.IsInstanceOf(toggleBackstageCommand);
Assert.IsInstanceOf(openLogFileCommand);
Assert.IsInstanceOf(openUserManualCommand);
+ Assert.IsInstanceOf(openHelpdeskWaterWebsiteCommand);
+ Assert.IsInstanceOf(callHelpdeskWaterWebsiteCommand);
+ Assert.IsInstanceOf(emailHelpdeskWaterWebsiteCommand);
}
}
}
\ No newline at end of file
Index: Core/Gui/test/Core.Gui.Test/Forms/Backstage/BackstageViewModelTest.cs
===================================================================
diff -u -r6f2f24378f372a8b22b5e5fa2b6987a804e3f7f6 -r5d59491a99d3e9ae9d65b24a8774d1db96e57f4f
--- Core/Gui/test/Core.Gui.Test/Forms/Backstage/BackstageViewModelTest.cs (.../BackstageViewModelTest.cs) (revision 6f2f24378f372a8b22b5e5fa2b6987a804e3f7f6)
+++ Core/Gui/test/Core.Gui.Test/Forms/Backstage/BackstageViewModelTest.cs (.../BackstageViewModelTest.cs) (revision 5d59491a99d3e9ae9d65b24a8774d1db96e57f4f)
@@ -66,6 +66,9 @@
Assert.IsNotNull(viewModel.SupportViewModel);
+ Assert.IsNotNull(viewModel.OpenHelpdeskWaterWebsiteCommand);
+ Assert.IsNotNull(viewModel.CallHelpdeskWaterSupportCommand);
+ Assert.IsNotNull(viewModel.EmailHelpdeskWaterSupportCommand);
Assert.IsNotNull(viewModel.SetSelectedViewModelCommand);
Assert.AreSame(viewModel.InfoViewModel, viewModel.SelectedViewModel);