Send start and end date params to middlware.

Author: mo-esmp

src/Serilog.Ui.Web/SerilogUiMiddleware.cs

@@ -147,9 +147,13 @@ private async Task<string> FetchLogsAsync(HttpContext httpContext)
 
             int.TryParse(pageStr, out var currentPage);
             int.TryParse(countStr, out var count);
+
             DateTime.TryParse(startDateStar, out var startDate);
             DateTime.TryParse(endDateStar, out var endDate);
 
+            if (endDate != default)
+                endDate = new DateTime(endDate.Year, endDate.Month, endDate.Day, 23, 59, 59);
+
             currentPage = currentPage == default ? 1 : currentPage;
             count = count == default ? 10 : count;
 

src/Serilog.Ui.Web/wwwroot/dist/main.css

@@ -380,4 +380,14 @@ a[data-toggle="collapse"] {
 
 .modal-body.wrapped pre {
     white-space: pre-wrap;
+}
+
+#searchArea .col {
+    padding-left: 5px;
+    padding-right: 5px;
+}
+
+#submit {
+    cursor: pointer;
+    vertical-align: text-top;
 }

src/Serilog.Ui.Web/wwwroot/dist/main.js

@@ -31,18 +31,7 @@
         fetchData();
     });
 
-    $("#search").on("keypress", function (e) {
-        if (e.which === 13) {
-            $("#page").val("1");
-            fetchData();
-        }
-    });
-
-    $("#search").on("input", function () {
-        if ($(this).val() !== "") {
-            return;
-        }
-
+    $("#submit").on("click", function () {
         $("#page").val("1");
         fetchData();
     });
@@ -123,8 +112,20 @@ const fetchData = () => {
     const page = $("#page").val();
     const count = $("#count").children("option:selected").val();
     const level = $("#level").children("option:selected").val();
+    const startDate = $("#startDate").val();
+    const endDate = $("#endDate").val();
+
+    if (startDate && endDate !== null) {
+        const start = Date.parse(startDate);
+        const end = Date.parse(endDate);
+        if (start > end) {
+            alert("Start date cannot be greater than end date");
+            return;
+        }
+    }
+
     const searchTerm = escape($("#search").val());
-    const url = `${location.pathname.replace("/index.html", "")}/api/logs?page=${page}&count=${count}&level=${level}&search=${searchTerm}`;
+    const url = `${location.pathname.replace("/index.html", "")}/api/logs?page=${page}&count=${count}&level=${level}&search=${searchTerm}&startDate=${startDate}&endDate=${endDate}`;
     const token = sessionStorage.getItem("serilogui_token");
     let xf = null;
     if (authType !== "Windows")