Index: accept/models/mat/MAT Configurator,1.0.0.xml
===================================================================
diff -u -r3288 -r3427
--- accept/models/mat/MAT Configurator,1.0.0.xml (.../MAT Configurator,1.0.0.xml) (revision 3288)
+++ accept/models/mat/MAT Configurator,1.0.0.xml (.../MAT Configurator,1.0.0.xml) (revision 3427)
@@ -7,30 +7,30 @@
-
+
-
+
-
+
-
+
-
+
-
+
-
+
@@ -41,16 +41,16 @@
-
+
-
+
-
+
-
+
-
+
@@ -59,7 +59,7 @@
-
+
@@ -75,24 +75,24 @@
-
+
-
+
-
+
-
+
-
+
-
+
@@ -102,11 +102,11 @@
-
+
-
+
@@ -116,63 +116,63 @@
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
@@ -184,7 +184,7 @@
-
+
@@ -196,7 +196,7 @@
-
+
@@ -237,14 +237,14 @@
-
+
-
+
-
+
@@ -258,7 +258,7 @@
-
+
@@ -272,29 +272,29 @@
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
@@ -316,7 +316,7 @@
-
+
@@ -325,25 +325,25 @@
-
+
-
+
-
+
-
+
-
+
@@ -354,74 +354,74 @@
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
@@ -432,26 +432,26 @@
-
+
-
+
-
+
-
+
-
+
-
+
@@ -482,27 +482,27 @@
-
+
-
+
-
+
-
+
-
+
-
+
@@ -521,38 +521,38 @@
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
@@ -562,23 +562,23 @@
-
+
-
+
-
+
@@ -595,19 +595,19 @@
-
+
-
+
-
+
-
+
@@ -616,40 +616,40 @@
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
@@ -671,115 +671,115 @@
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
@@ -789,16 +789,16 @@
-
+
-
+
-
+
-
+
@@ -812,22 +812,22 @@
-
+
-
+
-
+
-
+
-
+
@@ -845,22 +845,22 @@
-
+
-
+
-
+
-
+
-
+
@@ -872,10 +872,10 @@
-
+
-
+
@@ -888,10 +888,10 @@
-
+
-
+
@@ -907,7 +907,7 @@
-
+
@@ -920,109 +920,111 @@
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
+
+
@@ -1033,33 +1035,35 @@
-
+
-
+
+
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
@@ -1586,19 +1590,30 @@
- BEHAVIOR.IsEconWeb and (CONFIG.InputMode == "CreateConfig") and STATE.DataKenmerkenInvullenVia == "" and STATE.KenmerkenIngevuldDoorWebCreateConfig;
+ BEHAVIOR.IsEconWeb and (CONFIG.InputMode == "CreateConfig") and STATE.KenmerkenIngevuldDoorWebCreateConfig
+and ((STATE.DataKenmerkenInvullenVia == "") or (CONFIG.Settings.Nabestellen.IsNabestelling and not(State.IsConfigNabestellenPlotsIngevuld)));
-//if (Config.Settings.Nabestellen.IsNabestelling) then
-STATE.DataKenmerkenInvullenVia = "BijhorendeLade";
- /*
+
+if (CONFIG.Settings.Nabestellen.IsNabestelling) then
+ State.IsConfigNabestellenPlotsIngevuld= true;
+ STATE.DataKenmerkenInvullenVia = "BijhorendeLade";
else
STATE.DataKenmerkenInvullenVia = "InitieleDefaults";
end if;
-*/
Start StatenFlow DataKenmerkenInvullenVia voor CreateConfig Web
- ;state.datakenmerkeninvullenvia@value;
+ ;state.isconfignabestellenplotsingevuld@value;state.datakenmerkeninvullenvia@value;
+
+ State.IsConfigNabestellenPlotsIngevuld
+ State.IsConfigNabestellenPlotsIngevuld= false;
+
+STATE.WinkelkarInfoCalculated = false;
+STATE.WinkelkarInfoDiverseCalculated = false;
+STATE.WinkelkarInfoAfmetingCalculated = false;
+ Workaround voor staten
+ ;state.isconfignabestellenplotsingevuld@value;state.winkelkarinfocalculated@value;state.winkelkarinfodiversecalculated@value;state.winkelkarinfoafmetingcalculated@value;
+
true
@@ -4767,7 +4782,7 @@
not(STATE.WinkelkarInfoCalculated) and STATE.LanguagesLoaded and (STATE.SavedAndExit or STATE.SavedAndContinue or not(BEHAVIOR.IsInteractive))
-//STATE.WinkelkarInfoCalculated = true;
+STATE.WinkelkarInfoCalculated = true;
local string _Model = GetModel();
@@ -4805,12 +4820,12 @@
WinkelkarInfo
- ;
+ ;state.winkelkarinfocalculated@value;
- not(STATE.WinkelkarInfoDiverseCalculated) and STATE.LanguagesLoaded and (STATE.SavedAndExit or STATE.SavedAndContinue or not(BEHAVIOR.IsInteractive))
+ not(STATE.WinkelkarInfoAfmetingCalculated ) and STATE.LanguagesLoaded and (STATE.SavedAndExit or STATE.SavedAndContinue or not(BEHAVIOR.IsInteractive))
-//STATE.WinkelkarInfoDiverseCalculated = true;
+STATE.WinkelkarInfoAfmetingCalculated = true;
local string _Model = GetModel();
@@ -4847,12 +4862,12 @@
WinkelkarInfo - NettoAfmeting
- ;config.database.languages@value;data.lijn.winkelkarinfo[1].nettoafmeting[1]@value;data.lijn.winkelkarinfo[1].nettoafmeting[2]@value;data.lijn.winkelkarinfo[1].nettoafmeting[3]@value;
+ ;state.winkelkarinfoafmetingcalculated@value;
not(STATE.WinkelkarInfoDiverseCalculated) and STATE.LanguagesLoaded and (STATE.SavedAndExit or STATE.SavedAndContinue or not(BEHAVIOR.IsInteractive))
-//STATE.WinkelkarInfoDiverseCalculated = true;
+STATE.WinkelkarInfoDiverseCalculated = true;
local string _Model = GetModel();
local string _LadeToepassingOptionLabel = "toepassing" + "_" + DATA.Kenmerken.LadeToepassing@option(DATA.Kenmerken.LadeToepassing)@id;
@@ -4930,7 +4945,7 @@
WinkelkarInfo - InfoDiverse
- ;config.database.languages@value;data.lijn.winkelkarinfo[1].infodiverse[1]@value;data.lijn.winkelkarinfo[1].infodiverse[2]@value;data.lijn.winkelkarinfo[1].infodiverse[3]@value;
+ ;state.winkelkarinfodiversecalculated@value;
STATE.SavedAndExit or STATE.SavedAndContinue or not(BEHAVIOR.IsInteractive) or (BEHAVIOR.IsEconAx and BEHAVIOR.IsInteractive)
@@ -4988,6 +5003,7 @@
else
STATE.WinkelkarInfoCalculated = false;
STATE.WinkelkarInfoDiverseCalculated = false;
+ STATE.WinkelkarInfoAfmetingCalculated = false;
local string _Feedback = "";
Index: accept/models/mat/MAT Configurator,1.0.0.trl
===================================================================
diff -u -r3288 -r3427
--- accept/models/mat/MAT Configurator,1.0.0.trl (.../MAT Configurator,1.0.0.trl) (revision 3288)
+++ accept/models/mat/MAT Configurator,1.0.0.trl (.../MAT Configurator,1.0.0.trl) (revision 3427)
@@ -344,6 +344,8 @@
+
+