diff --git a/C4IT_DataHistoryProvider_Base/Publish/F4SD-Cockpit-Server.dll b/C4IT_DataHistoryProvider_Base/Publish/F4SD-Cockpit-Server.dll
index ae55511..e48104e 100644
Binary files a/C4IT_DataHistoryProvider_Base/Publish/F4SD-Cockpit-Server.dll and b/C4IT_DataHistoryProvider_Base/Publish/F4SD-Cockpit-Server.dll differ
diff --git a/C4IT_DataHistoryProvider_Test/Config/F4SD-DataClusters-Configuration.xml b/C4IT_DataHistoryProvider_Test/Config/F4SD-DataClusters-Configuration.xml
index 8368a46..e1f7f69 100644
--- a/C4IT_DataHistoryProvider_Test/Config/F4SD-DataClusters-Configuration.xml
+++ b/C4IT_DataHistoryProvider_Test/Config/F4SD-DataClusters-Configuration.xml
@@ -713,7 +713,7 @@
-
+
diff --git a/C4IT_DataHistoryProvider_Test/Config/F4SD-DataClusters-Configuration.xsd b/C4IT_DataHistoryProvider_Test/Config/F4SD-DataClusters-Configuration.xsd
index 9b2fc1d..e482e42 100644
--- a/C4IT_DataHistoryProvider_Test/Config/F4SD-DataClusters-Configuration.xsd
+++ b/C4IT_DataHistoryProvider_Test/Config/F4SD-DataClusters-Configuration.xsd
@@ -290,11 +290,12 @@
-
-
-
-
-
+
+
+
+
+
+
@@ -427,4 +428,4 @@
-
\ No newline at end of file
+
diff --git a/F4SD-Cockpit-ServerCore/DataHistoryCollectorM42Wpm.cs b/F4SD-Cockpit-ServerCore/DataHistoryCollectorM42Wpm.cs
index 7e5ea92..1c453d9 100644
--- a/F4SD-Cockpit-ServerCore/DataHistoryCollectorM42Wpm.cs
+++ b/F4SD-Cockpit-ServerCore/DataHistoryCollectorM42Wpm.cs
@@ -2262,15 +2262,16 @@ namespace C4IT.DataHistoryProvider
}
var _cols = Table.KeyColumns.First().SourceName;
- var _QueryRelationInfo = new cM42DataQueryRelationInfo()
- {
- EntityClassName = _template.EntityClassName,
- EntityTypeName = string.Join(",", _template.EntityTypeNames),
- search = search,
- WhereExpression = _whereExpr,
- pageSize = 0,
- page = 0,
- totalCounted = true,
+ var _QueryRelationInfo = new cM42DataQueryRelationInfo()
+ {
+ EntityClassName = _template.EntityClassName,
+ EntityTypeName = string.Join(",", _template.EntityTypeNames),
+ DataQueryName = string.IsNullOrWhiteSpace(_template.DataQueryName) ? null : _template.DataQueryName,
+ search = search,
+ WhereExpression = _whereExpr,
+ pageSize = 0,
+ page = 0,
+ totalCounted = true,
columns = _cols
};
@@ -2320,14 +2321,15 @@ namespace C4IT.DataHistoryProvider
var _cols = Table.KeyColumns.First().SourceName;
- var _QueryRelationInfo = new cM42DataQueryRelationInfo()
- {
- EntityClassName = _template.EntityClassName,
- EntityTypeName = string.Join(",", _template.EntityTypeNames),
- WhereExpression = _whereExpr,
- search = search,
- pageSize = PageSize,
- page = Page,
+ var _QueryRelationInfo = new cM42DataQueryRelationInfo()
+ {
+ EntityClassName = _template.EntityClassName,
+ EntityTypeName = string.Join(",", _template.EntityTypeNames),
+ DataQueryName = string.IsNullOrWhiteSpace(_template.DataQueryName) ? null : _template.DataQueryName,
+ WhereExpression = _whereExpr,
+ search = search,
+ pageSize = PageSize,
+ page = Page,
columns = _cols
};
@@ -4066,14 +4068,16 @@ namespace C4IT.DataHistoryProvider
}
}
-public class cM42DataQueryRelationInfo
-{
- public int ClientTimeOffset { get; set; } = 0;
- public string EntityClassName { get; set; }
- public string EntityTypeName { get; set; }
- public string AddedRelations { get; set; } = "";
- public string RemovedRelations { get; set; } = "";
- public string WhereExpression { get; set; } = "";
+public class cM42DataQueryRelationInfo
+{
+ public int ClientTimeOffset { get; set; } = 0;
+ public string EntityClassName { get; set; }
+ public string EntityTypeName { get; set; }
+ [JsonProperty(NullValueHandling = NullValueHandling.Ignore)]
+ public string DataQueryName { get; set; }
+ public string AddedRelations { get; set; } = "";
+ public string RemovedRelations { get; set; } = "";
+ public string WhereExpression { get; set; } = "";
public cM42QueryFilterGroup AdditionalFilter { get; set; } = new cM42QueryFilterGroup();
public int pageSize { get; set; } = 20;
public int page { get; set; } = 0;
diff --git a/F4SD-Cockpit-ServerCore/DataHistoryConfigClusters.cs b/F4SD-Cockpit-ServerCore/DataHistoryConfigClusters.cs
index 2e55193..1b91009 100644
--- a/F4SD-Cockpit-ServerCore/DataHistoryConfigClusters.cs
+++ b/F4SD-Cockpit-ServerCore/DataHistoryConfigClusters.cs
@@ -381,7 +381,7 @@ namespace C4IT.DataHistoryProvider
RetVal |= DoXmlInsertElement(XmlRoot
, "DataCluster[@Name='M42Tickets']"
, "Table[@Name='M42Wpm-Ticket-QuickCalls']"
- , ""
+ , ""
, "Table[@Name='M42Wpm-Ticket-Assets']"
);
@@ -516,6 +516,16 @@ namespace C4IT.DataHistoryProvider
}
}
+ var quickCallsTemplate = XmlRoot.SelectSingleNode("DataCluster[@Name='M42Tickets']/Table[@Name='M42Wpm-Ticket-QuickCalls']/Matrix42-DataQueryItems-Template") as XmlElement;
+ if (quickCallsTemplate != null)
+ {
+ if (!string.Equals(quickCallsTemplate.GetAttribute("DataQueryName"), "C4IT - F4SD - Quick Calls", StringComparison.OrdinalIgnoreCase))
+ {
+ quickCallsTemplate.SetAttribute("DataQueryName", "C4IT - F4SD - Quick Calls");
+ RetVal = true;
+ }
+ }
+
var categoriesColumns = XmlRoot.SelectSingleNode("DataCluster[@Name='M42Tickets']/Table[@Name='M42Wpm-Ticket-Categories']/Table-Columns") as XmlElement;
if (categoriesColumns != null)
{
@@ -2507,12 +2517,13 @@ namespace C4IT.DataHistoryProvider
}
- public class cDataHistoryConfigQueryTemplateM42DataQueryItems : cDataHistoryConfigQueryTemplate
- {
- public string EntityClassName { get; private set; } = null;
- public List EntityTypeNames { get; private set; } = null;
- public string OrderBy { get; private set; } = null;
- public string WhereExpression { get; private set; } = null;
+ public class cDataHistoryConfigQueryTemplateM42DataQueryItems : cDataHistoryConfigQueryTemplate
+ {
+ public string EntityClassName { get; private set; } = null;
+ public List EntityTypeNames { get; private set; } = null;
+ public string OrderBy { get; private set; } = null;
+ public string WhereExpression { get; private set; } = null;
+ public string DataQueryName { get; private set; } = null;
internal cDataHistoryConfigQueryTemplateM42DataQueryItems(XmlElement XNode, cXmlParser Parser) :
@@ -2544,10 +2555,11 @@ namespace C4IT.DataHistoryProvider
EntityTypeNames.Add(_e2);
}
- OrderBy = cXmlParser.GetStringFromXmlAttribute(XNode2, "OrderBy");
- WhereExpression = cXmlParser.GetStringFromXmlAttribute(XNode2, "WhereExpression");
-
- Parser.LeaveElement("Matrix42-DataQueryItems-Template");
+ OrderBy = cXmlParser.GetStringFromXmlAttribute(XNode2, "OrderBy");
+ WhereExpression = cXmlParser.GetStringFromXmlAttribute(XNode2, "WhereExpression");
+ DataQueryName = cXmlParser.GetStringFromXmlAttribute(XNode2, "DataQueryName");
+
+ Parser.LeaveElement("Matrix42-DataQueryItems-Template");
IsValid = true;
}
diff --git a/F4SDwebService/Config/F4SD-DataClusters-Configuration.xml b/F4SDwebService/Config/F4SD-DataClusters-Configuration.xml
index 8368a46..e1f7f69 100644
--- a/F4SDwebService/Config/F4SD-DataClusters-Configuration.xml
+++ b/F4SDwebService/Config/F4SD-DataClusters-Configuration.xml
@@ -713,7 +713,7 @@
-
+
diff --git a/F4SDwebService/Publish/Config/F4SD-DataClusters-Configuration.xml b/F4SDwebService/Publish/Config/F4SD-DataClusters-Configuration.xml
index 8368a46..e1f7f69 100644
--- a/F4SDwebService/Publish/Config/F4SD-DataClusters-Configuration.xml
+++ b/F4SDwebService/Publish/Config/F4SD-DataClusters-Configuration.xml
@@ -713,7 +713,7 @@
-
+
diff --git a/F4SDwebService/Publish/Config/F4SD-DataClusters-Configuration.xsd b/F4SDwebService/Publish/Config/F4SD-DataClusters-Configuration.xsd
index 9b2fc1d..e482e42 100644
--- a/F4SDwebService/Publish/Config/F4SD-DataClusters-Configuration.xsd
+++ b/F4SDwebService/Publish/Config/F4SD-DataClusters-Configuration.xsd
@@ -290,11 +290,12 @@
-
-
-
-
-
+
+
+
+
+
+
@@ -427,4 +428,4 @@
-
\ No newline at end of file
+