diff --git a/application/models/Logbook_model.php b/application/models/Logbook_model.php index 4cc42f13c..85866b8ba 100644 --- a/application/models/Logbook_model.php +++ b/application/models/Logbook_model.php @@ -1368,53 +1368,65 @@ class Logbook_model extends CI_Model { } if ($this->input->post('qsl_sent')) { - $qsl_sent = $this->input->post('qsl_sent'); + $qsl_sent = $this->input->post('qsl_sent',true); } else { $qsl_sent = 'N'; } if ($this->input->post('qsl_rcvd')) { - $qsl_rcvd = $this->input->post('qsl_rcvd'); + $qsl_rcvd = $this->input->post('qsl_rcvd',true); } else { $qsl_rcvd = 'N'; } if ($this->input->post('eqsl_sent')) { - $eqsl_sent = $this->input->post('eqsl_sent'); + $eqsl_sent = $this->input->post('eqsl_sent',true); } else { $eqsl_sent = 'N'; } if ($this->input->post('eqsl_rcvd')) { - $eqsl_rcvd = $this->input->post('eqsl_rcvd'); + $eqsl_rcvd = $this->input->post('eqsl_rcvd',true); } else { $eqsl_rcvd = 'N'; } if ($this->input->post('qrz_sent')) { - $qrz_sent = $this->input->post('qrz_sent'); + $qrz_sent = $this->input->post('qrz_sent',true); } else { $qrz_sent = 'N'; } if ($this->input->post('qrz_rcvd')) { - $qrz_rcvd = $this->input->post('qrz_rcvd'); + $qrz_rcvd = $this->input->post('qrz_rcvd',true); } else { $qrz_rcvd = 'N'; } if ($this->input->post('clublog_sent')) { - $clublog_sent = $this->input->post('clublog_sent'); + $clublog_sent = $this->input->post('clublog_sent',true); } else { $clublog_sent = 'N'; } if ($this->input->post('clublog_rcvd')) { - $clublog_rcvd = $this->input->post('clublog_rcvd'); + $clublog_rcvd = $this->input->post('clublog_rcvd',true); } else { $clublog_rcvd = 'N'; } + if ($this->input->post('dcl_sent')) { + $dcl_sent = $this->input->post('dcl_sent',true); + } else { + $dcl_sent = 'N'; + } + + if ($this->input->post('dcl_rcvd')) { + $dcl_rcvd = $this->input->post('dcl_rcvd',true); + } else { + $dcl_rcvd = 'N'; + } + if (in_array($this->input->post('prop_mode'), $this->config->item('lotw_unsupported_prop_modes'))) { $lotw_sent = 'I'; } elseif ($this->input->post('lotw_sent')) { @@ -1516,6 +1528,22 @@ class Logbook_model extends CI_Model { $clublogrdate = $qso->COL_CLUBLOG_QSO_DOWNLOAD_DATE; } + if ($dcl_sent == 'N' && $qso->COL_CLUBLOG_QSO_UPLOAD_STATUS != $dcl_sent) { + $dclsdate = null; + } elseif (!$qso->COL_DCL_QSLSDATE || $qso->COL_DCL_QSLSDATE != $dcl_sent) { + $dclsdate = date('Y-m-d H:i:s'); + } else { + $dclsdate = $qso->COL_DCL_QSLSDATE; + } + + if ($dcl_rcvd == 'N' && $qso->COL_DCL_QSLRDATE != $dcl_rcvd) { + $dclrdate = null; + } elseif (!$qso->COL_DCL_QSLRDATE || $qso->COL_DCL_QSLRDATE != $dcl_rcvd) { + $dclrdate = date('Y-m-d H:i:s'); + } else { + $dclrdate = $qso->COL_DCL_QSLRDATE; + } + if (($this->input->post('distance')) && (is_numeric($this->input->post('distance')))) { $distance = $this->input->post('distance'); } else { @@ -1588,6 +1616,10 @@ class Logbook_model extends CI_Model { 'COL_CLUBLOG_QSO_DOWNLOAD_DATE' => $clublogrdate, 'COL_CLUBLOG_QSO_DOWNLOAD_STATUS' => $clublog_rcvd, 'COL_CLUBLOG_QSO_UPLOAD_STATUS' => $clublog_sent, + 'COL_DCL_QSLSDATE' => $dclsdate, + 'COL_DCL_QSLRDATE' => $dclrdate, + 'COL_DCL_QSL_RCVD' => $dcl_rcvd, + 'COL_DCL_QSL_SENT' => $dcl_sent, 'COL_IOTA' => $this->input->post('iota_ref'), 'COL_SOTA_REF' => strtoupper(trim($this->input->post('sota_ref'))), 'COL_WWFF_REF' => strtoupper(trim($this->input->post('wwff_ref'))), diff --git a/application/views/qso/edit_ajax.php b/application/views/qso/edit_ajax.php index b333bd082..e93cf1cb2 100644 --- a/application/views/qso/edit_ajax.php +++ b/application/views/qso/edit_ajax.php @@ -427,9 +427,12 @@