Skip to content

Commit 3a0cbc5

Browse files
AndreasK79AndreasK79
committed
Merge branch 'dxcc_orbit' of https://github.com/AndreasK79/wavelog into dxcc_orbit
2 parents 00ee440 + 730c1a3 commit 3a0cbc5

File tree

7 files changed

+83
-24
lines changed

7 files changed

+83
-24
lines changed

‎application/controllers/Visitor.php‎

Lines changed: 30 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -14,9 +14,6 @@ function _remap($method) {
1414
elseif($method == "map") {
1515
$this->map($method);
1616
}
17-
elseif($method == "radio_display_component") {
18-
$this->radio_display_component($method);
19-
}
2017
elseif($method == "satellites") {
2118
$this->satellites($method);
2219
}
@@ -81,8 +78,6 @@ public function index($public_slug = NULL)
8178

8279
$this->load->model('cat');
8380

84-
$data['radio_status'] = $this->cat->recent_status();
85-
8681
// Store info
8782
$data['todays_qsos'] = $this->logbook_model->todays_qsos($logbooks_locations_array);
8883
$data['total_qsos'] = $this->logbook_model->total_qsos($logbooks_locations_array);
@@ -133,13 +128,6 @@ public function index($public_slug = NULL)
133128
}
134129
}
135130

136-
public function radio_display_component() {
137-
$this->load->model('cat');
138-
139-
$data['radio_status'] = $this->cat->recent_status();
140-
$this->load->view('components/radio_display_table', $data);
141-
}
142-
143131
public function map() {
144132
$this->load->model('logbook_model');
145133

@@ -421,6 +409,16 @@ public function search() {
421409

422410
public function exportmap() {
423411
$slug = $this->security->xss_clean($this->uri->segment(3));
412+
$lastqso = $this->security->xss_clean($this->uri->segment(4));
413+
414+
if ($lastqso === "lastqso") {
415+
$this->load->model('visitor_model');
416+
$result = $this->visitor_model->getlastqsodate($slug)->row();
417+
header('Content-Type: application/json');
418+
echo json_encode($result);
419+
return;
420+
}
421+
424422
$data['slug'] = $slug;
425423

426424
$data['page_title'] = "Export Map";
@@ -430,7 +428,7 @@ public function exportmap() {
430428
}
431429

432430
public function mapqsos() {
433-
$this->load->model('logbook_model');
431+
$this->load->model('visitor_model');
434432

435433
$this->load->library('qra');
436434

@@ -453,7 +451,7 @@ public function mapqsos() {
453451
show_404('Unknown Public Page.');
454452
}
455453

456-
$qsos = $this->logbook_model->get_qsos($qsocount, null, $logbooks_locations_array, $band);
454+
$qsos = $this->visitor_model->get_qsos($qsocount, $logbooks_locations_array, $band);
457455
$userid = $this->stationsetup_model->public_slug_exists_userid($slug);
458456
$user_default_confirmation = $this->get_user_default_confirmation($userid);
459457

@@ -519,12 +517,28 @@ public function get_map_custom() {
519517

520518
$this->load->model('user_options_model');
521519

522-
$result=$this->user_options_model->get_options('map_custom', null, $userid);
523-
$jsonout=[];
520+
$result = $this->user_options_model->get_options('map_custom', null, $userid);
521+
$jsonout = [];
524522
foreach($result->result() as $options) {
525523
if ($options->option_name=='icon') $jsonout[$options->option_key]=json_decode($options->option_value,true);
526524
else $jsonout[$options->option_name.'_'.$options->option_key]=$options->option_value;
527525
}
526+
527+
if (count($jsonout) == 0) {
528+
$jsonout['qso'] = array(
529+
"icon" => "fas fa-dot-circle",
530+
"color" => "#ff0000"
531+
);
532+
$jsonout['qsoconfirm'] = array(
533+
"icon" => "fas fa-dot-circle",
534+
"color" => "#00aa00"
535+
);
536+
$jsonout['station'] = array(
537+
"icon" => "fas fa-broadcast-tower",
538+
"color" => "#0000ff"
539+
);
540+
}
541+
528542
$jsonout['gridsquare_layer'] = $this->user_options_model->get_options('ExportMapOptions',array('option_name'=>'gridsquare_layer','option_key'=>$slug), $userid)->row()->option_value ?? true;
529543
$jsonout['path_lines'] = $this->user_options_model->get_options('ExportMapOptions',array('option_name'=>'path_lines','option_key'=>$slug), $userid)->row()->option_value ?? true;
530544
$jsonout['cqzone_layer'] = $this->user_options_model->get_options('ExportMapOptions',array('option_name'=>'cqzone_layer','option_key'=>$slug), $userid)->row()->option_value ?? true;

‎application/models/Visitor_model.php‎

Lines changed: 48 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,48 @@
1+
<?php
2+
3+
class Visitor_model extends CI_Model {
4+
5+
function get_qsos($num, $StationLocationsArray, $band = '') {
6+
$this->db->select($this->config->item('table_name').'.*, station_profile.*');
7+
$this->db->from($this->config->item('table_name'));
8+
9+
$this->db->join('station_profile', 'station_profile.station_id = '.$this->config->item('table_name').'.station_id');
10+
11+
if ($band != '') {
12+
if ($band == 'SAT') {
13+
$this->db->where($this->config->item('table_name').'.col_prop_mode', 'SAT');
14+
} else {
15+
$this->db->where($this->config->item('table_name').'.col_prop_mode !="SAT"');
16+
$this->db->where($this->config->item('table_name').'.col_band', $band);
17+
}
18+
}
19+
20+
$this->db->where_in($this->config->item('table_name').'.station_id', $StationLocationsArray);
21+
$this->db->order_by(''.$this->config->item('table_name').'.COL_TIME_ON', "desc");
22+
23+
$this->db->limit($num);
24+
25+
return $this->db->get();
26+
}
27+
28+
function getlastqsodate ($slug) {
29+
$this->load->model('stationsetup_model');
30+
$logbook_id = $this->stationsetup_model->public_slug_exists_logbook_id($slug);
31+
$userid = $this->stationsetup_model->public_slug_exists_userid($slug);
32+
$band = $this->user_options_model->get_options('ExportMapOptions',array('option_name'=>'band','option_key'=>$slug), $userid)->row()->option_value ?? '';
33+
34+
$sql = "select max(col_time_on) lastqso from " . $this->config->item('table_name') .
35+
" join station_profile on station_profile.station_id = " . $this->config->item('table_name') . ".station_id where 1 = 1";
36+
37+
if ($band != '') {
38+
if ($band == 'SAT') {
39+
$sql .= " and " . $this->config->item('table_name') . ".col_prop_mode = 'SAT'";
40+
} else {
41+
$sql .= " and " . $this->config->item('table_name') . ".col_prop_mode != 'SAT'";
42+
$sql .= " and " . $this->config->item('table_name') . ".col_band = '". $band . "'";
43+
}
44+
}
45+
46+
return $this->db->query($sql);
47+
}
48+
}

‎application/views/dashboard/index.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -191,7 +191,7 @@ function echo_table_col($row, $name) {
191191
<div class="table-responsive">
192192

193193

194-
<div id="radio_display" hx-get="<?php echo site_url('visitor/radio_display_component'); ?>" hx-trigger="load, every 5s"></div>
194+
<div id="radio_display" hx-get="<?php echo site_url('dashboard/radio_display_component'); ?>" hx-trigger="load, every 5s"></div>
195195

196196
<table class="table table-striped border-top">
197197
<tr class="titles">

‎application/views/visitor/index.php‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -115,8 +115,6 @@ function echo_table_col($row, $name) {
115115
<div class="col-sm-4">
116116
<div class="table-responsive">
117117

118-
<div id="radio_display" hx-get="<?php echo site_url('visitor/radio_display_component'); ?>" hx-trigger="load, every 5s"></div>
119-
120118

121119
<table class="table table-striped">
122120
<tr class="titles">

‎application/views/visitor/layout/footer.php‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@
88
<script type="text/javascript" src="<?php echo base_url() ;?>assets/js/darkmodehelpers.js"></script>
99
<script src="<?php echo base_url(); ?>assets/js/bootstrapdialog/js/bootstrap-dialog.min.js"></script>
1010
<script type="text/javascript" src="<?php echo base_url() ;?>assets/js/easyprint.js"></script>
11-
<script src="<?php echo base_url(); ?>assets/js/htmx.min.js"></script>
1211

1312
<script type="text/javascript">
1413
/*

‎application/views/visitor/layout/header.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -78,7 +78,7 @@
7878
<ul class="navbar-nav ms-auto">
7979
<?php if($this->optionslib->get_option('public_github_button') != "false") { ?> <!-- != false causes to set it on per default -->
8080
<li class="nav-item">
81-
<a class="btn btn-secondary" href="https://github.com/wavelog/wavelog">Visit Wavelog on Github</a>
81+
<a class="btn btn-secondary" href="https://github.com/wavelog/wavelog" target="_blank">Visit Wavelog on Github</a>
8282
</li>
8383
<?php } ?>
8484
<?php if ($this->uri->segment(1) != "oqrs") { ?>

‎install/index.php‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -281,7 +281,7 @@ function delDir($dir)
281281
<?php
282282
$maxUploadFileSize = ini_get('upload_max_filesize');
283283
$maxUploadFileSizeBytes = (int)($maxUploadFileSize) * (1024 * 1024); // convert to bytes
284-
if ($maxUploadFileSizeBytes > ($max_upload_file_size * 1024 * 1024)) { // compare with given value in bytes
284+
if ($maxUploadFileSizeBytes >= ($max_upload_file_size * 1024 * 1024)) { // compare with given value in bytes
285285
?>
286286
<span class="badge text-bg-success"><?php echo $maxUploadFileSize; ?></span>
287287
<?php } else {
@@ -300,7 +300,7 @@ function delDir($dir)
300300
<?php
301301
$maxUploadFileSize = ini_get('post_max_size');
302302
$maxUploadFileSizeBytes = (int)($maxUploadFileSize) * (1024 * 1024); // convert to bytes
303-
if ($maxUploadFileSizeBytes > ($post_max_size * 1024 * 1024)) { // compare with given value in bytes
303+
if ($maxUploadFileSizeBytes >= ($post_max_size * 1024 * 1024)) { // compare with given value in bytes
304304
?>
305305
<span class="badge text-bg-success"><?php echo $maxUploadFileSize; ?></span>
306306
<?php } else {
@@ -438,7 +438,7 @@ function delDir($dir)
438438
<div class="col">
439439
<div class="mb-3">
440440
<label for="db_hostname" class="form-label">Hostname or IP<i id="callbook_tooltip" data-bs-toggle="tooltip" data-bs-placement="top" title="Directory Hint" class="fas fa-question-circle text-muted ms-2" data-bs-custom-class="custom-tooltip" data-bs-html="true" data-bs-title="Usually 'localhost'. Optional with '...:[port]'. Default Port: 3306"></i></label>
441-
<input type="text" id="db_hostname" value="localhost" class="form-control" name="db_hostname" />
441+
<input type="text" id="db_hostname" placeholder="localhost" class="form-control" name="db_hostname" />
442442
</div>
443443
</div>
444444
<div class="col">

0 commit comments

Comments
 (0)