Index: UI/PR/GA/dlgTBSpoelbak.cls.xml =================================================================== diff -u -r1499 -r1664 --- UI/PR/GA/dlgTBSpoelbak.cls.xml (.../dlgTBSpoelbak.cls.xml) (revision 1499) +++ UI/PR/GA/dlgTBSpoelbak.cls.xml (.../dlgTBSpoelbak.cls.xml) (revision 1664) @@ -10,11 +10,19 @@ %Library.TMForm + +%Library.String + + %Library.Boolean 0 + +%Library.String + + %TMButton @@ -31,7 +39,7 @@ %TMLabel - + %TMLabel @@ -55,7 +63,7 @@ %TMLabel - + %TMEdit @@ -144,24 +152,29 @@ New blnFontRed,blnAllowReset Set ..lblSPZLI.Caption="" Set ..lblSPZRE.Caption="" - Set ..lblSPBR.Caption="" + Set ..lblSPBR1.Caption="" Set blnAllowReset=($IsObject($G(Sender)))&&(Sender.%Extends("%Library.TMEdit")) - If ..chkSymm.Checked="True" Do - . Do $$$SetCtrlLayout01(..txtSPZLI) - . Do $$$SetCtrlLayout01(..txtSPZRE) - . Do $$$SetCtrlLayout01(..txtSPBR) + If ..blnIsNieuweSifonlade Do + . Set blnFontRed=0 + . ;Do $$$SetCtrlLayout02(..txtSPBR1) + . ;Do:(SifonQty=2) $$$SetCtrlLayout02(..txtSPBR2) Else Do - . Set blnFontRed=$S(SifonQty=2:0, 1:(..txtSPZLI.Text>0)&&(..txtSPZRE.Text>0)&&(..txtSPBR.Text>0)) - . Do $$$SetCtrlLayout02(..txtSPZLI) - . Do $$$SetCtrlLayout02(..txtSPZRE) - . Do $$$SetCtrlLayout02(..txtSPBR) - If SifonQty=2 Do - . Set ..lblSPZMI.Caption="" - . Do $$$SetCtrlLayout02(..txtSPZMI) - . ;Do $$$SetCtrlLayout01(..txtSPBR2) + . If ..chkSymm.Checked="True" Do + . . Do $$$SetCtrlLayout01(..txtSPZLI) + . . Do $$$SetCtrlLayout01(..txtSPZRE) + . . Do $$$SetCtrlLayout01(..txtSPBR1) + . Else Do + . . Set blnFontRed=$S(SifonQty=2:0, 1:(..txtSPZLI.Text>0)&&(..txtSPZRE.Text>0)&&(..txtSPBR1.Text>0)) + . . Do $$$SetCtrlLayout02(..txtSPZLI) + . . Do $$$SetCtrlLayout02(..txtSPZRE) + . . Do $$$SetCtrlLayout02(..txtSPBR1) + . If SifonQty=2 Do + . . Set ..lblSPZMI.Caption="" + . . Do $$$SetCtrlLayout02(..txtSPZMI) + . . ;Do $$$SetCtrlLayout01(..txtSPBR2) Quit clmSetCtrlLayout(Ctrl, blnAllowReset, blnGrayed, blnFontRed) - Quit:(..blnSyfonLade)&&(Ctrl.ReadOnly="True") + Quit:(..blnSyfonLade || ..blnIsNieuweSifonlade)&&(Ctrl.ReadOnly="True") New FontColor Set:($D(blnFontRed)) FontColor=$S(blnFontRed:$$$clRed, 1:$$$clWindowText) Set:($L($G(FontColor))) Ctrl.Font.Color=FontColor @@ -178,19 +191,21 @@ ;Quit:(IB'>0) Set tmpLI=..txtSPZLI.Text Set tmpRE=..txtSPZRE.Text - Set tmpBR=..txtSPBR.Text + Set tmpBR=..txtSPBR1.Text Quit:(tmpLI>0)&&(tmpRE>0)&&(tmpBR>0)&&(SifonQty'=2) ; alle drie gedefinieerd : no calc! If (..chkSymm.Checked="True") Quit:((tmpLI>0)&&(tmpRE>0))||((tmpLI>0)&&(tmpBR>0))||((tmpRE>0)&&(tmpBR>0)) If SifonQty=2 Do . Set tmpMI=..txtSPZMI.Text - . Set sc=##class(BL.PR.GA.TandemBox).CalcSPBreedtesOpMaat(IB-(tmpBR*2),.tmpLI,.tmpMI,.tmpRE) ; Maten gesimuleerd door IB-2*SPBR als ladebreedte te nemen en SPZMI als uitsparing + . Set tmpBR2=..txtSPBR2.Text + . Set sc=##class(BL.PR.GA.TandemBox).CalcSPBreedtesOpMaat(IB-(tmpBR+tmpBR2),.tmpLI,.tmpMI,.tmpRE) ; Maten gesimuleerd door IB-(SPBR+SPBR2) als ladebreedte te nemen en SPZMI als uitsparing . Set ..lblSPZMI.Caption=$$$ValueOrEmpty(tmpMI) + . Set ..lblSPBR2.Caption=$$$ValueOrEmpty(tmpBR2) Else Do . Set sc=##class(BL.PR.GA.TandemBox).CalcSPBreedtesOpMaat(IB,.tmpLI,.tmpBR,.tmpRE) Set ..lblSPZLI.Caption=$$$ValueOrEmpty(tmpLI) Set ..lblSPZRE.Caption=$$$ValueOrEmpty(tmpRE) - Set ..lblSPBR.Caption=$$$ValueOrEmpty(tmpBR) + Set ..lblSPBR1.Caption=$$$ValueOrEmpty(tmpBR) Quit ]]> @@ -211,6 +226,55 @@ ]]> + + +cache +0 +%Library.Boolean +document +literal + + + cache @@ -223,6 +287,7 @@ #define minSPZLI 100 #define minSPRugMid 60 + Quit:(..blnIsNieuweSifonlade) ..BLValidateNieuweSifonDim(.msg) Quit:('..blnSyfonLade) 1 New MinimumSPZK @@ -244,7 +309,7 @@ Set IB=..lblNuttigeBreedte.Caption Set tmpLI=..lblSPZLI.Caption Set tmpRE=..lblSPZRE.Caption - Set tmpBR=..lblSPBR.Caption + Set tmpBR=..lblSPBR1.Caption Set tmpMI=..lblSPZMI.Caption Set sc=##class(BL.PR.GA.TandemBox).CalcSPBreedtesOpMaat(IB-(tmpBR*2),.tmpLI,.tmpMI,.tmpRE) ; Maten gesimuleerd door IB-2*SPBR als ladebreedte te nemen en SPZMI als uitsparing If $$$ISERR(sc) Do Quit 0 @@ -272,13 +337,13 @@ Set ..lblSPBR2.Visible=..txtSPBR2.Visible Set ..zzLabel6.Visible=..txtSPBR2.Visible - Set ..txtSPZRE.Top=$S(blnSifonDubbel:134, 1:86) + Set ..txtSPZRE.Top=$S(blnSifonDubbel:142, 1:94) Set ..lblSPZRE.Top=..txtSPZRE.Top Set ..zzLabel3.Top=..txtSPZRE.Top - Set ..zzLabel1.Caption=$S(..blnSyfonLade:"Rug links sifonlade", 1:"Spoelbak zijkant Links") - Set ..zzLabel3.Caption=$S(..blnSyfonLade:"Rug rechts sifonlade", 1:"Spoelbak zijkant Rechts") - Set ..zzLabel2.Caption=$S(..blnSyfonLade:"Sifonkap breedte", 1:"Spoelbak breedte") + Set ..zzLabel1.Caption=$S(..blnIsNieuweSifonlade || ..blnSyfonLade:"Rug links sifonlade", 1:"Spoelbak zijkant Links") + Set ..zzLabel3.Caption=$S(..blnIsNieuweSifonlade || ..blnSyfonLade:"Rug rechts sifonlade", 1:"Spoelbak zijkant Rechts") + Set ..zzLabel2.Caption=$S(..blnIsNieuweSifonlade:"Sifon uitsparing breedte", ..blnSyfonLade:"Sifonkap breedte", 1:"Spoelbak breedte") Set ..zzLabel6.Caption=..zzLabel2.Caption Quit ]]> @@ -343,7 +408,7 @@ ; AutoSize = False ; Layout = tlCenter ; end - ; object lblSPBR: CLabel + ; object lblSPBR1: CLabel ; Left = 243 ; Top = 70 ; Width = 50 @@ -465,7 +530,7 @@ ; TabOrder = 2 ; OnChange = OnChangeItem ; end - ; object txtSPBR: CEdit + ; object txtSPBR1: CEdit ; Left = 159 ; Top = 70 ; Width = 73 @@ -554,13 +619,18 @@ s Sender=##class(%TMPersistent).GetObjOref($lg(Args,1)) ;Beginning of user code - Set ..txtSPBR.ReadOnly=$S(..blnSyfonLade:"True", 1:"False") - Set ..txtSPBR2.ReadOnly=..txtSPBR.ReadOnly + ;Set ..IsUitsparingBreedteFixed=(..blnSyfonLade)||(..blnIsNieuweSifonlade&&$$$Not(opmaat)) + Set ..txtSPBR1.ReadOnly=$S(..IsUitsparingBreedteFixed:"True", 1:"False") + Set ..txtSPBR2.ReadOnly=..txtSPBR1.ReadOnly Set ..txtSPZLI.ReadOnly="False" Set ..txtSPZRE.ReadOnly="False" - Set ..chkSymm.Enabled=$S(..lblSifonQty.Caption=2:"False", 1:"True") - If ..blnSyfonLade Do ..chkSymmClick("") + If ..blnIsNieuweSifonlade Do + . Set ..chkSymm.Enabled="False" + . Set ..chkSymm.Checked="False" + Else Do + . Set ..chkSymm.Enabled=$S(..lblSifonQty.Caption=2:"False", 1:"True") + If ..blnSyfonLade Do ..chkSymmClick("") Do ..CtrlManagePosition() Do ..OKButtonEnabled() @@ -580,7 +650,7 @@ d %this.txtSPZMI.%Close() d %this.chkSymm.%Close() d %this.txtSPZRE.%Close() - d %this.txtSPBR.%Close() + d %this.txtSPBR1.%Close() d %this.txtSPZLI.%Close() d %this.btnCancel.%Close() d %this.btnOK.%Close() @@ -593,7 +663,7 @@ d %this.lblNuttigeBreedte.%Close() d %this.zzLabel4.%Close() d %this.lblSPZRE.%Close() - d %this.lblSPBR.%Close() + d %this.lblSPBR1.%Close() d %this.lblSPZLI.%Close() d %this.zzLabel2.%Close() d %this.zzLabel3.%Close() @@ -618,7 +688,7 @@ s %this.zzLabel3=##class(%TMLabel).%New($lb(%this.Form.Address,0)) s %this.zzLabel2=##class(%TMLabel).%New($lb(%this.Form.Address,0)) s %this.lblSPZLI=##class(%TMLabel).%New($lb(%this.Form.Address,0)) - s %this.lblSPBR=##class(%TMLabel).%New($lb(%this.Form.Address,0)) + s %this.lblSPBR1=##class(%TMLabel).%New($lb(%this.Form.Address,0)) s %this.lblSPZRE=##class(%TMLabel).%New($lb(%this.Form.Address,0)) s %this.zzLabel4=##class(%TMLabel).%New($lb(%this.Form.Address,0)) s %this.lblNuttigeBreedte=##class(%TMLabel).%New($lb(%this.Form.Address,0)) @@ -631,7 +701,7 @@ s %this.btnOK=##class(%TMButton).%New($lb(%this.Form.Address,0)) s %this.btnCancel=##class(%TMButton).%New($lb(%this.Form.Address,0)) s %this.txtSPZLI=##class(%TMEdit).%New($lb(%this.Form.Address,0)) - s %this.txtSPBR=##class(%TMEdit).%New($lb(%this.Form.Address,0)) + s %this.txtSPBR1=##class(%TMEdit).%New($lb(%this.Form.Address,0)) s %this.txtSPZRE=##class(%TMEdit).%New($lb(%this.Form.Address,0)) s %this.chkSymm=##class(%TMCheckBox).%New($lb(%this.Form.Address,0)) s %this.txtSPZMI=##class(%TMEdit).%New($lb(%this.Form.Address,0)) @@ -643,7 +713,7 @@ d %this.zzLabel3.SetMultiProperty($lb("Left","Top","Width","Height","AutoSize","Caption","Layout"),$lb(19,142,122,21,"False","Spoelbak zijkant Rechts","tlCenter")) d %this.zzLabel2.SetMultiProperty($lb("Left","Top","Width","Height","AutoSize","Caption","Layout"),$lb(19,70,122,21,"False","Spoelbak breedte","tlCenter")) d %this.lblSPZLI.SetMultiProperty($lb("Left","Top","Width","Height","AutoSize","Layout"),$lb(243,46,50,21,"False","tlCenter")) - d %this.lblSPBR.SetMultiProperty($lb("Left","Top","Width","Height","AutoSize","Layout"),$lb(243,70,50,21,"False","tlCenter")) + d %this.lblSPBR1.SetMultiProperty($lb("Left","Top","Width","Height","AutoSize","Layout"),$lb(243,70,50,21,"False","tlCenter")) d %this.lblSPZRE.SetMultiProperty($lb("Left","Top","Width","Height","AutoSize","Layout"),$lb(243,142,50,21,"False","tlCenter")) d %this.zzLabel4.SetMultiProperty($lb("Left","Top","Width","Height","AutoSize","Caption","Layout"),$lb(19,14,112,21,"False","Inbouwbreedte (corpus)","tlCenter")) d %this.lblNuttigeBreedte.SetMultiProperty($lb("Left","Top","Width","Height","AutoSize","Layout"),$lb(163,14,66,21,"False","tlCenter")) @@ -657,8 +727,8 @@ d %this.btnCancel.SetMultiProperty($lb("Left","Top","Width","Height","Anchors","Cancel","Caption","TabOrder","OnClick"),$lb(247,208,75,25,$lb("akRight","akBottom"),"True","Annuleren",1,$lb(%this,"btnCancelClick"))) d %this.txtSPZLI.SetMultiProperty($lb("Left","Top","Width","Height","Ctl3D","ParentCtl3D","ParentFont","TabOrder","OnChange"),$lb(159,46,73,21,"True","False","False",2,$lb(%this,"OnChangeItem"))) d %this.txtSPZLI.Font.SetMultiProperty($lb("Charset","Color","Height","Name","Style"),$lb($$$DEFAULTCHARSET,$$$clWindowText,-11,"MS Sans Serif",$lb())) - d %this.txtSPBR.SetMultiProperty($lb("Left","Top","Width","Height","Ctl3D","ParentCtl3D","ParentFont","TabOrder","OnChange"),$lb(159,70,73,21,"True","False","False",3,$lb(%this,"OnChangeItem"))) - d %this.txtSPBR.Font.SetMultiProperty($lb("Charset","Color","Height","Name","Style"),$lb($$$DEFAULTCHARSET,$$$clWindowText,-11,"MS Sans Serif",$lb())) + d %this.txtSPBR1.SetMultiProperty($lb("Left","Top","Width","Height","Ctl3D","ParentCtl3D","ParentFont","TabOrder","OnChange"),$lb(159,70,73,21,"True","False","False",3,$lb(%this,"OnChangeItem"))) + d %this.txtSPBR1.Font.SetMultiProperty($lb("Charset","Color","Height","Name","Style"),$lb($$$DEFAULTCHARSET,$$$clWindowText,-11,"MS Sans Serif",$lb())) d %this.txtSPZRE.SetMultiProperty($lb("Left","Top","Width","Height","Ctl3D","ParentCtl3D","ParentFont","TabOrder","OnChange"),$lb(159,142,73,21,"True","False","False",6,$lb(%this,"OnChangeItem"))) d %this.txtSPZRE.Font.SetMultiProperty($lb("Charset","Color","Height","Name","Style"),$lb($$$DEFAULTCHARSET,$$$clWindowText,-11,"MS Sans Serif",$lb())) d %this.chkSymm.SetMultiProperty($lb("Left","Top","Width","Height","Caption","TabOrder","OnClick"),$lb(22,175,97,17,"Symmetrisch",7,$lb(%this,"chkSymmClick"))) @@ -697,12 +767,20 @@ document literal 0)&&(..txtSPBR1.Text>0)&&(..txtSPZRE.Text>0) + . If (..lblSifonQty.Caption=2) Set IsVolledig = (IsVolledig) && ((..txtSPZLI.Text>0)&&(..txtSPZMI.Text>0)&&(..txtSPZRE.Text>0)) + + ; Else + If (..lblSifonQty.Caption=2) Quit (..txtSPZLI.Text>0)&&(..txtSPZMI.Text>0)&&(..txtSPZRE.Text>0) Quit:(..lblSPZLI.Caption="") 0 Quit:(..lblSPZRE.Caption="") 0 - Quit:(..lblSPBR.Caption="") 0 - ;Quit:(..cboMatKlant.ItemIndex=-1) 0 - ;Quit:(..cboOndSpecial.ItemIndex=-1) 1 ; No validation on this control + Quit:(..lblSPBR1.Caption="") 0 + Quit 1 ]]> @@ -963,6 +1041,18 @@ zzLabel7 + +lblSPBR1 + + +txtSPBR1 + + +blnIsNieuweSifonlade + + +IsUitsparingBreedteFixed + Index: UI/PR/GA/TandemBox.cls.xml =================================================================== diff -u -r1360 -r1664 --- UI/PR/GA/TandemBox.cls.xml (.../TandemBox.cls.xml) (revision 1360) +++ UI/PR/GA/TandemBox.cls.xml (.../TandemBox.cls.xml) (revision 1664) @@ -827,7 +827,7 @@ Quit:('$LD(Params,1)) new TBKlas,SPVisible,SPHidden,NewTopLbl,NewTopTxt Set TBKlas=$LI(Params,1) - Set SPHidden=$S(TBKlas?1(1"SP",1"SP2",1"SY"):"False", 1:"True") + Set SPHidden=$S(..SpoelbakCtrlsInvullen(TBKlas):"False", 1:"True") Set SPVisible=$S(SPHidden="False":"True", 1:"False") ; $S(TBKlas="SP":"True", 1:"False") ; Controls voor OpvulLijst Set ..txtOpvulLijstLi.Visible=SPHidden @@ -837,14 +837,15 @@ Set ..cboSPZijkant.Visible=SPVisible Set ..lblSPZijkantCbo.Visible=SPVisible Set ..lstSPBreedteInfo.Visible=SPVisible - If TBKlas?1(1"SP",1"SP2",1"SY") Do + If ..SpoelbakCtrlsInvullen(TBKlas) Do . Set NewTopLbl=..lblOpvulLijstTxt.Top . Set NewTopTxt=..txtOpvulLijstLi.Top Else Do . Set NewTopLbl=..lblSPZijkantCbo.Top . Set NewTopTxt=..cboSPZijkant.Top Set ..lblNutBreedte.Top=NewTopLbl Set ..txtNutBreedte.Top=NewTopTxt + Set ..lblSPZijkantCbo.Caption= $S(TBKlas="SY2":"Sifon zijstukken", 1:"Spoelbak zijstukken") Quit ]]> @@ -2461,9 +2462,9 @@ Else If GroepNaam="Afm" Do Quit bln . Set bln=($S(..cboWandDikte.SelectedGetKey()="":0, 1:1)) Quit:('bln) . Set bln=($S(..txtCBreedte.Visible="True":(..txtCBreedte.Text>0), ..cboCBreedte.Visible="True":(..cboCBreedte.SelectedGetKey()'=""), 1:1)) Quit:('bln) - . Set bln=($S((..cboSPZijkant.SelectedGetKey()="")&&(TBKlas?1(1"SP",1"SP2",1"SY")):0, 1:1)) Quit:('bln) - . Set bln=($S((..cboSPZijkant.SelectedGetKey()'="")&&(TBKlas'?1(1"SP",1"SP2",1"SY")):0, 1:1)) Quit:('bln) - . Set bln=($S($$$SPZkOpMaat(..cboSPZijkant.SelectedGetKey())&&('$$givSpoelbakMatenVolledig()):0, 1:1)) Quit:('bln) + . Set bln=($S((..cboSPZijkant.SelectedGetKey()="")&&(..SpoelbakCtrlsInvullen(TBKlas)):0, 1:1)) Quit:('bln) + . Set bln=($S((..cboSPZijkant.SelectedGetKey()'="")&&('..SpoelbakCtrlsInvullen(TBKlas)):0, 1:1)) Quit:('bln) + . Set bln=($S(($$$SPZkOpMaat(..cboSPZijkant.SelectedGetKey())||(..IsNieuweSifonlade(TBKlas)))&&('$$givSpoelbakMatenVolledig(TBKlas)):0, 1:1)) Quit:('bln) . Set bln=($S(..cboLadeDiepte.SelectedGetKey()="":0, 1:1)) Quit:('bln) . Set bln=($S(..cboDraagKracht.SelectedGetKey()="":0, 1:1)) Quit:('bln) . ; txtCDiepte en txtNutBreedte zijn berekende velden @@ -2485,11 +2486,27 @@ Quit 0 -givSpoelbakMatenVolledig() - New BTV +givSpoelbakMatenVolledig(Klasse) + New BTV,IsVolledig Set BTV=..blTBox.BTValues - Quit:($G(..SpoelbakDim("SifonQty"))>1) (BTV.GetAt("SpoelbakZkLi")>0)&&(BTV.GetAt("SpoelbakZkRe")>0)&&(BTV.GetAt("SpoelbakBreedte")>0)&&(BTV.GetAt("SpoelbakZkMi")>0) - Quit (BTV.GetAt("SpoelbakZkLi")>0)&&(BTV.GetAt("SpoelbakZkRe")>0)&&(BTV.GetAt("SpoelbakBreedte")>0) + Set IsVolledig=0 + If ..IsNieuweSifonlade(Klasse) { + If ($G(..SpoelbakDim("SifonQty"))>1) { + Set IsVolledig=(BTV.GetAt("SpoelbakZkLi")>0)&&(BTV.GetAt("SpoelbakZkRe")>0)&&(BTV.GetAt("SpoelbakBreedte1")>0)&&(BTV.GetAt("SpoelbakZkMi")>0)&&(BTV.GetAt("SpoelbakBreedte2")>0) + } + Else { + Set IsVolledig=(BTV.GetAt("SpoelbakZkLi")>0)&&(BTV.GetAt("SpoelbakZkRe")>0)&&(BTV.GetAt("SpoelbakBreedte1")>0) + } + } + Else { + If ($G(..SpoelbakDim("SifonQty"))>1) { + Set IsVolledig=(BTV.GetAt("SpoelbakZkLi")>0)&&(BTV.GetAt("SpoelbakZkRe")>0)&&(BTV.GetAt("SpoelbakBreedte")>0)&&(BTV.GetAt("SpoelbakZkMi")>0) + } + Else { + Set IsVolledig=(BTV.GetAt("SpoelbakZkLi")>0)&&(BTV.GetAt("SpoelbakZkRe")>0)&&(BTV.GetAt("SpoelbakBreedte")>0) + } + } + Quit IsVolledig ]]> @@ -3193,7 +3210,8 @@ New XecString,Key Set XecString="" Set Key=$P(Dfl,":",2) - If Key="BS" Set XecString="Set Dfl=$S(..blTBox.BTValues.GetAt(""TBKlasse"")?1(1""SP"",1""SP2"",1""SY""):""K:BD"", 1:"""")" + ;If Key="BS" Set XecString="Set Dfl=$S(..blTBox.BTValues.GetAt(""TBKlasse"")?1(1""SP"",1""SP2"",1""SY"",1""SY2""):""K:BD"", 1:"""")" + If Key="BS" Set XecString="Set Dfl=$S(..SpoelbakCtrlsInvullen(..blTBox.BTValues.GetAt(""TBKlasse"")):""K:BD"", 1:"""")" If Key="DWV" Set XecString="Set Dfl=$S(..blTBox.BTValues.GetAt(""TBKlasse"")'=""SP2"":""I:0"", ..blTBox.BTValues.GetAt(""LadeCode"")?1(1""DS2"",1""DS2/Z""):""K:4"", 1:""K:0"")" If Key="BHM" Set XecString="Set Dfl=$S(..blTBox.BTValues.GetAt(""TBKlasse"")=""B"":"""", ..blTBox.BTValues.GetAt(""LadeCode"")?1(1""M""):""K:0"", 1:"""")" ; Boring HangMap: alleen defaulting bij M-lade ;d ..TTrace("Dfl="_Dfl_" Key="_Key_" XcStr="_XecString) @@ -3438,7 +3456,14 @@ Set ..SpoelbakDim("SPZLI")=..blTBox.BTValues.GetAt("SpoelbakZkLi") Set ..SpoelbakDim("SPZRE")=..blTBox.BTValues.GetAt("SpoelbakZkRe") Set ..SpoelbakDim("SPZMI")=..blTBox.BTValues.GetAt("SpoelbakZkMi") - Set ..SpoelbakDim("SPBR")=..blTBox.BTValues.GetAt("SpoelbakBreedte") + Set ..SpoelbakDim("KLAS")=..blTBox.BTValues.GetAt("TBKlasse") + If ..IsNieuweSifonlade(..SpoelbakDim("KLAS")) { + Set ..SpoelbakDim("SPBR1")=..blTBox.BTValues.GetAt("SpoelbakBreedte1") + Set ..SpoelbakDim("SPBR2")=..blTBox.BTValues.GetAt("SpoelbakBreedte2") + } + Else { + Set ..SpoelbakDim("SPBR1")=..blTBox.BTValues.GetAt("SpoelbakBreedte") + } ;d ..TTrace("AppPrepare : Spoelbak Dim "_$$ArrayToText^vhLib("SpDim",%this,"SpoelbakDim")) Quit ]]> @@ -3752,7 +3777,7 @@ -SPZLI:%String,SPZRE:%String,SPBR:%String,UserLI:%String,UserRE:%String,UserBR:%String,SifonQty:%String,SPZMI:%String,UserMI:%String +SPZLI:%String,SPZRE:%String,SPBR1:%String,UserLI:%String,UserRE:%String,UserBR1:%String,SifonQty:%String,SPZMI:%String,UserMI:%String,SPBR2:%String,UserBR2:%String cache 0 %Library.Integer @@ -3764,40 +3789,56 @@ #define ValueOrEmpty(%v) $S($G(%v)>0:%v, 1:"") New Klasse - Set AftrekLadeProf=$S(..cboKlasse.SelectedGetKey()="SP":"", 1:0) ; "" = Default AftrekLadeProf (75) - Set SifonQty=##class(BL.PR.GA.TandemBox).SpoelbakUitsparingen(..cboLadeCode.SelectedGetKey(), ..cboSPZijkant.SelectedGetKey(), .Klasse) - Set:(Klasse'?1(1"SY")) SifonQty=0 + Set Klasse=..cboKlasse.SelectedGetKey() + Set AftrekLadeProf=$S(Klasse="SP":"", 1:0) ; "" = Default AftrekLadeProf (75) + Set SifonQty=##class(BL.PR.GA.TandemBox).SpoelbakUitsparingen(..cboLadeCode.SelectedGetKey(), ..cboSPZijkant.SelectedGetKey(), Klasse) + Set:(Klasse'?1(1"SY",1"SY2")) SifonQty=0 Do csmCalcAfmetingen() Do $$$TBoxParameter("SpoelbakZkLi", SPZLI) Do $$$TBoxParameter("SpoelbakZkRe", SPZRE) Do $$$TBoxParameter("SpoelbakZkMi", $S(SifonQty>1:SPZMI, 1:"")) ;d WL^vhDBG("BTValues : "_(..blTBox.BTValues.GetAt("SpoelbakZkMi"))_" SifonQty="_SifonQty_" SPZMI="_SPZMI) - Do $$$TBoxParameter("SpoelbakBreedte", SPBR) + Do $$$TBoxParameter("SpoelbakBreedte", SPBR1) + Do $$$TBoxParameter("SpoelbakBreedte1", SPBR1) + Do $$$TBoxParameter("SpoelbakBreedte2", SPBR2) Quit 1 + csmCalcAfmetingen() - new IB,scSPBR + new IB,sc Set IB=..txtNutBreedte.Text Set UserLI=$G(..SpoelbakDim("SPZLI")) Set UserRE=$G(..SpoelbakDim("SPZRE")) Set UserMI=$G(..SpoelbakDim("SPZMI")) - Set UserBR=$G(..SpoelbakDim("SPBR")) Set SPZLI=UserLI Set SPZRE=UserRE Set SPZMI=UserMI - Set SPBR=UserBR - If SifonQty>1 Do - . ;Set scSPBR=$S(SPZLI+SPBR+SPZMI+SPBR+SPZRE=IB:$$$OK, 1:$$$ERROR($$$GeneralError,"Afmetingen dubbele sifonlade incorrect")) - . ;d WL^vhDBG("Dubbele sifon in BLCalc : "_SPZLI_"+"_SPBR_"+"_SPZMI_"+"_SPBR_"+"_SPZRE_"="_(SPZLI+SPBR+SPZMI+SPBR+SPZRE)_" IB="_IB) - . ;Set sc=scSPBR - . Set sc=##class(BL.PR.GA.TandemBox).CalcSPBreedtesOpMaat(IB-(SPBR*2),.SPZLI,.SPZMI,.SPZRE) ; Maten gesimuleerd door IB-2*SPBR als ladebreedte te nemen en SPZMI als uitsparing + + If ..IsNieuweSifonlade(Klasse) Do + . ; Geen berekeningen, want alles manueel in te geven in DlgSpoelbak + . Set UserBR1=$G(..SpoelbakDim("SPBR1")) + . Set UserBR2=$G(..SpoelbakDim("SPBR2")) + . Set SPBR1=UserBR1 + . Set SPBR2=UserBR2 Else Do - . Set sc=##class(BL.PR.GA.TandemBox).CalcSPBreedtesOpMaat(IB,.SPZLI,.SPBR,.SPZRE,AftrekLadeProf) + . Set UserBR1=$G(..SpoelbakDim("SPBR1")) + . Set SPBR1=UserBR1 + . If SifonQty>1 Do + . . Set UserBR2=UserBR1 + . . Set SPBR2=UserBR2 + . . ;Set sc=$S(SPZLI+SPBR1+SPZMI+SPBR1+SPZRE=IB:$$$OK, 1:$$$ERROR($$$GeneralError,"Afmetingen dubbele sifonlade incorrect")) + . . ;d WL^vhDBG("Dubbele sifon in BLCalc : "_SPZLI_"+"_SPBR1_"+"_SPZMI_"+"_SPBR1_"+"_SPZRE_"="_(SPZLI+SPBR1+SPZMI+SPBR1+SPZRE)_" IB="_IB) + . . Set sc=##class(BL.PR.GA.TandemBox).CalcSPBreedtesOpMaat(IB-(SPBR1*2),.SPZLI,.SPZMI,.SPZRE) ; Maten gesimuleerd door IB-2*SPBR1 als ladebreedte te nemen en SPZMI als uitsparing + . Else Do + . . Set UserBR2=0 + . . Set SPBR2=0 + . . Set sc=##class(BL.PR.GA.TandemBox).CalcSPBreedtesOpMaat(IB,.SPZLI,.SPBR1,.SPZRE,AftrekLadeProf) Set SPZLI=$$$ValueOrEmpty(SPZLI) Set SPZRE=$$$ValueOrEmpty(SPZRE) Set SPZMI=$$$ValueOrEmpty(SPZMI) - Set SPBR=$$$ValueOrEmpty(SPBR) + Set SPBR1=$$$ValueOrEmpty(SPBR1) + Set SPBR2=$$$ValueOrEmpty(SPBR2) Quit ]]> @@ -4063,7 +4104,7 @@ If (blnBinL)&&(+..txtNutBreedte.Text>..#MaximumIBBinL) Do Quit 0 . Set msg="De nuttige (interne) breedte van de binnenlade mag maximum "_..#MaximumIBBinL_" mm zijn." ; Else - If (..cboKlasse.SelectedGetKey()?1(1"SP",1"SP2",1"SY"))&&(+..txtNutBreedte.Text<..#MinimumIBSP) Do Quit 0 + If (..SpoelbakCtrlsInvullen(..cboKlasse.SelectedGetKey()))&&(+..txtNutBreedte.Text<..#MinimumIBSP) Do Quit 0 . Set msg="De nuttige (interne) breedte van de spoelbaklade moet minimum "_..#MinimumIBSP_" mm zijn." ; Else If (DC="I")&&(..cboKlasse.SelectedGetKey()?1(1"SP2"))&&(+..txtNutBreedte.Text<..#MinimumIBSPintivo) Do Quit 0 @@ -4171,18 +4212,29 @@ literal @@ -4193,24 +4245,24 @@ literal ") Else Do . If SifonQty>1 Do . . Set txtItemMid="Mid : "_SPZMI_$S(UserMI>0:" (*)",1:"") . Else If SifonQty=1 Do - . . Set txtItemMid="Sifon : "_SPBR_$S(UserBR>0:" (*)",1:"") + . . Set txtItemMid="Sifon : "_SPBR1_$S(UserBR1>0:" (*)",1:"") . Else Do - . . Set txtItemMid="SpB : "_SPBR_$S(UserBR>0:" (*)",1:"") + . . Set txtItemMid="SpB : "_SPBR1_$S(UserBR1>0:" (*)",1:"") . . Set ..lstSP2BreedtesOpMaat.Font.Color=$$$clWindowText . ;Set ..lstSP2BreedtesOpMaat.Font.Style="" @@ -4609,6 +4661,17 @@ ]]> + +Klasse +cache +0 +%Library.Boolean +document +literal + + + Args:%String cache @@ -4760,6 +4823,17 @@ ]]> + +TBKlasse:%String +cache +0 +%Library.Boolean +document +literal + + + Args:%String cache @@ -4807,12 +4881,13 @@ s Sender=##class(%TMPersistent).GetObjOref($lg(Args,1)) ;Beginning of user code - New msg + New msg,IsNieuweSifonlade If (..txtNutBreedte.Text="")||('..BLValidateIB(.msg)) Do . Set msg="De nuttige breedte moet eerst een geldige waarde bevatten."_$$$CRLF_$G(msg) . Do MApplication.MessageBox(msg,..Form.Caption,$$$MBICONERROR) . Do ..cboWandDikte.SetFocus() Else Do + . Set IsNieuweSifonlade=..IsNieuweSifonlade(..cboKlasse.SelectedGetKey()) . Do:(..cboSPZijkant.SelectedGetKey()="") ..cboSPZijkant.SelectByKey("M") . Quit:(..cboSPZijkant.SelectedGetKey()="") ; Item to be selected does not exist . Do spbShowDlgSpoelbak @@ -4837,29 +4912,47 @@ ;----------------------------------------------------------------------------- spbValuesToDlg - New SPZLI,SPZRE,SPBR,SPZMI + #define NieuweSifonladeOpMaat(%v) (%v?1(1"M.",1"MM",1"M")) + New SifonQty,SPZLI,SPZRE,SPZMI,SPBR1,SPBR2 + Set SifonQty=$G(..SpoelbakDim("SifonQty")) Set SPZLI=(..SpoelbakDim("SPZLI")) Set SPZRE=(..SpoelbakDim("SPZRE")) Set SPZMI=(..SpoelbakDim("SPZMI")) - Set SPBR=(..SpoelbakDim("SPBR")) - Set SifonQty=$G(..SpoelbakDim("SifonQty")) + Set SPBR1=(..SpoelbakDim("SPBR1")) + Set SPBR2=SPBR1 + If SifonQty=1 { + Set SPBR2=0 + } + ElseIf IsNieuweSifonlade { + Set SPBR2=$G(..SpoelbakDim("SPBR2")) + } + + If IsNieuweSifonlade { + Set blnSymm=0 + } + Else { + Set blnSymm=((SPZLI="")&&(SPBR1=""))||((SPZRE="")&&(SPBR1=""))||((SPZLI="")&&(SPZRE="")) ; indien 1 van de 3 ingevuld, dan symmetrisch om te beginnen + Set:(SifonQty>1) blnSymm=0 + } + Set frmDlgSpoelbak.blnSyfonLade=(..cboKlasse.SelectedGetKey()="SY") + Set frmDlgSpoelbak.blnIsNieuweSifonlade=(IsNieuweSifonlade) Set frmDlgSpoelbak.lblNuttigeBreedte.Caption=..txtNutBreedte.Text + Set frmDlgSpoelbak.chkSymm.Checked=$S(blnSymm:"True", 1:"False") + Set frmDlgSpoelbak.IsUitsparingBreedteFixed=(frmDlgSpoelbak.blnSyfonLade) || (IsNieuweSifonlade && $$$Not($$$NieuweSifonladeOpMaat(..cboSPZijkant.SelectedGetKey()))) Set frmDlgSpoelbak.txtSPZLI.Text=SPZLI Set frmDlgSpoelbak.txtSPZRE.Text=SPZRE - Set frmDlgSpoelbak.txtSPBR.Text=SPBR - Set blnSymm=((SPZLI="")&&(SPBR=""))||((SPZRE="")&&(SPBR=""))||((SPZLI="")&&(SPZRE="")) - Set:(SifonQty>1) blnSymm=0 - Set frmDlgSpoelbak.chkSymm.Checked=$S(blnSymm:"True", 1:"False") + Set frmDlgSpoelbak.txtSPBR1.Text=SPBR1 + Set frmDlgSpoelbak.lblSPZLI.Caption=..blTBox.BTValues.GetAt("SpoelbakZkLi") Set frmDlgSpoelbak.lblSPZRE.Caption=..blTBox.BTValues.GetAt("SpoelbakZkRe") - Set frmDlgSpoelbak.lblSPBR.Caption=..blTBox.BTValues.GetAt("SpoelbakBreedte") + Set frmDlgSpoelbak.lblSPBR1.Caption=..blTBox.BTValues.GetAt("SpoelbakBreedte"_$S(IsNieuweSifonlade:"1", 1:"")) Set frmDlgSpoelbak.lblSifonQty.Caption=SifonQty If SifonQty>1 Do ; Dubbele sifonlade . Set frmDlgSpoelbak.txtSPZMI.Text=SPZMI - . Set frmDlgSpoelbak.txtSPBR2.Text=SPBR + . Set frmDlgSpoelbak.txtSPBR2.Text=SPBR2 . Set frmDlgSpoelbak.lblSPZMI.Caption=..blTBox.BTValues.GetAt("SpoelbakZkMi") - . Set frmDlgSpoelbak.lblSPBR2.Caption=..blTBox.BTValues.GetAt("SpoelbakBreedte") + . Set frmDlgSpoelbak.lblSPBR2.Caption=..blTBox.BTValues.GetAt("SpoelbakBreedte"_$S(IsNieuweSifonlade:"2", 1:"")) Quit ;----------------------------------------------------------------------------- @@ -4868,7 +4961,14 @@ Set ..SpoelbakDim("SPZLI")=frmDlgSpoelbak.txtSPZLI.Text Set ..SpoelbakDim("SPZRE")=frmDlgSpoelbak.txtSPZRE.Text Set ..SpoelbakDim("SPZMI")=frmDlgSpoelbak.txtSPZMI.Text - Set ..SpoelbakDim("SPBR")=frmDlgSpoelbak.txtSPBR.Text + Set ..SpoelbakDim("SPBR1")=frmDlgSpoelbak.txtSPBR1.Text + Set ..SpoelbakDim("SPBR2")=frmDlgSpoelbak.txtSPBR2.Text + If $G(..SpoelbakDim("SifonQty"))=1 { + Set ..SpoelbakDim("SPBR2")=0 + } + Else { + Set ..SpoelbakDim("SPBR2")=frmDlgSpoelbak.txtSPBR2.Text + } Do ..CtrlFillSP2BreedtesOpMaatLst() Quit ;----------------------------------------------------------------------------- @@ -5204,7 +5304,7 @@ . ;Do:($$$RunModeNew)&&(+..blTBox.BTValues.GetAt("NMAfdekkap")) ..blTBox.BTValues.SetAt(0,"NMAfdekkap") ; Spoelbak - If (TBKlas?1(1"SP",1"SP2",1"SY")), (+..txtOpvulLijstLi.Text)||(+..txtOpvulLijstLi.Text) Do + If (..SpoelbakCtrlsInvullen(TBKlas)), (+..txtOpvulLijstLi.Text)||(+..txtOpvulLijstLi.Text) Do . Set Answer=MApplication.MessageBox($$$msg,"Output window",$$$MBYESNO+$$$MBICONQUESTION) . Quit:(Answer=$$$mrNo) . Set ..txtOpvulLijstLi.Text="" @@ -5479,28 +5579,6 @@ ]]> - -Args:%String -cache -0 -document -literal -1) Do - . Do ..cboRelingKleur.SetIndex(0) - - ;End of user code - s Args=$lb(Sender) - q -]]> - - Args:%String cache @@ -5537,15 +5615,17 @@ Do ..EventAllBTChangeItem($LB(Sender)) #define SPZkOpMaat(%v) (%v?1(1"M".E,1"SI".E)) - New SPZLI,SPZRE,SPBR,objSP - If '$$$SPZkOpMaat(..cboSPZijkant.SelectedGetKey()) Do - . Do spzGetSPZKBreedtes(..cboSPZijkant.SelectedGetKey(), .SPZLI, .SPZRE, .SPBR) + New SPZLI,SPZRE,SPBR1,SPBR2,objSP + + If ('$$$SPZkOpMaat(..cboSPZijkant.SelectedGetKey())) || (..IsNieuweSifonlade(..cboKlasse.SelectedGetKey())) Do + . Do spzGetSPZKBreedtes(..cboSPZijkant.SelectedGetKey(), .SPZLI, .SPZRE, .SPBR1, .SPBR2) . Set ..SpoelbakDim("SPZLI")=$G(SPZLI) . Set ..SpoelbakDim("SPZRE")=$G(SPZLI) - . Set ..SpoelbakDim("SPBR")=$G(SPBR) + . Set ..SpoelbakDim("SPBR1")=$G(SPBR1) + . Set ..SpoelbakDim("SPBR2")=$G(SPBR2) Do ;If $$$SPZkOpMaat(Sender.SelectedGetKey()) Do - . Set:(..cboKlasse.SelectedGetKey()="SY") ..SpoelbakDim("SPBR")=..blTBox.CalcBreedteSpoelbak(..cboSPZijkant.SelectedGetKey(),+..txtNutBreedte.Text,,..blTBox.DC) + . Set:(..cboKlasse.SelectedGetKey()="SY") ..SpoelbakDim("SPBR1")=..blTBox.CalcBreedteSpoelbak(..cboSPZijkant.SelectedGetKey(),+..txtNutBreedte.Text,,..blTBox.DC) . Do ..CtrlFillSP2BreedtesOpMaatLst() . Set ..lstSP2BreedtesOpMaat.Visible="True" . Set ..lstSPBreedteInfo.Visible="False" @@ -5558,53 +5638,27 @@ ;============================================================================= -spzGetSPZKBreedtes(spID,SPZLI,SPZRE,SPBR) ; SPZLI,SPZRE,SPBR als .local doorgeven +spzGetSPZKBreedtes(spID,SPZLI,SPZRE,SPBR1,SPBR2) ; SPZLI,SPZRE,SPBR1,SPBR2 als .local doorgeven Quit:($G(spID)="") Set objSP=##class(Prod.GAMeta.BT.TBSPZijkant).OpenViaItemCode(spID,..blTBox.DC) Quit:('$IsObject(objSP)) If (objSP.Parameters.GetAt("SPBR")>0) Do - . Set SPRB=objSP.Parameters.GetAt("SPBR") + . Set SPBR=objSP.Parameters.GetAt("SPBR") + . If $L(SPBR,";")>1 Do + . . Set SPBR1=$P(SPBR,";",1) + . . Set SPBR2=$P(SPBR,";",2) + . Else Do + . . Set SPBR1=SPBR + . . Set SPBR2="" Else Do . Set SPZLI=objSP.Parameters.GetAt("ZKLI") . Set SPZRE=objSP.Parameters.GetAt("ZKRE") Set objSP="" + d WLIP^vhDBG(97,"SPBR "_$G(SPBR1)_" ; "_$G(SPBR2)) Quit ]]> - -Args:%String -cache -0 -document -literal - - - Args:%String cache @@ -5816,7 +5870,7 @@ ;Beginning of user code Do ..OnGroupBoxEnter(.Args) - If ..blTBox.BTValues.GetAt("TBKlasse")?1(1"SP",1"SP2",1"SY") Do + If ..SpoelbakCtrlsInvullen(..blTBox.BTValues.GetAt("TBKlasse")) Do . ;Do ..cboAntislipmat.SelectByKey("Z") ;End of user code @@ -5867,7 +5921,7 @@ #define SPZkOpMaat(%v) (%v?1(1"M".E,1"SI".E)) - Do:($$$SPZkOpMaat(..cboSPZijkant.SelectedGetKey())) ..btnSPZijkantOpMaatClick("") + Do:($$$SPZkOpMaat(..cboSPZijkant.SelectedGetKey()))||(..IsNieuweSifonlade(..cboKlasse.SelectedGetKey())) ..btnSPZijkantOpMaatClick("") Do ..cboSPZijkant.SetFocus() ;End of user code @@ -6015,7 +6069,7 @@ . Set ..lblNutBreedte.Font.Color=$$$clDefault . Set ..lblNutBreedte.ParentFont="True" - If ..cboKlasse.SelectedGetKey()?1(1"SP",1"SP2",1"SY") Do + If ..SpoelbakCtrlsInvullen(..cboKlasse.SelectedGetKey()) Do . Do ..CtrlFillSP2BreedtesOpMaatLst() ; ..CtrlFillSPBreedteLst() ;End of user code Index: BL/PR/GA/TandemBox.cls.xml =================================================================== diff -u -r1592 -r1664 --- BL/PR/GA/TandemBox.cls.xml (.../TandemBox.cls.xml) (revision 1592) +++ BL/PR/GA/TandemBox.cls.xml (.../TandemBox.cls.xml) (revision 1664) @@ -185,6 +185,8 @@ Set tmpAr("Staffel")= $LB("Staffel") ;Set tmpAr("Antislipmat")= $LB("ASM") ; !!! NEW Key = "TBMat" !!! (zie hoger) Set tmpAr("SpoelbakBreedte")= $LB("SPBR") + Set tmpAr("SpoelbakBreedte1")= $LB("SPBR1") + Set tmpAr("SpoelbakBreedte2")= $LB("SPBR2") Set tmpAr("SpoelbakZkLi")= $LB("SPZLI") Set tmpAr("SpoelbakZkRe")= $LB("SPZRE") Set tmpAr("SpoelbakZkMi")= $LB("SPRUGMID") @@ -694,15 +696,18 @@ + +Geeft de Klasse vertrekkende van de LadeCode +Bijvoorbeeld : voor LC = "MY/Z" geeft Klasse = "SY" + voor LC = "DLS2" geeft Klasse = "SP2" 1 LadeCode:%String 1 %String @@ -715,7 +720,8 @@ 1 %String 1 %String