Skip to content

Commit

Permalink
Merge pull request #901 from SmoKE585/alpha
Browse files Browse the repository at this point in the history 
Новая версия таймеров ПУ
  • Loading branch information
@sergejey
sergejey committed Feb 11, 2021
2 parents 306db00 + 49b5c13 commit 64e0fc9
Show file tree
Hide file tree
Showing 6 changed files with 157 additions and 101 deletions.
36 changes: 33 additions & 3 deletions js/scripts.js
View file
@@ -1,10 +1,26 @@
//Конвектор времени
function twoDigits(num) {
if(num == 0) num = 1;
return ('0' + num).slice(-2);
}

function secondsToHms(d, lang_h, lang_m, lang_s) {
function timeConvert(unixtime) {
unixtime = unixtime*1000;

date = new Date(unixtime);

returnArr = [
twoDigits(date.getDate()),
twoDigits((date.getMonth()+1)),
date.getFullYear(),
twoDigits(date.getHours()),
twoDigits(date.getMinutes()),
twoDigits(date.getSeconds()),
];

return returnArr;
}

function secondsToHms(d, lang_h = '', lang_m = '', lang_s = '') {
d = Number(d);
var h = Math.floor(d / 3600);
var m = Math.floor(d % 3600 / 60);
Expand All @@ -13,7 +29,21 @@ function secondsToHms(d, lang_h, lang_m, lang_s) {
var hDisplay = h > 0 ? h + " " + lang_h + " " : "";
var mDisplay = m > 0 ? m + " " + lang_m + " " : "";
var sDisplay = !h ? (s > 0 ? s + " " + lang_s + " " : "") : "";
return hDisplay + mDisplay + sDisplay;

//Собираем строку
genString = '';

if(lang_h) {
genString = genString + hDisplay;
}
if(lang_m) {
genString = genString + mDisplay;
}
if(lang_s) {
genString = genString + sDisplay;
}

return genString;
}

function simple_hash(s) {
Expand Down
25 changes: 9 additions & 16 deletions templates/classes/views/SLeak.html
View file
@@ -1,26 +1,19 @@
<script>
$(function() {
var sID = '%.object_id%';
var sDATA = '%.updated%';
sID = '%.object_id%';
sDATA = '%.updated%';

a = new Date(sDATA * 1000);
timeConvertVar = timeConvert(sDATA);
currentTime = new Date();

year = a.getFullYear();
month = a.getMonth();
date = a.getDate();
hour = a.getHours();
min = a.getMinutes();
sec = a.getSeconds();

if((currentTime.getDate() - date) == 0) {
beautyText = '<#LANG_DEVICES_PASSED_TODAY_IN#> ' + twoDigits(hour) + ':' + twoDigits(min);
} else if((currentTime.getDate() - date) == 1) {
beautyText = '<#LANG_DEVICES_PASSED_YESTERDAY_IN#> ' + twoDigits(hour) + ':' + twoDigits(min);
if((currentTime.getDate() - timeConvertVar[0]) == 0) {
beautyText = '<#LANG_DEVICES_PASSED_TODAY_IN#> ' + timeConvertVar[3] + ':' + timeConvertVar[4];
} else if((currentTime.getDate() - timeConvertVar[0]) == 1) {
beautyText = '<#LANG_DEVICES_PASSED_YESTERDAY_IN#> ' + timeConvertVar[3] + ':' + timeConvertVar[4] + ':' + timeConvertVar[5];
} else {
beautyText = twoDigits(date) + '.' + twoDigits(month) + '.' + year + ' ' + twoDigits(hour) + ':' + twoDigits(min);
beautyText = timeConvertVar[0] + '.' + timeConvertVar[1] + '.' + timeConvertVar[2] + ' ' + timeConvertVar[3] + ':' + timeConvertVar[4] + ':' + timeConvertVar[5];
}

$('.updatedText-JS-' + sID).text(beautyText);
});

Expand Down
72 changes: 48 additions & 24 deletions templates/classes/views/SMotions.html
View file
@@ -1,5 +1,5 @@
<script>
$(function() {
function setInsertData_%.object_id%() {
if(window.intervalUpdateDateMotion_%.object_id%) {
window.clearInterval(intervalUpdateDateMotion_%.object_id%);
}
Expand All @@ -12,60 +12,84 @@
if(diff <= -21) {
beautyText = '<#LANG_DEVICES_PASSED_INCORRECT_TIME#>';
$('.motion-updatedText-JS-' + sID).text(beautyText);
} else if(diff >= -20 && diff <= 0) {
} else if(diff >= -20 && diff <= 10) {
//Только что
beautyText = '<#LANG_DEVICES_PASSED_NOW#>';
$('.motion-updatedText-JS-' + sID).text(beautyText);
} else if(diff > 0 && diff < 3598) {
beautyText = secondsToHms(diff, '<#LANG_DEVICES_PASSED_NEW_HOURS_AGO#>', '<#LANG_DEVICES_PASSED_NEW_MINUTES_AGO#>', '<#LANG_DEVICES_PASSED_NEW_SECONDS_AGO#>') + ' <#LANG_DEVICES_PASSED_AGO#>';

window.intervalUpdateDateMotion_%.object_id% = setInterval(function() {
setInsertData_%.object_id%();
}, 1000);
} else if(diff > 10 && diff <= 600) {
beautyText = secondsToHms(diff, '', '<#LANG_DEVICES_PASSED_NEW_MINUTES_AGO#>', '<#LANG_DEVICES_PASSED_NEW_SECONDS_AGO#>') + ' <#LANG_DEVICES_PASSED_AGO#>';
$('.motion-updatedText-JS-' + sID).text(beautyText);

window.intervalUpdateDateMotion_%.object_id% = setInterval(function() {
var currentTime = parseInt(new Date().getTime()/1000);
var sID = '%.object_id%';
var sDATA = '%.updated%';
var diff = currentTime-sDATA;

beautyText = secondsToHms(diff, '<#LANG_DEVICES_PASSED_NEW_HOURS_AGO#>', '<#LANG_DEVICES_PASSED_NEW_MINUTES_AGO#>', '<#LANG_DEVICES_PASSED_NEW_SECONDS_AGO#>') + ' <#LANG_DEVICES_PASSED_AGO#>';
beautyText = secondsToHms(diff, '', '<#LANG_DEVICES_PASSED_NEW_MINUTES_AGO#>', '<#LANG_DEVICES_PASSED_NEW_SECONDS_AGO#>') + ' <#LANG_DEVICES_PASSED_AGO#>';
$('.motion-updatedText-JS-' + sID).text(beautyText);

setInsertData_%.object_id%();
}, 1000);
} else if(diff >= 3598 && diff < 86400) {
beautyText = secondsToHms(diff, '<#LANG_DEVICES_PASSED_NEW_HOURS_AGO#>', '<#LANG_DEVICES_PASSED_NEW_MINUTES_AGO#>', '<#LANG_DEVICES_PASSED_NEW_SECONDS_AGO#>');
} else if(diff > 600 && diff <= 7200) {
beautyText = secondsToHms(diff, '<#LANG_DEVICES_PASSED_NEW_HOURS_AGO#>', '<#LANG_DEVICES_PASSED_NEW_MINUTES_AGO#>', '') + ' <#LANG_DEVICES_PASSED_AGO#>';
$('.motion-updatedText-JS-' + sID).text(beautyText);

window.intervalUpdateDateMotion_%.object_id% = setInterval(function() {
var currentTime = parseInt(new Date().getTime()/1000);
var diff = currentTime-sDATA;

beautyText = secondsToHms(diff, '<#LANG_DEVICES_PASSED_NEW_HOURS_AGO#>', '<#LANG_DEVICES_PASSED_NEW_MINUTES_AGO#>', '') + ' <#LANG_DEVICES_PASSED_AGO#>';
$('.motion-updatedText-JS-' + sID).text(beautyText);

setInsertData_%.object_id%();
}, 61000);
} else if(diff > 7200 && diff < 25200) {
beautyText = secondsToHms(diff, '<#LANG_DEVICES_PASSED_NEW_HOURS_AGO#>', '', '') + ' <#LANG_DEVICES_PASSED_AGO#>';
$('.motion-updatedText-JS-' + sID).text(beautyText);

window.intervalUpdateDateMotion_%.object_id% = setInterval(function() {
var currentTime = parseInt(new Date().getTime()/1000);
var sID = '%.object_id%';
var sDATA = '%.updated%';
var diff = currentTime-sDATA;

//Считаем и делаем красиво
beautyText = secondsToHms(diff, '<#LANG_DEVICES_PASSED_NEW_HOURS_AGO#>', '<#LANG_DEVICES_PASSED_NEW_MINUTES_AGO#>', '<#LANG_DEVICES_PASSED_NEW_SECONDS_AGO#>');
beautyText = secondsToHms(diff, '<#LANG_DEVICES_PASSED_NEW_HOURS_AGO#>', '', '') + ' <#LANG_DEVICES_PASSED_AGO#>';
$('.motion-updatedText-JS-' + sID).text(beautyText);
}, 61000);

setInsertData_%.object_id%();
}, 1800000);
} else {
//Дропаем интервал
if(window.intervalUpdateDateMotion_%.object_id%) {
window.clearInterval(intervalUpdateDateMotion_%.object_id%);
}

a = new Date(sDATA * 1000);
timeConvertVar = timeConvert(sDATA);
currentTime = new Date();

year = a.getFullYear();
month = a.getMonth();
date = a.getDate();
hour = a.getHours();
min = a.getMinutes();
sec = a.getSeconds();

if((currentTime.getDate() - date) == 1) {
beautyText = '<#LANG_DEVICES_PASSED_YESTERDAY_IN#> ' + twoDigits(hour) + ':' + twoDigits(min) + ':' + twoDigits(sec);
if((currentTime.getDate() - timeConvertVar[0]) == 0) {
beautyText = '<#LANG_DEVICES_PASSED_TODAY_IN#> ' + timeConvertVar[3] + ':' + timeConvertVar[4];
} else if((currentTime.getDate() - timeConvertVar[0]) == 1) {
beautyText = '<#LANG_DEVICES_PASSED_YESTERDAY_IN#> ' + timeConvertVar[3] + ':' + timeConvertVar[4] + ':' + timeConvertVar[5];
} else {
beautyText = twoDigits(date) + '.' + twoDigits(month) + '.' + year + ' ' + twoDigits(hour) + ':' + twoDigits(min) + ':' + twoDigits(sec);
beautyText = timeConvertVar[0] + '.' + timeConvertVar[1] + '.' + timeConvertVar[2] + ' ' + timeConvertVar[3] + ':' + timeConvertVar[4] + ':' + timeConvertVar[5];
}

$('.motion-updatedText-JS-' + sID).text(beautyText);
}
}

$(function() {
if(window.intervalUpdateDateMotion_%.object_id%) {
window.clearInterval(intervalUpdateDateMotion_%.object_id%);
}

setInsertData_%.object_id%();
window.intervalUpdateDateMotion_%.object_id% = setInterval(function() {
setInsertData_%.object_id%();
}, 1000);
});

</script>
Expand Down
75 changes: 49 additions & 26 deletions templates/classes/views/SOpenClose.html
View file
@@ -1,5 +1,5 @@
<script>
$(function() {
function setInsertData_%.object_id%() {
if(window.intervalUpdateDateOpenclose_%.object_id%) {
window.clearInterval(intervalUpdateDateOpenclose_%.object_id%);
}
Expand All @@ -8,69 +8,92 @@
var sID = '%.object_id%';
var sDATA = '%.updated%';
var diff = currentTime-sDATA;

if(diff <= -21) {
beautyText = '<#LANG_DEVICES_PASSED_INCORRECT_TIME#>';
$('.openclose-updatedText-JS-' + sID).text(beautyText);
} else if(diff >= -20 && diff <= 0) {
} else if(diff >= -20 && diff <= 10) {
//Только что
beautyText = '<#LANG_DEVICES_PASSED_NOW#>';
$('.openclose-updatedText-JS-' + sID).text(beautyText);
} else if(diff > 0 && diff < 3598) {
beautyText = secondsToHms(diff, '<#LANG_DEVICES_PASSED_NEW_HOURS_AGO#>', '<#LANG_DEVICES_PASSED_NEW_MINUTES_AGO#>', '<#LANG_DEVICES_PASSED_NEW_SECONDS_AGO#>');

window.intervalUpdateDateOpenclose_%.object_id% = setInterval(function() {
setInsertData_%.object_id%();
}, 1000);
} else if(diff > 10 && diff <= 600) {
beautyText = secondsToHms(diff, '', '<#LANG_DEVICES_PASSED_NEW_MINUTES_AGO#>', '<#LANG_DEVICES_PASSED_NEW_SECONDS_AGO#>') + ' <#LANG_DEVICES_PASSED_AGO#>';
$('.openclose-updatedText-JS-' + sID).text(beautyText);

window.intervalUpdateDateOpenclose_%.object_id% = setInterval(function() {
var currentTime = parseInt(new Date().getTime()/1000);
var sID = '%.object_id%';
var sDATA = '%.updated%';
var diff = currentTime-sDATA;

beautyText = secondsToHms(diff, '<#LANG_DEVICES_PASSED_NEW_HOURS_AGO#>', '<#LANG_DEVICES_PASSED_NEW_MINUTES_AGO#>', '<#LANG_DEVICES_PASSED_NEW_SECONDS_AGO#>');
beautyText = secondsToHms(diff, '', '<#LANG_DEVICES_PASSED_NEW_MINUTES_AGO#>', '<#LANG_DEVICES_PASSED_NEW_SECONDS_AGO#>') + ' <#LANG_DEVICES_PASSED_AGO#>';
$('.openclose-updatedText-JS-' + sID).text(beautyText);

setInsertData_%.object_id%();
}, 1000);
} else if(diff >= 3598 && diff < 86400) {
beautyText = secondsToHms(diff, '<#LANG_DEVICES_PASSED_NEW_HOURS_AGO#>', '<#LANG_DEVICES_PASSED_NEW_MINUTES_AGO#>', '<#LANG_DEVICES_PASSED_NEW_SECONDS_AGO#>');
} else if(diff > 600 && diff <= 7200) {
beautyText = secondsToHms(diff, '<#LANG_DEVICES_PASSED_NEW_HOURS_AGO#>', '<#LANG_DEVICES_PASSED_NEW_MINUTES_AGO#>', '') + ' <#LANG_DEVICES_PASSED_AGO#>';
$('.openclose-updatedText-JS-' + sID).text(beautyText);

window.intervalUpdateDateOpenclose_%.object_id% = setInterval(function() {
var currentTime = parseInt(new Date().getTime()/1000);
var diff = currentTime-sDATA;

beautyText = secondsToHms(diff, '<#LANG_DEVICES_PASSED_NEW_HOURS_AGO#>', '<#LANG_DEVICES_PASSED_NEW_MINUTES_AGO#>', '') + ' <#LANG_DEVICES_PASSED_AGO#>';
$('.openclose-updatedText-JS-' + sID).text(beautyText);

setInsertData_%.object_id%();
}, 61000);
} else if(diff > 7200 && diff < 25200) {
beautyText = secondsToHms(diff, '<#LANG_DEVICES_PASSED_NEW_HOURS_AGO#>', '', '') + ' <#LANG_DEVICES_PASSED_AGO#>';
$('.openclose-updatedText-JS-' + sID).text(beautyText);

window.intervalUpdateDateOpenclose_%.object_id% = setInterval(function() {
var currentTime = parseInt(new Date().getTime()/1000);
var sID = '%.object_id%';
var sDATA = '%.updated%';
var diff = currentTime-sDATA;

//Считаем и делаем красиво
beautyText = secondsToHms(diff, '<#LANG_DEVICES_PASSED_NEW_HOURS_AGO#>', '<#LANG_DEVICES_PASSED_NEW_MINUTES_AGO#>', '<#LANG_DEVICES_PASSED_NEW_SECONDS_AGO#>');
beautyText = secondsToHms(diff, '<#LANG_DEVICES_PASSED_NEW_HOURS_AGO#>', '', '') + ' <#LANG_DEVICES_PASSED_AGO#>';
$('.openclose-updatedText-JS-' + sID).text(beautyText);
}, 61000);

setInsertData_%.object_id%();
}, 1800000);
} else {
//Дропаем интервал
if(window.intervalUpdateDateOpenclose_%.object_id%) {
window.clearInterval(intervalUpdateDateOpenclose_%.object_id%);
}

a = new Date(sDATA * 1000);
timeConvertVar = timeConvert(sDATA);
currentTime = new Date();

year = a.getFullYear();
month = a.getMonth();
date = a.getDate();
hour = a.getHours();
min = a.getMinutes();
sec = a.getSeconds();

if((currentTime.getDate() - date) == 1) {
beautyText = '<#LANG_DEVICES_PASSED_YESTERDAY_IN#> ' + twoDigits(hour) + ':' + twoDigits(min);
if((currentTime.getDate() - timeConvertVar[0]) == 0) {
beautyText = '<#LANG_DEVICES_PASSED_TODAY_IN#> ' + timeConvertVar[3] + ':' + timeConvertVar[4];
} else if((currentTime.getDate() - timeConvertVar[0]) == 1) {
beautyText = '<#LANG_DEVICES_PASSED_YESTERDAY_IN#> ' + timeConvertVar[3] + ':' + timeConvertVar[4] + ':' + timeConvertVar[5];
} else {
beautyText = twoDigits(date) + '.' + twoDigits(month) + '.' + year + ' ' + twoDigits(hour) + ':' + twoDigits(min);
beautyText = timeConvertVar[0] + '.' + timeConvertVar[1] + '.' + timeConvertVar[2] + ' ' + timeConvertVar[3] + ':' + timeConvertVar[4] + ':' + timeConvertVar[5];
}

$('.openclose-updatedText-JS-' + sID).text(beautyText);
}
}

$(function() {
if(window.intervalUpdateDateOpenclose_%.object_id%) {
window.clearInterval(intervalUpdateDateOpenclose_%.object_id%);
}

setInsertData_%.object_id%();
window.intervalUpdateDateOpenclose_%.object_id% = setInterval(function() {
setInsertData_%.object_id%();
}, 1000);
});

</script>


<div class="device-widget %.alive|"offline;online"%">
<div style='display:%.ncno|"nc=block;no=none"%'><div class="device-icon openclose %.status|"on;off"%"></div></div>
<div style='display:%.ncno|"nc=none;no=block;=none"%'><div class="device-icon openclose %.status|"off;on"%"></div></div>
Expand Down
25 changes: 9 additions & 16 deletions templates/classes/views/SOpenable.html
View file
@@ -1,26 +1,19 @@
<script>
$(function() {
var sID = '%.object_id%';
var sDATA = '%.updated%';
sID = '%.object_id%';
sDATA = '%.updated%';

a = new Date(sDATA * 1000);
timeConvertVar = timeConvert(sDATA);
currentTime = new Date();

year = a.getFullYear();
month = a.getMonth();
date = a.getDate();
hour = a.getHours();
min = a.getMinutes();
sec = a.getSeconds();

if((currentTime.getDate() - date) == 0) {
beautyText = '<#LANG_DEVICES_PASSED_TODAY_IN#> ' + twoDigits(hour) + ':' + twoDigits(min);
} else if((currentTime.getDate() - date) == 1) {
beautyText = '<#LANG_DEVICES_PASSED_YESTERDAY_IN#> ' + twoDigits(hour) + ':' + twoDigits(min);
if((currentTime.getDate() - timeConvertVar[0]) == 0) {
beautyText = '<#LANG_DEVICES_PASSED_TODAY_IN#> ' + timeConvertVar[3] + ':' + timeConvertVar[4];
} else if((currentTime.getDate() - timeConvertVar[0]) == 1) {
beautyText = '<#LANG_DEVICES_PASSED_YESTERDAY_IN#> ' + timeConvertVar[3] + ':' + timeConvertVar[4] + ':' + timeConvertVar[5];
} else {
beautyText = twoDigits(date) + '.' + twoDigits(month) + '.' + year + ' ' + twoDigits(hour) + ':' + twoDigits(min);
beautyText = timeConvertVar[0] + '.' + timeConvertVar[1] + '.' + timeConvertVar[2] + ' ' + timeConvertVar[3] + ':' + timeConvertVar[4] + ':' + timeConvertVar[5];
}

$('.updatedText-JS-' + sID).text(beautyText);
});

Expand Down
25 changes: 9 additions & 16 deletions templates/classes/views/SSmoke.html
View file
@@ -1,26 +1,19 @@
<script>
$(function() {
var sID = '%.object_id%';
var sDATA = '%.updated%';
sID = '%.object_id%';
sDATA = '%.updated%';

a = new Date(sDATA * 1000);
timeConvertVar = timeConvert(sDATA);
currentTime = new Date();

year = a.getFullYear();
month = a.getMonth();
date = a.getDate();
hour = a.getHours();
min = a.getMinutes();
sec = a.getSeconds();

if((currentTime.getDate() - date) == 0) {
beautyText = '<#LANG_DEVICES_PASSED_TODAY_IN#> ' + twoDigits(hour) + ':' + twoDigits(min);
} else if((currentTime.getDate() - date) == 1) {
beautyText = '<#LANG_DEVICES_PASSED_YESTERDAY_IN#> ' + twoDigits(hour) + ':' + twoDigits(min);
if((currentTime.getDate() - timeConvertVar[0]) == 0) {
beautyText = '<#LANG_DEVICES_PASSED_TODAY_IN#> ' + timeConvertVar[3] + ':' + timeConvertVar[4];
} else if((currentTime.getDate() - timeConvertVar[0]) == 1) {
beautyText = '<#LANG_DEVICES_PASSED_YESTERDAY_IN#> ' + timeConvertVar[3] + ':' + timeConvertVar[4] + ':' + timeConvertVar[5];
} else {
beautyText = twoDigits(date) + '.' + twoDigits(month) + '.' + year + ' ' + twoDigits(hour) + ':' + twoDigits(min);
beautyText = timeConvertVar[0] + '.' + timeConvertVar[1] + '.' + timeConvertVar[2] + ' ' + timeConvertVar[3] + ':' + timeConvertVar[4] + ':' + timeConvertVar[5];
}

$('.updatedText-JS-' + sID).text(beautyText);
});

Expand Down

0 comments on commit 64e0fc9

Please sign in to comment.