Index: UI/PR/GA/TandemBox.cls.xml =================================================================== diff -u -r19763 -r20256 --- UI/PR/GA/TandemBox.cls.xml (.../TandemBox.cls.xml) (revision 19763) +++ UI/PR/GA/TandemBox.cls.xml (.../TandemBox.cls.xml) (revision 20256) @@ -4452,7 +4452,7 @@ -LadeCode:%String,BoxSide:%String,Design:%String,blnRetryBSdefault:%Integer=0,BinnenGreep:%String,SPZK:%String +LadeCode:%String,BoxSide:%String,Design:%String,blnRetryBSdefault:%Integer=0,BinnenGreep:%String,SPZK:%String,OnderdelenSpeciaal:%String="",NietMeeleverenBoxSide:%String="" cache 0 document @@ -4465,9 +4465,14 @@ Set Design=$G(Design, ..blTBox.BTValues.GetAt("TBDesign")) Set BinnenGreep=$G(BinnenGreep, ..blTBox.BTValues.GetAt("TBBinnenGreep")) Set SPZK=$G(SPZK, ..blTBox.BTValues.GetAt("TBSPZijkant")) + Set OnderdelenSpeciaal=$S(OnderdelenSpeciaal="": ..blTBox.BTValues.GetAt("TBOndSpecial"), 1:OnderdelenSpeciaal) + Set NietMeeleverenBoxSide=$S(NietMeeleverenBoxSide="": ..blTBox.BTValues.GetAt("NMBoxSide"), 1:NietMeeleverenBoxSide) If LadeCode'="" Do - . Set FName=##class(BL.PR.GA.TandemBox).GetImageURL($$$ImgToepassing, LadeCode, BoxSide, Design, BinnenGreep, SPZK) - . Set:(FName="")&&(BoxSide'="")&&(blnRetryBSdefault) FName=##class(BL.PR.GA.TandemBox).GetImageURL("MAKOVA", LadeCode, "", Design, BinnenGreep, SPZK) + . Set LadeImageCodeBepalerInput = ##class(BL.PR.GA.TandemBox).GeefImageCodeBepalerInputMetDFL(LadeCode, BoxSide, Design, BinnenGreep, SPZK, OnderdelenSpeciaal, NietMeeleverenBoxSide) + . Set FName=##class(BL.PR.GA.TandemBox).GetImageURL($$$ImgToepassing, LadeImageCodeBepalerInput) + . If (FName="")&&(BoxSide'="")&&(blnRetryBSdefault) Do + . . Set LadeImageCodeBepalerInput.BoxSideID="" + . . Set:(FName="") FName=##class(BL.PR.GA.TandemBox).GetImageURL($$$ImgToepassing, LadeImageCodeBepalerInput) Else Do . Set FName="" @@ -4834,6 +4839,7 @@ If frmDlgOpt.Form.ShowModal()=$$$mrOk Do . Do optGetFromDlg ; waarden uitlezen . ;Do ..BLToegangSequentieel("Buttons",1) + . Do ..CtrlShowLadeImage(,,) Do optCleanUpAfterDlg Do frmDlgOpt.Form.Close() Do frmDlgOpt.%Close()