--- dao/DaoMqPump2/DaoMqGUI/MainForm.cs 2013/07/08 14:22:33 1999 +++ dao/DaoMqPump2/DaoMqGUI/MainForm.cs 2013/07/08 14:23:01 2000 @@ -77,13 +77,13 @@ foreach (string t in transportNames) { transportNameList.Add(t); - - bool enabled = client.GetTransportEnabled(t); + StatusData statusData = client.GetTransportStatus(t); + bool enabled = statusData.transportEnabled; string status = ""; if (enabled) { - bool lastOk = client.GetTransportLastrunOk(t); + bool lastOk = statusData.lastrunOk; if (lastOk) { @@ -153,36 +153,31 @@ private void transports_SelectedIndexChanged(object sender, EventArgs e) { - loadFormData(); + showData(); } - private void loadFormData() + private void loadStatusData() { if (transports.SelectedIndex == -1) return; string transportName = transportNameList[transports.SelectedIndex]; - bool enabled = client.GetTransportEnabled(transportName); - bool lastOk = client.GetTransportLastrunOk(transportName); - - string lastokTime = client.GetTransportLastOkTime(transportName); - string lastErrorTime = client.GetTransportLastErrorTime(transportName); - - string errorMsg = client.GetTransportLastErrorMessage(transportName); + StatusData statusData = client.GetTransportStatus(transportName); - int counter = client.GetTransportCounter(transportName); + bool enabled = statusData.transportEnabled; txtTransport.Text = transportName; txtEnabled.Text = "" + enabled; - txtLastOK.Text = "" + lastOk; + txtLastOK.Text = "" + statusData.lastrunOk; - txtOkTime.Text = lastokTime; - txtErrorTime.Text = lastErrorTime; + txtOkTime.Text = statusData.lastOkTime; + txtErrorTime.Text = statusData.lastErrorTime; + txtTransferTime.Text = statusData.lastTransferTime; - txtErrorMsg.Text = errorMsg; + txtErrorMsg.Text = statusData.lastErrorMessage; - txtCounter.Text = "" + counter; + txtCounter.Text = "" + statusData.counter; @@ -198,10 +193,7 @@ if (transports.SelectedIndex == -1) return; - if (tabControl1.SelectedIndex != 0) //0 er status siden - return; - - loadFormData(); + showData(); } private void loadLog() @@ -241,7 +233,7 @@ } - private void tabControl1_SelectedIndexChanged(object sender, EventArgs e) + private void showData() { if (transports.SelectedIndex == -1) return; @@ -249,7 +241,7 @@ switch (tabControl1.SelectedIndex) { case 0: - loadFormData(); + loadStatusData(); break; case 1: loadLog(); @@ -260,6 +252,11 @@ } } + private void tabControl1_SelectedIndexChanged(object sender, EventArgs e) + { + showData(); + } + private void lnkServer_LinkClicked(object sender, LinkLabelLinkClickedEventArgs e) { string tmp_hostname = Microsoft.VisualBasic.Interaction.InputBox("Indtast servernavn/ip", "MQ Gui", hostname);