From 7da34e190025d4ffd1b7193febaa621ae59f2a83 Mon Sep 17 00:00:00 2001
From: Andreas Kristiansen <6977712+AndreasK79@users.noreply.github.com>
Date: Sun, 3 Mar 2024 08:58:56 +0100
Subject: [PATCH] [Bands] Added RAC and JCC. And some future proofing

---
 application/controllers/Band.php  | 22 ++++++++++++----------
 application/models/Bands.php      |  8 +++++---
 application/models/User_model.php |  2 +-
 application/views/bands/index.php |  8 ++++++++
 assets/js/sections/bands.js       |  2 ++
 5 files changed, 28 insertions(+), 14 deletions(-)

diff --git a/application/controllers/Band.php b/application/controllers/Band.php
index d56e7a05d..0bedbad6a 100644
--- a/application/controllers/Band.php
+++ b/application/controllers/Band.php
@@ -20,7 +20,7 @@ class Band extends CI_Controller {
 		$this->load->model('bands');
 
 		$data['bands'] = $this->bands->get_all_bands_for_user();
-		
+
 		// Render Page
 		$data['page_title'] = "Bands";
 		$this->load->view('interface_assets/header', $data);
@@ -28,7 +28,7 @@ class Band extends CI_Controller {
 		$this->load->view('interface_assets/footer');
 	}
 
-	public function create() 
+	public function create()
 	{
 		$this->load->model('bands');
 		$this->load->library('form_validation');
@@ -41,7 +41,7 @@ class Band extends CI_Controller {
 			$this->load->view('bands/create', $data);
 		}
 		else
-		{	
+		{
 			$this->bands->add();
 		}
 	}
@@ -55,7 +55,7 @@ class Band extends CI_Controller {
 		$band_query = $this->bands->getband($item_id_clean);
 
 		$data['my_band'] = $band_query->row();
-		
+
 		$data['page_title'] = "Edit Band";
 
         $this->load->view('bands/edit', $data);
@@ -122,8 +122,11 @@ class Band extends CI_Controller {
 		$band['cq'] 		= $this->security->xss_clean($this->input->post('cq'));
 		$band['dok'] 		= $this->security->xss_clean($this->input->post('dok'));
 		$band['dxcc'] 		= $this->security->xss_clean($this->input->post('dxcc'));
-		$band['helvetia'] 		= $this->security->xss_clean($this->input->post('helvetia'));
+		$band['helvetia'] 	= $this->security->xss_clean($this->input->post('helvetia'));
 		$band['iota'] 		= $this->security->xss_clean($this->input->post('iota'));
+		$band['jcc'] 		= $this->security->xss_clean($this->input->post('jcc'));
+		$band['pota'] 		= $this->security->xss_clean($this->input->post('pota'));
+		$band['rac'] 		= $this->security->xss_clean($this->input->post('rac'));
 		$band['sig'] 		= $this->security->xss_clean($this->input->post('sig'));
 		$band['sota']		= $this->security->xss_clean($this->input->post('sota'));
 		$band['uscounties'] = $this->security->xss_clean($this->input->post('uscounties'));
@@ -131,11 +134,10 @@ class Band extends CI_Controller {
 		$band['wwff'] 		= $this->security->xss_clean($this->input->post('wwff'));
 		$band['vucc'] 		= $this->security->xss_clean($this->input->post('vucc'));
 		$band['waja'] 		= $this->security->xss_clean($this->input->post('waja'));
-		$band['pota'] 		= $this->security->xss_clean($this->input->post('pota'));
-        
+
 		$this->load->model('bands');
         $this->bands->saveBand($id, $band);
-        
+
 		header('Content-Type: application/json');
         echo json_encode(array('message' => 'OK'));
 		return;
@@ -144,10 +146,10 @@ class Band extends CI_Controller {
 	public function saveBandAward() {
 		$award  = $this->security->xss_clean($this->input->post('award'));
 		$status	= $this->security->xss_clean($this->input->post('status'));
-        
+
 		$this->load->model('bands');
         $this->bands->saveBandAward($award, $status);
-        
+
 		header('Content-Type: application/json');
         echo json_encode(array('message' => 'OK'));
 		return;
diff --git a/application/models/Bands.php b/application/models/Bands.php
index 2a8df6cc5..3b932e756 100644
--- a/application/models/Bands.php
+++ b/application/models/Bands.php
@@ -260,9 +260,11 @@ class Bands extends CI_Model {
 			'cq' 		 => $band['cq'] 		== "true" ? '1' : '0',
 			'dok' 		 => $band['dok'] 		== "true" ? '1' : '0',
 			'dxcc' 		 => $band['dxcc'] 		== "true" ? '1' : '0',
-			'helvetia' 		 => $band['helvetia'] 		== "true" ? '1' : '0',
+			'helvetia' 	 => $band['helvetia'] 	== "true" ? '1' : '0',
 			'iota' 		 => $band['iota'] 		== "true" ? '1' : '0',
+			'jcc' 		 => $band['jcc'] 		== "true" ? '1' : '0',
 			'pota' 		 => $band['pota'] 		== "true" ? '1' : '0',
+			'rac' 		 => $band['rac'] 		== "true" ? '1' : '0',
 			'sig' 		 => $band['sig'] 		== "true" ? '1' : '0',
 			'sota'		 => $band['sota'] 		== "true" ? '1' : '0',
 			'uscounties' => $band['uscounties'] == "true" ? '1' : '0',
@@ -308,8 +310,8 @@ class Bands extends CI_Model {
 		   $this->db->insert('bands', $data);
 		}
 
-		$this->db->query("insert into bandxuser (bandid, userid, active, cq, dok, dxcc, helvetia, iota, pota, sig, sota, uscounties, was, wwff, vucc, waja)
-		select bands.id, " . $this->session->userdata('user_id') . ", 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1 from bands where band ='".$data['band']."' and not exists (select 1 from bandxuser where userid = " . $this->session->userdata('user_id') . " and bandid = bands.id);");
+		$this->db->query("insert into bandxuser (bandid, userid)
+		select bands.id, " . $this->session->userdata('user_id') . " from bands where band ='".$data['band']."' and not exists (select 1 from bandxuser where userid = " . $this->session->userdata('user_id') . " and bandid = bands.id);");
 	}
 
 	function getband($id) {
diff --git a/application/models/User_model.php b/application/models/User_model.php
index 3783f84a3..44b33b849 100644
--- a/application/models/User_model.php
+++ b/application/models/User_model.php
@@ -200,7 +200,7 @@ class User_Model extends CI_Model {
 			// Add user and insert bandsettings for user
 			$this->db->insert($this->config->item('auth_table'), $data);
 			$insert_id = $this->db->insert_id();
-			$this->db->query("insert into bandxuser (bandid, userid, active, cq, dok, dxcc, helvetia, iota, pota, sig, sota, uscounties, was, wwff, vucc, waja, rac) select bands.id, " . $insert_id . ", 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1 from bands;");
+			$this->db->query("insert into bandxuser (bandid, userid, active) select bands.id, " . $insert_id . " from bands;");
 			$this->db->query("insert into paper_types (user_id,paper_name,metric,width,orientation,height) SELECT ".$insert_id.", paper_name, metric, width, orientation,height FROM paper_types where user_id = -1;");
 			return OK;
 		} else {
diff --git a/application/views/bands/index.php b/application/views/bands/index.php
index a0c4f04ef..85bf0e3d8 100644
--- a/application/views/bands/index.php
+++ b/application/views/bands/index.php
@@ -4,7 +4,9 @@ $dok = 0;
 $dxcc = 0;
 $helvetia = 0;
 $iota = 0;
+$jcc = 0;
 $pota = 0;
+$rac = 0;
 $sig = 0;
 $sota = 0;
 $uscounties = 0;
@@ -48,7 +50,9 @@ $wwff = 0;
                     <th><?php echo lang('gen_hamradio_dxcc'); ?></th>
 					<th><?php echo lang('menu_helvetia'); ?></th>
                     <th><?php echo lang('gen_hamradio_iota'); ?></th>
+                    <th><?php echo lang('menu_jcc'); ?></th>
 					<th><?php echo lang('gen_hamradio_pota'); ?></th>
+					<th><?php echo lang('menu_rac'); ?></th>
 					<th><?php echo lang('gen_hamradio_sig'); ?></th>
                     <th><?php echo lang('gen_hamradio_sota'); ?></th>
                     <th><?php echo lang('gen_hamradio_county_reference'); ?></th>
@@ -76,7 +80,9 @@ $wwff = 0;
                     <td style="text-align: center; vertical-align: middle;" class='dxcc_<?php echo $band->id ?>'><input type="checkbox" <?php if ($band->dxcc == 1) {echo 'checked'; $dxcc++;}?>></td>
 					<td style="text-align: center; vertical-align: middle;" class='helvetia_<?php echo $band->id ?>'><input type="checkbox" <?php if ($band->helvetia == 1) {echo 'checked'; $helvetia++;}?>></td>
                     <td style="text-align: center; vertical-align: middle;" class='iota_<?php echo $band->id ?>'><input type="checkbox" <?php if ($band->iota == 1) {echo 'checked'; $iota++;}?>></td>
+                    <td style="text-align: center; vertical-align: middle;" class='jcc_<?php echo $band->id ?>'><input type="checkbox" <?php if ($band->jcc == 1) {echo 'checked'; $jcc++;}?>></td>
                     <td style="text-align: center; vertical-align: middle;" class='pota_<?php echo $band->id ?>'><input type="checkbox" <?php if ($band->pota == 1) {echo 'checked'; $pota++;}?>></td>
+					<td style="text-align: center; vertical-align: middle;" class='rac_<?php echo $band->id ?>'><input type="checkbox" <?php if ($band->rac == 1) {echo 'checked'; $rac++;}?>></td>
                     <td style="text-align: center; vertical-align: middle;" class='sig_<?php echo $band->id ?>'><input type="checkbox" <?php if ($band->sig == 1) {echo 'checked'; $sig++;}?>></td>
                     <td style="text-align: center; vertical-align: middle;" class='sota_<?php echo $band->id ?>'><input type="checkbox" <?php if ($band->sota == 1) {echo 'checked'; $sota++;}?>></td>
                     <td style="text-align: center; vertical-align: middle;" class='uscounties_<?php echo $band->id ?>'><input type="checkbox" <?php if ($band->uscounties == 1) {echo 'checked'; $uscounties++;}?>></td>
@@ -108,7 +114,9 @@ $wwff = 0;
 					<th class="master_dxcc"><input type="checkbox" <?php if ($dxcc > 0) echo 'checked';?>></th>
 					<th class="master_helvetia"><input type="checkbox" <?php if ($helvetia > 0) echo 'checked';?>></th>
 					<th class="master_iota"><input type="checkbox" <?php if ($iota > 0) echo 'checked';?>></th>
+					<th class="master_jcc"><input type="checkbox" <?php if ($jcc > 0) echo 'checked';?>></th>
 					<th class="master_pota"><input type="checkbox" <?php if ($pota > 0) echo 'checked';?>></th>
+					<th class="master_rac"><input type="checkbox" <?php if ($rac > 0) echo 'checked';?>></th>
 					<th class="master_sig"><input type="checkbox" <?php if ($sig > 0) echo 'checked';?>></th>
 					<th class="master_sota"><input type="checkbox" <?php if ($sota > 0) echo 'checked';?>></th>
 					<th class="master_uscounties"><input type="checkbox" <?php if ($uscounties > 0) echo 'checked';?>></th>
diff --git a/assets/js/sections/bands.js b/assets/js/sections/bands.js
index 7ddca4c65..bb6ffb0ec 100644
--- a/assets/js/sections/bands.js
+++ b/assets/js/sections/bands.js
@@ -215,7 +215,9 @@ function saveBand(id) {
 			'dxcc': $(".dxcc_"+id+" input[type='checkbox']").is(":checked"),
 			'helvetia': $(".helvetia_"+id+" input[type='checkbox']").is(":checked"),
 			'iota': $(".iota_"+id+" input[type='checkbox']").is(":checked"),
+			'jcc': $(".jcc_"+id+" input[type='checkbox']").is(":checked"),
 			'pota': $(".pota_"+id+" input[type='checkbox']").is(":checked"),
+			'rac': $(".rac_"+id+" input[type='checkbox']").is(":checked"),
 			'sig': $(".sig_"+id+" input[type='checkbox']").is(":checked"),
 			'sota': $(".sota_"+id+" input[type='checkbox']").is(":checked"),
 			'uscounties': $(".uscounties_"+id+" input[type='checkbox']").is(":checked"),