Skip to content

Commit a370730

Browse files
committed
Add option to show specific log levels (like Error,Warning...) regardless active filtering fix #784
1 parent 6c0a5f8 commit a370730

File tree

3 files changed

+6
-1
lines changed

3 files changed

+6
-1
lines changed

Analogy/CommonChangeLog.cs

+1
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@ public static IEnumerable<AnalogyChangeLog> GetChangeLog()
1111
{
1212
return new List<AnalogyChangeLog>
1313
{
14+
new AnalogyChangeLog("V4.4.1 - Add option to show specific log levels (like Error,Warning...) regardless active filtering #784",AnalogChangeLogType.Improvement,"Lior Banai",new DateTime(2020,12,25)),
1415
new AnalogyChangeLog("V4.4.1 - [UI] Enable DPI awareness #783",AnalogChangeLogType.Improvement,"Lior Banai",new DateTime(2020,12,20)),
1516
new AnalogyChangeLog("V4.4.1 - [Plotting] add option to split charts to different panes #776",AnalogChangeLogType.Improvement,"Lior Banai",new DateTime(2020,12,16)),
1617
new AnalogyChangeLog("V4.4.1 - [Plotting] Enable toggle on/off series #775",AnalogChangeLogType.Improvement,"Lior Banai",new DateTime(2020,12,16)),

Analogy/FilterCriteriaObject.cs

+2-1
Original file line numberDiff line numberDiff line change
@@ -229,10 +229,11 @@ public string GetSqlExpression(bool orLogLevel)
229229
sqlString.Append(")");
230230
}
231231

232+
string andOr = orLogLevel ? "or" : "and";
232233
if (Levels != null && Levels.Any())
233234
{
234235
string sTemp = string.Join(",", Levels.Select(l => $"'{l}'"));
235-
sqlString.Append(" and Level in (" + sTemp + ")");
236+
sqlString.Append($" {andOr} Level in (" + sTemp + ")");
236237
}
237238

238239
string dateFilter = $" AND (Date >= '{NewerThan}' and Date <= '{OlderThan}')";

Analogy/UserControls/UCLogs.cs

+3
Original file line numberDiff line numberDiff line change
@@ -571,6 +571,9 @@ private void SetupEventsHandlers()
571571
lblPageNumber.Text = $"Page {pageNumber} / {arg.AnalogyPage.PageNumber}"));
572572

573573
};
574+
575+
ceLogLevelAnd.CheckedChanged += async (s, e) => await FilterHasChanged();
576+
ceLogLevelOr.CheckedChanged += async (s, e) => await FilterHasChanged();
574577
}
575578

576579

0 commit comments

Comments
 (0)