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

Merge pull request 'B2024-052-In-Annotations-pop-up-no-Annotation-type-should-be-selected-by-default' (#371) from B2024-052-In-Annotations-pop-up-no-Annotation-type-should-be-selected-by-default into Development

Browse Source 
changes look good - onto testing phase
This commit is contained in:
John Jenko 2024-07-31 09:49:30 -04:00
commit 7c33bad362
1 changed files with 19 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -54,6 +54,7 @@ namespace VEPROMS
lbAnnotationTypes.DisplayMember = "Value"; lbAnnotationTypes.DisplayMember = "Value";
lbAnnotationTypes.ValueMember = "Key"; lbAnnotationTypes.ValueMember = "Key";
lbAnnotationTypes.SelectedIndexChanged += lbAnnotationTypes_SelectedIndexChanged; lbAnnotationTypes.SelectedIndexChanged += lbAnnotationTypes_SelectedIndexChanged;
lbAnnotationTypes.ClearSelected();
} }
// create comma delimited string of procedures selected by user. // create comma delimited string of procedures selected by user.
@ -151,24 +152,27 @@ namespace VEPROMS
// 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; if (lbAnnotationTypes.SelectedIndex > -1)
lblCountNumber.Text = "";
int deletecountProc = 0;
int deletecountDocv = 0;
if (pil2.Count > 0)
{ {
AnnotationTyp = System.Convert.ToInt32(((KeyValuePair<string, string>)lbAnnotationTypes.SelectedItem).Key); btnClean.Enabled = false;
deletecountProc = Annotation.getAnnotationProcCnt(AnnotationTyp, getAnnotationProcItems(pil2)); lblCountNumber.Text = "";
} int deletecountProc = 0;
int deletecountDocv = 0;
if (pil2.Count > 0)
{
AnnotationTyp = System.Convert.ToInt32(((KeyValuePair<string, string>)lbAnnotationTypes.SelectedItem).Key);
deletecountProc = Annotation.getAnnotationProcCnt(AnnotationTyp, getAnnotationProcItems(pil2));
}
if (dvil2.Count > 0) if (dvil2.Count > 0)
{ {
AnnotationTyp = System.Convert.ToInt32(((KeyValuePair<string, string>)lbAnnotationTypes.SelectedItem).Key); AnnotationTyp = System.Convert.ToInt32(((KeyValuePair<string, string>)lbAnnotationTypes.SelectedItem).Key);
deletecountDocv = Annotation.getAnnotationCountDocv(AnnotationTyp, getAnnotationDocvItems(dvil2)); 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. // Close form.