Blank lines around Multiple Cautions/Notes

Getting Template Item/compare text AND type (in code that only BGE Alarms uses)
Blank lines around Multiple Cautions/Notes; Don’t do alarm box if box ended on previous page (only occurred when break was on substep of non-boxed step).
This commit is contained in:
2014-08-05 12:51:19 +00:00
parent eba0e7ea55
commit c6122d5a95
3 changed files with 15 additions and 8 deletions

View File

@@ -3650,7 +3650,8 @@ namespace VEPROMS.CSLA.Library
if (txt == null && formatData.Templates[indx].type == (MyContent.Type - 20001)) return indx;
// now see if we're on the topType, if so, look under this one for the step type
// that we're on, the TEXT ALSO NEEDS TO MATCH. If found return the index of it.
if (txt != null && formatData.Templates[indx].text!=null && (txt.Trim() == formatData.Templates[indx].text.Trim())) return indx;
if (txt != null && formatData.Templates[indx].text!=null && (txt.Trim() == formatData.Templates[indx].text.Trim())
&& ((MyContent.Type - 20001) == formatData.Templates[indx].type)) return indx;
indx++;
}
return -1; // didn't find this step type in the template width override list.