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

Added DevNoteOrCautionTabOffset property

Browse Source 
Hid Volian "V" Create PDF button when viewing a multi unit procedure
Added null check to mylookup value in ContainsKey method of ItemInfo class
This commit is contained in:
Rich 2014-01-24 05:13:03 +00:00
parent 242d03bba6
commit d959824dd4
6 changed files with 26 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
PROMS/VEPROMS User Interface/frmVEPROMS.cs
View File

@ -343,9 +343,15 @@ namespace VEPROMS
displayHistory.ApplDisplayMode = pnl.ApplDisplayMode; displayHistory.ApplDisplayMode = pnl.ApplDisplayMode;
//added by jcb 20130718 to support enabling/diabling create pdf button until user selects a unit //added by jcb 20130718 to support enabling/diabling create pdf button until user selects a unit
if (pnl.ApplDisplayMode > 0) if (pnl.ApplDisplayMode > 0)
{
pnl.MyStepTabPanel.MyStepTabRibbon.btnPdfCreate.Enabled = true; pnl.MyStepTabPanel.MyStepTabRibbon.btnPdfCreate.Enabled = true;
btnPrint.Visible = true;
}
else else
{
pnl.MyStepTabPanel.MyStepTabRibbon.btnPdfCreate.Enabled = false; pnl.MyStepTabPanel.MyStepTabRibbon.btnPdfCreate.Enabled = false;
btnPrint.Visible = false;
}
//end added by jcb 20130718 //end added by jcb 20130718
} }
} }
@ -1872,8 +1878,11 @@ namespace VEPROMS
} }
SetCaption(tv.SelectedNode as VETreeNode); SetCaption(tv.SelectedNode as VETreeNode);
displayApplicability.MyDisplayTabItem = tc.SelectedDisplayTabItem; displayApplicability.MyDisplayTabItem = tc.SelectedDisplayTabItem;
Console.WriteLine("tc_SelectedDisplayTabItemChanged");
lblUser.Text = tc.SelectedDisplayTabItem.MyUserRole; lblUser.Text = tc.SelectedDisplayTabItem.MyUserRole;
if (tc.SelectedDisplayTabItem.MyItemInfo.MyDocVersion.MultiUnitCount > 1)
btnPrint.Visible = false;
else
btnPrint.Visible = true;
} }
private void tc_StepPanelModeChange(object sender, StepRTBModeChangeEventArgs args) private void tc_StepPanelModeChange(object sender, StepRTBModeChangeEventArgs args)
{ {

4
PROMS/VEPROMS.CSLA.Library/Extension/ItemExt.cs
View File

@ -4516,7 +4516,7 @@ namespace VEPROMS.CSLA.Library
{ {
foreach (Dictionary<int, ItemInfo> mylookup in MyLookups.Values) foreach (Dictionary<int, ItemInfo> mylookup in MyLookups.Values)
{ {
if (mylookup.ContainsKey(itemID)) if (mylookup != null && mylookup.ContainsKey(itemID))
return mylookup[itemID]; return mylookup[itemID];
} }
return null; return null;
@ -4526,7 +4526,7 @@ namespace VEPROMS.CSLA.Library
{ {
foreach (Dictionary<int, ItemInfo> mylookup in MyLookups.Values) foreach (Dictionary<int, ItemInfo> mylookup in MyLookups.Values)
{ {
if (mylookup.ContainsKey(itemID)) if (mylookup != null && mylookup.ContainsKey(itemID))
return true; return true;
} }
return false; return false;

8
PROMS/VEPROMS.CSLA.Library/Format/PlantFormat.cs
View File

@ -2711,6 +2711,14 @@ namespace VEPROMS.CSLA.Library
return LazyLoad(ref _UseRNOParentIdent, "@UseRNOParentIdent"); return LazyLoad(ref _UseRNOParentIdent, "@UseRNOParentIdent");
} }
} }
private LazyLoad<string> _DevNoteOrCautionTabOffset;
public string DevNoteOrCautionTabOffset
{
get
{
return LazyLoad(ref _DevNoteOrCautionTabOffset, "@DevNoteOrCautionTabOffset");
}
}
private LazyLoad<string> _BoxLeftAdj; private LazyLoad<string> _BoxLeftAdj;
public string BoxLeftAdj public string BoxLeftAdj
{ {

1
PROMS/fmtxml/FmtFileToXml.cs
View File

@ -737,6 +737,7 @@ public struct StepSectionLayout
public string RNOWidthAdj; public string RNOWidthAdj;
public string BoxLeftAdj; public string BoxLeftAdj;
public string UseRNOParentIdent; public string UseRNOParentIdent;
public string DevNoteOrCautionTabOffset;
//end for Braidwood by jcb //end for Braidwood by jcb
/* Format flags moved to here.... */ /* Format flags moved to here.... */

3
PROMS/fmtxml/PlantSpecific_ByrBwd.cs
View File

@ -77,10 +77,9 @@ namespace fmtxml
fmtdata.StepData[6].TabData.RNOIdent = "ERG CAUTION: "; fmtdata.StepData[6].TabData.RNOIdent = "ERG CAUTION: ";
fmtdata.StepData[7].TabData.RNOIdent = "ERG NOTE : "; fmtdata.StepData[7].TabData.RNOIdent = "ERG NOTE : ";
fmtdata.StepData[9].TabData.RNOIdent = "ERG CAUTION: "; fmtdata.StepData[9].TabData.RNOIdent = "ERG CAUTION: ";
fmtdata.StepData[6].ColOverride = "42";
fmtdata.StepData[7].ColOverride = "42";
fmtdata.StepData[43].ColOverride = "42"; fmtdata.StepData[43].ColOverride = "42";
fmtdata.SectData.StepSectionData.StpSectLayData.UseRNOParentIdent = "True"; fmtdata.SectData.StepSectionData.StpSectLayData.UseRNOParentIdent = "True";
fmtdata.SectData.StepSectionData.StpSectLayData.DevNoteOrCautionTabOffset = "42";
} }
} }
public partial class FmtToXml public partial class FmtToXml

BIN
PROMS/fmtxml/TranslateFMT.XSL
View File

Binary file not shown.