From b63ebc02be31b8d181ccaad7254771e56c19bee4 Mon Sep 17 00:00:00 2001
From: Andreas <6977712+AndreasK79@users.noreply.github.com>
Date: Tue, 12 Oct 2021 13:10:54 +0200
Subject: [PATCH 1/2] [Contest Logging] Started work on adding DOK to exchange

---
 application/controllers/Contesting.php |  1 +
 application/views/contesting/index.php | 19 +++++-
 assets/js/sections/contesting.js       | 81 ++++++++++++--------------
 3 files changed, 53 insertions(+), 48 deletions(-)

diff --git a/application/controllers/Contesting.php b/application/controllers/Contesting.php
index 6beb4edf..0200380a 100644
--- a/application/controllers/Contesting.php
+++ b/application/controllers/Contesting.php
@@ -22,6 +22,7 @@ class Contesting extends CI_Controller {
 		$this->load->model('contesting_model');
 
 		$data['my_gridsquare'] = $this->stations->find_gridsquare();
+		$data['my_dok'] = ""; // For now, this is set to blank, but need function to get
         $data['radios'] = $this->cat->radios();
         $data['modes'] = $this->modes->active();
 		$data['contestnames'] = $this->contesting_model->getActivecontests();
diff --git a/application/views/contesting/index.php b/application/views/contesting/index.php
index ddac3236..140d9a04 100644
--- a/application/views/contesting/index.php
+++ b/application/views/contesting/index.php
@@ -13,6 +13,9 @@
 							<div class="col-auto">
 								<select class="form-control-sm" id="exchangetype" name="exchangetype">
 									<option value='None'>None</option>
+                                    <option value='Dok'>DOK</option>
+                                    <option value='Serialdok'>DOK + Serial</option>
+                                    <option value='Dokgridsquare'>DOK + Gridsquare</option>
 									<option value='Exchange'>Exchange</option>
 									<option value='Gridsquare'>Gridsquare</option>
 									<option value='Serial'>Serial</option>
@@ -120,10 +123,15 @@
                                 <input type="text" class="form-control form-control-sm" name="rst_sent" id="rst_sent" value="59">
                             </div>
 
-							<div style="display:none" class="form-group col-md-1 serials">
+                            <div style="display:none" class="form-group col-md-1 serials">
 								<label for="exch_serial_s">Serial (S)</label>
 								<input type="number" class="form-control form-control-sm" name="exch_serial_s" id="exch_serial_s" value="">
 							</div>
+                            
+                            <div style="display:none" class="form-group col-md-1 doks">
+                                <label for="exch_dok_s">DOK (S)</label>
+                                <input disabled type="text" class="form-control form-control-sm" name="exch_dok_s" id="exch_dok_s" value="<?php echo $my_dok;?>">
+                            </div>
 
                             <div style="display:none" class="form-group col-md-1 exchanges">
                                 <label for="exch_sent"><?php echo $this->lang->line('gen_hamradio_exchange_sent_short'); ?></label>
@@ -140,11 +148,16 @@
                                 <input type="text" class="form-control form-control-sm" name="rst_recv" id="rst_recv" value="59">
                             </div>
 
-							<div style="display:none" class="form-group col-md-1 serialr">
+                            <div style="display:none" class="form-group col-md-1 serialr">
 								<label for="exch_serial_r">Serial (R)</label>
 								<input type="number" class="form-control form-control-sm" name="exch_serial_r" id="exch_serial_r" value="">
 							</div>
-
+                            
+                            <div style="display:none" class="form-group col-md-1 dokr">
+								<label for="exch_dok_r">DOK (R)</label>
+								<input type="text" class="form-control form-control-sm" name="darc_dok" id="exch_dok_r" value="">
+							</div>
+							
 							<div style="display:none" class="form-group col-md-1 exchanger">
 								<label for="exch_recv"><?php echo $this->lang->line('gen_hamradio_exchange_recv_short'); ?></label>
 								<input type="text" class="form-control form-control-sm" name="exch_recv" id="exch_recv" value="">
diff --git a/assets/js/sections/contesting.js b/assets/js/sections/contesting.js
index 90e181d8..ff64a89e 100644
--- a/assets/js/sections/contesting.js
+++ b/assets/js/sections/contesting.js
@@ -233,72 +233,63 @@ $('#exchangetype').change(function () {
 });
 
 function setExchangetype(exchangetype) {
-	if (exchangetype == 'None') {
-		$("#exch_serial_s").val("");
-		$(".exchanger").hide();
-		$(".exchanges").hide();
-		$(".serials").hide();
-		$(".serialr").hide();
-		$(".gridsquarer").hide();
-		$(".gridsquares").hide();
+	// Perhaps a better approach is to hide everything, then just enable the things you need
+	$(".exchanger").hide();
+	$(".exchanges").hide();
+	$(".serials").hide();
+	$(".serialr").hide();
+	$(".gridsquarer").hide();
+	$(".gridsquares").hide();
+	$(".doks").hide();
+	$(".dokr").hide();
+	$("#exch_serial_s").val("");
+
+	var serialsent = localStorage.getItem("serialsent");
+	if (serialsent == null) {
+		serialsent = 1;
 	}
-	else if (exchangetype == 'Exchange') {
-		$("#exch_serial_s").val("");
+
+	if (exchangetype == 'Exchange') {
 		$(".exchanger").show();
 		$(".exchanges").show();
-		$(".serials").hide();
-		$(".serialr").hide();
-		$(".gridsquarer").hide();
-		$(".gridsquares").hide();
 	}
 	else if (exchangetype == 'Serial') {
-		var serialsent = localStorage.getItem("serialsent");
-		if (serialsent != null) {
-			$("#exch_serial_s").val(serialsent);
-		} else {
-			$("#exch_serial_s").val(1);
-		}
-		$(".exchanger").hide();
-		$(".exchanges").hide();
+		$("#exch_serial_s").val(serialsent);
 		$(".serials").show();
 		$(".serialr").show();
-		$(".gridsquarer").hide();
-		$(".gridsquares").hide();
+	}
+	else if (exchangetype == 'Dok') {
+		$(".doks").show();
+		$(".dokr").show();
+	}
+	else if (exchangetype == 'Serialdok') {
+		$("#exch_serial_s").val(serialsent);
+		$(".serials").show();
+		$(".serialr").show();
+		$(".doks").show();
+		$(".dokr").show();
+	}
+	else if (exchangetype == 'Dokgridsquare') {
+		$(".gridsquarer").show();
+		$(".gridsquares").show();
+		$(".doks").show();
+		$(".dokr").show();
 	}
 	else if (exchangetype == 'Serialexchange') {
-		var serialsent = localStorage.getItem("serialsent");
-		if (serialsent != null) {
-			$("#exch_serial_s").val(serialsent);
-		} else {
-			$("#exch_serial_s").val(1);
-		}
+		$("#exch_serial_s").val(serialsent);
 		$(".exchanger").show();
 		$(".exchanges").show();
 		$(".serials").show();
 		$(".serialr").show();
-		$(".gridsquarer").hide();
-		$(".gridsquares").hide();
 	}
 	else if (exchangetype == 'Serialgridsquare') {
-		var serialsent = localStorage.getItem("serialsent");
-		if (serialsent != null) {
-			$("#exch_serial_s").val(serialsent);
-		} else {
-			$("#exch_serial_s").val(1);
-		}
-		$(".exchanger").hide();
-		$(".exchanges").hide();
+		$("#exch_serial_s").val(serialsent);
 		$(".serials").show();
 		$(".serialr").show();
 		$(".gridsquarer").show();
 		$(".gridsquares").show();
 	}
 	else if (exchangetype == 'Gridsquare') {
-		$("#exch_serial_s").val("");
-		$(".exchanger").hide();
-		$(".exchanges").hide();
-		$(".serials").hide();
-		$(".serialr").hide();
 		$(".gridsquarer").show();
 		$(".gridsquares").show();
 	}

From d44831d3f581ef3324f02144c67369db37d63ea4 Mon Sep 17 00:00:00 2001
From: Andreas <6977712+AndreasK79@users.noreply.github.com>
Date: Sat, 16 Oct 2021 16:03:54 +0200
Subject: [PATCH 2/2] [Contesting] Added selection for copying received
 exchange over to DOK field in the database.

---
 application/controllers/Contesting.php |  1 -
 application/models/Logbook_model.php   |  8 ++++++-
 application/views/contesting/index.php | 22 +++++++------------
 assets/js/sections/contesting.js       | 29 +++++++-------------------
 4 files changed, 23 insertions(+), 37 deletions(-)

diff --git a/application/controllers/Contesting.php b/application/controllers/Contesting.php
index 0200380a..6beb4edf 100644
--- a/application/controllers/Contesting.php
+++ b/application/controllers/Contesting.php
@@ -22,7 +22,6 @@ class Contesting extends CI_Controller {
 		$this->load->model('contesting_model');
 
 		$data['my_gridsquare'] = $this->stations->find_gridsquare();
-		$data['my_dok'] = ""; // For now, this is set to blank, but need function to get
         $data['radios'] = $this->cat->radios();
         $data['modes'] = $this->modes->active();
 		$data['contestnames'] = $this->contesting_model->getActivecontests();
diff --git a/application/models/Logbook_model.php b/application/models/Logbook_model.php
index ab98d8d6..72fc2dd0 100755
--- a/application/models/Logbook_model.php
+++ b/application/models/Logbook_model.php
@@ -98,6 +98,12 @@ class Logbook_model extends CI_Model {
       $clean_county_input = null;
     }
 
+    if($this->input->post('copyexchangetodok')) {
+      $dark_dok = $this->input->post('exch_recv');
+    } else {
+      $dark_dok = $this->input->post('darc_dok');
+    }
+
     // Create array with QSO Data
     $data = array(
             'COL_TIME_ON' => $datetime,
@@ -154,7 +160,7 @@ class Logbook_model extends CI_Model {
             'COL_SOTA_REF' => trim($this->input->post('sota_ref')),
             'COL_SIG' => trim($this->input->post('sig')),
             'COL_SIG_INFO' => trim($this->input->post('sig_info')),
-            'COL_DARC_DOK' => trim($this->input->post('darc_dok')),
+            'COL_DARC_DOK' => trim($dark_dok),
 			'COL_NOTES' => $this->input->post('notes'),
     );
 
diff --git a/application/views/contesting/index.php b/application/views/contesting/index.php
index 140d9a04..599658ed 100644
--- a/application/views/contesting/index.php
+++ b/application/views/contesting/index.php
@@ -13,9 +13,6 @@
 							<div class="col-auto">
 								<select class="form-control-sm" id="exchangetype" name="exchangetype">
 									<option value='None'>None</option>
-                                    <option value='Dok'>DOK</option>
-                                    <option value='Serialdok'>DOK + Serial</option>
-                                    <option value='Dokgridsquare'>DOK + Gridsquare</option>
 									<option value='Exchange'>Exchange</option>
 									<option value='Gridsquare'>Gridsquare</option>
 									<option value='Serial'>Serial</option>
@@ -128,11 +125,6 @@
 								<input type="number" class="form-control form-control-sm" name="exch_serial_s" id="exch_serial_s" value="">
 							</div>
                             
-                            <div style="display:none" class="form-group col-md-1 doks">
-                                <label for="exch_dok_s">DOK (S)</label>
-                                <input disabled type="text" class="form-control form-control-sm" name="exch_dok_s" id="exch_dok_s" value="<?php echo $my_dok;?>">
-                            </div>
-
                             <div style="display:none" class="form-group col-md-1 exchanges">
                                 <label for="exch_sent"><?php echo $this->lang->line('gen_hamradio_exchange_sent_short'); ?></label>
                                 <input type="text" class="form-control form-control-sm" name="exch_sent" id="exch_sent" value="">
@@ -152,11 +144,6 @@
 								<label for="exch_serial_r">Serial (R)</label>
 								<input type="number" class="form-control form-control-sm" name="exch_serial_r" id="exch_serial_r" value="">
 							</div>
-                            
-                            <div style="display:none" class="form-group col-md-1 dokr">
-								<label for="exch_dok_r">DOK (R)</label>
-								<input type="text" class="form-control form-control-sm" name="darc_dok" id="exch_dok_r" value="">
-							</div>
 							
 							<div style="display:none" class="form-group col-md-1 exchanger">
 								<label for="exch_recv"><?php echo $this->lang->line('gen_hamradio_exchange_recv_short'); ?></label>
@@ -183,6 +170,14 @@
 
                         <button type="button" class="btn btn-sm btn-light" onclick="reset_log_fields()"><i class="fas fa-sync-alt"></i> <?php echo $this->lang->line('contesting_btn_reset_qso'); ?></button>
                         <button type="button" class="btn btn-sm btn-primary" onclick="logQso();"><i class="fas fa-save"></i> <?php echo $this->lang->line('contesting_btn_save_qso'); ?></button>
+                        <div class="form-group row">
+                          <div class="col-md-12">
+                              <div class="form-check-inline">
+                                  <input class="form-check-input" type="checkbox" name="copyexchangetodok" value="1" id="copyexchangetodok">
+                                  <label class="form-check-label" for="copyexchangetodok">Copy received exchange to DOK field in the database!</label>
+                              </div>
+                          </div>
+                      </div>
                     </form>
                 </div>
             </div>
@@ -226,5 +221,4 @@
     </div>
 </div>
 <?php
-//var_dump($_SESSION);
 ?>
diff --git a/assets/js/sections/contesting.js b/assets/js/sections/contesting.js
index ff64a89e..8f6086d9 100644
--- a/assets/js/sections/contesting.js
+++ b/assets/js/sections/contesting.js
@@ -26,6 +26,7 @@ function reset_contest_session() {
 	setExchangetype("None");
 	$("#contestname").val("Other").change();
 	$(".contest_qso_table_contents").empty();
+	$('#copyexchangetodok').prop('checked', false);
 
 	localStorage.removeItem("contestid");
 	localStorage.removeItem("exchangetype");
@@ -36,6 +37,7 @@ function reset_contest_session() {
 	localStorage.removeItem("serialsent");
 	localStorage.removeItem("gridsquarereceived");
 	localStorage.removeItem("gridsquaresent");
+	localStorage.removeItem("copytodok");
 }
 
 // Storing the contestid in contest session
@@ -240,8 +242,6 @@ function setExchangetype(exchangetype) {
 	$(".serialr").hide();
 	$(".gridsquarer").hide();
 	$(".gridsquares").hide();
-	$(".doks").hide();
-	$(".dokr").hide();
 	$("#exch_serial_s").val("");
 
 	var serialsent = localStorage.getItem("serialsent");
@@ -258,23 +258,6 @@ function setExchangetype(exchangetype) {
 		$(".serials").show();
 		$(".serialr").show();
 	}
-	else if (exchangetype == 'Dok') {
-		$(".doks").show();
-		$(".dokr").show();
-	}
-	else if (exchangetype == 'Serialdok') {
-		$("#exch_serial_s").val(serialsent);
-		$(".serials").show();
-		$(".serialr").show();
-		$(".doks").show();
-		$(".dokr").show();
-	}
-	else if (exchangetype == 'Dokgridsquare') {
-		$(".gridsquarer").show();
-		$(".gridsquares").show();
-		$(".doks").show();
-		$(".dokr").show();
-	}
 	else if (exchangetype == 'Serialexchange') {
 		$("#exch_serial_s").val(serialsent);
 		$(".exchanger").show();
@@ -365,6 +348,7 @@ function logQso() {
 				localStorage.setItem("serialsent", $("#exch_serial_s").val());
 				localStorage.setItem("gridsquarereceived", $("#exch_gridsquare_r").val());
 				localStorage.setItem("gridsquaresent", $("#exch_gridsquare_s").val());
+				localStorage.setItem("copytodok", $('#copyexchangetodok').is(":checked"));
 			}
 		});
 	}
@@ -372,14 +356,17 @@ function logQso() {
 
 // We are restoring the settings in the contest logging form here
 function restoreContestSession() {
-	var contestname = localStorage.getItem("contestid");
+	var dokcopy = localStorage.getItem("copytodok");
+	if (dokcopy != null) {
+		$('#copyexchangetodok').prop('checked', true);
+	}
 
+	var contestname = localStorage.getItem("contestid");
 	if (contestname != null) {
 		$("#contestname").val(contestname);
 	}
 
 	var exchangetype = localStorage.getItem("exchangetype");
-
 	if (exchangetype != null) {
 		$("#exchangetype").val(exchangetype);
 		setExchangetype(exchangetype);