Kiu/xenadmin
1
0
Fork 0
mirror of https://github.com/xcp-ng/xenadmin.git synced 2024-11-23 20:36:33 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

CA-330394: Fixed issue whereby queued conversions had a start time in future.

Browse Source 
Signed-off-by: Konstantina Chremmou <konstantina.chremmou@citrix.com>
This commit is contained in:
Konstantina Chremmou 2019-11-07 15:07:15 +00:00 committed by Mihaela Stoica
parent eb309a1af2
commit 4a8507fd86
1 changed files with 35 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

45
XenAdmin/Dialogs/ConversionDialog.cs
View File

@ -526,18 +526,18 @@ namespace XenAdmin.Dialogs
private string[] GetDetailValues(Conversion conversion)
{
var startTime = conversion.StartTime.ToLocalTime();
var finishTime = conversion.CompletedTime >= conversion.StartTime ? conversion.CompletedTime.ToLocalTime() : DateTime.Now;
GetConversionLocalTimes(conversion, out DateTime? startTime, out DateTime? finishTime, out TimeSpan? duration);
var startTimeString = Messages.HYPHEN;
var finishTimeString = Messages.HYPHEN;
Program.Invoke(this, () =>
{
startTimeString = HelpersGUI.DateTimeToString(startTime, Messages.DATEFORMAT_DMY_HM, true);
if (startTime.HasValue)
startTimeString = HelpersGUI.DateTimeToString(startTime.Value, Messages.DATEFORMAT_DMY_HM, true);
if (conversion.CompletedTime >= conversion.StartTime)
finishTimeString = HelpersGUI.DateTimeToString(finishTime, Messages.DATEFORMAT_DMY_HM, true);
if (finishTime.HasValue)
finishTimeString = HelpersGUI.DateTimeToString(finishTime.Value, Messages.DATEFORMAT_DMY_HM, true);
});
var statusDetail = conversion.StatusDetail;
@ -550,14 +550,35 @@ namespace XenAdmin.Dialogs
conversion.SRName,
string.Format(Messages.CONVERSION_DETAIL_NETWORK_READ_COMPRESSED, Util.DiskSizeString(conversion.CompressedBytesRead)),
Util.DiskSizeString(conversion.UncompressedBytesWritten),
startTimeString,
startTimeString,
finishTimeString,
(finishTime - startTime).ToString(@"h\:mm\:ss"),
duration.HasValue ? duration.Value.ToString(@"h\:mm\:ss") : Messages.HYPHEN,
conversion.GetStatusString(),
statusDetail
};
}
private static void GetConversionLocalTimes(Conversion conversion,
out DateTime? startTime, out DateTime? finishTime, out TimeSpan? duration)
{
var now = DateTime.Now;
startTime = conversion.StartTime.ToLocalTime();
if (now < startTime)
startTime = null;
finishTime = conversion.CompletedTime.ToLocalTime();
if (conversion.StartTime > conversion.CompletedTime)
finishTime = null;
if (startTime.HasValue && finishTime.HasValue)
duration = finishTime - startTime;
else if (startTime.HasValue)
duration = now - startTime;
else
duration = null;
}
private void FetchLogs(Conversion? conversion = null)
{
string fileName;
@ -956,10 +977,14 @@ namespace XenAdmin.Dialogs
cellSourceVm.Value = conversion.Configuration.SourceVmName;
cellsourceServer.Value = conversion.Configuration.SourceServer.Hostname;
cellStartTime.Value = HelpersGUI.DateTimeToString(conversion.StartTime.ToLocalTime(), Messages.DATEFORMAT_DMY_HM, true);
GetConversionLocalTimes(conversion, out DateTime? startTime, out DateTime? finishTime, out _);
cellFinishTime.Value = conversion.CompletedTime >= conversion.StartTime
? HelpersGUI.DateTimeToString(conversion.CompletedTime.ToLocalTime(), Messages.DATEFORMAT_DMY_HM, true)
cellStartTime.Value = startTime.HasValue
? HelpersGUI.DateTimeToString(startTime.Value, Messages.DATEFORMAT_DMY_HM, true)
: Messages.HYPHEN;
cellFinishTime.Value = finishTime.HasValue
? HelpersGUI.DateTimeToString(finishTime.Value, Messages.DATEFORMAT_DMY_HM, true)
: Messages.HYPHEN;
cellStatus.Value = Images.GetImageFor(conversion);