From c247c4efa417c426e01055db1a3ccd105927f33d Mon Sep 17 00:00:00 2001
From: Don van den Bergh <donvdbergh@hotmail.com>
Date: Tue, 18 Jun 2024 14:40:36 +0200
Subject: [PATCH] changes for new variablesList/ data reading

---
 inst/qml/multiVarControl.qml     | 2 +-
 inst/qml/predictiveAnalytics.qml | 9 ++++-----
 2 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/inst/qml/multiVarControl.qml b/inst/qml/multiVarControl.qml
index ffc525e..b78edea 100644
--- a/inst/qml/multiVarControl.qml
+++ b/inst/qml/multiVarControl.qml
@@ -8,7 +8,7 @@ Form
     VariablesForm
     {
         AvailableVariablesList	{ name: "allVariablesList" }
-        AssignedVariablesList	{ name: "variables";	title: qsTr("Control Variables");	suggestedColumns: ["scale"]}
+        AssignedVariablesList	{ name: "variables";	title: qsTr("Control Variables");	allowedColumns: ["scale"]}
     }
 
 
diff --git a/inst/qml/predictiveAnalytics.qml b/inst/qml/predictiveAnalytics.qml
index 0d05d89..cc8cede 100644
--- a/inst/qml/predictiveAnalytics.qml
+++ b/inst/qml/predictiveAnalytics.qml
@@ -15,7 +15,7 @@ Form
 			name: "dependent"
 			id: dependent
 			title: qsTr("Dependent Variable")
-			suggestedColumns: ["scale"]
+			allowedColumns: ["scale"]
 			singleVariable: true
 			info: qsTr("Time series variable to be predicted. (needed)")
 		}
@@ -25,7 +25,7 @@ Form
 			name: "time"
 			id: time
 			title: qsTr("Time")
-			suggestedColumns: ["nominal"]
+			allowedColumns: ["nominal"]
 			singleVariable: true
 			info: qsTr("Time variable that each corresponds to the time stamp of each observation. Can be in the following formats: ['YYYY-MM-DD', 'YYYY/MM/DD', 'YYYY-MM-DD HH:MM:SS', 'YYYY/MM/DD HH:MM:SS'] (needed)")
 		}
@@ -35,7 +35,6 @@ Form
 			name: "covariates"
 			id: covariates
 			title: qsTr("Covariates")
-			suggestedColumns: ["scale"]
 			allowedColumns: ["scale"]
 			info: qsTr("Covariates to be used in the prediction model. (optional)")
 		}
@@ -45,7 +44,7 @@ Form
 			name: "factors"
 			id: factors
 			title: qsTr("Factors")
-			allowedColumns: ["ordinal", "nominal"]
+			allowedColumns: ["nominal"]
 		}
 
 		AssignedVariablesList
@@ -53,7 +52,7 @@ Form
 			name: "trainingIndicator"
 			id: trainingIndicatorVariable
 			title: qsTr("Include in Training")
-			suggestedColumns: ["scale"]
+			allowedColumns: ["nominal"]
 			singleVariable: true
 			info : qsTr("Logical variable (only 0 or 1) indicating which cases should be used for training and verifying the models (= 1) and which cases should be predicted (= 0). This variable is necessary for making predictions when covariates and factors are supplied")
 		}