ETM-Schurig/powersync-app
Archived
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge PR #967: Fix working in rules param condition selectors

Browse Source
This commit is contained in:
jenkins 2023-02-13 15:06:56 +01:00
commit cc6daedb62
2 changed files with 46 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

48
nymea-app/ui/delegates/ParamDescriptorDelegate.qml
View File

@ -59,6 +59,7 @@ ItemDelegate {
FontMetrics {
id: fm
}
textRole: "text"
Layout.fillWidth: true
Layout.minimumWidth: {
@ -86,31 +87,28 @@ ItemDelegate {
}
model: isNumeric ?
[qsTr("is"), qsTr("is not"), qsTr("is greater"), qsTr("is smaller"), qsTr("is greater or equal"), qsTr("is smaller or equal")]
: [qsTr("is"), qsTr("is not")];
numericModel
: nonNumericModel
onCurrentTextChanged: {
switch (currentText) {
case qsTr("is"):
root.operatorType = ParamDescriptor.ValueOperatorEquals;
break;
case qsTr("is not"):
root.operatorType = ParamDescriptor.ValueOperatorNotEquals;
break;
case qsTr("is greater"):
root.operatorType = ParamDescriptor.ValueOperatorGreater;
break;
case qsTr("is smaller"):
root.operatorType = ParamDescriptor.ValueOperatorLess;
break;
case qsTr("is greater or equal"):
root.operatorType = ParamDescriptor.ValueOperatorGreaterOrEqual;
break;
case qsTr("is smaller or equal"):
root.operatorType = ParamDescriptor.ValueOperatorLessOrEqual;
break;
}
print("set operator to", root.operatorType, currentText)
ListModel {
id: numericModel
ListElement { text: qsTr("is equal to"); value: ParamDescriptor.ValueOperatorEquals }
ListElement { text: qsTr("is not equal to"); value: ParamDescriptor.ValueOperatorNotEquals }
ListElement { text: qsTr("is greater than"); value: ParamDescriptor.ValueOperatorGreater }
ListElement { text: qsTr("is less than"); value: ParamDescriptor.ValueOperatorLess }
ListElement { text: qsTr("is greater than or equal to"); value: ParamDescriptor.ValueOperatorGreaterOrEqual }
ListElement { text: qsTr("is less than or equal to"); value: ParamDescriptor.ValueOperatorLessOrEqual }
}
ListModel {
id: nonNumericModel
ListElement { text: qsTr("is"); value: ParamDescriptor.ValueOperatorEquals }
ListElement { text: qsTr("is not "); value: ParamDescriptor.ValueOperatorNotEquals }
}
onCurrentIndexChanged: {
root.operatorType = model.get(currentIndex).value
print("set operator to", root.operatorType, currentText, currentIndex, model, model.get(currentIndex))
}
}
@ -218,7 +216,7 @@ ItemDelegate {
}
Component.onCompleted: {
if (root.value == null || root.v^alue == undefined) {
if (root.value == null || root.value == undefined) {
root.value = from;
}
}

26
nymea-app/ui/magic/SelectStateDescriptorParamsPage.qml
View File

@ -89,8 +89,27 @@ Page {
}
model: isNumeric ?
[qsTr("is equal to"), qsTr("is not equal to"), qsTr("is smaller than"), qsTr("is greater than"), qsTr("is smaller or equal than"), qsTr("is greater or equal than")]
: [qsTr("is"), qsTr("is not")];
numericModel
: nonNumericModel
textRole: "text"
ListModel {
id: numericModel
ListElement { text: qsTr("is equal to"); value: ParamDescriptor.ValueOperatorEquals }
ListElement { text: qsTr("is not equal to"); value: ParamDescriptor.ValueOperatorNotEquals }
ListElement { text: qsTr("is greater than"); value: ParamDescriptor.ValueOperatorGreater }
ListElement { text: qsTr("is less than"); value: ParamDescriptor.ValueOperatorLess }
ListElement { text: qsTr("is greater than or equal to"); value: ParamDescriptor.ValueOperatorGreaterOrEqual }
ListElement { text: qsTr("is less than or equal to"); value: ParamDescriptor.ValueOperatorLessOrEqual }
}
ListModel {
id: nonNumericModel
ListElement { text: qsTr("is"); value: ParamDescriptor.ValueOperatorEquals }
ListElement { text: qsTr("is not "); value: ParamDescriptor.ValueOperatorNotEquals }
}
}
GroupBox {
@ -168,7 +187,8 @@ Page {
Layout.margins: app.margins
onClicked: {
print("saving")
root.stateDescriptor.valueOperator = operatorComboBox.currentIndex
root.stateDescriptor.valueOperator = operatorComboBox.model.get(operatorComboBox.currentIndex).value
print("operator:", root.stateDescriptor.valueOperator)
if (staticValueRadioButton.checked) {
print("static value:", staticValueParamDelegate.value)
root.stateDescriptor.value = staticValueParamDelegate.value