Skip to content

Commit

Permalink
Tag 2.5.0
Browse files Browse the repository at this point in the history
  • Loading branch information
@magicbug
magicbug authored Nov 3, 2023
2 parents 5fef977 + 6a75a4e commit 970edfa
Show file tree
Hide file tree
Showing 174 changed files with 7,376 additions and 613 deletions.
2 changes: 1 addition & 1 deletion README.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ When submitting PRs please make sure code is commented and includes one feature

## Credits

Thanks to Andy (VE7CXZ), Gavin (M1BXF), Graham (W5ISP), Robert (M0VFC), Corby (K0SKW), Andy (GI0VGV), Tobias (DL4TMA), Tony (G0WFV), Kim (DG9VH), Michael (G7VJR), Andreas (LA8AJA), Matthias (DL9MJ), Thomas (DO2TWE), Pat (KT3PJ), Flo (DF2ET) and Joerg (DJ7NT) for contributing code or help to Cloudlog.
Thanks to Andy (VE7CXZ), Gavin (M1BXF), Graham (W5ISP), Robert (M0VFC), Corby (K0SKW), Andy (GI0VGV), Tobias (DL4TMA), Tony (G0WFV), Kim (DG9VH), Michael (G7VJR), Andreas (LA8AJA), Matthias (DL9MJ), Thomas (DO2TWE), Pat (KT3PJ), Flo (DF2ET), Joerg (DJ7NT) and Fabian (HB9HIL) for contributing code or help to Cloudlog.

## Patreons & Donors

Expand Down
1 change: 1 addition & 0 deletions application/config/autoload.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -100,6 +100,7 @@
'account',
'adif',
'admin',
'awards',
'contesting',
'eqsl',
'export',
Expand Down
2 changes: 1 addition & 1 deletion application/config/migration.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
|
*/

$config['migration_version'] = 147;
$config['migration_version'] = 150;

/*
|--------------------------------------------------------------------------
Expand Down
112 changes: 108 additions & 4 deletions application/controllers/Awards.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -361,7 +361,7 @@ public function cq() {
}

// Render page
$data['page_title'] = "Awards - CQ Magazine";
$data['page_title'] = "Awards - CQ Magazine WAZ";
$this->load->view('interface_assets/header', $data);
$this->load->view('awards/cq/index');
$this->load->view('interface_assets/footer');
Expand Down Expand Up @@ -524,7 +524,7 @@ public function counties_details_ajax(){
}

public function gridmaster() {
$data['page_title']= lang('menu_us_gridmaster');
$data['page_title'] = "Awards - US Gridmaster";

$this->load->model('bands');
$this->load->model('gridmap_model');
Expand Down Expand Up @@ -558,7 +558,7 @@ public function gridmaster() {
}

public function ffma() {
$data['page_title']= lang('menu_ffma');
$data['page_title'] = "Awards - Fred Fish Memorial Award (FFMA)";

$this->load->model('bands');
$this->load->model('ffma_model');
Expand Down Expand Up @@ -587,7 +587,111 @@ public function ffma() {
$this->load->view('interface_assets/footer',$footerData);
}

public function getFfmaGridsjs() {
public function ja_gridmaster() {
$data['page_title']= lang('menu_ja_gridmaster');

$this->load->model('bands');
$this->load->model('ja_gridmaster_model');
$this->load->model('stations');

$data['homegrid']= explode(',', $this->stations->find_gridsquare());

$data['layer']= $this->optionslib->get_option('option_map_tile_server');

$data['attribution']= $this->optionslib->get_option('option_map_tile_server_copyright');

$data['gridsquares_gridsquares']= lang('gridsquares_gridsquares');
$data['gridsquares_gridsquares_worked']= lang('gridsquares_gridsquares_worked');
$data['gridsquares_gridsquares_lotw']= lang('gridsquares_gridsquares_lotw');
$data['gridsquares_gridsquares_paper']= lang('gridsquares_gridsquares_paper');

$footerData = [];
$footerData['scripts']= [
'assets/js/leaflet/geocoding.js',
'assets/js/leaflet/L.MaidenheadColouredJaGridmasterMap.js',
'assets/js/sections/ja_gridmaster.js?'
];

$this->load->view('interface_assets/header',$data);
$this->load->view('awards/ja_gridmaster/index');
$this->load->view('interface_assets/footer',$footerData);
}

public function getJaGridmasterGridsjs() {
$this->load->model('ja_gridmaster_model');

$array_grid_4char = array();
$array_grid_4char_lotw = array();
$array_grid_4char_paper = array();

$grid_4char = "";
$grid_4char_lotw = "";

$query = $this->ja_gridmaster_model->get_lotw();
if ($query && $query->num_rows() > 0) {
foreach ($query->result() as $row) {
$grid_4char_lotw = strtoupper(substr($row->GRID_SQUARES,0,4));
if(!in_array($grid_4char_lotw, $array_grid_4char_lotw)){
array_push($array_grid_4char_lotw, $grid_4char_lotw);
}
}
}

$query = $this->ja_gridmaster_model->get_paper();
if ($query && $query->num_rows() > 0) {
foreach ($query->result() as $row) {
$grid_4char_paper = strtoupper(substr($row->GRID_SQUARES,0,4));
if(!in_array($grid_4char_paper, $array_grid_4char_paper)){
array_push($array_grid_4char_paper, $grid_4char_paper);
}
}
}

$query = $this->ja_gridmaster_model->get_worked();
if ($query && $query->num_rows() > 0) {
foreach ($query->result() as $row) {
$grid_four = strtoupper(substr($row->GRID_SQUARES,0,4));
if(!in_array($grid_four, $array_grid_4char)){
array_push($array_grid_4char, $grid_four);
}
}
}

$vucc_grids = $this->ja_gridmaster_model->get_vucc_lotw();
foreach($vucc_grids as $key) {
$grid_four_lotw = strtoupper(substr($key,0,4));
if(!in_array($grid_four_lotw, $array_grid_4char_lotw)){
array_push($array_grid_4char_lotw, $grid_four_lotw);
}
}

$vucc_grids = $this->ja_gridmaster_model->get_vucc_paper();
foreach($vucc_grids as $key) {
$grid_four_paper = strtoupper(substr($key,0,4));
if(!in_array($grid_four_paper, $array_grid_4char_paper)){
array_push($array_grid_4char_paper, $grid_four_paper);
}
}

$vucc_grids = $this->ja_gridmaster_model->get_vucc_worked();
foreach($vucc_grids as $key) {
$grid_four = strtoupper(substr($key,0,4));
if(!in_array($grid_four, $array_grid_4char)){
array_push($array_grid_4char, $grid_four);
}
}

$data['grid_4char_lotw'] = ($array_grid_4char_lotw);
$data['grid_4char_paper'] = ($array_grid_4char_paper);
$data['grid_4char'] = ($array_grid_4char);
$data['grid_count'] = $this->ja_gridmaster_model->get_grid_count();
$data['grids'] = $this->ja_gridmaster_model->get_grids();

header('Content-Type: application/json');
echo json_encode($data);
}

public function getFfmaGridsjs() {
$this->load->model('ffma_model');

$array_grid_4char = array();
Expand Down
44 changes: 25 additions & 19 deletions application/controllers/Dashboard.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ public function index()
// user is not logged in
redirect('user/login');
}

$this->load->model('logbooks_model');
$logbooks_locations_array = $this->logbooks_model->list_logbook_relationships($this->session->userdata('active_station_logbook'));

Expand All @@ -41,15 +41,21 @@ public function index()
if ($qra_position) {
$data['qra'] = "set";
$data['qra_lat'] = $qra_position[0];
$data['qra_lng'] = $qra_position[1];
$data['qra_lng'] = $qra_position[1];
} else {
$data['qra'] = "none";
}
} else {
$data['qra'] = "none";
}

$this->load->model('stations');
$this->load->model('setup_model');

$data['countryCount'] = $this->setup_model->getCountryCount();
$data['logbookCount'] = $this->setup_model->getLogbookCount();
$data['locationCount'] = $this->setup_model->getLocationCount();

$data['current_active'] = $this->stations->find_active();

$setup_required = false;
Expand All @@ -62,7 +68,7 @@ public function index()
$this->load->view('interface_assets/footer');
} else {

//
//
$this->load->model('cat');
$this->load->model('vucc');

Expand Down Expand Up @@ -120,7 +126,7 @@ public function index()
}

}

function radio_display_component() {
$this->load->model('cat');

Expand All @@ -130,7 +136,7 @@ function radio_display_component() {

function map() {
$this->load->model('logbook_model');

$this->load->library('qra');

$qsos = $this->logbook_model->get_last_qsos('18');
Expand All @@ -145,7 +151,7 @@ function map() {
echo ",";
}

if($row->COL_SAT_NAME != null) {
if($row->COL_SAT_NAME != null) {
echo "{\"lat\":\"".$stn_loc[0]."\",\"lng\":\"".$stn_loc[1]."\", \"html\":\"Callsign: ".$row->COL_CALL."<br />Date/Time: ".$row->COL_TIME_ON."<br />SAT: ".$row->COL_SAT_NAME."<br />Mode: ";
echo $row->COL_SUBMODE==null?$row->COL_MODE:$row->COL_SUBMODE;
echo "\",\"label\":\"".$row->COL_CALL."\"}";
Expand All @@ -162,31 +168,31 @@ function map() {
if (count($grids) == 2) {
$grid1 = $this->qra->qra2latlong(trim($grids[0]));
$grid2 = $this->qra->qra2latlong(trim($grids[1]));

$coords[]=array('lat' => $grid1[0],'lng'=> $grid1[1]);
$coords[]=array('lat' => $grid2[0],'lng'=> $grid2[1]);
$coords[]=array('lat' => $grid2[0],'lng'=> $grid2[1]);

$stn_loc = $this->qra->get_midpoint($coords);
}
if (count($grids) == 4) {
$grid1 = $this->qra->qra2latlong(trim($grids[0]));
$grid2 = $this->qra->qra2latlong(trim($grids[1]));
$grid3 = $this->qra->qra2latlong(trim($grids[2]));
$grid4 = $this->qra->qra2latlong(trim($grids[3]));

$coords[]=array('lat' => $grid1[0],'lng'=> $grid1[1]);
$coords[]=array('lat' => $grid2[0],'lng'=> $grid2[1]);
$coords[]=array('lat' => $grid3[0],'lng'=> $grid3[1]);
$coords[]=array('lat' => $grid4[0],'lng'=> $grid4[1]);
$coords[]=array('lat' => $grid2[0],'lng'=> $grid2[1]);
$coords[]=array('lat' => $grid3[0],'lng'=> $grid3[1]);
$coords[]=array('lat' => $grid4[0],'lng'=> $grid4[1]);

$stn_loc = $this->qra->get_midpoint($coords);
}

if($count != 1) {
echo ",";
}
if($row->COL_SAT_NAME != null) {

if($row->COL_SAT_NAME != null) {
echo "{\"lat\":\"".$stn_loc[0]."\",\"lng\":\"".$stn_loc[1]."\", \"html\":\"Callsign: ".$row->COL_CALL."<br />Date/Time: ".$row->COL_TIME_ON."<br />SAT: ".$row->COL_SAT_NAME."<br />Mode: ";
echo $row->COL_SUBMODE==null?$row->COL_MODE:$row->COL_SUBMODE;
echo "\",\"label\":\"".$row->COL_CALL."\"}";
Expand All @@ -195,7 +201,7 @@ function map() {
echo $row->COL_SUBMODE==null?$row->COL_MODE:$row->COL_SUBMODE;
echo "\",\"label\":\"".$row->COL_CALL."\"}";
}

$count++;
} else {
if($count != 1) {
Expand All @@ -218,5 +224,5 @@ function map() {

}


}
Loading

0 comments on commit 970edfa

Please sign in to comment.