Free cookie consent management tool by TermsFeed Policy Generator

Ignore:
Timestamp:
05/01/10 13:58:24 (14 years ago)
Author:
kgrading
Message:

Removed References to HiveLogging and updated the default logging mechanism (#991)

Location:
trunk/sources/HeuristicLab.Hive.Server.Console/3.2
Files:
3 edited

Legend:

Unmodified
Added
Removed

  • trunk/sources/HeuristicLab.Hive.Server.Console/3.2/HiveServerManagementConsole.Designer.cs

    r3022 r3578  
    5555      this.chContent = new System.Windows.Forms.ColumnHeader();
    5656      this.chDetails = new System.Windows.Forms.ColumnHeader();
    57       this.lvSnapshots = new System.Windows.Forms.ListView();
    58       this.chClientCalculated = new System.Windows.Forms.ColumnHeader();
    59       this.chProgress = new System.Windows.Forms.ColumnHeader();
    60       this.chSnapshotTime = new System.Windows.Forms.ColumnHeader();
    6157      this.lblProgress = new System.Windows.Forms.Label();
    6258      this.lblStatus = new System.Windows.Forms.Label();
    … …  
    8581      this.menuItemAddGroup = new System.Windows.Forms.ToolStripMenuItem();
    8682      this.menuItemDeleteGroup = new System.Windows.Forms.ToolStripMenuItem();
     83      this.menuItemOpenCalendar = new System.Windows.Forms.ToolStripMenuItem();
    8784      this.lvClientControl = new System.Windows.Forms.ListView();
    8885      this.tcManagementConsole = new System.Windows.Forms.TabControl();
    8986      this.checkBox1 = new System.Windows.Forms.CheckBox();
    90       this.menuItemOpenCalendar = new System.Windows.Forms.ToolStripMenuItem();
    9187      this.menuStrip1.SuspendLayout();
    9288      this.plClientDetails.SuspendLayout();
    … …  
    350346      this.plJobDetails.BorderStyle = System.Windows.Forms.BorderStyle.Fixed3D;
    351347      this.plJobDetails.Controls.Add(this.lvJobDetails);
    352       this.plJobDetails.Controls.Add(this.lvSnapshots);
    353348      this.plJobDetails.Controls.Add(this.lblProgress);
    354349      this.plJobDetails.Controls.Add(this.lblStatus);
    … …  
    372367      this.lvJobDetails.Location = new System.Drawing.Point(17, 124);
    373368      this.lvJobDetails.Name = "lvJobDetails";
    374       this.lvJobDetails.Size = new System.Drawing.Size(382, 175);
     369      this.lvJobDetails.Size = new System.Drawing.Size(382, 243);
    375370      this.lvJobDetails.TabIndex = 17;
    376371      this.lvJobDetails.UseCompatibleStateImageBehavior = false;
    … …  
    386381      this.chDetails.Text = "Details";
    387382      this.chDetails.Width = 255;
    388       //
    389       // lvSnapshots
    390       //
    391       this.lvSnapshots.Columns.AddRange(new System.Windows.Forms.ColumnHeader[] {
    392             this.chClientCalculated,
    393             this.chProgress,
    394             this.chSnapshotTime});
    395       this.lvSnapshots.Enabled = false;
    396       this.lvSnapshots.FullRowSelect = true;
    397       this.lvSnapshots.GridLines = true;
    398       this.lvSnapshots.Location = new System.Drawing.Point(17, 310);
    399       this.lvSnapshots.Name = "lvSnapshots";
    400       this.lvSnapshots.Size = new System.Drawing.Size(382, 69);
    401       this.lvSnapshots.TabIndex = 16;
    402       this.lvSnapshots.UseCompatibleStateImageBehavior = false;
    403       this.lvSnapshots.View = System.Windows.Forms.View.Details;
    404       //
    405       // chClientCalculated
    406       //
    407       this.chClientCalculated.Text = "Client Calculated";
    408       this.chClientCalculated.Width = 112;
    409       //
    410       // chProgress
    411       //
    412       this.chProgress.Text = "Progress";
    413       this.chProgress.Width = 100;
    414       //
    415       // chSnapshotTime
    416       //
    417       this.chSnapshotTime.Text = "Snapshot request";
    418       this.chSnapshotTime.Width = 166;
    419383      //
    420384      // lblProgress
    … …  
    657621            this.menuItemOpenCalendar});
    658622      this.contextMenuGroup.Name = "contextMenuJob";
    659       this.contextMenuGroup.Size = new System.Drawing.Size(154, 92);
     623      this.contextMenuGroup.Size = new System.Drawing.Size(154, 70);
    660624      //
    661625      // menuItemAddGroup
    … …  
    670634      this.menuItemDeleteGroup.Size = new System.Drawing.Size(153, 22);
    671635      this.menuItemDeleteGroup.Text = "Delete Group";
     636      //
     637      // menuItemOpenCalendar
     638      //
     639      this.menuItemOpenCalendar.Name = "menuItemOpenCalendar";
     640      this.menuItemOpenCalendar.Size = new System.Drawing.Size(153, 22);
     641      this.menuItemOpenCalendar.Text = "Open Calendar";
    672642      //
    673643      // lvClientControl
    … …  
    705675      this.checkBox1.Text = "checkBox1";
    706676      this.checkBox1.UseVisualStyleBackColor = true;
    707       //
    708       // menuItemOpenCalendar
    709       //
    710       this.menuItemOpenCalendar.Name = "menuItemOpenCalendar";
    711       this.menuItemOpenCalendar.Size = new System.Drawing.Size(153, 22);
    712       this.menuItemOpenCalendar.Text = "Open Calendar";
    713677      //
    714678      // HiveServerManagementConsole
    … …  
    782746    private System.Windows.Forms.Label lblStatus;
    783747    private System.Windows.Forms.Label lblProgress;
    784     private System.Windows.Forms.ListView lvSnapshots;
    785     private System.Windows.Forms.ColumnHeader chClientCalculated;
    786     private System.Windows.Forms.ColumnHeader chProgress;
    787748    private System.Windows.Forms.Label lblStateClient;
    788749    private System.Windows.Forms.Label lblState;
    … …  
    796757    private System.Windows.Forms.ListView lvJobControl;
    797758    private System.Windows.Forms.CheckBox checkBox1;
    798     private System.Windows.Forms.ColumnHeader chSnapshotTime;
    799759    private System.Windows.Forms.ContextMenuStrip contextMenuJob;
    800760    private System.Windows.Forms.ToolStripMenuItem menuItemAbortJob;

  • trunk/sources/HeuristicLab.Hive.Server.Console/3.2/HiveServerManagementConsole.cs

    r3220 r3578  
    242242        CloneList(jobsOld, out jobsOldHelp);
    243243
    244         GetDelta(jobsOld.List, jobsOldHelp);
     244        if(jobsOld != null && jobsOld.List != null && jobsOldHelp != null)
     245          GetDelta(jobsOld.List, jobsOldHelp);
    245246
    246247      }
    … …  
    419420      lvJobDetails.Items.Clear();
    420421
    421       lvSnapshots.Enabled = true;
    422 
    423       if (currentJob.State == State.offline) {
     422      ResponseObject<JobDto> response = ServiceLocator.GetJobManager().GetJobByIdWithDetails(currentJob.Id);
     423
     424      if(response.Success == false || response.Obj == null)
     425        return;
     426
     427      JobDto job = response.Obj;
     428
     429      //lvSnapshots.Enabled = true;
     430
     431      if (job.State == State.offline) {
    424432        pbJobControl.Image = ilLargeImgJob.Images[2];
    425       } else if (currentJob.State == State.calculating) {
     433      } else if (job.State == State.calculating) {
    426434        pbJobControl.Image = ilLargeImgJob.Images[1];
    427       } else if (currentJob.State == State.finished) {
     435      } else if (job.State == State.finished) {
    428436        pbJobControl.Image = ilLargeImgJob.Images[0];
    429437      }
    430438
    431       lblJobName.Text = currentJob.Id.ToString();
    432       if (currentJob.Percentage != null) {
     439      lblJobName.Text = job.Id.ToString();
     440      if (job.Percentage != null) {
    433441        progressJob.Value = (int) (currentJob.Percentage*100);
    434442        lblProgress.Text = (int) (currentJob.Percentage*100) + "% calculated";
    … …  
    437445      ListViewItem lvi = new ListViewItem();
    438446      lvi.Text = "User:";
    439       lvi.SubItems.Add(currentJob.UserId.ToString());
     447      lvi.SubItems.Add(job.UserId.ToString());
    440448      lvJobDetails.Items.Add(lvi);
    441449
    … …  
    443451      lvi = new ListViewItem();
    444452      lvi.Text = "created at:";
    445       lvi.SubItems.Add(currentJob.DateCreated.ToString());
     453      lvi.SubItems.Add(job.DateCreated.ToString());
    446454      lvJobDetails.Items.Add(lvi);
    447455
    448       if (currentJob.ParentJob != null) {
     456      if (job.ParentJob != null) {
    449457        lvi = null;
    450458        lvi = new ListViewItem();
    451459        lvi.Text = "Parent job:";
    452         lvi.SubItems.Add(currentJob.ParentJob.ToString());
     460        lvi.SubItems.Add(job.ParentJob.ToString());
    453461        lvJobDetails.Items.Add(lvi);
    454462      }
    … …  
    457465      lvi = new ListViewItem();
    458466      lvi.Text = "Priority:";
    459       lvi.SubItems.Add(currentJob.Priority.ToString());
     467      lvi.SubItems.Add(job.Priority.ToString());
    460468      lvJobDetails.Items.Add(lvi);
    461469
    462       if (currentJob.Project != null) {
     470      if (job.Project != null) {
    463471        lvi = null;
    464472        lvi = new ListViewItem();
    465473        lvi.Text = "Project:";
    466         lvi.SubItems.Add(currentJob.Project.Name.ToString());
     474        lvi.SubItems.Add(job.Project.Name.ToString());
    467475        lvJobDetails.Items.Add(lvi);
    468476      }
    469477
    470       if (currentJob.Client != null) {
     478      if (job.Client != null) {
    471479        lvi = null;
    472480        lvi = new ListViewItem();
    473481        lvi.Text = "Calculation begin:";
    474         lvi.SubItems.Add(currentJob.DateCalculated.ToString());
     482        lvi.SubItems.Add(job.DateCalculated.ToString());
    475483        lvJobDetails.Items.Add(lvi);
    476484
    … …  
    479487        lvi = new ListViewItem();
    480488        lvi.Text = "Client calculated:";
    481         lvi.SubItems.Add(currentJob.Client.Name.ToString());
     489        lvi.SubItems.Add(job.Client.Name.ToString());
    482490        lvJobDetails.Items.Add(lvi);
    483491
    484         if (currentJob.State == State.finished) {
    485           IJobManager jobManager =
    486             ServiceLocator.GetJobManager();
    487           ResponseObject<JobResult> jobRes = null;
    488           //Todo: jobManager.GetLastJobResultOf(currentJob.Id);
    489 
    490           if (jobRes != null && jobRes.Obj != null) {
    491             lvi = null;
     492        if (job.State == State.finished) {
     493          lvi = null;
    492494            lvi = new ListViewItem();
    493495            lvi.Text = "Calculation ended:";
    494             lvi.SubItems.Add(jobRes.Obj.DateFinished.ToString());
     496            lvi.SubItems.Add(job.DateFinished.ToString());
    495497            lvJobDetails.Items.Add(lvi);
    496498          }
    497499        }
    498       }
    499       if (currentJob.State != State.offline) {
    500         lvSnapshots.Items.Clear();
    501         GetSnapshotList();
    502       } else {
    503         lvSnapshots.Visible = false;
    504       }
    505     }
     500      }
    506501
    507502    /// <summary>
    … …  
    776771    private void CloneList(ResponseList<JobDto> oldList, out IDictionary<int, JobDto> newList) {
    777772      newList = new Dictionary<int, JobDto>();
    778       for (int i = 0; i < oldList.List.Count; i++) {
    779         newList.Add(i, oldList.List[i]);
     773      if (oldList != null && oldList.List != null) {
     774        for (int i = 0; i < oldList.List.Count; i++) {
     775          newList.Add(i, oldList.List[i]);
     776        }
    780777      }
    781778    }
    782779
    783780    private bool IsEqual(ClientDto ci1, ClientDto ci2) {
     781      if (ci1 == null && ci2 == null) {
     782        return true;
     783      }
    784784      if (ci2 == null) {
    785785        return false;
    … …  
    849849    }
    850850
    851     private void GetSnapshotList() {
    852 
    853       lvSnapshots.Items.Clear();
    854       IJobManager jobManager = ServiceLocator.GetJobManager();
    855 
    856       ResponseList<JobResult> jobRes = jobManager.GetAllJobResults(currentJob.Id);
    857 
    858       if (jobRes != null && jobRes.List != null) {
    859         foreach (JobResult jobresult in jobRes.List) {
    860           ListViewItem curSnapshot = new ListViewItem(jobresult.ClientId.ToString());
    861           double percentage = jobresult.Percentage * 100;
    862           curSnapshot.SubItems.Add(percentage.ToString() + " %");
    863           curSnapshot.SubItems.Add(jobresult.Timestamp.ToString());
    864           lvSnapshots.Items.Add(curSnapshot);
    865         }
    866       }
    867 
    868       if ((jobRes.List == null) || (jobRes.List.Count == 0)) {
    869         lvSnapshots.Visible = false;
    870       } else {
    871         lvSnapshots.Visible = true;
    872       }
    873 
    874     }
    875 
    876851    #endregion
    877852

  • trunk/sources/HeuristicLab.Hive.Server.Console/3.2/HiveServerManagementConsole.resx

    r3022 r3578  
    129129        LCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPWI3N2E1YzU2MTkzNGUwODkFAQAAACZTeXN0
    130130        ZW0uV2luZG93cy5Gb3Jtcy5JbWFnZUxpc3RTdHJlYW1lcgEAAAAERGF0YQcCAgAAAAkDAAAADwMAAABo
    131         FwAAAk1TRnQBSQFMAgEBBAEAAQwBAAEMAQABIAEAASABAAT/AQkBAAj/AUIBTQE2AQQGAAE2AQQCAAEo
     131        FwAAAk1TRnQBSQFMAgEBBAEAARQBAAEUAQABIAEAASABAAT/AQkBAAj/AUIBTQE2AQQGAAE2AQQCAAEo
    132132        AwABgAMAAUADAAEBAQABCAYAASAYAAGAAgABgAMAAoABAAGAAwABgAEAAYABAAKAAgADwAEAAcAB3AHA
    133133        AQAB8AHKAaYBAAEzBQABMwEAATMBAAEzAQACMwIAAxYBAAMcAQADIgEAAykBAANVAQADTQEAA0IBAAM5
    … …  
    239239        LCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPWI3N2E1YzU2MTkzNGUwODkFAQAAACZTeXN0
    240240        ZW0uV2luZG93cy5Gb3Jtcy5JbWFnZUxpc3RTdHJlYW1lcgEAAAAERGF0YQcCAgAAAAkDAAAADwMAAAAO
    241         DgAAAk1TRnQBSQFMAgEBAwEAAQwBAAEMAQABIAEAASABAAT/AQkBAAj/AUIBTQE2AQQGAAE2AQQCAAEo
     241        DgAAAk1TRnQBSQFMAgEBAwEAARQBAAEUAQABIAEAASABAAT/AQkBAAj/AUIBTQE2AQQGAAE2AQQCAAEo
    242242        AwABgAMAASADAAEBAQABCAYAARAYAAGAAgABgAMAAoABAAGAAwABgAEAAYABAAKAAgADwAEAAcAB3AHA
    243243        AQAB8AHKAaYBAAEzBQABMwEAATMBAAEzAQACMwIAAxYBAAMcAQADIgEAAykBAANVAQADTQEAA0IBAAM5
    … …  
    312312    <value>
    313313        iVBORw0KGgoAAAANSUhEUgAAABgAAAAYCAYAAADgdz34AAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
    314         YQUAAAAgY0hSTQAAeiYAAICEAAD6AAAAgOgAAHUwAADqYAAAOpgAABdwnLpRPAAAAAlwSFlzAABcQgAA
    315         XEIB62nEUwAAA3hJREFUSEu1ls1PE2EQxj229ouPVNErgZOJicZDjR68mHg1JgYvxov/gIlHxARBoxGU
     314        YQUAAAAgY0hSTQAAeiYAAICEAAD6AAAAgOgAAHUwAADqYAAAOpgAABdwnLpRPAAAAAlwSFlzAABcQQAA
     315        XEEBRtDlPgAAA3hJREFUSEu1ls1PE2EQxj229ouPVNErgZOJicZDjR68mHg1JgYvxov/gIlHxARBoxGU
    316316        KlJUVJDypVIQKkXBpIootoC0tLS0pZEIiILfikAfZ5Zuu9sWaDQ2edLt7vvOrzPzzsxuALBBquIeRR7p
    317317        CKmQVJSmeC3vyUu0FzNOD3NIFhJYpU8VuGBXpiVeK+6L2sgRQQKAbm4hTZ/pVcA8ooN9Ug/H7GY4Z3PS
    … …  
    342342        LCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPWI3N2E1YzU2MTkzNGUwODkFAQAAACZTeXN0
    343343        ZW0uV2luZG93cy5Gb3Jtcy5JbWFnZUxpc3RTdHJlYW1lcgEAAAAERGF0YQcCAgAAAAkDAAAADwMAAABy
    344         DAAAAk1TRnQBSQFMAgEBBAEAAQwBAAEMAQABEAEAARABAAT/AQkBAAj/AUIBTQE2AQQGAAE2AQQCAAEo
     344        DAAAAk1TRnQBSQFMAgEBBAEAARQBAAEUAQABEAEAARABAAT/AQkBAAj/AUIBTQE2AQQGAAE2AQQCAAEo
    345345        AwABQAMAASADAAEBAQABCAYAAQgYAAGAAgABgAMAAoABAAGAAwABgAEAAYABAAKAAgADwAEAAcAB3AHA
    346346        AQAB8AHKAaYBAAEzBQABMwEAATMBAAEzAQACMwIAAxYBAAMcAQADIgEAAykBAANVAQADTQEAA0IBAAM5
    … …  
    409409        LCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPWI3N2E1YzU2MTkzNGUwODkFAQAAACZTeXN0
    410410        ZW0uV2luZG93cy5Gb3Jtcy5JbWFnZUxpc3RTdHJlYW1lcgEAAAAERGF0YQcCAgAAAAkDAAAADwMAAABq
    411         CQAAAk1TRnQBSQFMAgEBAwEAAQwBAAEMAQABEAEAARABAAT/AQkBAAj/AUIBTQE2AQQGAAE2AQQCAAEo
     411        CQAAAk1TRnQBSQFMAgEBAwEAARQBAAEUAQABEAEAARABAAT/AQkBAAj/AUIBTQE2AQQGAAE2AQQCAAEo
    412412        AwABQAMAARADAAEBAQABCAYAAQQYAAGAAgABgAMAAoABAAGAAwABgAEAAYABAAKAAgADwAEAAcAB3AHA
    413413        AQAB8AHKAaYBAAEzBQABMwEAATMBAAEzAQACMwIAAxYBAAMcAQADIgEAAykBAANVAQADTQEAA0IBAAM5
Note: See TracChangeset for help on using the changeset viewer.