изсенил чтение настроек

This commit is contained in:
2025-01-13 02:37:29 +05:00
parent cd93ec684a
commit ca19cbb261
13 changed files with 151 additions and 455 deletions

View File

@ -189,6 +189,10 @@ var g_user=null;
//var m_FrmLocustDel=null;
var g_FrmCheckpoints=null;
var g_WeaLegend=null; //Legends
var g_AirLegend=null;
var g_PreLegend=null;
var g_HTCLegend=null;
//Decode URL parameters.
var GET = {};
@ -376,7 +380,7 @@ function onLoadPage()
<option value="11">Armenian Հայերեն</option>
<option value="5">Georgian ქართული </option>
<option value="6">Kyrgyz Кыргыз</option>
<option value="2">kk (test)</option>
<option value="2">Kazakh Қазақ</option>
<option value="10">Dari دری</option>
<option value="7">Tajik Тоҷикӣ</option>
<option value="8">Turkman Türkmen</option>
@ -403,14 +407,12 @@ function onLoadPage()
<div style="position: relative; padding-bottom:10px;">
<b style="text-align:left; font-weight:bold;" th:text="${Substrate}"></b>
<table border="0" style="width: 100%;"><tr><td style="padding: 2px;">
<select id="SubstrateID" style="width:100%;" onchange="changeMap();">
<option value="OpenStreetMap">OpenStreetMap</option>
<option value="BingAerial">Bing aerial</option>
<!--option value="yandex">Yandex maps</option-->
<option value="StamenTerrain">Thunderforest Landscape</option>
<span th:text="${Substrate_head}">Substrate_head</span>
</select>
</td><td style="padding: 2px; width: 30px;">
<button class="main" style="width:30px;" onclick="openLayoutsWin();">...</button><br>
@ -438,7 +440,7 @@ function onLoadPage()
</tr>
<tr>
<td style="padding: 1px; white-space: nowrap;" th:text="${Method_filling_form}">Method_filling_form</td>
<td style="padding: 1px; width: 100%;"><select style="width: 100%;" id="filter_X1_device_id"><option value=""><span th:text="${From_PDA}">From_PDA</span> & <span th:text="${From_WEB_interface}">From_WEB_interface</span></option><option value="1" th:text="${From_PDA}">From_PDA</option><option value="0" th:text="${From_WEB_interface}">From_WEB_interface</option><option value="2" th:text="${Test_questionnaires}">Test_questionnaires</option></select></td>
<td style="padding: 1px; width: 100%;"><select style="width: 100%;" id="filter_X1_device_id"><option value="" th:text="${From_PDA} + ' & ' + ${From_WEB_interface}">From_PDA & From_WEB_interface</option><option value="1" th:text="${From_PDA}">From_PDA</option><option value="0" th:text="${From_WEB_interface}">From_WEB_interface</option><option value="2" th:text="${Test_questionnaires}">Test_questionnaires</option></select></td>
</tr>
<tr>
<td style="padding: 1px; white-space: nowrap;" th:text="${PDA_registered}">PDA_registered</td>
@ -574,7 +576,7 @@ if(field!=null)
</tr>
<tr>
<td style="padding: 1px; white-space: nowrap;" th:text="${Method_filling_form}">Method_filling_form</td>
<td style="padding: 1px; width: 100%;"><select style="width: 100%;" id="filter_X2_device_id"><option value=""><span th:text="${From_PDA}">From_PDA</span> & <span th:text="${From_WEB_interface}">From_WEB_interface</span></option><option value="1" th:text="${From_PDA}">From_PDA</option><option value="0" th:text="${From_WEB_interface}">From_WEB_interface</option><option value="2" th:text="${Test_questionnaires}">Test_questionnaires</option></select></td>
<td style="padding: 1px; width: 100%;"><select style="width: 100%;" id="filter_X2_device_id"><option value="" th:text="${From_PDA} + ' & ' + ${From_WEB_interface}">From_PDA & From_WEB_interface</option><option value="1" th:text="${From_PDA}">From_PDA</option><option value="0" th:text="${From_WEB_interface}">From_WEB_interface</option><option value="2" th:text="${Test_questionnaires}">Test_questionnaires</option></select></td>
</tr>
<tr>
<td style="padding: 1px; white-space: nowrap;" th:text="${PDA_registered}">PDA_registered</td>
@ -1164,15 +1166,16 @@ new Calendar({
<tr>
<td style="padding: 1px; width: 158px; white-space: nowrap;" th:text="${Year}">Year</td>
<td style="padding: 1px;">
<select style="width: 100%;" id="filter_ivi_year">
<option value="2023_03_05">2023 (<span th:text="${month}">month<span> 03..05)</option>
<option value="2023_02_04">2023 (<span th:text="${month}">month<span> 02..04)</option>
<select style="width: 100%;" id="filter_ivi_year">
<option value="2023_03_05">2023 (03..05)</option>
<option value="2023_02_04">2023 (02..04)</option>
<option value="2022_02_04">2022 (<span th:text="${month}">month<span> 02..04)</option>
<option value="2022_03_05">2022 (<span th:text="${month}">month<span> 03..05)</option>
<option value="2022_04_06">2022 (<span th:text="${month}">month<span> 04..06)</option>
<option value="2022_05_07">2022 (<span th:text="${month}">month<span> 05..07)</option>
<option value="2022_02_04">2022 (02..04)</option>
<option value="2022_03_05">2022 (03..05)</option>
<option value="2022_04_06">2022 (04..06)</option>
<option value="2022_05_07">2022 (05..07)</option>
</select>
</td>
</tr>
<tr>
@ -1825,6 +1828,16 @@ map.on('singleclick', function(evt){ //map.on('click', function(evt){
//$(element).popover('destroy');
//popup.setPosition(coordinate);
//$(popup.getElement()).show();
{
let center = ol.proj.transform(coordinate, 'EPSG:3857', 'EPSG:4326')
if (g_WeaLegend!=null && g_WeaLegend.visible) alert("g_WeaLegend");
if (g_AirLegend!=null && g_AirLegend.visible) alert("g_AirLegend");
if (g_PreLegend!=null && g_PreLegend.visible) alert("g_PreLegend");
//alert("lat = "+center[1]+" lon = "+center[0])
}
if(g_FrmCheckpoints!=null){
let center = ol.proj.transform(coordinate, 'EPSG:3857', 'EPSG:4326')