Data entry redux (#475)

* FilteredDataEntry will now create its own computed column and use that for values * let JASP handle the computed column part * also update bayesian workflow * use checking if column exists field
jasp-stats · Oct 10, 2024 · 8620771 · 8620771
1 parent 78715be
commit 8620771
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 12 deletions.
diff --git a/R/auditCommonFunctions.R b/R/auditCommonFunctions.R
@@ -296,18 +296,12 @@
     sampleFilter <- numeric(selectionState[["N.items"]])
     rowNumber <- as.numeric(sample[["row"]])
     sampleFilter[rowNumber] <- as.numeric(sample[["times"]])
-    auditDataVariable <- rep(NA, selectionState[["N.items"]])
-    auditDataVariable[options[["performAudit"]][[1]]$rowIndices] <- options[["performAudit"]][[1]]$values
-
+
     if (is.null(jaspResults[["indicator_col"]])) {
       jaspResults[["indicator_col"]] <- createJaspColumn(columnName = options[["indicator_col"]], dependencies = "indicator_col")
     }
-    if (is.null(jaspResults[["variable_col"]])) {
-      jaspResults[["variable_col"]] <- createJaspColumn(columnName = options[["variable_col"]], dependencies = "variable_col")
-    }
 
     jaspResults[["indicator_col"]]$setOrdinal(sampleFilter)
-    jaspResults[["variable_col"]]$setScale(auditDataVariable)
   }
 }
 

diff --git a/inst/qml/auditBayesianWorkflow.qml b/inst/qml/auditBayesianWorkflow.qml
@@ -286,7 +286,12 @@ Form
 					pasteVariables.checked 		= true
 					performAuditTable.colName   = names.variable_name
 					performAuditTable.extraCol	= names.indicator_name
-					values.count > 0 &&  critical.use_negative && critical.use_inspect ? performAuditTable.filter = names.indicator_name + " > 0" + " | " + critical.use_name + " > 0" : performAuditTable.filter = names.indicator_name + " > 0"
+
+					if(values.count > 0 && critical.use_negative && critical.use_inspect)
+						performAuditTable.filter = names.indicator_name + " > 0" + " | " + critical.use_name + " > 0" 
+					else
+						performAuditTable.filter = names.indicator_name + " > 0"
+
 					performAuditTable.initialValuesSource = annotation.use_values ? "values" : ""
 				}
 			}
@@ -315,7 +320,6 @@ Form
 				Layout.fillWidth: 					true
 				modelType:							JASP.FilteredDataEntryModel
 				source:     						["id", "values", "variables"]
-				colName:    						"Filter"
 				defaultValue:						0
 				decimals:							10
 				Layout.preferredHeight:				500 * preferencesModel.uiScale

diff --git a/inst/qml/auditClassicalWorkflow.qml b/inst/qml/auditClassicalWorkflow.qml
@@ -277,7 +277,12 @@ Form
 					pasteVariables.checked 		= true
 					performAuditTable.colName   = names.variable_name
 					performAuditTable.extraCol	= names.indicator_name
-					values.count > 0 && critical.use_negative && critical.use_inspect ? performAuditTable.filter = names.indicator_name + " > 0" + " | " + critical.use_name + " > 0" : performAuditTable.filter = names.indicator_name + " > 0"
+
+					if(values.count > 0 && critical.use_negative && critical.use_inspect)
+						performAuditTable.filter = names.indicator_name + " > 0" + " | " + critical.use_name + " > 0" 
+					else
+						performAuditTable.filter = names.indicator_name + " > 0"
+
 					performAuditTable.initialValuesSource = annotation.use_values ? "values" : ""
 				}
 			}
@@ -306,7 +311,6 @@ Form
 				Layout.fillWidth: 					true
 				modelType:							JASP.FilteredDataEntryModel
 				source:								["id", "values", "variables"]
-				colName:							"Filter"
 				defaultValue:						0
 				decimals:							10
 				Layout.preferredHeight:				500 * preferencesModel.uiScale

diff --git a/inst/qml/common/evaluation/AddVariables.qml b/inst/qml/common/evaluation/AddVariables.qml
@@ -39,12 +39,13 @@ Group
 		value:		qsTr("selected")
 	}
 
-	ComputedColumnField
+	CheckColumnIsFreeOrMineField
 	{
 		id: 		variable_col
 		name: 		"variable_col"
 		text: 		qsTr("Column name audit result")
 		fieldWidth: 120 * preferencesModel.uiScale
 		value: 		qsTr("auditResult")
+
 	}
 }