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

B2012-365 Fixed the default get of the Auto Indent option to return No if it is not set in the config

Browse Source 
B2012-365  Fixed, the Auto Indent option enabling
B2012-369 Fixed the lack of displaying a new subsection, after entering a new High level step
This commit is contained in:
John Jenko 2012-12-11 19:41:51 +00:00
parent 74e11c4025
commit d42972a389
3 changed files with 16 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
PROMS/VEPROMS User Interface/frmSectionProperties.cs
View File

@ -270,7 +270,7 @@ namespace VEPROMS
// set the section level configs: // set the section level configs:
ppCbEditableData.Checked = (_SectionConfig.SubSection_Edit == "Y"); ppCbEditableData.Checked = (_SectionConfig.SubSection_Edit == "Y");
ppCbAutoIndent.Checked = (_SectionConfig.SubSection_AutoIndent == "Y"); ppCbAutoIndent.Checked = (pf.FormatData.SectData.UseMetaSections && _SectionConfig.SubSection_AutoIndent == "Y");
// if this section has subsections: // if this section has subsections:
// show the editable data check box. If showing 'editable data', the procedures steps are // show the editable data check box. If showing 'editable data', the procedures steps are
@ -278,7 +278,8 @@ namespace VEPROMS
// 'editable data', the steps are not shown in editor or print. // 'editable data', the steps are not shown in editor or print.
// show the automatic indent checkbox. // show the automatic indent checkbox.
ppCbEditableData.Enabled = _SectionConfig.MySection.MySectionInfo.Sections != null && _SectionConfig.MySection.MySectionInfo.Sections.Count > 0; ppCbEditableData.Enabled = _SectionConfig.MySection.MySectionInfo.Sections != null && _SectionConfig.MySection.MySectionInfo.Sections.Count > 0;
ppCbAutoIndent.Enabled = _SectionConfig.MySection.MySectionInfo.Sections != null && _SectionConfig.MySection.MySectionInfo.Sections.Count > 0; //ppCbAutoIndent.Enabled = _SectionConfig.MySection.MySectionInfo.Sections != null && _SectionConfig.MySection.MySectionInfo.Sections.Count > 0;
ppCbAutoIndent.Enabled = pf.FormatData.SectData.UseMetaSections;
// Check for the print section num/title config item to determine whether that checkbox should // Check for the print section num/title config item to determine whether that checkbox should
// be checked. // be checked.

2
PROMS/VEPROMS.CSLA.Library/Config/SectionConfig.cs
View File

@ -740,7 +740,7 @@ namespace VEPROMS.CSLA.Library
{ {
// if null - return a "Y" // if null - return a "Y"
string tmp = _Xp["SubSection", "AutoIndent"]; string tmp = _Xp["SubSection", "AutoIndent"];
return tmp==null||tmp==""?"Y":tmp; return tmp==null||tmp==""?"N":tmp;
} }
set set
{ {

13
PROMS/Volian.Controls.Library/StepPanel.cs
View File

@ -364,6 +364,16 @@ namespace Volian.Controls.Library
// The following line expands the items needed to display SelectedItemInfo // The following line expands the items needed to display SelectedItemInfo
ExpandAsNeeded(SelectedItemInfo); ExpandAsNeeded(SelectedItemInfo);
} }
public void Reset(ItemInfo myItemInfo)
{
ItemInfo parent = myItemInfo.ActiveParent as ItemInfo;
if (parent != null) ItemInfo.ResetParts(parent.ItemID); // Force data to reload
else ItemInfo.ResetParts(myItemInfo.ItemID);
// The following line actually reloads the procedure item
MyProcedureItemInfo = MyProcedureItemInfo; // see get/set above. - Load Procedure and Sections
// The following line expands the items needed to display SelectedItemInfo
ExpandAsNeeded(myItemInfo);
}
/// <summary> /// <summary>
/// Currently selected StepRTB /// Currently selected StepRTB
/// </summary> /// </summary>
@ -392,7 +402,8 @@ namespace Volian.Controls.Library
{ {
ExpandAsNeeded(itemInfo); ExpandAsNeeded(itemInfo);
if (_SelectedItemInfo == null) _SelectedItemInfo = itemInfo; if (_SelectedItemInfo == null) _SelectedItemInfo = itemInfo;
if (!_LookupEditItems.ContainsKey(itemInfo.ItemID)) Reset(); //if (!_LookupEditItems.ContainsKey(itemInfo.ItemID)) Reset();
if (!_LookupEditItems.ContainsKey(itemInfo.ItemID)) Reset(itemInfo);
if (!_LookupEditItems.ContainsKey(itemInfo.ItemID)) return null; if (!_LookupEditItems.ContainsKey(itemInfo.ItemID)) return null;
return _LookupEditItems[itemInfo.ItemID]; return _LookupEditItems[itemInfo.ItemID];
} }