Skip to content
GitLab

18793: No vdc case handled; translations; various fixes and improvements

Merged Katarzyna Kwiatkowska requested to merge 18793 into master
Compare
and
58 files
+ 252
− 66
ui/js/app.js
+ 46
− 30
@@ -9,7 +9,7 @@
var callout;
// "global" variables
var filterGTIN = [
var filterGtin = [
'7640156792102', '7640156792096', '7640156792898', '7640156792904', '7640156792911', '7640156792928', '7640156792935', '7640156792942',
'7640156792959', '7640156792966', '7640156792973', '7640156792980', '7640156792997', '7640156793000', '7640156793017', '7640156793024',
'7640156793031', '7640156793048', '7640156792799', '7640156793055', '7640156793062', '7640156793079', '7640156793086', '7640156793093',
@@ -20,7 +20,7 @@
];
var vdcImplementationId = 'HomeConnect_Container';
var vdcToken = null;
var oDeviceStateDescriptions = {};
var deviceStateDescriptions = {};
var dsmuids = [];
var vdcDsuid = -1;
@@ -72,6 +72,12 @@
$oAuthButton.setState('in progress');
}
if (vdcDsuid < 0) {
oAuthUpdateStatus('disconnected', initial);
$oAuthButton.setState('disabled');
return;
}
ajaxRequest('/json/property/vdcquery', {
query: 'getProperty(deviceId=' + vdcDsuid + ')/homeConnectAccountStatus(*)'
}, function (data) {
@@ -161,14 +167,17 @@
* SET UP THE APP
*/
function getVdc () {
function queryForVdc () {
ajaxRequest('/json/apartment/getVdcs', {
'implementationId': vdcImplementationId
}, function (data) {
if (data && data.result && data.result.vdcs && data.result.vdcs[0] && typeof data.result.vdcs[0].dSUID !== undefined) {
vdcDsuid = data.result.vdcs[0].dSUID;
oAuthCheckStatus(true);
} else {
$('#VdcStartingUp').foundation('open');
$('.button').setState('disabled');
}
oAuthCheckStatus(true);
}, function () {
callout('error', i18n._('Checking for controllers has failed. Please refresh the page in a few minutes to try again.'));
oAuthCheckStatus(true);
@@ -216,11 +225,11 @@
dS.utils.detectFeed(feedDetectedCallback);
getVdc();
queryForVdc();
}
function translate () {
i18n.buildUpLang([ 'content_fragment', 'missing_remote_connectivity', 'bottom_fragment', 'footer_fragment' ]);
i18n.buildUpLang([ 'outdated_browser_fragment', 'content_fragment', 'missing_remote_connectivity', 'vdc_starting_up', 'bottom_fragment' ]);
$('body').addClass('loaded');
}
@@ -228,8 +237,15 @@
* DEVICES LISTING
*/
function closePopup ($popup) {
if ($popup.is(':visible')) {
$popup.foundation('close');
}
}
function queryForDeviceState (dsuid) {
var $stateCell = $deviceTable.find('.state_' + dsuid);
ajaxRequest('/json/device/getInfoOperational', {
dsuid: dsuid
}, function (data) {
@@ -242,10 +258,10 @@
for (var state in data) {
if (data.hasOwnProperty(state) && typeof data[state].value !== 'undefined') {
value = data[state].value;
if (oDeviceStateDescriptions && oDeviceStateDescriptions[dsuid] && oDeviceStateDescriptions[dsuid][state] &&
typeof oDeviceStateDescriptions[dsuid][state].options !== 'undefined') {
title = oDeviceStateDescriptions[dsuid][state].title;
option = oDeviceStateDescriptions[dsuid][state].options[value];
if (deviceStateDescriptions && deviceStateDescriptions[dsuid] && deviceStateDescriptions[dsuid][state] &&
typeof deviceStateDescriptions[dsuid][state].options !== 'undefined') {
title = deviceStateDescriptions[dsuid][state].title;
option = deviceStateDescriptions[dsuid][state].options[value];
sString += '<tr>' +
' <td>' + (title ? title + ':' : '') + '</td>' +
' <td class="state"><em>' + (option ? option : '?') + '</em></td>' +
@@ -274,7 +290,7 @@
filter: 'stateDesc'
}, function (data) {
if (data && data.result && typeof data.result.stateDescriptions !== 'undefined') {
oDeviceStateDescriptions[dsuid] = data.result.stateDescriptions;
deviceStateDescriptions[dsuid] = data.result.stateDescriptions;
}
queryForDeviceState(dsuid);
@@ -287,7 +303,7 @@
function insertDevice (device) {
var action = device.productInfo.ConfigLink + '?dsuid=' + device.dSUID + '&gtin=' + device.productInfo.EAN +
'&lang=' + i18n.languageSuffix + '&feed=' + dS.Utils.feed + '&context=overview&AppName=Configurator';
'&lang=' + i18n.languageSuffix + '&feed=' + dS.utils.feed + '&context=overview&AppName=Configurator';
if (vdcToken !== null) {
action += '&token=' + vdcToken;
}
@@ -307,23 +323,27 @@
$tr.find('.status span').html($currentState.html());
}
$deviceTableWorkingCopy.append($tr);
queryForStateDescriptions(device.dSUID);
}
function insertDevices (devices) {
dsmuids = [];
for (var dsuid in devices) {
if (devices.hasOwnProperty(dsuid) && devices[dsuid] && devices[dsuid].ImplementationId !== vdcImplementationId) {
if (devices.hasOwnProperty(dsuid) && devices[dsuid] && typeof devices[dsuid].DSMeterDSUID !== 'undefined') {
insertDevice(devices[dsuid]);
if (dsmuids.indexOf(devices[dsuid].DSMeterDSUID) === -1) {
dsmuids.push(devices[dsuid].DSMeterDSUID);
}
} else {
delete devices[dsuid];
}
}
$deviceTable.html($deviceTableWorkingCopy.html());
if ($searchingForDevicesPopup.is(':visible')) {
$searchingForDevicesPopup.foundation('close');
closePopup($searchingForDevicesPopup);
for (dsuid in devices) {
if (devices.hasOwnProperty(dsuid)) {
queryForStateDescriptions(dsuid);
}
}
}
@@ -336,9 +356,7 @@
$rediscoverButton.setState('default').setState('disabled');
}
$deviceTable.setTableState('error');
if ($searchingForDevicesPopup.is(':visible')) {
$searchingForDevicesPopup.foundation('close');
}
closePopup($searchingForDevicesPopup);
}
ajaxRequest('/json/property/query2', {
@@ -350,7 +368,7 @@
for (var dsuid in data) {
if (!data[dsuid].productInfo ||
!data[dsuid].productInfo.EAN ||
filterGTIN.indexOf(data[dsuid].productInfo.EAN) === -1) {
filterGtin.indexOf(data[dsuid].productInfo.EAN) === -1) {
delete data[dsuid];
}
}
@@ -359,19 +377,17 @@
insertDevices(data);
} else {
$deviceTable.setTableState('empty');
if ($searchingForDevicesPopup.is(':visible')) {
$searchingForDevicesPopup.foundation('close');
}
closePopup($searchingForDevicesPopup);
$('#NoDevicesFound').foundation('open');
}
} else {
errorCallback();
}
if (homeConnectStatus === 'connected') {
$rediscoverButton.setState('enabled');
if (homeConnectStatus === 'connected') {
$rediscoverButton.setState('enabled');
} else {
$rediscoverButton.setState('default').setState('disabled');
}
} else {
$rediscoverButton.setState('default').setState('disabled');
errorCallback();
}
}, errorCallback);
}
ui/locale/da_DK/bottom_fragment.html 0 → 100644
+ 6
− 0
<p>The behavior as well as additional Custom Actions can be configured within the Device Settings page.</p>
<h4>Note:</h4>
<ul>
<li>Please connect to your Home-Connect account first.</li>
<li>Device Settings can only be accessed with an active Internet connection.</li>
</ul>
ui/locale/da_DK/outdated_browser_fragment.html 0 → 100644
+ 1
− 0
<p>You are using an <strong>outdated</strong> browser. Please <a href="http://browsehappy.com/">upgrade your browser</a> to improve your experience.</p>
ui/locale/da_DK/singleStrings.po
+ 5
− 1
#
#
msgid ""
msgstr ""
"Language-Team: Danish (Denmark) (https://www.transifex.com/digitalstrom/teams/19937/da_DK/)\n"
@@ -109,3 +109,7 @@ msgstr ""
# #disconnected_devices
msgid "Please connect to service first."
msgstr ""
# #open_system_update_page
msgid "Open system update page"
msgstr ""
ui/locale/da_DK/vdc_starting_up.html 0 → 100644
+ 2
− 0
<h2>System is starting up...</h2>
<p>The system is starting up and is therefore not yet available. Please wait a few minutes and open this app again.</p>