From 28a7d8e8edd029f358f1e5490114a5a5ef9884ea Mon Sep 17 00:00:00 2001 From: Kathy Date: Wed, 5 Jul 2017 13:48:40 +0000 Subject: [PATCH] SAMG Supplemental Information Facing pages Create property versus variable for facing pages (prevents possible null crash) --- PROMS/Formats/fmtall/wstsamall.xml | Bin 0 -> 86332 bytes PROMS/Formats/genmacall/wstsam.svg | Bin 0 -> 7006 bytes PROMS/VEPROMS.CSLA.Library/Extension/ItemExt.cs | 6 +++++- PROMS/Volian.Print.Library/PromsPrinter.cs | 3 +-- 4 files changed, 6 insertions(+), 3 deletions(-) create mode 100644 PROMS/Formats/fmtall/wstsamall.xml create mode 100644 PROMS/Formats/genmacall/wstsam.svg diff --git a/PROMS/Formats/fmtall/wstsamall.xml b/PROMS/Formats/fmtall/wstsamall.xml new file mode 100644 index 0000000000000000000000000000000000000000..11822cbf930619810ecada9d3edd7330d31d6bfd GIT binary patch literal 86332 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 He<=PRH($~7 literal 0 HcmV?d00001 diff --git a/PROMS/Formats/genmacall/wstsam.svg b/PROMS/Formats/genmacall/wstsam.svg new file mode 100644 index 0000000000000000000000000000000000000000..5fe372e86a1ed762cad18f9e465fdca08e0151eb GIT binary patch literal 7006 zcmdT}TTdE66h5yu>3`VxE_VV`<*#+*xA`-i*Z>s zL}h1YXTEd$&Y9!iKW*Bh1^u8A1vH}pP3R}x&>fBGGi_6u3RJ@105fB{!1yI*$8=?8 zA81NL+QF&@*6dM-KGFwjV}}`51a{vso_Vipte(<6eWD^hbMqJ`;S5VCt64%u#%CWu2ku_7VuJlHun%j3SBWMco$pcE zYSaR%B-t8NqbBrJ0e+qz;^YxNyzAIlYhcD1^#sqiIGN|pvE~dIZez1Mo?c7Xeb=li zF6~%^cGad)X&I%=Y(YP1aw_8INt&08Th^9o5{T8J_^Yr+lAToAJnXXydkwzA*jD>l z1>X90@mCO^f-X&hij~r5f!DCW6w$VD;=JnUzr2iC=F}(L?oh6MNYL?;+K#SE`H#dqdYMVXGh3hcs%qN!}r`?wVE5s>zm=#RneecFeVN5FoV zfL`<-a%EC>V2_B(`dr3I%MHz?k8M6HtYRHEx7DrH-YaJ&<9}bQxk`q&#G4~9+!zeU zTvaypisscv`@Cywk_9}9>zOdO$+OO9S@)=i$I)?SQa%#AdcNXwb63^~wJzHtuDO&! zmFL}@)390#bIGQ1P7;!6#>o~-b{QuLxu0*c#hz!r;R;am&HpO&r1~~J+sGSv)VS;9 zR=yFbtg=44+*-HQ(_4|1@7XGA`n~J9R;`*ld_FhJb*##F(alKOd_|jbEJknAeA7`m zvyN0{;yk>Uv8UC*Urgo{N!k8cM{3^wEBNCzLTh>7k_tiMQ0s$mR;mLzu)I6+x|};+_sLijNNB9^){{1U3<#+&<=iu-h~|= zOlOFFH-IN|KRX&1NgX2XVkFy4B=K=^XIc8n+GnX?L^Z!TjEdF&TU_CBfB<8I+a2}eggf{W zLGf4#=dzC%)-?b3BS8KSBfzZ&{HmvGBvNijs(N-HiQ5Bac94kirB3c+=gAJy%7^8a I|9^GpA6um3@&Et; literal 0 HcmV?d00001 diff --git a/PROMS/VEPROMS.CSLA.Library/Extension/ItemExt.cs b/PROMS/VEPROMS.CSLA.Library/Extension/ItemExt.cs index 9c25aacd..20f45bf2 100644 --- a/PROMS/VEPROMS.CSLA.Library/Extension/ItemExt.cs +++ b/PROMS/VEPROMS.CSLA.Library/Extension/ItemExt.cs @@ -6935,7 +6935,11 @@ namespace VEPROMS.CSLA.Library private List _StepSectPageBreaks = null; public List StepSectPageBreaks { - get { return _StepSectPageBreaks; } + get + { + if (_StepSectPageBreaks == null) _StepSectPageBreaks = new List(); + return _StepSectPageBreaks; + } set { _StepSectPageBreaks = value; } } // Determine if this section contains any Supplemental information steps. This is used for print to determine diff --git a/PROMS/Volian.Print.Library/PromsPrinter.cs b/PROMS/Volian.Print.Library/PromsPrinter.cs index 966052f1..984b4cd4 100644 --- a/PROMS/Volian.Print.Library/PromsPrinter.cs +++ b/PROMS/Volian.Print.Library/PromsPrinter.cs @@ -1623,8 +1623,7 @@ namespace Volian.Print.Library { if (section.StepSectPageBreaksForSupInfo == null) section.StepSectPageBreaksForSupInfo = new List(); else section.StepSectPageBreaksForSupInfo.Clear(); - if (section.StepSectPageBreaks == null) section.StepSectPageBreaks = new List(); - else section.StepSectPageBreaks.Clear(); + section.StepSectPageBreaks.Clear(); } // 792: 72 * 11 inches - TopRow - Top is high value float _PointsPerPage = 792;