From 1a543f663d88ea7e0486ce768b6b76de82601313 Mon Sep 17 00:00:00 2001 From: John Date: Wed, 12 May 2021 16:49:33 +0000 Subject: [PATCH] B2021-060 Folders were missing from the tree view in the list when there are more than two levels folders. --- PROMS/VEPROMS User Interface/frmBatchRefresh.cs | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/PROMS/VEPROMS User Interface/frmBatchRefresh.cs b/PROMS/VEPROMS User Interface/frmBatchRefresh.cs index db8b6520..7d110e21 100644 --- a/PROMS/VEPROMS User Interface/frmBatchRefresh.cs +++ b/PROMS/VEPROMS User Interface/frmBatchRefresh.cs @@ -124,15 +124,18 @@ namespace VEPROMS myTV.SelectedNode.Expand(); this.Cursor = Cursors.Default; } - private void LoadChildFolders(FolderInfo fi, TreeNode tn, bool noProcs) + // B2021-060 Higher level folders where being removed from the tree even if there was a child folder that containe a working draft set + private bool LoadChildFolders(FolderInfo fi, TreeNode tn, bool noProcs) { bool loadedWorkingDraft = false; + bool loadedChildWorkingDraft = false; // B2021-060 flag when child folder working draft is loaded foreach (FolderInfo fic in fi.SortedChildFolders) { TreeNode tnc = tn.Nodes.Add(fic.Name); tnc.Tag = fic; if (fic.ChildFolderCount > 0) - LoadChildFolders(fic, tnc, noProcs); + if(LoadChildFolders(fic, tnc, noProcs)) + loadedChildWorkingDraft=true; // B2020-114 and C2020-035 only show folders the Set Admin can access if (fic.FolderDocVersionCount > 0) { @@ -142,8 +145,10 @@ namespace VEPROMS loadedWorkingDraft = true; } } + if (loadedChildWorkingDraft) loadedWorkingDraft = true; // B2021-060 if child folder working draft loaded set loadedWorkingDraft if (tn.Parent != null && !loadedWorkingDraft) tn.Remove(); + return loadedWorkingDraft; } private bool LoadDocVersions(FolderInfo fic, TreeNode tnc, bool noProcs) { @@ -525,6 +530,7 @@ namespace VEPROMS DateTime pEnd = DateTime.Now; txtProcess.AppendText(string.Format("Completed: {0}",pEnd.ToString("MM/dd/yyyy @ HH:mm"))); txtProcess.AppendText(Environment.NewLine); + txtProcess.AppendText(string.Format("Started: {0}",pStart.ToString("MM/dd/yyyy @ HH:mm"))); txtProcess.AppendText(Environment.NewLine); Application.DoEvents(); this.Cursor = Cursors.Default;