removed redundant code
这个提交包含在：
Peter Goodhall
父节点
4407da4c22
当前提交
af60e40315
共有 3 个文件被更改，包括 60 次插入 和 70 次删除
|
|
@ -469,7 +469,6 @@ class Qrz extends CI_Controller {
|
||||||
$tableheaders .= "<td>Mode</td>";
|
$tableheaders .= "<td>Mode</td>";
|
||||||
$tableheaders .= "<td>QRZ QSL Received</td>";
|
$tableheaders .= "<td>QRZ QSL Received</td>";
|
||||||
$tableheaders .= "<td>QRZ Confirmed</td>";
|
$tableheaders .= "<td>QRZ Confirmed</td>";
|
||||||
$tableheaders .= "<td>Log Status</td>";
|
|
||||||
$tableheaders .= "</tr>";
|
$tableheaders .= "</tr>";
|
||||||
|
|
||||||
$table = "";
|
$table = "";
|
||||||
|
|
|
||||||
|
|
@ -4931,7 +4931,6 @@ class Logbook_model extends CI_Model
|
||||||
$table .= "<td>" . $record['mode'] . "</td>";
|
$table .= "<td>" . $record['mode'] . "</td>";
|
||||||
$table .= "<td>" . $record['qsl_date'] . "</td>";
|
$table .= "<td>" . $record['qsl_date'] . "</td>";
|
||||||
$table .= "<td>" . ($record['qsl_rcvd'] == 'Y' ? '<span class="badge text-bg-success">Yes</span>' : '<span class="badge text-bg-danger">No</span>') . "</td>";
|
$table .= "<td>" . ($record['qsl_rcvd'] == 'Y' ? '<span class="badge text-bg-success">Yes</span>' : '<span class="badge text-bg-danger">No</span>') . "</td>";
|
||||||
$table .= "<td>" . $log_status . "</td>";
|
|
||||||
$table .= "</tr>";
|
$table .= "</tr>";
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -1,10 +1,9 @@
|
||||||
|
|
||||||
<div class="container adif" id="qrz_export">
|
<div class="container adif" id="qrz_export">
|
||||||
|
|
||||||
<h2><?php echo $page_title; ?></h2>
|
<h2><?php echo $page_title; ?></h2>
|
||||||
|
|
||||||
<div class="card">
|
<div class="card">
|
||||||
<div class="card-header">
|
<div class="card-header">
|
||||||
<ul class="nav nav-tabs card-header-tabs pull-right" role="tablist">
|
<ul class="nav nav-tabs card-header-tabs pull-right" role="tablist">
|
||||||
<li class="nav-item">
|
<li class="nav-item">
|
||||||
<a class="nav-link active" id="export-tab" data-bs-toggle="tab" href="#export" role="tab" aria-controls="import" aria-selected="true">Upload Logbook</a>
|
<a class="nav-link active" id="export-tab" data-bs-toggle="tab" href="#export" role="tab" aria-controls="import" aria-selected="true">Upload Logbook</a>
|
||||||
|
|
@ -17,18 +16,18 @@
|
||||||
</li>
|
</li>
|
||||||
</ul>
|
</ul>
|
||||||
|
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
<div class="card-body">
|
<div class="card-body">
|
||||||
<div class="tab-content">
|
<div class="tab-content">
|
||||||
<div class="tab-pane active" id="export" role="tabpanel" aria-labelledby="export-tab">
|
<div class="tab-pane active" id="export" role="tabpanel" aria-labelledby="export-tab">
|
||||||
<p>Here you can see and upload all QSOs which have not been previously uploaded to a QRZ logbook.</p>
|
<p>Here you can see and upload all QSOs which have not been previously uploaded to a QRZ logbook.</p>
|
||||||
<p>You need to set a QRZ Logbook API key in your station profile. Only station profiles with an API Key set are displayed.</p>
|
<p>You need to set a QRZ Logbook API key in your station profile. Only station profiles with an API Key set are displayed.</p>
|
||||||
<p><span class="badge text-bg-warning">Warning</span> This might take a while as QSO uploads are processed sequentially.</p>
|
<p><span class="badge text-bg-warning">Warning</span> This might take a while as QSO uploads are processed sequentially.</p>
|
||||||
|
|
||||||
<?php
|
<?php
|
||||||
if ($station_profile->result()) {
|
if ($station_profile->result()) {
|
||||||
echo '
|
echo '
|
||||||
|
|
||||||
<table class="table table-bordered table-hover table-striped table-condensed text-center">
|
<table class="table table-bordered table-hover table-striped table-condensed text-center">
|
||||||
<thead>
|
<thead>
|
||||||
|
|
@ -41,66 +40,59 @@
|
||||||
<td>Actions</td>
|
<td>Actions</td>
|
||||||
</thead>
|
</thead>
|
||||||
<tbody>';
|
<tbody>';
|
||||||
foreach ($station_profile->result() as $station) { // Fills the table with the data
|
foreach ($station_profile->result() as $station) { // Fills the table with the data
|
||||||
echo '<tr>';
|
echo '<tr>';
|
||||||
echo '<td>' . $station->station_profile_name . '</td>';
|
echo '<td>' . $station->station_profile_name . '</td>';
|
||||||
echo '<td>' . $station->station_callsign . '</td>';
|
echo '<td>' . $station->station_callsign . '</td>';
|
||||||
echo '<td id ="modcount'.$station->station_id.'">' . $station->modcount . '</td>';
|
echo '<td id ="modcount' . $station->station_id . '">' . $station->modcount . '</td>';
|
||||||
echo '<td id ="notcount'.$station->station_id.'">' . $station->notcount . '</td>';
|
echo '<td id ="notcount' . $station->station_id . '">' . $station->notcount . '</td>';
|
||||||
echo '<td id ="totcount'.$station->station_id.'">' . $station->totcount . '</td>';
|
echo '<td id ="totcount' . $station->station_id . '">' . $station->totcount . '</td>';
|
||||||
echo '<td><button id="qrzUpload" type="button" name="qrzUpload" class="btn btn-primary btn-sm ld-ext-right ld-ext-right-'.$station->station_id.'" onclick="ExportQrz('. $station->station_id .')"><i class="fas fa-cloud-upload-alt"></i> Upload<div class="ld ld-ring ld-spin"></div></button></td>';
|
echo '<td><button id="qrzUpload" type="button" name="qrzUpload" class="btn btn-primary btn-sm ld-ext-right ld-ext-right-' . $station->station_id . '" onclick="ExportQrz(' . $station->station_id . ')"><i class="fas fa-cloud-upload-alt"></i> Upload<div class="ld ld-ring ld-spin"></div></button></td>';
|
||||||
echo '</tr>';
|
echo '</tr>';
|
||||||
}
|
}
|
||||||
echo '</tfoot></table>';
|
echo '</tfoot></table>';
|
||||||
|
} else {
|
||||||
|
echo '<div class="alert alert-danger" role="alert">Nothing found!</div>';
|
||||||
|
}
|
||||||
|
?>
|
||||||
|
|
||||||
}
|
</div>
|
||||||
else {
|
<div class="tab-pane fade" id="import" role="tabpanel" aria-labelledby="home-tab">
|
||||||
echo '<div class="alert alert-danger" role="alert">Nothing found!</div>';
|
|
||||||
}
|
|
||||||
?>
|
|
||||||
|
|
||||||
</div>
|
<form class="form" action="<?php echo site_url('qrz/import_qrz'); ?>" method="post" enctype="multipart/form-data">
|
||||||
<div class="tab-pane fade" id="import" role="tabpanel" aria-labelledby="home-tab">
|
Download QSOs from QRZ Logbook for all Locations<br>
|
||||||
|
<button type="submit" class="btn btn-sm btn-primary" value="Export">Download from QRZ Logbook</button>
|
||||||
|
</form>
|
||||||
|
</div>
|
||||||
|
|
||||||
<form class="form" action="<?php echo site_url('qrz/import_qrz'); ?>" method="post" enctype="multipart/form-data">
|
<div class="tab-pane fade" id="mark" role="tabpanel" aria-labelledby="home-tab">
|
||||||
<p><span class="badge text-bg-warning">Warning</span> If no startdate is given then all QSOs after last confirmation will be downloaded/updated!</p>
|
|
||||||
<div class="row">
|
<form class="form" action="<?php echo site_url('qrz/mark_qrz'); ?>" method="post" enctype="multipart/form-data">
|
||||||
<div class="col-md-2">
|
<select name="station_profile" class="form-select mb-4 me-sm-4" style="width: 30%;">
|
||||||
<label for="from"><?php echo lang('gen_from_date') . ": " ?></label>
|
<option disabled value="0">Select Station Location</option>
|
||||||
<input name="from" id="from" type="date" class="form-control w-auto">
|
<?php foreach ($station_profiles->result() as $station) { ?>
|
||||||
|
<option <?php if ($station->station_active) {
|
||||||
|
echo "selected ";
|
||||||
|
} ?>value="<?php echo $station->station_id; ?>">Callsign: <?php echo $station->station_callsign; ?> (<?php echo $station->station_profile_name; ?>)</option>
|
||||||
|
<?php } ?>
|
||||||
|
</select>
|
||||||
|
<p><span class="badge text-bg-warning">Warning</span> If a date range is not selected then all QSOs will be marked!</p>
|
||||||
|
<div class="row">
|
||||||
|
<div class="col-md-2">
|
||||||
|
<label for="from"><?php echo lang('gen_from_date') . ": " ?></label>
|
||||||
|
<input name="from" id="from" type="date" class="form-control w-auto">
|
||||||
|
</div>
|
||||||
|
|
||||||
|
<div class="col-md-2">
|
||||||
|
<label for="to"><?php echo lang('gen_to_date') . ": " ?></label>
|
||||||
|
<input name="to" id="to" type="date" class="form-control w-auto">
|
||||||
|
</div>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
<br>
|
||||||
<br>
|
<button type="submit" class="btn btn-sm btn-primary" value="Export">Mark QSOs as exported to QRZ Logbook</button>
|
||||||
<button type="submit" class="btn btn-sm btn-primary" value="Export">Download from QRZ Logbook</button>
|
</form>
|
||||||
</form>
|
</div>
|
||||||
</div>
|
|
||||||
|
|
||||||
<div class="tab-pane fade" id="mark" role="tabpanel" aria-labelledby="home-tab">
|
|
||||||
|
|
||||||
<form class="form" action="<?php echo site_url('qrz/mark_qrz'); ?>" method="post" enctype="multipart/form-data">
|
|
||||||
<select name="station_profile" class="form-select mb-4 me-sm-4" style="width: 30%;">
|
|
||||||
<option disabled value="0">Select Station Location</option>
|
|
||||||
<?php foreach ($station_profiles->result() as $station) { ?>
|
|
||||||
<option <?php if ($station->station_active) { echo "selected "; } ?>value="<?php echo $station->station_id; ?>">Callsign: <?php echo $station->station_callsign; ?> (<?php echo $station->station_profile_name; ?>)</option>
|
|
||||||
<?php } ?>
|
|
||||||
</select>
|
|
||||||
<p><span class="badge text-bg-warning">Warning</span> If a date range is not selected then all QSOs will be marked!</p>
|
|
||||||
<div class="row">
|
|
||||||
<div class="col-md-2">
|
|
||||||
<label for="from"><?php echo lang('gen_from_date') . ": " ?></label>
|
|
||||||
<input name="from" id="from" type="date" class="form-control w-auto">
|
|
||||||
</div>
|
|
||||||
|
|
||||||
<div class="col-md-2">
|
|
||||||
<label for="to"><?php echo lang('gen_to_date') . ": " ?></label>
|
|
||||||
<input name="to" id="to" type="date" class="form-control w-auto">
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
<br>
|
|
||||||
<button type="submit" class="btn btn-sm btn-primary" value="Export">Mark QSOs as exported to QRZ Logbook</button>
|
|
||||||
</form>
|
|
||||||
</div>
|
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
正在加载…
在新工单中引用