Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Add check for null values to QSL timestamps #1893

Merged
merged 3 commits into from
Jan 2, 2023
Merged

Add check for null values to QSL timestamps #1893

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
31ee65a
Add check for null values to QSL timestamps
phl0 Jan 2, 2023
41d6da8
Also fix advanced search
phl0 Jan 2, 2023
c2dd384
Fix qslprint qsolist
phl0 Jan 2, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
60 changes: 42 additions & 18 deletions application/views/oqrs/qsolist.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,19 +40,23 @@
echo '<td style=\'text-align: center\' class="qsl">';
echo '<span ';
if ($qsl->COL_QSL_SENT != "N") {
$timestamp = strtotime($qsl->COL_QSLSDATE);
if ($qsl->COL_QSLSDATE != null) {
$timestamp = ' '.date($custom_date_format, strtotime($qsl->COL_QSLSDATE));
} else {
$timestamp = '';
}
switch ($qsl->COL_QSL_SENT) {
case "Y":
echo "class=\"qsl-green\" data-toggle=\"tooltip\" data-original-title=\"".$this->lang->line('general_word_sent')." ".date($custom_date_format,$timestamp);
echo "class=\"qsl-green\" data-toggle=\"tooltip\" data-original-title=\"".$this->lang->line('general_word_sent').$timestamp;
break;
case "Q":
echo "class=\"qsl-yellow\" data-toggle=\"tooltip\" data-original-title=\"".$this->lang->line('general_word_queued')." ".date($custom_date_format,$timestamp);
echo "class=\"qsl-yellow\" data-toggle=\"tooltip\" data-original-title=\"".$this->lang->line('general_word_queued').$timestamp;
break;
case "R":
echo "class=\"qsl-yellow\" data-toggle=\"tooltip\" data-original-title=\"".$this->lang->line('general_word_requested')." ".date($custom_date_format,$timestamp);
echo "class=\"qsl-yellow\" data-toggle=\"tooltip\" data-original-title=\"".$this->lang->line('general_word_requested').$timestamp;
break;
case "I":
echo "class=\"qsl-grey\" data-toggle=\"tooltip\" data-original-title=\"".$this->lang->line('general_word_invalid_ignore')." ".date($custom_date_format,$timestamp);
echo "class=\"qsl-grey\" data-toggle=\"tooltip\" data-original-title=\"".$this->lang->line('general_word_invalid_ignore').$timestamp;
break;
default:
echo "class=\"qsl-red";
Expand All @@ -78,19 +82,23 @@
echo '">&#9650;</span>';
echo '<span ';
if ($qsl->COL_QSL_RCVD != "N") {
$timestamp = strtotime($qsl->COL_QSLRDATE);
if ($qsl->COL_QSLRDATE != null) {
$timestamp = ' '.date($custom_date_format, strtotime($qsl->COL_QSLRDATE));
} else {
$timestamp = '';
}
switch ($qsl->COL_QSL_RCVD) {
case "Y":
echo "class=\"qsl-green\" data-toggle=\"tooltip\" data-original-title=\"".$this->lang->line('general_word_received')." ".date($custom_date_format,$timestamp);
echo "class=\"qsl-green\" data-toggle=\"tooltip\" data-original-title=\"".$this->lang->line('general_word_received').$timestamp;
break;
case "Q":
echo "class=\"qsl-yellow\" data-toggle=\"tooltip\" data-original-title=\"".$this->lang->line('general_word_queued')." ".date($custom_date_format,$timestamp);
echo "class=\"qsl-yellow\" data-toggle=\"tooltip\" data-original-title=\"".$this->lang->line('general_word_queued').$timestamp;
break;
case "R":
echo "class=\"qsl-yellow\" data-toggle=\"tooltip\" data-original-title=\"".$this->lang->line('general_word_requested')." ".date($custom_date_format,$timestamp);
echo "class=\"qsl-yellow\" data-toggle=\"tooltip\" data-original-title=\"".$this->lang->line('general_word_requested').$timestamp;
break;
case "I":
echo "class=\"qsl-grey\" data-toggle=\"tooltip\" data-original-title=\"".$this->lang->line('general_word_invalid_ignore')." ".date($custom_date_format,$timestamp);
echo "class=\"qsl-grey\" data-toggle=\"tooltip\" data-original-title=\"".$this->lang->line('general_word_invalid_ignore').$timestamp;
break;
default:
echo "class=\"qsl-red";
Expand Down Expand Up @@ -119,17 +127,25 @@
echo '<td style=\'text-align: center\' class="eqsl">';
echo '<span ';
if ($qsl->COL_EQSL_QSL_SENT == "Y") {
$timestamp = strtotime($qsl->COL_EQSL_QSLSDATE);
echo "data-original-title=\"".$this->lang->line('eqsl_short')." ".$this->lang->line('general_word_sent')." ".($timestamp!=''?date($custom_date_format, $timestamp):'')."\" data-toggle=\"tooltip\"";
echo "data-original-title=\"".$this->lang->line('eqsl_short')." ".$this->lang->line('general_word_sent');
if ($qsl->COL_EQSL_QSLSDATE != null) {
$timestamp = strtotime($qsl->COL_EQSL_QSLSDATE);
echo " ".($timestamp != '' ? date($custom_date_format, $timestamp) : '');
}
echo "\" data-toggle=\"tooltip\"";
}
echo ' class="eqsl-';
echo ($qsl->COL_EQSL_QSL_SENT=='Y')?'green':'red';
echo '">&#9650;</span>';

echo '<span ';
if ($qsl->COL_EQSL_QSL_RCVD == "Y") {
$timestamp = strtotime($qsl->COL_EQSL_QSLRDATE);
echo "data-original-title=\"".$this->lang->line('eqsl_short')." ".$this->lang->line('general_word_received')." ".($timestamp!=''?date($custom_date_format, $timestamp):'')."\" data-toggle=\"tooltip\"";
echo "data-original-title=\"".$this->lang->line('eqsl_short')." ".$this->lang->line('general_word_received');
if ($qsl->COL_EQSL_QSLRDATE != null) {
$timestamp = strtotime($qsl->COL_EQSL_QSLRDATE);
echo " ".($timestamp != '' ? date($custom_date_format, $timestamp) : '');
}
echo "\" data-toggle=\"tooltip\"";
}
echo ' class="eqsl-';
echo ($qsl->COL_EQSL_QSL_RCVD=='Y')?'green':'red';
Expand All @@ -140,17 +156,25 @@
echo '<td style=\'text-align: center\' class="lotw">';
echo '<span ';
if ($qsl->COL_LOTW_QSL_SENT == "Y") {
$timestamp = strtotime($qsl->COL_LOTW_QSLSDATE);
echo "data-original-title=\"".$this->lang->line('lotw_short')." ".$this->lang->line('general_word_sent')." ".($timestamp!=''?date($custom_date_format, $timestamp):'')."\" data-toggle=\"tooltip\"";
echo "data-original-title=\"".$this->lang->line('lotw_short')." ".$this->lang->line('general_word_sent');
if ($qsl->COL_LOTW_QSLSDATE != null) {
$timestamp = strtotime($qsl->COL_LOTW_QSLSDATE);
echo " ".($timestamp != '' ? date($custom_date_format, $timestamp) : '');
}
echo "\" data-toggle=\"tooltip\"";
}
echo ' class="lotw-';
echo ($qsl->COL_LOTW_QSL_SENT=='Y')?'green':'red';
echo '">&#9650;</span>';

echo '<span ';
if ($qsl->COL_LOTW_QSL_RCVD == "Y") {
$timestamp = strtotime($qsl->COL_LOTW_QSLRDATE);
echo "data-original-title=\"".$this->lang->line('lotw_short')." ".$this->lang->line('general_word_received')." ".($timestamp!=''?date($custom_date_format, $timestamp):'')."\" data-toggle=\"tooltip\"";
echo "data-original-title=\"".$this->lang->line('lotw_short')." ".$this->lang->line('general_word_received');
if ($qsl->COL_LOTW_QSLRDATE != null) {
$timestamp = strtotime($qsl->COL_LOTW_QSLRDATE);
echo " ".($timestamp != '' ? date($custom_date_format, $timestamp) : '');
}
echo "\" data-toggle=\"tooltip\"";
}
echo ' class="lotw-';
echo ($qsl->COL_LOTW_QSL_RCVD=='Y')?'green':'red';
Expand Down
60 changes: 42 additions & 18 deletions application/views/qslprint/qsolist.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,19 +40,23 @@
echo '<td style=\'text-align: center\' class="qsl">';
echo '<span ';
if ($qsl->COL_QSL_SENT != "N") {
$timestamp = strtotime($qsl->COL_QSLSDATE);
if ($qsl->COL_QSLSDATE != null) {
$timestamp = ' '.date($custom_date_format, strtotime($qsl->COL_QSLSDATE));
} else {
$timestamp = '';
}
switch ($qsl->COL_QSL_SENT) {
case "Y":
echo "class=\"qsl-green\" data-toggle=\"tooltip\" data-original-title=\"".$this->lang->line('general_word_sent')." ".date($custom_date_format,$timestamp);
echo "class=\"qsl-green\" data-toggle=\"tooltip\" data-original-title=\"".$this->lang->line('general_word_sent').$timestamp;
break;
case "Q":
echo "class=\"qsl-yellow\" data-toggle=\"tooltip\" data-original-title=\"".$this->lang->line('general_word_queued')." ".date($custom_date_format,$timestamp);
echo "class=\"qsl-yellow\" data-toggle=\"tooltip\" data-original-title=\"".$this->lang->line('general_word_queued').$timestamp;
break;
case "R":
echo "class=\"qsl-yellow\" data-toggle=\"tooltip\" data-original-title=\"".$this->lang->line('general_word_requested')." ".date($custom_date_format,$timestamp);
echo "class=\"qsl-yellow\" data-toggle=\"tooltip\" data-original-title=\"".$this->lang->line('general_word_requested').$timestamp;
break;
case "I":
echo "class=\"qsl-grey\" data-toggle=\"tooltip\" data-original-title=\"".$this->lang->line('general_word_invalid_ignore')." ".date($custom_date_format,$timestamp);
echo "class=\"qsl-grey\" data-toggle=\"tooltip\" data-original-title=\"".$this->lang->line('general_word_invalid_ignore').$timestamp;
break;
default:
echo "class=\"qsl-red";
Expand All @@ -78,19 +82,23 @@
echo '">&#9650;</span>';
echo '<span ';
if ($qsl->COL_QSL_RCVD != "N") {
$timestamp = strtotime($qsl->COL_QSLRDATE);
if ($qsl->COL_QSLRDATE != null) {
$timestamp = ' '.date($custom_date_format, strtotime($qsl->COL_QSLRDATE));
} else {
$timestamp = '';
}
switch ($qsl->COL_QSL_RCVD) {
case "Y":
echo "class=\"qsl-green\" data-toggle=\"tooltip\" data-original-title=\"".$this->lang->line('general_word_received')." ".date($custom_date_format,$timestamp);
echo "class=\"qsl-green\" data-toggle=\"tooltip\" data-original-title=\"".$this->lang->line('general_word_received').$timestamp;
break;
case "Q":
echo "class=\"qsl-yellow\" data-toggle=\"tooltip\" data-original-title=\"".$this->lang->line('general_word_queued')." ".date($custom_date_format,$timestamp);
echo "class=\"qsl-yellow\" data-toggle=\"tooltip\" data-original-title=\"".$this->lang->line('general_word_queued').$timestamp;
break;
case "R":
echo "class=\"qsl-yellow\" data-toggle=\"tooltip\" data-original-title=\"".$this->lang->line('general_word_requested')." ".date($custom_date_format,$timestamp);
echo "class=\"qsl-yellow\" data-toggle=\"tooltip\" data-original-title=\"".$this->lang->line('general_word_requested').$timestamp;
break;
case "I":
echo "class=\"qsl-grey\" data-toggle=\"tooltip\" data-original-title=\"".$this->lang->line('general_word_invalid_ignore')." ".date($custom_date_format,$timestamp);
echo "class=\"qsl-grey\" data-toggle=\"tooltip\" data-original-title=\"".$this->lang->line('general_word_invalid_ignore').$timestamp;
break;
default:
echo "class=\"qsl-red";
Expand Down Expand Up @@ -119,17 +127,25 @@
echo '<td style=\'text-align: center\' class="eqsl">';
echo '<span ';
if ($qsl->COL_EQSL_QSL_SENT == "Y") {
$timestamp = strtotime($qsl->COL_EQSL_QSLSDATE);
echo "data-original-title=\"".$this->lang->line('eqsl_short')." ".$this->lang->line('general_word_sent')." ".($timestamp!=''?date($custom_date_format, $timestamp):'')."\" data-toggle=\"tooltip\"";
echo "data-original-title=\"".$this->lang->line('eqsl_short')." ".$this->lang->line('general_word_sent');
if ($qsl->COL_EQSL_QSLSDATE != null) {
$timestamp = strtotime($qsl->COL_EQSL_QSLSDATE);
echo " ".($timestamp != '' ? date($custom_date_format, $timestamp) : '');
}
echo "\" data-toggle=\"tooltip\"";
}
echo ' class="eqsl-';
echo ($qsl->COL_EQSL_QSL_SENT=='Y')?'green':'red';
echo '">&#9650;</span>';

echo '<span ';
if ($qsl->COL_EQSL_QSL_RCVD == "Y") {
$timestamp = strtotime($qsl->COL_EQSL_QSLRDATE);
echo "data-original-title=\"".$this->lang->line('eqsl_short')." ".$this->lang->line('general_word_received')." ".($timestamp!=''?date($custom_date_format, $timestamp):'')."\" data-toggle=\"tooltip\"";
echo "data-original-title=\"".$this->lang->line('eqsl_short')." ".$this->lang->line('general_word_received');
if ($qsl->COL_EQSL_QSLRDATE != null) {
$timestamp = strtotime($qsl->COL_EQSL_QSLRDATE);
echo " ".($timestamp != '' ? date($custom_date_format, $timestamp) : '');
}
echo "\" data-toggle=\"tooltip\"";
}
echo ' class="eqsl-';
echo ($qsl->COL_EQSL_QSL_RCVD=='Y')?'green':'red';
Expand All @@ -140,17 +156,25 @@
echo '<td style=\'text-align: center\' class="lotw">';
echo '<span ';
if ($qsl->COL_LOTW_QSL_SENT == "Y") {
$timestamp = strtotime($qsl->COL_LOTW_QSLSDATE);
echo "data-original-title=\"".$this->lang->line('lotw_short')." ".$this->lang->line('general_word_sent')." ".($timestamp!=''?date($custom_date_format, $timestamp):'')."\" data-toggle=\"tooltip\"";
echo "data-original-title=\"".$this->lang->line('lotw_short')." ".$this->lang->line('general_word_sent');
if ($qsl->COL_LOTW_QSLSDATE != null) {
$timestamp = strtotime($qsl->COL_LOTW_QSLSDATE);
echo " ".($timestamp != '' ? date($custom_date_format, $timestamp) : '');
}
echo "\" data-toggle=\"tooltip\"";
}
echo ' class="lotw-';
echo ($qsl->COL_LOTW_QSL_SENT=='Y')?'green':'red';
echo '">&#9650;</span>';

echo '<span ';
if ($qsl->COL_LOTW_QSL_RCVD == "Y") {
$timestamp = strtotime($qsl->COL_LOTW_QSLRDATE);
echo "data-original-title=\"".$this->lang->line('lotw_short')." ".$this->lang->line('general_word_received')." ".($timestamp!=''?date($custom_date_format, $timestamp):'')."\" data-toggle=\"tooltip\"";
echo "data-original-title=\"".$this->lang->line('lotw_short')." ".$this->lang->line('general_word_received');
if ($qsl->COL_LOTW_QSLRDATE) {
$timestamp = strtotime($qsl->COL_LOTW_QSLRDATE);
echo " ".($timestamp != '' ? date($custom_date_format, $timestamp) : '');
}
echo "\" data-toggle=\"tooltip\"";
}
echo ' class="lotw-';
echo ($qsl->COL_LOTW_QSL_RCVD=='Y')?'green':'red';
Expand Down
Loading