From 1adae9fd885d8342cff87fc89540ff828aadbea8 Mon Sep 17 00:00:00 2001
From: Andreas <6977712+AndreasK79@users.noreply.github.com>
Date: Sat, 7 Aug 2021 10:13:38 +0200
Subject: [PATCH] [Contesting] Started working on adding more possibilities for
 contest exchange

---
 application/views/contesting/index.php | 46 ++++++++++++++++++--------
 assets/js/sections/contesting.js       | 29 +++++++++++++---
 2 files changed, 56 insertions(+), 19 deletions(-)

diff --git a/application/views/contesting/index.php b/application/views/contesting/index.php
index 2b482085..491a6966 100644
--- a/application/views/contesting/index.php
+++ b/application/views/contesting/index.php
@@ -8,19 +8,17 @@
                 <div class="card-body">
                     <form id="qso_input" name="qsos">
                         <div class="form-group row">
-                            <label class="col-auto control-label" for="radio"><?php echo $this->lang->line('contesting_exchange_type'); ?></label>
+							<label class="col-auto control-label" for="radio"><?php echo $this->lang->line('contesting_exchange_type'); ?></label>
 
-                            <div class="col-auto">
-                                <div class="form-check form-check-inline">
-                                    <input class="form-check-input" type="radio" name="exchangeradio" id="serial" value="serial" checked>
-                                    <label class="form-check-label" for="serial"><?php echo $this->lang->line('contesting_exchange_type_serial'); ?></label>
-                                </div>
-
-                                <div class="form-check form-check-inline">
-                                    <input class="form-check-input" type="radio" name="exchangeradio" id="other" value="other">
-                                    <label class="form-check-label" for="other"><?php echo $this->lang->line('contesting_exchange_type_other'); ?></label>
-                                </div>
-                            </div>
+							<div class="col-auto">
+								<select class="form-control-sm" id="exchangetype" name="exchangetype">
+									<option value='None'>None</option>
+									<option value='Serial'>Serial</option>
+									<option value='Serialexchange'>Serial + Exchange</option>
+									<option value='Serialgridsquare'>Serial + Gridsquare</option>
+									<option value='Gridsquare'>Gridsquare</option>
+								</select>
+							</div>
 
                             <label class="col-auto control-label" for="contestname"><?php echo $this->lang->line('contesting_contest_name'); ?></label>
 
@@ -121,21 +119,41 @@
                                 <input type="text" class="form-control form-control-sm" name="rst_sent" id="rst_sent" value="59">
                             </div>
 
+							<div class="form-group col-md-1">
+								<label for="exch_serial_r">Serial (R)</label>
+								<input type="text" class="form-control form-control-sm" name="exch_serial_r" id="exch_serial_r" value="">
+							</div>
+
                             <div class="form-group col-md-1">
                                 <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="">
                             </div>
 
+							<div class="form-group col-md-1">
+								<label for="exch_gridsquare_r">Gridsquare (S)</label>
+								<input type="text" class="form-control form-control-sm" name="exch_gridsquare_r" id="exch_gridsquare_r" value="">
+							</div>
+
                             <div class="form-group col-md-1">
                                 <label for="rst_recv"><?php echo $this->lang->line('gen_hamradio_rstr'); ?></label>
                                 <input type="text" class="form-control form-control-sm" name="rst_recv" id="rst_recv" value="59">
                             </div>
 
                             <div class="form-group col-md-1">
-                                <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="">
+                                <label for="exch_serial_s">Serial (S)</label>
+                                <input type="text" class="form-control form-control-sm" name="exch_serial_s" id="exch_serial_s" value="">
                             </div>
 
+							<div class="form-group col-md-1">
+								<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="">
+							</div>
+
+							<div class="form-group col-md-1">
+								<label for="exch_gridsquare_s">Gridsquare (S)</label>
+								<input type="text" class="form-control form-control-sm" name="exch_gridsquare_s" id="exch_gridsquare_s" value="">
+							</div>
+
                         </div>
 
                         <div class="form-row">
diff --git a/assets/js/sections/contesting.js b/assets/js/sections/contesting.js
index cf1b6090..0eef65e8 100644
--- a/assets/js/sections/contesting.js
+++ b/assets/js/sections/contesting.js
@@ -9,10 +9,10 @@ $( document ).ready(function() {
     setRst($("#mode").val());
 
     // Check to see what serial type is selected and set validation
-    if($('#serial').is(':checked')) { 
+    if($('#serial').is(':checked')) {
         set_serial_number_input_validation();
     }
-    if($('#other').is(':checked')) { 
+    if($('#other').is(':checked')) {
         set_other_input_validation();
     }
 });
@@ -181,18 +181,37 @@ $('#band').change(function() {
 
 // Change Serial Validation when selected
 $('#serial').change(function() {
-    if($('#serial').is(':checked')) { 
+    if($('#serial').is(':checked')) {
         set_serial_number_input_validation();
     }
 });
 
 // Change other serial type when selected
 $('#other').change(function() {
-    if($('#other').is(':checked')) { 
+    if($('#other').is(':checked')) {
         set_other_input_validation();
     }
 });
 
+$('#exchangetype').change(function(){
+	var exchangetype = $("#exchangetype option:selected").text();
+	if (exchangetype == 'None') {
+
+	}
+	if (exchangetype == 'Serial') {
+
+	}
+	if (exchangetype == 'Serialexchange') {
+
+	}
+	if (exchangetype == 'Serialgridsquare') {
+
+	}
+	if (exchangetype == 'Gridsquare') {
+
+	}
+});
+
 /*
     Function: set_serial_number_input_validation
     Job: This sets the field input to number for validation
@@ -209,4 +228,4 @@ function set_serial_number_input_validation() {
 function set_other_input_validation() {
     $('#exch_sent').attr('type', 'text');
     $('#exch_recv').attr('type', 'text');
-}
\ No newline at end of file
+}