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

[OQRS] Fixed broken OQRS

浏览代码
这个提交包含在：
Andreas 2023-06-12 13:57:01 +02:00
父节点 f87997f223
当前提交 e656b8ce7f
共有 2 个文件被更改，包括 43 次插入 和 37 次删除
显示统计信息 下载 Patch 文件 下载 Diff 文件 展开所有文件 折叠所有文件

55
application/views/oqrs/index.php
查看文件

@ -10,9 +10,9 @@
</div>
<div class="card-body">
<div class="stationinfo">
<div class="stationinfo">
<?php
<?php
if ($global_oqrs_text) {
echo $global_oqrs_text;
echo '<br /><br />';
@ -24,37 +24,41 @@
</form>';
echo '<div class="searchinfo"></div>';
?>
<script>// Get the input field
var input = document.getElementById("oqrssearch");
<script>
// Get the input field
var input = document.getElementById("oqrssearch");
// Execute a function when the user presses a key on the keyboard
input.addEventListener("keypress", function(event) {
// If the user presses the "Enter" key on the keyboard
if (event.key === "Enter") {
// Cancel the default action, if needed
event.preventDefault();
// Trigger the button element with a click
document.getElementById("stationbuttonsubmit").click();
}
});</script>
<?php
// Execute a function when the user presses a key on the keyboard
input.addEventListener("keypress", function(event) {
// If the user presses the "Enter" key on the keyboard
if (event.key === "Enter") {
// Cancel the default action, if needed
event.preventDefault();
// Trigger the button element with a click
document.getElementById("stationbuttonsubmit").click();
}
});
</script>
</div>
<?php
} else {
echo '<div class="resulttable">';
if ($stations->result() != NULL) { ?>
<form class="form-inline" enctype="multipart/form-data">
<label class="my-1 mr-2" for="station">Select station: </label>
<select id="station" class="custom-select my-1 mr-sm-2" name="station">
<?php foreach($stations->result() as $station) {
<form class="form-inline" enctype="multipart/form-data">
<label class="my-1 mr-2" for="station">Select station: </label>
<select id="station" class="custom-select my-1 mr-sm-2" name="station">
<?php foreach($stations->result() as $station) {
echo '<option value="' . $station->station_id . '">' . $station->station_profile_name . ' - ' . $station->station_callsign . '</option>'."\n";
} ?>
</select>
<button id="button1id" type="button" onclick="loadStationInfo();" name="button1id" class="btn btn-sm btn-primary"> Proceed</button>
</form>
</div>
</select>
<button id="button1id" type="button" onclick="loadStationInfo();" name="button1id" class="btn btn-sm btn-primary"> Proceed</button>
</form>
</div>
</div>
<div class="searchinfo"></div>
<?php
<div class="searchinfo"></div>
<?php
}
else {
@ -65,4 +69,3 @@
</div>
</div>
</div>

23
assets/js/sections/oqrs.js
查看文件

@ -1,10 +1,13 @@
let station_id;
function loadStationInfo() {
$(".stationinfo").empty();
station_id = $("#station").val();
// $(".stationinfo").empty();
$(".searchinfo").empty();
$.ajax({
url: base_url+'index.php/oqrs/get_station_info',
type: 'post',
data: {'station_id': $("#station").val()},
data: {'station_id': station_id},
success: function (data) {
if (data.count > 0) {
$(".stationinfo").append('<br />' + data.count + ' Qsos logged between ' + data.mindate + ' and ' + data.maxdate + '.<br /><br />');
@ -34,7 +37,7 @@ function searchOqrs() {
$.ajax({
url: base_url+'index.php/oqrs/get_qsos',
type: 'post',
data: {'station_id': $("#station").val(), 'callsign': $("#oqrssearch").val().toUpperCase()},
data: {'station_id': station_id, 'callsign': $("#oqrssearch").val().toUpperCase()},
success: function (data) {
$(".searchinfo").append(data);
}
@ -76,7 +79,7 @@ function notInLog() {
$.ajax({
url: base_url + 'index.php/oqrs/not_in_log',
type: 'post',
data: {'station_id': $("#station").val(), 'callsign': $("#oqrssearch").val().toUpperCase()},
data: {'station_id': station_id, 'callsign': $("#oqrssearch").val().toUpperCase()},
success: function(html) {
$(".searchinfo").html(html);
$('.qsotime').change(function() {
@ -94,11 +97,11 @@ function notInLog() {
}
function saveNotInLogRequest() {
const qsos = [];
$(".alertinfo").remove();
if ($("#emailInput").val() == '') {
$(".searchinfo").prepend('<div class="alertinfo"><br /><div class="alert alert-warning"><a href="#" class="close" data-dismiss="alert" aria-label="close">&times;</a>You need to fill out an email address!</div></div>');
} else {
const qsos = [];
$(".notinlog-table tbody tr").each(function(i) {
var data = [];
var datecell = $("#date", this).val();
@ -119,7 +122,7 @@ function saveNotInLogRequest() {
$.ajax({
url: base_url+'index.php/oqrs/save_not_in_log',
type: 'post',
data: { 'station_id': $("#station").val(),
data: { 'station_id': station_id,
'callsign': $("#oqrssearch").val().toUpperCase(),
'email': $("#emailInput").val(),
'message': $("#messageInput").val(),
@ -166,7 +169,7 @@ function requestOqrs() {
$.ajax({
url: base_url + 'index.php/oqrs/request_form',
type: 'post',
data: {'station_id': $("#station").val(), 'callsign': $("#oqrssearch").val().toUpperCase()},
data: {'station_id': station_id, 'callsign': $("#oqrssearch").val().toUpperCase()},
success: function(html) {
$(".searchinfo").html(html);
/* time input shortcut */
@ -194,11 +197,11 @@ function requestOqrs() {
}
function submitOqrsRequest() {
const qsos = [];
$(".alertinfo").remove();
if ($("#emailInput").val() == '') {
$(".searchinfo").prepend('<div class="alertinfo"><br /><div class="alert alert-warning"><a href="#" class="close" data-dismiss="alert" aria-label="close">&times;</a>You need to fill out an email address!</div></div>');
} else {
const qsos = [];
$(".result-table tbody tr").each(function(i) {
var data = [];
var datecell = $("#date", this).val();
@ -220,7 +223,7 @@ function submitOqrsRequest() {
$.ajax({
url: base_url+'index.php/oqrs/save_oqrs_request',
type: 'post',
data: { 'station_id': $("#station").val(),
data: { 'station_id': station_id,
'callsign': $("#oqrssearch").val().toUpperCase(),
'email': $("#emailInput").val(),
'message': $("#messageInput").val(),
@ -238,11 +241,11 @@ function submitOqrsRequest() {
}
function submitOqrsRequestGrouped() {
const qsos = [];
$(".alertinfo").remove();
if ($("#emailInput").val() == '') {
$(".searchinfo").prepend('<div class="alertinfo"><br /><div class="alert alert-warning"><a href="#" class="close" data-dismiss="alert" aria-label="close">&times;</a>You need to fill out an email address!</div></div>');
} else {
const qsos = [];
$(".result-table tbody tr").each(function(i) {
var data = [];
var stationid = this.getAttribute('stationid');;