Skip to content

Commit

Permalink
Latest Code from dev
Browse files Browse the repository at this point in the history 
Dev
  • Loading branch information
@magicbug
magicbug authored Dec 12, 2024
2 parents fb90a57 + 21df525 commit 3507e83
Show file tree
Hide file tree
Showing 2,646 changed files with 350,060 additions and 69,531 deletions.
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'] = 190;
$config['migration_version'] = 191;

/*
|--------------------------------------------------------------------------
Expand Down
23 changes: 23 additions & 0 deletions application/controllers/Dayswithqso.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@ public function index()
$data['streaks'] = $this->dayswithqso_model->getLongestStreak();
$data['currentstreak'] = $this->dayswithqso_model->getCurrentStreak();
$data['almostcurrentstreak'] = $this->dayswithqso_model->getAlmostCurrentStreak();
$data['daysofweek'] = $this->dayswithqso_model->getDaysOfWeek();

$this->load->view('interface_assets/header', $data);
$this->load->view('dayswithqso/index');
Expand All @@ -38,4 +39,26 @@ public function get_days(){
echo json_encode($data);
}

public function get_weekdays(){

//load model
$this->load->model('dayswithqso_model');

// get data
$data = $this->dayswithqso_model->getDaysOfWeek();
header('Content-Type: application/json');
echo json_encode($data);
}

public function get_historydays(){

//load model
$this->load->model('dayswithqso_model');

// get data
$data = $this->dayswithqso_model->getHistoryDays();
header('Content-Type: application/json');
echo json_encode($data);
}

}
16 changes: 14 additions & 2 deletions application/controllers/Distances.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -78,8 +78,9 @@ public function getDistanceQsos(){
$sat = $this->security->xss_clean($this->input->post('sat'));
$mode = $this->security->xss_clean($this->input->post('mode'));
$power = $this->security->xss_clean($this->input->post('pwr'));
$propag = $this->security->xss_clean($this->input->post('propag'));

$data['results'] = $this->distances_model->qso_details($distance, $band, $sat, $mode, $power);
$data['results'] = $this->distances_model->qso_details($distance, $band, $sat, $mode, $power, $propag);

// Render Page
if (strtolower($band) == 'all') $band = lang('statistics_distances_bands_all');
Expand All @@ -95,8 +96,19 @@ public function getDistanceQsos(){
$power .= 'W';
}

switch (strtolower($propag)) {
case 'all':
$propag = lang('general_word_all');
break;
case '':
$propag = lang('general_word_undefined');
break;
default:
$propag = lang("gen_hamradio_propagation_$propag");
}

$data['page_title'] = "Log View - " . $distance;
$data['filter'] = lang('statistics_distances_qsos_with') . " " . $distance . lang('statistics_distances_and_band') . " " . $band . lang('statistics_distances_and_mode') . $mode . lang('statistics_distances_and_power') . $power;
$data['filter'] = lang('statistics_distances_qsos_with') . " " . $distance . lang('statistics_distances_and_band') . " " . $band . lang('statistics_distances_and_mode') . $mode . lang('statistics_distances_and_power') . $power . lang('statistics_distances_and_propagation') . $propag;
$this->load->view('awards/details', $data);
}
}
2 changes: 1 addition & 1 deletion application/controllers/Logbook.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1364,7 +1364,7 @@ function part_table_col($row, $name) {
case 'WWFF': $ret.= '<td>' . ($row->COL_WWFF_REF) . '</td>'; break;
case 'POTA': $ret.= '<td>' . ($row->COL_POTA_REF) . '</td>'; break;
case 'Grid': $ret.= '<td>' . $this->part_QrbCalcLink($row->COL_MY_GRIDSQUARE, $row->COL_VUCC_GRIDS, $row->COL_GRIDSQUARE) . '</td>'; break;
case 'Distance': $ret.= '<td>' . ($row->COL_DISTANCE ? $row->COL_DISTANCE . '&nbsp;km' : '') . '</td>'; break;
case 'Distance': $ret .= '<td>' . (property_exists($row, 'COL_DISTANCE') && $row->COL_DISTANCE ? $row->COL_DISTANCE . '&nbsp;km' : '') . '</td>'; break;
case 'Band': $ret.= '<td>'; if($row->COL_SAT_NAME != null) { $ret.= '<a href="https://db.satnogs.org/search/?q='.$row->COL_SAT_NAME.'" target="_blank">'.$row->COL_SAT_NAME.'</a></td>'; } else { $ret.= strtolower($row->COL_BAND); } $ret.= '</td>'; break;
case 'Frequency': $ret.= '<td>'; if($row->COL_SAT_NAME != null) { $ret.= '<a href="https://db.satnogs.org/search/?q='.$row->COL_SAT_NAME.'" target="_blank">'.$row->COL_SAT_NAME.'</a></td>'; } else { if($row->COL_FREQ != null) { $ret.= $ci->frequency->hz_to_mhz($row->COL_FREQ); } else { $ret.= strtolower($row->COL_BAND); } } $ret.= '</td>'; break;
case 'State': $ret.= '<td>' . ($row->COL_STATE) . '</td>'; break;
Expand Down
1 change: 1 addition & 0 deletions application/controllers/Lotw.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -994,6 +994,7 @@ function lotw_satellite_map($satname) {
"TEVEL8" => "TEVEL-8",
"INSPR7" => "INSPIRE-SAT 7",
"SONATE" => "SONATE-2",
'AO-123' => "ASRTU-1",
);

return array_search(strtoupper($satname),$arr,true);
Expand Down
13 changes: 10 additions & 3 deletions application/controllers/Map.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,10 +10,10 @@ function index() {
function custom()
{
$this->load->model('bands');
$this->load->model('modes');
$this->load->model('gridmap_model');

$data['worked_bands'] = $this->bands->get_worked_bands(); // Used in the view for band select
$data['modes'] = $this->modes->active(); // Used in the view for mode select
$data['worked_bands'] = $this->bands->get_worked_bands(); // Used in the view for band select
$data['modes'] = $this->gridmap_model->get_worked_modes(); // Used in the view for mode select

if ($this->input->post('band') != NULL) { // Band is not set when page first loads.
if ($this->input->post('band') == 'All') { // Did the user specify a band? If not, use all bands
Expand Down Expand Up @@ -99,4 +99,11 @@ public function map_plot_json() {
}

}

// Function to fetch the date of the oldest QSO in the log
public function get_oldest_qso_date() {
$this->load->model('logbook_model');
$oldestQSOdate = $this->logbook_model->get_oldest_qso_date();
echo $oldestQSOdate;
}
}
20 changes: 20 additions & 0 deletions application/language/bulgarian/general_words_lang.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -153,6 +153,24 @@
$lang['gen_hamradio_locator'] = 'Локатор';
$lang['gen_hamradio_transmit_power'] = 'Мощност на предавателя (W)';
$lang['gen_hamradio_propagation_mode'] = 'Propagation Mode';
$lang['gen_hamradio_propagation_AS'] = "Aircraft Scatter";
$lang['gen_hamradio_propagation_AUR'] = "Aurora";
$lang['gen_hamradio_propagation_AUE'] = "Aurora-E";
$lang['gen_hamradio_propagation_BS'] = "Back scatter";
$lang['gen_hamradio_propagation_ECH'] = "EchoLink";
$lang['gen_hamradio_propagation_EME'] = "Earth-Moon-Earth";
$lang['gen_hamradio_propagation_ES'] = "Sporadic E";
$lang['gen_hamradio_propagation_FAI'] = "Field Aligned Irregularities";
$lang['gen_hamradio_propagation_F2'] = "F2 Reflection";
$lang['gen_hamradio_propagation_INTERNET'] = "Internet-assisted";
$lang['gen_hamradio_propagation_ION'] = "Ionoscatter";
$lang['gen_hamradio_propagation_IRL'] = "IRLP";
$lang['gen_hamradio_propagation_MS'] = "Meteor scatter";
$lang['gen_hamradio_propagation_RPT'] = "Terrestrial or atmospheric repeater or transponder";
$lang['gen_hamradio_propagation_RS'] = "Rain scatter";
$lang['gen_hamradio_propagation_SAT'] = "Satellite";
$lang['gen_hamradio_propagation_TEP'] = "Trans-equatorial";
$lang['gen_hamradio_propagation_TR'] = "Tropospheric ducting";

$lang['gen_hamradio_satellite_name'] = 'Име на сателита';
$lang['gen_hamradio_satellite_mode'] = 'Режим на сателита';
Expand Down Expand Up @@ -230,3 +248,5 @@
$lang['hams_at_no_activations_found'] = 'No upcoming activations found. Please check back later.';

$lang['datatables_language'] = "en-GB";

$lang['set_log_to_full_dates'] = "Set log to full dates";
15 changes: 12 additions & 3 deletions application/language/bulgarian/statistics_lang.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,8 @@
$lang['statistics_distances_and_band'] = ", band : ";
$lang['statistics_distances_and_mode'] = ", mode : ";
$lang['statistics_distances_and_power'] = ", power : ";
$lang['statistics_distances_and_propagation'] = ", propagation : ";
$lang['statistics_distances_no_qsos_to_plot'] = "No QSOs found to plot.";

/*
*
Expand All @@ -53,13 +55,20 @@
*
*/

$lang['statistics_days_with_qso'] = "Number of days with QSOs each year";
$lang['statistics_days_with_qso_short'] = "Days with QSOs";
$lang['statistics_tab_yearly'] = "Yearly";
$lang['statistics_tab_streaks'] = "Streaks";
$lang['statistics_tab_weekdays'] = "Days of the week";
$lang['statistics_tab_daily'] = "Daily";
$lang['statistics_days_yearly'] = "Number of days with QSOs each year";
$lang['statistics_days_with_qso'] = "Days with QSOs";
$lang['statistics_qsos_each_day'] = "Number of QSOs each day";
$lang['statistics_weekdays_with_qso'] = "QSOs breakdown by day of the week";
$lang['statistics_number_of_qsos_this_day'] = "Number of QSOs this day";
$lang['statistics_number_of_qsos_this_weekday'] = "Number of QSOs for this day of the week";
$lang['statistics_dwq_longest_streak_in_log'] = "Longest streak with QSOs in the log";
$lang['statistics_dwq_longest_streak_in_log_hint'] = "A maximum of the 10 longest streaks are shown!";
$lang['statistics_dwq_streak_continuous_days'] = "Streak (continuous days with QSOs)";
$lang['statistics_dwq_current_streak_in_log'] = "Current streak with QSOs in the log";
$lang['statistics_dwq_current_streak_continuous_days'] = "Current streak (continuous days with QSOs)";
$lang['statistics_dwq_make_qso_to_extend_streak'] = "If you make a QSO today, you can continue to extend your streak... or else your current streak will be broken!";
$lang['statistics_dwq_no_current_streak'] = "No current streak found!";

20 changes: 20 additions & 0 deletions application/language/chinese_simplified/general_words_lang.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -153,6 +153,24 @@
$lang['gen_hamradio_locator'] = '定位地图';
$lang['gen_hamradio_transmit_power'] = '发射功率 (W)';
$lang['gen_hamradio_propagation_mode'] = '传播模式';
$lang['gen_hamradio_propagation_AS'] = "Aircraft Scatter";
$lang['gen_hamradio_propagation_AUR'] = "Aurora";
$lang['gen_hamradio_propagation_AUE'] = "Aurora-E";
$lang['gen_hamradio_propagation_BS'] = "Back scatter";
$lang['gen_hamradio_propagation_ECH'] = "EchoLink";
$lang['gen_hamradio_propagation_EME'] = "Earth-Moon-Earth";
$lang['gen_hamradio_propagation_ES'] = "Sporadic E";
$lang['gen_hamradio_propagation_FAI'] = "Field Aligned Irregularities";
$lang['gen_hamradio_propagation_F2'] = "F2 Reflection";
$lang['gen_hamradio_propagation_INTERNET'] = "Internet-assisted";
$lang['gen_hamradio_propagation_ION'] = "Ionoscatter";
$lang['gen_hamradio_propagation_IRL'] = "IRLP";
$lang['gen_hamradio_propagation_MS'] = "Meteor scatter";
$lang['gen_hamradio_propagation_RPT'] = "Terrestrial or atmospheric repeater or transponder";
$lang['gen_hamradio_propagation_RS'] = "Rain scatter";
$lang['gen_hamradio_propagation_SAT'] = "Satellite";
$lang['gen_hamradio_propagation_TEP'] = "Trans-equatorial";
$lang['gen_hamradio_propagation_TR'] = "Tropospheric ducting";

$lang['gen_hamradio_satellite_name'] = '卫星名称';
$lang['gen_hamradio_satellite_mode'] = '卫星模式';
Expand Down Expand Up @@ -230,3 +248,5 @@
$lang['hams_at_no_activations_found'] = '未找到即将进行的激活。 请稍后再回来查看。';

$lang['datatables_language'] = "en-GB";

$lang['set_log_to_full_dates'] = "Set log to full dates";
15 changes: 12 additions & 3 deletions application/language/chinese_simplified/statistics_lang.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,8 @@
$lang['statistics_distances_and_band'] = "和波段";
$lang['statistics_distances_and_mode'] = ", 模式 : ";
$lang['statistics_distances_and_power'] = ", 发射功率 : ";
$lang['statistics_distances_and_propagation'] = ", 传播模式 : ";
$lang['statistics_distances_no_qsos_to_plot'] = "No QSOs found to plot.";

/*
*
Expand All @@ -53,13 +55,20 @@
*
*/

$lang['statistics_days_with_qso'] = "本年QSO总数";
$lang['statistics_days_with_qso_short'] = "QSO的日期";
$lang['statistics_tab_yearly'] = "Yearly";
$lang['statistics_tab_streaks'] = "Streaks";
$lang['statistics_tab_weekdays'] = "Days of the week";
$lang['statistics_tab_daily'] = "Daily";
$lang['statistics_days_yearly'] = "Number of days with QSOs each year";
$lang['statistics_days_with_qso'] = "QSO的日期";
$lang['statistics_qsos_each_day'] = "Number of QSOs each day";
$lang['statistics_weekdays_with_qso'] = "QSOs breakdown by day of the week";
$lang['statistics_number_of_qsos_this_day'] = "Number of QSOs this day";
$lang['statistics_number_of_qsos_this_weekday'] = "Number of QSOs for this day of the week";
$lang['statistics_dwq_longest_streak_in_log'] = "日志中最长QSO连续记录";
$lang['statistics_dwq_longest_streak_in_log_hint'] = "最多显示10条最长QSO连续记录";
$lang['statistics_dwq_streak_continuous_days'] = "最长QSO连续记录";
$lang['statistics_dwq_current_streak_in_log'] = "目前的QSO连续记录";
$lang['statistics_dwq_current_streak_continuous_days'] = "当前连续天数";
$lang['statistics_dwq_make_qso_to_extend_streak'] = "如果你今天进行了QSO，那么就能延长你的连续天数，否则将会被打破清零";
$lang['statistics_dwq_no_current_streak'] = "没有找到连续的天数";

20 changes: 20 additions & 0 deletions application/language/czech/general_words_lang.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -153,6 +153,24 @@
$lang['gen_hamradio_locator'] = 'Lokátor';
$lang['gen_hamradio_transmit_power'] = 'Vysílací výkon (W)';
$lang['gen_hamradio_propagation_mode'] = 'Šíření signálu';
$lang['gen_hamradio_propagation_AS'] = "Aircraft Scatter";
$lang['gen_hamradio_propagation_AUR'] = "Aurora";
$lang['gen_hamradio_propagation_AUE'] = "Aurora-E";
$lang['gen_hamradio_propagation_BS'] = "Back scatter";
$lang['gen_hamradio_propagation_ECH'] = "EchoLink";
$lang['gen_hamradio_propagation_EME'] = "Earth-Moon-Earth";
$lang['gen_hamradio_propagation_ES'] = "Sporadic E";
$lang['gen_hamradio_propagation_FAI'] = "Field Aligned Irregularities";
$lang['gen_hamradio_propagation_F2'] = "F2 Reflection";
$lang['gen_hamradio_propagation_INTERNET'] = "Internet-assisted";
$lang['gen_hamradio_propagation_ION'] = "Ionoscatter";
$lang['gen_hamradio_propagation_IRL'] = "IRLP";
$lang['gen_hamradio_propagation_MS'] = "Meteor scatter";
$lang['gen_hamradio_propagation_RPT'] = "Terrestrial or atmospheric repeater or transponder";
$lang['gen_hamradio_propagation_RS'] = "Rain scatter";
$lang['gen_hamradio_propagation_SAT'] = "Satellite";
$lang['gen_hamradio_propagation_TEP'] = "Trans-equatorial";
$lang['gen_hamradio_propagation_TR'] = "Tropospheric ducting";

$lang['gen_hamradio_satellite_name'] = 'Název satelitu';
$lang['gen_hamradio_satellite_mode'] = 'Režim satelitu';
Expand Down Expand Up @@ -225,3 +243,5 @@
$lang['hams_at_no_activations_found'] = 'No upcoming activations found. Please check back later.';

$lang['datatables_language'] = "en-GB";

$lang['set_log_to_full_dates'] = "Set log to full dates";
15 changes: 12 additions & 3 deletions application/language/czech/statistics_lang.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,8 @@
$lang['statistics_distances_and_band'] = ", band : ";
$lang['statistics_distances_and_mode'] = ", mode : ";
$lang['statistics_distances_and_power'] = ", power : ";
$lang['statistics_distances_and_propagation'] = ", propagation : ";
$lang['statistics_distances_no_qsos_to_plot'] = "No QSOs found to plot.";

/*
*
Expand All @@ -53,13 +55,20 @@
*
*/

$lang['statistics_days_with_qso'] = "Number of days with QSOs each year";
$lang['statistics_days_with_qso_short'] = "Days with QSOs";
$lang['statistics_tab_yearly'] = "Yearly";
$lang['statistics_tab_streaks'] = "Streaks";
$lang['statistics_tab_weekdays'] = "Days of the week";
$lang['statistics_tab_daily'] = "Daily";
$lang['statistics_days_yearly'] = "Number of days with QSOs each year";
$lang['statistics_days_with_qso'] = "Days with QSOs";
$lang['statistics_qsos_each_day'] = "Number of QSOs each day";
$lang['statistics_weekdays_with_qso'] = "QSOs breakdown by day of the week";
$lang['statistics_number_of_qsos_this_day'] = "Number of QSOs this day";
$lang['statistics_number_of_qsos_this_weekday'] = "Number of QSOs for this day of the week";
$lang['statistics_dwq_longest_streak_in_log'] = "Longest streak with QSOs in the log";
$lang['statistics_dwq_longest_streak_in_log_hint'] = "A maximum of the 10 longest streaks are shown!";
$lang['statistics_dwq_streak_continuous_days'] = "Streak (continuous days with QSOs)";
$lang['statistics_dwq_current_streak_in_log'] = "Current streak with QSOs in the log";
$lang['statistics_dwq_current_streak_continuous_days'] = "Current streak (continuous days with QSOs)";
$lang['statistics_dwq_make_qso_to_extend_streak'] = "If you make a QSO today, you can continue to extend your streak... or else your current streak will be broken!";
$lang['statistics_dwq_no_current_streak'] = "No current streak found!";

20 changes: 20 additions & 0 deletions application/language/dutch/general_words_lang.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -153,6 +153,24 @@
$lang['gen_hamradio_locator'] = 'Locator';
$lang['gen_hamradio_transmit_power'] = 'Vermogen (W)';
$lang['gen_hamradio_propagation_mode'] = 'Propagattie Mode';
$lang['gen_hamradio_propagation_AS'] = "Aircraft Scatter";
$lang['gen_hamradio_propagation_AUR'] = "Aurora";
$lang['gen_hamradio_propagation_AUE'] = "Aurora-E";
$lang['gen_hamradio_propagation_BS'] = "Back scatter";
$lang['gen_hamradio_propagation_ECH'] = "EchoLink";
$lang['gen_hamradio_propagation_EME'] = "Earth-Moon-Earth";
$lang['gen_hamradio_propagation_ES'] = "Sporadic E";
$lang['gen_hamradio_propagation_FAI'] = "Field Aligned Irregularities";
$lang['gen_hamradio_propagation_F2'] = "F2 Reflection";
$lang['gen_hamradio_propagation_INTERNET'] = "Internet-assisted";
$lang['gen_hamradio_propagation_ION'] = "Ionoscatter";
$lang['gen_hamradio_propagation_IRL'] = "IRLP";
$lang['gen_hamradio_propagation_MS'] = "Meteor scatter";
$lang['gen_hamradio_propagation_RPT'] = "Terrestrial or atmospheric repeater or transponder";
$lang['gen_hamradio_propagation_RS'] = "Rain scatter";
$lang['gen_hamradio_propagation_SAT'] = "Satellite";
$lang['gen_hamradio_propagation_TEP'] = "Trans-equatorial";
$lang['gen_hamradio_propagation_TR'] = "Tropospheric ducting";

$lang['gen_hamradio_satellite_name'] = 'Satelliet Naam';
$lang['gen_hamradio_satellite_mode'] = 'Satelliet Mode';
Expand Down Expand Up @@ -230,3 +248,5 @@
$lang['hams_at_no_activations_found'] = 'No upcoming activations found. Please check back later.';

$lang['datatables_language'] = "en-GB";

$lang['set_log_to_full_dates'] = "Set log to full dates";
Loading

0 comments on commit 3507e83

Please sign in to comment.