From 86b47cb4346f411649dbfc4ef542ca652d056b0f Mon Sep 17 00:00:00 2001 From: Milan Hanajik Date: Thu, 11 Oct 2018 13:53:24 +0200 Subject: [PATCH] ProcedureDlg : History TAB in progress. --- TBF/ProcedureDlg.cs | 18 ++++++++++++------ 1 file changed, 12 insertions(+), 6 deletions(-) diff --git a/TBF/ProcedureDlg.cs b/TBF/ProcedureDlg.cs index a149c1daf..f5bf95b6b 100644 --- a/TBF/ProcedureDlg.cs +++ b/TBF/ProcedureDlg.cs @@ -561,11 +561,12 @@ namespace TBF { TBF.LocalSettings ls = Program.LocalSettings; - historyListViewEx.Columns.Add(Strings.Name, (ls.HistoryColumnCount > 0) ? ls.HistoryColumnWidths[0] : 80); - historyListViewEx.Columns.Add(Strings.Revision, (ls.HistoryColumnCount > 0) ? ls.HistoryColumnWidths[0] : 80); - historyListViewEx.Columns.Add(Strings.Date_and_time, (ls.HistoryColumnCount > 1) ? ls.HistoryColumnWidths[1] : 120); - historyListViewEx.Columns.Add(Strings.User, (ls.HistoryColumnCount > 2) ? ls.HistoryColumnWidths[2] : 55); - historyListViewEx.Columns.Add(Strings.DescriptionColHdr, (ls.HistoryColumnCount > 3) ? ls.HistoryColumnWidths[3] : 300); + historyListViewEx.Columns.Add(Strings.Name, (ls.HistoryColumnCount > 0) ? ls.HistoryColumnWidths[0] : 80); + historyListViewEx.Columns.Add(Strings.Revision, (ls.HistoryColumnCount > 0) ? ls.HistoryColumnWidths[0] : 80); + historyListViewEx.Columns.Add(Strings.Date_and_time, (ls.HistoryColumnCount > 1) ? ls.HistoryColumnWidths[1] : 120); + historyListViewEx.Columns.Add(Strings.User, (ls.HistoryColumnCount > 2) ? ls.HistoryColumnWidths[2] : 55); + historyListViewEx.Columns.Add(Strings.DescriptionColHdr, (ls.HistoryColumnCount > 3) ? ls.HistoryColumnWidths[3] : 150); + historyListViewEx.Columns.Add(Strings.Other, (ls.HistoryColumnCount > 3) ? ls.HistoryColumnWidths[3] : 150); RefreshHistoryTab(); } @@ -608,7 +609,12 @@ namespace TBF item.SubItems.Add(p.LastChgTime.ToString()); item.SubItems.Add(p.LastChgUser.ToString()); item.SubItems.Add(p.Description); - historyListViewEx.Items.Add(item); + + string other = string.Empty; + //if ((p.Watermeters != null) && (p.Watermeters.Count > 0) && (p.Watermeters[0] != null)) other = p.Watermeters[0]; + item.SubItems.Add(other); + + historyListViewEx.Items.Add(item); predecessorId = p.PredecessorId; /// Iterate break;