Index: development/models/tbx/TBX Configurator, 0.0.14.trl
===================================================================
diff -u -r14 -r15
--- development/models/tbx/TBX Configurator, 0.0.14.trl (.../TBX Configurator, 0.0.14.trl) (revision 14)
+++ development/models/tbx/TBX Configurator, 0.0.14.trl (.../TBX Configurator,1.0.0.trl) (revision 15)
@@ -1,45 +1,35 @@
-
+
-
-
-
-
-
-
-
-
+
+
+
+
-
-
-
-
-
+
+
-
+
-
-
-
-
-
-
-
+
+
+
+
+
+
-
-
+
+
-
-
@@ -55,28 +45,20 @@
+
-
-
-
-
-
-
-
+
+
+
+
-
-
-
-
-
-
@@ -85,12 +67,13 @@
-
-
+
+
+
@@ -107,6 +90,44 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -123,50 +144,6 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
@@ -176,7 +153,6 @@
-
@@ -188,8 +164,12 @@
+
+
+
+
@@ -215,6 +195,8 @@
+
+
@@ -257,12 +239,10 @@
-
-
@@ -272,7 +252,10 @@
+
+
+
@@ -282,11 +265,12 @@
-
+
+
@@ -297,14 +281,13 @@
-
-
+
-
-
-
+
+
+
@@ -314,23 +297,35 @@
+
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -347,20 +342,15 @@
-
+
-
-
-
-
-
@@ -379,158 +369,143 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
+
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
@@ -540,58 +515,34 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
@@ -600,112 +551,44 @@
-
-
-
-
-
-
-
-
-
-
-
+
+
+
-
-
-
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
FishEye: Tag 15 refers to a dead (removed) revision in file `development/models/tbx/TBX Configurator, 0.0.14.mtd'.
FishEye: No comparison available. Pass `N' to diff?
FishEye: Tag 15 refers to a dead (removed) revision in file `development/models/tbx/TBX Configurator, 0.0.14.trl'.
FishEye: No comparison available. Pass `N' to diff?
FishEye: Tag 15 refers to a dead (removed) revision in file `development/models/tbx/TBX Configurator, 0.0.14.xml'.
FishEye: No comparison available. Pass `N' to diff?
Index: development/models/tbx/TBX Configurator, 0.0.14.xml
===================================================================
diff -u -r14 -r15
--- development/models/tbx/TBX Configurator, 0.0.14.xml (.../TBX Configurator, 0.0.14.xml) (revision 14)
+++ development/models/tbx/TBX Configurator, 0.0.14.xml (.../TBX Configurator,1.0.0.xml) (revision 15)
@@ -1,9 +1,9 @@
-
+
-
+
-
+
@@ -21,7 +21,7 @@
-
+
@@ -538,7 +538,7 @@
-
+
@@ -547,44 +547,44 @@
-
+
-
+
-
+
-
+
-
+
-
+
-
+
@@ -594,14 +594,14 @@
-
+
-
+
@@ -613,9 +613,9 @@
-
+
-
+
@@ -624,76 +624,76 @@
-
+
-
+
-
+
-
+
-
-
+
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
@@ -703,31 +703,31 @@
-
+
-
+
-
+
-
+
@@ -737,31 +737,31 @@
-
+
-
+
-
+
-
+
@@ -771,7 +771,7 @@
-
+
@@ -783,7 +783,7 @@
-
+
@@ -795,7 +795,7 @@
-
+
@@ -807,7 +807,7 @@
-
+
@@ -819,7 +819,7 @@
-
+
@@ -831,7 +831,7 @@
-
+
@@ -843,7 +843,7 @@
-
+
@@ -1022,31 +1022,31 @@
-
+
-
+
-
+
-
+
@@ -1056,31 +1056,31 @@
-
+
-
+
-
+
-
+
@@ -1090,23 +1090,23 @@
-
+
-
+
-
+
@@ -1116,31 +1116,31 @@
-
+
-
+
-
+
-
+
@@ -1149,57 +1149,7 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
@@ -1297,7 +1247,7 @@
-
+
@@ -1309,7 +1259,7 @@
-
+
@@ -1343,7 +1293,7 @@
-
+
@@ -1385,7 +1335,7 @@
-
+
@@ -1403,7 +1353,7 @@
-
+
@@ -1421,7 +1371,7 @@
-
+
@@ -1447,7 +1397,7 @@
-
+
@@ -1572,34 +1522,8 @@
-
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
@@ -1609,21 +1533,11 @@
-
+
-
-
-
-
-
-
-
-
-
-
-
+
@@ -1682,6 +1596,42 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -1704,12 +1654,12 @@
local string _Connection = GetSetting("data.connectionstring");
local string _Query = "SELECT Id, Name FROM ti.MDLanguage WHERE Active = '1'";
-CONFIG.Languages@options = {};
-CONFIG.Languages@options = ExecuteOptionsQuery("CONFIG.Languages"; true; _Connection; _Query);
+CONFIG.Database.Languages@options = {};
+CONFIG.Database.Languages@options = ExecuteOptionsQuery("CONFIG.Database.Languages"; true; _Connection; _Query);
STATE.LanguagesLoaded = true;
Actieve talen ophalen
- ;config.languages@options;state.languagesloaded@value;
+ ;config.database.languages@options;state.languagesloaded@value;
STATE.Initialized
@@ -1796,6 +1746,7 @@
local boolean _IsExtern = (CONFIG.Settings.OperationMode == "Extern");
local boolean _IsIntern = (CONFIG.Settings.OperationMode == "Intern");
+// @Wim: mss performanter met 1 if --> if (_IsExtern) then ... @visible = false ...
UI.VerpakkingOptiesToonAlle@visible = _IsIntern;
UI.HeeftAfwijkendeRugHoogte@visible = _IsIntern;
@@ -1808,7 +1759,13 @@
UI.ProductieWijze@visible = _IsIntern;
UI.ProductieWijze@mandatory = _IsIntern;
-UI.Toepassing@option("images\VH\Configurator\TBX\Toepassing\Buro.png")@visible = false;
+for i = 1 to len(UI.Toepassing@options)
+ UI.Toepassing = UI.Toepassing@option(i)@id;
+
+ if (UI.Toepassing.Value == "B") then
+ UI.Toepassing@option(i)@visible = false;
+ end if;
+end for;
index i of UI.NietMeeleveren
@@ -1826,7 +1783,7 @@
end index;
OperationMode intern/extern
- ;ui.verpakkingoptiestoonalle@visible;ui.heeftafwijkenderughoogte@visible;ui.rugwandmateriaal@visible;ui.rugwandmateriaal@mandatory;ui.hangmapboringaantal@visible;ui.productiewijze@visible;ui.productiewijze@mandatory;ui.toepassing@options;
+ ;ui.verpakkingoptiestoonalle@visible;ui.heeftafwijkenderughoogte@visible;ui.rugwandmateriaal@visible;ui.rugwandmateriaal@mandatory;ui.hangmapboringaantal@visible;ui.productiewijze@visible;ui.productiewijze@mandatory;
STATE.Initialized
@@ -2057,23 +2014,23 @@
local string _Connection = GetSetting("data.connectionstring");
local string _Query = "SELECT TOP 1 * FROM eCon.Configurations WHERE name = '" + CONFIG.Settings.ReferentieLade + "'";
-DEFAULTS.Configurations@options = {};
-DEFAULTS.Configurations@options = ExecuteOptionsQuery("DEFAULTS.Configurations"; true; _Connection; _Query);
+CONFIG.Database.Configurations@options = {};
+CONFIG.Database.Configurations@options = ExecuteOptionsQuery("CONFIG.Database.Configurations"; true; _Connection; _Query);
STATE.ReferentieLadeLoaded = true;
ReferentieLade: ConfigId ophalen op basis van ReferentieLade
- ;defaults.configurations@options;state.referentieladeloaded@value;
+ ;config.database.configurations@options;state.referentieladeloaded@value;
- STATE.ReferentieLadeLoaded and (DEFAULTS.Configurations.Name == CONFIG.Settings.ReferentieLade)
+ STATE.ReferentieLadeLoaded and (CONFIG.Database.Configurations.Name == CONFIG.Settings.ReferentieLade)
STATE.ReferentieLadeLoaded = false;
local string _Connection = GetSetting("data.connectionstring");
-local string _Query = "SELECT propertyname, value FROM eCon.ConfigAnalyseProperties WHERE configid = '" + DEFAULTS.Configurations.Id + "' AND propertyname LIKE 'Data.%'";
+local string _Query = "SELECT propertyname, value FROM eCon.ConfigAnalyseProperties WHERE configid = '" + CONFIG.Database.Configurations.Id + "' AND propertyname LIKE 'Data.%'";
local boolean _Result;
-DEFAULTS.Properties@options = {};
-DEFAULTS.Properties@options = ExecuteOptionsQuery("DEFAULTS.Properties"; true; _Connection; _Query);
+CONFIG.Database.ConfigAnalyseProperties@options = {};
+CONFIG.Database.ConfigAnalyseProperties@options = ExecuteOptionsQuery("CONFIG.Database.ConfigAnalyseProperties"; true; _Connection; _Query);
local string _References = "";
_References = _References + "DATA.BodemKleur;";
@@ -2104,40 +2061,40 @@
_References = _References + "DATA.VerpakkingType;";
_References = _References + "DATA.ZijwandVerhogingMateriaal;";
-for i = 1 to len(DEFAULTS.Properties@options)
- DEFAULTS.Properties = DEFAULTS.Properties@option(i)@id;
+for i = 1 to len(CONFIG.Database.ConfigAnalyseProperties@options)
+ CONFIG.Database.ConfigAnalyseProperties = CONFIG.Database.ConfigAnalyseProperties@option(i)@id;
- local boolean _ReferenceExists = (Instr(1; LCase(_References); LCase(DEFAULTS.Properties.PropertyName)) > 0);
+ local boolean _ReferenceExists = (Instr(1; LCase(_References); LCase(CONFIG.Database.ConfigAnalyseProperties.PropertyName)) > 0);
if (_ReferenceExists) then
- _Result = SetValue(DEFAULTS.Properties.PropertyName; DEFAULTS.Properties.Value);
+ _Result = SetValue(CONFIG.Database.ConfigAnalyseProperties.PropertyName; CONFIG.Database.ConfigAnalyseProperties.Value);
end if;
end for;
ReferentieLade: Properties ophalen op basis van ConfigId
- ;state.referentieladeloaded@value;defaults.properties@options;
+ ;state.referentieladeloaded@value;config.database.configanalyseproperties@options;
(CONFIG.Settings.ReferentieLade == "") and (CONFIG.InputMode <> "Edit") and (CONFIG.Settings.KlantId <> "")
local string _Connection = GetSetting("data.connectionstring");
local string _Query = "SELECT TOP 1 * FROM eCon.Configurations WHERE name = '" + CONFIG.Settings.KlantId + "'";
-DEFAULTS.Configurations@options = {};
-DEFAULTS.Configurations@options = ExecuteOptionsQuery("DEFAULTS.Configurations"; true; _Connection; _Query);
+CONFIG.Database.Configurations@options = {};
+CONFIG.Database.Configurations@options = ExecuteOptionsQuery("CONFIG.Database.Configurations"; true; _Connection; _Query);
STATE.DefaultsLoaded = true;
KlantVoorkeuren: ConfigId ophalen op basis van KlantId
- ;defaults.configurations@options;state.defaultsloaded@value;
+ ;config.database.configurations@options;state.defaultsloaded@value;
- STATE.DefaultsLoaded and (DEFAULTS.Configurations.Name == CONFIG.Settings.KlantId)
+ STATE.DefaultsLoaded and (CONFIG.Database.Configurations.Name == CONFIG.Settings.KlantId)
STATE.DefaultsLoaded = false;
local string _Connection = GetSetting("data.connectionstring");
-local string _Query = "SELECT propertyname, value FROM eCon.ConfigAnalyseProperties WHERE configid = '" + DEFAULTS.Configurations.Id + "' AND propertyname LIKE 'Data.%' AND value <> ''";
+local string _Query = "SELECT propertyname, value FROM eCon.ConfigAnalyseProperties WHERE configid = '" + CONFIG.Database.Configurations.Id + "' AND propertyname LIKE 'Data.%' AND value <> ''";
local boolean _Result;
-DEFAULTS.Properties@options = {};
-DEFAULTS.Properties@options = ExecuteOptionsQuery("DEFAULTS.Properties"; true; _Connection; _Query);
+CONFIG.Database.ConfigAnalyseProperties@options = {};
+CONFIG.Database.ConfigAnalyseProperties@options = ExecuteOptionsQuery("CONFIG.Database.ConfigAnalyseProperties"; true; _Connection; _Query);
local string _Preferences = "";
_Preferences = _Preferences + "DATA.BodemKleur;";
@@ -2156,40 +2113,40 @@
_Preferences = _Preferences + "DATA.NietMeeleveren.NietMeeleveren_TiponBlumotionOnderdelen";
_Preferences = _Preferences + "DATA.VerpakkingType";
-for i = 1 to len(DEFAULTS.Properties@options)
- DEFAULTS.Properties = DEFAULTS.Properties@option(i)@id;
+for i = 1 to len(CONFIG.Database.ConfigAnalyseProperties@options)
+ CONFIG.Database.ConfigAnalyseProperties = CONFIG.Database.ConfigAnalyseProperties@option(i)@id;
- local boolean _PreferenceExists = (Instr(1; LCase(_Preferences); LCase(DEFAULTS.Properties.PropertyName)) > 0);
+ local boolean _PreferenceExists = (Instr(1; LCase(_Preferences); LCase(CONFIG.Database.ConfigAnalyseProperties.PropertyName)) > 0);
if (_PreferenceExists) then
- _Result = SetValue(DEFAULTS.Properties.PropertyName; DEFAULTS.Properties.Value);
+ _Result = SetValue(CONFIG.Database.ConfigAnalyseProperties.PropertyName; CONFIG.Database.ConfigAnalyseProperties.Value);
end if;
end for;
KlantVoorkeuren: Properties ophalen op basis van ConfigId
- ;state.defaultsloaded@value;defaults.properties@options;
+ ;state.defaultsloaded@value;config.database.configanalyseproperties@options;
- (CONFIG.Settings.ReferentieLade == "") and (CONFIG.InputMode <> "Edit") and (CONFIG.Settings.PersonalityId <> "") and (len(DEFAULTS.Properties) == 0)
+ (CONFIG.Settings.ReferentieLade == "") and (CONFIG.InputMode <> "Edit") and (CONFIG.Settings.PersonalityId <> "") and (len(CONFIG.Database.ConfigAnalyseProperties) == 0)
local string _Connection = GetSetting("data.connectionstring");
local string _Query = "SELECT TOP 1 * FROM eCon.Configurations WHERE name = '" + CONFIG.Settings.PersonalityId + "'";
-DEFAULTS.Configurations@options = {};
-DEFAULTS.Configurations@options = ExecuteOptionsQuery("DEFAULTS.Configurations"; true; _Connection; _Query);
+CONFIG.Database.Configurations@options = {};
+CONFIG.Database.Configurations@options = ExecuteOptionsQuery("CONFIG.Database.Configurations"; true; _Connection; _Query);
STATE.DefaultsLoaded = true;
PersonalityVoorkeuren: ConfigId ophalen op basis van PersonalityId
- ;defaults.configurations@options;state.defaultsloaded@value;
+ ;config.database.configurations@options;state.defaultsloaded@value;
- STATE.DefaultsLoaded and (DEFAULTS.Configurations.Name == CONFIG.Settings.PersonalityId)
+ STATE.DefaultsLoaded and (CONFIG.Database.Configurations.Name == CONFIG.Settings.PersonalityId)
STATE.DefaultsLoaded = false;
local string _Connection = GetSetting("data.connectionstring");
-local string _Query = "SELECT propertyname, value FROM eCon.ConfigAnalyseProperties WHERE configid = '" + DEFAULTS.Configurations.Id + "' AND propertyname LIKE 'Data.%' AND value <> ''";
+local string _Query = "SELECT propertyname, value FROM eCon.ConfigAnalyseProperties WHERE configid = '" + CONFIG.Database.Configurations.Id + "' AND propertyname LIKE 'Data.%' AND value <> ''";
local boolean _Result;
-DEFAULTS.Properties@options = {};
-DEFAULTS.Properties@options = ExecuteOptionsQuery("DEFAULTS.Properties"; true; _Connection; _Query);
+CONFIG.Database.ConfigAnalyseProperties@options = {};
+CONFIG.Database.ConfigAnalyseProperties@options = ExecuteOptionsQuery("CONFIG.Database.ConfigAnalyseProperties"; true; _Connection; _Query);
local string _Defaults = "";
_Defaults = _Defaults + "DATA.FrontOndersteuningType;";
@@ -2209,47 +2166,17 @@
_Defaults = _Defaults + "DATA.Variant;";
_Defaults = _Defaults + "DATA.VerpakkingType;";
-for i = 1 to len(DEFAULTS.Properties@options)
- DEFAULTS.Properties = DEFAULTS.Properties@option(i)@id;
+for i = 1 to len(CONFIG.Database.ConfigAnalyseProperties@options)
+ CONFIG.Database.ConfigAnalyseProperties = CONFIG.Database.ConfigAnalyseProperties@option(i)@id;
- local boolean _DefaultExists = (Instr(1; LCase(_Defaults); LCase(DEFAULTS.Properties.PropertyName)) > 0);
+ local boolean _DefaultExists = (Instr(1; LCase(_Defaults); LCase(CONFIG.Database.ConfigAnalyseProperties.PropertyName)) > 0);
if (_DefaultExists) then
- _Result = SetValue(DEFAULTS.Properties.PropertyName; DEFAULTS.Properties.Value);
+ _Result = SetValue(CONFIG.Database.ConfigAnalyseProperties.PropertyName; CONFIG.Database.ConfigAnalyseProperties.Value);
end if;
-end for;
-
-
-/*
-local string _DefaultsValue = "";
-local string _DefaultsPropertyName = "";
-local string _DefaultsDataEval = "";
-
-for i = 1 to len(DEFAULTS.Properties@options)
- DEFAULTS.Properties = DEFAULTS.Properties@option(i)@id;
- local boolean _DefaultExists = (Instr(1; LCase(_Defaults); LCase(DEFAULTS.Properties.PropertyName)) > 0);
-
- if (_DefaultExists) then
- local string _Value = DEFAULTS.Properties.Value;
- local string _eValue = CStr(eval(DEFAULTS.Properties.PropertyName));
-
- local boolean _HasValue = (_Value <> "");
- local boolean _IsZero = (_Value == "0");
-
- _DefaultsValue = _DefaultsValue + DEFAULTS.Properties.Value + "||||";
- _DefaultsPropertyName = _DefaultsPropertyName + DEFAULTS.Properties.PropertyName + "||||";
- _DefaultsDataEval = _DefaultsDataEval + CStr(eval(DEFAULTS.Properties.PropertyName)) + "||||";
-
- if (_HasValue and not(_IsZero)) then
- _Result = SetValue(DEFAULTS.Properties.PropertyName; DEFAULTS.Properties.Value);
- end if;
- end if;
-end for;
-
-Output = _DefaultsValue + "-----" + _DefaultsPropertyName + "-----" + _DefaultsDataEval;
-*/
+end for;
PersonalityVoorkeuren: Properties ophalen op basis van ConfigId
- ;state.defaultsloaded@value;defaults.properties@options;
+ ;state.defaultsloaded@value;config.database.configanalyseproperties@options;
@@ -3929,10 +3856,10 @@
true
local boolean _ToonAlleVerpakkingen = UI.VerpakkingOptiesToonAlle;
-UI.VerpakkingType@option("Probox")@visible = (_ToonAlleVerpakkingen ) or CONFIG.Settings.VerpakkingProboxToegelaten;
-UI.VerpakkingType@option("VHoss")@visible = (_ToonAlleVerpakkingen ) or CONFIG.Settings.VerpakkingVHossToegelaten;
-UI.VerpakkingType@option("Procom")@visible = (_ToonAlleVerpakkingen ) or CONFIG.Settings.VerpakkingProcomToegelaten;
-UI.VerpakkingType@option("Pallet")@visible = (_ToonAlleVerpakkingen ) or CONFIG.Settings.VerpakkingPalletToegelaten;
+UI.VerpakkingType@option("Probox")@visible = (_ToonAlleVerpakkingen) or CONFIG.Settings.VerpakkingProboxToegelaten;
+UI.VerpakkingType@option("VHoss")@visible = (_ToonAlleVerpakkingen) or CONFIG.Settings.VerpakkingVHossToegelaten;
+UI.VerpakkingType@option("Procom")@visible = (_ToonAlleVerpakkingen) or CONFIG.Settings.VerpakkingProcomToegelaten;
+UI.VerpakkingType@option("Pallet")@visible = (_ToonAlleVerpakkingen) or CONFIG.Settings.VerpakkingPalletToegelaten;
Visible options - VerpakkingType
;ui.verpakkingtype@options;
@@ -4172,12 +4099,12 @@
STATE.LanguagesLoaded and STATE.Saved
local string _Model = GetModel();
-DATA.WinkelkarInfo@length = len(CONFIG.Languages@options);
+DATA.WinkelkarInfo@length = len(CONFIG.Database.Languages@options);
-for i = 1 to len(CONFIG.Languages@options)
- CONFIG.Languages = CONFIG.Languages@option(i)@id;
+for i = 1 to len(CONFIG.Database.Languages@options)
+ CONFIG.Database.Languages = CONFIG.Database.Languages@option(i)@id;
- local string _TaalCode = CONFIG.Languages.Name;
+ local string _TaalCode = CONFIG.Database.Languages.Name;
local string _CorpusWanddikte = " / ";
if not(DATA.IsBinnenbreedte) then
@@ -4211,7 +4138,7 @@
STATE.LanguagesLoaded and STATE.Saved
- for i = 1 to len(CONFIG.Languages@options)
+ for i = 1 to len(CONFIG.Database.Languages@options)
local string _InfoReferentie = "";
local string _InfoGeleider = "";
local string _InfoMat = "";