Public_Tools/wavelog
2
0
Fork 0
mirror of https://github.com/wavelog/wavelog.git synced 2026-03-22 10:24:14 +00:00
Code Issues Packages Projects Releases Wiki Activity

renamed h26 to helvetia

Browse Source
This commit is contained in:
HB9HIL
2024-02-17 00:47:00 +01:00
parent 5ffae9229b
commit a17ac50716
45 changed files with 187 additions and 187 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
application/controllers/Awards.php
View File

@@ -581,19 +581,19 @@ class Awards extends CI_Controller {
$this->load->view('interface_assets/footer', $footerData);
}
public function h26() {
public function helvetia() {
$footerData = [];
$footerData['scripts'] = [
'assets/js/sections/h26map_geojson.js?' . filemtime(realpath(__DIR__ . "/../../assets/js/sections/h26map_geojson.js")),
'assets/js/sections/h26map.js?' . filemtime(realpath(__DIR__ . "/../../assets/js/sections/h26map.js")),
'assets/js/sections/helvetiamap_geojson.js?' . filemtime(realpath(__DIR__ . "/../../assets/js/sections/helvetiamap_geojson.js")),
'assets/js/sections/helvetiamap.js?' . filemtime(realpath(__DIR__ . "/../../assets/js/sections/helvetiamap.js")),
'assets/js/leaflet/L.Maidenhead.js',
];
$this->load->model('h26');
$this->load->model('helvetia');
$this->load->model('modes');
$this->load->model('bands');
$data['worked_bands'] = $this->bands->get_worked_bands('h26');
$data['worked_bands'] = $this->bands->get_worked_bands('helvetia');
$data['modes'] = $this->modes->active(); // Used in the view for mode select
if ($this->input->post('band') != NULL) { // Band is not set when page first loads.
@@ -633,13 +633,13 @@ class Awards extends CI_Controller {
$postdata['mode'] = 'All';
}
$data['h26_array'] = $this->h26->get_h26_array($bands, $postdata);
$data['h26_summary'] = $this->h26->get_h26_summary($bands, $postdata);
$data['helvetia_array'] = $this->helvetia->get_helvetia_array($bands, $postdata);
$data['helvetia_summary'] = $this->helvetia->get_helvetia_summary($bands, $postdata);
// Render Page
$data['page_title'] = "Awards - H26";
$this->load->view('interface_assets/header', $data);
$this->load->view('awards/h26/index');
$this->load->view('awards/helvetia/index');
$this->load->view('interface_assets/footer', $footerData);
}
@@ -1133,11 +1133,11 @@ class Awards extends CI_Controller {
This displays the H26 map and requires the $band_type and $mode_type
*/
public function h26_map() {
public function helvetia_map() {
$stateString = 'AB,BC,MB,NB,NL,NT,NS,NU,ON,PE,QC,SK,YT';
$h26Array = explode(',', $stateString);
$helvetiaArray = explode(',', $stateString);
$this->load->model('h26');
$this->load->model('helvetia');
$bands[] = $this->security->xss_clean($this->input->post('band'));
@@ -1151,16 +1151,16 @@ class Awards extends CI_Controller {
$postdata['band'] = $this->security->xss_clean($this->input->post('band'));
$postdata['mode'] = $this->security->xss_clean($this->input->post('mode'));
$h26_array = $this->h26->get_h26_array($bands, $postdata);
$helvetia_array = $this->helvetia->get_helvetia_array($bands, $postdata);
$states = array();
foreach ($h26Array as $state) { // Generating array for use in the table
foreach ($helvetiaArray as $state) { // Generating array for use in the table
$states[$state] = '-'; // Inits each state's count
}
foreach ($h26_array as $was => $value) {
foreach ($helvetia_array as $was => $value) {
foreach ($value as $key) {
if($key != "") {
if (strpos($key, '>W<') !== false) {

2
application/controllers/Band.php
View File

@@ -122,7 +122,7 @@ 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['h26'] = $this->security->xss_clean($this->input->post('h26'));
$band['helvetia'] = $this->security->xss_clean($this->input->post('helvetia'));
$band['iota'] = $this->security->xss_clean($this->input->post('iota'));
$band['sig'] = $this->security->xss_clean($this->input->post('sig'));
$band['sota'] = $this->security->xss_clean($this->input->post('sota'));

8
application/language/bulgarian/awards_lang.php
View File

@@ -70,10 +70,10 @@ H26 -- Use all 4 Lines of Text
___________________________________________________________________________________________
*/
$lang['awards_h26_description_ln1'] = "HELVETIA 26 | SWITZERLAND AWARD";
$lang['awards_h26_description_ln2'] = "The USKA (Union of Swiss Shortwave Amateurs) sponsors two awards, the HELVETIA 26 (H26) Award and the SWITZERLAND Award, aimed at promoting activities on the bands by encouraging contacts across as many Swiss cantons as possible on multiple bands.";
$lang['awards_h26_description_ln3'] = "These awards come in two versions: one for HF bands and the other for VHF (including SHF and UHF) bands. Valid connections for these awards date back to January 1, 1980";
$lang['awards_h26_description_ln4'] = "For more information, you can visit this link: <a href='https://www.uska.ch/contest/uska-diplome/' target='_blank'>https://www.uska.ch/contest/uska-diplome/</a>.";
$lang['awards_helvetia_description_ln1'] = "HELVETIA 26 | SWITZERLAND AWARD";
$lang['awards_helvetia_description_ln2'] = "The USKA (Union of Swiss Shortwave Amateurs) sponsors two awards, the HELVETIA 26 (H26) Award and the SWITZERLAND Award, aimed at promoting activities on the bands by encouraging contacts across as many Swiss cantons as possible on multiple bands.";
$lang['awards_helvetia_description_ln3'] = "These awards come in two versions: one for HF bands and the other for VHF (including SHF and UHF) bands. Valid connections for these awards date back to January 1, 1980";
$lang['awards_helvetia_description_ln4'] = "For more information, you can visit this link: <a href='https://www.uska.ch/contest/uska-diplome/' target='_blank'>https://www.uska.ch/contest/uska-diplome/</a>.";
/*

2
application/language/bulgarian/menu_lang.php
View File

@@ -38,7 +38,7 @@ $lang['menu_cq'] = 'CQ';
$lang['menu_dok'] = 'DOK';
$lang['menu_dxcc'] = 'DXCC';
$lang['menu_ffma'] = 'Fred Fish Memorial Award';
$lang['menu_h26'] = "H26";
$lang['menu_helvetia'] = "H26";
$lang['menu_gridmaster'] = "Gridmaster";
$lang['menu_dl_gridmaster'] = 'DL Gridmaster';
$lang['menu_lx_gridmaster'] = 'LX Gridmaster';

8
application/language/chinese_simplified/awards_lang.php
View File

@@ -70,10 +70,10 @@ H26 -- Use all 4 Lines of Text
___________________________________________________________________________________________
*/
$lang['awards_h26_description_ln1'] = "HELVETIA 26 | SWITZERLAND AWARD";
$lang['awards_h26_description_ln2'] = "The USKA (Union of Swiss Shortwave Amateurs) sponsors two awards, the HELVETIA 26 (H26) Award and the SWITZERLAND Award, aimed at promoting activities on the bands by encouraging contacts across as many Swiss cantons as possible on multiple bands.";
$lang['awards_h26_description_ln3'] = "These awards come in two versions: one for HF bands and the other for VHF (including SHF and UHF) bands. Valid connections for these awards date back to January 1, 1980";
$lang['awards_h26_description_ln4'] = "For more information, you can visit this link: <a href='https://www.uska.ch/contest/uska-diplome/' target='_blank'>https://www.uska.ch/contest/uska-diplome/</a>.";
$lang['awards_helvetia_description_ln1'] = "HELVETIA 26 | SWITZERLAND AWARD";
$lang['awards_helvetia_description_ln2'] = "The USKA (Union of Swiss Shortwave Amateurs) sponsors two awards, the HELVETIA 26 (H26) Award and the SWITZERLAND Award, aimed at promoting activities on the bands by encouraging contacts across as many Swiss cantons as possible on multiple bands.";
$lang['awards_helvetia_description_ln3'] = "These awards come in two versions: one for HF bands and the other for VHF (including SHF and UHF) bands. Valid connections for these awards date back to January 1, 1980";
$lang['awards_helvetia_description_ln4'] = "For more information, you can visit this link: <a href='https://www.uska.ch/contest/uska-diplome/' target='_blank'>https://www.uska.ch/contest/uska-diplome/</a>.";
/*

2
application/language/chinese_simplified/menu_lang.php
View File

@@ -38,7 +38,7 @@ $lang['menu_cq'] = 'CQ';
$lang['menu_dok'] = 'DOK';
$lang['menu_dxcc'] = 'DXCC';
$lang['menu_ffma'] = 'Fred Fish Memorial Award';
$lang['menu_h26'] = "H26";
$lang['menu_helvetia'] = "H26";
$lang['menu_gridmaster'] = "Gridmaster";
$lang['menu_dl_gridmaster'] = 'DL Gridmaster';
$lang['menu_lx_gridmaster'] = 'LX Gridmaster';

8
application/language/czech/awards_lang.php
View File

@@ -70,10 +70,10 @@ H26 -- Use all 4 Lines of Text
___________________________________________________________________________________________
*/
$lang['awards_h26_description_ln1'] = "HELVETIA 26 | SWITZERLAND AWARD";
$lang['awards_h26_description_ln2'] = "The USKA (Union of Swiss Shortwave Amateurs) sponsors two awards, the HELVETIA 26 (H26) Award and the SWITZERLAND Award, aimed at promoting activities on the bands by encouraging contacts across as many Swiss cantons as possible on multiple bands.";
$lang['awards_h26_description_ln3'] = "These awards come in two versions: one for HF bands and the other for VHF (including SHF and UHF) bands. Valid connections for these awards date back to January 1, 1980";
$lang['awards_h26_description_ln4'] = "For more information, you can visit this link: <a href='https://www.uska.ch/contest/uska-diplome/' target='_blank'>https://www.uska.ch/contest/uska-diplome/</a>.";
$lang['awards_helvetia_description_ln1'] = "HELVETIA 26 | SWITZERLAND AWARD";
$lang['awards_helvetia_description_ln2'] = "The USKA (Union of Swiss Shortwave Amateurs) sponsors two awards, the HELVETIA 26 (H26) Award and the SWITZERLAND Award, aimed at promoting activities on the bands by encouraging contacts across as many Swiss cantons as possible on multiple bands.";
$lang['awards_helvetia_description_ln3'] = "These awards come in two versions: one for HF bands and the other for VHF (including SHF and UHF) bands. Valid connections for these awards date back to January 1, 1980";
$lang['awards_helvetia_description_ln4'] = "For more information, you can visit this link: <a href='https://www.uska.ch/contest/uska-diplome/' target='_blank'>https://www.uska.ch/contest/uska-diplome/</a>.";
/*

2
application/language/czech/menu_lang.php
View File

@@ -38,7 +38,7 @@ $lang['menu_cq'] = 'CQ';
$lang['menu_dok'] = 'DOK';
$lang['menu_dxcc'] = 'DXCC';
$lang['menu_ffma'] = 'Fred Fish Memorial Award';
$lang['menu_h26'] = "H26";
$lang['menu_helvetia'] = "H26";
$lang['menu_gridmaster'] = "Gridmaster";
$lang['menu_dl_gridmaster'] = 'DL Gridmaster';
$lang['menu_lx_gridmaster'] = 'LX Gridmaster';

8
application/language/dutch/awards_lang.php
View File

@@ -70,10 +70,10 @@ H26 -- Use all 4 Lines of Text
___________________________________________________________________________________________
*/
$lang['awards_h26_description_ln1'] = "HELVETIA 26 | SWITZERLAND AWARD";
$lang['awards_h26_description_ln2'] = "The USKA (Union of Swiss Shortwave Amateurs) sponsors two awards, the HELVETIA 26 (H26) Award and the SWITZERLAND Award, aimed at promoting activities on the bands by encouraging contacts across as many Swiss cantons as possible on multiple bands.";
$lang['awards_h26_description_ln3'] = "These awards come in two versions: one for HF bands and the other for VHF (including SHF and UHF) bands. Valid connections for these awards date back to January 1, 1980";
$lang['awards_h26_description_ln4'] = "For more information, you can visit this link: <a href='https://www.uska.ch/contest/uska-diplome/' target='_blank'>https://www.uska.ch/contest/uska-diplome/</a>.";
$lang['awards_helvetia_description_ln1'] = "HELVETIA 26 | SWITZERLAND AWARD";
$lang['awards_helvetia_description_ln2'] = "The USKA (Union of Swiss Shortwave Amateurs) sponsors two awards, the HELVETIA 26 (H26) Award and the SWITZERLAND Award, aimed at promoting activities on the bands by encouraging contacts across as many Swiss cantons as possible on multiple bands.";
$lang['awards_helvetia_description_ln3'] = "These awards come in two versions: one for HF bands and the other for VHF (including SHF and UHF) bands. Valid connections for these awards date back to January 1, 1980";
$lang['awards_helvetia_description_ln4'] = "For more information, you can visit this link: <a href='https://www.uska.ch/contest/uska-diplome/' target='_blank'>https://www.uska.ch/contest/uska-diplome/</a>.";
/*

2
application/language/dutch/menu_lang.php
View File

@@ -38,7 +38,7 @@ $lang['menu_cq'] = 'CQ';
$lang['menu_dok'] = 'DOK';
$lang['menu_dxcc'] = 'DXCC';
$lang['menu_ffma'] = 'Fred Fish Memorial Award';
$lang['menu_h26'] = "H26";
$lang['menu_helvetia'] = "H26";
$lang['menu_gridmaster'] = "Gridmaster";
$lang['menu_dl_gridmaster'] = 'DL Gridmaster';
$lang['menu_lx_gridmaster'] = 'LX Gridmaster';

8
application/language/english/awards_lang.php
View File

@@ -70,10 +70,10 @@ H26 -- Use all 4 Lines of Text
___________________________________________________________________________________________
*/
$lang['awards_h26_description_ln1'] = "HELVETIA 26 | SWITZERLAND AWARD";
$lang['awards_h26_description_ln2'] = "The USKA (Union of Swiss Shortwave Amateurs) sponsors two awards, the HELVETIA 26 (H26) Award and the SWITZERLAND Award, aimed at promoting activities on the bands by encouraging contacts across as many Swiss cantons as possible on multiple bands.";
$lang['awards_h26_description_ln3'] = "These awards come in two versions: one for HF bands and the other for VHF (including SHF and UHF) bands. Valid connections for these awards date back to January 1, 1980";
$lang['awards_h26_description_ln4'] = "For more information, you can visit this link: <a href='https://www.uska.ch/contest/uska-diplome/' target='_blank'>https://www.uska.ch/contest/uska-diplome/</a>.";
$lang['awards_helvetia_description_ln1'] = "HELVETIA 26 | SWITZERLAND AWARD";
$lang['awards_helvetia_description_ln2'] = "The USKA (Union of Swiss Shortwave Amateurs) sponsors two awards, the HELVETIA 26 (H26) Award and the SWITZERLAND Award, aimed at promoting activities on the bands by encouraging contacts across as many Swiss cantons as possible on multiple bands.";
$lang['awards_helvetia_description_ln3'] = "These awards come in two versions: one for HF bands and the other for VHF (including SHF and UHF) bands. Valid connections for these awards date back to January 1, 1980";
$lang['awards_helvetia_description_ln4'] = "For more information, you can visit this link: <a href='https://www.uska.ch/contest/uska-diplome/' target='_blank'>https://www.uska.ch/contest/uska-diplome/</a>.";
/*

2
application/language/english/menu_lang.php
View File

@@ -38,7 +38,7 @@ $lang['menu_cq'] = 'CQ';
$lang['menu_dok'] = 'DOK';
$lang['menu_dxcc'] = 'DXCC';
$lang['menu_ffma'] = 'Fred Fish Memorial Award';
$lang['menu_h26'] = "H26";
$lang['menu_helvetia'] = "H26";
$lang['menu_gridmaster'] = "Gridmaster";
$lang['menu_dl_gridmaster'] = 'DL Gridmaster';
$lang['menu_lx_gridmaster'] = 'LX Gridmaster';

8
application/language/finnish/awards_lang.php
View File

@@ -70,10 +70,10 @@ H26 -- Use all 4 Lines of Text
___________________________________________________________________________________________
*/
$lang['awards_h26_description_ln1'] = "HELVETIA 26 | SWITZERLAND AWARD";
$lang['awards_h26_description_ln2'] = "The USKA (Union of Swiss Shortwave Amateurs) sponsors two awards, the HELVETIA 26 (H26) Award and the SWITZERLAND Award, aimed at promoting activities on the bands by encouraging contacts across as many Swiss cantons as possible on multiple bands.";
$lang['awards_h26_description_ln3'] = "These awards come in two versions: one for HF bands and the other for VHF (including SHF and UHF) bands. Valid connections for these awards date back to January 1, 1980";
$lang['awards_h26_description_ln4'] = "For more information, you can visit this link: <a href='https://www.uska.ch/contest/uska-diplome/' target='_blank'>https://www.uska.ch/contest/uska-diplome/</a>.";
$lang['awards_helvetia_description_ln1'] = "HELVETIA 26 | SWITZERLAND AWARD";
$lang['awards_helvetia_description_ln2'] = "The USKA (Union of Swiss Shortwave Amateurs) sponsors two awards, the HELVETIA 26 (H26) Award and the SWITZERLAND Award, aimed at promoting activities on the bands by encouraging contacts across as many Swiss cantons as possible on multiple bands.";
$lang['awards_helvetia_description_ln3'] = "These awards come in two versions: one for HF bands and the other for VHF (including SHF and UHF) bands. Valid connections for these awards date back to January 1, 1980";
$lang['awards_helvetia_description_ln4'] = "For more information, you can visit this link: <a href='https://www.uska.ch/contest/uska-diplome/' target='_blank'>https://www.uska.ch/contest/uska-diplome/</a>.";
/*

2
application/language/finnish/menu_lang.php
View File

@@ -38,7 +38,7 @@ $lang['menu_cq'] = 'CQ';
$lang['menu_dok'] = 'DOK';
$lang['menu_dxcc'] = 'DXCC';
$lang['menu_ffma'] = 'Fred Fish Memorial Award';
$lang['menu_h26'] = "H26";
$lang['menu_helvetia'] = "H26";
$lang['menu_gridmaster'] = "Gridmaster";
$lang['menu_dl_gridmaster'] = 'DL Gridmaster';
$lang['menu_lx_gridmaster'] = 'LX Gridmaster';

8
application/language/french/awards_lang.php
View File

@@ -70,10 +70,10 @@ H26 -- Use all 4 Lines of Text
___________________________________________________________________________________________
*/
$lang['awards_h26_description_ln1'] = "HELVETIA 26 | SWITZERLAND AWARD";
$lang['awards_h26_description_ln2'] = "The USKA (Union of Swiss Shortwave Amateurs) sponsors two awards, the HELVETIA 26 (H26) Award and the SWITZERLAND Award, aimed at promoting activities on the bands by encouraging contacts across as many Swiss cantons as possible on multiple bands.";
$lang['awards_h26_description_ln3'] = "These awards come in two versions: one for HF bands and the other for VHF (including SHF and UHF) bands. Valid connections for these awards date back to January 1, 1980";
$lang['awards_h26_description_ln4'] = "For more information, you can visit this link: <a href='https://www.uska.ch/contest/uska-diplome/' target='_blank'>https://www.uska.ch/contest/uska-diplome/</a>.";
$lang['awards_helvetia_description_ln1'] = "HELVETIA 26 | SWITZERLAND AWARD";
$lang['awards_helvetia_description_ln2'] = "The USKA (Union of Swiss Shortwave Amateurs) sponsors two awards, the HELVETIA 26 (H26) Award and the SWITZERLAND Award, aimed at promoting activities on the bands by encouraging contacts across as many Swiss cantons as possible on multiple bands.";
$lang['awards_helvetia_description_ln3'] = "These awards come in two versions: one for HF bands and the other for VHF (including SHF and UHF) bands. Valid connections for these awards date back to January 1, 1980";
$lang['awards_helvetia_description_ln4'] = "For more information, you can visit this link: <a href='https://www.uska.ch/contest/uska-diplome/' target='_blank'>https://www.uska.ch/contest/uska-diplome/</a>.";
/*

2
application/language/french/menu_lang.php
View File

@@ -38,7 +38,7 @@ $lang['menu_cq'] = 'CQ';
$lang['menu_dok'] = 'DOK';
$lang['menu_dxcc'] = 'DXCC';
$lang['menu_ffma'] = 'Fred Fish Memorial Award';
$lang['menu_h26'] = "H26";
$lang['menu_helvetia'] = "H26";
$lang['menu_gridmaster'] = "Gridmaster";
$lang['menu_dl_gridmaster'] = 'DL Gridmaster';
$lang['menu_lx_gridmaster'] = 'LX Gridmaster';

8
application/language/german/awards_lang.php
View File

@@ -70,10 +70,10 @@ H26 -- Verwende alle 4 Textzeilen
___________________________________________________________________________________________
*/
$lang['awards_h26_description_ln1'] = "HELVETIA 26 | SWITZERLAND AWARD";
$lang['awards_h26_description_ln2'] = "Die USKA (Union Schweizerischer Kurzwellen Amateure) stiftet zwei Auszeichnungen, den HELVETIA 26 (H26) Award und den SWITZERLAND Award, um Aktivitäten auf den Bändern zu fördern, indem sie Kontakte über möglichst viele Schweizer Kantone auf verschiedenen Bändern anregen.";
$lang['awards_h26_description_ln3'] = "Diese Auszeichnungen gibt es in zwei Versionen: eine für HF-Bänder und eine für VHF-Bänder (einschließlich SHF und UHF). Gültige Verbindungen für diese Auszeichnungen datieren bis zum 1. Januar 1980 zurück.";
$lang['awards_h26_description_ln4'] = "Für weitere Informationen besuche bitte diesen Link: <a href='https://www.uska.ch/contest/uska-diplome/' target='_blank'>https://www.uska.ch/contest/uska-diplome/</a>.";
$lang['awards_helvetia_description_ln1'] = "HELVETIA 26 | SWITZERLAND AWARD";
$lang['awards_helvetia_description_ln2'] = "Die USKA (Union Schweizerischer Kurzwellen Amateure) stiftet zwei Auszeichnungen, den HELVETIA 26 (H26) Award und den SWITZERLAND Award, um Aktivitäten auf den Bändern zu fördern, indem sie Kontakte über möglichst viele Schweizer Kantone auf verschiedenen Bändern anregen.";
$lang['awards_helvetia_description_ln3'] = "Diese Auszeichnungen gibt es in zwei Versionen: eine für HF-Bänder und eine für VHF-Bänder (einschließlich SHF und UHF). Gültige Verbindungen für diese Auszeichnungen datieren bis zum 1. Januar 1980 zurück.";
$lang['awards_helvetia_description_ln4'] = "Für weitere Informationen besuche bitte diesen Link: <a href='https://www.uska.ch/contest/uska-diplome/' target='_blank'>https://www.uska.ch/contest/uska-diplome/</a>.";
/*

2
application/language/german/menu_lang.php
View File

@@ -38,7 +38,7 @@ $lang['menu_cq'] = 'CQ';
$lang['menu_dok'] = 'DOK';
$lang['menu_dxcc'] = 'DXCC';
$lang['menu_ffma'] = 'Fred Fish Memorial Award';
$lang['menu_h26'] = "H26";
$lang['menu_helvetia'] = "H26";
$lang['menu_gridmaster'] = "Gridmaster";
$lang['menu_dl_gridmaster'] = 'DL Gridmaster';
$lang['menu_lx_gridmaster'] = 'LX Gridmaster';

8
application/language/greek/awards_lang.php
View File

@@ -70,10 +70,10 @@ H26 -- Use all 4 Lines of Text
___________________________________________________________________________________________
*/
$lang['awards_h26_description_ln1'] = "HELVETIA 26 | SWITZERLAND AWARD";
$lang['awards_h26_description_ln2'] = "The USKA (Union of Swiss Shortwave Amateurs) sponsors two awards, the HELVETIA 26 (H26) Award and the SWITZERLAND Award, aimed at promoting activities on the bands by encouraging contacts across as many Swiss cantons as possible on multiple bands.";
$lang['awards_h26_description_ln3'] = "These awards come in two versions: one for HF bands and the other for VHF (including SHF and UHF) bands. Valid connections for these awards date back to January 1, 1980";
$lang['awards_h26_description_ln4'] = "For more information, you can visit this link: <a href='https://www.uska.ch/contest/uska-diplome/' target='_blank'>https://www.uska.ch/contest/uska-diplome/</a>.";
$lang['awards_helvetia_description_ln1'] = "HELVETIA 26 | SWITZERLAND AWARD";
$lang['awards_helvetia_description_ln2'] = "The USKA (Union of Swiss Shortwave Amateurs) sponsors two awards, the HELVETIA 26 (H26) Award and the SWITZERLAND Award, aimed at promoting activities on the bands by encouraging contacts across as many Swiss cantons as possible on multiple bands.";
$lang['awards_helvetia_description_ln3'] = "These awards come in two versions: one for HF bands and the other for VHF (including SHF and UHF) bands. Valid connections for these awards date back to January 1, 1980";
$lang['awards_helvetia_description_ln4'] = "For more information, you can visit this link: <a href='https://www.uska.ch/contest/uska-diplome/' target='_blank'>https://www.uska.ch/contest/uska-diplome/</a>.";
/*

2
application/language/greek/menu_lang.php
View File

@@ -38,7 +38,7 @@ $lang['menu_cq'] = 'CQ';
$lang['menu_dok'] = 'DOK';
$lang['menu_dxcc'] = 'DXCC';
$lang['menu_ffma'] = 'Fred Fish Memorial Award';
$lang['menu_h26'] = "H26";
$lang['menu_helvetia'] = "H26";
$lang['menu_gridmaster'] = "Gridmaster";
$lang['menu_dl_gridmaster'] = 'DL Gridmaster';
$lang['menu_lx_gridmaster'] = 'LX Gridmaster';

8
application/language/italian/awards_lang.php
View File

@@ -70,10 +70,10 @@ H26 -- Use all 4 Lines of Text
___________________________________________________________________________________________
*/
$lang['awards_h26_description_ln1'] = "HELVETIA 26 | SWITZERLAND AWARD";
$lang['awards_h26_description_ln2'] = "The USKA (Union of Swiss Shortwave Amateurs) sponsors two awards, the HELVETIA 26 (H26) Award and the SWITZERLAND Award, aimed at promoting activities on the bands by encouraging contacts across as many Swiss cantons as possible on multiple bands.";
$lang['awards_h26_description_ln3'] = "These awards come in two versions: one for HF bands and the other for VHF (including SHF and UHF) bands. Valid connections for these awards date back to January 1, 1980";
$lang['awards_h26_description_ln4'] = "For more information, you can visit this link: <a href='https://www.uska.ch/contest/uska-diplome/' target='_blank'>https://www.uska.ch/contest/uska-diplome/</a>.";
$lang['awards_helvetia_description_ln1'] = "HELVETIA 26 | SWITZERLAND AWARD";
$lang['awards_helvetia_description_ln2'] = "The USKA (Union of Swiss Shortwave Amateurs) sponsors two awards, the HELVETIA 26 (H26) Award and the SWITZERLAND Award, aimed at promoting activities on the bands by encouraging contacts across as many Swiss cantons as possible on multiple bands.";
$lang['awards_helvetia_description_ln3'] = "These awards come in two versions: one for HF bands and the other for VHF (including SHF and UHF) bands. Valid connections for these awards date back to January 1, 1980";
$lang['awards_helvetia_description_ln4'] = "For more information, you can visit this link: <a href='https://www.uska.ch/contest/uska-diplome/' target='_blank'>https://www.uska.ch/contest/uska-diplome/</a>.";
/*

2
application/language/italian/menu_lang.php
View File

@@ -38,7 +38,7 @@ $lang['menu_cq'] = 'CQ';
$lang['menu_dok'] = 'DOK';
$lang['menu_dxcc'] = 'DXCC';
$lang['menu_ffma'] = 'Fred Fish Memorial Award';
$lang['menu_h26'] = "H26";
$lang['menu_helvetia'] = "H26";
$lang['menu_gridmaster'] = "Gridmaster";
$lang['menu_dl_gridmaster'] = 'DL Gridmaster';
$lang['menu_lx_gridmaster'] = 'LX Gridmaster';

8
application/language/polish/awards_lang.php
View File

@@ -70,10 +70,10 @@ H26 -- Use all 4 Lines of Text
___________________________________________________________________________________________
*/
$lang['awards_h26_description_ln1'] = "HELVETIA 26 | SWITZERLAND AWARD";
$lang['awards_h26_description_ln2'] = "The USKA (Union of Swiss Shortwave Amateurs) sponsors two awards, the HELVETIA 26 (H26) Award and the SWITZERLAND Award, aimed at promoting activities on the bands by encouraging contacts across as many Swiss cantons as possible on multiple bands.";
$lang['awards_h26_description_ln3'] = "These awards come in two versions: one for HF bands and the other for VHF (including SHF and UHF) bands. Valid connections for these awards date back to January 1, 1980";
$lang['awards_h26_description_ln4'] = "For more information, you can visit this link: <a href='https://www.uska.ch/contest/uska-diplome/' target='_blank'>https://www.uska.ch/contest/uska-diplome/</a>.";
$lang['awards_helvetia_description_ln1'] = "HELVETIA 26 | SWITZERLAND AWARD";
$lang['awards_helvetia_description_ln2'] = "The USKA (Union of Swiss Shortwave Amateurs) sponsors two awards, the HELVETIA 26 (H26) Award and the SWITZERLAND Award, aimed at promoting activities on the bands by encouraging contacts across as many Swiss cantons as possible on multiple bands.";
$lang['awards_helvetia_description_ln3'] = "These awards come in two versions: one for HF bands and the other for VHF (including SHF and UHF) bands. Valid connections for these awards date back to January 1, 1980";
$lang['awards_helvetia_description_ln4'] = "For more information, you can visit this link: <a href='https://www.uska.ch/contest/uska-diplome/' target='_blank'>https://www.uska.ch/contest/uska-diplome/</a>.";
/*

2
application/language/polish/menu_lang.php
View File

@@ -38,7 +38,7 @@ $lang['menu_cq'] = 'CQ';
$lang['menu_dok'] = 'DOK';
$lang['menu_dxcc'] = 'DXCC';
$lang['menu_ffma'] = 'Fred Fish Memorial Award';
$lang['menu_h26'] = "H26";
$lang['menu_helvetia'] = "H26";
$lang['menu_gridmaster'] = "Gridmaster";
$lang['menu_dl_gridmaster'] = 'DL Gridmaster';
$lang['menu_lx_gridmaster'] = 'LX Gridmaster';

8
application/language/russian/awards_lang.php
View File

@@ -70,10 +70,10 @@ H26 -- Use all 4 Lines of Text
___________________________________________________________________________________________
*/
$lang['awards_h26_description_ln1'] = "HELVETIA 26 | SWITZERLAND AWARD";
$lang['awards_h26_description_ln2'] = "The USKA (Union of Swiss Shortwave Amateurs) sponsors two awards, the HELVETIA 26 (H26) Award and the SWITZERLAND Award, aimed at promoting activities on the bands by encouraging contacts across as many Swiss cantons as possible on multiple bands.";
$lang['awards_h26_description_ln3'] = "These awards come in two versions: one for HF bands and the other for VHF (including SHF and UHF) bands. Valid connections for these awards date back to January 1, 1980";
$lang['awards_h26_description_ln4'] = "For more information, you can visit this link: <a href='https://www.uska.ch/contest/uska-diplome/' target='_blank'>https://www.uska.ch/contest/uska-diplome/</a>.";
$lang['awards_helvetia_description_ln1'] = "HELVETIA 26 | SWITZERLAND AWARD";
$lang['awards_helvetia_description_ln2'] = "The USKA (Union of Swiss Shortwave Amateurs) sponsors two awards, the HELVETIA 26 (H26) Award and the SWITZERLAND Award, aimed at promoting activities on the bands by encouraging contacts across as many Swiss cantons as possible on multiple bands.";
$lang['awards_helvetia_description_ln3'] = "These awards come in two versions: one for HF bands and the other for VHF (including SHF and UHF) bands. Valid connections for these awards date back to January 1, 1980";
$lang['awards_helvetia_description_ln4'] = "For more information, you can visit this link: <a href='https://www.uska.ch/contest/uska-diplome/' target='_blank'>https://www.uska.ch/contest/uska-diplome/</a>.";
/*

2
application/language/russian/menu_lang.php
View File

@@ -38,7 +38,7 @@ $lang['menu_cq'] = 'CQ';
$lang['menu_dok'] = 'DOK';
$lang['menu_dxcc'] = 'DXCC';
$lang['menu_ffma'] = 'Fred Fish Memorial Award';
$lang['menu_h26'] = "H26";
$lang['menu_helvetia'] = "H26";
$lang['menu_gridmaster'] = "Gridmaster";
$lang['menu_dl_gridmaster'] = 'DL Gridmaster';
$lang['menu_lx_gridmaster'] = 'LX Gridmaster';

8
application/language/spanish/awards_lang.php
View File

@@ -70,10 +70,10 @@ H26 -- Use all 4 Lines of Text
___________________________________________________________________________________________
*/
$lang['awards_h26_description_ln1'] = "HELVETIA 26 | SWITZERLAND AWARD";
$lang['awards_h26_description_ln2'] = "The USKA (Union of Swiss Shortwave Amateurs) sponsors two awards, the HELVETIA 26 (H26) Award and the SWITZERLAND Award, aimed at promoting activities on the bands by encouraging contacts across as many Swiss cantons as possible on multiple bands.";
$lang['awards_h26_description_ln3'] = "These awards come in two versions: one for HF bands and the other for VHF (including SHF and UHF) bands. Valid connections for these awards date back to January 1, 1980";
$lang['awards_h26_description_ln4'] = "For more information, you can visit this link: <a href='https://www.uska.ch/contest/uska-diplome/' target='_blank'>https://www.uska.ch/contest/uska-diplome/</a>.";
$lang['awards_helvetia_description_ln1'] = "HELVETIA 26 | SWITZERLAND AWARD";
$lang['awards_helvetia_description_ln2'] = "The USKA (Union of Swiss Shortwave Amateurs) sponsors two awards, the HELVETIA 26 (H26) Award and the SWITZERLAND Award, aimed at promoting activities on the bands by encouraging contacts across as many Swiss cantons as possible on multiple bands.";
$lang['awards_helvetia_description_ln3'] = "These awards come in two versions: one for HF bands and the other for VHF (including SHF and UHF) bands. Valid connections for these awards date back to January 1, 1980";
$lang['awards_helvetia_description_ln4'] = "For more information, you can visit this link: <a href='https://www.uska.ch/contest/uska-diplome/' target='_blank'>https://www.uska.ch/contest/uska-diplome/</a>.";
/*

2
application/language/spanish/menu_lang.php
View File

@@ -38,7 +38,7 @@ $lang['menu_cq'] = 'CQ';
$lang['menu_dok'] = 'DOK';
$lang['menu_dxcc'] = 'DXCC';
$lang['menu_ffma'] = 'Fred Fish Memorial Award';
$lang['menu_h26'] = "H26";
$lang['menu_helvetia'] = "H26";
$lang['menu_gridmaster'] = "Gridmaster";
$lang['menu_dl_gridmaster'] = 'DL Gridmaster';
$lang['menu_lx_gridmaster'] = 'LX Gridmaster';

8
application/language/swedish/awards_lang.php
View File

@@ -70,10 +70,10 @@ H26 -- Use all 4 Lines of Text
___________________________________________________________________________________________
*/
$lang['awards_h26_description_ln1'] = "HELVETIA 26 | SWITZERLAND AWARD";
$lang['awards_h26_description_ln2'] = "The USKA (Union of Swiss Shortwave Amateurs) sponsors two awards, the HELVETIA 26 (H26) Award and the SWITZERLAND Award, aimed at promoting activities on the bands by encouraging contacts across as many Swiss cantons as possible on multiple bands.";
$lang['awards_h26_description_ln3'] = "These awards come in two versions: one for HF bands and the other for VHF (including SHF and UHF) bands. Valid connections for these awards date back to January 1, 1980";
$lang['awards_h26_description_ln4'] = "For more information, you can visit this link: <a href='https://www.uska.ch/contest/uska-diplome/' target='_blank'>https://www.uska.ch/contest/uska-diplome/</a>.";
$lang['awards_helvetia_description_ln1'] = "HELVETIA 26 | SWITZERLAND AWARD";
$lang['awards_helvetia_description_ln2'] = "The USKA (Union of Swiss Shortwave Amateurs) sponsors two awards, the HELVETIA 26 (H26) Award and the SWITZERLAND Award, aimed at promoting activities on the bands by encouraging contacts across as many Swiss cantons as possible on multiple bands.";
$lang['awards_helvetia_description_ln3'] = "These awards come in two versions: one for HF bands and the other for VHF (including SHF and UHF) bands. Valid connections for these awards date back to January 1, 1980";
$lang['awards_helvetia_description_ln4'] = "For more information, you can visit this link: <a href='https://www.uska.ch/contest/uska-diplome/' target='_blank'>https://www.uska.ch/contest/uska-diplome/</a>.";
/*

2
application/language/swedish/menu_lang.php
View File

@@ -38,7 +38,7 @@ $lang['menu_cq'] = 'CQ';
$lang['menu_dok'] = 'DOK';
$lang['menu_dxcc'] = 'DXCC';
$lang['menu_ffma'] = 'Fred Fish Memorial Award';
$lang['menu_h26'] = "H26";
$lang['menu_helvetia'] = "H26";
$lang['menu_gridmaster'] = "Gridmaster";
$lang['menu_dl_gridmaster'] = 'DL Gridmaster';
$lang['menu_lx_gridmaster'] = 'LX Gridmaster';

8
application/language/turkish/awards_lang.php
View File

@@ -70,10 +70,10 @@ H26 -- Use all 4 Lines of Text
___________________________________________________________________________________________
*/
$lang['awards_h26_description_ln1'] = "HELVETIA 26 | SWITZERLAND AWARD";
$lang['awards_h26_description_ln2'] = "The USKA (Union of Swiss Shortwave Amateurs) sponsors two awards, the HELVETIA 26 (H26) Award and the SWITZERLAND Award, aimed at promoting activities on the bands by encouraging contacts across as many Swiss cantons as possible on multiple bands.";
$lang['awards_h26_description_ln3'] = "These awards come in two versions: one for HF bands and the other for VHF (including SHF and UHF) bands. Valid connections for these awards date back to January 1, 1980";
$lang['awards_h26_description_ln4'] = "For more information, you can visit this link: <a href='https://www.uska.ch/contest/uska-diplome/' target='_blank'>https://www.uska.ch/contest/uska-diplome/</a>.";
$lang['awards_helvetia_description_ln1'] = "HELVETIA 26 | SWITZERLAND AWARD";
$lang['awards_helvetia_description_ln2'] = "The USKA (Union of Swiss Shortwave Amateurs) sponsors two awards, the HELVETIA 26 (H26) Award and the SWITZERLAND Award, aimed at promoting activities on the bands by encouraging contacts across as many Swiss cantons as possible on multiple bands.";
$lang['awards_helvetia_description_ln3'] = "These awards come in two versions: one for HF bands and the other for VHF (including SHF and UHF) bands. Valid connections for these awards date back to January 1, 1980";
$lang['awards_helvetia_description_ln4'] = "For more information, you can visit this link: <a href='https://www.uska.ch/contest/uska-diplome/' target='_blank'>https://www.uska.ch/contest/uska-diplome/</a>.";
/*

2
application/language/turkish/menu_lang.php
View File

@@ -38,7 +38,7 @@ $lang['menu_cq'] = 'CQ';
$lang['menu_dok'] = 'DOK';
$lang['menu_dxcc'] = 'DXCC';
$lang['menu_ffma'] = 'Fred Fish Memorial Award';
$lang['menu_h26'] = "H26";
$lang['menu_helvetia'] = "H26";
$lang['menu_gridmaster'] = "Gridmaster";
$lang['menu_dl_gridmaster'] = 'DL Gridmaster';
$lang['menu_lx_gridmaster'] = 'LX Gridmaster';

23
application/migrations/181_add_h26_bandxuser.php
View File

@@ -1,23 +0,0 @@
<?php
defined('BASEPATH') or exit('No direct script access allowed');
class Migration_add_h26_bandxuser extends CI_Migration
{
public function up()
{
$fields = array(
'h26 TINYINT NOT NULL DEFAULT 1',
);
if (!$this->db->field_exists('h26', 'bandxuser')) {
$this->dbforge->add_column('bandxuser', $fields);
}
}
public function down()
{
if ($this->db->field_exists('h26', 'bandxuser')) {
$this->dbforge->drop_column('bandxuser', 'h26');
}
}
}

23
application/migrations/181_add_helvetia_bandxuser.php Normal file
View File

@@ -0,0 +1,23 @@
<?php
defined('BASEPATH') or exit('No direct script access allowed');
class Migration_add_helvetia_bandxuser extends CI_Migration
{
public function up()
{
$fields = array(
'helvetia TINYINT NOT NULL DEFAULT 1',
);
if (!$this->db->field_exists('helvetia', 'bandxuser')) {
$this->dbforge->add_column('bandxuser', $fields);
}
}
public function down()
{
if ($this->db->field_exists('helvetia', 'bandxuser')) {
$this->dbforge->drop_column('bandxuser', 'helvetia');
}
}
}

6
application/models/Bands.php
View File

@@ -260,7 +260,7 @@ class Bands extends CI_Model {
'cq' => $band['cq'] == "true" ? '1' : '0',
'dok' => $band['dok'] == "true" ? '1' : '0',
'dxcc' => $band['dxcc'] == "true" ? '1' : '0',
'h26' => $band['h26'] == "true" ? '1' : '0',
'helvetia' => $band['helvetia'] == "true" ? '1' : '0',
'iota' => $band['iota'] == "true" ? '1' : '0',
'pota' => $band['pota'] == "true" ? '1' : '0',
'sig' => $band['sig'] == "true" ? '1' : '0',
@@ -308,8 +308,8 @@ class Bands extends CI_Model {
$this->db->insert('bands', $data);
}
$this->db->query("insert into bandxuser (bandid, userid, active, cq, dok, dxcc, h26, iota, pota, sig, sota, uscounties, was, wwff, vucc)
select bands.id, " . $this->session->userdata('user_id') . ", 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, 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);");
}
function getband($id) {

60
application/models/H26.php → application/models/Helvetia.php
View File

@@ -1,10 +1,10 @@
<?php
class h26 extends CI_Model {
class helvetia extends CI_Model {
public $stateString = 'AG,AI,AR,BE,BL,BS,FR,GE,GL,GR,JU,LU,NE,NW,OW,SG,SH,SO,SZ,TG,TI,UR,VD,VS,ZG,ZH';
function get_h26_array($bands, $postdata) {
function get_helvetia_array($bands, $postdata) {
$CI =& get_instance();
$CI->load->model('logbooks_model');
$logbooks_locations_array = $CI->logbooks_model->list_logbook_relationships($this->session->userdata('active_station_logbook'));
@@ -17,7 +17,7 @@ class h26 extends CI_Model {
$stateArray = explode(',', $this->stateString);
$states = array(); // Used for keeping th26k of which states that are not worked
$states = array(); // Used for keeping thelvetiak of which states that are not worked
$qsl = "";
if ($postdata['confirmed'] != NULL) {
@@ -42,20 +42,20 @@ class h26 extends CI_Model {
foreach ($bands as $band) {
foreach ($stateArray as $state) { // Generating array for use in the table
$bandh26[$state][$band] = '-'; // Sets all to dash to indicate no result
$bandhelvetia[$state][$band] = '-'; // Sets all to dash to indicate no result
}
if ($postdata['worked'] != NULL) {
$h26Band = $this->geth26Worked($location_list, $band, $postdata);
foreach ($h26Band as $line) {
$bandh26[$line->col_state][$band] = '<div class="bg-danger awardsBgDanger"><a href=\'javascript:displayContacts("' . $line->col_state . '","' . $band . '","'. $postdata['mode'] . '","h26", "")\'>W</a></div>';
$helvetiaBand = $this->gethelvetiaWorked($location_list, $band, $postdata);
foreach ($helvetiaBand as $line) {
$bandhelvetia[$line->col_state][$band] = '<div class="bg-danger awardsBgDanger"><a href=\'javascript:displayContacts("' . $line->col_state . '","' . $band . '","'. $postdata['mode'] . '","helvetia", "")\'>W</a></div>';
$states[$line->col_state]['count']++;
}
}
if ($postdata['confirmed'] != NULL) {
$h26Band = $this->geth26Confirmed($location_list, $band, $postdata);
foreach ($h26Band as $line) {
$bandh26[$line->col_state][$band] = '<div class="bg-success awardsBgSuccess"><a href=\'javascript:displayContacts("' . $line->col_state . '","' . $band . '","'. $postdata['mode'] . '","h26", "'.$qsl.'")\'>C</a></div>';
$helvetiaBand = $this->gethelvetiaConfirmed($location_list, $band, $postdata);
foreach ($helvetiaBand as $line) {
$bandhelvetia[$line->col_state][$band] = '<div class="bg-success awardsBgSuccess"><a href=\'javascript:displayContacts("' . $line->col_state . '","' . $band . '","'. $postdata['mode'] . '","helvetia", "'.$qsl.'")\'>C</a></div>';
$states[$line->col_state]['count']++;
}
}
@@ -63,30 +63,30 @@ class h26 extends CI_Model {
// We want to remove the worked states in the list, since we do not want to display them
if ($postdata['worked'] == NULL) {
$h26Band = $this->geth26Worked($location_list, $postdata['band'], $postdata);
foreach ($h26Band as $line) {
unset($bandh26[$line->col_state]);
$helvetiaBand = $this->gethelvetiaWorked($location_list, $postdata['band'], $postdata);
foreach ($helvetiaBand as $line) {
unset($bandhelvetia[$line->col_state]);
}
}
// We want to remove the confirmed states in the list, since we do not want to display them
if ($postdata['confirmed'] == NULL) {
$h26Band = $this->geth26Confirmed($location_list, $postdata['band'], $postdata);
foreach ($h26Band as $line) {
unset($bandh26[$line->col_state]);
$helvetiaBand = $this->gethelvetiaConfirmed($location_list, $postdata['band'], $postdata);
foreach ($helvetiaBand as $line) {
unset($bandhelvetia[$line->col_state]);
}
}
if ($postdata['notworked'] == NULL) {
foreach ($stateArray as $state) {
if ($states[$state]['count'] == 0) {
unset($bandh26[$state]);
unset($bandhelvetia[$state]);
};
}
}
if (isset($bandh26)) {
return $bandh26;
if (isset($bandhelvetia)) {
return $bandhelvetia;
}
else {
return 0;
@@ -96,7 +96,7 @@ class h26 extends CI_Model {
/*
* Function gets worked and confirmed summary on each band on the active stationprofile
*/
function get_h26_summary($bands, $postdata)
function get_helvetia_summary($bands, $postdata)
{
$CI =& get_instance();
$CI->load->model('logbooks_model');
@@ -111,17 +111,17 @@ class h26 extends CI_Model {
foreach ($bands as $band) {
$worked = $this->getSummaryByBand($band, $postdata, $location_list);
$confirmed = $this->getSummaryByBandConfirmed($band, $postdata, $location_list);
$h26Summary['worked'][$band] = $worked[0]->count;
$h26Summary['confirmed'][$band] = $confirmed[0]->count;
$helvetiaSummary['worked'][$band] = $worked[0]->count;
$helvetiaSummary['confirmed'][$band] = $confirmed[0]->count;
}
$workedTotal = $this->getSummaryByBand($postdata['band'], $postdata, $location_list);
$confirmedTotal = $this->getSummaryByBandConfirmed($postdata['band'], $postdata, $location_list);
$h26Summary['worked']['Total'] = $workedTotal[0]->count;
$h26Summary['confirmed']['Total'] = $confirmedTotal[0]->count;
$helvetiaSummary['worked']['Total'] = $workedTotal[0]->count;
$helvetiaSummary['confirmed']['Total'] = $confirmedTotal[0]->count;
return $h26Summary;
return $helvetiaSummary;
}
function getSummaryByBand($band, $postdata, $location_list)
@@ -135,7 +135,7 @@ class h26 extends CI_Model {
} else if ($band == 'All') {
$this->load->model('bands');
$bandslots = $this->bands->get_worked_bands('h26');
$bandslots = $this->bands->get_worked_bands('helvetia');
$bandslots_list = "'".implode("','",$bandslots)."'";
@@ -168,7 +168,7 @@ class h26 extends CI_Model {
} else if ($band == 'All') {
$this->load->model('bands');
$bandslots = $this->bands->get_worked_bands('h26');
$bandslots = $this->bands->get_worked_bands('helvetia');
$bandslots_list = "'".implode("','",$bandslots)."'";
@@ -196,7 +196,7 @@ class h26 extends CI_Model {
* Function returns all worked, but not confirmed states
* $postdata contains data from the form, in this case Lotw or QSL are used
*/
function geth26Worked($location_list, $band, $postdata) {
function gethelvetiaWorked($location_list, $band, $postdata) {
$sql = "SELECT distinct col_state FROM " . $this->config->item('table_name') . " thcv
where station_id in (" . $location_list . ")";
@@ -233,7 +233,7 @@ class h26 extends CI_Model {
* Function returns all confirmed states on given band and on LoTW or QSL
* $postdata contains data from the form, in this case Lotw or QSL are used
*/
function geth26Confirmed($location_list, $band, $postdata) {
function gethelvetiaConfirmed($location_list, $band, $postdata) {
$sql = "SELECT distinct col_state FROM " . $this->config->item('table_name') . " thcv
where station_id in (" . $location_list . ")";
@@ -295,7 +295,7 @@ class h26 extends CI_Model {
} else {
$this->load->model('bands');
$bandslots = $this->bands->get_worked_bands('h26');
$bandslots = $this->bands->get_worked_bands('helvetia');
$bandslots_list = "'".implode("','",$bandslots)."'";

2
application/models/Logbook_model.php
View File

@@ -380,7 +380,7 @@ class Logbook_model extends CI_Model {
$this->db->where('COL_STATE', $searchphrase);
$this->db->where_in('COL_DXCC', ['1']);
break;
case 'h26':
case 'helvetia':
$this->db->where('COL_STATE', $searchphrase);
$this->db->where_in('COL_DXCC', ['287']);
break;

2
application/models/User_model.php
View File

@@ -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, iota, pota, sig, sota, uscounties, was, wwff, vucc, waja, rac, h26) 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, 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 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 {

38
application/views/awards/h26/index.php → application/views/awards/helvetia/index.php
View File

@@ -3,7 +3,7 @@
</script>
<style>
#h26map {
#helvetiamap {
height: calc(100vh - 500px) !important;
max-height: 900px !important;
}
@@ -57,16 +57,16 @@
<div id="awardInfoButton">
<script>
var lang_awards_info_button = "<?php echo lang('awards_info_button'); ?>";
var lang_award_info_ln1 = "<?php echo lang('awards_h26_description_ln1'); ?>";
var lang_award_info_ln2 = "<?php echo lang('awards_h26_description_ln2'); ?>";
var lang_award_info_ln3 = "<?php echo lang('awards_h26_description_ln3'); ?>";
var lang_award_info_ln4 = "<?php echo lang('awards_h26_description_ln4'); ?>";
var lang_award_info_ln1 = "<?php echo lang('awards_helvetia_description_ln1'); ?>";
var lang_award_info_ln2 = "<?php echo lang('awards_helvetia_description_ln2'); ?>";
var lang_award_info_ln3 = "<?php echo lang('awards_helvetia_description_ln3'); ?>";
var lang_award_info_ln4 = "<?php echo lang('awards_helvetia_description_ln4'); ?>";
</script>
<h2><?php echo $page_title; ?></h2>
<button type="button" class="btn btn-sm btn-primary me-1" id="displayAwardInfo"><?php echo lang('awards_info_button'); ?></button>
</div>
<!-- End of Award Info Box -->
<form class="form" action="<?php echo site_url('awards/h26'); ?>" method="post" enctype="multipart/form-data">
<form class="form" action="<?php echo site_url('awards/helvetia'); ?>" method="post" enctype="multipart/form-data">
<fieldset>
<div class="mb-3 row">
@@ -150,8 +150,8 @@
<div class="col-md-10">
<button id="button2id" type="reset" name="button2id" class="btn btn-sm btn-warning">Reset</button>
<button id="button1id" type="submit" name="button1id" class="btn btn-sm btn-primary">Show</button>
<?php if ($h26_array) {
?><button type="button" onclick="load_h26_map();" class="btn btn-info btn-sm"><i class="fas fa-globe-americas"></i> Show h26 Map</button>
<?php if ($helvetia_array) {
?><button type="button" onclick="load_helvetia_map();" class="btn btn-info btn-sm"><i class="fas fa-globe-americas"></i> Show helvetia Map</button>
<?php }?>
</div>
</div>
@@ -164,16 +164,16 @@
<a class="nav-link active" id="table-tab" data-bs-toggle="tab" href="#table" role="tab" aria-controls="table" aria-selected="true">Table</a>
</li>
<li class="nav-item">
<a class="nav-link" id="map-tab" onclick="load_h26_map();" data-bs-toggle="tab" href="#h26maptab" role="tab" aria-controls="home" aria-selected="false">Map</a>
<a class="nav-link" id="map-tab" onclick="load_helvetia_map();" data-bs-toggle="tab" href="#helvetiamaptab" role="tab" aria-controls="home" aria-selected="false">Map</a>
</li>
</ul>
<br />
<div class="tab-content" id="myTabContent">
<div class="tab-pane fade" id="h26maptab" role="tabpanel" aria-labelledby="home-tab">
<div class="tab-pane fade" id="helvetiamaptab" role="tabpanel" aria-labelledby="home-tab">
<br />
<div id="h26map" class="map-leaflet" ></div>
<div id="helvetiamap" class="map-leaflet" ></div>
</div>
@@ -181,10 +181,10 @@
<?php
if ($h26_array) {
if ($helvetia_array) {
$i = 1;
echo '
<table style="width:100%" class="table table-sm tableh26 table-bordered table-hover table-striped table-condensed text-center">
<table style="width:100%" class="table table-sm tablehelvetia table-bordered table-hover table-striped table-condensed text-center">
<thead>
<tr>
<td>#</td>
@@ -196,10 +196,10 @@
</thead>
<tbody>';
foreach ($h26_array as $h26 => $value) { // Fills the table with the data
foreach ($helvetia_array as $helvetia => $value) { // Fills the table with the data
echo '<tr>
<td>' . $i++ . '</td>
<td>'. $h26 .'</td>';
<td>'. $helvetia .'</td>';
foreach ($value as $key) {
echo '<td style="text-align: center">' . $key . '</td>';
}
@@ -222,14 +222,14 @@
<tr><td>Total worked</td>';
foreach ($h26_summary['worked'] as $h26) { // Fills the table with the data
echo '<td style="text-align: center">' . $h26 . '</td>';
foreach ($helvetia_summary['worked'] as $helvetia) { // Fills the table with the data
echo '<td style="text-align: center">' . $helvetia . '</td>';
}
echo '</tr><tr>
<td>Total confirmed</td>';
foreach ($h26_summary['confirmed'] as $h26) { // Fills the table with the data
echo '<td style="text-align: center">' . $h26 . '</td>';
foreach ($helvetia_summary['confirmed'] as $helvetia) { // Fills the table with the data
echo '<td style="text-align: center">' . $helvetia . '</td>';
}
echo '</tr>

8
application/views/bands/index.php
View File

@@ -2,7 +2,7 @@
$cq = 0;
$dok = 0;
$dxcc = 0;
$h26 = 0;
$helvetia = 0;
$iota = 0;
$pota = 0;
$sig = 0;
@@ -46,7 +46,7 @@ $wwff = 0;
<th><?php echo lang('gen_hamradio_cq'); ?></th>
<th><?php echo lang('gen_hamradio_dok'); ?></th>
<th><?php echo lang('gen_hamradio_dxcc'); ?></th>
<th><?php echo lang('menu_h26'); ?></th>
<th><?php echo lang('menu_helvetia'); ?></th>
<th><?php echo lang('gen_hamradio_iota'); ?></th>
<th><?php echo lang('gen_hamradio_pota'); ?></th>
<th><?php echo lang('gen_hamradio_sig'); ?></th>
@@ -74,7 +74,7 @@ $wwff = 0;
<td style="text-align: center; vertical-align: middle;" class='cq_<?php echo $band->id ?>'><input type="checkbox" <?php if ($band->cq == 1) {echo 'checked'; $cq++;}?>></td>
<td style="text-align: center; vertical-align: middle;" class='dok_<?php echo $band->id ?>'><input type="checkbox" <?php if ($band->dok == 1) {echo 'checked'; $dok++;}?>></td>
<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='h26_<?php echo $band->id ?>'><input type="checkbox" <?php if ($band->h26 == 1) {echo 'checked'; $h26++;}?>></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='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='sig_<?php echo $band->id ?>'><input type="checkbox" <?php if ($band->sig == 1) {echo 'checked'; $sig++;}?>></td>
@@ -106,7 +106,7 @@ $wwff = 0;
<th class="master_cq"><input type="checkbox" <?php if ($cq > 0) echo 'checked';?>></th>
<th class="master_dok"><input type="checkbox" <?php if ($dok > 0) echo 'checked';?>></th>
<th class="master_dxcc"><input type="checkbox" <?php if ($dxcc > 0) echo 'checked';?>></th>
<th class="master_h26"><input type="checkbox" <?php if ($h26 > 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_pota"><input type="checkbox" <?php if ($pota > 0) echo 'checked';?>></th>
<th class="master_sig"><input type="checkbox" <?php if ($sig > 0) echo 'checked';?>></th>

4
application/views/interface_assets/footer.php
View File

@@ -1932,9 +1932,9 @@ $(document).ready(function(){
</script>
<?php } ?>
<?php if ($this->uri->segment(2) == "h26") { ?>
<?php if ($this->uri->segment(2) == "helvetia") { ?>
<script>
$('.tableh26').DataTable({
$('.tablehelvetia').DataTable({
"pageLength": 25,
responsive: false,
ordering: false,

2
application/views/interface_assets/header.php
View File

@@ -143,7 +143,7 @@
<div class="dropdown-divider"></div>
<li><a class="dropdown-item" href="<?php echo site_url('awards/ffma'); ?>"><i class="fas fa-trophy"></i> <?php echo lang('menu_ffma'); ?></a></li>
<div class="dropdown-divider"></div>
<li><a class="dropdown-item" href="<?php echo site_url('awards/h26'); ?>"><i class="fas fa-trophy"></i> H26</a></li>
<li><a class="dropdown-item" href="<?php echo site_url('awards/helvetia'); ?>"><i class="fas fa-trophy"></i> H26</a></li>
<div class="dropdown-divider"></div>
<li><a class="dropdown-item" href="<?php echo site_url('awards/iota'); ?>"><i class="fas fa-trophy"></i> <?php echo lang('menu_iota'); ?></a></li>
<div class="dropdown-divider"></div>

2
assets/js/sections/bands.js
View File

@@ -213,7 +213,7 @@ function saveBand(id) {
'cq': $(".cq_"+id+" input[type='checkbox']").is(":checked"),
'dok': $(".dok_"+id+" input[type='checkbox']").is(":checked"),
'dxcc': $(".dxcc_"+id+" input[type='checkbox']").is(":checked"),
'h26': $(".h26_"+id+" input[type='checkbox']").is(":checked"),
'helvetia': $(".helvetia_"+id+" input[type='checkbox']").is(":checked"),
'iota': $(".iota_"+id+" input[type='checkbox']").is(":checked"),
'pota': $(".pota_"+id+" input[type='checkbox']").is(":checked"),
'sig': $(".sig_"+id+" input[type='checkbox']").is(":checked"),

24
assets/js/sections/h26map.js → assets/js/sections/helvetiamap.js
View File

@@ -7,7 +7,7 @@ var clickmarkers = [];
const states = 'AG,AI,AR,BE,BL,BS,FR,GE,GL,GR,JU,LU,NE,NW,OW,SG,SH,SO,SZ,TG,TI,UR,VD,VS,ZG,ZH';
const h26markers = [
const helvetiamarkers = [
[ "55", "-115" ], // AB Alberta
[ "55", "-125" ], // BC British Columbia
[ "55", "-99" ], // MB Manitoba
@@ -26,10 +26,10 @@ const h26markers = [
var statearray = states.split(",");
function load_h26_map() {
$('.nav-tabs a[href="#h26maptab"]').tab('show');
function load_helvetia_map() {
$('.nav-tabs a[href="#helvetiamaptab"]').tab('show');
$.ajax({
url: base_url + 'index.php/awards/h26_map',
url: base_url + 'index.php/awards/helvetia_map',
type: 'post',
data: {
band: $('#band2').val(),
@@ -44,7 +44,7 @@ function load_h26_map() {
},
success: function(data) {
province = data;
load_h26_map2(data);
load_helvetia_map2(data);
},
error: function() {
@@ -52,18 +52,18 @@ function load_h26_map() {
});
}
function load_h26_map2(data) {
function load_helvetia_map2(data) {
// If map is already initialized
var container = L.DomUtil.get('h26map');
var container = L.DomUtil.get('helvetiamap');
if(container != null){
container._leaflet_id = null;
container.remove();
$("#h26maptab").append('<div id="h26map"></div>');
$("#helvetiamaptab").append('<div id="helvetiamap"></div>');
}
map = new L.Map('h26map', {
map = new L.Map('helvetiamap', {
fullscreenControl: true,
fullscreenControlOptions: {
position: 'topleft'
@@ -161,7 +161,7 @@ function createMarker(i) {
var title = '<span class="grid-text" style="cursor: default"><font style="color: \'white\'; font-size: 1em; font-weight: 900;">' + (statearray[i]) + '</font></span>';
var myIcon = L.divIcon({className: 'my-div-icon', html: title});
var marker = L.marker(
[h26markers[i][0], h26markers[i][1]], {
[helvetiamarkers[i][0], helvetiamarkers[i][1]], {
icon: myIcon,
title: (statearray[i]),
zIndex: 1000,
@@ -221,10 +221,10 @@ function style(feature) {
function onClick(e) {
zoomToFeature(e);
var marker = e.target;
displayContactsOnMap($("#h26map"),marker.feature.id, $('#band2').val(), $('#mode').val(), 'h26');
displayContactsOnMap($("#helvetiamap"),marker.feature.id, $('#band2').val(), $('#mode').val(), 'helvetia');
}
function onClick2(e) {
var marker = e.target;
displayContactsOnMap($("#h26map"), marker.options.title, $('#band2').val(), $('#mode').val(), 'h26');
displayContactsOnMap($("#helvetiamap"), marker.options.title, $('#band2').val(), $('#mode').val(), 'helvetia');
}

0
assets/js/sections/h26map_geojson.js → assets/js/sections/helvetiamap_geojson.js
View File