goodspeed/Cloudlog
1
0
派生 0
代码 工单 合并请求 项目 版本发布 软件包 百科 动态 Actions

[QRB Link] Added globe link to dashboard, logbook and qso. Spawns QRB window.

浏览代码
这个提交包含在：
Andreas 2022-02-19 19:46:07 +01:00
父节点 b94eb1909b
当前提交 274ecf85cb
共有 5 个文件被更改，包括 31 次插入 和 12 次删除
显示统计信息 下载 Patch 文件 下载 Diff 文件 展开所有文件 折叠所有文件

10
application/views/dashboard/index.php
查看文件

@ -22,12 +22,20 @@ function echo_table_col($row, $name) {
case 'Country': echo '<td>' . ucwords(strtolower(($row->COL_COUNTRY))) . '</td>'; break; case 'Country': echo '<td>' . ucwords(strtolower(($row->COL_COUNTRY))) . '</td>'; break;
case 'IOTA': echo '<td>' . ($row->COL_IOTA) . '</td>'; break; case 'IOTA': echo '<td>' . ($row->COL_IOTA) . '</td>'; break;
case 'SOTA': echo '<td>' . ($row->COL_SOTA_REF) . '</td>'; break; case 'SOTA': echo '<td>' . ($row->COL_SOTA_REF) . '</td>'; break;
case 'Grid': echo '<td>'; echo strlen($row->COL_GRIDSQUARE)==0?$row->COL_VUCC_GRIDS:$row->COL_GRIDSQUARE . '</td>'; break; case 'Grid': echo '<td>'; echoQrbCalcLink($row->COL_VUCC_GRIDS, $row->COL_GRIDSQUARE); echo '</td>'; break;
case 'Band': echo '<td>'; if($row->COL_SAT_NAME != null) { echo $row->COL_SAT_NAME; } else { echo strtolower($row->COL_BAND); } echo '</td>'; break; case 'Band': echo '<td>'; if($row->COL_SAT_NAME != null) { echo $row->COL_SAT_NAME; } else { echo strtolower($row->COL_BAND); } echo '</td>'; break;
case 'State': echo '<td>' . ($row->COL_STATE) . '</td>'; break; case 'State': echo '<td>' . ($row->COL_STATE) . '</td>'; break;
case 'Operator': echo '<td>' . ($row->COL_OPERATOR) . '</td>'; break; case 'Operator': echo '<td>' . ($row->COL_OPERATOR) . '</td>'; break;
} }
} }
function echoQrbCalcLink($grid, $vucc) {
if (strlen($grid) != 0) {
echo $grid . ' <a id="edit_qso" href="javascript:spawnQrbCalculator(\'' . $grid . '\')"><i class="fas fa-globe"></i></a>';
} else if (strlen($vucc) != 0) {
echo $vucc .' <a id="edit_qso" href="javascript:spawnQrbCalculator(\'' . $vucc . '\')"><i class="fas fa-globe"></i></a>';
}
}
?> ?>
<div class="container dashboard"> <div class="container dashboard">
<?php if(($this->config->item('use_auth') && ($this->session->userdata('user_type') >= 2)) || $this->config->item('use_auth') === FALSE) { ?> <?php if(($this->config->item('use_auth') && ($this->session->userdata('user_type') >= 2)) || $this->config->item('use_auth') === FALSE) { ?>

13
application/views/interface_assets/footer.php
查看文件

@ -430,7 +430,7 @@ document.onkeyup = function(e) {
} }
}; };
function spawnQrbCalculator() { function spawnQrbCalculator(locator2) {
$.ajax({ $.ajax({
url: base_url + 'index.php/qrbcalc', url: base_url + 'index.php/qrbcalc',
type: 'post', type: 'post',
@ -442,7 +442,10 @@ function spawnQrbCalculator() {
nl2br: false, nl2br: false,
message: html, message: html,
onshown: function(dialog) { onshown: function(dialog) {
if (locator2 !== undefined) {
$("#qrbcalc_locator2").val(locator2);
calculateQrb();
}
}, },
buttons: [{ buttons: [{
label: 'Close', label: 'Close',
@ -455,9 +458,9 @@ function spawnQrbCalculator() {
}); });
} }
function calculateQrb(form) { function calculateQrb() {
let locator1 = form.locator1.value; let locator1 = $("#qrbcalc_locator1").val();
let locator2 = form.locator2.value; let locator2 = $("#qrbcalc_locator2").val();
$(".qrbalert").remove(); $(".qrbalert").remove();

6
application/views/qrbcalc/index.php
查看文件

@ -2,14 +2,14 @@
<div class="form-group row"> <div class="form-group row">
<div class="col-md-2 control-label" for="input">Locator 1</div> <div class="col-md-2 control-label" for="input">Locator 1</div>
<div class="col-md-4"> <div class="col-md-4">
<input class="form-control input-group-sm" id="locator1" type="text" name="locator1" placeholder="" value="<?php if ($station_locator != "0") echo $station_locator; ?>" aria-label="locator1"> <input class="form-control input-group-sm" id="qrbcalc_locator1" type="text" name="locator1" placeholder="" value="<?php if ($station_locator != "0") echo $station_locator; ?>" aria-label="locator1">
</div> </div>
</div> </div>
<div class="form-group row"> <div class="form-group row">
<div class="col-md-2 control-label" for="input">Locator 2</div> <div class="col-md-2 control-label" for="input">Locator 2</div>
<div class="col-md-4"> <div class="col-md-4">
<input class="form-control input-group-sm" id="locator2" type="text" name="locator2" placeholder="" aria-label="locator2"> <input class="form-control input-group-sm" id="qrbcalc_locator2" type="text" name="locator2" placeholder="" aria-label="locator2">
</div> </div>
</div> </div>
@ -17,7 +17,7 @@
<label class="col-md-2 control-label" for="button1id"></label> <label class="col-md-2 control-label" for="button1id"></label>
<div class="col-md-4"> <div class="col-md-4">
<button id="button2id" type="reset" name="button2id" class="btn-sm btn-warning">Reset</button> <button id="button2id" type="reset" name="button2id" class="btn-sm btn-warning">Reset</button>
<button id="button1id" type="button" onclick="calculateQrb(this.form);" name="button1id" class="btn-sm btn-primary">Calculate</button> <button id="button1id" type="button" onclick="calculateQrb();" name="button1id" class="btn-sm btn-primary">Calculate</button>
</div> </div>
</div> </div>
</form> </form>

10
application/views/view_log/partial/log_ajax.php
查看文件

@ -23,12 +23,20 @@ function echo_table_col($row, $name) {
case 'Country': echo '<td>' . ucwords(strtolower(($row->COL_COUNTRY))) . '</td>'; break; case 'Country': echo '<td>' . ucwords(strtolower(($row->COL_COUNTRY))) . '</td>'; break;
case 'IOTA': echo '<td>' . ($row->COL_IOTA) . '</td>'; break; case 'IOTA': echo '<td>' . ($row->COL_IOTA) . '</td>'; break;
case 'SOTA': echo '<td>' . ($row->COL_SOTA_REF) . '</td>'; break; case 'SOTA': echo '<td>' . ($row->COL_SOTA_REF) . '</td>'; break;
case 'Grid': echo '<td>'; echo strlen($row->COL_GRIDSQUARE)==0?$row->COL_VUCC_GRIDS:$row->COL_GRIDSQUARE . '</td>'; break; case 'Grid': echo '<td>'; echoQrbCalcLink($row->COL_VUCC_GRIDS, $row->COL_GRIDSQUARE); echo '</td>'; break;
case 'Band': echo '<td>'; if($row->COL_SAT_NAME != null) { echo $row->COL_SAT_NAME; } else { echo strtolower($row->COL_BAND); } echo '</td>'; break; case 'Band': echo '<td>'; if($row->COL_SAT_NAME != null) { echo $row->COL_SAT_NAME; } else { echo strtolower($row->COL_BAND); } echo '</td>'; break;
case 'State': echo '<td>' . ($row->COL_STATE) . '</td>'; break; case 'State': echo '<td>' . ($row->COL_STATE) . '</td>'; break;
case 'Operator':echo '<td>' . ($row->COL_OPERATOR) . '</td>'; break; case 'Operator':echo '<td>' . ($row->COL_OPERATOR) . '</td>'; break;
} }
} }
function echoQrbCalcLink($grid, $vucc) {
if (strlen($grid) != 0) {
echo $grid . ' <a id="edit_qso" href="javascript:spawnQrbCalculator(\'' . $grid . '\')"><i class="fas fa-globe"></i></a>';
} else if (strlen($vucc) != 0) {
echo $vucc .' <a id="edit_qso" href="javascript:spawnQrbCalculator(\'' . $vucc . '\')"><i class="fas fa-globe"></i></a>';
}
}
?> ?>

4
application/views/view_log/qso.php
查看文件

@ -97,7 +97,7 @@
<?php if($row->COL_GRIDSQUARE != null) { ?> <?php if($row->COL_GRIDSQUARE != null) { ?>
<tr> <tr>
<td>Gridsquare:</td> <td>Gridsquare:</td>
<td><?php echo $row->COL_GRIDSQUARE; ?></td> <td><?php echo $row->COL_GRIDSQUARE; ?> <a id="edit_qso" href="javascript:spawnQrbCalculator('<?php echo $row->COL_GRIDSQUARE; ?>')"><i class="fas fa-globe"></i></a></td>
</tr> </tr>
<?php } ?> <?php } ?>
@ -133,7 +133,7 @@
<?php if($row->COL_VUCC_GRIDS != null) { ?> <?php if($row->COL_VUCC_GRIDS != null) { ?>
<tr> <tr>
<td>Gridsquare (Multi):</td> <td>Gridsquare (Multi):</td>
<td><?php echo $row->COL_VUCC_GRIDS; ?></td> <td><?php echo $row->COL_VUCC_GRIDS; ?> <a id="edit_qso" href="javascript:spawnQrbCalculator('<?php echo $row->COL_VUCC_GRIDS; ?>')"><i class="fas fa-globe"></i></a></td>
</tr> </tr>
<?php } ?> <?php } ?>