From 0015d4a1cf85c81047044f559bd92e3ecd2d53c7 Mon Sep 17 00:00:00 2001 From: Andreas <6977712+AndreasK79@users.noreply.github.com> Date: Thu, 29 Jul 2021 12:05:52 +0200 Subject: [PATCH 01/40] [DX Atlas Gridsquare Export] Initial work begun for export --- application/controllers/Dxatlas.php | 104 +++++++++++++++ application/views/dxatlas/index.php | 119 ++++++++++++++++++ application/views/interface_assets/header.php | 2 + 3 files changed, 225 insertions(+) create mode 100644 application/controllers/Dxatlas.php create mode 100644 application/views/dxatlas/index.php diff --git a/application/controllers/Dxatlas.php b/application/controllers/Dxatlas.php new file mode 100644 index 00000000..ac8c46ff --- /dev/null +++ b/application/controllers/Dxatlas.php @@ -0,0 +1,104 @@ +load->model('user_model'); + $this->load->model('modes'); + $this->load->model('dxcc'); + $this->load->model('logbook_model'); + + if(!$this->user_model->authorize(99)) { $this->session->set_flashdata('notice', 'You\'re not allowed to do that!'); redirect('dashboard'); } + + $data['worked_bands'] = $this->dxcc->get_worked_bands(); // Used in the view for band select + $data['modes'] = $this->modes->active(); // Used in the view for mode select + $data['dxcc'] = $this->logbook_model->fetchDxcc(); // Used in the view for dxcc select + + $data['page_title'] = "DX Atlas Gridsquare Export"; + + $this->load->view('interface_assets/header', $data); + $this->load->view('dxatlas/index'); + $this->load->view('interface_assets/footer'); + + } + + public function export() + { + // Load Librarys + $this->load->library('qra'); + $this->load->helper('file'); + + // Load Database connections + $this->load->model('logbook_model'); + + // Parameters + $band = $this->input->post('band'); + $mode = $this->input->post('mode'); + $dxcc = $this->input->post('dxcc_id'); + $cqz = $this->input->post('cqz'); + $propagation = $this->input->post('prop_mode'); + $fromdate = $this->input->post('fromdate'); + $todate = $this->input->post('todate'); + + // Get QSOs with Valid QRAs + $qsos = $this->logbook_model->kml_get_all_qsos($band, $mode, $dxcc, $cqz, $propagation, $fromdate, $todate); + + $output = ""; + $output .= ""; + + $output .= ""; + + foreach ($qsos->result() as $row) + { + $output .= ""; + + if($row->COL_GRIDSQUARE != null) { + $stn_loc = $this->qra->qra2latlong($row->COL_GRIDSQUARE); + + $lat = $stn_loc[0]; + $lng = $stn_loc[1]; + } else { + $query = $this->db->query(' + SELECT * + FROM dxcc_entities + WHERE prefix = SUBSTRING( \''.$row->COL_CALL.'\', 1, LENGTH( prefix ) ) + ORDER BY LENGTH( prefix ) DESC + LIMIT 1 + '); + + foreach ($query->result() as $dxcc) { + $lat = $dxcc->lat; + $lng = $dxcc->long; + } + } + + $timestamp = strtotime($row->COL_TIME_ON); + + $output .= "".$row->COL_CALL.""; + $output .= "Date/Time: ".date('Y-m-d H:i:s', ($timestamp))."
Band: ".$row->COL_BAND."

]]>"; + $output .= ""; + $output .= "".$lng.",".$lat.",0"; + $output .= ""; + $output .= ""; + } + + $output .= ""; + $output .= ""; + + if (!file_exists('kml')) { + mkdir('kml', 0755, true); + } + + if ( ! write_file('kml/qsos.kml', $output)) + { + echo 'Unable to write the file. Make sure the folder KML has write permissions.'; + } + else + { + header("Content-Disposition: attachment; filename=\"qsos.kml\""); + echo $output; + } + + } +} diff --git a/application/views/dxatlas/index.php b/application/views/dxatlas/index.php new file mode 100644 index 00000000..7e7f3521 --- /dev/null +++ b/application/views/dxatlas/index.php @@ -0,0 +1,119 @@ +
+
+

+ +
+
+ Export your logbook for use in DX Atlas to display worked / confirmed gridsquares. +
+ + + +
+ +
+ +
+ + +
+ +
+ + +
+ +
+ + +
+ +
+ + +
+ +
+ + +
+ +

From date:

+
+
+ +
+
+
+
+
+ +

To date:

+
+
+ +
+
+
+
+
+
+ +
+
+
+
diff --git a/application/views/interface_assets/header.php b/application/views/interface_assets/header.php index 088d02da..aa264458 100644 --- a/application/views/interface_assets/header.php +++ b/application/views/interface_assets/header.php @@ -195,6 +195,8 @@ KML Export + DX Atlas Gridsquare Export +
Logbook of the World From e384a631e0685d9a6a5418ca133d9d84cfdd5be2 Mon Sep 17 00:00:00 2001 From: Peter Goodhall Date: Sat, 31 Jul 2021 10:25:38 +0100 Subject: [PATCH 02/40] Created a SECURITY.md --- SECURITY.md | 7 +++++++ 1 file changed, 7 insertions(+) create mode 100644 SECURITY.md diff --git a/SECURITY.md b/SECURITY.md new file mode 100644 index 00000000..8c420770 --- /dev/null +++ b/SECURITY.md @@ -0,0 +1,7 @@ +# Security Policy + +## Reporting a Vulnerability + +If you discover a security vulnerability within Cloudlog, please send an e-mail to Peter Goodhall, 2M0SQL via [peter@magicbug.co.uk](mailto:peter@magicbug.co.uk). + +All security vulnerabilities will be promptly addressed. From ea916d88c9725b03b3be2b5bfcb5bca75335483e Mon Sep 17 00:00:00 2001 From: Andreas <6977712+AndreasK79@users.noreply.github.com> Date: Sat, 31 Jul 2021 12:01:14 +0200 Subject: [PATCH 03/40] [QRA Library] Fixes #1117. This fixes bearing calculation. Distance was not calculcated if the locator was directly to the north or south of your own locator. --- application/libraries/Qra.php | 37 ++++++++++++++--------------------- 1 file changed, 15 insertions(+), 22 deletions(-) diff --git a/application/libraries/Qra.php b/application/libraries/Qra.php index 8d38ed7f..7398151d 100644 --- a/application/libraries/Qra.php +++ b/application/libraries/Qra.php @@ -1,4 +1,4 @@ - Date: Fri, 6 Aug 2021 17:52:04 +0100 Subject: [PATCH 04/40] [Migration] Creates station_logbook table in database. --- application/config/migration.php | 2 +- .../071_create_station_logbook_table.php | 52 +++++++++++++++++++ 2 files changed, 53 insertions(+), 1 deletion(-) create mode 100644 application/migrations/071_create_station_logbook_table.php diff --git a/application/config/migration.php b/application/config/migration.php index 5b216f92..227bc690 100644 --- a/application/config/migration.php +++ b/application/config/migration.php @@ -21,7 +21,7 @@ $config['migration_enabled'] = TRUE; | be upgraded / downgraded to. | */ -$config['migration_version'] = 70; +$config['migration_version'] = 71; /* |-------------------------------------------------------------------------- diff --git a/application/migrations/071_create_station_logbook_table.php b/application/migrations/071_create_station_logbook_table.php new file mode 100644 index 00000000..762ef81b --- /dev/null +++ b/application/migrations/071_create_station_logbook_table.php @@ -0,0 +1,52 @@ +dbforge->add_field(array( + 'logbook_id' => array( + 'type' => 'BIGINT', + 'constraint' => 20, + 'unsigned' => TRUE, + 'auto_increment' => TRUE, + 'unique' => TRUE + ), + + 'user_id' => array( + 'type' => 'BIGINT', + 'constraint' => 20, + 'unsigned' => TRUE, + 'auto_increment' => FALSE + ), + + 'logbook_name' => array( + 'type' => 'VARCHAR', + 'constraint' => '191', + 'null' => TRUE + ), + + 'modified' => array( + 'type' => 'timestamp', + 'null' => TRUE, + ) + )); + + $this->dbforge->add_key('logbook_id', TRUE); + $this->dbforge->add_key('user_id', TRUE); + + $this->dbforge->create_table('station_logbooks'); + } + + public function down() + { + $this->dbforge->drop_table('station_logbooks'); + } +} \ No newline at end of file From e254753bec7365269837fc768bce17de710f08b0 Mon Sep 17 00:00:00 2001 From: Peter Goodhall Date: Fri, 6 Aug 2021 17:57:40 +0100 Subject: [PATCH 05/40] [Migration] Creates table station_logbook_relationship table for many to many setup --- application/config/migration.php | 2 +- ...ate_station_logbook_relationship_table.php | 54 +++++++++++++++++++ 2 files changed, 55 insertions(+), 1 deletion(-) create mode 100644 application/migrations/072_create_station_logbook_relationship_table.php diff --git a/application/config/migration.php b/application/config/migration.php index 227bc690..e0cf1bd4 100644 --- a/application/config/migration.php +++ b/application/config/migration.php @@ -21,7 +21,7 @@ $config['migration_enabled'] = TRUE; | be upgraded / downgraded to. | */ -$config['migration_version'] = 71; +$config['migration_version'] = 72; /* |-------------------------------------------------------------------------- diff --git a/application/migrations/072_create_station_logbook_relationship_table.php b/application/migrations/072_create_station_logbook_relationship_table.php new file mode 100644 index 00000000..02ed7a4b --- /dev/null +++ b/application/migrations/072_create_station_logbook_relationship_table.php @@ -0,0 +1,54 @@ +dbforge->add_field(array( + 'logbook_relation_id' => array( + 'type' => 'BIGINT', + 'constraint' => 20, + 'unsigned' => TRUE, + 'auto_increment' => TRUE, + 'unique' => TRUE + ), + + 'station_logbook_id' => array( + 'type' => 'BIGINT', + 'constraint' => 20, + 'unsigned' => TRUE, + 'auto_increment' => FALSE + ), + + 'station_location_id' => array( + 'type' => 'BIGINT', + 'constraint' => 20, + 'unsigned' => TRUE, + 'auto_increment' => FALSE + ), + + 'modified' => array( + 'type' => 'timestamp', + 'null' => TRUE, + ) + )); + + $this->dbforge->add_key('logbook_relation_id', TRUE); + $this->dbforge->add_key('station_logbook_id', TRUE); + $this->dbforge->add_key('station_location_id', TRUE); + + $this->dbforge->create_table('station_logbooks_relationship'); + } + + public function down() + { + $this->dbforge->drop_table('station_logbooks_relationship'); + } +} \ No newline at end of file From ef65494eb6d63e29af5bb628b1ef7760321de948 Mon Sep 17 00:00:00 2001 From: Peter Goodhall Date: Thu, 12 Aug 2021 20:17:18 +0100 Subject: [PATCH 06/40] [Station Logbooks] Added the basics for the index page --- application/controllers/Logbook.php | 1 - application/controllers/Logbooks.php | 31 ++++++++++ application/models/Logbooks_model.php | 17 ++++++ application/views/interface_assets/header.php | 2 + application/views/logbooks/index.php | 57 +++++++++++++++++++ 5 files changed, 107 insertions(+), 1 deletion(-) create mode 100644 application/controllers/Logbooks.php create mode 100644 application/models/Logbooks_model.php create mode 100644 application/views/logbooks/index.php diff --git a/application/controllers/Logbook.php b/application/controllers/Logbook.php index c764ce09..196780da 100755 --- a/application/controllers/Logbook.php +++ b/application/controllers/Logbook.php @@ -728,5 +728,4 @@ class Logbook extends CI_Controller { return $this->db->get(); } - } diff --git a/application/controllers/Logbooks.php b/application/controllers/Logbooks.php new file mode 100644 index 00000000..eee2abba --- /dev/null +++ b/application/controllers/Logbooks.php @@ -0,0 +1,31 @@ +load->helper(array('form', 'url')); + + $this->load->model('user_model'); + if(!$this->user_model->authorize(2)) { $this->session->set_flashdata('notice', 'You\'re not allowed to do that!'); redirect('dashboard'); } + } + + function index() { + $this->load->model('logbooks_model'); + + $data['my_logbooks'] = $this->logbooks_model->show_all(); + + // Render Page + $data['page_title'] = "Station Logbooks"; + $this->load->view('interface_assets/header', $data); + $this->load->view('logbooks/index'); + $this->load->view('interface_assets/footer'); + } + + +} \ No newline at end of file diff --git a/application/models/Logbooks_model.php b/application/models/Logbooks_model.php new file mode 100644 index 00000000..b1b7e37c --- /dev/null +++ b/application/models/Logbooks_model.php @@ -0,0 +1,17 @@ +db->where('user_id', $this->session->userdata('user_id')); + return $this->db->get('station_logbooks'); + } +} +?> \ No newline at end of file diff --git a/application/views/interface_assets/header.php b/application/views/interface_assets/header.php index 088d02da..20071666 100644 --- a/application/views/interface_assets/header.php +++ b/application/views/interface_assets/header.php @@ -185,6 +185,8 @@
session->userdata('user_id'); ?>" title="Account"> Account + Station Logbooks + Station Locations
diff --git a/application/views/logbooks/index.php b/application/views/logbooks/index.php new file mode 100644 index 00000000..589037ae --- /dev/null +++ b/application/views/logbooks/index.php @@ -0,0 +1,57 @@ +
+ +
+ session->flashdata('message')) { ?> + +
+

session->flashdata('message'); ?>

+
+ + +

+ +
+
+ Station Locations +
+
+

Intro to Station Logbooks.

+ +

Create a Station Logbook

+ + num_rows() > 0) { ?> + +
+ + + + + + + + + result() as $row) { ?> + + + + + + + + + + +
Name
+ logbook_name;?>
+ 		+ logbook_id; ?>" class="btn btn-outline-primary btn-sm"> Edit + + logbook_id; ?>" class="btn btn-danger btn-sm" onclick="return confirm('Are you sure you want delete station profile station_profile_name; ?> this will delete all QSOs within this station logbook?');"> Delete Station Logbook +
+ + + + + + + From ee0a93b48a32ec7db5dbfc8c50a388193628eb7a Mon Sep 17 00:00:00 2001 From: Peter Goodhall Date: Thu, 12 Aug 2021 20:36:01 +0100 Subject: [PATCH 07/40] [Station Logbooks] Added code to create and delete station logbooks --- application/controllers/Logbooks.php | 28 ++++++++++++++++++ application/models/Logbooks_model.php | 21 ++++++++++++++ application/views/logbooks/create.php | 41 +++++++++++++++++++++++++++ application/views/logbooks/index.php | 2 +- 4 files changed, 91 insertions(+), 1 deletion(-) create mode 100644 application/views/logbooks/create.php diff --git a/application/controllers/Logbooks.php b/application/controllers/Logbooks.php index eee2abba..ff59eb6f 100644 --- a/application/controllers/Logbooks.php +++ b/application/controllers/Logbooks.php @@ -27,5 +27,33 @@ class Logbooks extends CI_Controller { $this->load->view('interface_assets/footer'); } + public function create() + { + $this->load->library('form_validation'); + + $this->form_validation->set_rules('stationLogbook_Name', 'Station Logbook Name', 'required'); + + if ($this->form_validation->run() == FALSE) + { + $data['page_title'] = "Create Station Logbook"; + $this->load->view('interface_assets/header', $data); + $this->load->view('logbooks/create'); + $this->load->view('interface_assets/footer'); + } + else + { + $this->load->model('logbooks_model'); + $this->logbooks_model->add(); + + redirect('logbooks'); + } + } + + public function delete($id) { + $this->load->model('logbooks_model'); + $this->logbooks_model->delete($id); + + redirect('logbooks'); + } } \ No newline at end of file diff --git a/application/models/Logbooks_model.php b/application/models/Logbooks_model.php index b1b7e37c..bdaa8187 100644 --- a/application/models/Logbooks_model.php +++ b/application/models/Logbooks_model.php @@ -13,5 +13,26 @@ class Logbooks_model extends CI_Model { $this->db->where('user_id', $this->session->userdata('user_id')); return $this->db->get('station_logbooks'); } + + function add() { + // Create data array with field values + $data = array( + 'user_id' => $this->session->userdata('user_id'), + 'logbook_name' => xss_clean($this->input->post('stationLogbook_Name', true)), + ); + + // Insert Records + $this->db->insert('station_logbooks', $data); + } + + function delete($id) { + // Clean ID + $clean_id = $this->security->xss_clean($id); + + // Delete QSOs + $this->db->where('user_id', $this->session->userdata('user_id')); + $this->db->where('logbook_id', $id); + $this->db->delete('station_logbooks'); + } } ?> \ No newline at end of file diff --git a/application/views/logbooks/create.php b/application/views/logbooks/create.php new file mode 100644 index 00000000..a28cd066 --- /dev/null +++ b/application/views/logbooks/create.php @@ -0,0 +1,41 @@ +
+ +
+ session->flashdata('message')) { ?> + +
+

session->flashdata('message'); ?>

+
+ + +
+
+ +
+
+ session->flashdata('notice')) { ?> +
+ session->flashdata('notice'); ?> +
+ + + load->helper('form'); ?> + + + +
+
+ + + You can call a station logbook anything. +
+ + + + +
+
+ +
+ +
diff --git a/application/views/logbooks/index.php b/application/views/logbooks/index.php index 589037ae..cc1c8635 100644 --- a/application/views/logbooks/index.php +++ b/application/views/logbooks/index.php @@ -41,7 +41,7 @@ From 79d9167e8b5deb3039b58cf7614a6a436f60f43d Mon Sep 17 00:00:00 2001 From: Peter Goodhall Date: Thu, 12 Aug 2021 21:10:43 +0100 Subject: [PATCH 08/40] [Station Logbooks] Added functions to handle editing --- application/controllers/Logbooks.php | 32 +++++++++++++++++++ application/models/Logbooks_model.php | 19 +++++++++++ application/views/logbooks/edit.php | 46 +++++++++++++++++++++++++++ 3 files changed, 97 insertions(+) create mode 100644 application/views/logbooks/edit.php diff --git a/application/controllers/Logbooks.php b/application/controllers/Logbooks.php index ff59eb6f..fbdda849 100644 --- a/application/controllers/Logbooks.php +++ b/application/controllers/Logbooks.php @@ -49,6 +49,38 @@ class Logbooks extends CI_Controller { } } + public function edit($id) + { + $this->load->library('form_validation'); + + $this->load->model('logbooks_model'); + + $station_logbook_id = $this->security->xss_clean($id); + + $station_logbook_details_query = $this->logbooks_model->logbook($station_logbook_id); + + $data['station_logbook_details'] = $station_logbook_details_query->row(); + + $data['page_title'] = "Edit Station Logbook"; + + $this->form_validation->set_rules('station_logbook_name', 'Station Logbook Name', 'required'); + + if ($this->form_validation->run() == FALSE) + { + $this->load->view('interface_assets/header', $data); + $this->load->view('logbooks/edit'); + $this->load->view('interface_assets/footer'); + } + else + { + $this->logbooks_model->edit(); + + $data['notice'] = "Station Logbooks ".$this->security->xss_clean($this->input->post('station_logbook_name', true))." Updated"; + + redirect('logbooks'); + } + } + public function delete($id) { $this->load->model('logbooks_model'); $this->logbooks_model->delete($id); diff --git a/application/models/Logbooks_model.php b/application/models/Logbooks_model.php index bdaa8187..9e013348 100644 --- a/application/models/Logbooks_model.php +++ b/application/models/Logbooks_model.php @@ -34,5 +34,24 @@ class Logbooks_model extends CI_Model { $this->db->where('logbook_id', $id); $this->db->delete('station_logbooks'); } + + function edit() { + $data = array( + 'logbook_name' => xss_clean($this->input->post('station_logbook_name', true)), + ); + + $this->db->where('user_id', $this->session->userdata('user_id')); + $this->db->where('logbook_id', xss_clean($this->input->post('logbook_id', true))); + $this->db->update('station_logbooks', $data); + } + + function logbook($id) { + // Clean ID + $clean_id = $this->security->xss_clean($id); + + $this->db->where('user_id', $this->session->userdata('user_id')); + $this->db->where('logbook_id', $clean_id); + return $this->db->get('station_logbooks'); + } } ?> \ No newline at end of file diff --git a/application/views/logbooks/edit.php b/application/views/logbooks/edit.php new file mode 100644 index 00000000..542984f2 --- /dev/null +++ b/application/views/logbooks/edit.php @@ -0,0 +1,46 @@ +
+ +
+ session->flashdata('message')) { ?> + +
+

session->flashdata('message'); ?>

+
+ + + session->flashdata('notice')) { ?> +
+ session->flashdata('notice'); ?> +
+ + + load->helper('form'); ?> + + + +
+ + + +
+
+
+
: logbook_name; ?>
+
+ +
+ + logbook_name; } ?>" required> + Shortname for the station location. For example: Home (IO87IP) +
+
+
+
+
+ + + + + + +
From a80089f97c83e5f3f7c213a1f1c0ca8b7a3a4c5a Mon Sep 17 00:00:00 2001 From: Peter Goodhall Date: Mon, 16 Aug 2021 11:24:16 +0100 Subject: [PATCH 09/40] Make sure tables dont exist before running migration --- .../071_create_station_logbook_table.php | 58 +++++++++--------- ...ate_station_logbook_relationship_table.php | 60 ++++++++++--------- 2 files changed, 61 insertions(+), 57 deletions(-) diff --git a/application/migrations/071_create_station_logbook_table.php b/application/migrations/071_create_station_logbook_table.php index 762ef81b..452ec50b 100644 --- a/application/migrations/071_create_station_logbook_table.php +++ b/application/migrations/071_create_station_logbook_table.php @@ -11,38 +11,40 @@ class Migration_create_station_logbook_table extends CI_Migration { public function up() { - $this->dbforge->add_field(array( - 'logbook_id' => array( - 'type' => 'BIGINT', - 'constraint' => 20, - 'unsigned' => TRUE, - 'auto_increment' => TRUE, - 'unique' => TRUE - ), + if (!$this->db->table_exists('station_logbooks')) { + $this->dbforge->add_field(array( + 'logbook_id' => array( + 'type' => 'BIGINT', + 'constraint' => 20, + 'unsigned' => TRUE, + 'auto_increment' => TRUE, + 'unique' => TRUE + ), - 'user_id' => array( - 'type' => 'BIGINT', - 'constraint' => 20, - 'unsigned' => TRUE, - 'auto_increment' => FALSE - ), - - 'logbook_name' => array( - 'type' => 'VARCHAR', - 'constraint' => '191', - 'null' => TRUE - ), + 'user_id' => array( + 'type' => 'BIGINT', + 'constraint' => 20, + 'unsigned' => TRUE, + 'auto_increment' => FALSE + ), + + 'logbook_name' => array( + 'type' => 'VARCHAR', + 'constraint' => '191', + 'null' => TRUE + ), - 'modified' => array( - 'type' => 'timestamp', - 'null' => TRUE, - ) - )); + 'modified' => array( + 'type' => 'timestamp', + 'null' => TRUE, + ) + )); - $this->dbforge->add_key('logbook_id', TRUE); - $this->dbforge->add_key('user_id', TRUE); + $this->dbforge->add_key('logbook_id', TRUE); + $this->dbforge->add_key('user_id', TRUE); - $this->dbforge->create_table('station_logbooks'); + $this->dbforge->create_table('station_logbooks'); + } } public function down() diff --git a/application/migrations/072_create_station_logbook_relationship_table.php b/application/migrations/072_create_station_logbook_relationship_table.php index 02ed7a4b..8f487af0 100644 --- a/application/migrations/072_create_station_logbook_relationship_table.php +++ b/application/migrations/072_create_station_logbook_relationship_table.php @@ -11,40 +11,42 @@ class Migration_create_station_logbook_relationship_table extends CI_Migration { public function up() { - $this->dbforge->add_field(array( - 'logbook_relation_id' => array( - 'type' => 'BIGINT', - 'constraint' => 20, - 'unsigned' => TRUE, - 'auto_increment' => TRUE, - 'unique' => TRUE - ), + if (!$this->db->table_exists('station_logbooks_relationship')) { + $this->dbforge->add_field(array( + 'logbook_relation_id' => array( + 'type' => 'BIGINT', + 'constraint' => 20, + 'unsigned' => TRUE, + 'auto_increment' => TRUE, + 'unique' => TRUE + ), - 'station_logbook_id' => array( - 'type' => 'BIGINT', - 'constraint' => 20, - 'unsigned' => TRUE, - 'auto_increment' => FALSE - ), + 'station_logbook_id' => array( + 'type' => 'BIGINT', + 'constraint' => 20, + 'unsigned' => TRUE, + 'auto_increment' => FALSE + ), - 'station_location_id' => array( - 'type' => 'BIGINT', - 'constraint' => 20, - 'unsigned' => TRUE, - 'auto_increment' => FALSE - ), + 'station_location_id' => array( + 'type' => 'BIGINT', + 'constraint' => 20, + 'unsigned' => TRUE, + 'auto_increment' => FALSE + ), - 'modified' => array( - 'type' => 'timestamp', - 'null' => TRUE, - ) - )); + 'modified' => array( + 'type' => 'timestamp', + 'null' => TRUE, + ) + )); - $this->dbforge->add_key('logbook_relation_id', TRUE); - $this->dbforge->add_key('station_logbook_id', TRUE); - $this->dbforge->add_key('station_location_id', TRUE); + $this->dbforge->add_key('logbook_relation_id', TRUE); + $this->dbforge->add_key('station_logbook_id', TRUE); + $this->dbforge->add_key('station_location_id', TRUE); - $this->dbforge->create_table('station_logbooks_relationship'); + $this->dbforge->create_table('station_logbooks_relationship'); + } } public function down() From 605395264eaeb32eddbb451a4182103ebc4683fb Mon Sep 17 00:00:00 2001 From: Peter Goodhall Date: Mon, 23 Aug 2021 15:39:30 +0100 Subject: [PATCH 10/40] [Station Locations] Adds User_ID to station location to assign it to a user --- application/config/migration.php | 2 +- .../073_add_userid_to_station_profiles.php | 20 +++++++++++++++++++ 2 files changed, 21 insertions(+), 1 deletion(-) create mode 100644 application/migrations/073_add_userid_to_station_profiles.php diff --git a/application/config/migration.php b/application/config/migration.php index e0cf1bd4..7a7090ee 100644 --- a/application/config/migration.php +++ b/application/config/migration.php @@ -21,7 +21,7 @@ $config['migration_enabled'] = TRUE; | be upgraded / downgraded to. | */ -$config['migration_version'] = 72; +$config['migration_version'] = 73; /* |-------------------------------------------------------------------------- diff --git a/application/migrations/073_add_userid_to_station_profiles.php b/application/migrations/073_add_userid_to_station_profiles.php new file mode 100644 index 00000000..fd97b925 --- /dev/null +++ b/application/migrations/073_add_userid_to_station_profiles.php @@ -0,0 +1,20 @@ +dbforge->add_column('station_profile', $fields); + } + + public function down() + { + $this->dbforge->drop_column('station_profile', 'user_id'); + } +} \ No newline at end of file From 6cc96d21282de8920292bb0bc028be68fb3bad15 Mon Sep 17 00:00:00 2001 From: Peter Goodhall Date: Mon, 23 Aug 2021 15:50:19 +0100 Subject: [PATCH 11/40] [Station Location] Allow user to claim a location and also only show those of the user or non claimed. --- application/controllers/Station.php | 10 ++++++++++ application/models/Stations.php | 12 ++++++++++++ application/views/station_profile/index.php | 3 +++ 3 files changed, 25 insertions(+) diff --git a/application/controllers/Station.php b/application/controllers/Station.php index e59b44dd..3b332cc2 100644 --- a/application/controllers/Station.php +++ b/application/controllers/Station.php @@ -97,6 +97,16 @@ class Station extends CI_Controller { } } + // This function allows a user to claim ownership of a station location + function claim_user($id) { + // $id is the profile id + $this->load->model('stations'); + $this->stations->claim_user($id); + + //$this->stations->logbook_session_data(); + redirect('station'); + } + function reassign_profile($id) { // $id is the profile that needs reassigned to QSOs $this->load->model('stations'); diff --git a/application/models/Stations.php b/application/models/Stations.php index d179bb00..57ffe5fc 100644 --- a/application/models/Stations.php +++ b/application/models/Stations.php @@ -14,6 +14,8 @@ class Stations extends CI_Model { $this->db->from('station_profile'); $this->db->join($this->config->item('table_name'),'station_profile.station_id = '.$this->config->item('table_name').'.station_id','left'); $this->db->group_by('station_profile.station_id'); + $this->db->where('station_profile.user_id', $this->session->userdata('user_id')); + $this->db->or_where('station_profile.user_id =', NULL); return $this->db->get(); } @@ -114,6 +116,16 @@ class Stations extends CI_Model { $this->db->delete($this->config->item('table_name')); } + function claim_user($id) { + + $data = array( + 'user_id' => $this->session->userdata('user_id') + ); + + $this->db->where('station_id', xss_clean($id, true)); + $this->db->update('station_profile', $data); + } + function set_active($current, $new) { // Clean inputs diff --git a/application/views/station_profile/index.php b/application/views/station_profile/index.php index b6b480dd..bececfee 100644 --- a/application/views/station_profile/index.php +++ b/application/views/station_profile/index.php @@ -75,6 +75,9 @@ qso_total;?> QSOs
- logbook_id; ?>" class="btn btn-danger btn-sm" onclick="return confirm('Are you sure you want delete station profile station_profile_name; ?> this will delete all QSOs within this station logbook?');"> Delete Station Logbook + logbook_id; ?>" class="btn btn-danger btn-sm" onclick="return confirm('Are you sure you want delete station profile logbook_name; ?> this will delete all QSOs within this station logbook?');"> Delete Station Logbook
+ user_id == "") { ?> + station_id; ?>" class="btn btn-outline-primary btn-sm"> Claim Ownership + station_id; ?>" class="btn btn-outline-primary btn-sm"> Edit From 831f2499388d7047925c2e95e41edb5b3f088a39 Mon Sep 17 00:00:00 2001 From: Peter Goodhall Date: Mon, 23 Aug 2021 17:34:00 +0100 Subject: [PATCH 12/40] Built interface to display station locations when editing Station Logbooks --- application/controllers/Logbooks.php | 2 ++ application/controllers/Station.php | 3 ++- application/models/Stations.php | 10 +++++----- application/views/logbooks/edit.php | 17 +++++++++++++++++ 4 files changed, 26 insertions(+), 6 deletions(-) diff --git a/application/controllers/Logbooks.php b/application/controllers/Logbooks.php index fbdda849..4a6cf7ad 100644 --- a/application/controllers/Logbooks.php +++ b/application/controllers/Logbooks.php @@ -54,12 +54,14 @@ class Logbooks extends CI_Controller { $this->load->library('form_validation'); $this->load->model('logbooks_model'); + $this->load->model('stations'); $station_logbook_id = $this->security->xss_clean($id); $station_logbook_details_query = $this->logbooks_model->logbook($station_logbook_id); $data['station_logbook_details'] = $station_logbook_details_query->row(); + $data['station_locations_list'] = $this->stations->all(); $data['page_title'] = "Edit Station Logbook"; diff --git a/application/controllers/Station.php b/application/controllers/Station.php index 3b332cc2..35ce839a 100644 --- a/application/controllers/Station.php +++ b/application/controllers/Station.php @@ -102,8 +102,9 @@ class Station extends CI_Controller { // $id is the profile id $this->load->model('stations'); $this->stations->claim_user($id); + + echo $this->session->userdata('user_id'); - //$this->stations->logbook_session_data(); redirect('station'); } diff --git a/application/models/Stations.php b/application/models/Stations.php index 57ffe5fc..d774656e 100644 --- a/application/models/Stations.php +++ b/application/models/Stations.php @@ -20,6 +20,7 @@ class Stations extends CI_Model { } function all() { + $this->db->where('station_profile.user_id', $this->session->userdata('user_id')); return $this->db->get('station_profile'); } @@ -117,13 +118,12 @@ class Stations extends CI_Model { } function claim_user($id) { - $data = array( - 'user_id' => $this->session->userdata('user_id') + 'user_id' => $this->session->userdata('user_id'), ); - - $this->db->where('station_id', xss_clean($id, true)); - $this->db->update('station_profile', $data); + + $this->db->where('station_id', $id); + $this->db->update('station_profile', $data); } function set_active($current, $new) { diff --git a/application/views/logbooks/edit.php b/application/views/logbooks/edit.php index 542984f2..d459cb87 100644 --- a/application/views/logbooks/edit.php +++ b/application/views/logbooks/edit.php @@ -36,6 +36,23 @@ + +
+
+
Station Locations
+
+
+ + + Hold down the Ctrl (windows) or Command (Mac) button to select multiple options. +
+
+
+
From efac6b8d80d341abcff951ad6511feeceec84f86 Mon Sep 17 00:00:00 2001 From: Peter Goodhall Date: Mon, 23 Aug 2021 21:56:18 +0100 Subject: [PATCH 13/40] Base code for getting select options for station locations --- application/controllers/Logbooks.php | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/application/controllers/Logbooks.php b/application/controllers/Logbooks.php index 4a6cf7ad..78556e32 100644 --- a/application/controllers/Logbooks.php +++ b/application/controllers/Logbooks.php @@ -79,7 +79,17 @@ class Logbooks extends CI_Controller { $data['notice'] = "Station Logbooks ".$this->security->xss_clean($this->input->post('station_logbook_name', true))." Updated"; - redirect('logbooks'); + foreach ($this->input->post('SelectedStationLocations') as $selectedOption){ + echo $selectedOption."\n"; + + // Check if theres already a link between logbook and location + + // If no link exisits create + + // Delete link if removed + } + + //redirect('logbooks'); } } From 2f0cf971c5e9309526ab368eeb05401c067c4fce Mon Sep 17 00:00:00 2001 From: Andreas <6977712+AndreasK79@users.noreply.github.com> Date: Mon, 30 Aug 2021 18:28:20 +0200 Subject: [PATCH 14/40] [DX Atlas Gridsquare Export] Tweaking of the view. Activated datepicker. --- application/views/dxatlas/index.php | 72 ++++++++++--------- application/views/interface_assets/footer.php | 18 +++++ assets/css/general.css | 10 ++- 3 files changed, 66 insertions(+), 34 deletions(-) diff --git a/application/views/dxatlas/index.php b/application/views/dxatlas/index.php index 7e7f3521..16a91189 100644 --- a/application/views/dxatlas/index.php +++ b/application/views/dxatlas/index.php @@ -14,8 +14,8 @@
- -
+
+
+
+ + +
-
+
-
- -
-
+ + +
+
-
+
- -

From date:

-
-
- -
-
+
+
+
+ +
+ +
+
+
-
-

To date:

-
-
- -
-
+
+ +
+ +
+
+
diff --git a/application/views/interface_assets/footer.php b/application/views/interface_assets/footer.php index c8195c33..cc8eca7a 100644 --- a/application/views/interface_assets/footer.php +++ b/application/views/interface_assets/footer.php @@ -2025,6 +2025,24 @@ function deleteQsl(id) { +uri->segment(1) == "dxatlas") { ?> + + + + + uri->segment(1) == "qslprint") { ?>