added "mark qsl sent" options to qso cog menu

application/controllers/Qso.php

@@ -218,6 +218,27 @@ class QSO extends CI_Controller {
         }
     }
 
+    function qsl_sent_ajax() {
+        $id = str_replace('"', "", $this->input->post("id"));
+        $method = str_replace('"', "", $this->input->post("method"));
+        
+        $this->load->model('logbook_model');
+        $this->load->model('user_model');
+        
+        header('Content-Type: application/json');
+        
+        if(!$this->user_model->authorize(2)) {
+            echo json_encode(array('message' => 'Error'));
+            
+        }
+        else {
+            // Update Logbook to Mark Paper Card Sent
+            $this->logbook_model->paperqsl_update_sent($id, $method);
+            
+            echo json_encode(array('message' => 'OK'));
+        }
+    }
+
     function qsl_requested_ajax() {
         $id = str_replace('"', "", $this->input->post("id"));
         $method = str_replace('"', "", $this->input->post("method"));

application/language/english/general_words_lang.php

@@ -48,6 +48,8 @@ $lang['general_word_qslcard_via'] = 'Via';
 $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_tx_bureau'] = 'Mark QSL Sent (Bureau)';
+$lang['general_mark_qsl_tx_direct'] = 'Mark QSL Sent (Direct)';
 
 $lang['general_delete_qso'] = 'Delete QSO';
 

application/models/Logbook_model.php

@@ -776,6 +776,21 @@ class Logbook_model extends CI_Model {
   }
 
 
+  // Set Paper to sent
+  function paperqsl_update_sent($qso_id, $method) {
+      
+      $data = array(
+          'COL_QSLSDATE' => date('Y-m-d'),
+          'COL_QSL_SENT' => 'Y',
+          'COL_QSL_SENT_VIA' => $method
+      );
+      
+      $this->db->where('COL_PRIMARY_KEY', $qso_id);
+      
+      $this->db->update($this->config->item('table_name'), $data);
+  }
+
+
   // Set Paper to requested
   function paperqsl_requested($qso_id, $method) {
 

application/views/interface_assets/footer.php

@@ -1410,7 +1410,27 @@ $(document).ready(function(){
                 success: function(data) {
                     if (data.message == 'OK') {
                         $("#qso_" + id).find("td:eq(8)").find("span:eq(1)").attr('class', 'qsl-green'); // Paints arrow green
-                        $(".qsl_" + id).remove(); // removes choice from menu
+                        $(".qsl_rcvd_" + id).remove(); // removes choice from menu
+                    }
+                    else {
+                        $(".bootstrap-dialog-message").append('<div class="alert alert-danger"><a href="#" class="close" data-dismiss="alert" aria-label="close">&times;</a>You are not allowed to update QSL status!</div>');
+                    }
+                }
+            });
+        }
+
+        function qsl_sent(id, method) {
+            var baseURL= "<?php echo base_url();?>";
+            $.ajax({
+                url: baseURL + 'index.php/qso/qsl_sent_ajax',
+                type: 'post',
+                data: {'id': id,
+                    'method': method
+                },
+                success: function(data) {
+                    if (data.message == 'OK') {
+                        $("#qso_" + id).find("td:eq(8)").find("span:eq(0)").attr('class', 'qsl-green'); // Paints arrow green
+                        $(".qsl_sent_" + id).remove(); // removes choice from menu
                     }
                     else {
                         $(".bootstrap-dialog-message").append('<div class="alert alert-danger"><a href="#" class="close" data-dismiss="alert" aria-label="close">&times;</a>You are not allowed to update QSL status!</div>');

application/views/search/search_result_ajax.php

@@ -262,16 +262,24 @@
 
                         <div class="dropdown-menu" aria-labelledby="dropdownMenuLink">
                             <a class="dropdown-item" id="edit_qso" href="javascript:qso_edit(<?php echo $row->COL_PRIMARY_KEY; ?>)"><i class="fas fa-edit"></i> <?php echo $this->lang->line('general_edit_qso'); ?></a>
-                            <div class="qsl_<?php echo $row->COL_PRIMARY_KEY; ?>">
+
+                            <?php if($row->COL_QSL_SENT !='Y') { ?>
+                                <div class="qsl_sent_<?php echo $row->COL_PRIMARY_KEY; ?>">
                                     <div class="dropdown-divider"></div>
+                                    <a class="dropdown-item" href="javascript:qsl_sent(<?php echo $row->COL_PRIMARY_KEY; ?>, 'B')" ><i class="fas fa-envelope"></i> <?php echo $this->lang->line('general_mark_qsl_tx_bureau'); ?></a>
+                                    <a class="dropdown-item" href="javascript:qsl_sent(<?php echo $row->COL_PRIMARY_KEY; ?>, 'D')" ><i class="fas fa-envelope"></i> <?php echo $this->lang->line('general_mark_qsl_tx_direct'); ?></a>
+                                </div>
+                            <?php } ?>
 
                             <?php if($row->COL_QSL_RCVD !='Y') { ?>
+                                <div class="qsl_rcvd_<?php echo $row->COL_PRIMARY_KEY; ?>">
+                                    <div class="dropdown-divider"></div>
                                     <a class="dropdown-item" href="javascript:qsl_rcvd(<?php echo $row->COL_PRIMARY_KEY; ?>, 'B')" ><i class="fas fa-envelope"></i> <?php echo $this->lang->line('general_mark_qsl_rx_bureau'); ?></a>
                                     <a class="dropdown-item" href="javascript:qsl_rcvd(<?php echo $row->COL_PRIMARY_KEY; ?>, 'D')" ><i class="fas fa-envelope"></i> <?php echo $this->lang->line('general_mark_qsl_rx_direct'); ?></a>
                                     <a class="dropdown-item" href="javascript:qsl_requested(<?php echo $row->COL_PRIMARY_KEY; ?>, 'D')" ><i class="fas fa-envelope"></i> Mark QSL Card Requested</a>
-                            <?php } ?>
-
                                     <a class="dropdown-item" href="javascript:qsl_ignore(<?php echo $row->COL_PRIMARY_KEY; ?>, 'D')" ><i class="fas fa-envelope"></i> Mark QSL Card Not Required</a>
+                                </div>
+                            <?php } ?>
 
                             <div class="dropdown-divider"></div>
 

application/views/view_log/partial/log.php

@@ -128,19 +128,28 @@
 
                     <div class="dropdown-menu" aria-labelledby="dropdownMenuLink">
                         <a class="dropdown-item" id="edit_qso" href="javascript:qso_edit(<?php echo $row->COL_PRIMARY_KEY; ?>)"><i class="fas fa-edit"></i> <?php echo $this->lang->line('general_edit_qso'); ?></a>
-                            <div class="qsl_<?php echo $row->COL_PRIMARY_KEY; ?>">
-                            <div class="dropdown-divider"></div>
 
-                            <?php if($row->COL_QSL_RCVD !='Y') { ?>
+                        <?php if($row->COL_QSL_SENT !='Y') { ?>
-                                <a class="dropdown-item" href="javascript:qsl_rcvd(<?php echo $row->COL_PRIMARY_KEY; ?>, 'B')" ><i class="fas fa-envelope"></i> <?php echo $this->lang->line('general_mark_qsl_rx_bureau'); ?></a>
+                            <div class="qsl_sent_<?php echo $row->COL_PRIMARY_KEY; ?>">
-                                <a class="dropdown-item" href="javascript:qsl_rcvd(<?php echo $row->COL_PRIMARY_KEY; ?>, 'D')" ><i class="fas fa-envelope"></i> <?php echo $this->lang->line('general_mark_qsl_rx_direct'); ?></a>
+                                <div class="dropdown-divider"></div>
+                                <a class="dropdown-item" href="javascript:qsl_sent(<?php echo $row->COL_PRIMARY_KEY; ?>, 'B')" ><i class="fas fa-envelope"></i> <?php echo $this->lang->line('general_mark_qsl_tx_bureau'); ?></a>
+                                <a class="dropdown-item" href="javascript:qsl_sent(<?php echo $row->COL_PRIMARY_KEY; ?>, 'D')" ><i class="fas fa-envelope"></i> <?php echo $this->lang->line('general_mark_qsl_tx_direct'); ?></a>
+                            </div>
                         <?php } ?>
 
+                        <?php if($row->COL_QSL_RCVD !='Y') { ?>
+                            <div class="qsl_rcvd_<?php echo $row->COL_PRIMARY_KEY; ?>">
                                 <div class="dropdown-divider"></div>
+                                <a class="dropdown-item" href="javascript:qsl_rcvd(<?php echo $row->COL_PRIMARY_KEY; ?>, 'B')" ><i class="fas fa-envelope"></i> <?php echo $this->lang->line('general_mark_qsl_rx_bureau'); ?></a>
+                                <a class="dropdown-item" href="javascript:qsl_rcvd(<?php echo $row->COL_PRIMARY_KEY; ?>, 'D')" ><i class="fas fa-envelope"></i> <?php echo $this->lang->line('general_mark_qsl_rx_direct'); ?></a>
+                                <a class="dropdown-item" href="javascript:qsl_requested(<?php echo $row->COL_PRIMARY_KEY; ?>, 'D')" ><i class="fas fa-envelope"></i> Mark QSL Card Requested</a>
+                                <a class="dropdown-item" href="javascript:qsl_ignore(<?php echo $row->COL_PRIMARY_KEY; ?>, 'D')" ><i class="fas fa-envelope"></i> Mark QSL Card Not Required</a>
+                            </div>
+                        <?php } ?>
+
                     </div>
                     <a class="dropdown-item" href="javascript:qso_delete(<?php echo $row->COL_PRIMARY_KEY; ?>, '<?php echo $row->COL_CALL; ?>')"><i class="fas fa-trash-alt"></i> <?php echo $this->lang->line('general_delete_qso'); ?></a>
                 </div>
-                    </div>
 			</td>
 			<?php } ?>
 		</tr>

application/views/view_log/partial/log_ajax.php

@@ -168,16 +168,24 @@ function echo_table_col($row, $name) {
 
                         <div class="dropdown-menu" aria-labelledby="dropdownMenuLink">
                             <a class="dropdown-item" id="edit_qso" href="javascript:qso_edit(<?php echo $row->COL_PRIMARY_KEY; ?>)"><i class="fas fa-edit"></i> <?php echo $this->lang->line('general_edit_qso'); ?></a>
-                            <div class="qsl_<?php echo $row->COL_PRIMARY_KEY; ?>">
+
+                            <?php if($row->COL_QSL_SENT !='Y') { ?>
+                                <div class="qsl_sent_<?php echo $row->COL_PRIMARY_KEY; ?>">
                                     <div class="dropdown-divider"></div>
+                                    <a class="dropdown-item" href="javascript:qsl_sent(<?php echo $row->COL_PRIMARY_KEY; ?>, 'B')" ><i class="fas fa-envelope"></i> <?php echo $this->lang->line('general_mark_qsl_tx_bureau'); ?></a>
+                                    <a class="dropdown-item" href="javascript:qsl_sent(<?php echo $row->COL_PRIMARY_KEY; ?>, 'D')" ><i class="fas fa-envelope"></i> <?php echo $this->lang->line('general_mark_qsl_tx_direct'); ?></a>
+                                </div>
+                            <?php } ?>
 
                             <?php if($row->COL_QSL_RCVD !='Y') { ?>
+                                <div class="qsl_rcvd_<?php echo $row->COL_PRIMARY_KEY; ?>">
+                                    <div class="dropdown-divider"></div>
                                     <a class="dropdown-item" href="javascript:qsl_rcvd(<?php echo $row->COL_PRIMARY_KEY; ?>, 'B')" ><i class="fas fa-envelope"></i> <?php echo $this->lang->line('general_mark_qsl_rx_bureau'); ?></a>
                                     <a class="dropdown-item" href="javascript:qsl_rcvd(<?php echo $row->COL_PRIMARY_KEY; ?>, 'D')" ><i class="fas fa-envelope"></i> <?php echo $this->lang->line('general_mark_qsl_rx_direct'); ?></a>
                                     <a class="dropdown-item" href="javascript:qsl_requested(<?php echo $row->COL_PRIMARY_KEY; ?>, 'D')" ><i class="fas fa-envelope"></i> Mark QSL Card Requested</a>
-                            <?php } ?>
-
                                     <a class="dropdown-item" href="javascript:qsl_ignore(<?php echo $row->COL_PRIMARY_KEY; ?>, 'D')" ><i class="fas fa-envelope"></i> Mark QSL Card Not Required</a>
+                                </div>
+                            <?php } ?>
 
                             <div class="dropdown-divider"></div>