Skip to content

Commit

Permalink
fix up test
Browse files Browse the repository at this point in the history
  • Loading branch information
JFriel committed Jan 6, 2025
1 parent 4e0441c commit 4a900e4
Show file tree
Hide file tree
Showing 5 changed files with 29 additions and 19 deletions.
9 changes: 7 additions & 2 deletions Rdmp.Core/Curation/Data/Overview/OverviewModel.cs
Original file line number Diff line number Diff line change
Expand Up @@ -121,8 +121,13 @@ private DataTable GetCountsByDatePeriod()
{

var dt = new DataTable();
var repo = new DQERepository(_catalogue.CatalogueRepository);
_evaluation = repo.GetAllObjectsWhere<Evaluation>("CatalogueID", _catalogue.ID).LastOrDefault();
try
{
var repo = new DQERepository(_catalogue.CatalogueRepository);
_evaluation = repo.GetAllObjectsWhere<Evaluation>("CatalogueID", _catalogue.ID).LastOrDefault();
}catch(Exception) {
return dt;
}
if (_evaluation != null)
{
dt = PeriodicityState.GetPeriodicityForDataTableForEvaluation(_evaluation, "ALL", true);
Expand Down
1 change: 1 addition & 0 deletions Rdmp.UI.Tests/CatalogueItemUITests.cs
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@
using NUnit.Framework;
using Rdmp.Core.Curation.Data;
using Rdmp.UI.MainFormUITabs;
using Rdmp.UI.Overview;
using Rdmp.UI.SimpleDialogs;
using Rdmp.UI.TestsAndSetup.ServicePropogation;

Expand Down
10 changes: 5 additions & 5 deletions Rdmp.UI/Overview/ViewCatalogueOverviewUI.Designer.cs

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

5 changes: 0 additions & 5 deletions Rdmp.UI/Overview/ViewCatalogueOverviewUI.cs
Original file line number Diff line number Diff line change
Expand Up @@ -74,11 +74,6 @@ private void UpdateCatalogueData()
}

areaChartUI.GenerateChart(_overview.GetTableData(), $"Records per month");

var syntaxHelper = _catalogue.GetDistinctLiveDatabaseServer(DataAccessContext.InternalDataProcessing, false)?.GetQuerySyntaxHelper();
var dateTypeString = syntaxHelper.TypeTranslater.GetSQLDBTypeForCSharpType(new TypeGuesser.DatabaseTypeRequest(typeof(DateTime)));
var dateColumns = _catalogue.CatalogueItems.Where(ci => ci.ColumnInfo.Data_type == dateTypeString).ToList();

}

private int OnTabChange(int tabIndex)
Expand Down
23 changes: 16 additions & 7 deletions Rdmp.UI/Overview/ViewCatalogueOverviewUI.resx
Original file line number Diff line number Diff line change
Expand Up @@ -142,6 +142,9 @@
BHggYtkAAAAASUVORK5CYII=
</value>
</data>
<metadata name="toolTip2.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>114, 17</value>
</metadata>
<data name="pictureBox5.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>
iVBORw0KGgoAAAANSUhEUgAAABMAAAATCAYAAAByUDbMAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO
Expand All @@ -168,8 +171,8 @@
6CnMhCUNUSqYkFEU/QfmZ4pQGIZ0wR+NKbARMf9ip3X+aNv2H8rqsspBB8HxAAAAAElFTkSuQmCC
</value>
</data>
<metadata name="toolTip2.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>114, 17</value>
<metadata name="toolTip1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>17, 17</value>
</metadata>
<data name="pictureBox4.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>
Expand Down Expand Up @@ -205,9 +208,6 @@
6CnMhCUNUSqYkFEU/QfmZ4pQGIZ0wR+NKbARMf9ip3X+aNv2H8rqsspBB8HxAAAAAElFTkSuQmCC
</value>
</data>
<metadata name="toolTip1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>17, 17</value>
</metadata>
<data name="pictureBox1.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>
iVBORw0KGgoAAAANSUhEUgAAABQAAAAUCAIAAAAC64paAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO
Expand Down Expand Up @@ -238,6 +238,9 @@
6CnMhCUNUSqYkFEU/QfmZ4pQGIZ0wR+NKbARMf9ip3X+aNv2H8rqsspBB8HxAAAAAElFTkSuQmCC
</value>
</data>
<metadata name="toolTip3.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>397, 17</value>
</metadata>
<data name="pictureBox3.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>
iVBORw0KGgoAAAANSUhEUgAAABMAAAATCAYAAAByUDbMAAAABGdBTUEAAK/INwWK6QAAACBjSFJNAAB6
Expand Down Expand Up @@ -281,10 +284,16 @@
6CnMhCUNUSqYkFEU/QfmZ4pQGIZ0wR+NKbARMf9ip3X+aNv2H8rqsspBB8HxAAAAAElFTkSuQmCC
</value>
</data>
<metadata name="toolTip3.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>397, 17</value>
<metadata name="toolTip1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>17, 17</value>
</metadata>
<metadata name="toolTip2.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>114, 17</value>
</metadata>
<metadata name="viewSourceCodeToolTip1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>211, 17</value>
</metadata>
<metadata name="toolTip3.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>397, 17</value>
</metadata>
</root>

0 comments on commit 4a900e4

Please sign in to comment.