allerta-vvf
/
allerta-vvf
mirror of https://github.com/allerta-vvf/allerta-vvf
1
0
Fork 0
Code Issues Releases Wiki Activity

fix

This commit is contained in:
Matteo Gheza 2021-04-23 19:27:09 +02:00
parent d54196f1aa
commit ce88c54760
11 changed files with 15 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
server/resources/src/maps.js
View File

@ -189,7 +189,7 @@ export function addrSearch (stringResultsFound= undefined, stringResultsNotFound
const items = [];
$.each(data, function (key, val) {
items.push("<li><a href='' onclick='allertaJS.chooseAddr(\"" + val.lat + "\", \"" + val.lon + "\", undefined, " + val.boundingbox[0] + ", " + val.boundingbox[2] + ", " + val.boundingbox[1] + ", " + val.boundingbox[3] + ", \"" + val.osm_type + "\"); return false;'>" + val.display_name + "</a></li>");
items.push("<li><a href='' onclick='allertaJS.maps.chooseAddr(\"" + val.lat + "\", \"" + val.lon + "\", undefined, " + val.boundingbox[0] + ", " + val.boundingbox[2] + ", " + val.boundingbox[1] + ", " + val.boundingbox[3] + ", \"" + val.osm_type + "\"); return false;'>" + val.display_name + "</a></li>");
});
if (items.length !== 0) {

2
server/resources/src/table_engine_datatables.js
View File

@ -27,7 +27,7 @@ export default async function fillTable ({ data, replaceLatLngWithMap = false, c
mapDiv.className = "map";
mapDiv.id = "map-" + rowNum;
const mapScript = document.createElement("script");
mapScript.appendChild(document.createTextNode("allertaJS.loadMap(" + lat + ", " + lng + ", \"map-" + rowNum + "\", false)"));
mapScript.appendChild(document.createTextNode("allertaJS.maps.loadMap(" + lat + ", " + lng + ", \"map-" + rowNum + "\", false)"));
mapDiv.appendChild(mapScript);
const cell = document.createElement("td");
cell.appendChild(mapDiv);

2
server/resources/src/table_engine_default.js
View File

@ -12,7 +12,7 @@ export default async function fillTable ({ data, replaceLatLngWithMap = false, c
mapDiv.className = "map";
mapDiv.id = "map-" + rowNum;
const mapScript = document.createElement("script");
mapScript.appendChild(document.createTextNode("allertaJS.loadMap(" + lat + ", " + lng + ", \"map-" + rowNum + "\", false)"));
mapScript.appendChild(document.createTextNode("allertaJS.maps.loadMap(" + lat + ", " + lng + ", \"map-" + rowNum + "\", false)"));
mapDiv.appendChild(mapScript);
const cell = document.createElement("td");
cell.appendChild(mapDiv);

2
server/resources/webpack.common.js
View File

@ -19,7 +19,7 @@ module.exports = {
path: path.resolve(__dirname, "dist"),
publicPath: "resources/dist/",
chunkFilename: "[name].bundle.js?h=[chunkhash]",
library: "allertaJS"
library: ["allertaJS", "[name]"]
},
resolve: {
alias: {

4
server/templates/edit_service.html
View File

@ -82,12 +82,12 @@
<div id="map"></div>
<div id="search">
<input type="text" name="addr" value="" id="addr" size="10" />
<button type="button" onclick="allertaJS.addrSearch('{{ 'Search results'|t }}', '{{ 'No results found'|t }}');"
<button type="button" onclick="allertaJS.maps.addrSearch('{{ 'Search results'|t }}', '{{ 'No results found'|t }}');"
class="btn btn-primary">{{ 'Search'|t }}</button>
<div id="results"></div>
</div>
<input type="hidden" name="place" value="" />
<script src="{{ urlsoftware }}/resources/dist/{{ resource('maps.js') }}" onload="allertaJS.loadMap();"></script>
<script src="{{ urlsoftware }}/resources/dist/{{ resource('maps.js') }}" onload="allertaJS.maps.loadMap();"></script>
{% else %}
<label><b>{{ 'Service place'|t }}</b></label>
<input type="text" name="place" required value="{{ values.place }}">

4
server/templates/edit_training.html
View File

@ -67,12 +67,12 @@
<div id="map"></div>
<div id="search">
<input type="text" name="addr" value="" id="addr" size="10" />
<button type="button" onclick="allertaJS.addrSearch('{{ 'Search results'|t }}', '{{ 'No results found'|t }}');"
<button type="button" onclick="allertaJS.maps.addrSearch('{{ 'Search results'|t }}', '{{ 'No results found'|t }}');"
class="btn btn-primary">{{ 'Search'|t }}</button>
<div id="results"></div>
</div>
<input type="hidden" name="place" value="" />
<script src="{{ urlsoftware }}/resources/dist/{{ resource('maps.js') }}" onload="allertaJS.loadMap();"></script>
<script src="{{ urlsoftware }}/resources/dist/{{ resource('maps.js') }}" onload="allertaJS.maps.loadMap();"></script>
{% else %}
<label><b>{{ 'Training place'|t }}</b></label>
<input type="text" name="place" required value="{{ values.place }}">

6
server/templates/list.html
View File

@ -67,7 +67,7 @@
},
success: function (data) {
toastr.success(`{{ 'Thanks, %s, you have given %s in case of alert.'|t|format(user.name, '${generate_alert_string(id)}') }}`);
allertaJS.loadTable({tablePage: "list", useCustomTableEngine: "default"});
allertaJS.main.loadTable({tablePage: "list", useCustomTableEngine: "default"});
}
});
}
@ -83,7 +83,7 @@
},
success: function (data) {
toastr.success(`{{ 'Thanks, %s, you have removed %s in case of alert.'|t|format(user.name, '${generate_alert_string(id)}') }}`);
allertaJS.loadTable({tablePage: "list", useCustomTableEngine: "default"});
allertaJS.main.loadTable({tablePage: "list", useCustomTableEngine: "default"});
}
});
}
@ -112,7 +112,7 @@
</tbody>
</table>
<script>
allertaJS.loadTable({tablePage: "list", useCustomTableEngine: "default"});
allertaJS.main.loadTable({tablePage: "list", useCustomTableEngine: "default"});
</script>
</div>

2
server/templates/log.html
View File

@ -19,7 +19,7 @@
</tbody>
</table>
<script>
allertaJS.loadTable({tablePage: "log", setInterval: false, callback: function(tableDt) {
allertaJS.main.loadTable({tablePage: "log", setInterval: false, callback: function(tableDt) {
tableDt
.column( '3:visible' )
.order( 'desc' )

2
server/templates/offline.html
View File

@ -26,7 +26,7 @@
</tbody>
</table>
<script>
allertaJS.loadTable("list", true, 20000, true);
allertaJS.main.loadTable("list", true, 20000, true);
</script>
</div>
<br>

2
server/templates/services.html
View File

@ -36,7 +36,7 @@
</tbody>
</table>
<script>
allertaJS.loadTable({tablePage: "services", interval: 120000});
allertaJS.main.loadTable({tablePage: "services", interval: 120000});
</script>
</div>
<br>

2
server/templates/trainings.html
View File

@ -34,7 +34,7 @@
</tbody>
</table>
<script>
allertaJS.loadTable({tablePage: "trainings", interval: 120000});
allertaJS.main.loadTable({tablePage: "trainings", interval: 120000});
</script>
</div>
<br>