mirror
/
radiosonde_auto_rx
kopia lustrzana https://github.com/projecthorus/radiosonde_auto_rx
1
0
Forkuj 0
Kod Zgłoszenia Projekty Wydania Wiki Aktywność

Use system locale settings for web interface date/time presentation if UTC is not selected.

pull/721/head
Mark Jessop 2022-11-20 10:18:40 +10:30
rodzic 4680106d05
commit 70420017aa
2 zmienionych plików z 12 dodań i 8 usunięć
Pokaż statystyki Ściągnij plik aktualizacji Ściągnij plik porównania Expand all files Collapse all files

5
auto_rx/autorx/templates/historical.html
Wyświetl plik

@ -100,10 +100,11 @@
{title:"Date", field:"datetime", width:160, resizable:false, formatter:function(cell, formatterParams, onRendered){
if (getCookie('UTC') == 'false') {
var temp_time = new Date(cell.getValue());
if (temp_time.toLocaleString("en-AU") == "Invalid Date") {
var temp_converted = temp_time.toLocaleString(window.navigator.language,{hourCycle:'h23', year:"numeric", month:"2-digit", day:'2-digit', hour:'2-digit',minute:'2-digit', second:'2-digit'});
if (temp_converted == "Invalid Date") {
return;
} else {
return temp_time.toLocaleString("en-AU");
return temp_converted;
}
} else {
return cell.getValue();

15
auto_rx/autorx/templates/index.html
Wyświetl plik

@ -105,11 +105,12 @@
// Check if time is UTC mode.
if (getCookie('UTC') == 'false') {
// Check if entry is important.
var log_time_converted = log_time.toLocaleString(window.navigator.language,{hourCycle:'h23', year:"numeric", month:"2-digit", day:'2-digit', hour:'2-digit',minute:'2-digit', second:'2-digit'});
if (msg.level == "INFO") {
var log_entry = "<tr><td>" + log_time.toLocaleString("en-AU") + " – " + msg.level + "<br><em style='font-size: 15px;'>" + msg.msg + "</em></td></tr>";
var log_entry = "<tr><td>" + log_time_converted + " – " + msg.level + "<br><em style='font-size: 15px;'>" + msg.msg + "</em></td></tr>";
} else {
// If entry is important colour text red.
var log_entry = "<tr><td>" + log_time.toLocaleString("en-AU") + " – " + msg.level + "<br><em style='font-size: 15px; color:red;'>" + msg.msg + "</em></td></tr>"
var log_entry = "<tr><td>" + log_time_converted + " – " + msg.level + "<br><em style='font-size: 15px; color:red;'>" + msg.msg + "</em></td></tr>"
if (msg.level == "ERROR" || msg.level == "CRITICAL") {
if (document.getElementById("mySidenav").offsetWidth == 0) {
$('#log-tray').css('color', 'red');
@ -168,7 +169,8 @@
temp_date = temp_date.slice(0, -3);
temp_date += "Z";
var date = new Date(temp_date);
$('#scan_results').html('<b>Latest Scan:</b> ' + date.toLocaleString("en-AU"));
var date_converted = date.toLocaleString(window.navigator.language,{hourCycle:'h23', year:"numeric", month:"2-digit", day:'2-digit', hour:'2-digit',minute:'2-digit', second:'2-digit'});
$('#scan_results').html('<b>Latest Scan:</b> ' + date_converted);
} else {
$('#scan_results').html('<b>Latest Scan:</b> ' + (data.timestamp.slice(0, -3) + 'Z').replace("T", " ").replace("Z", "").slice(0, -4) + ' UTC');
}
@ -501,11 +503,12 @@
{title:"Time", field:"datetime", width:180, headerSort:true, formatter:function(cell, formatterParams, onRendered){
if (getCookie('UTC') == 'false') {
var temp_time = new Date(cell.getValue());
if (temp_time.toLocaleString("en-AU") == "Invalid Date") {
var temp_converted = temp_time.toLocaleString(window.navigator.language,{hourCycle:'h23', year:"numeric", month:"2-digit", day:'2-digit', hour:'2-digit',minute:'2-digit', second:'2-digit'});
if (temp_converted == "Invalid Date") {
return;
} else {
return temp_time.toLocaleString("en-AU");
}
return temp_converted;
}
} else {
return cell.getValue();
}