mbirth/php-owntracks-recorder
Archived
1
0
Fork 0
Code Issues 1 Pull Requests Activity

Cleanup. Get dateFrom/dateTo from URL via JavaScript.

Browse Source
This commit is contained in:
Markus Birth
2018-04-25 23:00:50 +02:00
parent 4a6fddfa78
commit 580ded6a7c
3 changed files with 29 additions and 45 deletions
Download Patch File Download Diff File Expand all files Collapse all files

63
assets/index.js
View File

@ -137,11 +137,21 @@ function handlePopState(event){
return gotoDate(event.state.dateFrom, event.state.dateTo, false);
}
function initUI(dateFromStr, dateToStr, accuracy, trackerID, language) {
function initUI(accuracy, trackerID, language) {
console.log("initUI : INIT");
dateFrom = moment(dateFromStr);
dateTo = moment(dateToStr);
var _GET = new URLSearchParams(window.location.search);
dateFrom = moment();
dateTo = moment();
if (_GET.has('dateFrom')) {
dateFrom = moment(_GET.get('dateFrom'));
}
if (_GET.has('dateTo')) {
dateTo = moment(_GET.get('dateTo'));
}
$('#dateFrom').val(dateFrom.format('YYYY-MM-DD'));
$('#dateTo').val(dateTo.format('YYYY-MM-DD'));
//date params event handlers
updateDateNav();
@ -164,7 +174,6 @@ function initUI(dateFromStr, dateToStr, accuracy, trackerID, language) {
gotoAccuracy();
});
$('#trackerID_selector').change(function(){
changeTrackerID();
});
@ -187,35 +196,15 @@ function initMap()
show_markers = Cookies.get('show_markers');
console.log("initMap : INFO show_markers = " + show_markers);
marker_start_icons[0] = L.AwesomeMarkers.icon({icon: 'play', markerColor: 'blue', iconColor: 'green' });
marker_start_icons[1] = L.AwesomeMarkers.icon({icon: 'play', markerColor: 'red', iconColor: 'green' });
marker_start_icons[2] = L.AwesomeMarkers.icon({icon: 'play', markerColor: 'orange', iconColor: 'green' });
marker_start_icons[3] = L.AwesomeMarkers.icon({icon: 'play', markerColor: 'green', iconColor: 'darkgreen' });
marker_start_icons[4] = L.AwesomeMarkers.icon({icon: 'play', markerColor: 'purple', iconColor: 'green' });
marker_start_icons[5] = L.AwesomeMarkers.icon({icon: 'play', markerColor: 'cadetblue', iconColor: 'green' });
marker_start_icons[6] = L.AwesomeMarkers.icon({icon: 'play', markerColor: 'darkred', iconColor: 'green' });
marker_start_icons[7] = L.AwesomeMarkers.icon({icon: 'play', markerColor: 'darkgreen', iconColor: 'green' });
marker_start_icons[8] = L.AwesomeMarkers.icon({icon: 'play', markerColor: 'darkpuple', iconColor: 'green' });
marker_finish_icons[0] = L.AwesomeMarkers.icon({icon: 'stop', markerColor: 'blue', iconColor: 'red' });
marker_finish_icons[1] = L.AwesomeMarkers.icon({icon: 'stop', markerColor: 'red', iconColor: 'darkred' });
marker_finish_icons[2] = L.AwesomeMarkers.icon({icon: 'stop', markerColor: 'orange', iconColor: 'red' });
marker_finish_icons[3] = L.AwesomeMarkers.icon({icon: 'stop', markerColor: 'green', iconColor: 'red' });
marker_finish_icons[4] = L.AwesomeMarkers.icon({icon: 'stop', markerColor: 'purple', iconColor: 'red' });
marker_finish_icons[5] = L.AwesomeMarkers.icon({icon: 'stop', markerColor: 'cadetblue', iconColor: 'red' });
marker_finish_icons[6] = L.AwesomeMarkers.icon({icon: 'stop', markerColor: 'darkred', iconColor: 'red' });
marker_finish_icons[7] = L.AwesomeMarkers.icon({icon: 'stop', markerColor: 'darkgreen', iconColor: 'red' });
marker_finish_icons[8] = L.AwesomeMarkers.icon({icon: 'stop', markerColor: 'darkpuple', iconColor: 'red' });
marker_icons[0] = L.AwesomeMarkers.icon({icon: 'user', markerColor: 'blue' });
marker_icons[1] = L.AwesomeMarkers.icon({icon: 'user', markerColor: 'red' });
marker_icons[2] = L.AwesomeMarkers.icon({icon: 'user', markerColor: 'orange' });
marker_icons[3] = L.AwesomeMarkers.icon({icon: 'user', markerColor: 'green' });
marker_icons[4] = L.AwesomeMarkers.icon({icon: 'user', markerColor: 'purple' });
marker_icons[5] = L.AwesomeMarkers.icon({icon: 'user', markerColor: 'cadetblue' });
marker_icons[6] = L.AwesomeMarkers.icon({icon: 'user', markerColor: 'darkred' });
marker_icons[7] = L.AwesomeMarkers.icon({icon: 'user', markerColor: 'darkgreen' });
marker_icons[8] = L.AwesomeMarkers.icon({icon: 'user', markerColor: 'darkpuple' });
var colours = ['blue', 'red', 'orange', 'green', 'purple', 'cadetblue', 'darkred', 'darkgreen', 'darkpurple'];
for (var i=0; i<=colours.length; i++) {
var fg = colours[i];
var bg1 = (fg=='green')?'darkgreen':'green';
var bg2 = (fg=='red')?'darkgred':'red';
marker_start_icons[i] = L.AwesomeMarkers.icon({icon: 'play', markerColor: fg, iconColor: bg1 });
marker_finish_icons[i] = L.AwesomeMarkers.icon({icon: 'stop', markerColor: fg, iconColor: bg2 });
marker_icons[i] = L.AwesomeMarkers.icon({icon: 'user', markerColor: fg });
}
//set checkbox
if (show_markers == '1') {
@ -252,7 +241,7 @@ function getMarkers()
{
console.log("getMarkers : INIT");
//ajax call to get list of markers
$.ajax({
$.ajax({
url: 'rpc.php',
data: {
'dateFrom': dateFrom.format('YYYY-MM-DD'),
@ -266,14 +255,14 @@ function getMarkers()
dataType: 'json',
beforeSend: function(xhr)
{
$('#mapid').css('filter','blur(5px)');
$('#mapid').css('filter', 'blur(5px)');
},
success: function(data, status)
{
if (data.status) {
jsonMarkers = JSON.parse(data.markers);
jsonMarkers = data.markers;
updateTrackerIDs(jsonMarkers);
if (drawMap(jsonMarkers)) { $('#mapid').css('filter','blur(0px)'); }
if (drawMap(jsonMarkers)) { $('#mapid').css('filter', 'blur(0px)'); }
} else {
console.log("getMarkers : ERROR Status : " + status);
console.log("getMarkers : ERROR Data : ");

5
index.php
View File

@ -3,9 +3,6 @@
require_once 'config.inc.php';
require_once 'vendor/autoload.php';
$dateFrom = isset($_GET['dateFrom']) ? $_GET['dateFrom'] : date('Y-m-d');
$dateTo = isset($_GET['dateTo']) ? $_GET['dateTo'] : date('Y-m-d');
if (isset($_GET['accuracy']) && $_GET['accuracy'] != '' && intval($_GET['accuracy']) > 0) {
$accuracy = intval($_GET['accuracy']);
} elseif (isset($_COOKIE['accuracy']) && $_COOKIE['accuracy'] != '' && intval($_COOKIE['accuracy']) > 0) {
@ -31,8 +28,6 @@ $mustache = new \Mustache_Engine(array(
$vars = array(
'default_tracker_id' => $_config['default_trackerID'],
'date_from' => $dateFrom,
'date_to' => $dateTo,
'accuracy' => $accuracy,
'tracker_id' => $trackerID,
'datepicker_language' => $_config['datepicker-language'],

6
templates/index.mustache
View File

@ -23,9 +23,9 @@
</div>
<div class="col-xs-5 text-center">
<div class="input-group input-daterange">
<input type="text" class="form-control" value="{{date_from}}" id="dateFrom"/>
<input type="text" class="form-control" value="" id="dateFrom"/>
<span class="input-group-addon">to</span>
<input type="text" class="form-control" value="{{date_to}}" id="dateTo"/>
<input type="text" class="form-control" value="" id="dateTo"/>
</div>
</div>
<div class="col-xs-6 text-right">
@ -97,7 +97,7 @@
$(document).ready(function() {
var default_trackerID = '{{default_tracker_id}}';
initUI('{{date_from}}', '{{date_to}}', {{accuracy}}, '{{tracker_id}}', '{{datepicker_language}}');
initUI({{accuracy}}, '{{tracker_id}}', '{{datepicker_language}}');
initMap();
});
</script>