From 7872f192ed4e4dc1b1228c62381a8361639a3ceb Mon Sep 17 00:00:00 2001 From: Paul Larsen Date: Wed, 31 Jul 2024 09:23:34 -0400 Subject: [PATCH] B2024-052-In-Annotations-pop-up-no-Annotation-type-should-be-selected-by-default --- .../frmAnnotationsCleanup.cs | 34 +++++++++++-------- 1 file changed, 19 insertions(+), 15 deletions(-) diff --git a/PROMS/VEPROMS User Interface/frmAnnotationsCleanup.cs b/PROMS/VEPROMS User Interface/frmAnnotationsCleanup.cs index 7a78813d..bb91f05a 100644 --- a/PROMS/VEPROMS User Interface/frmAnnotationsCleanup.cs +++ b/PROMS/VEPROMS User Interface/frmAnnotationsCleanup.cs @@ -54,6 +54,7 @@ namespace VEPROMS lbAnnotationTypes.DisplayMember = "Value"; lbAnnotationTypes.ValueMember = "Key"; lbAnnotationTypes.SelectedIndexChanged += lbAnnotationTypes_SelectedIndexChanged; + lbAnnotationTypes.ClearSelected(); } // create comma delimited string of procedures selected by user. @@ -151,24 +152,27 @@ namespace VEPROMS // Retrieve number of annotations that will be deleted. private void lbAnnotationTypes_SelectedIndexChanged(object sender, EventArgs e) { - btnClean.Enabled = false; - lblCountNumber.Text = ""; - int deletecountProc = 0; - int deletecountDocv = 0; - if (pil2.Count > 0) + if (lbAnnotationTypes.SelectedIndex > -1) { - AnnotationTyp = System.Convert.ToInt32(((KeyValuePair)lbAnnotationTypes.SelectedItem).Key); - deletecountProc = Annotation.getAnnotationProcCnt(AnnotationTyp, getAnnotationProcItems(pil2)); - } + btnClean.Enabled = false; + lblCountNumber.Text = ""; + int deletecountProc = 0; + int deletecountDocv = 0; + if (pil2.Count > 0) + { + AnnotationTyp = System.Convert.ToInt32(((KeyValuePair)lbAnnotationTypes.SelectedItem).Key); + deletecountProc = Annotation.getAnnotationProcCnt(AnnotationTyp, getAnnotationProcItems(pil2)); + } - if (dvil2.Count > 0) - { - AnnotationTyp = System.Convert.ToInt32(((KeyValuePair)lbAnnotationTypes.SelectedItem).Key); - deletecountDocv = Annotation.getAnnotationCountDocv(AnnotationTyp, getAnnotationDocvItems(dvil2)); + if (dvil2.Count > 0) + { + AnnotationTyp = System.Convert.ToInt32(((KeyValuePair)lbAnnotationTypes.SelectedItem).Key); + deletecountDocv = Annotation.getAnnotationCountDocv(AnnotationTyp, getAnnotationDocvItems(dvil2)); + } + lblCountNumber.Text = (deletecountProc + deletecountDocv).ToString(); + totalDeleteCnt = (deletecountProc + deletecountDocv).ToString(); + btnClean.Enabled = true; } - lblCountNumber.Text = (deletecountProc + deletecountDocv).ToString(); - totalDeleteCnt = (deletecountProc + deletecountDocv).ToString(); - btnClean.Enabled = true; } // Close form. -- 2.47.2