From e7d1b3bf2758e52130ae61c1cb663e818b1a8928 Mon Sep 17 00:00:00 2001 From: AndreasK79 Date: Wed, 1 Apr 2020 08:43:08 +0200 Subject: [PATCH] Added possibility to mark QSOs as exported to LoTW. --- application/controllers/Adif.php | 26 +++++++++- application/models/Adif_data.php | 2 +- application/views/adif/import.php | 50 +++++++++++++++---- application/views/adif/mark_lotw.php | 22 ++++++++ application/views/interface_assets/footer.php | 12 +++++ 5 files changed, 101 insertions(+), 11 deletions(-) create mode 100644 application/views/adif/mark_lotw.php diff --git a/application/controllers/Adif.php b/application/controllers/Adif.php index cb9dd127..aff723ca 100644 --- a/application/controllers/Adif.php +++ b/application/controllers/Adif.php @@ -85,7 +85,31 @@ class adif extends CI_Controller { $this->load->view('adif/data/exportall', $data); - } + if ($this->input->post('markLotw') == 1) { + foreach ($data['qsos']->result() as $qso) + { + $this->adif_data->mark_lotw_sent($qso->COL_PRIMARY_KEY); + } + } + } + + public function mark_lotw() { + // Set memory limit to unlimited to allow heavy usage + ini_set('memory_limit', '-1'); + + $this->load->model('adif_data'); + + $data['qsos'] = $this->adif_data->export_custom($this->input->post('from'), $this->input->post('to')); + + //$this->load->view('adif/import', $data); + + foreach ($data['qsos']->result() as $qso) + { + $this->adif_data->mark_lotw_sent($qso->COL_PRIMARY_KEY); + } + + $this->load->view('adif/mark_lotw', $data); + } public function export_lotw() { diff --git a/application/models/Adif_data.php b/application/models/Adif_data.php index 980b70ea..908aca30 100644 --- a/application/models/Adif_data.php +++ b/application/models/Adif_data.php @@ -97,7 +97,7 @@ class adif_data extends CI_Model { 'COL_LOTW_QSL_SENT' => 'Y' ); - $this->db->set('COL_LOTW_QSLSDATE', 'CURDATE()', FALSE); + $this->db->set('COL_LOTW_QSLSDATE', 'now()', FALSE); $this->db->where('COL_PRIMARY_KEY', $id); $this->db->update($this->config->item('table_name'), $data); } diff --git a/application/views/adif/import.php b/application/views/adif/import.php index 555d0380..5d9d4fa6 100644 --- a/application/views/adif/import.php +++ b/application/views/adif/import.php @@ -60,23 +60,55 @@ +

To date:

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

+
Logbook of The World
+

If no date are chosen, that means all QSOs will be marked!

+
+

From date:

+
+
+ +
+
+
+
+
+

To date:

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

+

Export Satellite Only QSOs
Export All Satellite QSOs diff --git a/application/views/adif/mark_lotw.php b/application/views/adif/mark_lotw.php new file mode 100644 index 00000000..f40da432 --- /dev/null +++ b/application/views/adif/mark_lotw.php @@ -0,0 +1,22 @@ +
+
+ session->flashdata('message')) { ?> + +
+

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

+
+ + +
+
+ QSOs marked +
+
+

Yay, it's done!

+

The QSOs are marked as exported to LoTW.

+
+
+ + +
+ diff --git a/application/views/interface_assets/footer.php b/application/views/interface_assets/footer.php index f3bb51ba..57a95858 100644 --- a/application/views/interface_assets/footer.php +++ b/application/views/interface_assets/footer.php @@ -24,6 +24,18 @@ format: 'DD/MM/YYYY', }); }); + + $(function () { + $('#datetimepicker3').datetimepicker({ + format: 'DD/MM/YYYY', + }); + }); + + $(function () { + $('#datetimepicker4').datetimepicker({ + format: 'DD/MM/YYYY', + }); + });