diff --git a/application/controllers/Dashboard.php b/application/controllers/Dashboard.php index 8c5ae246..6f4f1b36 100644 --- a/application/controllers/Dashboard.php +++ b/application/controllers/Dashboard.php @@ -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."
Date/Time: ".$row->COL_TIME_ON."
SAT: ".$row->COL_SAT_NAME."
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."
Date/Time: ".$row->COL_TIME_ON."
SAT: ".$row->COL_SAT_NAME."
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 { } - + } diff --git a/application/controllers/Labels.php b/application/controllers/Labels.php index 008ec762..cf0b966c 100644 --- a/application/controllers/Labels.php +++ b/application/controllers/Labels.php @@ -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'] !== '')) { diff --git a/application/controllers/Maintenance.php b/application/controllers/Maintenance.php index 0e0deb2f..5ac18615 100644 --- a/application/controllers/Maintenance.php +++ b/application/controllers/Maintenance.php @@ -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; } diff --git a/application/language/bulgarian/filter_lang.php b/application/language/bulgarian/filter_lang.php index 58fce8eb..b34f9a4f 100644 --- a/application/language/bulgarian/filter_lang.php +++ b/application/language/bulgarian/filter_lang.php @@ -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'; diff --git a/application/language/bulgarian/general_words_lang.php b/application/language/bulgarian/general_words_lang.php index 9a218beb..ce7d4fcf 100644 --- a/application/language/bulgarian/general_words_lang.php +++ b/application/language/bulgarian/general_words_lang.php @@ -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 here to do it!'; +$lang['dashboard_locations_warning'] = 'You have no station locations. Go here to create it!'; +$lang['dashboard_logbooks_warning'] = 'You have no station logbook. Go here to create it!'; diff --git a/application/language/chinese_simplified/filter_lang.php b/application/language/chinese_simplified/filter_lang.php index 58fce8eb..b34f9a4f 100644 --- a/application/language/chinese_simplified/filter_lang.php +++ b/application/language/chinese_simplified/filter_lang.php @@ -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'; diff --git a/application/language/chinese_simplified/general_words_lang.php b/application/language/chinese_simplified/general_words_lang.php index 526e9725..b70a4986 100644 --- a/application/language/chinese_simplified/general_words_lang.php +++ b/application/language/chinese_simplified/general_words_lang.php @@ -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 here to do it!'; +$lang['dashboard_locations_warning'] = 'You have no station locations. Go here to create it!'; +$lang['dashboard_logbooks_warning'] = 'You have no station logbook. Go here to create it!'; diff --git a/application/language/czech/filter_lang.php b/application/language/czech/filter_lang.php index 58fce8eb..b34f9a4f 100644 --- a/application/language/czech/filter_lang.php +++ b/application/language/czech/filter_lang.php @@ -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'; diff --git a/application/language/dutch/filter_lang.php b/application/language/dutch/filter_lang.php index 58fce8eb..b34f9a4f 100644 --- a/application/language/dutch/filter_lang.php +++ b/application/language/dutch/filter_lang.php @@ -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'; diff --git a/application/language/dutch/general_words_lang.php b/application/language/dutch/general_words_lang.php index d94e9139..28606f5f 100644 --- a/application/language/dutch/general_words_lang.php +++ b/application/language/dutch/general_words_lang.php @@ -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 here to do it!'; +$lang['dashboard_locations_warning'] = 'You have no station locations. Go here to create it!'; +$lang['dashboard_logbooks_warning'] = 'You have no station logbook. Go here to create it!'; diff --git a/application/language/english/filter_lang.php b/application/language/english/filter_lang.php index 73574aa2..280429bd 100644 --- a/application/language/english/filter_lang.php +++ b/application/language/english/filter_lang.php @@ -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'; diff --git a/application/language/english/general_words_lang.php b/application/language/english/general_words_lang.php index fa5df780..718da081 100644 --- a/application/language/english/general_words_lang.php +++ b/application/language/english/general_words_lang.php @@ -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 here to do it!'; +$lang['dashboard_locations_warning'] = 'You have no station locations. Go here to create it!'; +$lang['dashboard_logbooks_warning'] = 'You have no station logbook. Go here to create it!'; diff --git a/application/language/finnish/filter_lang.php b/application/language/finnish/filter_lang.php index 58fce8eb..b34f9a4f 100644 --- a/application/language/finnish/filter_lang.php +++ b/application/language/finnish/filter_lang.php @@ -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'; diff --git a/application/language/finnish/general_words_lang.php b/application/language/finnish/general_words_lang.php index 858d99ef..9b14ff92 100644 --- a/application/language/finnish/general_words_lang.php +++ b/application/language/finnish/general_words_lang.php @@ -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 here to do it!'; +$lang['dashboard_locations_warning'] = 'You have no station locations. Go here to create it!'; +$lang['dashboard_logbooks_warning'] = 'You have no station logbook. Go here to create it!'; diff --git a/application/language/french/filter_lang.php b/application/language/french/filter_lang.php index 0f5c24a8..648e0419 100644 --- a/application/language/french/filter_lang.php +++ b/application/language/french/filter_lang.php @@ -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'; diff --git a/application/language/french/general_words_lang.php b/application/language/french/general_words_lang.php index b6af838b..22df0ce1 100644 --- a/application/language/french/general_words_lang.php +++ b/application/language/french/general_words_lang.php @@ -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 here to do it!'; +$lang['dashboard_locations_warning'] = 'You have no station locations. Go here to create it!'; +$lang['dashboard_logbooks_warning'] = 'You have no station logbook. Go here to create it!'; diff --git a/application/language/german/filter_lang.php b/application/language/german/filter_lang.php index bf614584..02aff861 100644 --- a/application/language/german/filter_lang.php +++ b/application/language/german/filter_lang.php @@ -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'; diff --git a/application/language/greek/filter_lang.php b/application/language/greek/filter_lang.php index 58fce8eb..b34f9a4f 100644 --- a/application/language/greek/filter_lang.php +++ b/application/language/greek/filter_lang.php @@ -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'; diff --git a/application/language/greek/general_words_lang.php b/application/language/greek/general_words_lang.php index 9f0a579d..6a57f709 100644 --- a/application/language/greek/general_words_lang.php +++ b/application/language/greek/general_words_lang.php @@ -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 here to do it!'; +$lang['dashboard_locations_warning'] = 'You have no station locations. Go here to create it!'; +$lang['dashboard_logbooks_warning'] = 'You have no station logbook. Go here to create it!'; diff --git a/application/language/italian/filter_lang.php b/application/language/italian/filter_lang.php index 58fce8eb..b34f9a4f 100644 --- a/application/language/italian/filter_lang.php +++ b/application/language/italian/filter_lang.php @@ -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'; diff --git a/application/language/italian/general_words_lang.php b/application/language/italian/general_words_lang.php index 9be4d3ee..acff1df5 100644 --- a/application/language/italian/general_words_lang.php +++ b/application/language/italian/general_words_lang.php @@ -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 here to do it!'; +$lang['dashboard_locations_warning'] = 'You have no station locations. Go here to create it!'; +$lang['dashboard_logbooks_warning'] = 'You have no station logbook. Go here to create it!'; diff --git a/application/language/polish/filter_lang.php b/application/language/polish/filter_lang.php index 58fce8eb..b34f9a4f 100644 --- a/application/language/polish/filter_lang.php +++ b/application/language/polish/filter_lang.php @@ -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'; diff --git a/application/language/russian/filter_lang.php b/application/language/russian/filter_lang.php index 58fce8eb..b34f9a4f 100644 --- a/application/language/russian/filter_lang.php +++ b/application/language/russian/filter_lang.php @@ -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'; diff --git a/application/language/russian/general_words_lang.php b/application/language/russian/general_words_lang.php index fbd9eb08..e9aee467 100644 --- a/application/language/russian/general_words_lang.php +++ b/application/language/russian/general_words_lang.php @@ -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 here to do it!'; +$lang['dashboard_locations_warning'] = 'You have no station locations. Go here to create it!'; +$lang['dashboard_logbooks_warning'] = 'You have no station logbook. Go here to create it!'; diff --git a/application/language/spanish/filter_lang.php b/application/language/spanish/filter_lang.php index 58fce8eb..b34f9a4f 100644 --- a/application/language/spanish/filter_lang.php +++ b/application/language/spanish/filter_lang.php @@ -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'; diff --git a/application/language/spanish/general_words_lang.php b/application/language/spanish/general_words_lang.php index d979557d..76718fab 100644 --- a/application/language/spanish/general_words_lang.php +++ b/application/language/spanish/general_words_lang.php @@ -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 here to do it!'; +$lang['dashboard_locations_warning'] = 'You have no station locations. Go here to create it!'; +$lang['dashboard_logbooks_warning'] = 'You have no station logbook. Go here to create it!'; diff --git a/application/language/swedish/filter_lang.php b/application/language/swedish/filter_lang.php index 58fce8eb..b34f9a4f 100644 --- a/application/language/swedish/filter_lang.php +++ b/application/language/swedish/filter_lang.php @@ -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'; diff --git a/application/language/swedish/general_words_lang.php b/application/language/swedish/general_words_lang.php index 8d6e0e85..afc31ba9 100644 --- a/application/language/swedish/general_words_lang.php +++ b/application/language/swedish/general_words_lang.php @@ -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 here to do it!'; +$lang['dashboard_locations_warning'] = 'You have no station locations. Go here to create it!'; +$lang['dashboard_logbooks_warning'] = 'You have no station logbook. Go here to create it!'; \ No newline at end of file diff --git a/application/language/turkish/filter_lang.php b/application/language/turkish/filter_lang.php index 58fce8eb..b34f9a4f 100644 --- a/application/language/turkish/filter_lang.php +++ b/application/language/turkish/filter_lang.php @@ -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'; diff --git a/application/language/turkish/general_words_lang.php b/application/language/turkish/general_words_lang.php index 2b643992..6def5221 100644 --- a/application/language/turkish/general_words_lang.php +++ b/application/language/turkish/general_words_lang.php @@ -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 here to do it!'; +$lang['dashboard_locations_warning'] = 'You have no station locations. Go here to create it!'; +$lang['dashboard_logbooks_warning'] = 'You have no station logbook. Go here to create it!'; diff --git a/application/models/Logbook_model.php b/application/models/Logbook_model.php index 90bdad19..98cabe72 100755 --- a/application/models/Logbook_model.php +++ b/application/models/Logbook_model.php @@ -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) diff --git a/application/models/Setup_model.php b/application/models/Setup_model.php new file mode 100644 index 00000000..66692014 --- /dev/null +++ b/application/models/Setup_model.php @@ -0,0 +1,29 @@ +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; + } +} + +?> diff --git a/application/views/dashboard/index.php b/application/views/dashboard/index.php index 38ad16c9..dc686380 100644 --- a/application/views/dashboard/index.php +++ b/application/views/dashboard/index.php @@ -48,7 +48,31 @@ function echoQrbCalcLink($mygrid, $grid, $vucc) { ?>
config->item('use_auth') && ($this->session->userdata('user_type') >= 2)) || $this->config->item('use_auth') === FALSE) { ?> - + + + + + + + + + + + + + + + + + optionslib->get_option('dashboard_banner') != "false") { ?> = 1) { ?>
+
+ +
+ +
+
diff --git a/application/views/logbookadvanced/startatform.php b/application/views/logbookadvanced/startatform.php index f5672d79..463f00cc 100644 --- a/application/views/logbookadvanced/startatform.php +++ b/application/views/logbookadvanced/startatform.php @@ -5,6 +5,12 @@
+
+ +
+ +
+
diff --git a/application/views/maintenance/main.php b/application/views/maintenance/main.php index fef8627d..8c276ced 100644 --- a/application/views/maintenance/main.php +++ b/application/views/maintenance/main.php @@ -13,11 +13,44 @@
QSO-DB Maintenance
- = 1) { ?> +
+
+ + + + + + + + + + + + + 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 ''; + echo ''; + $timestamp = strtotime($qso->COL_TIME_ON); + echo ''; + $timestamp = strtotime($qso->COL_TIME_ON); + echo ''; + echo ''; + echo ''; + echo ''; + echo ''; + } ?> + +
DateTimeCallModeBand
'.date($custom_date_format, $timestamp).''.date('H:i', $timestamp).''.$qso->COL_CALL.''.$qso->COL_MODE.''.$qso->COL_BAND.'
+

Please reassign those QSOs to an existing station location:

@@ -33,12 +66,12 @@ '.$call['COL_STATION_CALLSIGN'].''; $options=''; foreach ($stations->result() as $station) { $options.=''; } - echo $options.''; + echo $options.''; } ?> diff --git a/application/views/qslcard/index.php b/application/views/qslcard/index.php index 3d71c88d..38cb3f05 100644 --- a/application/views/qslcard/index.php +++ b/application/views/qslcard/index.php @@ -36,7 +36,7 @@ foreach ($qslarray->result() as $qsl) { echo ''; - echo '' . $qsl->COL_CALL . ''; + echo '' . str_replace("0","Ø",$qsl->COL_CALL) . ''; echo ''; echo $qsl->COL_SUBMODE==null?$qsl->COL_MODE:$qsl->COL_SUBMODE; echo ''; diff --git a/application/views/view_log/qso.php b/application/views/view_log/qso.php index 14820e9d..ce6b69dd 100644 --- a/application/views/view_log/qso.php +++ b/application/views/view_log/qso.php @@ -484,7 +484,7 @@

- COL_NOTES); ?> + COL_NOTES)) { echo nl2br($row->COL_NOTES); } ?>
{ + 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; +}