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

This PR adds some eye candy tooltips to QSLs icons as well as contest 

exchanges on various sections within cloudlog

Squashed commit of the following:

commit 89edbf3ddadd7d796ba5412388f66d14e3e9ac17
Author: phl0 <florian@florian-wolters.de>
Date:   Wed Jan 12 20:47:17 2022 +0100

    Fix flicker issue on gridmaps page (by LA8AJA)

commit 5b0c2672aadbf0451ec52ecc65745e880b44ef8f
Author: phl0 <florian@florian-wolters.de>
Date:   Wed Jan 12 19:36:31 2022 +0100

    Also show tooltips for contest name

commit 88e091f65ace6bdbae3d605839665fdd457ea943
Author: phl0 <florian@florian-wolters.de>
Date:   Wed Jan 12 19:08:31 2022 +0100

    Enable QSL tooltips also for QSO list in qslprint section

commit 91b81a0b2ba531e867f82197fe1b201e24785dd2
Author: phl0 <florian@florian-wolters.de>
Date:   Tue Jan 11 17:46:38 2022 +0100

    Prevent display of empty date values

commit a66be2dab1d23b15fa41df0a2c9a0c41f455afff
Author: phl0 <florian@florian-wolters.de>
Date:   Tue Jan 11 17:12:43 2022 +0100

    Make tooltip work also for gridsquares section
    Tnx @AndreasK79

commit 92c13483b9c71d55fa3d863d426b300cf008dd31
Author: phl0 <florian@florian-wolters.de>
Date:   Tue Jan 11 15:37:21 2022 +0100

    Implement tooltip hints also for other awards sections

commit 625c0e73c5dd5823301d888be4d0b3419a76f1db
Author: phl0 <florian@florian-wolters.de>
Date:   Mon Jan 10 19:28:47 2022 +0100

    Implement tooltip for awards section

commit 0fe9061ecf3e4b8d9826dee62779e2493124d8a5
Author: phl0 <florian@florian-wolters.de>
Date:   Mon Jan 10 16:57:35 2022 +0100

    Fix bug with extra quotes if manager defined

commit cb8e4d1e4343670a60bc93ac3e87d54d45d0a9fd
Author: phl0 <florian@florian-wolters.de>
Date:   Mon Jan 10 16:18:44 2022 +0100

    Small bugix

commit 5bca33b7a1dca1b89d0921a8e0890fc1aebccedd
Author: phl0 <florian@florian-wolters.de>
Date:   Mon Jan 10 15:42:31 2022 +0100

    Add missing translations for electronic QSL

commit 617f58a6217aa385225eab27bfe577ad55b7ff37
Author: phl0 <florian@florian-wolters.de>
Date:   Mon Jan 10 00:40:32 2022 +0100

    Enable tooltips also for search results

commit 432a1b283a19196618d4c809545d01cef4f630d3
Author: phl0 <florian@florian-wolters.de>
Date:   Mon Jan 10 00:18:33 2022 +0100

    Also QSL method/manager info

commit b43e7a1419c75a199c0a28c9849f2b09e0c62288
Author: phl0 <florian@florian-wolters.de>
Date:   Sun Jan 9 23:28:54 2022 +0100

    Show details for paper QSLs

commit 1759d94d8af7299684265700cec51fe0591623dc
Author: phl0 <florian@florian-wolters.de>
Date:   Fri Jan 7 17:51:17 2022 +0100

    Add tooltip hints for QSL sent/rcvd dates
pull/1361/head
phl0 2022-01-12 20:51:24 +01:00
rodzic 87b287beea
commit 4bdafe185f
Nie znaleziono w bazie danych klucza dla tego podpisu
ID klucza GPG: 48EA1E640798CA9A
10 zmienionych plików z 252 dodań i 81 usunięć
Pokaż statystyki Ściągnij plik aktualizacji Ściągnij plik porównania Expand all files Collapse all files

2
application/config/autoload.php
Wyświetl plik

@ -113,4 +113,4 @@ $autoload['model'] = array();
/* End of file autoload.php */
/* Location: ./application/config/autoload.php */
/* Location: ./application/config/autoload.php */

1
application/controllers/Logbook.php
Wyświetl plik

@ -12,6 +12,7 @@ class Logbook extends CI_Controller {
'contesting',
'qslcard',
'lotw',
'eqsl',
'qso'
));
}

5
application/language/english/eqsl_lang.php 100644
Wyświetl plik

@ -0,0 +1,5 @@
<?php
defined('BASEPATH') OR exit('No direct script access allowed');
$lang['eqsl_short'] = 'eQSL';

3
application/language/english/general_words_lang.php
Wyświetl plik

@ -38,11 +38,14 @@ $lang['general_word_method'] = 'Method';
$lang['general_word_sent'] = 'Sent';
$lang['general_word_received'] = 'Received';
$lang['general_word_requested'] = 'Requested';
$lang['general_word_queued'] = 'Queued';
$lang['general_word_invalid_ignore'] = 'Invalid (Ignore)';
$lang['general_word_qslcard'] = 'QSL Card';
$lang['general_word_qslcard_management'] = 'QSL Management';
$lang['general_word_qslcards'] = 'QSL Cards';
$lang['general_word_qslcard_direct'] = 'Direct';
$lang['general_word_qslcard_bureau'] = 'Bureau';
$lang['general_word_qslcard_electronic'] = 'Electronic';
$lang['general_word_qslcard_via'] = 'Via';
$lang['general_word_eqslcards'] = 'eQSL Cards';
$lang['general_word_lotw'] = 'Logbook of the World';

5
application/language/german/eqsl_lang.php 100644
Wyświetl plik

@ -0,0 +1,5 @@
<?php
defined('BASEPATH') OR exit('No direct script access allowed');
$lang['eqsl_short'] = 'eQSL';

3
application/language/german/general_words_lang.php
Wyświetl plik

@ -38,11 +38,14 @@ $lang['general_word_method'] = 'Methode';
$lang['general_word_sent'] = 'Gesendet';
$lang['general_word_received'] = 'Erhalten';
$lang['general_word_requested'] = 'Angefordert';
$lang['general_word_queued'] = 'In Warteschlange';
$lang['general_word_invalid_ignore'] = 'Ungültig (Ignorieren)';
$lang['general_word_qslcard'] = 'QSL Karte';
$lang['general_word_qslcard_management'] = 'QSL Verwaltung';
$lang['general_word_qslcards'] = 'QSL Karten';
$lang['general_word_qslcard_direct'] = 'Direkt';
$lang['general_word_qslcard_bureau'] = 'Büro';
$lang['general_word_qslcard_electronic'] = 'Elektronisch';
$lang['general_word_qslcard_via'] = 'Via';
$lang['general_word_eqslcards'] = 'eQSL Karten';
$lang['general_word_lotw'] = 'Logbook of the World';

4
application/views/dashboard/index.php
Wyświetl plik

@ -17,8 +17,8 @@ function echo_table_header_col($ctx, $name) {
function echo_table_col($row, $name) {
switch($name) {
case 'Mode': echo '<td>'; echo $row->COL_SUBMODE==null?$row->COL_MODE:$row->COL_SUBMODE . '</td>'; break;
case 'RSTS': echo '<td class="d-none d-sm-table-cell">' . $row->COL_RST_SENT; if ($row->COL_STX) { echo '<span class="badge badge-light">'; printf("%03d", $row->COL_STX); echo '</span>';} if ($row->COL_STX_STRING) { echo '<span class="badge badge-light">' . $row->COL_STX_STRING . '</span>';} echo '</td>'; break;
case 'RSTR': echo '<td class="d-none d-sm-table-cell">' . $row->COL_RST_RCVD; if ($row->COL_SRX) { echo '<span class="badge badge-light">'; printf("%03d", $row->COL_SRX); echo '</span>';} if ($row->COL_SRX_STRING) { echo '<span class="badge badge-light">' . $row->COL_SRX_STRING . '</span>';} echo '</td>'; break;
case 'RSTS': echo '<td class="d-none d-sm-table-cell">' . $row->COL_RST_SENT; if ($row->COL_STX) { echo '<span data-toggle="tooltip" data-original-title="'.($row->COL_CONTEST_ID!=""?$row->COL_CONTEST_ID:"n/a").'" class="badge badge-light">'; printf("%03d", $row->COL_STX); echo '</span>';} if ($row->COL_STX_STRING) { echo '<span data-toggle="tooltip" data-original-title="'.($row->COL_CONTEST_ID!=""?$row->COL_CONTEST_ID:"n/a").'" class="badge badge-light">' . $row->COL_STX_STRING . '</span>';} echo '</td>'; break;
case 'RSTR': echo '<td class="d-none d-sm-table-cell">' . $row->COL_RST_RCVD; if ($row->COL_SRX) { echo '<span data-toggle="tooltip" data-original-title="'.($row->COL_CONTEST_ID!=""?$row->COL_CONTEST_ID:"n/a").'" class="badge badge-light">'; printf("%03d", $row->COL_SRX); echo '</span>';} if ($row->COL_SRX_STRING) { echo '<span data-toggle="tooltip" data-original-title="'.($row->COL_CONTEST_ID!=""?$row->COL_CONTEST_ID:"n/a").'" class="badge badge-light">' . $row->COL_SRX_STRING . '</span>';} echo '</td>'; break;
case 'Country': echo '<td>' . ucwords(strtolower(($row->COL_COUNTRY))) . '</td>'; break;
case 'IOTA': echo '<td>' . ($row->COL_IOTA) . '</td>'; break;
case 'SOTA': echo '<td>' . ($row->COL_SOTA_REF) . '</td>'; break;

35
application/views/interface_assets/footer.php
Wyświetl plik

@ -612,6 +612,11 @@ function getLookupResult() {
<?php if ($this->uri->segment(1) == "search") { ?>
<script type="text/javascript">
$(function () {
$('[data-toggle="tooltip"]').tooltip()
});
</script>
<script type="text/javascript">
i=0;
@ -619,7 +624,9 @@ function searchButtonPress(){
event.preventDefault()
if ($('#callsign').val()) {
let fixedcall = $('#callsign').val();
$('#partial_view').load("logbook/search_result/" + fixedcall.replace('Ø', '0'), function() {});
$('#partial_view').load("logbook/search_result/" + fixedcall.replace('Ø', '0'), function() {
$('[data-toggle="tooltip"]').tooltip()
});
}
}
@ -627,6 +634,7 @@ $(document).ready(function(){
<?php if($this->input->post('callsign') != "") { ?>
$('#partial_view').load("logbook/search_result/<?php echo str_replace("Ø","0",$this->input->post('callsign')); ?>", function() {
$('[data-toggle="tooltip"]').tooltip()
});
<?php } ?>
@ -635,7 +643,9 @@ $(document).on('keypress',function(e) {
if ($('#callsign').val()) {
let fixedcall = $('#callsign').val();
$('#partial_view').load("logbook/search_result/" + fixedcall.replace('Ø', '0'), function() {});
$('#partial_view').load("logbook/search_result/" + fixedcall.replace('Ø', '0'), function() {
$('[data-toggle="tooltip"]').tooltip()
});
}
event.preventDefault();
@ -651,6 +661,11 @@ $(document).on('keypress',function(e) {
<?php if ($this->uri->segment(1) == "logbook" && $this->uri->segment(2) != "view") { ?>
<script type="text/javascript" src="<?php echo base_url();?>assets/js/leaflet/L.Maidenhead.js"></script>
<script type="text/javascript" src="<?php echo base_url();?>assets/js/leaflet/leafembed.js"></script>
<script type="text/javascript">
$(function () {
$('[data-toggle="tooltip"]').tooltip()
});
</script>
<script type="text/javascript">
<?php if($qra == "set") { ?>
var q_lat = <?php echo $qra_lat; ?>;
@ -1110,6 +1125,7 @@ $(document).ready(function(){
if (count > 0) {
$('#square_number').text(loc_4char);
$('#exampleModal').modal('show');
$('[data-toggle="tooltip"]').tooltip({ boundary: 'window' });
}
}
});
@ -1298,6 +1314,9 @@ $(document).ready(function(){
cssClass: 'qso-dok-dialog',
nl2br: false,
message: html,
onshown: function(dialog) {
$('[data-toggle="tooltip"]').tooltip();
},
buttons: [{
label: 'Close',
action: function (dialogItself) {
@ -1718,6 +1737,9 @@ $(document).ready(function(){
cssClass: 'qso-was-dialog',
nl2br: false,
message: html,
onshown: function(dialog) {
$('[data-toggle="tooltip"]').tooltip();
},
buttons: [{
label: 'Close',
action: function (dialogItself) {
@ -1864,6 +1886,9 @@ function deleteQsl(id) {
cssClass: 'qso-dialog',
nl2br: false,
message: html,
onshown: function(dialog) {
$('[data-toggle="tooltip"]').tooltip();
},
buttons: [{
label: 'Close',
action: function (dialogItself) {
@ -2123,6 +2148,9 @@ function deleteQsl(id) {
cssClass: 'qso-counties-dialog',
nl2br: false,
message: html,
onshown: function(dialog) {
$('[data-toggle="tooltip"]').tooltip();
},
buttons: [{
label: 'Close',
action: function (dialogItself) {
@ -2282,6 +2310,9 @@ function deleteQsl(id) {
cssClass: 'qso-dialog',
nl2br: false,
message: html,
onshown: function(dialog) {
$('[data-toggle="tooltip"]').tooltip();
},
buttons: [{
label: 'Close',
action: function (dialogItself) {

155
application/views/qslprint/qsolist.php
Wyświetl plik

@ -10,12 +10,12 @@ if ($qsos->result() != NULL) {
<th style=\'text-align: center\'>' . $this->lang->line('gen_hamradio_band') . '</th>
<th style=\'text-align: center\'>' . $this->lang->line('gen_hamradio_station') . '</th>
<th style=\'text-align: center\'>QSL</th>';
if($this->session->userdata('user_lotw_name') != "") {
echo '<th style=\'text-align: center\'>LoTW</th>';
}
if ($this->session->userdata('user_eqsl_name') != "") {
echo '<th style=\'text-align: center\'>eQSL</th>';
}
if($this->session->userdata('user_lotw_name') != "") {
echo '<th style=\'text-align: center\'>LoTW</th>';
}
echo '<th style=\'text-align: center\'></th>
</tr>
</thead><tbody>';
@ -37,38 +37,125 @@ if ($qsos->result() != NULL) {
echo '<td style=\'text-align: center\'>'; echo $qsl->COL_SUBMODE==null?$qsl->COL_MODE:$qsl->COL_SUBMODE; echo '</td>';
echo '<td style=\'text-align: center\'>'; if($qsl->COL_SAT_NAME != null) { echo $qsl->COL_SAT_NAME; } else { echo strtolower($qsl->COL_BAND); }; echo '</td>';
echo '<td style=\'text-align: center\'><span class="badge badge-light">' . $qsl->station_callsign . '</span></td>';
echo '<td style=\'text-align: center\' class="qsl">
<span class="qsl-';
switch ($qsl->COL_QSL_SENT) {
case "Y": echo "green"; break;
case "Q": echo "yellow"; break;
case "R": echo "yellow"; break;
case "I": echo "grey"; break;
default: echo "red";
}
echo '">&#9650;</span>
<span class="qsl-';
switch ($qsl->COL_QSL_RCVD) {
case "Y": echo "green"; break;
case "Q": echo "yellow"; break;
case "R": echo "yellow"; break;
case "I": echo "grey"; break;
default: echo "red";
}
echo '">&#9660;</span></td>';
if($this->session->userdata('user_lotw_name') != "") {
echo '<td style=\'text-align: center\' class="lotw">';
if ($qsl->COL_LOTW_QSL_SENT != ''){
echo '<span class="lotw-' . ($qsl->COL_LOTW_QSL_SENT=='Y'?'green':'red') . '">&#9650;</span>
<span class="lotw-' . ($qsl->COL_LOTW_QSL_RCVD=='Y'?'green':'red') . '">&#9660;</span>';
}
echo '</td>';
}
echo '<td style=\'text-align: center\' class="qsl">';
echo '<span ';
if ($qsl->COL_QSL_SENT != "N") {
$timestamp = strtotime($qsl->COL_QSLSDATE);
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);
break;
case "Q":
echo "class=\"qsl-yellow\" data-toggle=\"tooltip\" data-original-title=\"".$this->lang->line('general_word_queued')." ".date($custom_date_format,$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);
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);
break;
default:
echo "class=\"qsl-red";
break;
}
} else { echo "class=\"qsl-red"; }
if ($qsl->COL_QSL_SENT_VIA != "") {
switch ($qsl->COL_QSL_SENT_VIA) {
case "B":
echo " (".$this->lang->line('general_word_qslcard_bureau').")";
break;
case "D":
echo " (".$this->lang->line('general_word_qslcard_direct').")";
break;
case "M":
echo " (".$this->lang->line('general_word_qslcard_via').": ".($qsl->COL_QSL_VIA!="" ? $qsl->COL_QSL_VIA:"n/a").")";
break;
case "E":
echo " (".$this->lang->line('general_word_qslcard_electronic').")";
break;
}
}
echo '">&#9650;</span>';
echo '<span ';
if ($qsl->COL_QSL_RCVD != "N") {
$timestamp = strtotime($qsl->COL_QSLRDATE);
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);
break;
case "Q":
echo "class=\"qsl-yellow\" data-toggle=\"tooltip\" data-original-title=\"".$this->lang->line('general_word_queued')." ".date($custom_date_format,$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);
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);
break;
default:
echo "class=\"qsl-red";
break;
}
} else { echo "class=\"qsl-red"; }
if ($qsl->COL_QSL_RCVD_VIA != "") {
switch ($qsl->COL_QSL_RCVD_VIA) {
case "B":
echo " (".$this->lang->line('general_word_qslcard_bureau').")";
break;
case "D":
echo " (".$this->lang->line('general_word_qslcard_direct').")";
break;
case "M":
echo " (Manager)";
break;
case "E":
echo " (".$this->lang->line('general_word_qslcard_electronic').")";
break;
}
}
echo '">&#9660;</span>';
if ($this->session->userdata('user_eqsl_name') != ""){
echo '<td style=\'text-align: center\' class="eqsl">
<span class="eqsl-' . ($qsl->COL_EQSL_QSL_SENT=='Y'?'green':'red') . '">&#9650;</span>
<span class="eqsl-' . ($qsl->COL_EQSL_QSL_RCVD=='Y'?'green':'red') . '">&#9660;</span>
</td>';
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 ' 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 ' class="eqsl-';
echo ($qsl->COL_EQSL_QSL_RCVD=='Y')?'green':'red';
echo '">&#9660;</span>';
echo '</td>';
}
if($this->session->userdata('user_lotw_name') != "") {
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 ' 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 ' class="lotw-';
echo ($qsl->COL_LOTW_QSL_RCVD=='Y')?'green':'red';
echo '">&#9660;</span>';
echo '</td>';
}
echo '<td id="'.$qsl->COL_PRIMARY_KEY.'" style=\'text-align: center\'><button onclick="addQsoToPrintQueue(\''.$qsl->COL_PRIMARY_KEY.'\')" class="btn btn-sm btn-success">Add to print queue</button></td>';
echo '</tr>';

120
application/views/view_log/partial/log_ajax.php
Wyświetl plik

@ -18,8 +18,8 @@ function echo_table_header_col($ctx, $name) {
function echo_table_col($row, $name) {
switch($name) {
case 'Mode': echo '<td>'; echo $row->COL_SUBMODE==null?$row->COL_MODE:$row->COL_SUBMODE . '</td>'; break;
case 'RSTS': echo '<td>' . $row->COL_RST_SENT; if ($row->COL_STX) { echo '<span class="badge badge-light">'; printf("%03d", $row->COL_STX); echo '</span>';} if ($row->COL_STX_STRING) { echo '<span class="badge badge-light">' . $row->COL_STX_STRING . '</span>';} echo '</td>'; break;
case 'RSTR': echo '<td>' . $row->COL_RST_RCVD; if ($row->COL_SRX) { echo '<span class="badge badge-light">'; printf("%03d", $row->COL_SRX); echo '</span>';} if ($row->COL_SRX_STRING) { echo '<span class="badge badge-light">' . $row->COL_SRX_STRING . '</span>';} echo '</td>'; break;
case 'RSTS': echo '<td>' . $row->COL_RST_SENT; if ($row->COL_STX) { echo '<span data-toggle="tooltip" data-original-title="'.($row->COL_CONTEST_ID!=""?$row->COL_CONTEST_ID:"n/a").'" class="badge badge-light">'; printf("%03d", $row->COL_STX); echo '</span>';} if ($row->COL_STX_STRING) { echo '<span data-toggle="tooltip" data-original-title="'.($row->COL_CONTEST_ID!=""?$row->COL_CONTEST_ID:"n/a").'" class="badge badge-light">' . $row->COL_STX_STRING . '</span>';} echo '</td>'; break;
case 'RSTR': echo '<td>' . $row->COL_RST_RCVD; if ($row->COL_SRX) { echo '<span data-toggle="tooltip" data-original-title="'.($row->COL_CONTEST_ID!=""?$row->COL_CONTEST_ID:"n/a").'" class="badge badge-light">'; printf("%03d", $row->COL_SRX); echo '</span>';} if ($row->COL_SRX_STRING) { echo '<span data-toggle="tooltip" data-original-title="'.($row->COL_CONTEST_ID!=""?$row->COL_CONTEST_ID:"n/a").'" class="badge badge-light">' . $row->COL_SRX_STRING . '</span>';} echo '</td>'; break;
case 'Country': echo '<td>' . ucwords(strtolower(($row->COL_COUNTRY))) . '</td>'; break;
case 'IOTA': echo '<td>' . ($row->COL_IOTA) . '</td>'; break;
case 'SOTA': echo '<td>' . ($row->COL_SOTA_REF) . '</td>'; break;
@ -91,48 +91,84 @@ function echo_table_col($row, $name) {
if(($this->config->item('use_auth')) && ($this->session->userdata('user_type') >= 2)) { ?>
<td class="qsl">
<span class="qsl-<?php
switch ($row->COL_QSL_SENT) {
case "Y":
echo "green";
break;
case "Q":
echo "yellow";
break;
case "R":
echo "yellow";
break;
case "I":
echo "grey";
break;
default:
echo "red";
}
?>">&#9650;</span>
<span class="qsl-<?php
switch ($row->COL_QSL_RCVD) {
case "Y":
echo "green";
break;
case "Q":
echo "yellow";
break;
case "R":
echo "yellow";
break;
case "I":
echo "grey";
break;
default:
echo "red";
}
?>">&#9660;</span>
<span <?php if ($row->COL_QSL_SENT != "N") {
$timestamp = strtotime($row->COL_QSLSDATE);
switch ($row->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);
break;
case "Q":
echo "class=\"qsl-yellow\" data-toggle=\"tooltip\" data-original-title=\"".$this->lang->line('general_word_queued')." ".date($custom_date_format,$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);
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);
break;
default:
echo "class=\"qsl-red";
break;
}
} else { echo "class=\"qsl-red"; }
if ($row->COL_QSL_SENT_VIA != "") {
switch ($row->COL_QSL_SENT_VIA) {
case "B":
echo " (".$this->lang->line('general_word_qslcard_bureau').")";
break;
case "D":
echo " (".$this->lang->line('general_word_qslcard_direct').")";
break;
case "M":
echo " (".$this->lang->line('general_word_qslcard_via').": ".($row->COL_QSL_VIA!="" ? $row->COL_QSL_VIA:"n/a").")";
break;
case "E":
echo " (".$this->lang->line('general_word_qslcard_electronic').")";
break;
}
} ?>">&#9650;</span>
<span <?php if ($row->COL_QSL_RCVD != "N") {
$timestamp = strtotime($row->COL_QSLRDATE);
switch ($row->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);
break;
case "Q":
echo "class=\"qsl-yellow\" data-toggle=\"tooltip\" data-original-title=\"".$this->lang->line('general_word_queued')." ".date($custom_date_format,$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);
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);
break;
default:
echo "class=\"qsl-red";
break;
}
} else { echo "class=\"qsl-red"; }
if ($row->COL_QSL_RCVD_VIA != "") {
switch ($row->COL_QSL_RCVD_VIA) {
case "B":
echo " (".$this->lang->line('general_word_qslcard_bureau').")";
break;
case "D":
echo " (".$this->lang->line('general_word_qslcard_direct').")";
break;
case "M":
echo " (Manager)";
break;
case "E":
echo " (".$this->lang->line('general_word_qslcard_electronic').")";
break;
}
} ?>">&#9660;</span>
</td>
<?php if ($this->session->userdata('user_eqsl_name') != ""){ ?>
<td class="eqsl">
<span class="eqsl-<?php echo ($row->COL_EQSL_QSL_SENT=='Y')?'green':'red'?>">&#9650;</span>
<span class="eqsl-<?php echo ($row->COL_EQSL_QSL_RCVD=='Y')?'green':'red'?>">
<span <?php if ($row->COL_EQSL_QSL_SENT == "Y") { $timestamp = strtotime($row->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\""; } ?> class="eqsl-<?php echo ($row->COL_EQSL_QSL_SENT=='Y')?'green':'red'?>">&#9650;</span>
<span <?php if ($row->COL_EQSL_QSL_RCVD == "Y") { $timestamp = strtotime($row->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\""; } ?> class="eqsl-<?php echo ($row->COL_EQSL_QSL_RCVD=='Y')?'green':'red'?>">
<?php if($row->COL_EQSL_QSL_RCVD =='Y') { ?>
<a style="color: green" href="<?php echo site_url("eqsl/image/".$row->COL_PRIMARY_KEY); ?>" data-fancybox="images" data-width="528" data-height="336">&#9660;</a>
<?php } else { ?>
@ -145,8 +181,8 @@ function echo_table_col($row, $name) {
<?php if($this->session->userdata('user_lotw_name') != "") { ?>
<td class="lotw">
<?php if ($row->COL_LOTW_QSL_SENT != ''){ ?>
<span class="lotw-<?php echo ($row->COL_LOTW_QSL_SENT=='Y')?'green':'red'?>">&#9650;</span>
<span class="lotw-<?php echo ($row->COL_LOTW_QSL_RCVD=='Y')?'green':'red'?>">&#9660;</span>
<span <?php if ($row->COL_LOTW_QSL_SENT == "Y") { $timestamp = strtotime($row->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\""; } ?> class="lotw-<?php echo ($row->COL_LOTW_QSL_SENT=='Y')?'green':'red'?>">&#9650;</span>
<span <?php if ($row->COL_LOTW_QSL_RCVD == "Y") { $timestamp = strtotime($row->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\""; } ?> class="lotw-<?php echo ($row->COL_LOTW_QSL_RCVD=='Y')?'green':'red'?>">&#9660;</span>
<?php } ?>
</td>
<?php } ?>