Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Changes made to popup buttons #2076

Merged
merged 4 commits into from
Nov 27, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
- Update Migration strategy to account for all Primary Keys when moving from staging -> live
- Fix UI issue with viewing cross-database SQL results
- Add UI Steps to deprecate old cohorts when importing a cohort
- Add instance setting to enable and disable Yes/No to all

## [8.3.1] - 2024-10-22

Expand Down
8 changes: 4 additions & 4 deletions Directory.Packages.props
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
<Project>
<ItemGroup>
<PackageVersion Include="AWSSDK.S3" Version="3.7.407" />
<PackageVersion Include="AWSSDK.SecurityToken" Version="3.7.401.5" />
<PackageVersion Include="AWSSDK.SSO" Version="3.7.400.56" />
<PackageVersion Include="AWSSDK.SSOOIDC" Version="3.7.400.56" />
<PackageVersion Include="AWSSDK.S3" Version="3.7.407.1" />
<PackageVersion Include="AWSSDK.SecurityToken" Version="3.7.401.6" />
<PackageVersion Include="AWSSDK.SSO" Version="3.7.400.57" />
<PackageVersion Include="AWSSDK.SSOOIDC" Version="3.7.400.57" />
<PackageVersion Include="CommandLineParser" Version="2.9.1" />
<PackageVersion Include="Equ" Version="2.3.0" />
<PackageVersion Include="ExcelNumberFormat" Version="1.1.0" />
Expand Down
2 changes: 1 addition & 1 deletion Rdmp.UI/ChecksUI/ChecksUI.cs
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ public partial class ChecksUI : UserControl, ICheckNotifier
private ConcurrentBag<CheckEventArgs> _results = new();
private bool outOfDate;

public ChecksUI()
public ChecksUI()
{
InitializeComponent();
olvChecks.ItemActivate += olvChecks_ItemActivate;
Expand Down
13 changes: 11 additions & 2 deletions Rdmp.UI/LoadExecutionUIs/ExecuteLoadMetadataUI.cs
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
using Rdmp.UI.CommandExecution.AtomicCommands;
using Rdmp.UI.ItemActivation;
using Rdmp.UI.TestsAndSetup.ServicePropogation;

using Rdmp.Core.Setting;

namespace Rdmp.UI.LoadExecutionUIs;

Expand All @@ -37,7 +37,6 @@ public partial class ExecuteLoadMetadataUI : DatasetLoadControl_Design
private LoadMetadata _loadMetadata;
private ILoadProgress[] _allLoadProgresses;


private ToolStripComboBox dd_DebugOptions = new();


Expand Down Expand Up @@ -74,6 +73,16 @@ public override void SetDatabaseObject(IActivateItems activator, LoadMetadata da

checkAndExecuteUI1.SetItemActivator(activator);

checkAndExecuteUI1.AllowsYesNoToAll = false;

if (activator.IsInteractive)
{
var ShowYestoAllNotoAlldataloadcheck = false;
var ShowYestoAllNotoAlldataloadcheckSetting = activator.RepositoryLocator.CatalogueRepository.GetAllObjects<Setting>().Where(s => s.Key == "ToggleYestoAllNotoAlldataloadcheck").FirstOrDefault();
if (ShowYestoAllNotoAlldataloadcheckSetting is not null) ShowYestoAllNotoAlldataloadcheck = Convert.ToBoolean(ShowYestoAllNotoAlldataloadcheckSetting.Value);
checkAndExecuteUI1.AllowsYesNoToAll = ShowYestoAllNotoAlldataloadcheck;

}
SetButtonStates(null, null);

SetLoadProgressGroupBoxState();
Expand Down
16 changes: 15 additions & 1 deletion Rdmp.UI/SimpleDialogs/InstanceSettings.Designer.cs

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

8 changes: 7 additions & 1 deletion Rdmp.UI/SimpleDialogs/InstanceSettings.cs
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,7 @@ public InstanceSettings(IActivateItems activator)

RegisterCheckbox(cbAutoSuggestProjectNumbers, "AutoSuggestProjectNumbers");
RegisterCheckbox(cbCohortVersioningOnCommit, "PromptForVersionOnCohortCommit");
RegisterCheckbox(cbYesNoAll, "ToggleYestoAllNotoAlldataloadcheck");
_loaded = true;
}

Expand Down Expand Up @@ -61,7 +62,7 @@ private void RegisterCheckbox(CheckBox cb, string propertyName)
var value = false;
if (prop is null)
{
prop = new Setting(_activator.RepositoryLocator.CatalogueRepository,propertyName, Convert.ToString(false));
prop = new Setting(_activator.RepositoryLocator.CatalogueRepository, propertyName, Convert.ToString(false));
prop.SaveToDatabase();
}
value = Convert.ToBoolean(prop.Value);
Expand All @@ -75,5 +76,10 @@ private void RegisterCheckbox(CheckBox cb, string propertyName)
// add help
AddTooltip(cb, propertyName);
}

private void checkBox1_CheckedChanged(object sender, EventArgs e)
{

}
}
}
4 changes: 2 additions & 2 deletions Rdmp.UI/SimpleDialogs/InstanceSettings.resx
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<root>
<!--
Microsoft ResX Schema
Microsoft ResX Schema

Version 2.0

Expand Down Expand Up @@ -48,7 +48,7 @@
value : The object must be serialized with
: System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
: and then encoded with base64 encoding.

mimetype: application/x-microsoft.net.object.soap.base64
value : The object must be serialized with
: System.Runtime.Serialization.Formatters.Soap.SoapFormatter
Expand Down
1 change: 1 addition & 0 deletions Rdmp.UI/SimpleDialogs/YesNoYesToAllDialog.cs
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@ public class YesNoYesToAllDialog : WideMessageBox
private bool NoToAllClicked;
private object lockShowDialog = new();


private FlowLayoutPanel p = new();
private Button btnYes = new() { Text = "Yes" };
private Button btnYesToAll = new() { Text = "Yes To All" };
Expand Down