Compare commits
13 Commits
d07344a88a
...
B2025-003
| Author | SHA1 | Date | |
|---|---|---|---|
| 5bba126a36 | |||
| e01b955d46 | |||
| e3431b0e1e | |||
| b6d646b910 | |||
| bb679a2790 | |||
| e3af0a6426 | |||
| b2108b9e5f | |||
| d100002107 | |||
| afd61303c5 | |||
| d1c3e81a38 | |||
| 46419edfee | |||
| 81c91d7866 | |||
| 34ee092919 |
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.
@@ -746,6 +746,7 @@ namespace ROEditor
|
|||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
if (inusename == "u") found = true; //to handle unit designation
|
||||||
if (found == false)syntax(inusename+" invalid field name",strt,where);
|
if (found == false)syntax(inusename+" invalid field name",strt,where);
|
||||||
// used to have procini def stuff here.
|
// used to have procini def stuff here.
|
||||||
start=where+1;
|
start=where+1;
|
||||||
|
|||||||
@@ -1352,6 +1352,16 @@ namespace VEPROMS.CSLA.Library
|
|||||||
{
|
{
|
||||||
gg = ItemInfo.ConvertToDisplayText(gg);
|
gg = ItemInfo.ConvertToDisplayText(gg);
|
||||||
newvalue = ItemInfo.ConvertToDisplayText(newvalue);
|
newvalue = ItemInfo.ConvertToDisplayText(newvalue);
|
||||||
|
|
||||||
|
//CSM B2024-094 - Carats (as Deltas) print as question marks in tables when unit <u> is used in RO Definition Value
|
||||||
|
//If there is a grid, need to keep these as the \u code
|
||||||
|
//Otherwise they will not use the correct font and end up as question marks
|
||||||
|
if (MyGrid != null)
|
||||||
|
{
|
||||||
|
gg = gg.Replace($"{(char)916}", @"\u916?");
|
||||||
|
newvalue = newvalue.Replace($"{(char)916}", @"\u916?");
|
||||||
|
}
|
||||||
|
|
||||||
// Debug - jsj 5-19-2017 - left in for initial check-in
|
// Debug - jsj 5-19-2017 - left in for initial check-in
|
||||||
//string xx_gg = gg_org.Replace(@"\'b0", @"\'B0").Replace(@"\u8209?", "-").Replace(@"\u160?", " ").Replace("\xA0", " ");
|
//string xx_gg = gg_org.Replace(@"\'b0", @"\'B0").Replace(@"\u8209?", "-").Replace(@"\u160?", " ").Replace("\xA0", " ");
|
||||||
//string xx_nv = newval_org.Replace(@"\'b0", @"\'B0").Replace(@"\u8209?", "-").Replace(@"\u160?", " ").Replace("\xA0", " ");
|
//string xx_nv = newval_org.Replace(@"\'b0", @"\'B0").Replace(@"\u8209?", "-").Replace(@"\u160?", " ").Replace("\xA0", " ");
|
||||||
|
|||||||
@@ -308,7 +308,7 @@ namespace Volian.Print.Library
|
|||||||
h.Font = f3;
|
h.Font = f3;
|
||||||
string actionWhat = (cai.ActionWhat == "Added" && cai.DTS <= MyProc.ChangeBarDate) ? "Original" : cai.ActionWhat != "Changed" ? cai.ActionWhat : cai.DTS <= maxDTS ? "Restored" : cai.DTS > MyProc.ChangeBarDate ? cai.ActionWhat : "Original";
|
string actionWhat = (cai.ActionWhat == "Added" && cai.DTS <= MyProc.ChangeBarDate) ? "Original" : cai.ActionWhat != "Changed" ? cai.ActionWhat : cai.DTS <= maxDTS ? "Restored" : cai.DTS > MyProc.ChangeBarDate ? cai.ActionWhat : "Original";
|
||||||
if (actionWhat == "Deleted" || actionWhat == "Restored")
|
if (actionWhat == "Deleted" || actionWhat == "Restored")
|
||||||
h.Add(actionWhat + "\r\n" + cai.ActionWhen.ToString());
|
h.Add(actionWhat + "\r\n" + (cai.ActionWhen < cai.DTS ? cai.DTS.ToString("M/dd/yyyy") : cai.ActionWhen.ToString()));
|
||||||
else
|
else
|
||||||
h.Add(actionWhat);
|
h.Add(actionWhat);
|
||||||
if (cai.DTS > maxDTS)
|
if (cai.DTS > maxDTS)
|
||||||
@@ -1465,7 +1465,7 @@ namespace Volian.Print.Library
|
|||||||
// h.Add(cai.ActionWhen > MyProc.DTS ? cai.ActionWhat : "Original");
|
// h.Add(cai.ActionWhen > MyProc.DTS ? cai.ActionWhat : "Original");
|
||||||
string actionWhat = ((cai.ActionWhat == "Added" || cai.ActionWhat == "Changed") && cai.DTS <= MyProc.ChangeBarDate) ? "Original" : cai.ActionWhat; //(cai.ActionWhat == "Added" && cai.DTS <= MyProc.DTS) ? "Original" : cai.ActionWhat != "Changed" ? cai.ActionWhat : cai.DTS <= maxDTS ? "Restored" : cai.DTS > MyProc.DTS ? cai.ActionWhat : "Original";
|
string actionWhat = ((cai.ActionWhat == "Added" || cai.ActionWhat == "Changed") && cai.DTS <= MyProc.ChangeBarDate) ? "Original" : cai.ActionWhat; //(cai.ActionWhat == "Added" && cai.DTS <= MyProc.DTS) ? "Original" : cai.ActionWhat != "Changed" ? cai.ActionWhat : cai.DTS <= maxDTS ? "Restored" : cai.DTS > MyProc.DTS ? cai.ActionWhat : "Original";
|
||||||
if (actionWhat == "Deleted" || actionWhat == "Restored")
|
if (actionWhat == "Deleted" || actionWhat == "Restored")
|
||||||
h.Add(actionWhat + "\r\n" + cai.ActionWhen.ToString());
|
h.Add(actionWhat + "\r\n" + (cai.ActionWhen < cai.DTS ? cai.DTS.ToString("M/dd/yyyy") : cai.ActionWhen.ToString()));
|
||||||
else
|
else
|
||||||
h.Add(actionWhat);
|
h.Add(actionWhat);
|
||||||
c = new PdfPCell(h);
|
c = new PdfPCell(h);
|
||||||
|
|||||||
@@ -2953,7 +2953,7 @@ namespace Volian.Print.Library
|
|||||||
if (ii.Sections == null) return; // B2021-067 crash on null reference
|
if (ii.Sections == null) return; // B2021-067 crash on null reference
|
||||||
foreach (SectionInfo si in ii.Sections)
|
foreach (SectionInfo si in ii.Sections)
|
||||||
{
|
{
|
||||||
if (MyPromsPrinter.PrtSectID == -1 || (MyPromsPrinter.PrtSectID > -1 && si.ItemID == MyPromsPrinter.PrtSectID))
|
if (MyPromsPrinter.PrtSectID == -1 || (MyPromsPrinter.PrtSectID > -1 && (ii.ItemID == MyPromsPrinter.PrtSectID || si.ItemID == MyPromsPrinter.PrtSectID)))
|
||||||
{
|
{
|
||||||
if (si.IsStepSection)
|
if (si.IsStepSection)
|
||||||
{
|
{
|
||||||
|
|||||||
Reference in New Issue
Block a user