Volian/SourceCode
8
0
Fork 0
Code Issues Pull Requests 1 Projects Releases Wiki Activity

Merge pull request 'C2024-018 - Updated fixes per Michelle testing. Added some confirmation messages' (#380) from C2024-018 into Development

Browse Source 
changes approved. - ready for testing phase
This commit is contained in:
John Jenko 2024-08-05 12:12:05 -04:00
commit 86a3e56a27
1 changed files with 12 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
PROMS/VEPROMS User Interface/frmBatchRefresh.cs
View File

@ -1520,7 +1520,7 @@ namespace VEPROMS
{ {
splitContainer3.Panel2Collapsed = false; splitContainer3.Panel2Collapsed = false;
progressSteps1.Items.Add(siOrphDatRecs); progressSteps1.Items.Add(siOrphDatRecs);
lblAdmToolProgressType.Text = "Repairing: "; lblAdmToolProgressType.Text = "Deleting: ";
progressSteps1.Visible = true; progressSteps1.Visible = true;
progressSteps1.Refresh(); progressSteps1.Refresh();
} }
@ -1757,7 +1757,7 @@ namespace VEPROMS
if (swDeleteFolder.Value) if (swDeleteFolder.Value)
{ {
if (FlexibleMessageBox.Show(this, "You sure you want to remove the selected folders and their contents?", "Confirm Folder Deletion", MessageBoxButtons.YesNo, MessageBoxIcon.Question) == DialogResult.Yes) if (FlexibleMessageBox.Show(this, "Are you sure you want to remove the selected folders and their contents?", "Confirm Folder Deletion", MessageBoxButtons.YesNo, MessageBoxIcon.Question) == DialogResult.Yes)
{ {
txtProcess.AppendText("Deleting Folders..."); txtProcess.AppendText("Deleting Folders...");
@ -1804,6 +1804,8 @@ namespace VEPROMS
private void ProcessDelete(List<DocVersionInfo> foldersToDelete, List<FolderInfo> emptyFoldersToDelete) private void ProcessDelete(List<DocVersionInfo> foldersToDelete, List<FolderInfo> emptyFoldersToDelete)
{ {
int foldersDeleted = 0;
DateTime pStart = DateTime.Now; DateTime pStart = DateTime.Now;
txtProcess.AppendText(Environment.NewLine); txtProcess.AppendText(Environment.NewLine);
txtProcess.AppendText(pStart.ToString("MM/dd/yyyy @ HH:mm")); txtProcess.AppendText(pStart.ToString("MM/dd/yyyy @ HH:mm"));
@ -1823,6 +1825,7 @@ namespace VEPROMS
if (deletionSuccessful) if (deletionSuccessful)
{ {
txtProcess.AppendText($"Successfully deleted folder: {folderName} (ID: {itemID})"); txtProcess.AppendText($"Successfully deleted folder: {folderName} (ID: {itemID})");
foldersDeleted += 1;
} }
else else
{ {
@ -1847,14 +1850,20 @@ namespace VEPROMS
if (deletionSuccessful) if (deletionSuccessful)
{ {
txtProcess.AppendText($"Successfully deleted folder: {folderName} (ID: {itemID})"); txtProcess.AppendText($"Successfully deleted folder: {folderName} (ID: {itemID})");
foldersDeleted += 1;
} }
else else
{ {
txtProcess.AppendText($"Failed to delete folder: {folderName} (ID: {itemID})"); txtProcess.AppendText($"Failed to delete folder: {folderName} (ID: {itemID})");
} }
txtProcess.AppendText(Environment.NewLine); txtProcess.AppendText(Environment.NewLine);
} }
txtProcess.AppendText($"Folder deletion process completed, {foldersDeleted} folders have been deleted. ");
txtProcess.AppendText(Environment.NewLine);
//Run Repair //Run Repair
int prgStpIdx = -1; int prgStpIdx = -1;
StepProgress(++prgStpIdx, 50); StepProgress(++prgStpIdx, 50);
@ -1864,7 +1873,7 @@ namespace VEPROMS
//rebuild //rebuild
ResetDelTV(true); ResetDelTV(true);
MessageBox.Show("Folder Deletion Completed", "Delete Folders"); MessageBox.Show($"Folder deletion completed, {foldersDeleted} folders have been deleted.", "Delete Folders");
ClearStepProgress(); ClearStepProgress();
} }