Fixed missing inital same step experiments sorting. Set initial value…

… of IsServerEnabled to true.
abrechts · Feb 21, 2024 · 91dbc91 · 91dbc91
1 parent 1415cbd
commit 91dbc91
Show file tree

Hide file tree

Showing 7 changed files with 6 additions and 16 deletions.
diff --git a/CustomControls/App.config b/CustomControls/App.config
@@ -79,7 +79,7 @@
                 <value>g</value>
             </setting>
             <setting name="IsServerEnabled" serializeAs="String">
-                <value>True</value>
+                <value>False</value>
             </setting>
             <setting name="RestoreFromServer" serializeAs="String">
                 <value>False</value>

diff --git a/CustomControls/My Project/Settings.Designer.vb b/CustomControls/My Project/Settings.Designer.vb
diff --git a/CustomControls/My Project/Settings.settings b/CustomControls/My Project/Settings.settings
@@ -72,7 +72,7 @@
       <Value Profile="(Default)">g</Value>
     </Setting>
     <Setting Name="IsServerEnabled" Type="System.Boolean" Scope="User">
-      <Value Profile="(Default)">True</Value>
+      <Value Profile="(Default)">False</Value>
     </Setting>
     <Setting Name="RestoreFromServer" Type="System.Boolean" Scope="User">
       <Value Profile="(Default)">False</Value>

diff --git a/CustomControls/StepSummary.xaml b/CustomControls/StepSummary.xaml
@@ -42,7 +42,7 @@
             </StackPanel>
 
             <local:ComboPlus x:Name="cboSortType" SelectedIndex="0" HorizontalAlignment="Center" Margin="-10,1,0,4" Padding="6,1,6,2" 
-               CboBackground="white" VerticalAlignment="Center"  DockPanel.Dock="top">
+               CboBackground="white" VerticalAlignment="Center" DockPanel.Dock="top">
                 <ComboBoxItem Content="by yield"/>
                 <ComboBoxItem Content="by scale"/>
             </local:ComboPlus>

diff --git a/CustomControls/StepSummary.xaml.vb b/CustomControls/StepSummary.xaml.vb
@@ -31,7 +31,7 @@ Public Class StepSummary
 
         If Me.DataContext IsNot Nothing Then
             cvsStepExperiments.Source = CType(Me.DataContext, tblUsers).tblExperiments
-            cvsStepExperiments.View.Refresh()
+            cboSortType_Changed()
         End If
 
     End Sub

diff --git a/CustomControls/dlgServerConnection.xaml.vb b/CustomControls/dlgServerConnection.xaml.vb
@@ -3,7 +3,6 @@ Imports System.Windows
 Imports System.Windows.Input
 Imports ElnBase
 Imports ElnCoreModel
-Imports Microsoft.EntityFrameworkCore
 
 
 Public Class dlgServerConnection

diff --git a/PhoenixELN.sln b/PhoenixELN.sln
@@ -22,15 +22,6 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution
 		README.md = README.md
 	EndProjectSection
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "GitHub_Assets", "GitHub_Assets", "{610FECCA-813E-44EF-9C4D-13F1382387E2}"
-	ProjectSection(SolutionItems) = preProject
-		GitHub_Assets\Materials-Database.png = GitHub_Assets\Materials-Database.png
-		GitHub_Assets\Protocol_Overall_1.png = GitHub_Assets\Protocol_Overall_1.png
-		GitHub_Assets\Reaction-Editor.png = GitHub_Assets\Reaction-Editor.png
-		GitHub_Assets\Same_Step_List.png = GitHub_Assets\Same_Step_List.png
-		GitHub_Assets\Server-Login.png = GitHub_Assets\Server-Login.png
-	EndProjectSection
-EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU