diff --git a/PROMS/VEPROMS User Interface/PROMSFixes.Sql b/PROMS/VEPROMS User Interface/PROMSFixes.Sql index 26bd9ad1..c60d5b26 100644 --- a/PROMS/VEPROMS User Interface/PROMSFixes.Sql +++ b/PROMS/VEPROMS User Interface/PROMSFixes.Sql @@ -22642,8 +22642,7 @@ Go Begin: C2024-005: PRL - SPs to support Admin tool to clean Annotations ========================================================================================================== */ --- Change COMPATIBILITY_LEVEL to 130. This change is needed for C2024-005 -ALTER DATABASE [VEPROMS_BeaverValley] SET COMPATIBILITY_LEVEL = 130 + /****** Object: StoredProcedure [dbo].[deleteAnnotationsDocvByType] Script Date: 7/11/2024 2:39:59 PM ******/ IF EXISTS (SELECT * FROM sys.objects WHERE type = 'P' AND name = 'deleteAnnotationsDocvByType') @@ -22688,7 +22687,7 @@ AS AllItemIDs int ) - INSERT INTO @docvs (DocvVersionID) (select value from STRING_SPLIT(@docvList, ',')) + INSERT INTO @docvs (DocvVersionID) (select id from vefn_SplitInt(@docvList, ',')) DECLARE @cnt int = 0 DECLARE @cnt2 int @@ -22713,7 +22712,7 @@ AS -- Delete Annotations DELETE FROM Ann - FROM tblAnnotations Ann INNER JOIN @Annotationitems AI ON Ann.itemid = AI.AllItemIDs WHERE TypeID = @typeid + FROM tblAnnotations Ann INNER JOIN @Annotationitems AI ON Ann.itemid = AI.AllItemIDs WHERE TypeID = @typeidI beleive the GO @@ -22763,7 +22762,7 @@ AS DECLARE @cnt2 int DECLARE @itemid int - INSERT INTO @procs (ProcItemIDs) (select value from STRING_SPLIT(@procList, ',')) + INSERT INTO @procs (ProcItemIDs) (select id from vefn_SplitInt(@procList, ',')) DECLARE @i INT SET @i = (SELECT MIN(RowID) FROM @procs); diff --git a/PROMS/VEPROMS User Interface/VEPROMS_UI.csproj b/PROMS/VEPROMS User Interface/VEPROMS_UI.csproj index b2d80678..1a410a53 100644 --- a/PROMS/VEPROMS User Interface/VEPROMS_UI.csproj +++ b/PROMS/VEPROMS User Interface/VEPROMS_UI.csproj @@ -626,4 +626,4 @@ cmd /c "$(ProjectDir)FixRev.bat" - \ No newline at end of file + diff --git a/PROMS/VEPROMS User Interface/frmAnnotationsCleanup.Designer.cs b/PROMS/VEPROMS User Interface/frmAnnotationsCleanup.Designer.cs index 6638f454..84b4fcd3 100644 --- a/PROMS/VEPROMS User Interface/frmAnnotationsCleanup.Designer.cs +++ b/PROMS/VEPROMS User Interface/frmAnnotationsCleanup.Designer.cs @@ -127,4 +127,5 @@ namespace VEPROMS private System.Windows.Forms.Label lblCount; private System.Windows.Forms.Button btnClose; } -} \ No newline at end of file +} + diff --git a/PROMS/VEPROMS User Interface/frmAnnotationsCleanup.cs b/PROMS/VEPROMS User Interface/frmAnnotationsCleanup.cs index c1279285..59506f14 100644 --- a/PROMS/VEPROMS User Interface/frmAnnotationsCleanup.cs +++ b/PROMS/VEPROMS User Interface/frmAnnotationsCleanup.cs @@ -25,38 +25,36 @@ namespace VEPROMS List pil2 = new List(); List dvil2 = new List(); private frmBatchRefresh mainForm = null; + // frmAnnotationsCleanup constructor passes users procedure and docversion selections from frmBatchRefresh public frmAnnotationsCleanup(Form callingForm, List pil, List dvil) - { + + { // Set up link back to parent form. mainForm = callingForm as frmBatchRefresh; InitializeComponent(); pil2 = pil; dvil2 = dvil; + // Get list of annotation types for plant. myAnnotationTypeInfoList = AnnotationTypeInfoList.Get(); lbAnnotationTypes.DataSource = myLocalAnnotationTypeInfoList = new LocalAnnotationTypeInfoList(myAnnotationTypeInfoList); Dictionary AnnotationsList = new Dictionary(); + // Add name and type ID to form. foreach (LocalAnnotationTypeInfo lati in myLocalAnnotationTypeInfoList) { AnnotationsList.Add(lati.TypeID.ToString(), lati.Name); //cbAnnotationTypes.Items.Add(new { Name = lati.Name, Value = lati.TypeID }); } - //cbAnnotationTypes.DroppedDown = true; //DroppedDown lbAnnotationTypes.DataSource = new BindingSource(AnnotationsList, null); lbAnnotationTypes.DisplayMember = "Value"; lbAnnotationTypes.ValueMember = "Key"; lbAnnotationTypes.SelectedIndexChanged += lbAnnotationTypes_SelectedIndexChanged; - - //List SelectedProds = new List(); - //SelectedProds = frmBatchRefresh.RetrieveChkAnnotations(); - - } - + // create comma delimited string of procedures selected by user. private string getAnnotationProcItems(List pil2) { procList = ""; @@ -75,9 +73,9 @@ namespace VEPROMS } } return procList; - //for( int i = 0; pil2.Count ; i++ ) } + // create comma delimited string of doc versions selected by user. private string getAnnotationDocvItems(List dvil2) { docvList = ""; @@ -96,11 +94,12 @@ namespace VEPROMS } } return docvList; - //for( int i = 0; pil2.Count ; i++ ) } private AnnotationTypeInfoList myAnnotationTypeInfoList = null; private LocalAnnotationTypeInfoList myLocalAnnotationTypeInfoList = null; + + // Process used to cleanup annotations "(Proceed?" button) private void button1_Click(object sender, EventArgs e) { foreach (var p in pil2) @@ -127,12 +126,7 @@ namespace VEPROMS } } } - - //private void cbAnnotationTypes_SelectedIndexChanged(object sender, EventArgs e) - //{ - // mylab.Text = mylab.Text + ((KeyValuePair)cbAnnotationTypes.SelectedItem).Key; - //} - + // Retrieve number of annotations that will be deleted. private void lbAnnotationTypes_SelectedIndexChanged(object sender, EventArgs e) { lblCountNumber.Text = ""; @@ -152,23 +146,11 @@ namespace VEPROMS lblCountNumber.Text = (deletecountProc + deletecountDocv).ToString(); } - + // Close form. private void btnClose_Click(object sender, EventArgs e) { this.Close(); } - - //private void cbAnnotationTypes_(object sender, EventArgs e) - //{ - // //mylab.Text = mylab.Text + cbAnnotationTypes.SelectedValue; - // //mylab.Text = mylab.Text + cbAnnotationTypes.SelectedItem.ToString(); - - // //mylab.Text = mylab.Text + ((KeyValuePair)cbAnnotationTypes.SelectedItem).Value; - - //} } } - - - diff --git a/PROMS/VEPROMS User Interface/frmAnnotationsCleanup.resx b/PROMS/VEPROMS User Interface/frmAnnotationsCleanup.resx index e0ab540c..76fb8bd8 100644 --- a/PROMS/VEPROMS User Interface/frmAnnotationsCleanup.resx +++ b/PROMS/VEPROMS User Interface/frmAnnotationsCleanup.resx @@ -120,4 +120,5 @@ 17, 17 - \ No newline at end of file + + diff --git a/PROMS/VEPROMS User Interface/frmBatchRefresh.Designer.cs b/PROMS/VEPROMS User Interface/frmBatchRefresh.Designer.cs index f4902314..547c5582 100644 --- a/PROMS/VEPROMS User Interface/frmBatchRefresh.Designer.cs +++ b/PROMS/VEPROMS User Interface/frmBatchRefresh.Designer.cs @@ -1461,3 +1461,5 @@ private DevComponents.DotNetBar.Controls.SideNavItem sideNavItmDelete; } } + + diff --git a/PROMS/VEPROMS User Interface/frmBatchRefresh.cs b/PROMS/VEPROMS User Interface/frmBatchRefresh.cs index 248ee3c6..bca40b1b 100644 --- a/PROMS/VEPROMS User Interface/frmBatchRefresh.cs +++ b/PROMS/VEPROMS User Interface/frmBatchRefresh.cs @@ -53,7 +53,7 @@ namespace VEPROMS swStandardHypenChars.Enabled = false; } } - // txtProcess text box available to frmAnnotationsClean form. + // Make txtProcess text box available to frmAnnotationsClean form. internal TextBox GettxtProcess() { return txtProcess; @@ -1718,28 +1718,21 @@ namespace VEPROMS } else { - //TODO process deletions of annotations + // Write progress status txtProcess.AppendText("Deleting Annotations..."); + // Create a list of procedures the user selected List pil = new List(); foreach (TreeNode tn in myProcedures.Keys) if (tn.Checked) pil.Add(myProcedures[tn]); + // Create a list of doc versions the user selected List dvil = new List(); foreach (TreeNode tn in myDocVersions.Keys) if (tn.Checked) dvil.Add(myDocVersions[tn]); - - //List dvil = new List(); - //foreach (TreeNode tn in myTVdel.Nodes) - // if (tn.Checked) - // { - // tn.Tag = dvil; - // myDocVersions.Add(tn, dvil); - // } - frmAnnotationsCleanup frmAnnoDel = new frmAnnotationsCleanup(this, pil, dvil); frmAnnoDel.ShowDialog(); @@ -1794,3 +1787,5 @@ namespace VEPROMS } } } + + diff --git a/PROMS/VEPROMS User Interface/frmBatchRefresh.resx b/PROMS/VEPROMS User Interface/frmBatchRefresh.resx index a2674e82..ee2c6dfc 100644 --- a/PROMS/VEPROMS User Interface/frmBatchRefresh.resx +++ b/PROMS/VEPROMS User Interface/frmBatchRefresh.resx @@ -405,4 +405,4 @@ If more than one procedure is selected, it is recommended that this be performed 46 - \ No newline at end of file + diff --git a/PROMS/VEPROMS User Interface/frmVEPROMS.Designer.cs b/PROMS/VEPROMS User Interface/frmVEPROMS.Designer.cs index 283570bb..8548a650 100644 --- a/PROMS/VEPROMS User Interface/frmVEPROMS.Designer.cs +++ b/PROMS/VEPROMS User Interface/frmVEPROMS.Designer.cs @@ -1763,3 +1763,4 @@ namespace VEPROMS } } + diff --git a/PROMS/VEPROMS.CSLA.Library/Extension/AnnotationExt.cs b/PROMS/VEPROMS.CSLA.Library/Extension/AnnotationExt.cs index 7f108de3..6b116fec 100644 --- a/PROMS/VEPROMS.CSLA.Library/Extension/AnnotationExt.cs +++ b/PROMS/VEPROMS.CSLA.Library/Extension/AnnotationExt.cs @@ -563,11 +563,6 @@ namespace VEPROMS.CSLA.Library } } } - //public partial class AnnotationTypeAnnotations - //{ - // public static int GetAnnotationID() - // { - // return AnnotationTypeAnnotat - // } - //} } + +