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 174 dqe improvements #1849

Merged
merged 11 commits into from
Jun 5, 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
2 changes: 2 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0

- Add Key-Value store for instance settings
- Allow for Re-extractions of projects to a database, see [ExecuteFullExtractionToDatabaseMSSql](Documentation\DataExtractions\ExecuteFullExtractionToDatabaseMSSql.md)
- Allow DQE graphs to be scrollable and scalable
- Allow for partial refreshes of time-based DQE charts

## [8.1.6] - 2024-05-27

Expand Down
8 changes: 8 additions & 0 deletions Rdmp.Core/QueryBuilding/AggregateBuilder.cs
Original file line number Diff line number Diff line change
Expand Up @@ -82,6 +82,10 @@ public string SQL
/// </summary>
public string HavingSQL { get; set; }


public string AxisStartDateOverride { get; set; }
public string AxisEndDateOverride { get; set; }

/// <summary>
/// Optional, Limit the results returned.
///
Expand Down Expand Up @@ -435,6 +439,10 @@ public void RegenerateSQL()
GetGroupBySQL(queryLines, aggregateHelper);

queryLines = queryLines.Where(l => !string.IsNullOrWhiteSpace(l.Text)).ToList();
if (AxisStartDateOverride != null)
_axis.StartDate = AxisStartDateOverride;
if (AxisEndDateOverride != null)
_axis.EndDate = AxisEndDateOverride;

_sql = aggregateHelper.BuildAggregate(queryLines, _axis);
}
Expand Down
128 changes: 128 additions & 0 deletions Rdmp.UI/AggregationUIs/Advanced/AggregateGraphDateSelector.Designer.cs

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

108 changes: 108 additions & 0 deletions Rdmp.UI/AggregationUIs/Advanced/AggregateGraphDateSelector.cs
Original file line number Diff line number Diff line change
@@ -0,0 +1,108 @@
using System;
using System.Collections.Generic;
using System.ComponentModel;
using System.Data;
using System.Drawing;
using System.Linq;
using System.Text;
using System.Text.RegularExpressions;
using System.Threading.Tasks;
using System.Windows.Forms;

namespace Rdmp.UI.AggregationUIs.Advanced
{
public partial class AggregateGraphDateSelector : Form
{
public AggregateGraphDateSelector(string startDate = "", string endDate = "")
{

StartDate = startDate;
EndDate = endDate;
InitializeComponent();
tbStartDate.Text = startDate;
tbEndDate.Text = endDate;
validateUpdate();
}

public string StartDate;
public string EndDate;

private bool validateDate(string date)
{
return DateRegex().Match(date.Trim()).Success;
}


private void validateUpdate()
{
var startDateValid = validateDate(tbStartDate.Text);
var endDateValid = validateDate(tbEndDate.Text);
if (!startDateValid)
{
tbStartDate.ForeColor = Color.Red;
}
else
{
tbStartDate.ForeColor = Color.Black;
}
if (!endDateValid)
{
tbEndDate.ForeColor = Color.Red;
}
else
{
tbEndDate.ForeColor = Color.Black;
}
if (!startDateValid || !endDateValid)
{
btnRefresh.Enabled = false;
}
else
{
btnRefresh.Enabled = true;
}

}

private void AggregateGraphDateSelector_Load(object sender, EventArgs e)
{

}

private void label1_Click(object sender, EventArgs e)
{

}

private void label2_Click(object sender, EventArgs e)
{

}

private void tbStartDate_TextChanged(object sender, EventArgs e)
{
StartDate = tbStartDate.Text;
validateUpdate();

}

[GeneratedRegex("^'\\d{4}-(0?[1-9]|1[012])-(0?[1-9]|[12][0-9]|3[01])'$")]
private static partial Regex DateRegex();

private void tbEndDate_TextChanged(object sender, EventArgs e)
{
EndDate = tbEndDate.Text;
validateUpdate();
}

private void btnRefresh_Click(object sender, EventArgs e)
{
DialogResult = DialogResult.OK;
}

private void btnCancel_Click(object sender, EventArgs e)
{
DialogResult = DialogResult.Cancel;
}
}
}
120 changes: 120 additions & 0 deletions Rdmp.UI/AggregationUIs/Advanced/AggregateGraphDateSelector.resx
Original file line number Diff line number Diff line change
@@ -0,0 +1,120 @@
<?xml version="1.0" encoding="utf-8"?>
<root>
<!--
Microsoft ResX Schema

Version 2.0

The primary goals of this format is to allow a simple XML format
that is mostly human readable. The generation and parsing of the
various data types are done through the TypeConverter classes
associated with the data types.

Example:

... ado.net/XML headers & schema ...
<resheader name="resmimetype">text/microsoft-resx</resheader>
<resheader name="version">2.0</resheader>
<resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
<resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
<data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
<data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
<data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
<value>[base64 mime encoded serialized .NET Framework object]</value>
</data>
<data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
<comment>This is a comment</comment>
</data>

There are any number of "resheader" rows that contain simple
name/value pairs.

Each data row contains a name, and value. The row also contains a
type or mimetype. Type corresponds to a .NET class that support
text/value conversion through the TypeConverter architecture.
Classes that don't support this are serialized and stored with the
mimetype set.

The mimetype is used for serialized objects, and tells the
ResXResourceReader how to depersist the object. This is currently not
extensible. For a given mimetype the value must be set accordingly:

Note - application/x-microsoft.net.object.binary.base64 is the format
that the ResXResourceWriter will generate, however the reader can
read any of the formats listed below.

mimetype: application/x-microsoft.net.object.binary.base64
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
: and then encoded with base64 encoding.

mimetype: application/x-microsoft.net.object.bytearray.base64
value : The object must be serialized into a byte array
: using a System.ComponentModel.TypeConverter
: and then encoded with base64 encoding.
-->
<xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
<xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
<xsd:element name="root" msdata:IsDataSet="true">
<xsd:complexType>
<xsd:choice maxOccurs="unbounded">
<xsd:element name="metadata">
<xsd:complexType>
<xsd:sequence>
<xsd:element name="value" type="xsd:string" minOccurs="0" />
</xsd:sequence>
<xsd:attribute name="name" use="required" type="xsd:string" />
<xsd:attribute name="type" type="xsd:string" />
<xsd:attribute name="mimetype" type="xsd:string" />
<xsd:attribute ref="xml:space" />
</xsd:complexType>
</xsd:element>
<xsd:element name="assembly">
<xsd:complexType>
<xsd:attribute name="alias" type="xsd:string" />
<xsd:attribute name="name" type="xsd:string" />
</xsd:complexType>
</xsd:element>
<xsd:element name="data">
<xsd:complexType>
<xsd:sequence>
<xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
<xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
</xsd:sequence>
<xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
<xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
<xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
<xsd:attribute ref="xml:space" />
</xsd:complexType>
</xsd:element>
<xsd:element name="resheader">
<xsd:complexType>
<xsd:sequence>
<xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
</xsd:sequence>
<xsd:attribute name="name" type="xsd:string" use="required" />
</xsd:complexType>
</xsd:element>
</xsd:choice>
</xsd:complexType>
</xsd:element>
</xsd:schema>
<resheader name="resmimetype">
<value>text/microsoft-resx</value>
</resheader>
<resheader name="version">
<value>2.0</value>
</resheader>
<resheader name="reader">
<value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</resheader>
<resheader name="writer">
<value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</resheader>
</root>
Loading