Merge remote-tracking branch 'origin/kenric' into frank

prs.desktop/Panels/Employees/EmployeePanel.xaml

@@ -10,7 +10,8 @@
              d:DesignHeight="800" d:DesignWidth="1100">
 
     <Grid>
-        <dynamicGrid:DynamicTabControl x:Name="Tab" SelectionChanged="Tab_SelectionChanged">
+        <dynamicGrid:DynamicTabControl x:Name="Tab" SelectionChanged="Tab_SelectionChanged"
+                                       TabStripPlacement="Bottom">
             <dynamicGrid:DynamicTabItem Header="Employees" x:Name="EmployeeTab">
                 <dynamicGrid:DynamicSplitPanel x:Name="SplitPanel" View="Combined" Anchor="Detail" AnchorWidth="400" MasterCaption="Employee List"
                                                DetailCaption="Employee Details" OnChanged="SplitPanel_OnChanged">

prs.desktop/Panels/Employees/EmployeePanel.xaml.cs

@@ -101,6 +101,19 @@ namespace PRSDesktop
                 Qualifications.Refresh(true, false);
                 Spreadsheets.Refresh(true, false);
                 Jobs.Refresh(true, false);
+
+                RoleCrossTab.Visibility = Security.CanView<Employee>()
+                    && Security.CanView<Role>()
+                    && Security.CanView<EmployeeRole>() ? Visibility.Visible : Visibility.Collapsed;
+                var visibleTabItems = Tab.Items.OfType<DynamicTabItem>().Where(x => x.Visibility == Visibility.Visible).ToList();
+                if(visibleTabItems.Count <= 1)
+                {
+                    foreach(var tab in visibleTabItems)
+                    {
+                        tab.Visibility = Visibility.Collapsed;
+                        Tab.SelectedItem = tab;
+                    }
+                }
             }
         }
 

prs.server/App.xaml.cs

@@ -1,4 +1,6 @@
-using System;
+using InABox.Core;
+using Syncfusion.Licensing;
+using System;
 using System.Diagnostics;
 using System.IO;
 using System.Linq;
@@ -60,6 +62,8 @@ namespace PRSServer
         protected override void OnStartup(StartupEventArgs e)
         {
             base.OnStartup(e);
+            SyncfusionLicenseProvider.RegisterLicense(CoreUtils.SyncfusionLicense(SyncfusionVersion.v23_2));
+
             if (Environment.UserInteractive)
             {
                 var args = Environment.GetCommandLineArgs();

prs.server/Forms/Configuration.xaml.cs

@@ -49,8 +49,6 @@ namespace PRSServer
             {
                 _settings = new LocalConfiguration<AutoUpdateSettings>().Load();
 
-                SyncfusionLicenseProvider.RegisterLicense(CoreUtils.SyncfusionLicense(SyncfusionVersion.v23_2));
-
                 StoreUtils.RegisterClasses();
                 CoreUtils.RegisterClasses();
                 ComalUtils.RegisterClasses();