Public_Tools/wavelog
2
0
Fork 0
mirror of https://github.com/wavelog/wavelog.git synced 2026-03-22 10:24:14 +00:00
Code Issues Packages Projects Releases Wiki Activity

added option for date range

Browse Source
This commit is contained in:
HB9HIL
2024-11-04 01:58:02 +01:00
parent bbf9fbbf4f
commit e91ab001f0
2 changed files with 24 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
application/controllers/Staticmap.php
View File

@@ -33,6 +33,9 @@ class Staticmap extends CI_Controller {
$hide_home = $this->input->get('hide_home', TRUE) == 1 ? true : false;
$contest = $this->input->get('contest', TRUE) ?? 'nContest';
$start_date = $this->input->get('start_date', TRUE) ?? 'noStart'; // Format YYYY-MM-DD
$end_date = $this->input->get('end_date', TRUE) ?? 'noEnd'; // Format YYYY-MM-DD
// if the user defines an Satellite Orbit, we need to set the band to SAT
if ($orbit != 'nOrb') {
$band = 'SAT';
@@ -95,7 +98,7 @@ class Staticmap extends CI_Controller {
$cacheDir = realpath($cachepath . "staticmap_images/");
// create a unique filename for the cache
$filenameRaw = $uid . $logbook_id . $qsocount . $band . $thememode . $continent . $hide_home . ($night_shadow == false ? 0 : 1) . ($pathlines == false ? 0 : 1) . ($cqzones == false ? 0 : 1) . ($ituzones == false ? 0 : 1) . $orbit . $contest;
$filenameRaw = $uid . $logbook_id . $qsocount . $band . $thememode . $continent . $hide_home . ($night_shadow == false ? 0 : 1) . ($pathlines == false ? 0 : 1) . ($cqzones == false ? 0 : 1) . ($ituzones == false ? 0 : 1) . $orbit . $contest . $start_date . $end_date;
$filename = crc32('staticmap_' . $slug) . '_' . substr(md5($filenameRaw), 0, 12) . '.png';
$filepath = $cacheDir . '/' . $filename;
@@ -149,7 +152,16 @@ class Staticmap extends CI_Controller {
}
$centerMap = $this->qra->getCenterLatLng($coordinates);
$qsos = $this->visitor_model->get_qsos($qsocount, $logbooks_locations_array, $band == 'nbf' ? '' : $band, $continent == 'nC' ? '' : $continent, $orbit == 'nOrb' ? '' : $orbit, $contest == 'nContest' ? '' : $contest);
$qsos = $this->visitor_model->get_qsos(
$qsocount,
$logbooks_locations_array,
$band == 'nbf' ? '' : $band,
$continent == 'nC' ? '' : $continent,
$orbit == 'nOrb' ? '' : $orbit,
$contest == 'nContest' ? '' : $contest,
$start_date == 'noStart' ? '' : $start_date,
$end_date == 'noEnd' ? '' : $end_date
);
$image = $this->staticmap_model->render_static_map($qsos, $uid, $centerMap, $coordinates, $filepath, $continent, $thememode, $hide_home, $night_shadow, $pathlines, $cqzones, $ituzones);

11
application/models/Visitor_model.php
View File

@@ -2,7 +2,7 @@
class Visitor_model extends CI_Model {
function get_qsos($num, $StationLocationsArray, $band = '', $continent = '', $orbit = '', $contest = '') {
function get_qsos($num, $StationLocationsArray, $band = '', $continent = '', $orbit = '', $contest = '', $start_date = '', $end_date = '') {
$this->db->select($this->config->item('table_name').'.*, station_profile.*');
$this->db->from($this->config->item('table_name'));
@@ -11,6 +11,15 @@ class Visitor_model extends CI_Model {
$this->db->join('satellite', 'satellite.name = '.$this->config->item('table_name').'.COL_SAT_NAME', 'left');
}
if ($start_date != '') {
$start_date = date('Y-m-d', strtotime($start_date));
$this->db->where($this->config->item('table_name').'.COL_TIME_ON >=', $start_date);
}
if ($end_date != '') {
$end_date = date('Y-m-d', strtotime($end_date));
$this->db->where($this->config->item('table_name').'.COL_TIME_ON <=', $end_date);
}
if ($band != '') {
if ($band == 'SAT') {
$this->db->where($this->config->item('table_name').'.col_prop_mode', 'SAT');