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

Browse Source
This commit is contained in:
Kathy Ruffing 2013-02-26 14:37:15 +00:00
parent d9a79bfbda
commit 442198860c
3 changed files with 43 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
PROMS/VEPROMS.CSLA.Library/Extension/DocumentExt.cs
View File

@ -667,7 +667,7 @@ namespace VEPROMS.CSLA.Library
string roid = lookup.GetROIDByAccPagID(sel.Text, spPrefix, igPrefix);
if (roid != null)
{
string roidkey = string.Format("{0}:{1}",rofst.RODbID, roid);
string roidkey = string.Format("{0}:{1}", rofst.RODbID, roid);
if (!roids.Contains(roidkey))
roids.Add(roidkey);
}
@ -998,7 +998,12 @@ namespace VEPROMS.CSLA.Library
}
private static LBSelection FindRO()
{
LBSelection sel = MyApp.Selection;
int firstStart = 0;
bool executeResult = false;
LBSelection sel = null;
while (!executeResult)
{
sel = MyApp.Selection;
LBFind find = sel.Find;
find.ClearFormatting();
// Search string format - this is MSWord wildcard format
@ -1010,14 +1015,27 @@ namespace VEPROMS.CSLA.Library
// [!<> ]@ - 1 or more characters not including Less-Than, Greater-Than or Space
// [>] - Greater-Than Character
find.Text = "[<][!<> ]@-[!<> ]@[>]";
//find.Wrap = LBWdFindWrap.wdFindStop;
find.Wrap = LBWdFindWrap.wdFindContinue;
find.MatchCase = false;
find.MatchWholeWord = false;
find.MatchWildcards = true;
find.MatchSoundsLike = false;
find.MatchAllWordForms = false;
if (find.Execute()) return sel;
executeResult = find.Execute();
// MS Word found 'invalid' ro when text had "[335.0<T<335.6ºC]" (not sure what problem was).
// When this occurred, the selection was found, but it's end = 0, so move 1 char past it.
// Also, need to simulate a loop by saving first position and if loop back to first position,
// we are done with the search.
if (sel.End == 0)
{
if (firstStart == sel.Start) return null;
if (firstStart == 0)
firstStart = sel.Start;
sel.MoveStart(LBWdUnits.wdCharacter, 1);
executeResult = false;
}
}
if (executeResult) return sel;
return null;
}
private static string CreatePDF(string fileName, bool openPdf)

9
PROMS/VEPROMS.CSLA.Library/VEObjects/VETreeNode.cs
View File

@ -234,14 +234,13 @@ namespace VEPROMS.CSLA.Library
bool isStepPart = (o is PartInfo && (o as PartInfo).PartType == E_FromType.Step);
if (isStepPart)
{
// get parent section and see if it has the Editable flag set. Only skip
// if this flag is set to "N".
ItemInfo sectInfo = (ItemInfo)(o as PartInfo).ActiveParent;
if (sectInfo != null)
{
SectionConfig sc = sectInfo.MyConfig as SectionConfig;
if (sc != null && sc.SubSection_Edit == "N") skipIt = true;
}
bool hasMetaSubs = sectInfo != null && sectInfo.Sections != null && sectInfo.Sections.Count > 0;
bool editSteps = !hasMetaSubs || (sectInfo.MyConfig is SectionConfig && (sectInfo.MyConfig as SectionConfig).SubSection_Edit == "Y");
if (!editSteps) skipIt = true;
}
if (!skipIt)
{

BIN
PROMS/fmtxml/WST2all.xml
View File

Binary file not shown.