kopia lustrzana https://github.com/magicbug/Cloudlog
Merge pull request #2117 from phl0/reOrdereQSL
Align ordering of QSL to match with overview viewpull/2118/head
commit
83ebfb50b9
|
@ -203,12 +203,12 @@
|
||||||
<th>Name</th>
|
<th>Name</th>
|
||||||
<th>QSL Via</th>
|
<th>QSL Via</th>
|
||||||
<th>QSL</th>
|
<th>QSL</th>
|
||||||
<?php if ($this->session->userdata('user_lotw_name') != ""){
|
|
||||||
echo '<th class="lotwconfirmation">LoTW</th>';
|
|
||||||
} ?>
|
|
||||||
<?php if ($this->session->userdata('user_eqsl_name') != ""){
|
<?php if ($this->session->userdata('user_eqsl_name') != ""){
|
||||||
echo '<th class="eqslconfirmation">eQSL</th>';
|
echo '<th class="eqslconfirmation">eQSL</th>';
|
||||||
} ?>
|
} ?>
|
||||||
|
<?php if ($this->session->userdata('user_lotw_name') != ""){
|
||||||
|
echo '<th class="lotwconfirmation">LoTW</th>';
|
||||||
|
} ?>
|
||||||
<th>QSL Msg</th>
|
<th>QSL Msg</th>
|
||||||
<th>DXCC</th>
|
<th>DXCC</th>
|
||||||
<th>State</th>
|
<th>State</th>
|
||||||
|
|
|
@ -27,12 +27,12 @@ function updateRow(qso) {
|
||||||
cells.eq(c++).text(qso.name);
|
cells.eq(c++).text(qso.name);
|
||||||
cells.eq(c++).text(qso.qslVia);
|
cells.eq(c++).text(qso.qslVia);
|
||||||
cells.eq(c++).html(qso.qsl);
|
cells.eq(c++).html(qso.qsl);
|
||||||
if ($(".lotwconfirmation")[0]){
|
|
||||||
cells.eq(c++).html(qso.lotw);
|
|
||||||
}
|
|
||||||
if ($(".eqslconfirmation")[0]){
|
if ($(".eqslconfirmation")[0]){
|
||||||
cells.eq(c++).html(qso.eqsl);
|
cells.eq(c++).html(qso.eqsl);
|
||||||
}
|
}
|
||||||
|
if ($(".lotwconfirmation")[0]){
|
||||||
|
cells.eq(c++).html(qso.lotw);
|
||||||
|
}
|
||||||
cells.eq(c++).text(qso.qslMessage);
|
cells.eq(c++).text(qso.qslMessage);
|
||||||
cells.eq(c++).text(qso.dxcc);
|
cells.eq(c++).text(qso.dxcc);
|
||||||
cells.eq(c++).text(qso.state);
|
cells.eq(c++).text(qso.state);
|
||||||
|
@ -82,12 +82,12 @@ function loadQSOTable(rows) {
|
||||||
data.push(qso.name);
|
data.push(qso.name);
|
||||||
data.push(qso.qslVia);
|
data.push(qso.qslVia);
|
||||||
data.push(qso.qsl);
|
data.push(qso.qsl);
|
||||||
if ($(".lotwconfirmation")[0]){
|
|
||||||
data.push(qso.lotw);
|
|
||||||
}
|
|
||||||
if ($(".eqslconfirmation")[0]){
|
if ($(".eqslconfirmation")[0]){
|
||||||
data.push(qso.eqsl);
|
data.push(qso.eqsl);
|
||||||
}
|
}
|
||||||
|
if ($(".lotwconfirmation")[0]){
|
||||||
|
data.push(qso.lotw);
|
||||||
|
}
|
||||||
data.push(qso.qslMessage);
|
data.push(qso.qslMessage);
|
||||||
data.push(qso.dxcc+(qso.end == null ? '' : ' <span class="badge badge-danger">Deleted DXCC</span>'));
|
data.push(qso.dxcc+(qso.end == null ? '' : ' <span class="badge badge-danger">Deleted DXCC</span>'));
|
||||||
data.push(qso.state);
|
data.push(qso.state);
|
||||||
|
|
|
@ -372,7 +372,7 @@ class QSO
|
||||||
$eqslstring .= "\" data-toggle=\"tooltip\"";
|
$eqslstring .= "\" data-toggle=\"tooltip\"";
|
||||||
}
|
}
|
||||||
|
|
||||||
$eqslstring .= ' class="eqsl-' . (($data['COL_EQSL_QSL_SENT'] =='Y') ? 'green':'red') . '">▲</span><span';
|
$eqslstring .= ' class="eqsl-' . (($data['COL_EQSL_QSL_SENT'] =='Y') ? 'green':'red') . '">▲</span><span ';
|
||||||
|
|
||||||
if ($data['COL_EQSL_QSL_RCVD'] == "Y") {
|
if ($data['COL_EQSL_QSL_RCVD'] == "Y") {
|
||||||
$eqslstring .= "data-original-title=\"".$CI->lang->line('eqsl_short')." ".$CI->lang->line('general_word_received');
|
$eqslstring .= "data-original-title=\"".$CI->lang->line('eqsl_short')." ".$CI->lang->line('general_word_received');
|
||||||
|
|
Ładowanie…
Reference in New Issue