Skip to content
GitLab

#22070: Greying out of motion trigger in grid and dialog added, for when no…

Merged Katarzyna Kwiatkowska requested to merge kkwiatkowska/ventilation-controller:22070 into master
Compare
and
2 files
+ 55
− 10
ui/js/ventilationWizardPanel.js
+ 49
− 10
@@ -74,8 +74,7 @@ Ext.define('DSS.component.VentilationWizardPanel', {
}, me.timeToField ]
});
this.timeRangeFields.isValid = function () {
// TODO: append some red error
return me.timeFromField.isValid() && me.timeToField.isValid() && me.timeFromField.getValue() < me.timeToField.getValue();
return me.timeFromField.isValid() && me.timeToField.isValid(); // && me.timeFromField.getValue() < me.timeToField.getValue(); // time can be e.g. 23:00 - 4:00
};
// scene to called
@@ -125,7 +124,6 @@ Ext.define('DSS.component.VentilationWizardPanel', {
id: 'lightTriggerEnabled',
labelWidth: 395,
width: 1000,
fieldLabel: '', // TODO delete it later
boxLabel: _('enable light trigger'),
style: {
padding: '10px',
@@ -137,7 +135,6 @@ Ext.define('DSS.component.VentilationWizardPanel', {
id: 'motionTriggerEnabled',
labelWidth: 395,
width: 1000,
fieldLabel: '', // TODO delete it later
boxLabel: _('enable motion trigger'),
style: {
padding: '10px',
@@ -149,7 +146,6 @@ Ext.define('DSS.component.VentilationWizardPanel', {
id: 'humidityTriggerEnabled',
labelWidth: 395,
width: 1000,
fieldLabel: '', // TODO delete it later
boxLabel: _('enable humidity trigger'),
style: {
padding: '10px',
@@ -225,7 +221,7 @@ Ext.define('DSS.component.VentilationWizardPanel', {
}, me.humidityThresholdField, {
xtype: 'label',
id: 'humidityThresholdUnitLabel',
text: _('% rH'), // TODO: check this string if it's like that in translations
text: _('% rH'),
style: {
padding: '0 0 0 5px',
color: '#005138'
@@ -345,6 +341,8 @@ Ext.define('DSS.component.VentilationWizardPanel', {
}, {
name: 'motionTriggerEnabled'
}, {
name: 'motionDetectorPresent'
}, {
name: 'humidityTriggerEnabled'
}, {
name: 'humidityThreshold'
@@ -410,7 +408,15 @@ Ext.define('DSS.component.VentilationWizardPanel', {
dataIndex: 'motionTriggerEnabled',
flex: 1,
xtype: 'textcolumn',
customColumnRenderer: triggerRenderer
customColumnRenderer: function (val, metadata, record) {
val = triggerRenderer(val);
if (record.get('motionDetectorPresent')) {
return val;
} else {
metadata.tdAttr = 'data-qtip="' + Ext.String.htmlEncode(_('No motion sensors in the zone')) + '"';
return '<span style="opacity:0.3">' + val + '</span>';
}
}
}, {
header: _('humidity trigger'),
dataIndex: 'humidityTriggerEnabled',
@@ -418,7 +424,12 @@ Ext.define('DSS.component.VentilationWizardPanel', {
xtype: 'textcolumn',
customColumnRenderer: function (val, metadata, record) {
val = triggerRenderer(val);
return record.get('humiditySensorPresent') ? val : '<span style="opacity:0.3">' + val + '</span>';
if (record.get('humiditySensorPresent')) {
return val;
} else {
metadata.tdAttr = 'data-qtip="' + Ext.String.htmlEncode(_('No zone humidity sensor')) + '"';
return '<span style="opacity:0.3">' + val + '</span>';
}
}
}, {
header: _('humidity threshold'),
@@ -427,7 +438,12 @@ Ext.define('DSS.component.VentilationWizardPanel', {
xtype: 'textcolumn',
customColumnRenderer: function (val, metadata, record) { // , rowIdx, colIdx, store, view
val = val + _('% rH');
return record.get('humiditySensorPresent') ? val : '<span style="opacity:0.3">' + val + '</span>';
if (record.get('humiditySensorPresent')) {
return val;
} else {
metadata.tdAttr = 'data-qtip="' + Ext.String.htmlEncode(_('No zone humidity sensor')) + '"';
return '<span style="opacity:0.3">' + val + '</span>';
}
}
// }, {
// header: _('humidity sensor'),
@@ -451,7 +467,7 @@ Ext.define('DSS.component.VentilationWizardPanel', {
}
},
saveEntry: function (grid, values) {
grid.setStatus(_('Refreshing...')); // TODO: saving maybe?
grid.setStatus(_('Refreshing...'));
me.saveItem(grid, values);
},
disableEntry: function (grid, entry) {
@@ -543,6 +559,9 @@ Ext.define('DSS.component.VentilationWizardPanel', {
control.resetComponent();
}
}
if (id === 'motionTriggerEnabled') {
me.motionTriggerField.setDisabled(!values.motionDetectorPresent);
}
if (id === 'humidityTriggerEnabled') {
if (values.humiditySensorPresent) {
me.humidityTriggerField.setDisabled(false);
@@ -633,12 +652,28 @@ Ext.define('DSS.component.VentilationWizardPanel', {
this.vwZones = this.basePanel.zvrZones.filter(function (zone) {
return zone.groupId === Groups.ZONEVENTILATION && zone.actors.length; // TODO: just ventilation or recirculation as well?
// NO, recirculation doesn't make sense - can have different available scenes
// than ventilation, then what?
});
// get wizard settings for zones
var result;
var zoneId;
var success = true;
if (this.vwZones.length) {
var motionSensors = dss.staticDataModel.getAKMDeviceArray() || [];
motionSensors = motionSensors
.filter(function (device) {
return device.binaryInputs && device.binaryInputs[0] && device.binaryInputs[0].type === 5; // motion detectors only
}).reduce(function (currentList, device) {
if (currentList.indexOf(device.ZoneID) === -1) {
currentList.push(device.ZoneID);
}
return currentList;
}, []);
}
for (var i = 0; i < this.vwZones.length; i++) {
zoneId = this.vwZones[i].zoneId;
result = null;
@@ -695,6 +730,7 @@ Ext.define('DSS.component.VentilationWizardPanel', {
}
// TODO: correct sceneToCallId if not in active basic scenes? I guess not, just at the action performing stage take this into account
// check if humidity sensors are present
try {
result = Ext.JSON.decode(
dss.ajaxSyncRequest('/json/property/query2', {
@@ -710,6 +746,9 @@ Ext.define('DSS.component.VentilationWizardPanel', {
continue;
}
this.vwZones[i].humiditySensorPresent = typeof result.result['type' + HumiditySensorTypes.ZONESENSOR] !== 'undefined';
// check if motion detectors are present
this.vwZones[i].motionDetectorPresent = motionSensors.indexOf(this.vwZones[i].zoneId) !== -1;
}
return success;
ui/locale/templates/ventilation.pot
+ 6
− 0
@@ -249,3 +249,9 @@ msgstr ""
msgid "Ventilation levels"
msgstr ""
msgid "No zone humidity sensor"
msgstr ""
msgid "No motion sensors in the zone"
msgstr ""