Merge branch 'dev' into cabrillo-multilanguage

这个提交包含在:
Andreas Kristiansen 2023-10-31 09:01:16 +01:00 提交者 GitHub
当前提交 6bc902dd28
找不到此签名对应的密钥
GPG 密钥 ID: 4AEE18F83AFDEB23
共有 42 个文件被更改,包括 289 次插入65 次删除

查看文件

@ -29,7 +29,7 @@ class Dashboard extends CI_Controller {
// 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'));
@ -41,15 +41,21 @@ class Dashboard extends CI_Controller {
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;
@ -62,7 +68,7 @@ class Dashboard extends CI_Controller {
$this->load->view('interface_assets/footer');
} else {
//
//
$this->load->model('cat');
$this->load->model('vucc');
@ -120,7 +126,7 @@ class Dashboard extends CI_Controller {
}
}
function radio_display_component() {
$this->load->model('cat');
@ -130,7 +136,7 @@ class Dashboard extends CI_Controller {
function map() {
$this->load->model('logbook_model');
$this->load->library('qra');
$qsos = $this->logbook_model->get_last_qsos('18');
@ -145,7 +151,7 @@ class Dashboard extends CI_Controller {
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."\"}";
@ -162,10 +168,10 @@ class Dashboard extends CI_Controller {
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) {
@ -173,20 +179,20 @@ class Dashboard extends CI_Controller {
$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."\"}";
@ -195,7 +201,7 @@ class Dashboard extends CI_Controller {
echo $row->COL_SUBMODE==null?$row->COL_MODE:$row->COL_SUBMODE;
echo "\",\"label\":\"".$row->COL_CALL."\"}";
}
$count++;
} else {
if($count != 1) {
@ -218,5 +224,5 @@ class Dashboard extends CI_Controller {
}
}

查看文件

@ -134,28 +134,30 @@ class Labels extends CI_Controller {
$ids = xss_clean(json_decode($this->input->post('id')));
$offset = xss_clean($this->input->post('startat'));
$grid = $this->input->post('grid') === "true" ? 1 : 0;
$via = $this->input->post('via') === "true" ? 1 : 0;
$this->load->model('labels_model');
$result = $this->labels_model->export_printrequestedids($ids);
$this->prepareLabel($result, true, $offset, $grid);
$this->prepareLabel($result, true, $offset, $grid, $via);
}
public function print($station_id) {
$clean_id = xss_clean($station_id);
$offset = xss_clean($this->input->post('startat'));
$grid = xss_clean($this->input->post('grid') ?? 0);
$via = xss_clean($this->input->post('via') ?? 0);
$this->load->model('stations');
if ($this->stations->check_station_is_accessible($station_id)) {
$this->load->model('labels_model');
$result = $this->labels_model->export_printrequested($clean_id);
$this->prepareLabel($result, false, $offset, $grid);
$this->prepareLabel($result, false, $offset, $grid, $via);
} else {
redirect('labels');
}
}
function prepareLabel($qsos, $jscall = false, $offset = 1, $grid = false) {
function prepareLabel($qsos, $jscall = false, $offset = 1, $grid = false, $via = false) {
$this->load->model('labels_model');
$label = $this->labels_model->getDefaultLabel();
@ -231,9 +233,9 @@ class Labels extends CI_Controller {
if ($qsos->num_rows() > 0) {
if ($label->qsos == 1) {
$this->makeMultiQsoLabel($qsos->result(), $pdf, 1, $offset, $ptype->orientation, $grid);
$this->makeMultiQsoLabel($qsos->result(), $pdf, 1, $offset, $ptype->orientation, $grid, $via);
} else {
$this->makeMultiQsoLabel($qsos->result(), $pdf, $label->qsos, $offset, $ptype->orientation, $grid);
$this->makeMultiQsoLabel($qsos->result(), $pdf, $label->qsos, $offset, $ptype->orientation, $grid, $via);
}
} else {
$this->session->set_flashdata('message', '0 QSOs found for print!');
@ -242,7 +244,7 @@ class Labels extends CI_Controller {
$pdf->Output();
}
function makeMultiQsoLabel($qsos, $pdf, $numberofqsos, $offset, $orientation, $grid) {
function makeMultiQsoLabel($qsos, $pdf, $numberofqsos, $offset, $orientation, $grid, $via) {
$text = '';
$current_callsign = '';
$current_sat = '';
@ -259,7 +261,7 @@ class Labels extends CI_Controller {
( ($qso->COL_BAND_RX !== $current_sat_bandrx) && ($this->pretty_sat_mode($qso->COL_SAT_MODE) !== '')) ) {
// ((($qso->COL_SAT_NAME ?? '' !== $current_sat) || ($qso->COL_CALL !== $current_callsign)) && ($qso->COL_SAT_NAME ?? '' !== '') && ($col->COL_BAND_RX ?? '' !== $current_sat_bandrx))) {
if (!empty($qso_data)) {
$this->finalizeData($pdf, $current_callsign, $qso_data, $numberofqsos, $orientation, $grid);
$this->finalizeData($pdf, $current_callsign, $qso_data, $numberofqsos, $orientation, $grid, $via);
$qso_data = [];
}
$current_callsign = $qso->COL_CALL;
@ -274,6 +276,7 @@ class Labels extends CI_Controller {
'mode' => $qso->COL_MODE,
'rst' => $qso->COL_RST_SENT,
'mygrid' => $qso->station_gridsquare,
'via' => $qso->COL_QSL_VIA,
'sat' => $qso->COL_SAT_NAME,
'sat_mode' => $this->pretty_sat_mode($qso->COL_SAT_MODE ?? ''),
'sat_band_rx' => ($qso->COL_BAND_RX ?? ''),
@ -282,7 +285,7 @@ class Labels extends CI_Controller {
];
}
if (!empty($qso_data)) {
$this->finalizeData($pdf, $current_callsign, $qso_data, $numberofqsos, $orientation, $grid);
$this->finalizeData($pdf, $current_callsign, $qso_data, $numberofqsos, $orientation, $grid, $via);
}
}
// New begin
@ -290,7 +293,7 @@ class Labels extends CI_Controller {
return(strlen($sat_mode ?? '') == 2 ? (strtoupper($sat_mode[0]).'/'.strtoupper($sat_mode[1])) : strtoupper($sat_mode ?? ''));
}
function finalizeData($pdf, $current_callsign, &$preliminaryData, $qso_per_label,$orientation, $grid) {
function finalizeData($pdf, $current_callsign, &$preliminaryData, $qso_per_label,$orientation, $grid, $via) {
$tableData = [];
$count_qso = 0;
@ -310,7 +313,7 @@ class Labels extends CI_Controller {
if($count_qso == $qso_per_label){
$this->generateLabel($pdf, $current_callsign, $tableData,$count_qso,$qso,$orientation, $grid);
$this->generateLabel($pdf, $current_callsign, $tableData,$count_qso,$qso,$orientation, $grid, $via);
$tableData = []; // reset the data
$count_qso = 0; // reset the counter
}
@ -318,16 +321,20 @@ class Labels extends CI_Controller {
}
// generate label for remaining QSOs
if($count_qso > 0){
$this->generateLabel($pdf, $current_callsign, $tableData,$count_qso,$qso,$orientation, $grid);
$this->generateLabel($pdf, $current_callsign, $tableData,$count_qso,$qso,$orientation, $grid, $via);
$preliminaryData = []; // reset the data
}
}
function generateLabel($pdf, $current_callsign, $tableData,$numofqsos,$qso,$orientation,$grid=true){
function generateLabel($pdf, $current_callsign, $tableData,$numofqsos,$qso,$orientation,$grid=true, $via=false){
$builder = new \AsciiTable\Builder();
$builder->addRows($tableData);
$text = "Confirming QSO".($numofqsos>1 ? 's' : '')." with ";
$text .= $current_callsign."\n";
$text .= $current_callsign;
if (($via) && ($qso['via'] ?? '' != '')) {
$text.=' via '.substr($qso['via'],0,8);
}
$text .= "\n";
$text .= $builder->renderTable();
if($qso['sat'] != "") {
if (($qso['sat_mode'] == '') && ($qso['sat_band_rx'] !== '')) {

查看文件

@ -14,8 +14,8 @@ class Maintenance extends CI_Controller {
$this->load->model('Stations');
$data['stations']=$this->Stations->all();
$data['page_title'] = "Maintenance";
$data['is_there_qsos_with_no_station_id'] = $this->Logbook_model->check_for_station_id();
if ($data['is_there_qsos_with_no_station_id']) {
$data['qsos_with_no_station_id'] = $this->Logbook_model->check_for_station_id();
if ($data['qsos_with_no_station_id']) {
$data['calls_wo_sid']=$this->Logbook_model->calls_without_station_id();
}
$this->load->view('interface_assets/header', $data);
@ -29,6 +29,7 @@ class Maintenance extends CI_Controller {
$this->load->model('Logbook_model');
$this->load->model('Stations');
$call = xss_clean(($this->input->post('call')));
$qsoids = xss_clean(($this->input->post('qsoids')));
$station_profile_id = xss_clean(($this->input->post('station_id')));
// Check if target-station-id exists
@ -39,8 +40,7 @@ class Maintenance extends CI_Controller {
if ($station->station_id == $station_profile_id) { $allowed=true; }
}
if ($allowed) {
log_message("error",$call." to ".$station_profile_id);
$status=$this->Logbook_model->update_all_station_ids($station_profile_id,$call);
$status=$this->Logbook_model->update_station_ids($station_profile_id,$call,$qsoids);
} else {
$status=false;
}

查看文件

@ -115,6 +115,7 @@ $lang['filter_actions_recv_electronic'] = 'Received (Electronic)';
$lang['filter_actions_create_adif'] = 'Create ADIF';
$lang['filter_actions_print_label'] = 'Print Label';
$lang['filter_actions_start_print_title'] = 'Print Labels';
$lang['filter_actions_print_include_via'] = "Include Via";
$lang['filter_actions_print_include_grid'] = 'Include Grid?';
$lang['filter_actions_start_print'] = 'Start printing at?';
$lang['filter_actions_print'] = 'Print';

查看文件

@ -191,3 +191,8 @@ $lang['southamerica'] = 'South America';
$lang['gen_band_selection'] = 'Band selection';
$lang['general_word_today'] = 'Today';
$lang['dashboard_php_version_warning'] = 'You need to upgrade your PHP version. Minimum version is 7.4. Your version is';
$lang['dashboard_country_files_warning'] = 'You need to update country files! Go <a href="'.site_url('update').'">here</a> to do it!';
$lang['dashboard_locations_warning'] = 'You have no station locations. Go <a href="'. site_url('station') . '">here</a> to create it!';
$lang['dashboard_logbooks_warning'] = 'You have no station logbook. Go <a href="'. site_url('logbooks') . '">here</a> to create it!';

查看文件

@ -115,6 +115,7 @@ $lang['filter_actions_recv_electronic'] = 'Received (Electronic)';
$lang['filter_actions_create_adif'] = 'Create ADIF';
$lang['filter_actions_print_label'] = 'Print Label';
$lang['filter_actions_start_print_title'] = 'Print Labels';
$lang['filter_actions_print_include_via'] = "Include Via";
$lang['filter_actions_print_include_grid'] = 'Include Grid?';
$lang['filter_actions_start_print'] = 'Start printing at?';
$lang['filter_actions_print'] = 'Print';

查看文件

@ -191,3 +191,8 @@ $lang['southamerica'] = '南美洲';
$lang['gen_band_selection'] = '波段选择';
$lang['general_word_today'] = 'Today';
$lang['dashboard_php_version_warning'] = 'You need to upgrade your PHP version. Minimum version is 7.4. Your version is';
$lang['dashboard_country_files_warning'] = 'You need to update country files! Go <a href="'.site_url('update').'">here</a> to do it!';
$lang['dashboard_locations_warning'] = 'You have no station locations. Go <a href="'. site_url('station') . '">here</a> to create it!';
$lang['dashboard_logbooks_warning'] = 'You have no station logbook. Go <a href="'. site_url('logbooks') . '">here</a> to create it!';

查看文件

@ -115,6 +115,7 @@ $lang['filter_actions_recv_electronic'] = 'Received (Electronic)';
$lang['filter_actions_create_adif'] = 'Create ADIF';
$lang['filter_actions_print_label'] = 'Print Label';
$lang['filter_actions_start_print_title'] = 'Print Labels';
$lang['filter_actions_print_include_via'] = "Include Via";
$lang['filter_actions_print_include_grid'] = 'Include Grid?';
$lang['filter_actions_start_print'] = 'Start printing at?';
$lang['filter_actions_print'] = 'Print';

查看文件

@ -115,6 +115,7 @@ $lang['filter_actions_recv_electronic'] = 'Received (Electronic)';
$lang['filter_actions_create_adif'] = 'Create ADIF';
$lang['filter_actions_print_label'] = 'Print Label';
$lang['filter_actions_start_print_title'] = 'Print Labels';
$lang['filter_actions_print_include_via'] = "Include Via";
$lang['filter_actions_print_include_grid'] = 'Include Grid?';
$lang['filter_actions_start_print'] = 'Start printing at?';
$lang['filter_actions_print'] = 'Print';

查看文件

@ -191,3 +191,8 @@ $lang['southamerica'] = 'South America';
$lang['gen_band_selection'] = 'Band selection';
$lang['general_word_today'] = 'Today';
$lang['dashboard_php_version_warning'] = 'You need to upgrade your PHP version. Minimum version is 7.4. Your version is';
$lang['dashboard_country_files_warning'] = 'You need to update country files! Go <a href="'.site_url('update').'">here</a> to do it!';
$lang['dashboard_locations_warning'] = 'You have no station locations. Go <a href="'. site_url('station') . '">here</a> to create it!';
$lang['dashboard_logbooks_warning'] = 'You have no station logbook. Go <a href="'. site_url('logbooks') . '">here</a> to create it!';

查看文件

@ -115,6 +115,7 @@ $lang['filter_actions_recv_electronic'] = 'Received (Electronic)';
$lang['filter_actions_create_adif'] = 'Create ADIF';
$lang['filter_actions_print_label'] = 'Print Label';
$lang['filter_actions_start_print_title'] = 'Print Labels';
$lang['filter_actions_print_include_via'] = "Include Via";
$lang['filter_actions_print_include_grid'] = 'Include Grid?';
$lang['filter_actions_start_print'] = 'Start printing at?';
$lang['filter_actions_print'] = 'Print';

查看文件

@ -189,3 +189,8 @@ $lang['southamerica'] = 'South America';
$lang['gen_band_selection'] = 'Band selection';
$lang['general_word_today'] = 'Today';
$lang['dashboard_php_version_warning'] = 'You need to upgrade your PHP version. Minimum version is 7.4. Your version is';
$lang['dashboard_country_files_warning'] = 'You need to update country files! Go <a href="'.site_url('update').'">here</a> to do it!';
$lang['dashboard_locations_warning'] = 'You have no station locations. Go <a href="'. site_url('station') . '">here</a> to create it!';
$lang['dashboard_logbooks_warning'] = 'You have no station logbook. Go <a href="'. site_url('logbooks') . '">here</a> to create it!';

查看文件

@ -115,6 +115,7 @@ $lang['filter_actions_recv_electronic'] = 'Received (Electronic)';
$lang['filter_actions_create_adif'] = 'Create ADIF';
$lang['filter_actions_print_label'] = 'Print Label';
$lang['filter_actions_start_print_title'] = 'Print Labels';
$lang['filter_actions_print_include_via'] = "Include Via";
$lang['filter_actions_print_include_grid'] = 'Include Grid?';
$lang['filter_actions_start_print'] = 'Start printing at?';
$lang['filter_actions_print'] = 'Print';

查看文件

@ -191,3 +191,8 @@ $lang['southamerica'] = 'Etelä-Amerikka';
$lang['gen_band_selection'] = 'Bandin valinta';
$lang['general_word_today'] = 'Today';
$lang['dashboard_php_version_warning'] = 'You need to upgrade your PHP version. Minimum version is 7.4. Your version is';
$lang['dashboard_country_files_warning'] = 'You need to update country files! Go <a href="'.site_url('update').'">here</a> to do it!';
$lang['dashboard_locations_warning'] = 'You have no station locations. Go <a href="'. site_url('station') . '">here</a> to create it!';
$lang['dashboard_logbooks_warning'] = 'You have no station logbook. Go <a href="'. site_url('logbooks') . '">here</a> to create it!';

查看文件

@ -115,6 +115,7 @@ $lang['filter_actions_recv_electronic'] = 'Received (Electronic)';
$lang['filter_actions_create_adif'] = 'Create ADIF';
$lang['filter_actions_print_label'] = 'Print Label';
$lang['filter_actions_start_print_title'] = 'Print Labels';
$lang['filter_actions_print_include_via'] = "Include Via";
$lang['filter_actions_print_include_grid'] = 'Include Grid?';
$lang['filter_actions_start_print'] = 'Start printing at?';
$lang['filter_actions_print'] = 'Print';

查看文件

@ -191,3 +191,8 @@ $lang['southamerica'] = 'South America';
$lang['gen_band_selection'] = 'Band selection';
$lang['general_word_today'] = 'Today';
$lang['dashboard_php_version_warning'] = 'You need to upgrade your PHP version. Minimum version is 7.4. Your version is';
$lang['dashboard_country_files_warning'] = 'You need to update country files! Go <a href="'.site_url('update').'">here</a> to do it!';
$lang['dashboard_locations_warning'] = 'You have no station locations. Go <a href="'. site_url('station') . '">here</a> to create it!';
$lang['dashboard_logbooks_warning'] = 'You have no station logbook. Go <a href="'. site_url('logbooks') . '">here</a> to create it!';

查看文件

@ -115,6 +115,7 @@ $lang['filter_actions_recv_electronic'] = 'Erhalten (Elektronisch)';
$lang['filter_actions_create_adif'] = 'Erstelle ADIF';
$lang['filter_actions_print_label'] = 'Label drucken';
$lang['filter_actions_start_print_title'] = 'Label Drucken';
$lang['filter_actions_print_include_via'] = "Include Via";
$lang['filter_actions_print_include_grid'] = 'Mit Planquadrat?';
$lang['filter_actions_start_print'] = 'Druck starten bei?';
$lang['filter_actions_print'] = 'Drucken';

查看文件

@ -115,6 +115,7 @@ $lang['filter_actions_recv_electronic'] = 'Received (Electronic)';
$lang['filter_actions_create_adif'] = 'Create ADIF';
$lang['filter_actions_print_label'] = 'Print Label';
$lang['filter_actions_start_print_title'] = 'Print Labels';
$lang['filter_actions_print_include_via'] = "Include Via";
$lang['filter_actions_print_include_grid'] = 'Include Grid?';
$lang['filter_actions_start_print'] = 'Start printing at?';
$lang['filter_actions_print'] = 'Print';

查看文件

@ -191,3 +191,8 @@ $lang['southamerica'] = 'South America';
$lang['gen_band_selection'] = 'Band selection';
$lang['general_word_today'] = 'Today';
$lang['dashboard_php_version_warning'] = 'You need to upgrade your PHP version. Minimum version is 7.4. Your version is';
$lang['dashboard_country_files_warning'] = 'You need to update country files! Go <a href="'.site_url('update').'">here</a> to do it!';
$lang['dashboard_locations_warning'] = 'You have no station locations. Go <a href="'. site_url('station') . '">here</a> to create it!';
$lang['dashboard_logbooks_warning'] = 'You have no station logbook. Go <a href="'. site_url('logbooks') . '">here</a> to create it!';

查看文件

@ -115,6 +115,7 @@ $lang['filter_actions_recv_electronic'] = 'Received (Electronic)';
$lang['filter_actions_create_adif'] = 'Create ADIF';
$lang['filter_actions_print_label'] = 'Print Label';
$lang['filter_actions_start_print_title'] = 'Print Labels';
$lang['filter_actions_print_include_via'] = "Include Via";
$lang['filter_actions_print_include_grid'] = 'Include Grid?';
$lang['filter_actions_start_print'] = 'Start printing at?';
$lang['filter_actions_print'] = 'Print';

查看文件

@ -191,3 +191,8 @@ $lang['southamerica'] = 'South America';
$lang['gen_band_selection'] = 'Band selection';
$lang['general_word_today'] = 'Today';
$lang['dashboard_php_version_warning'] = 'You need to upgrade your PHP version. Minimum version is 7.4. Your version is';
$lang['dashboard_country_files_warning'] = 'You need to update country files! Go <a href="'.site_url('update').'">here</a> to do it!';
$lang['dashboard_locations_warning'] = 'You have no station locations. Go <a href="'. site_url('station') . '">here</a> to create it!';
$lang['dashboard_logbooks_warning'] = 'You have no station logbook. Go <a href="'. site_url('logbooks') . '">here</a> to create it!';

查看文件

@ -115,6 +115,7 @@ $lang['filter_actions_recv_electronic'] = 'Received (Electronic)';
$lang['filter_actions_create_adif'] = 'Create ADIF';
$lang['filter_actions_print_label'] = 'Print Label';
$lang['filter_actions_start_print_title'] = 'Print Labels';
$lang['filter_actions_print_include_via'] = "Include Via";
$lang['filter_actions_print_include_grid'] = 'Include Grid?';
$lang['filter_actions_start_print'] = 'Start printing at?';
$lang['filter_actions_print'] = 'Print';

查看文件

@ -115,6 +115,7 @@ $lang['filter_actions_recv_electronic'] = 'Received (Electronic)';
$lang['filter_actions_create_adif'] = 'Create ADIF';
$lang['filter_actions_print_label'] = 'Print Label';
$lang['filter_actions_start_print_title'] = 'Print Labels';
$lang['filter_actions_print_include_via'] = "Include Via";
$lang['filter_actions_print_include_grid'] = 'Include Grid?';
$lang['filter_actions_start_print'] = 'Start printing at?';
$lang['filter_actions_print'] = 'Print';

查看文件

@ -192,3 +192,8 @@ $lang['southamerica'] = 'Южная Америка';
$lang['gen_band_selection'] = 'Выбор диапазона';
$lang['general_word_today'] = 'Today';
$lang['dashboard_php_version_warning'] = 'You need to upgrade your PHP version. Minimum version is 7.4. Your version is';
$lang['dashboard_country_files_warning'] = 'You need to update country files! Go <a href="'.site_url('update').'">here</a> to do it!';
$lang['dashboard_locations_warning'] = 'You have no station locations. Go <a href="'. site_url('station') . '">here</a> to create it!';
$lang['dashboard_logbooks_warning'] = 'You have no station logbook. Go <a href="'. site_url('logbooks') . '">here</a> to create it!';

查看文件

@ -115,6 +115,7 @@ $lang['filter_actions_recv_electronic'] = 'Received (Electronic)';
$lang['filter_actions_create_adif'] = 'Create ADIF';
$lang['filter_actions_print_label'] = 'Print Label';
$lang['filter_actions_start_print_title'] = 'Print Labels';
$lang['filter_actions_print_include_via'] = "Include Via";
$lang['filter_actions_print_include_grid'] = 'Include Grid?';
$lang['filter_actions_start_print'] = 'Start printing at?';
$lang['filter_actions_print'] = 'Print';

查看文件

@ -191,3 +191,8 @@ $lang['southamerica'] = 'South America';
$lang['gen_band_selection'] = 'Band selection';
$lang['general_word_today'] = 'Today';
$lang['dashboard_php_version_warning'] = 'You need to upgrade your PHP version. Minimum version is 7.4. Your version is';
$lang['dashboard_country_files_warning'] = 'You need to update country files! Go <a href="'.site_url('update').'">here</a> to do it!';
$lang['dashboard_locations_warning'] = 'You have no station locations. Go <a href="'. site_url('station') . '">here</a> to create it!';
$lang['dashboard_logbooks_warning'] = 'You have no station logbook. Go <a href="'. site_url('logbooks') . '">here</a> to create it!';

查看文件

@ -115,6 +115,7 @@ $lang['filter_actions_recv_electronic'] = 'Received (Electronic)';
$lang['filter_actions_create_adif'] = 'Create ADIF';
$lang['filter_actions_print_label'] = 'Print Label';
$lang['filter_actions_start_print_title'] = 'Print Labels';
$lang['filter_actions_print_include_via'] = "Include Via";
$lang['filter_actions_print_include_grid'] = 'Include Grid?';
$lang['filter_actions_start_print'] = 'Start printing at?';
$lang['filter_actions_print'] = 'Print';

查看文件

@ -191,3 +191,8 @@ $lang['southamerica'] = 'Sydamerika';
$lang['gen_band_selection'] = 'Band val';
$lang['general_word_today'] = 'Today';
$lang['dashboard_php_version_warning'] = 'You need to upgrade your PHP version. Minimum version is 7.4. Your version is';
$lang['dashboard_country_files_warning'] = 'You need to update country files! Go <a href="'.site_url('update').'">here</a> to do it!';
$lang['dashboard_locations_warning'] = 'You have no station locations. Go <a href="'. site_url('station') . '">here</a> to create it!';
$lang['dashboard_logbooks_warning'] = 'You have no station logbook. Go <a href="'. site_url('logbooks') . '">here</a> to create it!';

查看文件

@ -115,6 +115,7 @@ $lang['filter_actions_recv_electronic'] = 'Received (Electronic)';
$lang['filter_actions_create_adif'] = 'Create ADIF';
$lang['filter_actions_print_label'] = 'Print Label';
$lang['filter_actions_start_print_title'] = 'Print Labels';
$lang['filter_actions_print_include_via'] = "Include Via";
$lang['filter_actions_print_include_grid'] = 'Include Grid?';
$lang['filter_actions_start_print'] = 'Start printing at?';
$lang['filter_actions_print'] = 'Print';

查看文件

@ -191,3 +191,8 @@ $lang['southamerica'] = 'South America';
$lang['gen_band_selection'] = 'Band selection';
$lang['general_word_today'] = 'Today';
$lang['dashboard_php_version_warning'] = 'You need to upgrade your PHP version. Minimum version is 7.4. Your version is';
$lang['dashboard_country_files_warning'] = 'You need to update country files! Go <a href="'.site_url('update').'">here</a> to do it!';
$lang['dashboard_locations_warning'] = 'You have no station locations. Go <a href="'. site_url('station') . '">here</a> to create it!';
$lang['dashboard_logbooks_warning'] = 'You have no station logbook. Go <a href="'. site_url('logbooks') . '">here</a> to create it!';

查看文件

@ -4109,10 +4109,12 @@ function check_if_callsign_worked_in_logbook($callsign, $StationLocationsArray =
}
public function check_for_station_id() {
$this->db->select('COL_PRIMARY_KEY, COL_TIME_ON, COL_CALL, COL_MODE, COL_BAND');
$this->db->where('station_id =', NULL);
$query = $this->db->get($this->config->item('table_name'));
log_message('debug','SQL: '.$this->db->last_query());
if($query->num_rows() >= 1) {
return 1;
return $query->result();
} else {
return 0;
}
@ -4165,24 +4167,29 @@ function check_if_callsign_worked_in_logbook($callsign, $StationLocationsArray =
}
}
public function update_all_station_ids($station_id,$station_callsign) {
public function update_station_ids($station_id,$station_callsign,$qsoids) {
$data = array(
'station_id' => $station_id,
);
if (! empty($qsoids)) {
$data = array(
'station_id' => $station_id,
);
$this->db->where(array('station_id' => NULL));
if ($station_callsign == '') {
$this->db->where(array('col_station_callsign' => NULL));
} else {
$this->db->where('col_station_callsign', $station_callsign);
}
$this->db->update($this->config->item('table_name'), $data);
if ($this->db->affected_rows() > 0) {
return TRUE;
} else {
return FALSE;
}
$this->db->where_in('COL_PRIMARY_KEY', $qsoids);
$this->db->where(array('station_id' => NULL));
if ($station_callsign == '') {
$this->db->where(array('col_station_callsign' => NULL));
} else {
$this->db->where('col_station_callsign', $station_callsign);
}
$this->db->update($this->config->item('table_name'), $data);
if ($this->db->affected_rows() > 0) {
return TRUE;
} else {
return FALSE;
}
} else {
return FALSE;
}
}
public function parse_frequency($frequency)

查看文件

@ -0,0 +1,29 @@
<?php
class Setup_model extends CI_Model {
function getCountryCount() {
$sql = 'select count(*) as count from dxcc_entities';
$query = $this->db->query($sql);
return $query->row()->count;
}
function getLogbookCount() {
$userid = xss_clean($this->session->userdata('user_id'));
$sql = 'select count(*) as count from station_logbooks where user_id =' . $userid;
$query = $this->db->query($sql);
return $query->row()->count;
}
function getLocationCount() {
$userid = xss_clean($this->session->userdata('user_id'));
$sql = 'select count(*) as count from station_profile where user_id =' . $userid;
$query = $this->db->query($sql);
return $query->row()->count;
}
}
?>

查看文件

@ -48,7 +48,31 @@ function echoQrbCalcLink($mygrid, $grid, $vucc) {
?>
<div class="container dashboard">
<?php if(($this->config->item('use_auth') && ($this->session->userdata('user_type') >= 2)) || $this->config->item('use_auth') === FALSE) { ?>
<?php if (version_compare(PHP_VERSION, '7.4.0') <= 0) { ?>
<div class="alert alert-danger" role="alert">
<?php echo lang('dashboard_php_version_warning') . ' ' . PHP_VERSION . '.';?>
</div>
<?php } ?>
<?php if ($countryCount == 0) { ?>
<div class="alert alert-danger" role="alert">
<?php echo lang('dashboard_country_files_warning'); ?>
</div>
<?php } ?>
<?php if ($locationCount == 0) { ?>
<div class="alert alert-danger" role="alert">
<?php echo lang('dashboard_locations_warning'); ?>
</div>
<?php } ?>
<?php if ($logbookCount == 0) { ?>
<div class="alert alert-danger" role="alert">
<?php echo lang('dashboard_logbooks_warning'); ?>
</div>
<?php } ?>
<?php if($this->optionslib->get_option('dashboard_banner') != "false") { ?>
<?php if($todays_qsos >= 1) { ?>
<div class="alert alert-success" role="alert">

查看文件

@ -34,7 +34,7 @@
foreach ($qslarray->result() as $qsl) {
echo '<tr>';
echo '<td style=\'text-align: center\'><a id="edit_qso" href="javascript:displayQso('.$qsl->COL_PRIMARY_KEY.')">' . $qsl->COL_CALL . '</a></td>';
echo '<td style=\'text-align: center\'><a id="edit_qso" href="javascript:displayQso('.$qsl->COL_PRIMARY_KEY.')">' . str_replace("0","&Oslash;",$qsl->COL_CALL) . '</a></td>';
echo '<td style=\'text-align: center\'>';
echo $qsl->COL_SUBMODE==null?$qsl->COL_MODE:$qsl->COL_SUBMODE;
echo '</td>';

查看文件

@ -2314,7 +2314,7 @@ function viewQsl(picture, callsign) {
if (callsign == null) {
title = 'QSL Card';
} else {
title = 'QSL Card for ' + callsign;
title = 'QSL Card for ' + callsign.replace('0', '&Oslash;');
}
BootstrapDialog.show({
@ -2376,7 +2376,7 @@ function viewEqsl(picture, callsign) {
if (callsign == null) {
title = 'eQSL Card';
} else {
title = 'eQSL Card for ' + callsign;
title = 'eQSL Card for ' + callsign.replace('0', '&Oslash;');
}
BootstrapDialog.show({

查看文件

@ -5,6 +5,12 @@
<input class="form-check-input" type="checkbox" name="grid" id="grid">
</div>
</div>
<div class="form-group row">
<label class="my-1 mr-2 col-md-4" for="via">Include Via (if filled)?</label>
<div class="form-check-inline">
<input class="form-check-input" type="checkbox" name="via" id="via">
</div>
</div>
<div class="form-group row">
<label class="my-1 mr-2 col-md-4" for="startat">Start printing at?</label>
<div class="form-inline">

查看文件

@ -5,6 +5,12 @@
<input class="form-check-input" type="checkbox" name="gridlabel" id="gridlabel">
</div>
</div>
<div class="form-group row">
<label class="my-1 mr-2 col-md-4" for="via"><?php echo lang('filter_actions_print_include_via'); ?></label>
<div class="form-check-inline">
<input class="form-check-input" type="checkbox" name="via" id="via">
</div>
</div>
<div class="form-group row">
<label class="my-1 mr-2 col-md-4" for="startat"><?php echo lang('filter_actions_start_print'); ?></label>
<div class="form-inline">

查看文件

@ -13,11 +13,44 @@
<div class="card-header">
QSO-DB Maintenance
</div>
<?php if($is_there_qsos_with_no_station_id >= 1) { ?>
<?php if(!empty($qsos_with_no_station_id)) { ?>
<div class="alert alert-danger" role="alert" style="margin-bottom: 0px !important;">
<span class="badge badge-pill badge-warning">Warning</span> The Database contains QSOs without a station-profile (location)<br/>
<span class="badge badge-pill badge-warning">Warning</span> The Database contains <?php echo count($qsos_with_no_station_id); ?> QSO<?php echo count($qsos_with_no_station_id) > 1 ? 's' : '' ?> without a station-profile (location)<br/>
</div>
<div class="card-body">
<div class?"table-responsive">
<table id="unasigned_qsos_table" class="table table-sm table-striped">
<thead>
<tr>
<th scope="col"><input type="checkbox" onClick="toggleAll(this)"></th>
<th scope="col">Date</th>
<th scope="col">Time</th>
<th scope="col">Call</th>
<th scope="col">Mode</th>
<th scope="col">Band</th>
</tr>
</thead>
<tbody>
<?php if($this->session->userdata('user_date_format')) {
$custom_date_format = $this->session->userdata('user_date_format');
} else {
$custom_date_format = 'd.m.Y';
}
foreach ($qsos_with_no_station_id as $qso) {
echo '<tr>';
echo '<td><input type="checkbox" id="'.$qso->COL_PRIMARY_KEY.'" name="cBox[]" value="'.$qso->COL_PRIMARY_KEY.'"></td>';
$timestamp = strtotime($qso->COL_TIME_ON);
echo '<td>'.date($custom_date_format, $timestamp).'</td>';
$timestamp = strtotime($qso->COL_TIME_ON);
echo '<td>'.date('H:i', $timestamp).'</td>';
echo '<td>'.$qso->COL_CALL.'</td>';
echo '<td>'.$qso->COL_MODE.'</td>';
echo '<td>'.$qso->COL_BAND.'</td>';
echo '</tr>';
} ?>
</tbody>
</table>
</div>
<p class="card-text">Please reassign those QSOs to an existing station location:</p>
@ -33,12 +66,12 @@
<tbody>
<?php
foreach ($calls_wo_sid as $call) {
echo '<tr><td>'.$call['COL_STATION_CALLSIGN'].'</td><td><select name="station_profile" id="station_profile">';
echo '<tr><td><div id="station_call">'.$call['COL_STATION_CALLSIGN'].'</div></td><td><select name="station_profile" id="station_profile" onChange="updateCallsign(this)">';
$options='';
foreach ($stations->result() as $station) {
$options.='<option value='.$station->station_id.'>'.$station->station_profile_name.' ('.$station->station_callsign.')</option>';
}
echo $options.'</select></td><td><button class="btn btn-warning" onClick="reassign(\''.$call['COL_STATION_CALLSIGN'].'\',$(\'#station_profile option:selected\').val());"><i class="fas fa-sync"></i>Reassign</a></button></td></tr>';
echo $options.'</select></td><td><button class="btn btn-warning" onClick="reassign(\''.$call['COL_STATION_CALLSIGN'].'\',$(\'#station_profile option:selected\').val());"><i class="fas fa-sync"></i> Reassign</a></button></td></tr>';
} ?>
</tbody>
</table>

查看文件

@ -36,7 +36,7 @@
foreach ($qslarray->result() as $qsl) {
echo '<tr>';
echo '<td style=\'text-align: center\'>' . $qsl->COL_CALL . '</td>';
echo '<td style=\'text-align: center\'>' . str_replace("0","&Oslash;",$qsl->COL_CALL) . '</td>';
echo '<td style=\'text-align: center\'>';
echo $qsl->COL_SUBMODE==null?$qsl->COL_MODE:$qsl->COL_SUBMODE;
echo '</td>';

查看文件

@ -484,7 +484,7 @@
<div class="tab-pane fade" id="notesdetails" role="tabpanel" aria-labelledby="table-tab">
<h3><?php echo lang('general_word_notes'); ?></h3>
<?php echo nl2br($row->COL_NOTES); ?>
<?php if (isset($row->COL_NOTES)) { echo nl2br($row->COL_NOTES); } ?>
</div>
<?php

查看文件

@ -774,7 +774,7 @@ function printlabel() {
data: {'id': JSON.stringify(id_list, null, 2),
'startat': $('#startat').val(),
'grid': $('#gridlabel')[0].checked,
'via': $('#via')[0].checked,
},
xhr:function(){
var xhr = new XMLHttpRequest();

查看文件

@ -1,8 +1,15 @@
function reassign(call,target_profile_id) {
let qsoids = [];
let elements = document.getElementsByName("cBox[]");
elements.forEach((item) => {
if (item.checked) {
qsoids.push(item.value);
}
});
$.ajax({
url: base_url + 'index.php/maintenance/reassign',
type: 'post',
data: {'call': call, 'station_id': target_profile_id},
data: {'call': call, 'station_id': target_profile_id, 'qsoids' : qsoids},
success: function (resu) {
if (resu.status) {
location.reload();
@ -10,3 +17,27 @@ function reassign(call,target_profile_id) {
}
});
}
function toggleAll(source) {
console.log('test');
if (source.checked) {
let elements = document.getElementsByName("cBox[]");
elements.forEach((item) => {
item.checked = true;
})
source.checked = true;
}
if (!source.checked) {
let elements = document.getElementsByName("cBox[]");
elements.forEach((item) => {
item.checked = false;
})
source.checked = false;
}
}
function updateCallsign(item) {
let text = item.options[item.selectedIndex].text
let call = text.substr(text.lastIndexOf('(')+1,(text.lastIndexOf(')')-text.lastIndexOf('(')-1));
document.getElementById("station_call").innerHTML = call;
}