diff --git a/application/config/migration.php b/application/config/migration.php index 769923a31..ba2ca6cf8 100644 --- a/application/config/migration.php +++ b/application/config/migration.php @@ -22,7 +22,7 @@ $config['migration_enabled'] = TRUE; | */ -$config['migration_version'] = 143; +$config['migration_version'] = 144; /* |-------------------------------------------------------------------------- diff --git a/application/controllers/Eqsl.php b/application/controllers/Eqsl.php index 67a2e0b26..d5d52e9cf 100644 --- a/application/controllers/Eqsl.php +++ b/application/controllers/Eqsl.php @@ -69,6 +69,7 @@ class eqsl extends CI_Controller { redirect('eqsl/import'); } + $eqsl_force_from_date = (!$this->input->post('eqsl_force_from_date')=="")?$this->input->post('eqsl_force_from_date'):""; foreach ($eqsl_locations->result_array() as $eqsl_location) { $this->eqslimporter->from_callsign_and_QTH( $eqsl_location['station_callsign'], @@ -76,7 +77,7 @@ class eqsl extends CI_Controller { $config['upload_path'] ); - $eqsl_results[] = $this->eqslimporter->fetch($eqsl_password); + $eqsl_results[] = $this->eqslimporter->fetch($eqsl_password,$eqsl_force_from_date); } } elseif ($this->input->post('eqslimport') == 'upload') { $station_id4upload=$this->input->post('station_profile'); diff --git a/application/libraries/EqslImporter.php b/application/libraries/EqslImporter.php index 2ca8ff4b9..d84ad812e 100644 --- a/application/libraries/EqslImporter.php +++ b/application/libraries/EqslImporter.php @@ -53,7 +53,7 @@ class EqslImporter } // Download confirmed QSO from eQSL inbox and import them - public function fetch($password) { + public function fetch($password, $eqsl_force_from_date="") { if (empty($password) || empty($this->callsign)) { return $this->result('Missing username and/or password'); } @@ -63,8 +63,8 @@ class EqslImporter $q = $query->row(); $eqsl_url = $q->eqsl_download_url; - // Query the logbook to determine when the last eQSL confirmation was - $eqsl_last_qsl_date = $this->CI->eqslmethods_model->eqsl_last_qsl_rcvd_date($this->callsign, $this->qth_nickname); + // Query the logbook to determine when the last eQSL confirmation was / Or use date input from form // + $eqsl_last_qsl_date = (strtotime($eqsl_force_from_date)!==false)?date("Ymd",strtotime($eqsl_force_from_date)):$this->CI->eqslmethods_model->eqsl_last_qsl_rcvd_date($this->callsign, $this->qth_nickname); // Build parameters for eQSL inbox file $eqsl_params = http_build_query(array( diff --git a/application/migrations/144_tag_2_4_10.php b/application/migrations/144_tag_2_4_10.php new file mode 100644 index 000000000..413bfd9ce --- /dev/null +++ b/application/migrations/144_tag_2_4_10.php @@ -0,0 +1,24 @@ +db->where('option_name', 'version'); + $this->db->update('options', array('option_value' => '2.4.10')); + } + + public function down() + { + $this->db->where('option_name', 'version'); + $this->db->update('options', array('option_value' => '2.4.9')); + } +} \ No newline at end of file diff --git a/application/models/Eqslmethods_model.php b/application/models/Eqslmethods_model.php index 5972bd5d0..da183d0c7 100644 --- a/application/models/Eqslmethods_model.php +++ b/application/models/Eqslmethods_model.php @@ -149,7 +149,7 @@ class Eqslmethods_model extends CI_Model { } else { // No previous date (first time import has run?), so choose UNIX EPOCH! // Note: date is yyyy/mm/dd format - return '1970/01/01'; + return '19700101'; } } diff --git a/application/views/eqsl/import.php b/application/views/eqsl/import.php index f01679066..764f0d0eb 100644 --- a/application/views/eqsl/import.php +++ b/application/views/eqsl/import.php @@ -29,7 +29,7 @@ -

+

Upload the Exported ADIF file from eQSL from the Download Inbox page, to mark QSOs as confirmed on eQSL.

Important Log files must have the file type .adi

@@ -47,14 +47,21 @@
- +

Cloudlog will use the eQSL credentials from your Cloudlog user profile to connect to eQSL and download confirmations.

+
+
+
+ +
+
+
+
+
- - +
+
diff --git a/application/views/interface_assets/footer.php b/application/views/interface_assets/footer.php index c1bae8531..f593e4bb1 100644 --- a/application/views/interface_assets/footer.php +++ b/application/views/interface_assets/footer.php @@ -2249,7 +2249,9 @@ $(document).ready(function(){ if (isDarkModeTheme()) { $('[class*="buttons"]').css("color", "white"); } - + $('#eqsl_force_from_date').datetimepicker({ + format: 'YYYY/MM/DD', + });