Merge pull request #2228 from phl0/qslPicMarking

Add option to mark QSL RX from pic upload window

application/language/english/general_words_lang.php

@@ -55,6 +55,7 @@ $lang['general_word_lotw'] = 'Logbook of the World';
 $lang['general_edit_qso'] = 'Edit QSO';
 $lang['general_mark_qsl_rx_bureau'] = 'Mark QSL Received (Bureau)';
 $lang['general_mark_qsl_rx_direct'] = 'Mark QSL Received (Direct)';
+$lang['general_mark_qsl_rx_electronic'] = 'Mark QSL Received (Electronic)';
 $lang['general_mark_qsl_tx_bureau'] = 'Mark QSL Sent (Bureau)';
 $lang['general_mark_qsl_tx_direct'] = 'Mark QSL Sent (Direct)';
 

application/language/german/general_words_lang.php

@@ -55,6 +55,7 @@ $lang['general_word_lotw'] = 'Logbook of the World';
 $lang['general_edit_qso'] = 'QSO bearbeiten';
 $lang['general_mark_qsl_rx_bureau'] = 'Markiere QSL erhalten (Büro)';
 $lang['general_mark_qsl_rx_direct'] = 'Markiere QSL erhalten (Direkt)';
+$lang['general_mark_qsl_rx_electronic'] = 'Markiere QSL erhalten (Elektronisch)';
 $lang['general_mark_qsl_tx_bureau'] = 'Markiere QSL gesendet (Büro)';
 $lang['general_mark_qsl_tx_direct'] = 'Markiere QSL gesendet (Direkt)';
 

application/views/view_log/qso.php

@@ -507,25 +507,51 @@
 
             <p><div class="alert alert-warning" role="alert"><span class="badge badge-warning">Warning</span> Maximum file upload size is <?php echo $max_upload; ?>B.</div></p>
 
-            <form class="form" id="fileinfo" name="fileinfo" enctype="multipart/form-data">
+            <div class="row">
-                <fieldset>
+                <div class="col-md">
+                    <form class="form" id="fileinfo" name="fileinfo" enctype="multipart/form-data">
+                        <fieldset>
 
-                    <div class="form-group">
+                            <div class="form-group">
-                        <label for="qslcardfront"><?php echo lang('qslcard_upload_front'); ?></label>
+                                <label for="qslcardfront"><?php echo lang('qslcard_upload_front'); ?></label>
-                        <input class="form-control-file" type="file" id="qslcardfront" name="qslcardfront" accept="image/*" >
+                                <input class="form-control-file" type="file" id="qslcardfront" name="qslcardfront" accept="image/*" >
-                    </div>
+                            </div>
 
-                    <div class="form-group">
+                            <input type="hidden" class="form-control" id="qsoinputid" name="qsoid" value="<?php echo $row->COL_PRIMARY_KEY; ?>">
-                        <label for="qslcardback"><?php echo lang('qslcard_upload_back'); ?></label>
+                            <button type="button" onclick="uploadQsl();" id="button1id"  name="button1id" class="btn btn-primary"><?php echo lang('qslcard_upload_button'); ?></button>
-                        <input class="form-control-file" type="file" id="qslcardback" name="qslcardback" accept="image/*">
-                    </div>
 
-                    <input type="hidden" class="form-control" id="qsoinputid" name="qsoid" value="<?php echo $row->COL_PRIMARY_KEY; ?>">
+                </div>
+                <div class="col-md">
+                            <div class="form-group">
+                                <label for="qslcardback"><?php echo lang('qslcard_upload_back'); ?></label>
+                                <input class="form-control-file" type="file" id="qslcardback" name="qslcardback" accept="image/*">
+                            </div>
 
-                    <button type="button" onclick="uploadQsl();" id="button1id"  name="button1id" class="btn btn-primary"><?php echo lang('qslcard_upload_button'); ?></button>
+                        </fieldset>
+                    </form>
+                </div>
+            </div>
+            <p>
+            <div class="row">
+                <div class="col-md">
+                        <button type="button" onclick="qsl_rcvd(<?php echo $row->COL_PRIMARY_KEY; ?>, 'B');" id="qslrxb"  name="qslrxb" class="btn btn-sm btn-success ld-ext-right ld-ext-right-r-B"><i class="fas fa-envelope"></i> <?php echo lang('general_mark_qsl_rx_bureau'); ?> <div class="ld ld-ring ld-spin"></div></button>
 
-                </fieldset>
+                        <button type="button" onclick="qsl_rcvd(<?php echo $row->COL_PRIMARY_KEY; ?>, 'D');" id="qslrxd"  name="qslrxd" class="btn btn-sm btn-success ld-ext-right ld-ext-right-r-D"><i class="fas fa-envelope"></i> <?php echo lang('general_mark_qsl_rx_direct'); ?> <div class="ld ld-ring ld-spin"></div></button>
-            </form>
+
+                        <button type="button" onclick="qsl_rcvd(<?php echo $row->COL_PRIMARY_KEY; ?>, 'E');" id="qslrxe"  name="qslrxe" class="btn btn-sm btn-success ld-ext-right ld-ext-right-r-E"><i class="fas fa-envelope"></i> <?php echo lang('general_mark_qsl_rx_electronic'); ?> <div class="ld ld-ring ld-spin"></div></button>
+                </div>
+            </div>
+            <p>
+            <div class="row">
+                <div class="col-md">
+                        <button type="button" onclick="qsl_requested(<?php echo $row->COL_PRIMARY_KEY; ?>, 'B');" id="qsltxb"  name="qsltxb" class="btn btn-sm btn-warning ld-ext-right ld-ext-right-t-B"><i class="fas fa-envelope"></i> Mark QSL Card Requested (Bureau) <div class="ld ld-ring ld-spin"></div></button>
+
+                        <button type="button" onclick="qsl_requested(<?php echo $row->COL_PRIMARY_KEY; ?>, 'D');" id="qsltxd"  name="qsltxd" class="btn btn-sm btn-warning ld-ext-right ld-ext-right-t-D"><i class="fas fa-envelope"></i> Mark QSL Card Requested (Direct) <div class="ld ld-ring ld-spin"></div></button>
+
+                        <button type="button" onclick="qsl_ignore(<?php echo $row->COL_PRIMARY_KEY; ?>, 'I');" id="qsltxi"  name="qsltxi" class="btn btn-sm btn-warning ld-ext-right ld-ext-right-ignore"><i class="fas fa-envelope"></i> Mark QSL Card Not Required <div class="ld ld-ring ld-spin"></div></button>
+
+                </div>
+            </div>
         </div>
 
         <div class="tab-pane fade" id="qslcard" role="tabpanel" aria-labelledby="table-tab">

assets/js/sections/common.js

@@ -1,4 +1,6 @@
 function qsl_rcvd(id, method) {
+    $(".ld-ext-right-r-"+method).addClass('running');
+    $(".ld-ext-right-r-"+method).prop('disabled', true);
     $.ajax({
         url: base_url + 'index.php/qso/qsl_rcvd_ajax',
         type: 'post',
@@ -6,6 +8,8 @@ function qsl_rcvd(id, method) {
             'method': method
         },
         success: function(data) {
+            $(".ld-ext-right-r-"+method).removeClass('running');
+            $(".ld-ext-right-r-"+method).prop('disabled', false);
             if (data.message == 'OK') {
                 $("#qsl_" + id).find("span:eq(1)").attr('class', 'qsl-green'); // Paints arrow green
                 $(".qsl_rcvd_" + id).remove(); // removes choice from menu
@@ -39,6 +43,8 @@ function qsl_sent(id, method) {
 // Function: qsl_requested
 // Marks QSL card requested against the QSO.
 function qsl_requested(id, method) {
+    $(".ld-ext-right-t-"+method).addClass('running');
+    $(".ld-ext-right-t-"+method).prop('disabled', true);
     $.ajax({
         url: base_url + 'index.php/qso/qsl_requested_ajax',
         type: 'post',
@@ -46,6 +52,8 @@ function qsl_requested(id, method) {
             'method': method
         },
         success: function(data) {
+            $(".ld-ext-right-t-"+method).removeClass('running');
+            $(".ld-ext-right-t-"+method).prop('disabled', false);
             if (data.message == 'OK') {
                 $("#qsl_" + id).find("span:eq(0)").attr('class', 'qsl-yellow'); // Paints arrow yellow
             }
@@ -59,6 +67,8 @@ function qsl_requested(id, method) {
 // Function: qsl_ignore
 // Marks QSL card ignore against the QSO.
 function qsl_ignore(id, method) {
+    $(".ld-ext-right-ignore").addClass('running');
+    $(".ld-ext-right-ignore").prop('disabled', true);
     $.ajax({
         url: base_url + 'index.php/qso/qsl_ignore_ajax',
         type: 'post',
@@ -66,6 +76,8 @@ function qsl_ignore(id, method) {
             'method': method
         },
         success: function(data) {
+            $(".ld-ext-right-ignore").removeClass('running');
+            $(".ld-ext-right-ignore").prop('disabled', false);
             if (data.message == 'OK') {
                 $("#qsl_" + id).find("span:eq(0)").attr('class', 'qsl-grey'); // Paints arrow grey
             }