C2025-024 #590

Merged
jjenko merged 18 commits from C2025-024 into Development 2025-08-08 10:19:00 -04:00
52 changed files with 2145 additions and 4099 deletions
Showing only changes of commit 0bf9025c0d - Show all commits

View File

@@ -55,6 +55,12 @@ namespace VEPROMS
//Overridden function to handle export of EP data //Overridden function to handle export of EP data
protected override void ExportEPAnnotationInfo(XmlElement xe, ItemInfo ii) protected override void ExportEPAnnotationInfo(XmlElement xe, ItemInfo ii)
{ {
if (_UnitIndex > 0)
{
ii.MyDocVersion.DocVersionConfig.SelectedSlave = _UnitIndex;
ii.MyProcedure.MyDocVersion.DocVersionConfig.SelectedSlave = _UnitIndex;
}
//switch to handle customizations for different formats //switch to handle customizations for different formats
switch (ii.ActiveFormat.PlantFormat.EPFormatFiles.Find(x => x.AnnotationTypeID == _AnnotationType.TypeID)?.Name) switch (ii.ActiveFormat.PlantFormat.EPFormatFiles.Find(x => x.AnnotationTypeID == _AnnotationType.TypeID)?.Name)
{ {
@@ -63,6 +69,9 @@ namespace VEPROMS
break; break;
} }
ii.MyDocVersion.DocVersionConfig.SelectedSlave = 0;
ii.MyProcedure.MyDocVersion.DocVersionConfig.SelectedSlave = 0;
} }
//default export of EP Data //default export of EP Data
@@ -242,14 +251,9 @@ namespace VEPROMS
return dbSeq(ii); return dbSeq(ii);
} }
} }
//return a db sequence string from an ItemInfo //return a db sequence string from an ItemInfo
private string dbSeq(ItemInfo ii) private string dbSeq(ItemInfo ii) => $"{((FolderInfo)ii.MyDocVersion.ActiveParent).Name}:{ii.MyProcedure.DisplayNumber} {ii.MyProcedure.DisplayText}:{ii.DBSequence}";
{
if (_UnitIndex > 0) ii.MyProcedure.MyDocVersion.DocVersionConfig.SelectedSlave = _UnitIndex;
string rtnval = $"{((FolderInfo)ii.MyDocVersion.ActiveParent).Name}:{ii.MyProcedure.DisplayNumber} {ii.MyProcedure.DisplayText}:{ii.DBSequence}";
ii.MyProcedure.MyDocVersion.DocVersionConfig.SelectedSlave = 0;
return rtnval;
}
//For Exporting an RO that is an image //For Exporting an RO that is an image
//returns the Location and FileName of the RO Image //returns the Location and FileName of the RO Image