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

Merge pull request #1387 from onovy/qso_date_off 

Fix QSO with time_on < time_off and QSO with date_off field
pull/1403/head
Peter Goodhall 2022-02-06 20:51:39 +00:00 zatwierdzone przez Peter Goodhall
rodzic dcc4f2b992
commit 9fc05d9cb3
1 zmienionych plików z 12 dodań i 2 usunięć
Pokaż statystyki Ściągnij plik aktualizacji Ściągnij plik porównania Expand all files Collapse all files

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

@ -1949,9 +1949,19 @@ class Logbook_model extends CI_Model {
$time_on = date('Y-m-d', strtotime($record['qso_date'])) ." ".date('H:i:s', strtotime($record['time_on']));
if (isset($record['time_off'])) {
$time_off = date('Y-m-d', strtotime($record['qso_date'])) ." ".date('H:i:s', strtotime($record['time_off']));
if (isset($record['date_off'])) {
// date_off and time_off set
$time_off = date('Y-m-d', strtotime($record['date_off'])) . ' ' . date('H:i:s', strtotime($record['time_off']));
} elseif (strtotime($record['time_off']) < strtotime($record['time_on'])) {
// date_off is not set, QSO ends next day
$time_off = date('Y-m-d', strtotime($record['qso_date'] . ' + 1 day')) . ' ' . date('H:i:s', strtotime($record['time_off']));
} else {
// date_off is not set, QSO ends same day
$time_off = date('Y-m-d', strtotime($record['qso_date'])) . ' ' . date('H:i:s', strtotime($record['time_off']));
}
} else {
$time_off = $time_on;
// date_off and time_off not set, QSO end == QSO start
$time_off = $time_on;
}
// Store Freq