Index: /trunk/sources/HeuristicLab.Hive.Server.Console/3.2/HiveServerManagementConsole.Designer.cs
===================================================================
--- /trunk/sources/HeuristicLab.Hive.Server.Console/3.2/HiveServerManagementConsole.Designer.cs (revision 1580)
+++ /trunk/sources/HeuristicLab.Hive.Server.Console/3.2/HiveServerManagementConsole.Designer.cs (revision 1581)
@@ -47,7 +47,7 @@
this.plJobDetails = new System.Windows.Forms.Panel();
this.lvSnapshots = new System.Windows.Forms.ListView();
- this.chJobId = new System.Windows.Forms.ColumnHeader();
- this.chTimeCalculated = new System.Windows.Forms.ColumnHeader();
+ this.chClientCalculated = new System.Windows.Forms.ColumnHeader();
this.chProgress = new System.Windows.Forms.ColumnHeader();
+ this.chSnapshotTime = new System.Windows.Forms.ColumnHeader();
this.lblPriorityJob = new System.Windows.Forms.Label();
this.lblParentJob = new System.Windows.Forms.Label();
@@ -289,7 +289,7 @@
//
this.lvSnapshots.Columns.AddRange(new System.Windows.Forms.ColumnHeader[] {
- this.chJobId,
- this.chTimeCalculated,
- this.chProgress});
+ this.chClientCalculated,
+ this.chProgress,
+ this.chSnapshotTime});
this.lvSnapshots.Enabled = false;
this.lvSnapshots.FullRowSelect = true;
@@ -302,15 +302,18 @@
this.lvSnapshots.View = System.Windows.Forms.View.Details;
//
- // chJobId
- //
- this.chJobId.Text = "Job-ID";
- //
- // chTimeCalculated
- //
- this.chTimeCalculated.Text = "Calculated At";
+ // chClientCalculated
+ //
+ this.chClientCalculated.Text = "Client Calculated";
+ this.chClientCalculated.Width = 88;
//
// chProgress
//
this.chProgress.Text = "Progress";
+ this.chProgress.Width = 67;
+ //
+ // chSnapshotTime
+ //
+ this.chSnapshotTime.Text = "Snapshot request";
+ this.chSnapshotTime.Width = 166;
//
// lblPriorityJob
@@ -636,6 +639,5 @@
private System.Windows.Forms.Label lblParentJob;
private System.Windows.Forms.ListView lvSnapshots;
- private System.Windows.Forms.ColumnHeader chJobId;
- private System.Windows.Forms.ColumnHeader chTimeCalculated;
+ private System.Windows.Forms.ColumnHeader chClientCalculated;
private System.Windows.Forms.ColumnHeader chProgress;
private System.Windows.Forms.Label lblStateClient;
@@ -650,4 +652,5 @@
private System.Windows.Forms.ListView lvJobControl;
private System.Windows.Forms.CheckBox checkBox1;
+ private System.Windows.Forms.ColumnHeader chSnapshotTime;
}
}
Index: /trunk/sources/HeuristicLab.Hive.Server.Console/3.2/HiveServerManagementConsole.cs
===================================================================
--- /trunk/sources/HeuristicLab.Hive.Server.Console/3.2/HiveServerManagementConsole.cs (revision 1580)
+++ /trunk/sources/HeuristicLab.Hive.Server.Console/3.2/HiveServerManagementConsole.cs (revision 1581)
@@ -79,4 +79,7 @@
}
+ private void updaterWoker_RunWorkerCompleted(object sender, RunWorkerCompletedEventArgs e) {
+ Refresh();
+ }
private int CapacityRam(int noCores, int freeCores) {
@@ -231,5 +234,6 @@
///
- /// if one client is clicked, a panel is opened with the details
+ /// if one client is clicked, the details for the clicked client are shown
+ /// in the second panel
///
private void ClientClicked() {
@@ -258,5 +262,6 @@
///
- /// if one job is clicked, a panel is opened with the details
+ /// if one job is clicked, the details for the clicked job are shown
+ /// in the second panel
///
private void JobClicked() {
@@ -296,4 +301,5 @@
}
if (currentJob.State != State.offline) {
+ GetSnapshotList();
lvSnapshots.Visible = true;
} else {
@@ -307,5 +313,5 @@
RefreshJob(change);
} else if (change.Types == Type.Client) {
- RefreshClient(change);
+ RefreshClient(change);
} else if (change.Types == Type.ClientGroup) {
RefreshClientGroup(change);
@@ -426,5 +432,5 @@
AddJobForm newForm = new AddJobForm();
newForm.Show();
- //newForm.addJobEvent += new addDelegate(updaterWoker.RunWorkerAsync);
+ newForm.addJobEvent += new addDelegate(updaterWoker.RunWorkerAsync);
}
@@ -649,10 +655,21 @@
}
+ private void GetSnapshotList() {
+
+ lvSnapshots.Items.Clear();
+ IJobManager jobManager =
+ ServiceLocator.GetJobManager();
+ ResponseObject jobRes = jobManager.GetLastJobResultOf(currentJob.Id, false);
+ ListViewItem curSnapshot = new ListViewItem(jobRes.Obj.Client.Name);
+ double percentage = jobRes.Obj.Percentage * 100;
+ curSnapshot.SubItems.Add(percentage.ToString() + " %");
+ curSnapshot.SubItems.Add(jobRes.Obj.timestamp.ToString());
+ lvSnapshots.Items.Add(curSnapshot);
+
+
+ }
#endregion
- private void updaterWoker_RunWorkerCompleted(object sender, RunWorkerCompletedEventArgs e) {
- Refresh();
- }