From b3989b3b2af7529a03fdabee8025b07530ccaa0b Mon Sep 17 00:00:00 2001
From: DB4SCW <dev@db4scw.de>
Date: Wed, 27 Nov 2024 09:18:29 +0000
Subject: [PATCH] add contest select to cbr import

---
 application/controllers/Cabrillo.php | 6 ++++++
 application/views/adif/import.php    | 8 ++++++++
 2 files changed, 14 insertions(+)

diff --git a/application/controllers/Cabrillo.php b/application/controllers/Cabrillo.php
index 7342bd181..fb3368bb4 100644
--- a/application/controllers/Cabrillo.php
+++ b/application/controllers/Cabrillo.php
@@ -170,6 +170,7 @@ class Cabrillo extends CI_Controller {
 		} 
 
 		//get data from upload
+		$contest_id = $this->input->post('contest_id', false) ?? '';
 		$data = array('upload_data' => $this->upload->data());
 
 		//set memory limit to allow big files
@@ -213,6 +214,11 @@ class Cabrillo extends CI_Controller {
 			array_push($station_ids, $station->station_id);
 		}
 
+		//overwrite contest id if chosen during upload
+		if($contest_id != ''){
+			$parsed_cbr["HEADER"]["CONTEST"] = $contest_id;
+		}
+
 		//create helper variables
 		$custom_errors = [];
 		$i = 1;
diff --git a/application/views/adif/import.php b/application/views/adif/import.php
index 368b36b23..dedd9b2fe 100644
--- a/application/views/adif/import.php
+++ b/application/views/adif/import.php
@@ -311,6 +311,14 @@
 
                         <div class="mb-3 row">
                             <div class="col-md-10">
+                            <div class="small form-text text-muted"><span class="badge text-bg-success"><?= __("Optional"); ?></span><?= __(" Contest Name, only if Contest ID in CBR is different") ?></div>
+                                <select name="contest_id" id="contest_id" class="form-select mb-2 me-sm-2 w-50 w-lg-100">
+                                    <option value="" selected><?= __("No Contest"); ?></option>
+                                    <?php
+                                    foreach ($contests as $contest) {
+                                        echo '<option value="' . $contest['adifname'] . '">' . $contest['name'] . '</option>';
+                                    } ?>
+                                </select>
                                 <div class="form-check-inline">
                                     <input class="form-check-input" type="checkbox" name="serial_number_present" value="1" id="serial_number_present" unchecked>
                                     <label class="form-check-label" for="serial_number_present"><?= __("A serial number is ALWAYS part of the exchange for both parties in this contest.") ?></label>