Skip to content

C
CAP
Commit 828de686 authored by Savorboard's avatar Savorboard
Browse files
Options

Adjust dashboard display

parent d6278538
Hide whitespace changes
Inline Side-by-side
Showing with 24 additions and 23 deletions
src/DotNetCore.CAP.Dashboard/Pages/PublishedPage.cshtml
View file @ 828de686
......@@ -80,7 +80,7 @@
<th style="width: 30px;">
<input type="checkbox" class="js-jobs-list-select-all"/>
</th>
<th>@Strings.Common_Id</th>
<th style="width: 175px">@Strings.Common_Id</th>
<th>@Strings.Common_Version</th>
<th>@Strings.MessagesPage_Table_Name</th>
<th class="min-width">@Strings.MessagesPage_Table_Retries</th>
......
src/DotNetCore.CAP.Dashboard/Pages/PublishedPage.generated.cs
View file @ 828de686
......@@ -268,12 +268,12 @@ WriteLiteral(@"
<th style=""width: 30px;"">
<input type=""checkbox"" class=""js-jobs-list-select-all""/>
</th>
<th>");
<th style=""width: 175px"">");
#line 83 "..\..\Pages\PublishedPage.cshtml"
Write(Strings.Common_Id);
Write(Strings.Common_Id);
#line default
......
src/DotNetCore.CAP.Dashboard/Pages/ReceivedPage.cshtml
View file @ 828de686
......@@ -85,8 +85,8 @@
<th style="width: 30px;">
<input type="checkbox" class="js-jobs-list-select-all"/>
</th>
<th>@Strings.Common_Id</th>
<th style="width: 30px;">@Strings.Common_Version</th>
<th style="width: 175px">@Strings.Common_Id</th>
<th>@Strings.Common_Version</th>
<th>@Strings.MessagesPage_Table_Group</th>
<th>@Strings.MessagesPage_Table_Name</th>
<th class="min-width">@Strings.MessagesPage_Table_Retries</th>
......
src/DotNetCore.CAP.Dashboard/Pages/ReceivedPage.generated.cs
View file @ 828de686
using DotNetCore.CAP.Monitoring;
#pragma warning disable 1591
#pragma warning disable 1591
//------------------------------------------------------------------------------
// <auto-generated>
// This code was generated by a tool.
......@@ -30,23 +28,25 @@ namespace DotNetCore.CAP.Dashboard.Pages
#line hidden
#line 4 "..\..\Pages\ReceivedPage.cshtml"
#line default
using DotNetCore.CAP.Dashboard.Pages;
#line default
#line hidden
#line 5 "..\..\Pages\ReceivedPage.cshtml"
using DotNetCore.CAP.Dashboard.Pages;
using DotNetCore.CAP.Dashboard.Resources;
#line default
#line hidden
#line 6 "..\..\Pages\ReceivedPage.cshtml"
using DotNetCore.CAP.Dashboard.Resources;
using DotNetCore.CAP.Messages;
#line default
#line hidden
#line 7 "..\..\Pages\ReceivedPage.cshtml"
using DotNetCore.CAP.Messages;
using DotNetCore.CAP.Monitoring;
#line default
#line hidden
......@@ -292,22 +292,22 @@ WriteLiteral(@"
<th style=""width: 30px;"">
<input type=""checkbox"" class=""js-jobs-list-select-all""/>
</th>
<th>");
<th style=""width: 175px"">");
#line 88 "..\..\Pages\ReceivedPage.cshtml"
Write(Strings.Common_Id);
Write(Strings.Common_Id);
#line default
#line hidden
WriteLiteral("</th>\r\n <th style=\"width: 30px;\">");
WriteLiteral("</th>\r\n <th>");
#line 89 "..\..\Pages\ReceivedPage.cshtml"
Write(Strings.Common_Version);
Write(Strings.Common_Version);
#line default
......
src/DotNetCore.CAP.Dashboard/Pages/SubscriberPage.cshtml
View file @ 828de686
......@@ -35,7 +35,7 @@
</thead>
<tbody>
@foreach (var subscriber in subscribers)
{
{
var i = 0;
var rowCount = subscriber.Value.Count;
foreach (var column in subscriber.Value)
......
src/DotNetCore.CAP.Dashboard/Pages/SubscriberPage.generated.cs
View file @ 828de686
......@@ -145,7 +145,7 @@ WriteLiteral("</th>\r\n </tr>\r\n </thead>
#line 37 "..\..\Pages\SubscriberPage.cshtml"
foreach (var subscriber in subscribers)
{
{
var i = 0;
var rowCount = subscriber.Value.Count;
foreach (var column in subscriber.Value)
......
src/DotNetCore.CAP.InMemoryStorage/IMonitoringApi.InMemory.cs
View file @ 828de686
......@@ -55,12 +55,12 @@ namespace DotNetCore.CAP.InMemoryStorage
if (!string.IsNullOrEmpty(queryDto.StatusName))
{
expression = expression.Where(x => x.StatusName.ToString() == queryDto.StatusName);
expression = expression.Where(x => x.StatusName.ToString().Equals(queryDto.StatusName, StringComparison.InvariantCultureIgnoreCase));
}
if (!string.IsNullOrEmpty(queryDto.Name))
{
expression = expression.Where(x => x.Name == queryDto.Name);
expression = expression.Where(x => x.Name.Equals(queryDto.Name, StringComparison.InvariantCultureIgnoreCase));
}
if (!string.IsNullOrEmpty(queryDto.Content))
......@@ -74,6 +74,7 @@ namespace DotNetCore.CAP.InMemoryStorage
return expression.Skip(offset).Take(size).Select(x => new MessageDto()
{
Added = x.Added,
Version = "N/A",
Content = x.Content,
ExpiresAt = x.ExpiresAt,
Id = long.Parse(x.DbId),
......@@ -88,17 +89,17 @@ namespace DotNetCore.CAP.InMemoryStorage
if (!string.IsNullOrEmpty(queryDto.StatusName))
{
expression = expression.Where(x => x.StatusName.ToString() == queryDto.StatusName);
expression = expression.Where(x => x.StatusName.ToString().Equals(queryDto.StatusName, StringComparison.InvariantCultureIgnoreCase));
}
if (!string.IsNullOrEmpty(queryDto.Name))
{
expression = expression.Where(x => x.Name == queryDto.Name);
expression = expression.Where(x => x.Name.Equals(queryDto.Name, StringComparison.InvariantCultureIgnoreCase));
}
if (!string.IsNullOrEmpty(queryDto.Group))
{
expression = expression.Where(x => x.Group == queryDto.Name);
expression = expression.Where(x => x.Group.Equals(queryDto.Group, StringComparison.InvariantCultureIgnoreCase));
}
if (!string.IsNullOrEmpty(queryDto.Content))
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment