Compare commits
11 Commits
C2026-023
...
F2026-012_
| Author | SHA1 | Date | |
|---|---|---|---|
| 4e829200f5 | |||
| 56f14323d1 | |||
| 4fcd22ca68 | |||
| ef32564fba | |||
| d95505726f | |||
| 836cdaf087 | |||
| 6f5c41abb8 | |||
| 6379321785 | |||
| e4c6e4393e | |||
| 3e6bb81e39 | |||
| 81643e2aef |
Binary file not shown.
@@ -1337,24 +1337,37 @@ namespace VEPROMS
|
|||||||
pi.ClearChangeBarOverrides();
|
pi.ClearChangeBarOverrides();
|
||||||
|
|
||||||
//B2019-140 Change bars do not get refreshed when approval is run.
|
//B2019-140 Change bars do not get refreshed when approval is run.
|
||||||
ProcedureInfo newproc = ItemInfo.ResetProcedure(pi.ItemID);
|
ProcedureInfo newproc;
|
||||||
|
|
||||||
//// Refresh the StepPanel for the current Procedure
|
//// Refresh the StepPanel for the current Procedure
|
||||||
//// so change bars update
|
//// so change bars update
|
||||||
//// on any open StepPanel
|
//// on any open StepPanel
|
||||||
DisplayTabItem dti = MyFrmVEPROMS.GetTabContainingProcedure(pi.ItemID);
|
|
||||||
|
//B2026-019 Attempt to prevent an Access Error by utilizing a different Refresh if a Procedure is Open
|
||||||
|
DisplayTabItem dti = MyFrmVEPROMS.GetTabContainingProcedure(pi.ItemID);
|
||||||
if (dti != null)
|
if (dti != null)
|
||||||
{
|
{
|
||||||
if (!dti.MyStepTabPanel.MyStepPanel.ContainsFocus)
|
if (!dti.MyStepTabPanel.MyStepPanel.ContainsFocus)
|
||||||
dti.MyStepTabPanel.MyStepPanel.Focus();
|
dti.MyStepTabPanel.MyStepPanel.Focus();
|
||||||
|
|
||||||
foreach (EditItem eitm in dti.MyStepTabPanel.MyStepPanel.Controls.OfType<EditItem>())
|
foreach (EditItem eitm in dti.MyStepTabPanel.MyStepPanel.Controls.OfType<EditItem>())
|
||||||
eitm.ChangeBar = eitm.MyItemInfo.HasChangeBar;
|
{
|
||||||
}
|
eitm.ChangeBar = eitm.MyItemInfo.HasChangeBar;
|
||||||
|
}
|
||||||
|
|
||||||
//since in a separate form, need to update the tree view
|
dti.MyStepTabPanel.MyStepTabRibbon.RefreshProcedure();
|
||||||
//so "Showing Change Bars" Content Menu Item is correct
|
Application.DoEvents();
|
||||||
MyFrmVEPROMS.RefreshProcedureNode(newproc);
|
newproc = ProcedureInfo.Get(pi.ItemID);
|
||||||
|
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
newproc = ItemInfo.ResetProcedure(pi.ItemID);
|
||||||
|
}
|
||||||
|
|
||||||
|
//since in a separate form, need to update the tree view
|
||||||
|
//so "Showing Change Bars" Content Menu Item is correct
|
||||||
|
MyFrmVEPROMS.RefreshProcedureNode(newproc);
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
UpdateProcedureConfig(pi, ap.RevNumber, ap.RevDate, myDTS, selectedSlave);
|
UpdateProcedureConfig(pi, ap.RevNumber, ap.RevDate, myDTS, selectedSlave);
|
||||||
|
|||||||
@@ -626,22 +626,31 @@ namespace VEPROMS
|
|||||||
itm.UserID = Volian.Base.Library.VlnSettings.UserID;
|
itm.UserID = Volian.Base.Library.VlnSettings.UserID;
|
||||||
itm.Save();
|
itm.Save();
|
||||||
|
|
||||||
//B2019-140 Change bars do not get refreshed when approval is run.
|
//B2019-140 Change bars do not get refreshed when approval is run.
|
||||||
// Reset a Procedure and sub items in the cache
|
// Reset a Procedure and sub items in the cache
|
||||||
ProcedureInfo newproc = ItemInfo.ResetProcedure(pi.ItemID);
|
|
||||||
|
|
||||||
//// Refresh the StepPanel for the current Procedure
|
//// Refresh the StepPanel for the current Procedure
|
||||||
//// so change bars update
|
//// so change bars update
|
||||||
//// on any open StepPanel
|
//// on any open StepPanel
|
||||||
DisplayTabItem dti = GetTabContainingProcedure(pi.ItemID);
|
|
||||||
if (dti != null)
|
//B2026-019 Attempt to prevent an Access Error by utilizing a different Refresh if a Procedure is Open
|
||||||
{
|
DisplayTabItem dti = GetTabContainingProcedure(pi.ItemID);
|
||||||
if (!dti.MyStepTabPanel.MyStepPanel.ContainsFocus)
|
if (dti != null)
|
||||||
dti.MyStepTabPanel.MyStepPanel.Focus();
|
{
|
||||||
|
if (!dti.MyStepTabPanel.MyStepPanel.ContainsFocus)
|
||||||
|
dti.MyStepTabPanel.MyStepPanel.Focus();
|
||||||
|
|
||||||
foreach (EditItem eitm in dti.MyStepTabPanel.MyStepPanel.Controls.OfType<EditItem>())
|
foreach (EditItem eitm in dti.MyStepTabPanel.MyStepPanel.Controls.OfType<EditItem>())
|
||||||
|
{
|
||||||
eitm.ChangeBar = eitm.MyItemInfo.HasChangeBar;
|
eitm.ChangeBar = eitm.MyItemInfo.HasChangeBar;
|
||||||
|
}
|
||||||
|
|
||||||
|
dti.MyStepTabPanel.MyStepTabRibbon.RefreshProcedure();
|
||||||
}
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
_ = ItemInfo.ResetProcedure(pi.ItemID);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1113,13 +1113,34 @@ namespace VEPROMS
|
|||||||
if (_Apples == null)
|
if (_Apples == null)
|
||||||
{
|
{
|
||||||
_Apples = new List<MiniConfig>();
|
_Apples = new List<MiniConfig>();
|
||||||
}
|
}
|
||||||
_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 = null;
|
||||||
bsApples.DataSource = _Apples;
|
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)
|
private bool ApplicIsUsed(MiniConfig cfg) // B2017-230 - don't allow user to remove an applicability that is being used (specified)
|
||||||
{
|
{
|
||||||
|
|||||||
@@ -2291,7 +2291,7 @@ OnPropertyChanged("Default_BkColor");
|
|||||||
public void RemoveSlave(int index)
|
public void RemoveSlave(int index)
|
||||||
{
|
{
|
||||||
XmlNode dd = _Xp.XmlContents.SelectSingleNode("//Slave[@index='" + index.ToString() + "']");
|
XmlNode dd = _Xp.XmlContents.SelectSingleNode("//Slave[@index='" + index.ToString() + "']");
|
||||||
dd.ParentNode.RemoveChild(dd);
|
dd?.ParentNode?.RemoveChild(dd);
|
||||||
}
|
}
|
||||||
public int MaxSlaveIndex
|
public int MaxSlaveIndex
|
||||||
{
|
{
|
||||||
|
|||||||
@@ -3839,9 +3839,17 @@ namespace VEPROMS.CSLA.Library
|
|||||||
_SupInfos = null;
|
_SupInfos = null;
|
||||||
}
|
}
|
||||||
|
|
||||||
//B2019-140 Change bars do not get refreshed when approval is run.
|
//B2019-140 Change bars do not get refreshed when approval is run.
|
||||||
// Reset a Procedure and sub items in the cache
|
// Reset a Procedure and sub items in the cache
|
||||||
public static ProcedureInfo ResetProcedure(int procID)
|
// **********************
|
||||||
|
// Be carefull calling this when the Procedure is Open
|
||||||
|
// When the Procedure is Open - use StepTabRibbon.RefreshProcedure(); instead
|
||||||
|
// When a Procedure is open and you try to refresh it,
|
||||||
|
// events can fire behind the scenes - causing data to try to be accessed while you are trying to refresh it
|
||||||
|
// When This occurs, it will cause a
|
||||||
|
// "ThreadException ... Collection was modified; enumeration operation may not execute.”
|
||||||
|
// **********************
|
||||||
|
public static ProcedureInfo ResetProcedure(int procID)
|
||||||
{
|
{
|
||||||
// The following lines reload the procedure info cache
|
// The following lines reload the procedure info cache
|
||||||
ProcedureInfo newproc = ProcedureInfo.Get(procID, true);
|
ProcedureInfo newproc = ProcedureInfo.Get(procID, true);
|
||||||
|
|||||||
@@ -4162,8 +4162,11 @@ namespace Volian.Controls.Library
|
|||||||
}
|
}
|
||||||
void MyConfig_PropertyChanged(object sender, PropertyChangedEventArgs e)
|
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()
|
public void SaveConfig()
|
||||||
{
|
{
|
||||||
if (!MyItemInfo.MyConfig.IsDirty) return;
|
if (!MyItemInfo.MyConfig.IsDirty) return;
|
||||||
|
|||||||
Reference in New Issue
Block a user