From ca611dee737ad10d1b63ed60ec56cf6d2b71b6f5 Mon Sep 17 00:00:00 2001
From: phl0 <github@florian-wolters.de>
Date: Thu, 29 Jun 2023 09:46:01 +0200
Subject: [PATCH] Add option to mark QSL RX from pic upload window

---
 .../language/english/general_words_lang.php   |  3 +-
 .../language/german/general_words_lang.php    |  1 +
 application/views/view_log/qso.php            | 42 ++++++++++++-------
 3 files changed, 31 insertions(+), 15 deletions(-)

diff --git a/application/language/english/general_words_lang.php b/application/language/english/general_words_lang.php
index 6dc3b456..2b15e688 100644
--- a/application/language/english/general_words_lang.php
+++ b/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)';
 
@@ -138,4 +139,4 @@ $lang['northamerica'] = 'North America';
 $lang['oceania'] = 'Oceania';
 $lang['southamerica'] = 'South America';
 
-$lang['gen_band_selection'] = 'Band selection';
\ No newline at end of file
+$lang['gen_band_selection'] = 'Band selection';
diff --git a/application/language/german/general_words_lang.php b/application/language/german/general_words_lang.php
index 61865b04..8930dddf 100644
--- a/application/language/german/general_words_lang.php
+++ b/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)';
 
diff --git a/application/views/view_log/qso.php b/application/views/view_log/qso.php
index 0071fc06..8c61953d 100644
--- a/application/views/view_log/qso.php
+++ b/application/views/view_log/qso.php
@@ -507,25 +507,39 @@
 
             <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">
-                <fieldset>
+            <div class="row">
+                <div class="col-md">
+                    <form class="form" id="fileinfo" name="fileinfo" enctype="multipart/form-data">
+                        <fieldset>
 
-                    <div class="form-group">
-                        <label for="qslcardfront"><?php echo lang('qslcard_upload_front'); ?></label>
-                        <input class="form-control-file" type="file" id="qslcardfront" name="qslcardfront" accept="image/*" >
-                    </div>
+                            <div class="form-group">
+                                <label for="qslcardfront"><?php echo lang('qslcard_upload_front'); ?></label>
+                                <input class="form-control-file" type="file" id="qslcardfront" name="qslcardfront" accept="image/*" >
+                            </div>
 
-                    <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>
+                            <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>
 
-                    <input type="hidden" class="form-control" id="qsoinputid" name="qsoid" value="<?php echo $row->COL_PRIMARY_KEY; ?>">
+                            <input type="hidden" class="form-control" id="qsoinputid" name="qsoid" value="<?php echo $row->COL_PRIMARY_KEY; ?>">
 
-                    <button type="button" onclick="uploadQsl();" id="button1id"  name="button1id" class="btn btn-primary"><?php echo lang('qslcard_upload_button'); ?></button>
+                            <button type="button" onclick="uploadQsl();" id="button1id"  name="button1id" class="btn btn-primary"><?php echo lang('qslcard_upload_button'); ?></button>
 
-                </fieldset>
-            </form>
+                        </fieldset>
+                    </form>
+                </div>
+                <?php if ($row->COL_QSL_RCVD != 'Y') { ?>
+                <div class="col-md">
+                        <p><button type="button" onclick="qsl_rcvd(<?php echo $row->COL_PRIMARY_KEY; ?>, 'B');" id="qslrxb"  name="qslrxb" class="btn btn-sm btn-success"><i class="fas fa-envelope"></i> <?php echo lang('general_mark_qsl_rx_bureau'); ?></button></p>
+
+                        </p><button type="button" onclick="qsl_rcvd(<?php echo $row->COL_PRIMARY_KEY; ?>, 'D');" id="qslrxd"  name="qslrxd" class="btn btn-sm btn-success"><i class="fas fa-envelope"></i> <?php echo lang('general_mark_qsl_rx_direct'); ?></button></p>
+
+                        <p><button type="button" onclick="qsl_rcvd(<?php echo $row->COL_PRIMARY_KEY; ?>, 'E');" id="qslrxe"  name="qslrxe" class="btn btn-sm btn-success"><i class="fas fa-envelope"></i> <?php echo lang('general_mark_qsl_rx_electronic'); ?></button></p>
+
+                </div>
+                <?php } ?>
+            </div>
         </div>
 
         <div class="tab-pane fade" id="qslcard" role="tabpanel" aria-labelledby="table-tab">