kopia lustrzana https://github.com/magicbug/Cloudlog
Merge remote-tracking branch 'upstream/dev' into bootstrap_5
HB9HIL
commit
ba63e5f6db
|
|
@ -11,6 +11,7 @@
|
|||
/images/eqsl_card_images/*.jpg
|
||||
/updates/clublog_scp.txt
|
||||
/assets/qslcard/*
|
||||
/assets/js/sections/custom.js
|
||||
.idea/*
|
||||
.DS_Store
|
||||
sync.sh
|
||||
|
|
|
|||
|
|
@ -22,7 +22,7 @@ $config['migration_enabled'] = TRUE;
|
|||
|
|
||||
*/
|
||||
|
||||
$config['migration_version'] = 153;
|
||||
$config['migration_version'] = 154;
|
||||
|
||||
/*
|
||||
|--------------------------------------------------------------------------
|
||||
|
|
|
|||
|
|
@ -110,6 +110,7 @@ class Dashboard extends CI_Controller {
|
|||
$data['last_five_qsos'] = $this->logbook_model->get_last_qsos('18', $logbooks_locations_array);
|
||||
|
||||
$data['vucc'] = $this->vucc->fetchVuccSummary();
|
||||
$data['vuccSAT'] = $this->vucc->fetchVuccSummary('SAT');
|
||||
|
||||
$data['page_title'] = "Dashboard";
|
||||
|
||||
|
|
|
|||
|
|
@ -156,7 +156,7 @@ ________________________________________________________________________________
|
|||
|
||||
$lang['awards_vucc_description_ln1'] = "VUCC - VHF/UHF Century Club Award";
|
||||
$lang['awards_vucc_description_ln2'] = "The VHF/UHF Century Club Award is given for a minimum number of worked and confirmed gridsquares on a desired band.";
|
||||
$lang['awards_vucc_description_ln3'] = "Official information and the rules can be found in this document: <a href='https://www.amsat.org/gridmaster/' target='_blank'>Click here</a>.";
|
||||
$lang['awards_vucc_description_ln3'] = "Official information and the rules can be found in this document: <a href='https://www.arrl.org/vucc' target='_blank'>Click here</a>.";
|
||||
$lang['awards_vucc_description_ln4'] = "Only VHF/UHF bands are relevant.";
|
||||
|
||||
|
||||
|
|
|
|||
|
|
@ -156,7 +156,7 @@ ________________________________________________________________________________
|
|||
|
||||
$lang['awards_vucc_description_ln1'] = "VUCC - VHF/UHF Century Club Award";
|
||||
$lang['awards_vucc_description_ln2'] = "The VHF/UHF Century Club Award is given for a minimum number of worked and confirmed gridsquares on a desired band.";
|
||||
$lang['awards_vucc_description_ln3'] = "Official information and the rules can be found in this document: <a href='https://www.amsat.org/gridmaster/' target='_blank'>Click here</a>.";
|
||||
$lang['awards_vucc_description_ln3'] = "Official information and the rules can be found in this document: <a href='https://www.arrl.org/vucc' target='_blank'>Click here</a>.";
|
||||
$lang['awards_vucc_description_ln4'] = "Only VHF/UHF bands are relevant.";
|
||||
|
||||
|
||||
|
|
|
|||
|
|
@ -156,7 +156,7 @@ ________________________________________________________________________________
|
|||
|
||||
$lang['awards_vucc_description_ln1'] = "VUCC - VHF/UHF Century Club Award";
|
||||
$lang['awards_vucc_description_ln2'] = "The VHF/UHF Century Club Award is given for a minimum number of worked and confirmed gridsquares on a desired band.";
|
||||
$lang['awards_vucc_description_ln3'] = "Official information and the rules can be found in this document: <a href='https://www.amsat.org/gridmaster/' target='_blank'>Click here</a>.";
|
||||
$lang['awards_vucc_description_ln3'] = "Official information and the rules can be found in this document: <a href='https://www.arrl.org/vucc' target='_blank'>Click here</a>.";
|
||||
$lang['awards_vucc_description_ln4'] = "Only VHF/UHF bands are relevant.";
|
||||
|
||||
|
||||
|
|
|
|||
|
|
@ -156,7 +156,7 @@ ________________________________________________________________________________
|
|||
|
||||
$lang['awards_vucc_description_ln1'] = "VUCC - VHF/UHF Century Club Award";
|
||||
$lang['awards_vucc_description_ln2'] = "The VHF/UHF Century Club Award is given for a minimum number of worked and confirmed gridsquares on a desired band.";
|
||||
$lang['awards_vucc_description_ln3'] = "Official information and the rules can be found in this document: <a href='https://www.amsat.org/gridmaster/' target='_blank'>Click here</a>.";
|
||||
$lang['awards_vucc_description_ln3'] = "Official information and the rules can be found in this document: <a href='https://www.arrl.org/vucc' target='_blank'>Click here</a>.";
|
||||
$lang['awards_vucc_description_ln4'] = "Only VHF/UHF bands are relevant.";
|
||||
|
||||
|
||||
|
|
|
|||
|
|
@ -156,7 +156,7 @@ ________________________________________________________________________________
|
|||
|
||||
$lang['awards_vucc_description_ln1'] = "VUCC - VHF/UHF Century Club Award";
|
||||
$lang['awards_vucc_description_ln2'] = "The VHF/UHF Century Club Award is given for a minimum number of worked and confirmed gridsquares on a desired band.";
|
||||
$lang['awards_vucc_description_ln3'] = "Official information and the rules can be found in this document: <a href='https://www.amsat.org/gridmaster/' target='_blank'>Click here</a>.";
|
||||
$lang['awards_vucc_description_ln3'] = "Official information and the rules can be found in this document: <a href='https://www.arrl.org/vucc' target='_blank'>Click here</a>.";
|
||||
$lang['awards_vucc_description_ln4'] = "Only VHF/UHF bands are relevant.";
|
||||
|
||||
|
||||
|
|
|
|||
|
|
@ -156,7 +156,7 @@ ________________________________________________________________________________
|
|||
|
||||
$lang['awards_vucc_description_ln1'] = "VUCC - VHF/UHF Century Club Award";
|
||||
$lang['awards_vucc_description_ln2'] = "The VHF/UHF Century Club Award is given for a minimum number of worked and confirmed gridsquares on a desired band.";
|
||||
$lang['awards_vucc_description_ln3'] = "Official information and the rules can be found in this document: <a href='https://www.amsat.org/gridmaster/' target='_blank'>Click here</a>.";
|
||||
$lang['awards_vucc_description_ln3'] = "Official information and the rules can be found in this document: <a href='https://www.arrl.org/vucc' target='_blank'>Click here</a>.";
|
||||
$lang['awards_vucc_description_ln4'] = "Only VHF/UHF bands are relevant.";
|
||||
|
||||
|
||||
|
|
|
|||
|
|
@ -156,7 +156,7 @@ ________________________________________________________________________________
|
|||
|
||||
$lang['awards_vucc_description_ln1'] = "VUCC - VHF/UHF Century Club Award";
|
||||
$lang['awards_vucc_description_ln2'] = "The VHF/UHF Century Club Award is given for a minimum number of worked and confirmed gridsquares on a desired band.";
|
||||
$lang['awards_vucc_description_ln3'] = "Official information and the rules can be found in this document: <a href='https://www.amsat.org/gridmaster/' target='_blank'>Click here</a>.";
|
||||
$lang['awards_vucc_description_ln3'] = "Official information and the rules can be found in this document: <a href='https://www.arrl.org/vucc' target='_blank'>Click here</a>.";
|
||||
$lang['awards_vucc_description_ln4'] = "Only VHF/UHF bands are relevant.";
|
||||
|
||||
|
||||
|
|
|
|||
|
|
@ -156,7 +156,7 @@ ________________________________________________________________________________
|
|||
|
||||
$lang['awards_vucc_description_ln1'] = "VUCC - VHF/UHF Century Club Award";
|
||||
$lang['awards_vucc_description_ln2'] = "Der VHF/UHF Century Club Award wird für eine Mindestanzahl von gearbeiteten und bestätigten Gitterquadraten auf einem gewünschten Band verliehen.";
|
||||
$lang['awards_vucc_description_ln3'] = "Offizielle Informationen und Regeln finden Sie in diesem Dokument: <a href='https://www.amsat.org/gridmaster/' target='_blank'>Klick hier.</a>.";
|
||||
$lang['awards_vucc_description_ln3'] = "Offizielle Informationen und Regeln finden Sie in diesem Dokument: <a href='https://www.arrl.org/vucc' target='_blank'>Klick hier.</a>.";
|
||||
$lang['awards_vucc_description_ln4'] = "Nur VHF/UHF-Bänder sind relevant.";
|
||||
|
||||
|
||||
|
|
|
|||
|
|
@ -156,7 +156,7 @@ ________________________________________________________________________________
|
|||
|
||||
$lang['awards_vucc_description_ln1'] = "VUCC - VHF/UHF Century Club Award";
|
||||
$lang['awards_vucc_description_ln2'] = "The VHF/UHF Century Club Award is given for a minimum number of worked and confirmed gridsquares on a desired band.";
|
||||
$lang['awards_vucc_description_ln3'] = "Official information and the rules can be found in this document: <a href='https://www.amsat.org/gridmaster/' target='_blank'>Click here</a>.";
|
||||
$lang['awards_vucc_description_ln3'] = "Official information and the rules can be found in this document: <a href='https://www.arrl.org/vucc' target='_blank'>Click here</a>.";
|
||||
$lang['awards_vucc_description_ln4'] = "Only VHF/UHF bands are relevant.";
|
||||
|
||||
|
||||
|
|
|
|||
|
|
@ -156,7 +156,7 @@ ________________________________________________________________________________
|
|||
|
||||
$lang['awards_vucc_description_ln1'] = "VUCC - VHF/UHF Century Club Award";
|
||||
$lang['awards_vucc_description_ln2'] = "The VHF/UHF Century Club Award is given for a minimum number of worked and confirmed gridsquares on a desired band.";
|
||||
$lang['awards_vucc_description_ln3'] = "Official information and the rules can be found in this document: <a href='https://www.amsat.org/gridmaster/' target='_blank'>Click here</a>.";
|
||||
$lang['awards_vucc_description_ln3'] = "Official information and the rules can be found in this document: <a href='https://www.arrl.org/vucc' target='_blank'>Click here</a>.";
|
||||
$lang['awards_vucc_description_ln4'] = "Only VHF/UHF bands are relevant.";
|
||||
|
||||
|
||||
|
|
|
|||
|
|
@ -156,7 +156,7 @@ ________________________________________________________________________________
|
|||
|
||||
$lang['awards_vucc_description_ln1'] = "VUCC - VHF/UHF Century Club Award";
|
||||
$lang['awards_vucc_description_ln2'] = "The VHF/UHF Century Club Award is given for a minimum number of worked and confirmed gridsquares on a desired band.";
|
||||
$lang['awards_vucc_description_ln3'] = "Official information and the rules can be found in this document: <a href='https://www.amsat.org/gridmaster/' target='_blank'>Click here</a>.";
|
||||
$lang['awards_vucc_description_ln3'] = "Official information and the rules can be found in this document: <a href='https://www.arrl.org/vucc' target='_blank'>Click here</a>.";
|
||||
$lang['awards_vucc_description_ln4'] = "Only VHF/UHF bands are relevant.";
|
||||
|
||||
|
||||
|
|
|
|||
|
|
@ -156,7 +156,7 @@ ________________________________________________________________________________
|
|||
|
||||
$lang['awards_vucc_description_ln1'] = "VUCC - VHF/UHF Century Club Award";
|
||||
$lang['awards_vucc_description_ln2'] = "The VHF/UHF Century Club Award is given for a minimum number of worked and confirmed gridsquares on a desired band.";
|
||||
$lang['awards_vucc_description_ln3'] = "Official information and the rules can be found in this document: <a href='https://www.amsat.org/gridmaster/' target='_blank'>Click here</a>.";
|
||||
$lang['awards_vucc_description_ln3'] = "Official information and the rules can be found in this document: <a href='https://www.arrl.org/vucc' target='_blank'>Click here</a>.";
|
||||
$lang['awards_vucc_description_ln4'] = "Only VHF/UHF bands are relevant.";
|
||||
|
||||
|
||||
|
|
|
|||
|
|
@ -156,7 +156,7 @@ ________________________________________________________________________________
|
|||
|
||||
$lang['awards_vucc_description_ln1'] = "VUCC - VHF/UHF Century Club Award";
|
||||
$lang['awards_vucc_description_ln2'] = "The VHF/UHF Century Club Award is given for a minimum number of worked and confirmed gridsquares on a desired band.";
|
||||
$lang['awards_vucc_description_ln3'] = "Official information and the rules can be found in this document: <a href='https://www.amsat.org/gridmaster/' target='_blank'>Click here</a>.";
|
||||
$lang['awards_vucc_description_ln3'] = "Official information and the rules can be found in this document: <a href='https://www.arrl.org/vucc' target='_blank'>Click here</a>.";
|
||||
$lang['awards_vucc_description_ln4'] = "Only VHF/UHF bands are relevant.";
|
||||
|
||||
|
||||
|
|
|
|||
|
|
@ -156,7 +156,7 @@ ________________________________________________________________________________
|
|||
|
||||
$lang['awards_vucc_description_ln1'] = "VUCC - VHF/UHF Century Club Award";
|
||||
$lang['awards_vucc_description_ln2'] = "The VHF/UHF Century Club Award is given for a minimum number of worked and confirmed gridsquares on a desired band.";
|
||||
$lang['awards_vucc_description_ln3'] = "Official information and the rules can be found in this document: <a href='https://www.amsat.org/gridmaster/' target='_blank'>Click here</a>.";
|
||||
$lang['awards_vucc_description_ln3'] = "Official information and the rules can be found in this document: <a href='https://www.arrl.org/vucc' target='_blank'>Click here</a>.";
|
||||
$lang['awards_vucc_description_ln4'] = "Only VHF/UHF bands are relevant.";
|
||||
|
||||
|
||||
|
|
|
|||
|
|
@ -156,7 +156,7 @@ ________________________________________________________________________________
|
|||
|
||||
$lang['awards_vucc_description_ln1'] = "VUCC - VHF/UHF Century Club Award";
|
||||
$lang['awards_vucc_description_ln2'] = "The VHF/UHF Century Club Award is given for a minimum number of worked and confirmed gridsquares on a desired band.";
|
||||
$lang['awards_vucc_description_ln3'] = "Official information and the rules can be found in this document: <a href='https://www.amsat.org/gridmaster/' target='_blank'>Click here</a>.";
|
||||
$lang['awards_vucc_description_ln3'] = "Official information and the rules can be found in this document: <a href='https://www.arrl.org/vucc' target='_blank'>Click here</a>.";
|
||||
$lang['awards_vucc_description_ln4'] = "Only VHF/UHF bands are relevant.";
|
||||
|
||||
|
||||
|
|
|
|||
|
|
@ -0,0 +1,60 @@
|
|||
<?php
|
||||
|
||||
defined('BASEPATH') or exit('No direct script access allowed');
|
||||
|
||||
/*
|
||||
* Create a dxpedition table
|
||||
*/
|
||||
|
||||
class Migration_create_dxpedition_table extends CI_Migration
|
||||
{
|
||||
|
||||
public function up()
|
||||
{
|
||||
/* check if the dxpedition table exists if not create dxpedition table */
|
||||
if (!$this->db->table_exists('dxpedition')) {
|
||||
|
||||
$this->dbforge->add_field(array(
|
||||
'id' => array(
|
||||
'type' => 'INT',
|
||||
'constraint' => 6,
|
||||
'unsigned' => TRUE,
|
||||
'auto_increment' => TRUE,
|
||||
'null' => FALSE
|
||||
),
|
||||
'start_date' => array(
|
||||
'type' => 'DATE',
|
||||
'null' => TRUE,
|
||||
),
|
||||
'end_date' => array(
|
||||
'type' => 'DATE',
|
||||
'null' => TRUE,
|
||||
),
|
||||
'callsign' => array(
|
||||
'type' => 'VARCHAR',
|
||||
'constraint' => '255',
|
||||
'null' => FALSE,
|
||||
),
|
||||
'country' => array(
|
||||
'type' => 'VARCHAR',
|
||||
'constraint' => '255',
|
||||
'null' => TRUE,
|
||||
),
|
||||
'notes' => array(
|
||||
'type' => 'VARCHAR',
|
||||
'constraint' => '255',
|
||||
'null' => TRUE,
|
||||
),
|
||||
));
|
||||
$this->dbforge->add_key('id', TRUE);
|
||||
$this->dbforge->add_key('callsign', TRUE);
|
||||
|
||||
$this->dbforge->create_table('dxpedition');
|
||||
}
|
||||
}
|
||||
|
||||
public function down()
|
||||
{
|
||||
$this->dbforge->drop_table('dxpedition');
|
||||
}
|
||||
}
|
||||
|
|
@ -8,14 +8,15 @@ class Logbookadvanced_model extends CI_Model {
|
|||
$binding = [$searchCriteria['user_id']];
|
||||
|
||||
if ((isset($searchCriteria['dupes'])) && ($searchCriteria['dupes'] !== '')) {
|
||||
$id_sql="select group_concat(x.qsoids separator ',') as QSO_IDs from (
|
||||
select GROUP_CONCAT(col_primary_key separator ',') as qsoids, COL_CALL, COL_MODE, COL_SUBMODE, station_callsign, COL_SAT_NAME, COL_BAND, min(col_time_on) Mintime, max(col_time_on) Maxtime from " . $this->config->item('table_name') . "
|
||||
$id_sql="select GROUP_CONCAT(col_primary_key separator ',') as qsoids, COL_CALL, COL_MODE, COL_SUBMODE, station_callsign, COL_SAT_NAME, COL_BAND, min(col_time_on) Mintime, max(col_time_on) Maxtime from " . $this->config->item('table_name') . "
|
||||
join station_profile on " . $this->config->item('table_name') . ".station_id = station_profile.station_id where station_profile.user_id=?
|
||||
group by col_call, col_mode, COL_SUBMODE, STATION_CALLSIGN, col_band, COL_SAT_NAME having count(*) > 1 and timediff(maxtime, mintime) < 3000) x";
|
||||
group by col_call, col_mode, COL_SUBMODE, STATION_CALLSIGN, col_band, COL_SAT_NAME having count(*) > 1 and timediff(maxtime, mintime) < 3000";
|
||||
$id_query = $this->db->query($id_sql, $searchCriteria['user_id']);
|
||||
$ids2fetch = '';
|
||||
foreach ($id_query->result() as $id) {
|
||||
$ids2fetch=$id->QSO_IDs;
|
||||
$ids2fetch .= ','.$id->qsoids;
|
||||
}
|
||||
$ids2fetch = ltrim($ids2fetch, ',');
|
||||
if ($ids2fetch ?? '' !== '') {
|
||||
$conditions[] = "qsos.COL_PRIMARY_KEY in (".$ids2fetch.")";
|
||||
} else {
|
||||
|
|
|
|||
|
|
@ -144,43 +144,47 @@ class VUCC extends CI_Model
|
|||
* $confirmationMethod - qsl, lotw or both, use anything else to skip confirmed
|
||||
*/
|
||||
function get_vucc_summary($band, $confirmationMethod) {
|
||||
$CI =& get_instance();
|
||||
$CI->load->model('logbooks_model');
|
||||
$logbooks_locations_array = $CI->logbooks_model->list_logbook_relationships($this->session->userdata('active_station_logbook'));
|
||||
$CI =& get_instance();
|
||||
$CI->load->model('logbooks_model');
|
||||
$logbooks_locations_array = $CI->logbooks_model->list_logbook_relationships($this->session->userdata('active_station_logbook'));
|
||||
|
||||
if (!$logbooks_locations_array) {
|
||||
return null;
|
||||
}
|
||||
if (!$logbooks_locations_array) {
|
||||
return null;
|
||||
}
|
||||
|
||||
$location_list = "'".implode("','",$logbooks_locations_array)."'";
|
||||
$location_list = "'".implode("','",$logbooks_locations_array)."'";
|
||||
|
||||
$sql = "select distinct upper(substring(col_gridsquare, 1, 4)) gridsquare
|
||||
from " . $this->config->item('table_name') .
|
||||
" where station_id in (" . $location_list . ")" .
|
||||
" and col_gridsquare <> ''";
|
||||
$sql = "select distinct upper(substring(log.col_gridsquare, 1, 4)) gridsquare
|
||||
from " . $this->config->item('table_name') . " log".
|
||||
" inner join bands b on (b.band = log.col_band) ".
|
||||
" where log.station_id in (" . $location_list . ")" .
|
||||
" and log.col_gridsquare <> ''";
|
||||
|
||||
if (($band == 'SAT') || ($band == 'All')) {
|
||||
$sql.=" and b.bandgroup in ('vhf','uhf','shf','sat')";
|
||||
}
|
||||
|
||||
if ($confirmationMethod == 'both') {
|
||||
$sql .= " and (col_qsl_rcvd='Y' or col_lotw_qsl_rcvd='Y')";
|
||||
}
|
||||
else if ($confirmationMethod == 'qsl') {
|
||||
$sql .= " and col_qsl_rcvd='Y'";
|
||||
}
|
||||
else if ($confirmationMethod == 'lotw') {
|
||||
$sql .= " and col_lotw_qsl_rcvd='Y'";
|
||||
}
|
||||
if ($confirmationMethod == 'both') {
|
||||
$sql .= " and (log.col_qsl_rcvd='Y' or log.col_lotw_qsl_rcvd='Y')";
|
||||
} else if ($confirmationMethod == 'qsl') {
|
||||
$sql .= " and log.col_qsl_rcvd='Y'";
|
||||
} else if ($confirmationMethod == 'lotw') {
|
||||
$sql .= " and log.col_lotw_qsl_rcvd='Y'";
|
||||
}
|
||||
|
||||
if ($band != 'All') {
|
||||
if ($band == 'SAT') {
|
||||
$sql .= " and col_prop_mode ='" . $band . "'";
|
||||
} else {
|
||||
$sql .= " and col_prop_mode !='SAT'";
|
||||
$sql .= " and col_band ='" . $band . "'";
|
||||
}
|
||||
}
|
||||
if ($band != 'All') {
|
||||
if ($band == 'SAT') {
|
||||
$sql .= " and log.col_prop_mode ='" . $band . "'";
|
||||
} else {
|
||||
$sql .= " and log.col_prop_mode !='SAT'";
|
||||
$sql .= " and log.col_band ='" . $band . "'";
|
||||
}
|
||||
} else {
|
||||
$sql .= " and log.col_prop_mode !='SAT'";
|
||||
}
|
||||
$query = $this->db->query($sql);
|
||||
|
||||
$query = $this->db->query($sql);
|
||||
|
||||
return $query->result_array();
|
||||
return $query->result_array();
|
||||
}
|
||||
|
||||
/*
|
||||
|
|
@ -333,12 +337,12 @@ class VUCC extends CI_Model
|
|||
/*
|
||||
* Builds the array to display worked/confirmed vucc on dashboard page
|
||||
*/
|
||||
function fetchVuccSummary() {
|
||||
function fetchVuccSummary($band = 'All') {
|
||||
$totalGridConfirmed = array();
|
||||
$totalGridWorked = array();
|
||||
|
||||
// Getting all the worked grids
|
||||
$col_gridsquare_worked = $this->get_vucc_summary('All', 'none');
|
||||
$col_gridsquare_worked = $this->get_vucc_summary($band, 'none');
|
||||
|
||||
$workedGridArray = array();
|
||||
if ($col_gridsquare_worked != null) {
|
||||
|
|
@ -350,7 +354,7 @@ class VUCC extends CI_Model
|
|||
}
|
||||
}
|
||||
|
||||
$col_vucc_grids_worked = $this->get_vucc_summary_col_vucc('All', 'none');
|
||||
$col_vucc_grids_worked = $this->get_vucc_summary_col_vucc($band, 'none');
|
||||
|
||||
if ($col_vucc_grids_worked != null) {
|
||||
foreach ($col_vucc_grids_worked as $gridSplit) {
|
||||
|
|
@ -370,7 +374,7 @@ class VUCC extends CI_Model
|
|||
}
|
||||
|
||||
// Getting all the confirmed grids
|
||||
$col_gridsquare_confirmed = $this->get_vucc_summary('All', 'both');
|
||||
$col_gridsquare_confirmed = $this->get_vucc_summary($band, 'both');
|
||||
|
||||
if ($col_gridsquare_confirmed != null) {
|
||||
$confirmedGridArray = array();
|
||||
|
|
@ -382,7 +386,7 @@ class VUCC extends CI_Model
|
|||
}
|
||||
}
|
||||
|
||||
$col_vucc_grids_confirmed = $this->get_vucc_summary_col_vucc('All', 'both');
|
||||
$col_vucc_grids_confirmed = $this->get_vucc_summary_col_vucc($band, 'both');
|
||||
|
||||
if ($col_vucc_grids_confirmed != null) {
|
||||
foreach ($col_vucc_grids_confirmed as $gridSplit) {
|
||||
|
|
@ -401,8 +405,8 @@ class VUCC extends CI_Model
|
|||
}
|
||||
}
|
||||
|
||||
$vuccArray['All']['worked'] = count($totalGridWorked);
|
||||
$vuccArray['All']['confirmed'] = count($totalGridConfirmed);
|
||||
$vuccArray[$band]['worked'] = count($totalGridWorked);
|
||||
$vuccArray[$band]['confirmed'] = count($totalGridConfirmed);
|
||||
|
||||
return $vuccArray;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
<?php
|
||||
header('Content-Type: text/plain; charset=utf-8');
|
||||
header('Content-Disposition: attachment; filename="'.$this->session->userdata('user_callsign').'-'.date('dmY-Hi').'.adi"')
|
||||
header('Content-Disposition: attachment; filename="'.$this->session->userdata('user_callsign').'-'.date('Ymd-Hi').'.adi"')
|
||||
?>
|
||||
Cloudlog ADIF export
|
||||
<ADIF_VER:5>3.1.4
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
<?php
|
||||
header('Content-Type: text/plain; charset=utf-8');
|
||||
header('Content-Disposition: attachment; filename="'.$this->session->userdata('user_callsign').'-'.date('dmY-Hi').'.adi"')
|
||||
header('Content-Disposition: attachment; filename="'.$this->session->userdata('user_callsign').'-'.date('Ymd-Hi').'.adi"')
|
||||
?>
|
||||
Cloudlog ADIF export
|
||||
<ADIF_VER:5>3.1.4
|
||||
|
|
|
|||
|
|
@ -25,11 +25,11 @@
|
|||
</thead>
|
||||
<tbody>
|
||||
<?php foreach($vucc_array as $band => $vucc) {
|
||||
echo '<tr>';
|
||||
echo '<td><a href=\'vucc_band?Band="'. $band . '"\'>'. $band .'</td>';
|
||||
echo '<td><a href=\'vucc_band?Band="'. $band . '"&Type="worked"\'>'. $vucc['worked'] .'</td>';
|
||||
echo '<td><a href=\'vucc_band?Band="'. $band . '"&Type="confirmed"\'>'. $vucc['confirmed'] .'</td>';
|
||||
echo '</tr>';
|
||||
echo '<tr>';
|
||||
echo '<td><a href=\'vucc_band?Band="'. $band . '"\'>'. $band .'</td>';
|
||||
echo '<td><a href=\'vucc_band?Band="'. $band . '"&Type="worked"\'>'. $vucc['worked'] .'</td>';
|
||||
echo '<td><a href=\'vucc_band?Band="'. $band . '"&Type="confirmed"\'>'. $vucc['confirmed'] .'</td>';
|
||||
echo '</tr>';
|
||||
}
|
||||
?>
|
||||
</tbody>
|
||||
|
|
@ -38,4 +38,4 @@
|
|||
<?php } else {
|
||||
echo '<div class="alert alert-danger" role="alert"><a href="#" class="btn-close" data-bs-dismiss="alert" aria-label="close">×</a>Nothing found!</div>';
|
||||
} ?>
|
||||
</div>
|
||||
</div>
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
<?php
|
||||
header('Content-Type: text/plain; charset=utf-8');
|
||||
header('Content-Disposition: attachment; filename="'.$callsign.'-'.$contest_id.'-'.date('dmY-Hi').'.cbr"');
|
||||
header('Content-Disposition: attachment; filename="'.$callsign.'-'.$contest_id.'-'.date('Ymd-Hi').'.cbr"');
|
||||
|
||||
$CI =& get_instance();
|
||||
$CI->load->library('Cabrilloformat');
|
||||
|
|
@ -11,4 +11,4 @@ echo $CI->cabrilloformat->header($contest_id, $callsign, $claimed_score,
|
|||
foreach ($qsos->result() as $row) {
|
||||
echo $CI->cabrilloformat->qso($row);
|
||||
}
|
||||
echo $CI->cabrilloformat->footer();
|
||||
echo $CI->cabrilloformat->footer();
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
<?php
|
||||
header('Content-Type: text/plain; charset=utf-8');
|
||||
header('Content-Disposition: attachment; filename="'.$this->session->userdata('user_callsign').'-SOTA-'.date('dmY-Hi').'.csv"');
|
||||
header('Content-Disposition: attachment; filename="'.$this->session->userdata('user_callsign').'-SOTA-'.date('Ymd-Hi').'.csv"');
|
||||
$CI =& get_instance();
|
||||
$bands = array(
|
||||
"2190m" => "VLF",
|
||||
|
|
|
|||
|
|
@ -308,17 +308,20 @@ function echoQrbCalcLink($mygrid, $grid, $vucc) {
|
|||
<?php if((($this->config->item('use_auth') && ($this->session->userdata('user_type') >= 2)) || $this->config->item('use_auth') === FALSE)) { ?>
|
||||
<table class="table table-striped">
|
||||
<tr class="titles">
|
||||
<td colspan="2"><i class="fas fa-globe-europe"></i> VHF/UHF Century Club (VUCC)</td>
|
||||
<td colspan="2"><i class="fas fa-globe-europe"></i> VUCC-Grids</td>
|
||||
<td colspan="1">SAT</td>
|
||||
</tr>
|
||||
|
||||
<tr>
|
||||
<td width="50%"><?php echo lang('general_word_worked'); ?></td>
|
||||
<td width="50%"><?php echo $vucc['All']['worked']; ?></td>
|
||||
<td width="25%"><?php echo $vucc['All']['worked']; ?></td>
|
||||
<td width="25%"><?php echo $vuccSAT['SAT']['worked'] ?? '0'; ?></td>
|
||||
</tr>
|
||||
|
||||
<tr>
|
||||
<td width="50%"><?php echo lang('general_word_confirmed'); ?></td>
|
||||
<td width="50%"><?php echo $vucc['All']['confirmed']; ?></td>
|
||||
<td width="25%"><?php echo $vucc['All']['confirmed']; ?></td>
|
||||
<td width="25%"><?php echo $vuccSAT['SAT']['confirmed'] ?? '0'; ?></td>
|
||||
</tr>
|
||||
|
||||
</table>
|
||||
|
|
|
|||
|
|
@ -9,7 +9,7 @@
|
|||
<meta name="mobile-web-app-capable" content="yes">
|
||||
<meta name="apple-mobile-web-app-status-bar-style" content="default">
|
||||
<link rel="manifest" href="<?php echo base_url(); ?>manifest.json"/>
|
||||
|
||||
|
||||
<!-- Bootstrap CSS -->
|
||||
<?php if ($this->optionslib->get_theme()) { ?>
|
||||
<link rel="stylesheet" href="<?php echo base_url(); ?>assets/css/<?php echo $this->optionslib->get_theme(); ?>/bootstrap.min.css">
|
||||
|
|
@ -50,6 +50,10 @@
|
|||
echo '<link rel="stylesheet" href="' . base_url() . 'assets/css/custom.css">';
|
||||
} ?>
|
||||
|
||||
<?php if (file_exists(APPPATH . '../assets/js/sections/custom.js')) {
|
||||
echo '<script src="' . base_url() . 'assets/js/sections/custom.js"></script>';
|
||||
} ?>
|
||||
|
||||
<link rel="icon" href="<?php echo base_url(); ?>favicon.ico">
|
||||
|
||||
<title><?php if (isset($page_title)) {
|
||||
|
|
@ -412,4 +416,4 @@
|
|||
|
||||
</div>
|
||||
</div>
|
||||
</nav>
|
||||
</nav>
|
||||
|
|
|
|||
|
|
@ -588,7 +588,6 @@ $(document).ready(function () {
|
|||
});
|
||||
|
||||
function dupeSearch() {
|
||||
$('#searchForm').trigger("reset");
|
||||
$("#dupes").val("Y");
|
||||
$('#searchForm').submit();
|
||||
}
|
||||
|
|
|
|||
Ładowanie…
Reference in New Issue