mirror
/
Cloudlog
kopia lustrzana https://github.com/magicbug/Cloudlog
1
0
Forkuj 0
Kod Zgłoszenia Packages Projekty Wydania Wiki Aktywność

Same logic for Clublog

pull/2387/head
int2001 2023-08-07 09:21:21 +00:00
rodzic 9b9f62e3e9
commit e4d50049e2
Nie znaleziono w bazie danych klucza dla tego podpisu
ID klucza GPG: DFB1C13CD2DB037B
2 zmienionych plików z 10 dodań i 3 usunięć
Pokaż statystyki Ściągnij plik aktualizacji Ściągnij plik porównania Expand all files Collapse all files

6
application/models/Clublog_model.php
Wyświetl plik

@ -26,7 +26,8 @@ class Clublog_model extends CI_Model {
$this->db->where("station_id", $station_id); $this->db->where("station_id", $station_id);
$this->db->where("COL_CLUBLOG_QSO_UPLOAD_STATUS", null); $this->db->where("COL_CLUBLOG_QSO_UPLOAD_STATUS", null);
$this->db->or_where("COL_CLUBLOG_QSO_UPLOAD_STATUS", ""); $this->db->or_where("COL_CLUBLOG_QSO_UPLOAD_STATUS", "");
$this->db->or_where("COL_CLUBLOG_QSO_UPLOAD_STATUS", "N"); $this->db->or_where("COL_CLUBLOG_QSO_UPLOAD_STATUS", "N");
$this->db->or_where("COL_CLUBLOG_QSO_UPLOAD_STATUS", "M");
$this->db->update($this->config->item('table_name'), $data); $this->db->update($this->config->item('table_name'), $data);
} }
@ -54,6 +55,7 @@ class Clublog_model extends CI_Model {
function mark_all_qsos_notsent($station_id) { function mark_all_qsos_notsent($station_id) {
$data = array( $data = array(
'COL_CLUBLOG_QSO_UPLOAD_DATE' => null, 'COL_CLUBLOG_QSO_UPLOAD_DATE' => null,
'COL_CLUBLOG_QSO_UPLOAD_STATUS' => "M",
'COL_CLUBLOG_QSO_UPLOAD_STATUS' => "N", 'COL_CLUBLOG_QSO_UPLOAD_STATUS' => "N",
); );
@ -70,6 +72,7 @@ class Clublog_model extends CI_Model {
$this->db->group_start(); $this->db->group_start();
$this->db->where("COL_CLUBLOG_QSO_UPLOAD_STATUS", null); $this->db->where("COL_CLUBLOG_QSO_UPLOAD_STATUS", null);
$this->db->or_where("COL_CLUBLOG_QSO_UPLOAD_STATUS", ""); $this->db->or_where("COL_CLUBLOG_QSO_UPLOAD_STATUS", "");
$this->db->or_where("COL_CLUBLOG_QSO_UPLOAD_STATUS", "M");
$this->db->or_where("COL_CLUBLOG_QSO_UPLOAD_STATUS", "N"); $this->db->or_where("COL_CLUBLOG_QSO_UPLOAD_STATUS", "N");
$this->db->group_end(); $this->db->group_end();
@ -87,6 +90,7 @@ class Clublog_model extends CI_Model {
$this->db->group_start(); $this->db->group_start();
$this->db->where("COL_CLUBLOG_QSO_UPLOAD_STATUS", null); $this->db->where("COL_CLUBLOG_QSO_UPLOAD_STATUS", null);
$this->db->or_where("COL_CLUBLOG_QSO_UPLOAD_STATUS", ""); $this->db->or_where("COL_CLUBLOG_QSO_UPLOAD_STATUS", "");
$this->db->or_where("COL_CLUBLOG_QSO_UPLOAD_STATUS", "M");
$this->db->or_where("COL_CLUBLOG_QSO_UPLOAD_STATUS", "N"); $this->db->or_where("COL_CLUBLOG_QSO_UPLOAD_STATUS", "N");
$this->db->group_end(); $this->db->group_end();

7
application/models/Logbook_model.php
Wyświetl plik

@ -2699,13 +2699,16 @@ class Logbook_model extends CI_Model {
$data['COL_ITUZ'] = $ituz; $data['COL_ITUZ'] = $ituz;
} }
// Check if QRZ is already uploaded. If so, set qso to reupload to qrz.com (M) // Check if QRZ or ClubLog is already uploaded. If so, set qso to reupload to qrz.com (M) or clublog
$qsql = "select COL_QRZCOM_QSO_UPLOAD_STATUS as QRZ_STATE from ".$this->config->item('table_name')." where COL_BAND=? and COL_CALL=? and COL_STATION_CALLSIGN=? and date_format(COL_TIME_ON, '%Y-%m-%d %H:%i') = ?"; $qsql = "select COL_CLUBLOG_QSO_UPLOAD_STATUS as CL_STATE, COL_QRZCOM_QSO_UPLOAD_STATUS as QRZ_STATE from ".$this->config->item('table_name')." where COL_BAND=? and COL_CALL=? and COL_STATION_CALLSIGN=? and date_format(COL_TIME_ON, '%Y-%m-%d %H:%i') = ?";
$query = $this->db->query($qsql, array($band, $callsign,$station_callsign,$datetime)); $query = $this->db->query($qsql, array($band, $callsign,$station_callsign,$datetime));
$row = $query->row(); $row = $query->row();
if ($row->QRZ_STATE == 'Y') { if ($row->QRZ_STATE == 'Y') {
$data['COL_QRZCOM_QSO_UPLOAD_STATUS'] = 'M'; $data['COL_QRZCOM_QSO_UPLOAD_STATUS'] = 'M';
} }
if ($row->CL_STATE == 'Y') {
$data['COL_CLUBLOG_QSO_UPLOAD_STATUS'] = 'M';
}
$this->db->where('date_format(COL_TIME_ON, \'%Y-%m-%d %H:%i\') = "'.$datetime.'"'); $this->db->where('date_format(COL_TIME_ON, \'%Y-%m-%d %H:%i\') = "'.$datetime.'"');
$this->db->where('COL_CALL', $callsign); $this->db->where('COL_CALL', $callsign);