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

Merge pull request #616 from AndreasK79/was_dialog_bugfix

浏览代码 
Fixes issue with edit areas
这个提交包含在：
Peter Goodhall 2020-09-15 20:17:05 +01:00 提交者 GitHub
当前提交 68f5c01196
找不到此签名对应的密钥
GPG 密钥 ID: 4AEE18F83AFDEB23
共有 3 个文件被更改，包括 28 次插入 和 21 次删除
显示统计信息 下载 Patch 文件 下载 Diff 文件 展开所有文件 折叠所有文件

2
application/controllers/Qso.php
查看文件

@ -134,6 +134,7 @@ class QSO extends CI_Controller {
$this->load->model('logbook_model'); $this->load->model('logbook_model');
$this->load->model('user_model'); $this->load->model('user_model');
$this->load->model('modes');
$this->load->library('form_validation'); $this->load->library('form_validation');
@ -147,6 +148,7 @@ class QSO extends CI_Controller {
$data['qso'] = $query->row(); $data['qso'] = $query->row();
$data['dxcc'] = $this->logbook_model->fetchDxcc(); $data['dxcc'] = $this->logbook_model->fetchDxcc();
$data['iota'] = $this->logbook_model->fetchIota(); $data['iota'] = $this->logbook_model->fetchIota();
$data['modes'] = $this->modes->all();
$this->load->view('qso/edit_ajax', $data); $this->load->view('qso/edit_ajax', $data);
} }

44
application/views/qso/edit_ajax.php
查看文件

@ -72,9 +72,13 @@
<label for="freq">Mode</label> <label for="freq">Mode</label>
<select id="mode" class="form-control mode form-control-sm" name="mode"> <select id="mode" class="form-control mode form-control-sm" name="mode">
<?php <?php
$this->load->library('frequency'); foreach($modes->result() as $mode){
foreach(Frequency::modes as $mode){ var_dump($mode);
printf("<option value=\"%s\" %s>%s</option>", $mode, $qso->COL_MODE==$mode?"selected=\"selected\"":"",$mode); if ($mode->submode == null) {
printf("<option value=\"%s\" %s>%s</option>", $mode->mode, $qso->COL_MODE==$mode->mode?"selected=\"selected\"":"",$mode->mode);
} else {
printf("<option value=\"%s\" %s>&rArr; %s</option>", $mode->submode, $qso->COL_SUBMODE==$mode->submode?"selected=\"selected\"":"",$mode->submode);
}
} }
?> ?>
</select> </select>
@ -84,29 +88,29 @@
<label for="freq">Band</label> <label for="freq">Band</label>
<select id="band" class="form-control form-control-sm" name="band"> <select id="band" class="form-control form-control-sm" name="band">
<optgroup label="HF"> <optgroup label="HF">
<option value="160m" <?php if($qso->COL_BAND == "160m") { echo "selected=\"selected\""; } ?>>160m</option> <option value="160m" <?php if(strtolower($qso->COL_BAND == "160m")) { echo "selected=\"selected\""; } ?>>160m</option>
<option value="80m" <?php if($qso->COL_BAND == "80m") { echo "selected=\"selected\""; } ?>>80m</option> <option value="80m" <?php if(strtolower($qso->COL_BAND == "80m")) { echo "selected=\"selected\""; } ?>>80m</option>
<option value="60m" <?php if($qso->COL_BAND == "60m") { echo "selected=\"selected\""; } ?>>60m</option> <option value="60m" <?php if(strtolower($qso->COL_BAND == "60m")) { echo "selected=\"selected\""; } ?>>60m</option>
<option value="40m" <?php if($qso->COL_BAND == "40m") { echo "selected=\"selected\""; } ?>>40m</option> <option value="40m" <?php if(strtolower($qso->COL_BAND == "40m")) { echo "selected=\"selected\""; } ?>>40m</option>
<option value="30m" <?php if($qso->COL_BAND == "30m") { echo "selected=\"selected\""; } ?>>30m</option> <option value="30m" <?php if(strtolower($qso->COL_BAND == "30m")) { echo "selected=\"selected\""; } ?>>30m</option>
<option value="20m" <?php if($qso->COL_BAND == "20m") { echo "selected=\"selected\""; } ?>>20m</option> <option value="20m" <?php if(strtolower($qso->COL_BAND == "20m")) { echo "selected=\"selected\""; } ?>>20m</option>
<option value="17m" <?php if($qso->COL_BAND == "17m") { echo "selected=\"selected\""; } ?>>17m</option> <option value="17m" <?php if(strtolower($qso->COL_BAND == "17m")) { echo "selected=\"selected\""; } ?>>17m</option>
<option value="15m" <?php if($qso->COL_BAND == "15m") { echo "selected=\"selected\""; } ?>>15m</option> <option value="15m" <?php if(strtolower($qso->COL_BAND == "15m")) { echo "selected=\"selected\""; } ?>>15m</option>
<option value="12m" <?php if($qso->COL_BAND == "12m") { echo "selected=\"selected\""; } ?>>12m</option> <option value="12m" <?php if(strtolower($qso->COL_BAND == "12m")) { echo "selected=\"selected\""; } ?>>12m</option>
<option value="10m" <?php if($qso->COL_BAND == "10m") { echo "selected=\"selected\""; } ?>>10m</option> <option value="10m" <?php if(strtolower($qso->COL_BAND == "10m")) { echo "selected=\"selected\""; } ?>>10m</option>
</optgroup> </optgroup>
<optgroup label="VHF"> <optgroup label="VHF">
<option value="6m" <?php if($qso->COL_BAND == "6m") { echo "selected=\"selected\""; } ?>>6m</option> <option value="6m" <?php if(strtolower($qso->COL_BAND == "6m")) { echo "selected=\"selected\""; } ?>>6m</option>
<option value="4m" <?php if($qso->COL_BAND == "4m") { echo "selected=\"selected\""; } ?>>4m</option> <option value="4m" <?php if(strtolower($qso->COL_BAND == "4m")) { echo "selected=\"selected\""; } ?>>4m</option>
<option value="2m" <?php if($qso->COL_BAND == "2m") { echo "selected=\"selected\""; } ?>>2m</option> <option value="2m" <?php if(strtolower($qso->COL_BAND == "2m")) { echo "selected=\"selected\""; } ?>>2m</option>
</optgroup> </optgroup>
<optgroup label="UHF"> <optgroup label="UHF">
<option value="70cm" <?php if($qso->COL_BAND == "70cm") { echo "selected=\"selected\""; } ?>>70cm</option> <option value="70cm" <?php if(strtolower($qso->COL_BAND == "70cm")) { echo "selected=\"selected\""; } ?>>70cm</option>
<option value="23cm" <?php if($qso->COL_BAND == "23cm") { echo "selected=\"selected\""; } ?>>23cm</option> <option value="23cm" <?php if(strtolower($qso->COL_BAND == "23cm")) { echo "selected=\"selected\""; } ?>>23cm</option>
<option value="13cm" <?php if($qso->COL_BAND == "13cm") { echo "selected=\"selected\""; } ?>>13cm</option> <option value="13cm" <?php if(strtolower($qso->COL_BAND == "13cm")) { echo "selected=\"selected\""; } ?>>13cm</option>
<option value="9cm" <?php if($qso->COL_BAND == "9cm") { echo "selected=\"selected\""; } ?>>9cm</option> <option value="9cm" <?php if(strtolower($qso->COL_BAND == "9cm")) { echo "selected=\"selected\""; } ?>>9cm</option>
</optgroup> </optgroup>
<optgroup label="Microwave"> <optgroup label="Microwave">

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

@ -31,7 +31,8 @@
<?php if(($this->config->item('use_auth') && ($this->session->userdata('user_type') >= 2)) || $this->config->item('use_auth') === FALSE || ($this->config->item('show_time'))) { ?> <?php if(($this->config->item('use_auth') && ($this->session->userdata('user_type') >= 2)) || $this->config->item('use_auth') === FALSE || ($this->config->item('show_time'))) { ?>
<td><?php $timestamp = strtotime($row->COL_TIME_ON); echo date('H:i', $timestamp); ?></td> <td><?php $timestamp = strtotime($row->COL_TIME_ON); echo date('H:i', $timestamp); ?></td>
<?php } ?> <?php } ?>
<td><a data-fancybox data-type="iframe" data-width="750" data-height="520" data-src="<?php echo site_url('logbook/view')."/".$row->COL_PRIMARY_KEY; ?>" href="javascript:;"><?php echo str_replace("0","&Oslash;",strtoupper($row->COL_CALL)); ?></a> <td>
<a id="edit_qso" href="javascript:qso_edit(<?php echo $row->COL_PRIMARY_KEY; ?>)"><?php echo str_replace("0","&Oslash;",strtoupper($row->COL_CALL)); ?></a>
</td> </td>
<td><?php echo $row->COL_MODE; ?></td> <td><?php echo $row->COL_MODE; ?></td>
<td><?php echo $row->COL_RST_SENT; ?> <?php if ($row->COL_STX) { ?><span class="badge badge-light"><?php echo $row->COL_STX;?></span><?php } ?><?php if ($row->COL_STX_STRING) { ?><span class="badge badge-light"><?php echo $row->COL_STX_STRING;?></span><?php } ?></td> <td><?php echo $row->COL_RST_SENT; ?> <?php if ($row->COL_STX) { ?><span class="badge badge-light"><?php echo $row->COL_STX;?></span><?php } ?><?php if ($row->COL_STX_STRING) { ?><span class="badge badge-light"><?php echo $row->COL_STX_STRING;?></span><?php } ?></td>