diff --git a/PROMS/Formats/fmtall/VEGPBckStpsall.xml b/PROMS/Formats/fmtall/VEGPBckStpsall.xml index 0962e4de..dc98b152 100644 Binary files a/PROMS/Formats/fmtall/VEGPBckStpsall.xml and b/PROMS/Formats/fmtall/VEGPBckStpsall.xml differ diff --git a/PROMS/VEPROMS User Interface/frmVersionsProperties.cs b/PROMS/VEPROMS User Interface/frmVersionsProperties.cs index 2a42eccb..ee0efcdd 100644 --- a/PROMS/VEPROMS User Interface/frmVersionsProperties.cs +++ b/PROMS/VEPROMS User Interface/frmVersionsProperties.cs @@ -1113,13 +1113,34 @@ namespace VEPROMS if (_Apples == null) { _Apples = new List(); - } - _Apples.Add(cfg); + } + + //B2026-017 Use Pre-typed in information when adding New Applicability + if (_Apples.Count == 0) + { + cfg.ID = textBox1.Text; + if (!string.IsNullOrEmpty(textBox2.Text)) + { + cfg.Name = textBox2.Text; + } + cfg.Number = textBox3.Text; + cfg.Text = textBox4.Text; + cfg.OtherID = textBox8.Text; + cfg.OtherName = textBox9.Text; + cfg.OtherNumber = textBox10.Text; + cfg.OtherText = textBox11.Text; + cfg.ProcedureNumber = textBox5.Text; + cfg.SetID = textBox6.Text; + cfg.SetName = textBox7.Text; + } + _Apples.Add(cfg); bsApples.DataSource = null; bsApples.DataSource = _Apples; - lbApplicabilities.SelectedItem = cfg; - } + lbApplicabilities.SelectedItem = cfg; + lbApplicabilities_SelectedIndexChanged(sender, e); + + } private bool ApplicIsUsed(MiniConfig cfg) // B2017-230 - don't allow user to remove an applicability that is being used (specified) { diff --git a/PROMS/VEPROMS.CSLA.Library/Config/DocVersionConfig.cs b/PROMS/VEPROMS.CSLA.Library/Config/DocVersionConfig.cs index b2797317..876f711c 100644 --- a/PROMS/VEPROMS.CSLA.Library/Config/DocVersionConfig.cs +++ b/PROMS/VEPROMS.CSLA.Library/Config/DocVersionConfig.cs @@ -2291,7 +2291,7 @@ OnPropertyChanged("Default_BkColor"); public void RemoveSlave(int index) { XmlNode dd = _Xp.XmlContents.SelectSingleNode("//Slave[@index='" + index.ToString() + "']"); - dd.ParentNode.RemoveChild(dd); + dd?.ParentNode?.RemoveChild(dd); } public int MaxSlaveIndex { diff --git a/PROMS/Volian.Controls.Library/EditItem.cs b/PROMS/Volian.Controls.Library/EditItem.cs index c0fec876..a8c0c8ba 100644 --- a/PROMS/Volian.Controls.Library/EditItem.cs +++ b/PROMS/Volian.Controls.Library/EditItem.cs @@ -4162,8 +4162,11 @@ namespace Volian.Controls.Library } void MyConfig_PropertyChanged(object sender, PropertyChangedEventArgs e) { - SaveConfig(); - } + //B2026-024 Change bars should not show when updating Applicability. + if (e.PropertyName == "MasterSlave_Applicability") ChangeBarForConfigItemChange = false; + SaveConfig(); + if (e.PropertyName == "MasterSlave_Applicability") ChangeBarForConfigItemChange = true; + } public void SaveConfig() { if (!MyItemInfo.MyConfig.IsDirty) return;