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

Development #373

Merged
djankowski merged 17 commits from Development into master 2024-08-01 08:37:24 -04:00
Conversation 0 Commits 17 Files Changed 314 +42 -8
2 changed files with 42 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 659833c5bf - Show all commits

39
PROMS/VEPROMS User Interface/frmAnnotationsCleanup.cs
View File

@@ -22,6 +22,8 @@ namespace VEPROMS
string procList = ""; string procList = "";
string docvList = ""; string docvList = "";
int AnnotationTyp; int AnnotationTyp;
string AnnotationName = "";
string totalDeleteCnt = "";
List<ProcedureInfo> pil2 = new List<ProcedureInfo>(); List<ProcedureInfo> pil2 = new List<ProcedureInfo>();
List<DocVersionInfo> dvil2 = new List<DocVersionInfo>(); List<DocVersionInfo> dvil2 = new List<DocVersionInfo>();
private frmBatchRefresh mainForm = null; private frmBatchRefresh mainForm = null;
@@ -99,16 +101,29 @@ namespace VEPROMS
private AnnotationTypeInfoList myAnnotationTypeInfoList = null; private AnnotationTypeInfoList myAnnotationTypeInfoList = null;
private LocalAnnotationTypeInfoList myLocalAnnotationTypeInfoList = null; private LocalAnnotationTypeInfoList myLocalAnnotationTypeInfoList = null;
// Process used to cleanup annotations "(Proceed?" button) // Process used to cleanup annotations "(Proceed?" button)
private void button1_Click(object sender, EventArgs e) private void button1_Click(object sender, EventArgs e)
{ {
TextBox frm2 = mainForm.GettxtProcess();
TextBox frm3 = mainForm.GettxtResults();
AnnotationTyp = System.Convert.ToInt32(((KeyValuePair<string, string>)lbAnnotationTypes.SelectedItem).Key);
AnnotationName = System.Convert.ToString(((KeyValuePair<string, string>)lbAnnotationTypes.SelectedItem).Value);
frm3.AppendText("Deleting Annotations: Annotation Type: " + '"' + AnnotationName + '"');
frm3.AppendText(Environment.NewLine + "P = Procedure, F = Folder" + Environment.NewLine);
int deletecountProc = 0;
int deletecountDocv = 0;
foreach (var p in pil2) foreach (var p in pil2)
{ {
if (p.IsProcedure) if (p.IsProcedure)
{ {
TextBox frm2 = mainForm.GettxtProcess(); //AnnotationTyp = System.Convert.ToInt32(((KeyValuePair<string, string>)lbAnnotationTypes.SelectedItem).Key);
frm2.AppendText(p.DisplayNumber + ' ' + p.DisplayText); //AnnotationName = System.Convert.ToString(((KeyValuePair<string, string>)lbAnnotationTypes.SelectedItem).Value);
AnnotationTyp = System.Convert.ToInt32(((KeyValuePair<string, string>)lbAnnotationTypes.SelectedItem).Key); //deletecountProc = Annotation.getAnnotationProcCnt(AnnotationTyp, getAnnotationProcItems(p));
deletecountProc = Annotation.getAnnotationProcCnt(AnnotationTyp, p.ItemID.ToString());
frm2.AppendText(Environment.NewLine + p.DisplayNumber + ' ' + p.DisplayText);
//frm3.AppendText(Environment.NewLine + "P: " + p.DisplayNumber + '"' + p.DisplayText + '"' + " Type: " + '"' + AnnotationName + '"' + " count: " + deletecountProc);
frm3.AppendText(Environment.NewLine + "P: " + p.DisplayNumber + '"' + p.DisplayText + '"' + " Delete count: " + deletecountProc);
Annotation.DeleteAnnotationProcByType(AnnotationTyp, p.ItemID.ToString()); Annotation.DeleteAnnotationProcByType(AnnotationTyp, p.ItemID.ToString());
lblCountNumber.Text = "0"; lblCountNumber.Text = "0";
} }
@@ -118,15 +133,22 @@ namespace VEPROMS
{ {
if (d.IsDocVersion) if (d.IsDocVersion)
{ {
TextBox frm2 = mainForm.GettxtProcess(); //AnnotationTyp = System.Convert.ToInt32(((KeyValuePair<string, string>)lbAnnotationTypes.SelectedItem).Key);
frm2.AppendText(d.ActiveParent.ToString()); //AnnotationName = System.Convert.ToString(((KeyValuePair<string, string>)lbAnnotationTypes.SelectedItem).Value);
deletecountDocv = Annotation.getAnnotationCountDocv(AnnotationTyp, d.VersionID.ToString());
frm2.AppendText(Environment.NewLine + d.ActiveParent.ToString());
frm3.AppendText(Environment.NewLine + "F: " + '"' + d.ActiveParent.ToString() + '"' + " Delete count: " + deletecountDocv);
AnnotationTyp = System.Convert.ToInt32(((KeyValuePair<string, string>)lbAnnotationTypes.SelectedItem).Key); AnnotationTyp = System.Convert.ToInt32(((KeyValuePair<string, string>)lbAnnotationTypes.SelectedItem).Key);
Annotation.DeleteAnnotationDocvByType(AnnotationTyp, d.VersionID.ToString()); Annotation.DeleteAnnotationDocvByType(AnnotationTyp, d.VersionID.ToString());
lblCountNumber.Text = "0"; lblCountNumber.Text = "0";
} }
} }
frm3.AppendText(Environment.NewLine + Environment.NewLine + "Total Annotations Deleted: " + totalDeleteCnt + Environment.NewLine + Environment.NewLine);
} }
// Retrieve number of annotations that will be deleted.
// Retrieve number of annotations that will be deleted.
private void lbAnnotationTypes_SelectedIndexChanged(object sender, EventArgs e) private void lbAnnotationTypes_SelectedIndexChanged(object sender, EventArgs e)
{ {
btnClean.Enabled = false; btnClean.Enabled = false;
@@ -145,6 +167,7 @@ namespace VEPROMS
deletecountDocv = Annotation.getAnnotationCountDocv(AnnotationTyp, getAnnotationDocvItems(dvil2)); deletecountDocv = Annotation.getAnnotationCountDocv(AnnotationTyp, getAnnotationDocvItems(dvil2));
} }
lblCountNumber.Text = (deletecountProc + deletecountDocv).ToString(); lblCountNumber.Text = (deletecountProc + deletecountDocv).ToString();
totalDeleteCnt = (deletecountProc + deletecountDocv).ToString();
btnClean.Enabled = true; btnClean.Enabled = true;
} }
@@ -156,3 +179,5 @@ namespace VEPROMS
} }
} }

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

@@ -61,6 +61,13 @@ namespace VEPROMS
{ {
return txtProcess; return txtProcess;
} }
// Make txtResults text box available to frmAnnotationsClean form.
internal TextBox GettxtResults()
{
return txtResults;
}
// NOTE: removed the Refresh ROs and Refresh Transitions and ROs options (now only Transitions can be refreshed) // NOTE: removed the Refresh ROs and Refresh Transitions and ROs options (now only Transitions can be refreshed)
// the Update ROs and Refresh ROs logic was merged together. The Update ROs will functionally do both // the Update ROs and Refresh ROs logic was merged together. The Update ROs will functionally do both
// also annotations will be placed on step elements that have RO changes // also annotations will be placed on step elements that have RO changes
@@ -1722,7 +1729,7 @@ namespace VEPROMS
else else
{ {
// Write progress status // Write progress status
txtProcess.AppendText("Deleting Annotations..."); txtProcess.AppendText("Deleting Annotations..." + Environment.NewLine);
// Create a list of procedures the user selected // Create a list of procedures the user selected
List<ProcedureInfo> pil = new List<ProcedureInfo>(); List<ProcedureInfo> pil = new List<ProcedureInfo>();
@@ -1792,3 +1799,5 @@ namespace VEPROMS
} }