diff --git a/PROMS/VEPROMS User Interface/VEPROMS_UI.csproj b/PROMS/VEPROMS User Interface/VEPROMS_UI.csproj
index 1a410a53..26cbbdb3 100644
--- a/PROMS/VEPROMS User Interface/VEPROMS_UI.csproj
+++ b/PROMS/VEPROMS User Interface/VEPROMS_UI.csproj
@@ -223,6 +223,12 @@
dlgUCFDetail.cs
+
+ Form
+
+
+ frmAnnotationResults.cs
+
Form
@@ -340,6 +346,9 @@
dlgUCFDetail.cs
+
+ frmAnnotationResults.cs
+
frmAnnotationsCleanup.cs
@@ -626,4 +635,4 @@
cmd /c "$(ProjectDir)FixRev.bat"
-
+
\ No newline at end of file
diff --git a/PROMS/VEPROMS User Interface/frmAnnotationResults.Designer.cs b/PROMS/VEPROMS User Interface/frmAnnotationResults.Designer.cs
new file mode 100644
index 00000000..62bcab44
--- /dev/null
+++ b/PROMS/VEPROMS User Interface/frmAnnotationResults.Designer.cs
@@ -0,0 +1,158 @@
+
+namespace VEPROMS
+{
+ partial class frmAnnotationResults
+ {
+ ///
+ /// Required designer variable.
+ ///
+ private System.ComponentModel.IContainer components = null;
+
+ ///
+ /// Clean up any resources being used.
+ ///
+ /// true if managed resources should be disposed; otherwise, false.
+ protected override void Dispose(bool disposing)
+ {
+ if (disposing && (components != null))
+ {
+ components.Dispose();
+ }
+ base.Dispose(disposing);
+ }
+
+ #region Windows Form Designer generated code
+
+ ///
+ /// Required method for Designer support - do not modify
+ /// the contents of this method with the code editor.
+ ///
+ private void InitializeComponent()
+ {
+ this.lblAnnotationResults = new System.Windows.Forms.Label();
+ this.lblResultTotal = new System.Windows.Forms.Label();
+ this.lblTotal = new System.Windows.Forms.Label();
+ this.lblType = new System.Windows.Forms.Label();
+ this.lblTypeTxt = new System.Windows.Forms.Label();
+ this.lblPlace1 = new System.Windows.Forms.Label();
+ this.lblPlace1Txt = new System.Windows.Forms.Label();
+ this.lblPlace2 = new System.Windows.Forms.Label();
+ this.lblPlace2Txt = new System.Windows.Forms.Label();
+ this.SuspendLayout();
+ //
+ // lblAnnotationResults
+ //
+ this.lblAnnotationResults.AutoSize = true;
+ this.lblAnnotationResults.Location = new System.Drawing.Point(63, 9);
+ this.lblAnnotationResults.Name = "lblAnnotationResults";
+ this.lblAnnotationResults.Size = new System.Drawing.Size(138, 13);
+ this.lblAnnotationResults.TabIndex = 0;
+ this.lblAnnotationResults.Text = "Annotation Cleanup Results";
+ this.lblAnnotationResults.Click += new System.EventHandler(this.label1_Click);
+ //
+ // lblResultTotal
+ //
+ this.lblResultTotal.AutoSize = true;
+ this.lblResultTotal.Location = new System.Drawing.Point(159, 37);
+ this.lblResultTotal.Name = "lblResultTotal";
+ this.lblResultTotal.Size = new System.Drawing.Size(27, 13);
+ this.lblResultTotal.TabIndex = 1;
+ this.lblResultTotal.Text = "*****";
+ //
+ // lblTotal
+ //
+ this.lblTotal.AutoSize = true;
+ this.lblTotal.Location = new System.Drawing.Point(66, 37);
+ this.lblTotal.Name = "lblTotal";
+ this.lblTotal.Size = new System.Drawing.Size(69, 13);
+ this.lblTotal.TabIndex = 2;
+ this.lblTotal.Text = "Total remved";
+ //
+ // lblType
+ //
+ this.lblType.AutoSize = true;
+ this.lblType.Location = new System.Drawing.Point(66, 60);
+ this.lblType.Name = "lblType";
+ this.lblType.Size = new System.Drawing.Size(85, 13);
+ this.lblType.TabIndex = 3;
+ this.lblType.Text = "Annotation Type";
+ //
+ // lblTypeTxt
+ //
+ this.lblTypeTxt.AutoSize = true;
+ this.lblTypeTxt.Location = new System.Drawing.Point(159, 60);
+ this.lblTypeTxt.Name = "lblTypeTxt";
+ this.lblTypeTxt.Size = new System.Drawing.Size(27, 13);
+ this.lblTypeTxt.TabIndex = 4;
+ this.lblTypeTxt.Text = "*****";
+ //
+ // lblPlace1
+ //
+ this.lblPlace1.AutoSize = true;
+ this.lblPlace1.Location = new System.Drawing.Point(66, 87);
+ this.lblPlace1.Name = "lblPlace1";
+ this.lblPlace1.Size = new System.Drawing.Size(43, 13);
+ this.lblPlace1.TabIndex = 5;
+ this.lblPlace1.Text = "Place 1";
+ //
+ // lblPlace1Txt
+ //
+ this.lblPlace1Txt.AutoSize = true;
+ this.lblPlace1Txt.Location = new System.Drawing.Point(159, 87);
+ this.lblPlace1Txt.Name = "lblPlace1Txt";
+ this.lblPlace1Txt.Size = new System.Drawing.Size(27, 13);
+ this.lblPlace1Txt.TabIndex = 6;
+ this.lblPlace1Txt.Text = "*****";
+ //
+ // lblPlace2
+ //
+ this.lblPlace2.AutoSize = true;
+ this.lblPlace2.Location = new System.Drawing.Point(66, 115);
+ this.lblPlace2.Name = "lblPlace2";
+ this.lblPlace2.Size = new System.Drawing.Size(43, 13);
+ this.lblPlace2.TabIndex = 7;
+ this.lblPlace2.Text = "Place 2";
+ //
+ // lblPlace2Txt
+ //
+ this.lblPlace2Txt.AutoSize = true;
+ this.lblPlace2Txt.Location = new System.Drawing.Point(159, 115);
+ this.lblPlace2Txt.Name = "lblPlace2Txt";
+ this.lblPlace2Txt.Size = new System.Drawing.Size(27, 13);
+ this.lblPlace2Txt.TabIndex = 8;
+ this.lblPlace2Txt.Text = "*****";
+ //
+ // frmAnnotationResults
+ //
+ this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
+ this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
+ this.ClientSize = new System.Drawing.Size(253, 157);
+ this.Controls.Add(this.lblPlace2Txt);
+ this.Controls.Add(this.lblPlace2);
+ this.Controls.Add(this.lblPlace1Txt);
+ this.Controls.Add(this.lblPlace1);
+ this.Controls.Add(this.lblTypeTxt);
+ this.Controls.Add(this.lblType);
+ this.Controls.Add(this.lblTotal);
+ this.Controls.Add(this.lblResultTotal);
+ this.Controls.Add(this.lblAnnotationResults);
+ this.Name = "frmAnnotationResults";
+ this.Text = "frmAnnotationResults";
+ this.ResumeLayout(false);
+ this.PerformLayout();
+
+ }
+
+ #endregion
+
+ private System.Windows.Forms.Label lblAnnotationResults;
+ private System.Windows.Forms.Label lblResultTotal;
+ private System.Windows.Forms.Label lblTotal;
+ private System.Windows.Forms.Label lblType;
+ private System.Windows.Forms.Label lblTypeTxt;
+ private System.Windows.Forms.Label lblPlace1;
+ private System.Windows.Forms.Label lblPlace1Txt;
+ private System.Windows.Forms.Label lblPlace2;
+ private System.Windows.Forms.Label lblPlace2Txt;
+ }
+}
\ No newline at end of file
diff --git a/PROMS/VEPROMS User Interface/frmAnnotationResults.cs b/PROMS/VEPROMS User Interface/frmAnnotationResults.cs
new file mode 100644
index 00000000..07a9518c
--- /dev/null
+++ b/PROMS/VEPROMS User Interface/frmAnnotationResults.cs
@@ -0,0 +1,25 @@
+using System;
+using System.Collections.Generic;
+using System.ComponentModel;
+using System.Data;
+using System.Drawing;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using System.Windows.Forms;
+
+namespace VEPROMS
+{
+ public partial class frmAnnotationResults : Form
+ {
+ public frmAnnotationResults()
+ {
+ InitializeComponent();
+ }
+
+ private void label1_Click(object sender, EventArgs e)
+ {
+
+ }
+ }
+}
diff --git a/PROMS/VEPROMS User Interface/frmAnnotationResults.resx b/PROMS/VEPROMS User Interface/frmAnnotationResults.resx
new file mode 100644
index 00000000..7fa5f80a
--- /dev/null
+++ b/PROMS/VEPROMS User Interface/frmAnnotationResults.resx
@@ -0,0 +1,150 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ text/microsoft-resx
+
+
+ 2.0
+
+
+ System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
+
+
+ System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
+
+
+ True
+
+
+ True
+
+
+ True
+
+
+ True
+
+
+ True
+
+
+ True
+
+
+ True
+
+
+ True
+
+
+ True
+
+
+ True
+
+
\ No newline at end of file
diff --git a/PROMS/VEPROMS User Interface/frmAnnotationsCleanup.cs b/PROMS/VEPROMS User Interface/frmAnnotationsCleanup.cs
index 7e964995..c95fd14f 100644
--- a/PROMS/VEPROMS User Interface/frmAnnotationsCleanup.cs
+++ b/PROMS/VEPROMS User Interface/frmAnnotationsCleanup.cs
@@ -22,6 +22,8 @@ namespace VEPROMS
string procList = "";
string docvList = "";
int AnnotationTyp;
+ string AnnotationName = "";
+ string totalDeleteCnt = "";
List pil2 = new List();
List dvil2 = new List();
private frmBatchRefresh mainForm = null;
@@ -99,16 +101,29 @@ namespace VEPROMS
private AnnotationTypeInfoList myAnnotationTypeInfoList = 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)
{
+
+ TextBox frm2 = mainForm.GettxtProcess();
+ TextBox frm3 = mainForm.GettxtResults();
+ AnnotationTyp = System.Convert.ToInt32(((KeyValuePair)lbAnnotationTypes.SelectedItem).Key);
+ AnnotationName = System.Convert.ToString(((KeyValuePair)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)
{
if (p.IsProcedure)
{
- TextBox frm2 = mainForm.GettxtProcess();
- frm2.AppendText(p.DisplayNumber + ' ' + p.DisplayText);
- AnnotationTyp = System.Convert.ToInt32(((KeyValuePair)lbAnnotationTypes.SelectedItem).Key);
+ //AnnotationTyp = System.Convert.ToInt32(((KeyValuePair)lbAnnotationTypes.SelectedItem).Key);
+ //AnnotationName = System.Convert.ToString(((KeyValuePair)lbAnnotationTypes.SelectedItem).Value);
+ //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());
lblCountNumber.Text = "0";
}
@@ -118,15 +133,22 @@ namespace VEPROMS
{
if (d.IsDocVersion)
{
- TextBox frm2 = mainForm.GettxtProcess();
- frm2.AppendText(d.ActiveParent.ToString());
+ //AnnotationTyp = System.Convert.ToInt32(((KeyValuePair)lbAnnotationTypes.SelectedItem).Key);
+ //AnnotationName = System.Convert.ToString(((KeyValuePair)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)lbAnnotationTypes.SelectedItem).Key);
Annotation.DeleteAnnotationDocvByType(AnnotationTyp, d.VersionID.ToString());
+
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)
{
btnClean.Enabled = false;
@@ -145,6 +167,7 @@ namespace VEPROMS
deletecountDocv = Annotation.getAnnotationCountDocv(AnnotationTyp, getAnnotationDocvItems(dvil2));
}
lblCountNumber.Text = (deletecountProc + deletecountDocv).ToString();
+ totalDeleteCnt = (deletecountProc + deletecountDocv).ToString();
btnClean.Enabled = true;
}
diff --git a/PROMS/VEPROMS User Interface/frmBatchRefresh.cs b/PROMS/VEPROMS User Interface/frmBatchRefresh.cs
index 041d81f5..1bde0100 100644
--- a/PROMS/VEPROMS User Interface/frmBatchRefresh.cs
+++ b/PROMS/VEPROMS User Interface/frmBatchRefresh.cs
@@ -61,6 +61,13 @@ namespace VEPROMS
{
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)
// 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
@@ -1722,7 +1729,7 @@ namespace VEPROMS
else
{
// Write progress status
- txtProcess.AppendText("Deleting Annotations...");
+ txtProcess.AppendText("Deleting Annotations..." + Environment.NewLine);
// Create a list of procedures the user selected
List pil = new List();