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

Small improvments in the edit rules page

Browse Source
This commit is contained in:
Michael Zanetti 2020-05-07 15:24:41 +02:00
parent b790905d60
commit c30edaafdc
3 changed files with 25 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
nymea-app/ui/magic/EditRulePage.qml
View File

@ -499,7 +499,7 @@ Page {
Button { Button {
Layout.fillWidth: true Layout.fillWidth: true
Layout.margins: app.margins Layout.leftMargin: app.margins; Layout.rightMargin: app.margins; Layout.bottomMargin: app.margins
text: eventsRepeater.count == 0 && timeEventRepeater.count === 0 ? qsTr("Configure...") : qsTr("Add another...") text: eventsRepeater.count == 0 && timeEventRepeater.count === 0 ? qsTr("Configure...") : qsTr("Add another...")
visible: !root.isStateBased visible: !root.isStateBased
onClicked: { onClicked: {
@ -592,8 +592,8 @@ Page {
Button { Button {
Layout.fillWidth: true Layout.fillWidth: true
Layout.margins: app.margins Layout.leftMargin: app.margins; Layout.rightMargin: app.margins; Layout.bottomMargin: app.margins
text: root.rule.stateEvaluator === null && root.rule.timeDescriptor.calendarItems.count === 0 ? text: root.rule.stateEvaluator === null || root.rule.timeDescriptor.calendarItems.count === 0 ?
qsTr("Configure...") : qsTr("Configure...") :
qsTr("Add another...") qsTr("Add another...")
visible: root.rule.timeDescriptor.timeEventItems.count === 0 || root.rule.stateEvaluator === null visible: root.rule.timeDescriptor.timeEventItems.count === 0 || root.rule.stateEvaluator === null
@ -661,7 +661,7 @@ Page {
Button { Button {
Layout.fillWidth: true Layout.fillWidth: true
Layout.margins: app.margins Layout.leftMargin: app.margins; Layout.rightMargin: app.margins; Layout.bottomMargin: app.margins
text: root.isEmpty ? qsTr("Configure...") : text: root.isEmpty ? qsTr("Configure...") :
actionsRepeater.count == 0 ? qsTr("Add an action...") : qsTr("Add another action...") actionsRepeater.count == 0 ? qsTr("Add an action...") : qsTr("Add another action...")
onClicked: { onClicked: {
@ -697,7 +697,7 @@ Page {
Button { Button {
Layout.fillWidth: true Layout.fillWidth: true
Layout.margins: app.margins Layout.leftMargin: app.margins; Layout.rightMargin: app.margins; Layout.bottomMargin: app.margins
text: actionsRepeater.count == 0 ? qsTr("Add an action...") : qsTr("Add another action...") text: actionsRepeater.count == 0 ? qsTr("Add an action...") : qsTr("Add another action...")
onClicked: { onClicked: {
var page = pageStack.push(ruleActionQuestionPageComponent, {exitAction: true}); var page = pageStack.push(ruleActionQuestionPageComponent, {exitAction: true});

13
nymea-app/ui/magic/RuleActionDelegate.qml
View File

@ -64,9 +64,18 @@ NymeaListItemDelegate {
var ruleActionParam = root.ruleAction.ruleActionParams.get(i) var ruleActionParam = root.ruleAction.ruleActionParams.get(i)
print("populating subtext:", ruleActionParam.eventTypeId, ruleActionParam.eventParamTypeId, ruleActionParam.stateDeviceId, ruleActionParam.stateTypeId, ruleActionParam.isValueBased, ruleActionParam.isEventParamBased, ruleActionParam.isStateValueBased) print("populating subtext:", ruleActionParam.eventTypeId, ruleActionParam.eventParamTypeId, ruleActionParam.stateDeviceId, ruleActionParam.stateTypeId, ruleActionParam.isValueBased, ruleActionParam.isEventParamBased, ruleActionParam.isStateValueBased)
var paramString = qsTr("%1: %2").arg(root.actionType.paramTypes.getParamType(ruleActionParam.paramTypeId).displayName) var paramType = root.actionType.paramTypes.getParamType(ruleActionParam.paramTypeId);
var paramString = qsTr("%1: %2").arg(paramType.displayName)
if (ruleActionParam.isValueBased) { if (ruleActionParam.isValueBased) {
paramString = paramString.arg(ruleActionParam.value) var text = ""
switch (paramType.type.toLowerCase()) {
case "bool":
text = ruleActionParam.value === true ? qsTr("True") : qsTr("False")
break;
default:
text = ruleActionParam.value
}
paramString = paramString.arg(text)
} else if (ruleActionParam.isEventParamBased) { } else if (ruleActionParam.isEventParamBased) {
paramString = paramString.arg(qsTr("value from event")) paramString = paramString.arg(qsTr("value from event"))
} else if (ruleActionParam.isStateValueBased) { } else if (ruleActionParam.isStateValueBased) {

11
nymea-app/ui/magic/SimpleStateEvaluatorDelegate.qml
View File

@ -97,10 +97,17 @@ SwipeDelegate {
if (!root.stateType) { if (!root.stateType) {
return qsTr("Press to edit condition") return qsTr("Press to edit condition")
} }
var valueText = root.stateEvaluator.stateDescriptor.value;
switch (root.stateType.type.toLowerCase()) {
case "bool":
valueText = root.stateEvaluator.stateDescriptor.value === true ? qsTr("True") : qsTr("False")
break;
}
if (root.device) { if (root.device) {
return qsTr("%1: %2 %3 %4").arg(root.device.name).arg(root.stateType.displayName).arg(operatorString).arg(root.stateEvaluator.stateDescriptor.value) return qsTr("%1: %2 %3 %4").arg(root.device.name).arg(root.stateType.displayName).arg(operatorString).arg(valueText)
} else if (root.iface) { } else if (root.iface) {
return qsTr("%1: %2 %3 %4").arg(root.iface.displayName).arg(root.stateType.displayName).arg(operatorString).arg(root.stateEvaluator.stateDescriptor.value) return qsTr("%1: %2 %3 %4").arg(root.iface.displayName).arg(root.stateType.displayName).arg(operatorString).arg(valueText)
} }
return "--"; return "--";
} }