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

[Contest Logging] Started work on adding DOK to exchange

浏览代码
这个提交包含在：
Andreas 2021-10-12 13:10:54 +02:00
父节点 c4a2c7229d
当前提交 b63ebc02be
共有 3 个文件被更改，包括 53 次插入 和 48 次删除
显示统计信息 下载 Patch 文件 下载 Diff 文件 展开所有文件 折叠所有文件

1
application/controllers/Contesting.php
查看文件

@ -22,6 +22,7 @@ class Contesting extends CI_Controller {
$this->load->model('contesting_model');
$data['my_gridsquare'] = $this->stations->find_gridsquare();
$data['my_dok'] = ""; // For now, this is set to blank, but need function to get
$data['radios'] = $this->cat->radios();
$data['modes'] = $this->modes->active();
$data['contestnames'] = $this->contesting_model->getActivecontests();

19
application/views/contesting/index.php
查看文件

@ -13,6 +13,9 @@
<div class="col-auto">
<select class="form-control-sm" id="exchangetype" name="exchangetype">
<option value='None'>None</option>
<option value='Dok'>DOK</option>
<option value='Serialdok'>DOK + Serial</option>
<option value='Dokgridsquare'>DOK + Gridsquare</option>
<option value='Exchange'>Exchange</option>
<option value='Gridsquare'>Gridsquare</option>
<option value='Serial'>Serial</option>
@ -120,10 +123,15 @@
<input type="text" class="form-control form-control-sm" name="rst_sent" id="rst_sent" value="59">
</div>
<div style="display:none" class="form-group col-md-1 serials">
<div style="display:none" class="form-group col-md-1 serials">
<label for="exch_serial_s">Serial (S)</label>
<input type="number" class="form-control form-control-sm" name="exch_serial_s" id="exch_serial_s" value="">
</div>
<div style="display:none" class="form-group col-md-1 doks">
<label for="exch_dok_s">DOK (S)</label>
<input disabled type="text" class="form-control form-control-sm" name="exch_dok_s" id="exch_dok_s" value="<?php echo $my_dok;?>">
</div>
<div style="display:none" class="form-group col-md-1 exchanges">
<label for="exch_sent"><?php echo $this->lang->line('gen_hamradio_exchange_sent_short'); ?></label>
@ -140,11 +148,16 @@
<input type="text" class="form-control form-control-sm" name="rst_recv" id="rst_recv" value="59">
</div>
<div style="display:none" class="form-group col-md-1 serialr">
<div style="display:none" class="form-group col-md-1 serialr">
<label for="exch_serial_r">Serial (R)</label>
<input type="number" class="form-control form-control-sm" name="exch_serial_r" id="exch_serial_r" value="">
</div>
<div style="display:none" class="form-group col-md-1 dokr">
<label for="exch_dok_r">DOK (R)</label>
<input type="text" class="form-control form-control-sm" name="darc_dok" id="exch_dok_r" value="">
</div>
<div style="display:none" class="form-group col-md-1 exchanger">
<label for="exch_recv"><?php echo $this->lang->line('gen_hamradio_exchange_recv_short'); ?></label>
<input type="text" class="form-control form-control-sm" name="exch_recv" id="exch_recv" value="">

81
assets/js/sections/contesting.js
查看文件

@ -233,72 +233,63 @@ $('#exchangetype').change(function () {
});
function setExchangetype(exchangetype) {
if (exchangetype == 'None') {
$("#exch_serial_s").val("");
$(".exchanger").hide();
$(".exchanges").hide();
$(".serials").hide();
$(".serialr").hide();
$(".gridsquarer").hide();
$(".gridsquares").hide();
// Perhaps a better approach is to hide everything, then just enable the things you need
$(".exchanger").hide();
$(".exchanges").hide();
$(".serials").hide();
$(".serialr").hide();
$(".gridsquarer").hide();
$(".gridsquares").hide();
$(".doks").hide();
$(".dokr").hide();
$("#exch_serial_s").val("");
var serialsent = localStorage.getItem("serialsent");
if (serialsent == null) {
serialsent = 1;
}
else if (exchangetype == 'Exchange') {
$("#exch_serial_s").val("");
if (exchangetype == 'Exchange') {
$(".exchanger").show();
$(".exchanges").show();
$(".serials").hide();
$(".serialr").hide();
$(".gridsquarer").hide();
$(".gridsquares").hide();
}
else if (exchangetype == 'Serial') {
var serialsent = localStorage.getItem("serialsent");
if (serialsent != null) {
$("#exch_serial_s").val(serialsent);
} else {
$("#exch_serial_s").val(1);
}
$(".exchanger").hide();
$(".exchanges").hide();
$("#exch_serial_s").val(serialsent);
$(".serials").show();
$(".serialr").show();
$(".gridsquarer").hide();
$(".gridsquares").hide();
}
else if (exchangetype == 'Dok') {
$(".doks").show();
$(".dokr").show();
}
else if (exchangetype == 'Serialdok') {
$("#exch_serial_s").val(serialsent);
$(".serials").show();
$(".serialr").show();
$(".doks").show();
$(".dokr").show();
}
else if (exchangetype == 'Dokgridsquare') {
$(".gridsquarer").show();
$(".gridsquares").show();
$(".doks").show();
$(".dokr").show();
}
else if (exchangetype == 'Serialexchange') {
var serialsent = localStorage.getItem("serialsent");
if (serialsent != null) {
$("#exch_serial_s").val(serialsent);
} else {
$("#exch_serial_s").val(1);
}
$("#exch_serial_s").val(serialsent);
$(".exchanger").show();
$(".exchanges").show();
$(".serials").show();
$(".serialr").show();
$(".gridsquarer").hide();
$(".gridsquares").hide();
}
else if (exchangetype == 'Serialgridsquare') {
var serialsent = localStorage.getItem("serialsent");
if (serialsent != null) {
$("#exch_serial_s").val(serialsent);
} else {
$("#exch_serial_s").val(1);
}
$(".exchanger").hide();
$(".exchanges").hide();
$("#exch_serial_s").val(serialsent);
$(".serials").show();
$(".serialr").show();
$(".gridsquarer").show();
$(".gridsquares").show();
}
else if (exchangetype == 'Gridsquare') {
$("#exch_serial_s").val("");
$(".exchanger").hide();
$(".exchanges").hide();
$(".serials").hide();
$(".serialr").hide();
$(".gridsquarer").show();
$(".gridsquares").show();
}