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

Task/rdmp 276 catalogue metadata #2120

Open
wants to merge 39 commits into
base: develop
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from 35 commits
Commits
Show all changes
39 commits
Select commit Hold shift + click to select a range
a1a2132
add basic editable
JFriel Jan 16, 2025
fe0fdc4
intermin new ui
JFriel Jan 21, 2025
09fe0bd
smarter binding
JFriel Jan 21, 2025
c07ae96
tab updates
JFriel Jan 22, 2025
f471c24
remove unused
JFriel Jan 22, 2025
f05d083
workign dropdowns
JFriel Jan 22, 2025
05a5b21
finish bindings
JFriel Jan 23, 2025
14d53f4
update tests
JFriel Jan 23, 2025
f0b7018
update chips
JFriel Jan 23, 2025
c437078
use group boxes
JFriel Jan 23, 2025
9e0207b
use group boxes
JFriel Jan 23, 2025
01e87d8
better layout
JFriel Jan 23, 2025
46404a7
working ui
JFriel Jan 24, 2025
b2112d4
update tests
JFriel Jan 24, 2025
969158d
update tests
JFriel Jan 24, 2025
caffc91
add missing file
JFriel Jan 24, 2025
4930b18
Merge branch 'develop' into task/RDMP-276-catalogue-metadata
JFriel Jan 24, 2025
3cddc63
tidy up
JFriel Feb 4, 2025
0a13d67
add scroll
JFriel Feb 4, 2025
5613b6f
fix up scroll bars
JFriel Feb 4, 2025
745c5c8
downward scroll
JFriel Feb 5, 2025
d3ee642
tidy up
JFriel Feb 5, 2025
b824ae1
tidy up
JFriel Feb 5, 2025
657a0e0
Merge branch 'develop' into task/RDMP-276-catalogue-metadata
JFriel Feb 6, 2025
f975ce6
add purpose of dataset
JFriel Feb 6, 2025
e3f3932
add additional info
JFriel Feb 6, 2025
b7b4a48
add missing file
JFriel Feb 6, 2025
3500802
attempt to fix test
JFriel Feb 7, 2025
a5dacc2
add tooltips
JFriel Feb 10, 2025
5ce7abd
add missing file
JFriel Feb 10, 2025
d167044
improve display
JFriel Feb 11, 2025
d7ab179
add tooltips
JFriel Feb 11, 2025
12a98df
update helper text
JFriel Feb 11, 2025
f5c4810
rename
JFriel Feb 11, 2025
52f318b
Merge branch 'develop' of https://github.com/HicServices/RDMP into ta…
JFriel Feb 11, 2025
5278d72
update data source parsing
JFriel Feb 11, 2025
5680f9b
tidy up
JFriel Feb 11, 2025
e6ba45c
add other
JFriel Feb 12, 2025
6808caf
move other
JFriel Feb 12, 2025
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
Original file line number Diff line number Diff line change
Expand Up @@ -398,7 +398,7 @@ private T Activate<T, T2>(T2 databaseObject, Image<Rgba32> tabImage)

uiInstance.SetDatabaseObject(this, databaseObject);

if (insertIndex is not null)
if (insertIndex is not null && _mainDockPanel.ActivePane is not null)
{
_mainDockPanel.ActivePane.SetContentIndex(floatable, (int)insertIndex);
}
Expand Down
1 change: 1 addition & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
- Build on and target .Net 9 rather than 8
- Simplify DB Patching Interface
- Fix issue with Simple File Extractor pipeline component checking
- Update Catalogue metadata options
- Add Load Metadata versioning
- Fix application restart not closing all windows
- Improve cohort deprecation override test
Expand Down
4 changes: 2 additions & 2 deletions Rdmp.Core.Tests/Curation/Integration/CatalogueTests.cs
Original file line number Diff line number Diff line change
Expand Up @@ -108,7 +108,7 @@ public void update_changeAllProperties_pass()
catalogue.Time_coverage = "comprehensive";
catalogue.Search_keywords = "excitement,fishmongery";
catalogue.Type = Catalogue.CatalogueType.ResearchStudy;
catalogue.Update_freq = "Every darmn second!";
catalogue.Update_freq =Catalogue.UpdateFrequencies.Daily;
catalogue.Update_sched = "periodically on request";

catalogue.Country_of_origin = "United Kingdom";
Expand Down Expand Up @@ -154,7 +154,7 @@ public void update_changeAllProperties_pass()
Assert.That(catalogue.Time_coverage, Is.EqualTo("comprehensive"));
Assert.That(catalogue.Search_keywords, Is.EqualTo("excitement,fishmongery"));
Assert.That(catalogue.Type, Is.EqualTo(Catalogue.CatalogueType.ResearchStudy));
Assert.That(catalogue.Update_freq, Is.EqualTo("Every darmn second!"));
Assert.That(catalogue.Update_freq, Is.EqualTo(Catalogue.UpdateFrequencies.Daily));
Assert.That(catalogue.Update_sched, Is.EqualTo("periodically on request"));


Expand Down
Loading