Skip to content

Commit 4f2deb4

Browse files
HB9HILHB9HIL
authored
Merge pull request wavelog#278 from wavelog/dev
Release Version 1.5
2 parents a4627c5 + 61e2cbf commit 4f2deb4

File tree

83 files changed

+1387
-420
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

83 files changed

+1387
-420
lines changed

‎application/config/migration.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
|
2323
*/
2424

25-
$config['migration_version'] = 191;
25+
$config['migration_version'] = 192;
2626

2727
/*
2828
|--------------------------------------------------------------------------

‎application/controllers/Activated_gridmap.php‎

Lines changed: 20 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -6,18 +6,19 @@ function __construct() {
66
parent::__construct();
77
}
88

9-
public function index() {
9+
public function index() {
1010
$data['page_title'] = "Activated Gridsquare Map";
1111

12-
$this->load->model('bands');
13-
$this->load->model('activated_gridmap_model');
12+
$this->load->model('bands');
13+
$this->load->model('activated_gridmap_model');
1414
$this->load->model('stations');
1515

1616
$data['visitor'] = false;
1717
$data['homegrid'] = explode(',', $this->stations->find_gridsquare());
1818

1919
$data['modes'] = $this->activated_gridmap_model->get_worked_modes();
2020
$data['bands'] = $this->bands->get_worked_bands();
21+
$data['orbits'] = $this->bands->get_worked_orbits();
2122
$data['sats_available'] = $this->bands->get_worked_sats();
2223

2324
$data['user_default_band'] = $this->session->userdata('user_default_band');
@@ -32,7 +33,7 @@ public function index() {
3233
$data['gridsquares_gridsquares_not_confirmed'] = lang('gridsquares_gridsquares_not_confirmed');
3334
$data['gridsquares_gridsquares_total_activated'] = lang('gridsquares_gridsquares_total_activated');
3435

35-
$footerData = [];
36+
$footerData = [];
3637
$footerData['scripts'] = [
3738
'assets/js/leaflet/geocoding.js',
3839
'assets/js/leaflet/L.MaidenheadColouredGridMap.js',
@@ -45,13 +46,14 @@ public function index() {
4546
}
4647

4748
public function getGridsjs() {
48-
$band = $this->security->xss_clean($this->input->post('band'));
49-
$mode = $this->security->xss_clean($this->input->post('mode'));
50-
$qsl = $this->security->xss_clean($this->input->post('qsl'));
51-
$lotw = $this->security->xss_clean($this->input->post('lotw'));
52-
$eqsl = $this->security->xss_clean($this->input->post('eqsl'));
53-
$qrz = $this->security->xss_clean($this->input->post('qrz'));
49+
$band = $this->security->xss_clean($this->input->post('band'));
50+
$mode = $this->security->xss_clean($this->input->post('mode'));
51+
$qsl = $this->security->xss_clean($this->input->post('qsl'));
52+
$lotw = $this->security->xss_clean($this->input->post('lotw'));
53+
$eqsl = $this->security->xss_clean($this->input->post('eqsl'));
54+
$qrz = $this->security->xss_clean($this->input->post('qrz'));
5455
$sat = $this->security->xss_clean($this->input->post('sat'));
56+
$orbit = $this->security->xss_clean($this->input->post('orbit'));
5557
$this->load->model('activated_gridmap_model');
5658

5759
$array_grid_2char = array();
@@ -70,7 +72,7 @@ public function getGridsjs() {
7072
$grid_4char_confirmed = "";
7173
$grid_6char_confirmed = "";
7274

73-
$query = $this->activated_gridmap_model->get_band_confirmed($band, $mode, $qsl, $lotw, $eqsl, $qrz, $sat);
75+
$query = $this->activated_gridmap_model->get_band_confirmed($band, $mode, $qsl, $lotw, $eqsl, $qrz, $sat, $orbit);
7476

7577
if ($query && $query->num_rows() > 0) {
7678
foreach ($query->result() as $row) {
@@ -100,7 +102,7 @@ public function getGridsjs() {
100102
}
101103
}
102104

103-
$query = $this->activated_gridmap_model->get_band($band, $mode, $qsl, $lotw, $eqsl, $qrz, $sat);
105+
$query = $this->activated_gridmap_model->get_band($band, $mode, $qsl, $lotw, $eqsl, $qrz, $sat, $orbit);
104106

105107
if ($query && $query->num_rows() > 0) {
106108
foreach ($query->result() as $row) {
@@ -130,7 +132,7 @@ public function getGridsjs() {
130132
}
131133
}
132134
}
133-
$query_vucc = $this->activated_gridmap_model->get_band_worked_vucc_squares($band, $mode, $qsl, $lotw, $eqsl, $qrz, $sat);
135+
$query_vucc = $this->activated_gridmap_model->get_band_worked_vucc_squares($band, $mode, $qsl, $lotw, $eqsl, $qrz, $sat, $orbit);
134136

135137
if ($query_vucc && $query_vucc->num_rows() > 0) {
136138
foreach ($query_vucc->result() as $row) {
@@ -155,7 +157,7 @@ public function getGridsjs() {
155157
}
156158

157159
// // Confirmed Squares
158-
$query_vucc = $this->activated_gridmap_model->get_band_confirmed_vucc_squares($band, $mode, $qsl, $lotw, $eqsl, $qrz, $sat);
160+
$query_vucc = $this->activated_gridmap_model->get_band_confirmed_vucc_squares($band, $mode, $qsl, $lotw, $eqsl, $qrz, $sat, $orbit);
159161

160162
if ($query_vucc && $query_vucc->num_rows() > 0) {
161163
foreach ($query_vucc->result() as $row) {
@@ -179,15 +181,15 @@ public function getGridsjs() {
179181
}
180182
}
181183

182-
$data['grid_2char_confirmed'] = ($array_grid_2char_confirmed);
184+
$data['grid_2char_confirmed'] = ($array_grid_2char_confirmed);
183185
$data['grid_4char_confirmed'] = ($array_grid_4char_confirmed);
184186
$data['grid_6char_confirmed'] = ($array_grid_6char_confirmed);
185187

186188
$data['grid_2char'] = ($array_grid_2char);
187189
$data['grid_4char'] = ($array_grid_4char);
188190
$data['grid_6char'] = ($array_grid_6char);
189191

190-
header('Content-Type: application/json');
191-
echo json_encode($data);
192-
}
192+
header('Content-Type: application/json');
193+
echo json_encode($data);
194+
}
193195
}

‎application/controllers/Awards.php‎

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -103,6 +103,10 @@ public function dxcc () {
103103
$this->load->model('modes');
104104
$this->load->model('bands');
105105

106+
$data['orbits'] = $this->bands->get_worked_orbits();
107+
$data['sats_available'] = $this->bands->get_worked_sats();
108+
$data['user_default_band'] = $this->session->userdata('user_default_band');
109+
106110
$data['worked_bands'] = $this->bands->get_worked_bands('dxcc'); // Used in the view for band select
107111
$data['modes'] = $this->modes->active(); // Used in the view for mode select
108112

@@ -138,6 +142,8 @@ public function dxcc () {
138142
$postdata['Antarctica'] = $this->security->xss_clean($this->input->post('Antarctica'));
139143
$postdata['band'] = $this->security->xss_clean($this->input->post('band'));
140144
$postdata['mode'] = $this->security->xss_clean($this->input->post('mode'));
145+
$postdata['sat'] = $this->security->xss_clean($this->input->post('sats'));
146+
$postdata['orbit'] = $this->security->xss_clean($this->input->post('orbits'));
141147
}
142148
else { // Setting default values at first load of page
143149
$postdata['qsl'] = 1;
@@ -157,6 +163,8 @@ public function dxcc () {
157163
$postdata['Antarctica'] = 1;
158164
$postdata['band'] = 'All';
159165
$postdata['mode'] = 'All';
166+
$postdata['sat'] = 'All';
167+
$postdata['orbit'] = 'All';
160168
}
161169

162170
$dxcclist = $this->dxcc->fetchdxcc($postdata);
@@ -1405,6 +1413,8 @@ public function dxcc_map() {
14051413
$postdata['SouthAmerica'] = $this->input->post('SouthAmerica') == 0 ? NULL: 1;
14061414
$postdata['Oceania'] = $this->input->post('Oceania') == 0 ? NULL: 1;
14071415
$postdata['Antarctica'] = $this->input->post('Antarctica') == 0 ? NULL: 1;
1416+
$postdata['sat'] = $this->security->xss_clean($this->input->post('sat'));
1417+
$postdata['orbit'] = $this->security->xss_clean($this->input->post('orbit'));
14081418

14091419
$dxcclist = $this->dxcc->fetchdxcc($postdata);
14101420

‎application/controllers/Distances.php‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,8 @@ public function index()
1919
$this->load->model('bands');
2020
$data['bands_available'] = $this->bands->get_worked_bands_distances();
2121
$data['sats_available'] = $this->bands->get_worked_sats();
22+
$data['orbits'] = $this->bands->get_worked_orbits();
23+
$data['user_default_band'] = $this->session->userdata('user_default_band');
2224

2325
$this->load->view('interface_assets/header', $data);
2426
$this->load->view('distances/index');

‎application/controllers/Logbookadvanced.php‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -53,6 +53,7 @@ function index() {
5353
$pageData['dxccarray'] = $this->logbook_model->fetchDxcc();
5454
$pageData['iotaarray'] = $this->logbook_model->fetchIota();
5555
$pageData['sats'] = $this->bands->get_worked_sats();
56+
$pageData['orbits'] = $this->bands->get_worked_orbits();
5657
$pageData['station_profile'] = $this->stations->all_of_user();
5758
$pageData['active_station_info'] = $station_profile->row();
5859
$pageData['homegrid'] = explode(',', $this->stations->find_gridsquare());
@@ -124,6 +125,7 @@ public function search() {
124125
'cqzone' => xss_clean($this->input->post('cqzone')),
125126
'qsoresults' => xss_clean($this->input->post('qsoresults')),
126127
'sats' => xss_clean($this->input->post('sats')),
128+
'orbits' => xss_clean($this->input->post('orbits')),
127129
'lotwSent' => xss_clean($this->input->post('lotwSent')),
128130
'lotwReceived' => xss_clean($this->input->post('lotwReceived')),
129131
'eqslSent' => xss_clean($this->input->post('eqslSent')),
@@ -288,6 +290,7 @@ public function mapSelectedQsos() {
288290
'cqzone' => '',
289291
'qsoresults' => count($this->input->post('ids')),
290292
'sats' => '',
293+
'orbits' => '',
291294
'lotwSent' => '',
292295
'lotwReceived' => '',
293296
'eqslSent' => '',
@@ -328,6 +331,7 @@ public function mapQsos() {
328331
'cqzone' => xss_clean($this->input->post('cqzone')),
329332
'qsoresults' => xss_clean($this->input->post('qsoresults')),
330333
'sats' => xss_clean($this->input->post('sats')),
334+
'orbits' => xss_clean($this->input->post('orbits')),
331335
'lotwSent' => xss_clean($this->input->post('lotwSent')),
332336
'lotwReceived' => xss_clean($this->input->post('lotwReceived')),
333337
'eqslSent' => xss_clean($this->input->post('eqslSent')),
@@ -414,6 +418,7 @@ public function calculate($qso, $locator1, $locator2, $measurement_base, $var_di
414418
$data['mycallsign'] = $qso['station_callsign'];
415419
$data['datetime'] = date($custom_date_format, strtotime($qso['COL_TIME_ON'])). date(' H:i',strtotime($qso['COL_TIME_ON']));
416420
$data['satname'] = $qso['COL_SAT_NAME'];
421+
$data['orbit'] = $qso['orbit'];
417422
$data['confirmed'] = ($this->logbook_model->qso_is_confirmed($qso)==true) ? true : false;
418423

419424
return $data;
@@ -440,6 +445,7 @@ public function calculateCoordinates($qso, $lat, $long, $mygrid, $measurement_ba
440445
$data['mycallsign'] = $qso['station_callsign'];
441446
$data['datetime'] = date($custom_date_format, strtotime($qso['COL_TIME_ON'])). date(' H:i',strtotime($qso['COL_TIME_ON']));
442447
$data['satname'] = $qso['COL_SAT_NAME'];
448+
$data['orbit'] = $qso['orbit'];
443449
$data['confirmed'] = ($this->logbook_model->qso_is_confirmed($qso)==true) ? true : false;
444450

445451
return $data;

‎application/controllers/Stationsetup.php‎

Lines changed: 41 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -279,6 +279,7 @@ private function lblnk2html($public_slug, $logbook_name, $id) {
279279
if($public_slug != '') {
280280
$htmret .= '<a target="_blank" href="'.site_url('visitor')."/".$public_slug.'" class="btn btn-outline-primary btn-sm"><i class="fas fa-globe" title="'.lang('station_logbooks_view_public') . $logbook_name.'"></i></a>';
281281
$htmret .= ' <button id="' . $id . '" class="deletePublicSlug btn btn-outline-danger btn-sm" cnftext="Are you sure you want to delete the public slug?"><i class="fas fa-trash-alt"></i></button>';
282+
$htmret .= ' <button id="' . $id . '" class="editExportmapOptions btn btn-outline-primary btn-sm"><i class="fas fa-globe-europe"></i></button>';
282283
}
283284
return $htmret;
284285
}
@@ -428,4 +429,44 @@ public function linkLocations() {
428429
}
429430
echo json_encode($data);
430431
}
432+
433+
public function editExportmapOptions() {
434+
$this->load->model('stationsetup_model');
435+
436+
$this->load->model('bands');
437+
438+
$data['bands'] = $this->bands->get_user_bands();
439+
440+
$container = $this->stationsetup_model->getContainer(xss_clean($this->input->post('id', true)))->row();
441+
$slug = $container->public_slug;
442+
$data['logbookid'] = xss_clean($this->input->post('id', true));
443+
$data['slug'] = $slug;
444+
445+
$exportmapoptions['gridsquare_layer'] = $this->user_options_model->get_options('ExportMapOptions',array('option_name'=>'gridsquare_layer','option_key'=>$slug))->row();
446+
$exportmapoptions['path_lines'] = $this->user_options_model->get_options('ExportMapOptions',array('option_name'=>'path_lines','option_key'=>$slug))->row();
447+
$exportmapoptions['cqzone_layer'] = $this->user_options_model->get_options('ExportMapOptions',array('option_name'=>'cqzone_layer','option_key'=>$slug))->row();
448+
$exportmapoptions['qsocount'] = $this->user_options_model->get_options('ExportMapOptions',array('option_name'=>'qsocount','option_key'=>$slug))->row();
449+
$exportmapoptions['nightshadow_layer'] = $this->user_options_model->get_options('ExportMapOptions',array('option_name'=>'nightshadow_layer','option_key'=>$slug))->row();
450+
$exportmapoptions['band'] = $this->user_options_model->get_options('ExportMapOptions',array('option_name'=>'band','option_key'=>$slug))->row();
451+
452+
$data['exportmapoptions'] = $exportmapoptions;
453+
454+
$data['page_title'] = "Edit Export Map options";
455+
$this->load->view('stationsetup/exportmapoptions', $data);
456+
}
457+
458+
public function saveExportmapOptions() {
459+
$this->load->model('stationsetup_model');
460+
$container = $this->stationsetup_model->getContainer(xss_clean($this->input->post('id', true)))->row();
461+
$slug = $container->public_slug;
462+
463+
$this->load->model('user_options_model');
464+
465+
$this->user_options_model->set_option('ExportMapOptions', 'gridsquare_layer', array($slug => xss_clean($this->input->post('gridsquare_layer'))));
466+
$this->user_options_model->set_option('ExportMapOptions', 'path_lines', array($slug => xss_clean($this->input->post('path_lines'))));
467+
$this->user_options_model->set_option('ExportMapOptions', 'cqzone_layer', array($slug => xss_clean($this->input->post('cqzone_layer'))));
468+
$this->user_options_model->set_option('ExportMapOptions', 'nightshadow_layer', array($slug => xss_clean($this->input->post('nightshadow_layer'))));
469+
$this->user_options_model->set_option('ExportMapOptions', 'qsocount', array($slug => xss_clean($this->input->post('qsocount'))));
470+
$this->user_options_model->set_option('ExportMapOptions', 'band', array($slug => xss_clean($this->input->post('band'))));
471+
}
431472
}

0 commit comments

Comments
 (0)