Public_Tools/wavelog
2
0
Fork 0
mirror of https://github.com/wavelog/wavelog.git synced 2026-03-22 10:24:14 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #3002 from AndreasK79/label_split_,mycall_grid

Browse Source 
[Labels] Added option for my call, to split grid and my call
This commit is contained in:
Andreas Kristiansen
2026-02-23 08:43:38 +01:00
committed by GitHub
parent 5b1be1aa83 2a6532c057
commit cd407602c8
7 changed files with 246 additions and 102 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
assets/js/sections/labels.js
View File

@@ -39,7 +39,7 @@ function printat(stationid) {
data: {'stationid': stationid},
success: function (html) {
BootstrapDialog.show({
title: 'Start printing at which label?',
title: '<i class="fas fa-print me-2"></i>'+lang_label_print_options,
size: BootstrapDialog.SIZE_NORMAL,
cssClass: 'qso-dialog',
nl2br: false,
@@ -51,20 +51,21 @@ function printat(stationid) {
{
label: lang_print_queue,
id: "button1id",
cssClass: "btn btn-primary",
action: function() {
cssClass: "btn btn-primary btn-sm me-3",
action: function() {
$('#button_markprint').removeClass("disabled");
$('#button_markprint').attr("disabled", false);
$("#pform").submit();
$("#pform").submit();
}
},
{
label: lang_mark_qsl_as_printed+'<div class="ld ld-ring ld-spin"></div>',
cssClass: "btn btn-secondary me-3 ld-ext-right",
cssClass: "btn btn-secondary btn-sm me-3 ld-ext-right",
id: "button_markprint"
},
{
label: lang_admin_close,
cssClass: "btn btn-secondary btn-sm me-3",
action: function (dialogItself) {
dialogItself.close();
location.reload(); // Refresh Mainpage, because labels could have been marked as sent

12
assets/js/sections/logbookadvanced.js
View File

@@ -838,7 +838,7 @@ $(document).ready(function () {
buttons: [
{
label: lang_admin_close,
cssClass: 'btn-sm btn-secondary',
cssClass: 'btn btn-sm btn-secondary',
id: 'closeButton',
action: function (dialogItself) {
dialogItself.close();
@@ -846,7 +846,7 @@ $(document).ready(function () {
},
{
label: 'Update',
cssClass: 'btn-sm btn-primary',
cssClass: 'btn btn-sm btn-primary',
id: 'updateButton',
action: function (dialogItself) {
startProcessingCallbook(nElements, $('[name="gridsquareaccuracycheck"]').is(":checked"));
@@ -1627,7 +1627,7 @@ $(document).ready(function () {
type: 'post',
success: function (html) {
BootstrapDialog.show({
title: lang_gen_advanced_logbook_start_printing_at_which_label,
title: '<i class="fas fa-print me-2"></i>'+lang_label_print_options,
size: BootstrapDialog.SIZE_NORMAL,
cssClass: 'qso-dialog',
nl2br: false,
@@ -1636,7 +1636,7 @@ $(document).ready(function () {
},
buttons: [{
label: 'Print',
cssClass: 'btn-primary btn-sm',
cssClass: 'btn btn-primary btn-sm',
action: function (dialogItself) {
printlabel(id_list);
dialogItself.close();
@@ -1644,6 +1644,7 @@ $(document).ready(function () {
},
{
label: lang_admin_close,
cssClass: 'btn btn-secondary btn-sm',
action: function (dialogItself) {
$('#printLabel').prop("disabled", false);
dialogItself.close();
@@ -1771,7 +1772,8 @@ function printlabel(id_list) {
'via': $('#via')[0].checked,
'tnxmsg': $('#tnxmsg')[0].checked,
'qslmsg': $('#qslmsg')[0].checked,
'reference': $('#reference')[0].checked
'reference': $('#reference')[0].checked,
'mycall': $('#mycall')[0].checked
},
xhr:function(){
var xhr = new XMLHttpRequest();