Compare commits
4 Commits
C2026-062
...
F2026-004_
| Author | SHA1 | Date | |
|---|---|---|---|
| a181cf3815 | |||
| 7afca6a254 | |||
| 1c56aa2eb1 | |||
| f38aa4595f |
Binary file not shown.
Binary file not shown.
@@ -3312,7 +3312,26 @@ namespace VEPROMS.CSLA.Library
|
|||||||
return retval;
|
return retval;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
public string DisplayNumber
|
|
||||||
|
//B2026-011 Improve the resolution of unit numbers in multi-unit background documents when printing.
|
||||||
|
// for enhanced documents, when copying content, need to not resolve the
|
||||||
|
//unit designators until print time
|
||||||
|
public string DisplayTextKeepSpecialCharsKeepUnitSpecific
|
||||||
|
{
|
||||||
|
get
|
||||||
|
{
|
||||||
|
string str = MyContent.Text;
|
||||||
|
foreach (string key in SpecialCharacters.Keys)
|
||||||
|
str = str.Replace(key, SpecialCharacters[key]);
|
||||||
|
string retval = ConvertToDisplayText(str);
|
||||||
|
foreach (string key in SpecialCharacters.Keys)
|
||||||
|
retval = retval.Replace(SpecialCharacters[key], key);
|
||||||
|
return retval;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
public string DisplayNumber
|
||||||
{
|
{
|
||||||
get
|
get
|
||||||
{
|
{
|
||||||
@@ -8357,8 +8376,11 @@ namespace VEPROMS.CSLA.Library
|
|||||||
if (seds != null && seds.Count != 0)
|
if (seds != null && seds.Count != 0)
|
||||||
{
|
{
|
||||||
ItemInfo srcItem = ItemInfo.Get(seds[0].ItemID);
|
ItemInfo srcItem = ItemInfo.Get(seds[0].ItemID);
|
||||||
// B2022-049: Copy/paste of enhanced procedure and bad links between source and enhanced. Null reference check
|
// B2022-049: Copy/paste of enhanced procedure and bad links between source and enhanced. Null reference check
|
||||||
if (srcItem != null && srcItem.DisplayTextKeepSpecialChars != ii.DisplayTextKeepSpecialChars)
|
//B2026-011 Improve the resolution of unit numbers in multi-unit background documents when printing.
|
||||||
|
// for enhanced documents, when copying content, need to not resolve the
|
||||||
|
//unit designators until print time
|
||||||
|
if (srcItem != null && srcItem.DisplayTextKeepSpecialCharsKeepUnitSpecific != ii.DisplayTextKeepSpecialCharsKeepUnitSpecific)
|
||||||
{
|
{
|
||||||
if (retiil == null) retiil = new ItemInfoList(ii);
|
if (retiil == null) retiil = new ItemInfoList(ii);
|
||||||
else retiil.AddItem(ii);
|
else retiil.AddItem(ii);
|
||||||
@@ -8384,7 +8406,10 @@ namespace VEPROMS.CSLA.Library
|
|||||||
ItemInfo srcItem = ItemInfo.Get(seds[0].ItemID);
|
ItemInfo srcItem = ItemInfo.Get(seds[0].ItemID);
|
||||||
using (Item enhItem = Item.Get(ii.ItemID))
|
using (Item enhItem = Item.Get(ii.ItemID))
|
||||||
{
|
{
|
||||||
enhItem.MyContent.Text = srcItem.DisplayTextKeepSpecialChars;
|
//B2026-011 Improve the resolution of unit numbers in multi-unit background documents when printing.
|
||||||
|
// for enhanced documents, when copying content, need to not resolve the
|
||||||
|
//unit designators until print time
|
||||||
|
enhItem.MyContent.Text = srcItem.DisplayTextKeepSpecialCharsKeepUnitSpecific;
|
||||||
enhItem.Save();
|
enhItem.Save();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user