Commit 828de686 authored by Savorboard's avatar Savorboard

Adjust dashboard display

parent d6278538
...@@ -80,7 +80,7 @@ ...@@ -80,7 +80,7 @@
<th style="width: 30px;"> <th style="width: 30px;">
<input type="checkbox" class="js-jobs-list-select-all"/> <input type="checkbox" class="js-jobs-list-select-all"/>
</th> </th>
<th>@Strings.Common_Id</th> <th style="width: 175px">@Strings.Common_Id</th>
<th>@Strings.Common_Version</th> <th>@Strings.Common_Version</th>
<th>@Strings.MessagesPage_Table_Name</th> <th>@Strings.MessagesPage_Table_Name</th>
<th class="min-width">@Strings.MessagesPage_Table_Retries</th> <th class="min-width">@Strings.MessagesPage_Table_Retries</th>
......
...@@ -268,12 +268,12 @@ WriteLiteral(@" ...@@ -268,12 +268,12 @@ WriteLiteral(@"
<th style=""width: 30px;""> <th style=""width: 30px;"">
<input type=""checkbox"" class=""js-jobs-list-select-all""/> <input type=""checkbox"" class=""js-jobs-list-select-all""/>
</th> </th>
<th>"); <th style=""width: 175px"">");
#line 83 "..\..\Pages\PublishedPage.cshtml" #line 83 "..\..\Pages\PublishedPage.cshtml"
Write(Strings.Common_Id); Write(Strings.Common_Id);
#line default #line default
......
...@@ -85,8 +85,8 @@ ...@@ -85,8 +85,8 @@
<th style="width: 30px;"> <th style="width: 30px;">
<input type="checkbox" class="js-jobs-list-select-all"/> <input type="checkbox" class="js-jobs-list-select-all"/>
</th> </th>
<th>@Strings.Common_Id</th> <th style="width: 175px">@Strings.Common_Id</th>
<th style="width: 30px;">@Strings.Common_Version</th> <th>@Strings.Common_Version</th>
<th>@Strings.MessagesPage_Table_Group</th> <th>@Strings.MessagesPage_Table_Group</th>
<th>@Strings.MessagesPage_Table_Name</th> <th>@Strings.MessagesPage_Table_Name</th>
<th class="min-width">@Strings.MessagesPage_Table_Retries</th> <th class="min-width">@Strings.MessagesPage_Table_Retries</th>
......
using DotNetCore.CAP.Monitoring; #pragma warning disable 1591
#pragma warning disable 1591
//------------------------------------------------------------------------------ //------------------------------------------------------------------------------
// <auto-generated> // <auto-generated>
// This code was generated by a tool. // This code was generated by a tool.
...@@ -30,23 +28,25 @@ namespace DotNetCore.CAP.Dashboard.Pages ...@@ -30,23 +28,25 @@ namespace DotNetCore.CAP.Dashboard.Pages
#line hidden #line hidden
#line 4 "..\..\Pages\ReceivedPage.cshtml" #line 4 "..\..\Pages\ReceivedPage.cshtml"
#line default using DotNetCore.CAP.Dashboard.Pages;
#line default
#line hidden #line hidden
#line 5 "..\..\Pages\ReceivedPage.cshtml" #line 5 "..\..\Pages\ReceivedPage.cshtml"
using DotNetCore.CAP.Dashboard.Pages; using DotNetCore.CAP.Dashboard.Resources;
#line default #line default
#line hidden #line hidden
#line 6 "..\..\Pages\ReceivedPage.cshtml" #line 6 "..\..\Pages\ReceivedPage.cshtml"
using DotNetCore.CAP.Dashboard.Resources; using DotNetCore.CAP.Messages;
#line default #line default
#line hidden #line hidden
#line 7 "..\..\Pages\ReceivedPage.cshtml" #line 7 "..\..\Pages\ReceivedPage.cshtml"
using DotNetCore.CAP.Messages; using DotNetCore.CAP.Monitoring;
#line default #line default
#line hidden #line hidden
...@@ -292,22 +292,22 @@ WriteLiteral(@" ...@@ -292,22 +292,22 @@ WriteLiteral(@"
<th style=""width: 30px;""> <th style=""width: 30px;"">
<input type=""checkbox"" class=""js-jobs-list-select-all""/> <input type=""checkbox"" class=""js-jobs-list-select-all""/>
</th> </th>
<th>"); <th style=""width: 175px"">");
#line 88 "..\..\Pages\ReceivedPage.cshtml" #line 88 "..\..\Pages\ReceivedPage.cshtml"
Write(Strings.Common_Id); Write(Strings.Common_Id);
#line default #line default
#line hidden #line hidden
WriteLiteral("</th>\r\n <th style=\"width: 30px;\">"); WriteLiteral("</th>\r\n <th>");
#line 89 "..\..\Pages\ReceivedPage.cshtml" #line 89 "..\..\Pages\ReceivedPage.cshtml"
Write(Strings.Common_Version); Write(Strings.Common_Version);
#line default #line default
......
...@@ -35,7 +35,7 @@ ...@@ -35,7 +35,7 @@
</thead> </thead>
<tbody> <tbody>
@foreach (var subscriber in subscribers) @foreach (var subscriber in subscribers)
{ {
var i = 0; var i = 0;
var rowCount = subscriber.Value.Count; var rowCount = subscriber.Value.Count;
foreach (var column in subscriber.Value) foreach (var column in subscriber.Value)
......
...@@ -145,7 +145,7 @@ WriteLiteral("</th>\r\n </tr>\r\n </thead> ...@@ -145,7 +145,7 @@ WriteLiteral("</th>\r\n </tr>\r\n </thead>
#line 37 "..\..\Pages\SubscriberPage.cshtml" #line 37 "..\..\Pages\SubscriberPage.cshtml"
foreach (var subscriber in subscribers) foreach (var subscriber in subscribers)
{ {
var i = 0; var i = 0;
var rowCount = subscriber.Value.Count; var rowCount = subscriber.Value.Count;
foreach (var column in subscriber.Value) foreach (var column in subscriber.Value)
......
...@@ -55,12 +55,12 @@ namespace DotNetCore.CAP.InMemoryStorage ...@@ -55,12 +55,12 @@ namespace DotNetCore.CAP.InMemoryStorage
if (!string.IsNullOrEmpty(queryDto.StatusName)) 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)) 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)) if (!string.IsNullOrEmpty(queryDto.Content))
...@@ -74,6 +74,7 @@ namespace DotNetCore.CAP.InMemoryStorage ...@@ -74,6 +74,7 @@ namespace DotNetCore.CAP.InMemoryStorage
return expression.Skip(offset).Take(size).Select(x => new MessageDto() return expression.Skip(offset).Take(size).Select(x => new MessageDto()
{ {
Added = x.Added, Added = x.Added,
Version = "N/A",
Content = x.Content, Content = x.Content,
ExpiresAt = x.ExpiresAt, ExpiresAt = x.ExpiresAt,
Id = long.Parse(x.DbId), Id = long.Parse(x.DbId),
...@@ -88,17 +89,17 @@ namespace DotNetCore.CAP.InMemoryStorage ...@@ -88,17 +89,17 @@ namespace DotNetCore.CAP.InMemoryStorage
if (!string.IsNullOrEmpty(queryDto.StatusName)) 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)) 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)) 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)) 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