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

Merge pull request #2831 from int2001/qslprintfix 

Qslprintfix
pull/2832/head
Peter Goodhall 2023-12-14 13:31:44 +00:00 zatwierdzone przez GitHub
rodzic c43ab44219 654651671d
commit 19f82b1322
Nie znaleziono w bazie danych klucza dla tego podpisu
ID klucza GPG: 4AEE18F83AFDEB23
4 zmienionych plików z 44 dodań i 31 usunięć
Pokaż statystyki Ściągnij plik aktualizacji Ściągnij plik porównania Expand all files Collapse all files

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

@ -1483,22 +1483,28 @@ class Logbook_model extends CI_Model {
// Set Paper to sent
function paperqsl_update_sent($qso_id, $method) {
if ($this->logbook_model->check_qso_is_accessible($qso_id)) {
function paperqsl_update_sent($qso_id, $method) {
if ($this->logbook_model->check_qso_is_accessible($qso_id)) {
if ($method != '') {
$data = array(
'COL_QSLSDATE' => date('Y-m-d H:i:s'),
'COL_QSL_SENT' => 'Y',
'COL_QSL_SENT_VIA' => $method
);
} else {
$data = array(
'COL_QSLSDATE' => date('Y-m-d H:i:s'),
'COL_QSL_SENT' => 'Y'
);
}
$data = array(
'COL_QSLSDATE' => date('Y-m-d H:i:s'),
'COL_QSL_SENT' => 'Y',
'COL_QSL_SENT_VIA' => $method
);
$this->db->where('COL_PRIMARY_KEY', $qso_id);
$this->db->where('COL_PRIMARY_KEY', $qso_id);
$this->db->update($this->config->item('table_name'), $data);
} else {
return;
}
}
$this->db->update($this->config->item('table_name'), $data);
} else {
return;
}
}
// Set Paper to requested

37
application/models/Logbookadvanced_model.php
Wyświetl plik

@ -335,23 +335,30 @@ class Logbookadvanced_model extends CI_Model {
}
}
public function updateQsl($ids, $user_id, $method, $sent) {
$this->load->model('user_model');
public function updateQsl($ids, $user_id, $method, $sent) {
$this->load->model('user_model');
if(!$this->user_model->authorize(2)) {
return array('message' => 'Error');
} else {
$data = array(
'COL_QSLSDATE' => date('Y-m-d H:i:s'),
'COL_QSL_SENT' => $sent,
'COL_QSL_SENT_VIA' => $method
);
$this->db->where_in('COL_PRIMARY_KEY', json_decode($ids, true));
$this->db->update($this->config->item('table_name'), $data);
if(!$this->user_model->authorize(2)) {
return array('message' => 'Error');
} else {
if ($method != '') {
$data = array(
'COL_QSLSDATE' => date('Y-m-d H:i:s'),
'COL_QSL_SENT' => $sent,
'COL_QSL_SENT_VIA' => $method
);
} else {
$data = array(
'COL_QSLSDATE' => date('Y-m-d H:i:s'),
'COL_QSL_SENT' => $sent,
);
}
$this->db->where_in('COL_PRIMARY_KEY', json_decode($ids, true));
$this->db->update($this->config->item('table_name'), $data);
return array('message' => 'OK');
}
}
return array('message' => 'OK');
}
}
public function updateQslReceived($ids, $user_id, $method, $sent) {
$this->load->model('user_model');

2
application/views/qslprint/qslprint.php
Wyświetl plik

@ -56,7 +56,7 @@ if ($qsos->result() != NULL) {
echo '<td style=\'text-align: center\'>' . $qsl->COL_QSL_VIA . '</td>';
echo '<td style=\'text-align: center\'><span class="badge text-bg-light">' . $qsl->station_callsign . '</span></td>';
echo '<td style=\'text-align: center\'>'; echo_qsl_sent_via($qsl->COL_QSL_SENT_VIA); echo '</td>';
echo '<td style=\'text-align: center\'><button onclick="mark_qsl_sent(\''.$qsl->COL_PRIMARY_KEY.'\', \'B\')" class="btn btn-sm btn-success"><i class="fa fa-check"></i></button></td>';
echo '<td style=\'text-align: center\'><button onclick="mark_qsl_sent(\''.$qsl->COL_PRIMARY_KEY.'\', \''. $qsl->COL_QSL_SENT_VIA. '\')" class="btn btn-sm btn-success"><i class="fa fa-check"></i></button></td>';
echo '<td style=\'text-align: center\'><button onclick="deleteFromQslQueue(\''.$qsl->COL_PRIMARY_KEY.'\')" class="btn btn-sm btn-danger"><i class="fas fa-trash-alt"></i></button></td>';
echo '<td style=\'text-align: center\'><button onclick="openQsoList(\''.$qsl->COL_CALL.'\')" class="btn btn-sm btn-success"><i class="fas fa-search"></i></button></td>';
echo '</tr>';

2
assets/js/sections/qslprint.js
Wyświetl plik

@ -168,7 +168,7 @@ function markSelectedQsos() {
type: 'post',
data: {'id': JSON.stringify(id_list, null, 2),
'sent' : 'Y',
'method' : 'B'
'method' : ''
},
success: function(data) {
if (data !== []) {