Commit a16041cd authored by Savorboard's avatar Savorboard

processing pages will contains Scheduled and Enqueued messages.

parent 1d408d09
...@@ -14,11 +14,11 @@ namespace DotNetCore.CAP.Dashboard.Pages ...@@ -14,11 +14,11 @@ namespace DotNetCore.CAP.Dashboard.Pages
public int GetTotal(IMonitoringApi api) public int GetTotal(IMonitoringApi api)
{ {
if (string.Compare(StatusName, SucceededState.StateName, StringComparison.OrdinalIgnoreCase) == 0) if (string.Equals(StatusName, SucceededState.StateName, StringComparison.CurrentCultureIgnoreCase))
{ {
return api.PublishedSucceededCount(); return api.PublishedSucceededCount();
} }
if (string.Compare(StatusName, ProcessingState.StateName, StringComparison.OrdinalIgnoreCase) == 0) if (string.Equals(StatusName, ProcessingState.StateName, StringComparison.CurrentCultureIgnoreCase))
{ {
return api.PublishedProcessingCount(); return api.PublishedProcessingCount();
} }
......
...@@ -32,7 +32,7 @@ ...@@ -32,7 +32,7 @@
<div class="row"> <div class="row">
<div class="col-md-3"> <div class="col-md-3">
@Html.JobsSidebar(MessageType.Publish) @Html.MessagesSidebar(MessageType.Publish)
</div> </div>
<div class="col-md-9"> <div class="col-md-9">
<h1 class="page-header">@Strings.PublishedPage_Title</h1> <h1 class="page-header">@Strings.PublishedPage_Title</h1>
...@@ -67,7 +67,7 @@ ...@@ -67,7 +67,7 @@
data-loading-text="@Strings.Common_Enqueueing" data-loading-text="@Strings.Common_Enqueueing"
disabled="disabled"> disabled="disabled">
<span class="glyphicon glyphicon-repeat"></span> <span class="glyphicon glyphicon-repeat"></span>
@Strings.Common_RequeueJobs @Strings.Common_RequeueMessages
</button> </button>
@Html.PerPageSelector(pager) @Html.PerPageSelector(pager)
...@@ -83,6 +83,10 @@ ...@@ -83,6 +83,10 @@
<th>@Strings.MessagesPage_Table_Code</th> <th>@Strings.MessagesPage_Table_Code</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>
@if (string.Equals(StatusName, "Processing", StringComparison.CurrentCultureIgnoreCase))
{
<th>@Strings.MessagesPage_Table_State</th>
}
<th class="align-right">@Strings.MessagesPage_Table_ExpiresAt</th> <th class="align-right">@Strings.MessagesPage_Table_ExpiresAt</th>
</tr> </tr>
</thead> </thead>
...@@ -102,6 +106,12 @@ ...@@ -102,6 +106,12 @@
<td> <td>
@message.Retries @message.Retries
</td> </td>
@if (string.Equals(StatusName, "Processing", StringComparison.CurrentCultureIgnoreCase))
{
<td>
@message.StatusName
</td>
}
<td class="align-right"> <td class="align-right">
@if (message.ExpiresAt.HasValue) @if (message.ExpiresAt.HasValue)
{ {
......
...@@ -14,11 +14,11 @@ namespace DotNetCore.CAP.Dashboard.Pages ...@@ -14,11 +14,11 @@ namespace DotNetCore.CAP.Dashboard.Pages
public int GetTotal(IMonitoringApi api) public int GetTotal(IMonitoringApi api)
{ {
if (string.Compare(StatusName, SucceededState.StateName, StringComparison.OrdinalIgnoreCase) == 0) if (string.Equals(StatusName, SucceededState.StateName, StringComparison.CurrentCultureIgnoreCase))
{ {
return api.ReceivedSucceededCount(); return api.ReceivedSucceededCount();
} }
if (string.Compare(StatusName, ProcessingState.StateName, StringComparison.OrdinalIgnoreCase) == 0) if (string.Equals(StatusName, ProcessingState.StateName, StringComparison.CurrentCultureIgnoreCase))
{ {
return api.ReceivedProcessingCount(); return api.ReceivedProcessingCount();
} }
......
...@@ -22,7 +22,7 @@ ...@@ -22,7 +22,7 @@
var queryDto = new MessageQueryDto var queryDto = new MessageQueryDto
{ {
MessageType = MessageType.Subscribe, MessageType = MessageType.Subscribe,
Group =group, Group = group,
Name = name, Name = name,
Content = content, Content = content,
StatusName = StatusName, StatusName = StatusName,
...@@ -34,7 +34,7 @@ ...@@ -34,7 +34,7 @@
<div class="row"> <div class="row">
<div class="col-md-3"> <div class="col-md-3">
@Html.JobsSidebar(MessageType.Subscribe) @Html.MessagesSidebar(MessageType.Subscribe)
</div> </div>
<div class="col-md-9"> <div class="col-md-9">
<h1 class="page-header">@Strings.ReceivedPage_Title</h1> <h1 class="page-header">@Strings.ReceivedPage_Title</h1>
...@@ -72,7 +72,7 @@ ...@@ -72,7 +72,7 @@
data-loading-text="@Strings.Common_Enqueueing" data-loading-text="@Strings.Common_Enqueueing"
disabled="disabled"> disabled="disabled">
<span class="glyphicon glyphicon-repeat"></span> <span class="glyphicon glyphicon-repeat"></span>
@Strings.Common_RequeueJobs @Strings.Common_ReConsume
</button> </button>
@Html.PerPageSelector(pager) @Html.PerPageSelector(pager)
...@@ -89,6 +89,10 @@ ...@@ -89,6 +89,10 @@
<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>
@if (string.Equals(StatusName, "Processing", StringComparison.CurrentCultureIgnoreCase))
{
<th>@Strings.MessagesPage_Table_State</th>
}
<th class="align-right">@Strings.MessagesPage_Table_ExpiresAt</th> <th class="align-right">@Strings.MessagesPage_Table_ExpiresAt</th>
</tr> </tr>
</thead> </thead>
...@@ -111,6 +115,12 @@ ...@@ -111,6 +115,12 @@
<td> <td>
@message.Retries @message.Retries
</td> </td>
@if (string.Equals(StatusName, "Processing", StringComparison.CurrentCultureIgnoreCase))
{
<td>
@message.StatusName
</td>
}
<td class="align-right"> <td class="align-right">
@if (message.ExpiresAt.HasValue) @if (message.ExpiresAt.HasValue)
{ {
......
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