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

Revert "Make the manual query parameter optional"

浏览代码 
This reverts commit 0faf59c7e8.
这个提交包含在：
Peter Goodhall 2022-05-30 14:30:28 +01:00
父节点 0920c73f7f
当前提交 b7c046184a
共有 2 个文件被更改，包括 18 次插入 和 19 次删除
显示统计信息 下载 Patch 文件 下载 Diff 文件 展开所有文件 折叠所有文件

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

@ -1,6 +1,3 @@
<?php
$manual_time = $_GET['manual'] ?? 0;
?>
<div class="container qso_panel contesting">
<button type="button" class="btn btn-sm btn-warning float-right" onclick="reset_contest_session()"><i class="fas fa-sync-alt"></i> <?php echo $this->lang->line('contesting_button_reset_contest_session'); ?></button>
<h2><?php echo $this->lang->line('contesting_page_title'); ?></h2>
@ -38,15 +35,15 @@ $manual_time = $_GET['manual'] ?? 0;
<div class="form-row">
<div class="form-group col-md-2">
<label for="start_date"><?php echo $this->lang->line('general_word_date'); ?></label>
<input type="text" class="form-control form-control-sm input_date" name="start_date" id="start_date" value="<?php if (($this->session->userdata('start_date') != NULL && ((time() - $this->session->userdata('time_stamp')) < 24 * 60 * 60))) { echo $this->session->userdata('start_date'); } else { echo date('d-m-Y');}?>" <?php echo ($manual_time == 0 ? "disabled" : ""); ?> >
<input type="text" class="form-control form-control-sm input_date" name="start_date" id="start_date" value="<?php if (($this->session->userdata('start_date') != NULL && ((time() - $this->session->userdata('time_stamp')) < 24 * 60 * 60))) { echo $this->session->userdata('start_date'); } else { echo date('d-m-Y');}?>" <?php echo ($_GET['manual'] == 0 ? "disabled" : ""); ?> >
</div>
<div class="form-group col-md-1">
<label for="start_time"><?php echo $this->lang->line('general_word_time'); ?></label>
<input type="text" class="form-control form-control-sm input_time" name="start_time" id="start_time" value="<?php if (($this->session->userdata('start_time') != NULL && ((time() - $this->session->userdata('time_stamp')) < 24 * 60 * 60))) { echo $this->session->userdata('start_time'); } else {echo date('H:i'); } ?>" size="7" <?php echo ($manual_time == 0 ? "disabled" : ""); ?> >
<input type="text" class="form-control form-control-sm input_time" name="start_time" id="start_time" value="<?php if (($this->session->userdata('start_time') != NULL && ((time() - $this->session->userdata('time_stamp')) < 24 * 60 * 60))) { echo $this->session->userdata('start_time'); } else {echo date('H:i'); } ?>" size="7" <?php echo ($_GET['manual'] == 0 ? "disabled" : ""); ?> >
</div>
<?php if ( $manual_time == 0 ) { ?>
<?php if ( $_GET['manual'] == 0 ) { ?>
<input class="input_time" type="hidden" id="start_time" name="start_time"value="<?php echo date('H:i'); ?>" />
<input class="input_date" type="hidden" id="start_date" name="start_date" value="<?php echo date('d-m-Y'); ?>" />
<?php } ?>
@ -231,3 +228,5 @@ $manual_time = $_GET['manual'] ?? 0;
</div>
</div>
</div>
<?php
?>

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

@ -879,7 +879,7 @@ $(document).on('keypress',function(e) {
<script type="text/javascript">
var manual = <?php echo $_GET['manual'] ?? 0; ?>;
var manual = <?php echo $_GET['manual']; ?>;
$(document).ready(function() {
@ -1058,7 +1058,7 @@ $(document).on('keypress',function(e) {
</script>
<?php } ?>
<?php if ( ($this->uri->segment(1) == "qso" && $_GET['manual'] ?? 0 == 0) || ($this->uri->segment(1) == "contesting" && $this->uri->segment(2) != "add")) { ?>
<?php if ( ($this->uri->segment(1) == "qso" && $_GET['manual'] == 0) || ($this->uri->segment(1) == "contesting" && $this->uri->segment(2) != "add")) { ?>
<script>
function setRst(mode) {
if(mode == 'JT65' || mode == 'JT65B' || mode == 'JT6C' || mode == 'JTMS' || mode == 'ISCAT' || mode == 'MSK144' || mode == 'JTMSK' || mode == 'QRA64' || mode == 'FT8' || mode == 'FT4' || mode == 'JS8' || mode == 'JT9' || mode == 'JT9-1' || mode == 'ROS'){
@ -2453,7 +2453,7 @@ function deleteQsl(id) {
</script>
<?php if ($this->uri->segment(1) == "contesting" && $this->uri->segment(2) != "add" ) { ?>
<script>
var manual = <?php echo $_GET['manual'] ?? 0; ?>;
var manual = <?php echo $_GET['manual']; ?>;
</script>
<script src="<?php echo base_url() ;?>assets/js/sections/contesting.js?v2"></script>
<?php } ?>