From cb51d83eba480bc84261d3d4bb961295e3040328 Mon Sep 17 00:00:00 2001 From: int2001 Date: Wed, 25 Oct 2023 07:15:13 +0000 Subject: [PATCH 1/3] Prevent EQSL-Prcoessing if no station_location was created --- application/models/Eqslmethods_model.php | 1 + 1 file changed, 1 insertion(+) diff --git a/application/models/Eqslmethods_model.php b/application/models/Eqslmethods_model.php index da183d0c..08e97500 100644 --- a/application/models/Eqslmethods_model.php +++ b/application/models/Eqslmethods_model.php @@ -79,6 +79,7 @@ class Eqslmethods_model extends CI_Model { foreach ($stations->result() as $row) { array_push($logbooks_locations_array, $row->station_id); } + array_push($logbooks_locations_array, -9999); } $this->db->select('station_profile.station_id, '.$this->config->item('table_name').'.COL_PRIMARY_KEY, '.$this->config->item('table_name').'.COL_TIME_ON, '.$this->config->item('table_name').'.COL_CALL, '.$this->config->item('table_name').'.COL_MODE, '.$this->config->item('table_name').'.COL_SUBMODE, '.$this->config->item('table_name').'.COL_BAND, '.$this->config->item('table_name').'.COL_PROP_MODE, '.$this->config->item('table_name').'.COL_SAT_NAME, '.$this->config->item('table_name').'.COL_SAT_MODE, '.$this->config->item('table_name').'.COL_QSLMSG, eQSL_images.qso_id'); From b59244c191d96e15e0d62996eadba11f77fa1353 Mon Sep 17 00:00:00 2001 From: phl0 Date: Wed, 25 Oct 2023 09:30:40 +0200 Subject: [PATCH 2/3] Mark invalid time and date with red border --- application/views/qso/index.php | 4 ++-- assets/css/general.css | 6 +++++- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/application/views/qso/index.php b/application/views/qso/index.php index e8ef6e16..3cdae502 100755 --- a/application/views/qso/index.php +++ b/application/views/qso/index.php @@ -54,12 +54,12 @@
- > + required pattern="[0-3][0-9]-[0-1][0-9]-[0-9]{4}">
- > + required pattern="[0-2][0-9]:[0-5][0-9]">
diff --git a/assets/css/general.css b/assets/css/general.css index 03f4cae7..e51bbc42 100644 --- a/assets/css/general.css +++ b/assets/css/general.css @@ -543,4 +543,8 @@ div#station_logbooks_linked_table_paginate { } #awardInfoButton h2 { margin-right: 30px; -} \ No newline at end of file +} + +input:invalid { + border-color: red; +} From a2dbf6e362a3e993efd49b0f4b7867d96282bab1 Mon Sep 17 00:00:00 2001 From: int2001 Date: Wed, 25 Oct 2023 07:41:01 +0000 Subject: [PATCH 3/3] 2nd location needs to be fixed for eqsl --- application/models/Eqslmethods_model.php | 1 + 1 file changed, 1 insertion(+) diff --git a/application/models/Eqslmethods_model.php b/application/models/Eqslmethods_model.php index 08e97500..13e05dc6 100644 --- a/application/models/Eqslmethods_model.php +++ b/application/models/Eqslmethods_model.php @@ -48,6 +48,7 @@ class Eqslmethods_model extends CI_Model { foreach ($stations->result() as $row) { array_push($logbooks_locations_array, $row->station_id); } + array_push($logbooks_locations_array, -9999); } $this->db->select('station_profile.*, '.$this->config->item('table_name').'.COL_PRIMARY_KEY, '.$this->config->item('table_name').'.COL_TIME_ON, '.$this->config->item('table_name').'.COL_CALL, '.$this->config->item('table_name').'.COL_MODE, '.$this->config->item('table_name').'.COL_SUBMODE, '.$this->config->item('table_name').'.COL_BAND, '.$this->config->item('table_name').'.COL_COMMENT, '.$this->config->item('table_name').'.COL_RST_SENT, '.$this->config->item('table_name').'.COL_PROP_MODE, '.$this->config->item('table_name').'.COL_SAT_NAME, '.$this->config->item('table_name').'.COL_SAT_MODE, '.$this->config->item('table_name').'.COL_QSLMSG');