fixing a qrg syntax bug
这个提交包含在:
父节点
043a5135eb
当前提交
9720cbae7a
共有 1 个文件被更改,包括 25 次插入 和 18 次删除
|
|
@ -109,6 +109,7 @@ function handleInput() {
|
||||||
|
|
||||||
var extraQsoDate = qsodate;
|
var extraQsoDate = qsodate;
|
||||||
var band = "";
|
var band = "";
|
||||||
|
var prevMode = "";
|
||||||
var mode = "";
|
var mode = "";
|
||||||
var freq = "";
|
var freq = "";
|
||||||
var callsign = "";
|
var callsign = "";
|
||||||
|
|
@ -123,7 +124,7 @@ function handleInput() {
|
||||||
var rst_r = null;
|
var rst_r = null;
|
||||||
items = row.startsWith("day ") ? [row] : row.split(" ");
|
items = row.startsWith("day ") ? [row] : row.split(" ");
|
||||||
var itemNumber = 0;
|
var itemNumber = 0;
|
||||||
var freq = 0;
|
|
||||||
items.forEach((item) => {
|
items.forEach((item) => {
|
||||||
if (item === "") {
|
if (item === "") {
|
||||||
return;
|
return;
|
||||||
|
|
@ -142,6 +143,10 @@ function handleInput() {
|
||||||
} else if (
|
} else if (
|
||||||
item.match(/^CW$|^SSB$|^LSB$|^USB$|^FM$|^AM$|^PSK$|^FT8$/i)
|
item.match(/^CW$|^SSB$|^LSB$|^USB$|^FM$|^AM$|^PSK$|^FT8$/i)
|
||||||
) {
|
) {
|
||||||
|
if (mode != "") {
|
||||||
|
freq = 0;
|
||||||
|
console.log("QRG is 0 now");
|
||||||
|
}
|
||||||
mode = item.toUpperCase();
|
mode = item.toUpperCase();
|
||||||
} else if (
|
} else if (
|
||||||
item.match(/^[0-9]{1,4}(?:m|cm|mm)$/) ||
|
item.match(/^[0-9]{1,4}(?:m|cm|mm)$/) ||
|
||||||
|
|
@ -151,7 +156,7 @@ function handleInput() {
|
||||||
freq = 0;
|
freq = 0;
|
||||||
} else if (item.match(/^\d+\.\d+$/)) {
|
} else if (item.match(/^\d+\.\d+$/)) {
|
||||||
freq = item;
|
freq = item;
|
||||||
band = "";
|
band = getBandFromFreq(freq);
|
||||||
} else if (
|
} else if (
|
||||||
item.match(/^[1-9]{1}$/) &&
|
item.match(/^[1-9]{1}$/) &&
|
||||||
qsotime &&
|
qsotime &&
|
||||||
|
|
@ -166,13 +171,13 @@ function handleInput() {
|
||||||
qsotime = qsotime.slice(0, -2) + item;
|
qsotime = qsotime.slice(0, -2) + item;
|
||||||
} else if (
|
} else if (
|
||||||
item.match(
|
item.match(
|
||||||
/^[A-Z0-9]{1,3}\/[A-Z]{2}-\d{3}|[AENOS]*[FNSUACA]-\d{3}|(?!.*FF)[A-Z0-9]{1,3}-\d{4,5}|[A-Z0-9]{1,3}[F]{2}-\d{4}$/i,
|
/^[A-Z0-9]{1,3}\/[A-Z]{2}-\d{3}|[AENOS]*[FNSUACA]-\d{3}|(?!.*FF)[A-Z0-9]{1,3}-\d{4,5}|[A-Z0-9]{1,3}[F]{2}-\d{4}$/i
|
||||||
)
|
)
|
||||||
) {
|
) {
|
||||||
sotaWwff = item.toUpperCase();
|
sotaWwff = item.toUpperCase();
|
||||||
} else if (
|
} else if (
|
||||||
item.match(
|
item.match(
|
||||||
/([a-zA-Z0-9]{1,3}[0-9][a-zA-Z0-9]{0,3}[a-zA-Z])|.*\/([a-zA-Z0-9]{1,3}[0-9][a-zA-Z0-9]{0,3}[a-zA-Z])|([a-zA-Z0-9]{1,3}[0-9][a-zA-Z0-9]{0,3}[a-zA-Z])\/.*/,
|
/([a-zA-Z0-9]{1,3}[0-9][a-zA-Z0-9]{0,3}[a-zA-Z])|.*\/([a-zA-Z0-9]{1,3}[0-9][a-zA-Z0-9]{0,3}[a-zA-Z])|([a-zA-Z0-9]{1,3}[0-9][a-zA-Z0-9]{0,3}[a-zA-Z])\/.*/
|
||||||
)
|
)
|
||||||
) {
|
) {
|
||||||
callsign = item.toUpperCase();
|
callsign = item.toUpperCase();
|
||||||
|
|
@ -209,7 +214,7 @@ function handleInput() {
|
||||||
|
|
||||||
if (isValidDate(extraQsoDate) === false) {
|
if (isValidDate(extraQsoDate) === false) {
|
||||||
addErrorMessage(
|
addErrorMessage(
|
||||||
lang_qso_simplefle_error_date + " " + extraQsoDate,
|
lang_qso_simplefle_error_date + " " + extraQsoDate
|
||||||
);
|
);
|
||||||
extraQsoDate = qsodate;
|
extraQsoDate = qsodate;
|
||||||
}
|
}
|
||||||
|
|
@ -257,41 +262,43 @@ function handleInput() {
|
||||||
|
|
||||||
localStorage.setItem(
|
localStorage.setItem(
|
||||||
`user_${user_id}_tabledata`,
|
`user_${user_id}_tabledata`,
|
||||||
$("#qsoTable").html(),
|
$("#qsoTable").html()
|
||||||
);
|
);
|
||||||
localStorage.setItem(
|
localStorage.setItem(
|
||||||
`user_${user_id}_my-call`,
|
`user_${user_id}_my-call`,
|
||||||
$("#station-call").val(),
|
$("#station-call").val()
|
||||||
);
|
);
|
||||||
localStorage.setItem(
|
localStorage.setItem(
|
||||||
`user_${user_id}_operator`,
|
`user_${user_id}_operator`,
|
||||||
$("#operator").val(),
|
$("#operator").val()
|
||||||
);
|
);
|
||||||
localStorage.setItem(
|
localStorage.setItem(
|
||||||
`user_${user_id}_my-sota-wwff`,
|
`user_${user_id}_my-sota-wwff`,
|
||||||
$("#my-sota-wwff").val(),
|
$("#my-sota-wwff").val()
|
||||||
);
|
);
|
||||||
localStorage.setItem(
|
localStorage.setItem(
|
||||||
`user_${user_id}_qso-area`,
|
`user_${user_id}_qso-area`,
|
||||||
$(".qso-area").val(),
|
$(".qso-area").val()
|
||||||
);
|
);
|
||||||
localStorage.setItem(
|
localStorage.setItem(
|
||||||
`user_${user_id}_qsodate`,
|
`user_${user_id}_qsodate`,
|
||||||
$("#qsodate").val(),
|
$("#qsodate").val()
|
||||||
);
|
);
|
||||||
localStorage.setItem(
|
localStorage.setItem(
|
||||||
`user_${user_id}_my-power`,
|
`user_${user_id}_my-power`,
|
||||||
$("#my-power").val(),
|
$("#my-power").val()
|
||||||
);
|
);
|
||||||
localStorage.setItem(
|
localStorage.setItem(
|
||||||
`user_${user_id}_my-grid`,
|
`user_${user_id}_my-grid`,
|
||||||
$("#my-grid").val(),
|
$("#my-grid").val()
|
||||||
);
|
);
|
||||||
|
|
||||||
callsign = "";
|
callsign = "";
|
||||||
sotaWwff = "";
|
sotaWwff = "";
|
||||||
}
|
}
|
||||||
|
|
||||||
|
prevMode = mode;
|
||||||
|
|
||||||
showErrors();
|
showErrors();
|
||||||
}); //lines.forEach((row)
|
}); //lines.forEach((row)
|
||||||
|
|
||||||
|
|
@ -306,7 +313,7 @@ function handleInput() {
|
||||||
":</strong> " +
|
":</strong> " +
|
||||||
qsoCount +
|
qsoCount +
|
||||||
" " +
|
" " +
|
||||||
lang_gen_hamradio_qso,
|
lang_gen_hamradio_qso
|
||||||
);
|
);
|
||||||
} else {
|
} else {
|
||||||
$(".js-qso-count").html("");
|
$(".js-qso-count").html("");
|
||||||
|
|
@ -489,7 +496,7 @@ for (const [key, value] of Object.entries(Bands)) {
|
||||||
<div class="form-group">
|
<div class="form-group">
|
||||||
<label for="${key.slice(1)}CW">CW</label>
|
<label for="${key.slice(1)}CW">CW</label>
|
||||||
<input type="text" class="form-control text-uppercase" id="${key.slice(
|
<input type="text" class="form-control text-uppercase" id="${key.slice(
|
||||||
1,
|
1
|
||||||
)}CW" value="${value.cw}">
|
)}CW" value="${value.cw}">
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
|
@ -497,7 +504,7 @@ for (const [key, value] of Object.entries(Bands)) {
|
||||||
<div class="form-group">
|
<div class="form-group">
|
||||||
<label for="${key.slice(1)}SSB">SSB</label>
|
<label for="${key.slice(1)}SSB">SSB</label>
|
||||||
<input type="text" class="form-control text-uppercase" id="${key.slice(
|
<input type="text" class="form-control text-uppercase" id="${key.slice(
|
||||||
1,
|
1
|
||||||
)}SSB" value="${value.ssb}">
|
)}SSB" value="${value.ssb}">
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
|
@ -505,7 +512,7 @@ for (const [key, value] of Object.entries(Bands)) {
|
||||||
<div class="form-group">
|
<div class="form-group">
|
||||||
<label for="${key.slice(1)}DIGI">DIGI</label>
|
<label for="${key.slice(1)}DIGI">DIGI</label>
|
||||||
<input type="text" class="form-control text-uppercase" id="${key.slice(
|
<input type="text" class="form-control text-uppercase" id="${key.slice(
|
||||||
1,
|
1
|
||||||
)}DIGI" value="${value.digi}">
|
)}DIGI" value="${value.digi}">
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
|
@ -760,7 +767,7 @@ $(".js-save-to-log").click(function () {
|
||||||
iota_ref: iota_ref,
|
iota_ref: iota_ref,
|
||||||
pota_ref: pota_ref,
|
pota_ref: pota_ref,
|
||||||
wwff_ref: wwff_ref,
|
wwff_ref: wwff_ref,
|
||||||
isSFLE: true
|
isSFLE: true,
|
||||||
},
|
},
|
||||||
success: function (result) {},
|
success: function (result) {},
|
||||||
});
|
});
|
||||||
|
|
|
||||||
正在加载…
在新工单中引用