20-12-2022
This commit is contained in:
@@ -17,7 +17,9 @@ namespace ECM.JobRunner.Web.Data
|
||||
{
|
||||
logger = Logging.LogConfig.GetLogger();
|
||||
channel = Wcf.Channel;
|
||||
pollingTimer.Interval = 1000;
|
||||
pollingTimer.Elapsed += PollingTimer_Elapsed;
|
||||
pollingTimer.Enabled = true;
|
||||
}
|
||||
|
||||
protected virtual void OnDataUpdated(DashboardResponse e)
|
||||
@@ -32,39 +34,14 @@ namespace ECM.JobRunner.Web.Data
|
||||
|
||||
public async Task<DashboardResponse> GetData()
|
||||
{
|
||||
List<Common.JobRunnerReference.HistoryItem> jobHistory = await GetHistoryItems();
|
||||
List<Common.JobRunnerReference.StatusItem> jobStatus = await GetStatusItems();
|
||||
|
||||
return new DashboardResponse()
|
||||
{
|
||||
jobHistory = jobHistory.OrderByDescending(e => e.CreatedAt).ToList(),
|
||||
jobStatus = jobStatus.OrderByDescending(e => e.StartTime).ToList()
|
||||
jobStatus = jobStatus.OrderByDescending(e => e.CompleteTime).ToList()
|
||||
};
|
||||
}
|
||||
|
||||
private async Task<List<Common.JobRunnerReference.HistoryItem>> GetHistoryItems()
|
||||
{
|
||||
try
|
||||
{
|
||||
var oResponse = await channel.GetJobStatusAsync();
|
||||
|
||||
if (oResponse.OK)
|
||||
{
|
||||
return oResponse.HistoryItems.ToList();
|
||||
}
|
||||
else
|
||||
{
|
||||
return new();
|
||||
}
|
||||
}
|
||||
catch (Exception e)
|
||||
{
|
||||
logger.Error(e);
|
||||
return new();
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
private async Task<List<Common.JobRunnerReference.StatusItem>> GetStatusItems()
|
||||
{
|
||||
try
|
||||
|
||||
Reference in New Issue
Block a user