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

Add ExecuteCommandImportDatabase WIP #449

Open
wants to merge 6 commits into
base: develop
Choose a base branch
from
Open
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
6 changes: 6 additions & 0 deletions .github/dependabot.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,3 +13,9 @@ updates:
open-pull-requests-limit: 99
reviewers:
- SMI/reviewers
- package-ecosystem: "dotnet-sdk"
directory: "/"
schedule:
interval: weekly
reviewers:
- SMI/reviewers
1 change: 1 addition & 0 deletions .github/workflows/codeql.yml
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,7 @@ jobs:
repository: HicServices/RDMP
ref: develop
path: RDMP
- uses: actions/setup-dotnet@v4

- name: Initialize CodeQL
uses: github/codeql-action/init@v3
Expand Down
2 changes: 0 additions & 2 deletions .github/workflows/dotnet-core.yml
Original file line number Diff line number Diff line change
Expand Up @@ -20,8 +20,6 @@ jobs:
ref: develop
path: RDMP
- uses: actions/setup-dotnet@v4
with:
dotnet-version: 8.0.x
- name: Get version
id: version
shell: cmd
Expand Down
2 changes: 2 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0

## [Unreleased]

- Add new command ImportDatabase to generate RDMP metadata for an existing SMI-type DB

## [7.1.3] 2024-12-02

- Bump RDMP from 8.3.1 to 8.4.0
Expand Down
9 changes: 4 additions & 5 deletions Rdmp.Dicom.Tests/Rdmp.Dicom.Tests.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<PropertyGroup>
<RootNamespace>Rdmp.Dicom.Tests</RootNamespace>
<AssemblyName>Rdmp.Dicom.Tests</AssemblyName>
<TargetFramework>net8.0</TargetFramework>
<TargetFramework>net$(NETCoreAppMaximumVersion)</TargetFramework>
<GenerateAssemblyInfo>false</GenerateAssemblyInfo>
</PropertyGroup>
<ItemGroup>
Expand Down Expand Up @@ -42,15 +42,14 @@
</ItemGroup>
<ItemGroup>
<PackageReference Include="HIC.BadMedicine.Dicom" Version="0.1.2" />
<PackageReference Include="Microsoft.Extensions.Logging.Console" Version="9.0.0" />
<PackageReference Include="Microsoft.Extensions.Logging.Console" Version="9.0.1" />
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.12.0" />
<PackageReference Include="NUnit" Version="4.2.2" />
<PackageReference Include="NUnit.Analyzers" Version="4.4.0">
<PackageReference Include="NUnit" Version="4.3.2" />
<PackageReference Include="NUnit.Analyzers" Version="4.6.0">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageReference>
<PackageReference Include="NUnit3TestAdapter" Version="4.6.0" />
<PackageReference Include="NunitXml.TestLogger" Version="4.1.0" />
</ItemGroup>
<ItemGroup>
<None Update="TestDatabases.txt">
Expand Down
2 changes: 1 addition & 1 deletion Rdmp.Dicom.UI/Rdmp.Dicom.UI.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<PropertyGroup>
<RootNamespace>Rdmp.Dicom.UI</RootNamespace>
<AssemblyName>Rdmp.Dicom.UI</AssemblyName>
<TargetFramework>net8.0-windows</TargetFramework>
<TargetFramework>net$(NETCoreAppMaximumVersion)-windows</TargetFramework>
<GenerateAssemblyInfo>false</GenerateAssemblyInfo>
<UseWindowsForms>true</UseWindowsForms>
<EnableWindowsTargeting>true</EnableWindowsTargeting>
Expand Down
4 changes: 4 additions & 0 deletions Rdmp.Dicom.UI/TagColumnAdderUI.cs
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
using System;
using System.ComponentModel;
using System.Windows.Forms;
using Rdmp.Core.Curation.Data;
using Rdmp.Dicom.TagPromotionSchema;
Expand Down Expand Up @@ -37,7 +38,10 @@ private void cbxTag_SelectedIndexChanged(object sender, EventArgs e)
}
}

[DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]
public string ColumnName { get; private set; }

[DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]
public string ColumnDataType { get; private set; }

private void btnOk_Click(object sender, EventArgs e)
Expand Down
4 changes: 3 additions & 1 deletion Rdmp.Dicom.UI/TagElevationXmlUI.cs
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@
using Rdmp.Core.ReusableLibraryCode.Checks;
using ScintillaNET;
using System;
using System.ComponentModel;
using System.Runtime.Versioning;
using System.Windows.Forms;
using Rdmp.UI.ScintillaHelper;
Expand Down Expand Up @@ -71,7 +72,8 @@ private void RunChecks()
}
}

public ICatalogueRepository CatalogueRepository { get;set; }
[DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]
public ICatalogueRepository CatalogueRepository { get; set; }

public ICustomUIDrivenClass GetFinalStateOfUnderlyingObject()
{
Expand Down
Loading
Loading