webinterface changes

- add tag resolution
- weather forecast card: enabled modify lat/lon coordinates
This commit is contained in:
Nic Limper
2023-12-30 15:41:22 +01:00
parent 0621dda3cc
commit 424cf2faf6
8 changed files with 59 additions and 32 deletions

Binary file not shown.

View File

@@ -182,7 +182,7 @@
{
"id": 4,
"name": "Current weather",
"desc": "Current weather. Weather data by Open-Meteo.com",
"desc": "Current weather. Weather data by Open-Meteo.com. Parameters Lat, Lon and Time Zone are filled automatically from the entered location. In case of an ambiguous location, you can alter those manually.",
"hwtype": [
0,
1,
@@ -202,18 +202,6 @@
"desc": "Name of the city. This is used to lookup the lat/long data, and to display as the title",
"type": "text"
},
{
"key": "#lat",
"name": "Lat",
"desc": "Latitude (set automatic when generating image)",
"type": "ro"
},
{
"key": "#lon",
"name": "Lon",
"desc": "Longitude (set automatic when generating image)",
"type": "ro"
},
{
"key": "units",
"name": "Units",
@@ -223,13 +211,31 @@
"0": "-Celcius / Beaufort / millimeters",
"1": "Fahrenheit / mph / millimeters"
}
},
{
"key": "#lat",
"name": "Lat",
"desc": "Latitude (set automatic when generating image)",
"type": "text"
},
{
"key": "#lon",
"name": "Lon",
"desc": "Longitude (set automatic when generating image)",
"type": "text"
},
{
"key": "#tz",
"name": "Time zone",
"desc": "Time zone (set automatic when generating image)",
"type": "text"
}
]
},
{
"id": 8,
"name": "Weather forecast",
"desc": "Weather forecast for the next five days. Weather data by Open-Meteo.com",
"desc": "Weather forecast for the next five days. Weather data by Open-Meteo.com. Parameters Lat, Lon and Time Zone are filled automatically from the entered location. In case of an ambiguous location, you can alter those manually.",
"hwtype": [
1,
2,
@@ -247,18 +253,6 @@
"desc": "Name of the city. This is used to lookup the lat/long data, and to display as the title",
"type": "text"
},
{
"key": "#lat",
"name": "Lat",
"desc": "Latitude (set automatic when generating image)",
"type": "ro"
},
{
"key": "#lon",
"name": "Lon",
"desc": "Longitude (set automatic when generating image)",
"type": "ro"
},
{
"key": "units",
"name": "Units",
@@ -268,6 +262,24 @@
"0": "-Celcius / Beaufort / millimeters",
"1": "Fahrenheit / mph / millimeters"
}
},
{
"key": "#lat",
"name": "Lat",
"desc": "Latitude (set automatic when generating image)",
"type": "text"
},
{
"key": "#lon",
"name": "Lon",
"desc": "Longitude (set automatic when generating image)",
"type": "text"
},
{
"key": "#tz",
"name": "Time zone",
"desc": "Time zone (set automatic when generating image)",
"type": "text"
}
]
},

View File

@@ -168,9 +168,10 @@
<div id="taglist" class="taglist">
<div class="tagcard" id="tagtemplate">
<div class="currimg"><canvas class="tagimg"></div>
<div class="mac"></div>
<div class="alias"></div>
<div class="mac"></div>
<div class="model"></div>
<div class="resolution"></div>
<div class="received"></div>
<div class="contentmode"></div>
<div class="lastseen"></div>

View File

@@ -510,8 +510,8 @@ select {
width: 225px;
position: relative;
min-height: 170px;
margin: 5px;
padding: 5px;
margin: 3px;
padding: 4px 5px 5px 8px;
background-color: #ffffff;
border: 1px solid #cccccc;
transition: box-shadow 0.3s ease;
@@ -537,7 +537,7 @@ select {
background-color: #6d6e6e;
color: white;
padding: 5px;
margin: 0px 5px;
margin: 0px 3px;
}
.currimg {
@@ -552,7 +552,12 @@ select {
.mac {
font-size: 0.9em;
cursor: pointer;
line-height: 1.25;
}
.model {
font-size: 0.9em;
line-height: 1.25;
}
.alias {
@@ -561,12 +566,19 @@ select {
white-space: nowrap;
overflow: hidden;
text-overflow: ellipsis;
padding-bottom: 4px;
}
.resolution {
font-size: 0.9em;
line-height: 1.25;
}
.received {
display: flex;
font-size: .85em;
font-size: .9em;
padding-bottom: 5px;
line-height: 1.25;
}
.received div {

View File

@@ -232,6 +232,7 @@ function processTags(tagArray) {
const localTagmac = tagmac;
const data = await getTagtype(element.hwType);
$('#tag' + localTagmac + ' .model').innerHTML = data.name;
$('#tag' + localTagmac + ' .resolution').innerHTML = data.width + "x" + data.height;
})();
let statusline = "";
if (element.RSSI != 100) {
@@ -253,6 +254,7 @@ function processTags(tagArray) {
} else {
$('#tag' + tagmac + ' .model').innerHTML = "waiting for hardware type";
$('#tag' + tagmac + ' .received').style.opacity = "0";
$('#tag' + tagmac + ' .resolution').innerHTML = "";
}
if (!apConfig.preview || element.contentMode == 20) {