Development #226

Merged
djankowski merged 12 commits from Development into master 2024-02-08 11:38:49 -05:00
15 changed files with 41 additions and 2 deletions

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

View File

@ -44,8 +44,18 @@ using System.Runtime.InteropServices;
// Revision DHH (day - no leading zero, two digit hour - military time // Revision DHH (day - no leading zero, two digit hour - military time
// //
// ********* REMEMBER TO CHECK THE AssemblyConfiguration SETTING (ABOVE) ******** // ********* REMEMBER TO CHECK THE AssemblyConfiguration SETTING (ABOVE) ********
[assembly: AssemblyVersion("2.1.2311.3014")] [assembly: AssemblyVersion("2.1.2402.616")]
[assembly: AssemblyFileVersion("2.1.2311.3014")] [assembly: AssemblyFileVersion("2.1.2402.616")]

View File

@ -1545,6 +1545,9 @@ namespace VEPROMS.CSLA.Library
{ {
//if (tb._FromItem.MyContent.InList(5322)) Console.WriteLine("Here"); //if (tb._FromItem.MyContent.InList(5322)) Console.WriteLine("Here");
string str1 = TranGetSectionNumber(tb._ToItem); string str1 = TranGetSectionNumber(tb._ToItem);
// F2024-008 added flag to title case the section number in transitions
if (tb._FormatData.TransData.Cap1stCharTransSectionNumber)
str1 = CapFirstLetterOnly(str1, 0);
if(!tb._ToItem.ActiveFormat.PlantFormat.FormatData.PrintData.SpecialCaseCalvert) return str1; if(!tb._ToItem.ActiveFormat.PlantFormat.FormatData.PrintData.SpecialCaseCalvert) return str1;
List<ItemInfo> FromSections = GetSections(tb._FromItem.ActiveSection); List<ItemInfo> FromSections = GetSections(tb._FromItem.ActiveSection);
List<ItemInfo> ToSections = GetSections(tb._ToItem.ActiveSection); List<ItemInfo> ToSections = GetSections(tb._ToItem.ActiveSection);
@ -1615,6 +1618,9 @@ namespace VEPROMS.CSLA.Library
sectionTitle = (tb._FormatData.TransData.CapsTransitionsSection ? sectionTitle.ToUpper().Replace(@"\U", @"\u") : sectionTitle = (tb._FormatData.TransData.CapsTransitionsSection ? sectionTitle.ToUpper().Replace(@"\U", @"\u") :
tb._FormatData.TransData.Cap1stCharTransSection ? CapFirstLetterOnly(sectionTitle, 0) : tb._FormatData.TransData.Cap1stCharTransSection ? CapFirstLetterOnly(sectionTitle, 0) :
sectionTitle); sectionTitle);
// F2024-008 Added flag to surround the section title with parenthesis in transitions
if (tb._FormatData.TransData.ParensAroundSectionTitle)
sectionTitle = string.Format("({0})", sectionTitle);
// B2017-236 Replace embedded returns with spaces and trim the spaces from the end of the section title. // B2017-236 Replace embedded returns with spaces and trim the spaces from the end of the section title.
return TrimSectionTitle(sectionTitle); return TrimSectionTitle(sectionTitle);
} }

View File

@ -7103,6 +7103,7 @@ namespace VEPROMS.CSLA.Library
return LazyLoad(ref _Cap1stCharTrans, "@Cap1stCharTrans"); return LazyLoad(ref _Cap1stCharTrans, "@Cap1stCharTrans");
} }
} }
// Title Case section title
private LazyLoad<bool> _Cap1stCharTransSection; private LazyLoad<bool> _Cap1stCharTransSection;
public bool Cap1stCharTransSection public bool Cap1stCharTransSection
{ {
@ -7111,6 +7112,24 @@ namespace VEPROMS.CSLA.Library
return LazyLoad(ref _Cap1stCharTransSection, "@Cap1stCharTransSection"); return LazyLoad(ref _Cap1stCharTransSection, "@Cap1stCharTransSection");
} }
} }
// Title Case section number
private LazyLoad<bool> _Cap1stCharTransSectionNumber;
public bool Cap1stCharTransSectionNumber
{
get
{
return LazyLoad(ref _Cap1stCharTransSectionNumber, "@Cap1stCharTransSectionNumber");
}
}
// Parens around section title
private LazyLoad<bool> _ParensAroundSectionTitle;
public bool ParensAroundSectionTitle
{
get
{
return LazyLoad(ref _ParensAroundSectionTitle, "@ParensAroundSectionTitle");
}
}
private LazyLoad<bool> _UseTransitionModifier; private LazyLoad<bool> _UseTransitionModifier;
public bool UseTransitionModifier public bool UseTransitionModifier
{ {

View File

@ -3395,6 +3395,8 @@ namespace Volian.Controls.Library
Cursor = Cursors.Default; Cursor = Cursors.Default;
return; return;
} }
// B2024-002: Save any changes to the database so that updating of ROs has current data:
MyEditItem.SaveContents();
using (DocVersion dv = DocVersion.Get(Mydvi.VersionID)) using (DocVersion dv = DocVersion.Get(Mydvi.VersionID))
{ {
swROUpdate = new System.IO.StreamWriter(ROFstInfo.ROUpdateResultsPath(Mydvi)); swROUpdate = new System.IO.StreamWriter(ROFstInfo.ROUpdateResultsPath(Mydvi));

View File

@ -1836,6 +1836,8 @@ i = 0;
float coverlinelen = ((ctlen == 0) ? (int)section.ActiveFormat.PlantFormat.FormatData.ProcData.TitleLength : ctlen) * (float)pageItem.Font.CPI / 12; float coverlinelen = ((ctlen == 0) ? (int)section.ActiveFormat.PlantFormat.FormatData.ProcData.TitleLength : ctlen) * (float)pageItem.Font.CPI / 12;
string title1 = section.MyProcedure.MyContent.Text; string title1 = section.MyProcedure.MyContent.Text;
if (section.ActiveFormat.PlantFormat.FormatData.ProcData.CapitalizeTitle) title1 = title1.ToUpper(); if (section.ActiveFormat.PlantFormat.FormatData.ProcData.CapitalizeTitle) title1 = title1.ToUpper();
// F2024-012 copied this line from above (processing COVERPROCTITLE) to resolve unit designators in the procedure title
if (title1.ToUpper().Contains(@"<U")) title1 = VEPROMS.CSLA.Library.DisplayText.ResolveUnitSpecific(section.MyDocVersion, title1);
plstr = SplitCoverTitle(svgGroup, pageItem, title1, (int)coverlinelen, token, plstr);//, rowAdj); plstr = SplitCoverTitle(svgGroup, pageItem, title1, (int)coverlinelen, token, plstr);//, rowAdj);
break; break;
case "{TITLE&UNIT}": case "{TITLE&UNIT}":