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

Fixed bug B2016-013 where the step properties would be inactive the first time it’s opened

Browse Source 
Bug fix B2016-014 where a change bar was set when you check the CAS checkbox or the Page Break check box
Bug Fix B2016-011 where a change bar a compressed table was too short
Bug Fix  B2015-184 where generate PDF would bomb when it tried to print a change bar related to a null step element.
This commit is contained in:
John Jenko
2016-01-22 21:49:26 +00:00
parent 15d8380fe6
commit c035370bb0
5 changed files with 23 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
PROMS/Volian.Controls.Library/DisplayTags.cs
View File

@@ -401,7 +401,9 @@ namespace Volian.Controls.Library
MyEditItem.SaveContents();
StepConfig sc = CurItemInfo.MyConfig as StepConfig;
if (sc == null) return;
MyEditItem.ChangeBarForConfigItemChange = false;
sc.Step_NewManualPagebreak = cbPageBreak.Checked;
MyEditItem.ChangeBarForConfigItemChange = true;
}
private void cbCAS_CheckedChanged(object sender, EventArgs e)
{
@@ -409,7 +411,9 @@ namespace Volian.Controls.Library
MyEditItem.SaveContents();
StepConfig sc = CurItemInfo.MyConfig as StepConfig;
if (sc == null) return;
MyEditItem.ChangeBarForConfigItemChange = false;
sc.Step_CAS = (cbCAS.Checked) ? "True" : "False";
MyEditItem.ChangeBarForConfigItemChange = true;
}
private void cbPlacekeeper_CheckedChanged(object sender, EventArgs e)
{
@@ -417,7 +421,9 @@ namespace Volian.Controls.Library
MyEditItem.SaveContents();
StepConfig sc = CurItemInfo.MyConfig as StepConfig;
if (sc == null) return;
sc.Step_Placekeeper = (cbPlaceKeeper.Checked)?"Y":"N";
MyEditItem.ChangeBarForConfigItemChange = false;
sc.Step_Placekeeper = (cbPlaceKeeper.Checked) ? "Y" : "N";
MyEditItem.ChangeBarForConfigItemChange = true;
if (cbPlaceKeeper.Checked)
{
_Initalizing = true;
@@ -431,7 +437,9 @@ namespace Volian.Controls.Library
MyEditItem.SaveContents();
StepConfig sc = CurItemInfo.MyConfig as StepConfig;
if (sc == null) return;
MyEditItem.ChangeBarForConfigItemChange = false;
sc.Step_Placekeeper = (cbPlaceKeeperCont.Checked) ? "C" : "N";
MyEditItem.ChangeBarForConfigItemChange = true;
if (cbPlaceKeeperCont.Checked)
{
_Initalizing = true;

11
PROMS/Volian.Controls.Library/EditItem.cs
View File

@@ -210,6 +210,14 @@ namespace Volian.Controls.Library
//if (value.FormatStepData != null && value.FormatStepData.TabData.IdentPrint.Contains("C0")) Circle = true;
}
}
private bool _ChangeBarForConfigItemChange = true;
public bool ChangeBarForConfigItemChange
{
get { return _ChangeBarForConfigItemChange; }
set { _ChangeBarForConfigItemChange = value; }
}
void value_Changed(object sender)
{
ChangeBar = _MyItemInfo.HasChangeBar;
@@ -2781,7 +2789,8 @@ namespace Volian.Controls.Library
using (Item itm = MyItemInfo.Get())
{
itm.MyContent.Config = MyItemInfo.MyConfig.ToString();
itm.MyContent.DTS = DateTime.Now;
if (ChangeBarForConfigItemChange)
itm.MyContent.DTS = DateTime.Now;
itm.MyContent.UserID = Volian.Base.Library.VlnSettings.UserID;
itm.Save();
}