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

Use ActiveFormat rather than FormatStepData.MyFormat (this works for Steps/Sections and Procedures)

Browse Source
This commit is contained in:
Rich
2014-08-21 17:52:11 +00:00
parent 45e663f2d3
commit ba4f16b7e1
2 changed files with 23 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
PROMS/VEPROMS.CSLA.Library/Extension/ItemInsertExt.cs
View File

@@ -312,8 +312,8 @@ namespace VEPROMS.CSLA.Library
{
ItemInfo siblingSmart = null;
ItemInfo firstSmart = null;
int level = FormatStepData.MyFormat.PlantFormat.FormatData.Templates[tpIndx].level;
string tmptext = FormatStepData.MyFormat.PlantFormat.FormatData.NewTemplateFormat ? text : FormatStepData.MyFormat.PlantFormat.FormatData.Templates[tpIndx].text;
int level = ActiveFormat.PlantFormat.FormatData.Templates[tpIndx].level;
string tmptext = ActiveFormat.PlantFormat.FormatData.NewTemplateFormat ? text : ActiveFormat.PlantFormat.FormatData.Templates[tpIndx].text;
int prevlevel = level;
while (level > 0)
{
@@ -331,7 +331,7 @@ namespace VEPROMS.CSLA.Library
if (level == prevlevel) addPart = EAddpingPart.After;
if (level < prevlevel)
{
if (FormatStepData.MyFormat.PlantFormat.FormatData.Templates[tpIndx].type == 39)
if (ActiveFormat.PlantFormat.FormatData.Templates[tpIndx].type == 39)
{
fromType = E_FromType.RNO;
addPart = EAddpingPart.Child;
@@ -343,15 +343,15 @@ namespace VEPROMS.CSLA.Library
newItemID = siblingSmart.ItemID;
}
tmptext = /*FormatStepData.MyFormat.PlantFormat.FormatData.NewTemplateFormat ? " ": */FormatStepData.MyFormat.PlantFormat.FormatData.Templates[tpIndx].text;
tmp = NewItemInfoFetch(newItemID, addPart, null, tmptext, FormatStepData.MyFormat.PlantFormat.FormatData.Templates[tpIndx].type + 20001, (int?)fromType, null, null, DateTime.Now, Volian.Base.Library.VlnSettings.UserID);
tmptext = /*ActiveFormat.PlantFormat.FormatData.NewTemplateFormat ? " ": */ActiveFormat.PlantFormat.FormatData.Templates[tpIndx].text;
tmp = NewItemInfoFetch(newItemID, addPart, null, tmptext, ActiveFormat.PlantFormat.FormatData.Templates[tpIndx].type + 20001, (int?)fromType, null, null, DateTime.Now, Volian.Base.Library.VlnSettings.UserID);
newItemID = tmp.ItemID;
if (level < prevlevel) siblingSmart = tmp;
}
tpIndx++;
prevlevel = level;
level = tpIndx < FormatStepData.MyFormat.PlantFormat.FormatData.Templates.Count ?
FormatStepData.MyFormat.PlantFormat.FormatData.Templates[tpIndx].level : -1;
level = tpIndx < ActiveFormat.PlantFormat.FormatData.Templates.Count ?
ActiveFormat.PlantFormat.FormatData.Templates[tpIndx].level : -1;
}
tmp = firstSmart;
}
@@ -368,8 +368,8 @@ namespace VEPROMS.CSLA.Library
{
ItemInfo siblingSmart = null;
ItemInfo firstSmart = null;
int level = FormatStepData.MyFormat.PlantFormat.FormatData.Templates[tpIndx].level;
string tmptext = FormatStepData.MyFormat.PlantFormat.FormatData.NewTemplateFormat?text:FormatStepData.MyFormat.PlantFormat.FormatData.Templates[tpIndx].text;
int level = ActiveFormat.PlantFormat.FormatData.Templates[tpIndx].level;
string tmptext = ActiveFormat.PlantFormat.FormatData.NewTemplateFormat ? text : ActiveFormat.PlantFormat.FormatData.Templates[tpIndx].text;
int prevlevel = level;
while (level > 0)
{
@@ -386,7 +386,7 @@ namespace VEPROMS.CSLA.Library
if (level == prevlevel) addPart = EAddpingPart.After;
if (level < prevlevel)
{
if (FormatStepData.MyFormat.PlantFormat.FormatData.Templates[tpIndx].type == 39)
if (ActiveFormat.PlantFormat.FormatData.Templates[tpIndx].type == 39)
{
fromType = E_FromType.RNO;
addPart = EAddpingPart.Child;
@@ -398,15 +398,15 @@ namespace VEPROMS.CSLA.Library
newItemID = siblingSmart.ItemID;
}
tmptext = /*FormatStepData.MyFormat.PlantFormat.FormatData.NewTemplateFormat ? " ": */FormatStepData.MyFormat.PlantFormat.FormatData.Templates[tpIndx].text;
tmp = NewItemInfoFetch(newItemID, addPart, null, tmptext, FormatStepData.MyFormat.PlantFormat.FormatData.Templates[tpIndx].type + 20001, (int ?)fromType, null, null, DateTime.Now, Volian.Base.Library.VlnSettings.UserID);
tmptext = /*ActiveFormat.PlantFormat.FormatData.NewTemplateFormat ? " ": */ActiveFormat.PlantFormat.FormatData.Templates[tpIndx].text;
tmp = NewItemInfoFetch(newItemID, addPart, null, tmptext, ActiveFormat.PlantFormat.FormatData.Templates[tpIndx].type + 20001, (int?)fromType, null, null, DateTime.Now, Volian.Base.Library.VlnSettings.UserID);
newItemID = tmp.ItemID;
if (level < prevlevel) siblingSmart = tmp;
}
tpIndx++;
prevlevel = level;
level = tpIndx < FormatStepData.MyFormat.PlantFormat.FormatData.Templates.Count ?
FormatStepData.MyFormat.PlantFormat.FormatData.Templates[tpIndx].level : -1;
level = tpIndx < ActiveFormat.PlantFormat.FormatData.Templates.Count ?
ActiveFormat.PlantFormat.FormatData.Templates[tpIndx].level : -1;
}
tmp = firstSmart;
}