Merge branch 'dev' into qsoTime

pull/2632/head
phl0 2023-11-01 12:18:39 +01:00
commit 36d9a95ebb
Nie znaleziono w bazie danych klucza dla tego podpisu
ID klucza GPG: 48EA1E640798CA9A
23 zmienionych plików z 421 dodań i 231 usunięć

Wyświetl plik

@ -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 {
}
}

Wyświetl plik

@ -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;
}

Wyświetl plik

@ -192,3 +192,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!';

Wyświetl plik

@ -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!';

Wyświetl plik

@ -192,3 +192,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!';

Wyświetl plik

@ -190,3 +190,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!';

Wyświetl plik

@ -192,3 +192,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!';

Wyświetl plik

@ -192,3 +192,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!';

Wyświetl plik

@ -192,3 +192,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!';

Wyświetl plik

@ -192,3 +192,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!';

Wyświetl plik

@ -193,3 +193,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!';

Wyświetl plik

@ -192,3 +192,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!';

Wyświetl plik

@ -1,194 +1,199 @@
<?php
defined('BASEPATH') OR exit('No direct script access allowed');
$lang['error_no_active_station_profile'] = 'OBS! Du behöver ange en aktiv station location.';
$lang['notice_turn_the_radio_on'] = 'Inga QSOn idag - dags att slå på radion!';
$lang['general_word_important'] = 'Viktigt';
$lang['general_word_warning'] = 'Warning';
$lang['general_word_danger'] = 'DANGER';
$lang['general_word_maintenance'] = 'Maintenance';
$lang['general_word_info'] = 'Info';
$lang['general_word_choose_file'] = 'Välj fil';
$lang['general_word_next'] = 'Next';
$lang['general_word_previous'] = 'Previous';
<?php
defined('BASEPATH') OR exit('No direct script access allowed');
$lang['error_no_active_station_profile'] = 'OBS! Du behöver ange en aktiv station location.';
$lang['notice_turn_the_radio_on'] = 'Inga QSOn idag - dags att slå på radion!';
$lang['general_word_important'] = 'Viktigt';
$lang['general_word_warning'] = 'Warning';
$lang['general_word_danger'] = 'DANGER';
$lang['general_word_maintenance'] = 'Maintenance';
$lang['general_word_info'] = 'Info';
$lang['general_word_choose_file'] = 'Välj fil';
$lang['general_word_next'] = 'Next';
$lang['general_word_previous'] = 'Previous';
$lang['general_word_enabled'] = "Enabled";
$lang['general_word_disabled'] = "Disabled";
$lang['general_word_export'] = "Export";
$lang['general_word_import'] = "Import";
$lang['general_word_date'] = 'Datum';
$lang['general_word_time'] = 'Tid';
$lang['general_word_date'] = 'Datum';
$lang['general_word_time'] = 'Tid';
$lang['general_word_time_on'] = 'Time on';
$lang['general_word_time_off'] = 'Time off';
$lang['general_word_datetime'] = 'Datum/Tid';
$lang['general_word_none'] = 'Ingen';
$lang['general_word_name'] = 'Namn';
$lang['general_word_location'] = 'QTH';
$lang['general_word_comment'] = 'Notering';
$lang['general_word_general'] = 'Allmänt';
$lang['general_word_satellite'] = 'Satellit';
$lang['general_word_satellite_short'] = 'Sat';
$lang['general_word_notes'] = 'Anteckningar';
$lang['general_word_country'] = 'Land';
$lang['general_word_city'] = 'City';
$lang['general_word_total'] = 'Totalt';
$lang['general_word_year'] = 'I år';
$lang['general_word_month'] = 'Denna månad';
$lang['general_word_datetime'] = 'Datum/Tid';
$lang['general_word_none'] = 'Ingen';
$lang['general_word_name'] = 'Namn';
$lang['general_word_location'] = 'QTH';
$lang['general_word_comment'] = 'Notering';
$lang['general_word_general'] = 'Allmänt';
$lang['general_word_satellite'] = 'Satellit';
$lang['general_word_satellite_short'] = 'Sat';
$lang['general_word_notes'] = 'Anteckningar';
$lang['general_word_country'] = 'Land';
$lang['general_word_city'] = 'City';
$lang['general_word_total'] = 'Totalt';
$lang['general_word_year'] = 'I år';
$lang['general_word_month'] = 'Denna månad';
$lang['general_word_colors'] = "Colors";
$lang['general_word_worked'] = 'Körda';
$lang['general_word_worked'] = 'Körda';
$lang['general_word_worked_not_confirmed'] = "Worked not confirmed";
$lang['general_word_not_worked'] = "Not worked";
$lang['general_word_confirmed'] = 'Bekräftade';
$lang['general_word_needed'] = 'Behövs';
$lang['general_word_all'] = 'All';
$lang['general_word_no'] = 'Nej';
$lang['general_word_yes'] = 'Ja';
$lang['general_word_method'] = 'Metod';
$lang['general_word_sent'] = 'Skickad';
$lang['general_word_received'] = 'Mottagen';
$lang['general_word_requested'] = 'Begärd';
$lang['general_word_queued'] = 'Köad';
$lang['general_word_confirmed'] = 'Bekräftade';
$lang['general_word_needed'] = 'Behövs';
$lang['general_word_all'] = 'All';
$lang['general_word_no'] = 'Nej';
$lang['general_word_yes'] = 'Ja';
$lang['general_word_method'] = 'Metod';
$lang['general_word_sent'] = 'Skickad';
$lang['general_word_received'] = 'Mottagen';
$lang['general_word_requested'] = 'Begärd';
$lang['general_word_queued'] = 'Köad';
$lang['general_word_table'] = "Table";
$lang['general_word_invalid_ignore'] = 'Invalid (Ignore)';
$lang['general_word_qslcard'] = 'QSL-kort';
$lang['general_word_qslcard_management'] = 'QSL Management';
$lang['general_word_qslcards'] = 'QSL-kort';
$lang['general_word_qslcard_direct'] = 'Direkt';
$lang['general_word_qslcard_bureau'] = 'Byrå';
$lang['general_word_qslcard_electronic'] = 'Elektronisk';
$lang['general_word_qslcard_manager'] = 'Manager';
$lang['general_word_qslcard_via'] = 'Via';
$lang['general_word_eqslcard'] = 'eQSL Card';
$lang['general_word_eqslcards'] = 'eQSL Cards';
$lang['general_word_lotw'] = 'Logbook of the World';
$lang['general_word_lotw_short'] = 'LoTW';
$lang['general_word_details'] = 'Details';
$lang['general_word_qso_data'] = 'QSO Data';
$lang['general_edit_qso'] = 'Redigera QSO';
$lang['general_mark_qsl_rx_bureau'] = 'Ange QSL mottagen (Byrå)';
$lang['general_mark_qsl_rx_direct'] = 'Ange QSL mottagen (Direkt)';
$lang['general_mark_qsl_rx_electronic'] = 'Ange QSL mottagen (Elektronisk)';
$lang['general_mark_qsl_tx_bureau'] = 'Ange QSL skickad (Byrå)';
$lang['general_mark_qsl_tx_direct'] = 'Ange QSL skickad (Direkt)';
$lang['general_mark_qsl_requested'] = 'Ange QSL Karta Begärda';
$lang['general_mark_qsl_requested_bureau'] = 'Ange QSL Karta Begärda (Byrå)';
$lang['general_mark_qsl_requested_direct'] = 'Ange QSL Karta Begärda (Direkt)';
$lang['general_mark_qsl_not_required'] = 'Ange QSL Karta Inte Nödvändig';
$lang['general_delete_qso'] = 'Radera QSO';
$lang['general_more_qso'] = 'More QSOs';
$lang['general_lookup_qrz'] = 'Lookup on QRZ.com';
$lang['general_lookup_hamqth'] = 'Lookup on HamQTH';
$lang['general_total_distance'] = 'Totalt avstånd';
// PHP Upload Warning
$lang['gen_max_file_upload_size'] = 'Maximum file upload size is ';
// Cloudlog Terms
$lang['cloudlog_station_profile'] = 'Stationsplats';
// ham radio terms
$lang['general_word_invalid_ignore'] = 'Invalid (Ignore)';
$lang['general_word_qslcard'] = 'QSL-kort';
$lang['general_word_qslcard_management'] = 'QSL Management';
$lang['general_word_qslcards'] = 'QSL-kort';
$lang['general_word_qslcard_direct'] = 'Direkt';
$lang['general_word_qslcard_bureau'] = 'Byrå';
$lang['general_word_qslcard_electronic'] = 'Elektronisk';
$lang['general_word_qslcard_manager'] = 'Manager';
$lang['general_word_qslcard_via'] = 'Via';
$lang['general_word_eqslcard'] = 'eQSL Card';
$lang['general_word_eqslcards'] = 'eQSL Cards';
$lang['general_word_lotw'] = 'Logbook of the World';
$lang['general_word_lotw_short'] = 'LoTW';
$lang['general_word_details'] = 'Details';
$lang['general_word_qso_data'] = 'QSO Data';
$lang['general_edit_qso'] = 'Redigera QSO';
$lang['general_mark_qsl_rx_bureau'] = 'Ange QSL mottagen (Byrå)';
$lang['general_mark_qsl_rx_direct'] = 'Ange QSL mottagen (Direkt)';
$lang['general_mark_qsl_rx_electronic'] = 'Ange QSL mottagen (Elektronisk)';
$lang['general_mark_qsl_tx_bureau'] = 'Ange QSL skickad (Byrå)';
$lang['general_mark_qsl_tx_direct'] = 'Ange QSL skickad (Direkt)';
$lang['general_mark_qsl_requested'] = 'Ange QSL Karta Begärda';
$lang['general_mark_qsl_requested_bureau'] = 'Ange QSL Karta Begärda (Byrå)';
$lang['general_mark_qsl_requested_direct'] = 'Ange QSL Karta Begärda (Direkt)';
$lang['general_mark_qsl_not_required'] = 'Ange QSL Karta Inte Nödvändig';
$lang['general_delete_qso'] = 'Radera QSO';
$lang['general_more_qso'] = 'More QSOs';
$lang['general_lookup_qrz'] = 'Lookup on QRZ.com';
$lang['general_lookup_hamqth'] = 'Lookup on HamQTH';
$lang['general_total_distance'] = 'Totalt avstånd';
// PHP Upload Warning
$lang['gen_max_file_upload_size'] = 'Maximum file upload size is ';
// Cloudlog Terms
$lang['cloudlog_station_profile'] = 'Stationsplats';
// ham radio terms
$lang['gen_hamradio_cq'] = "CQ";
$lang['gen_hamradio_qso'] = 'QSO';
$lang['gen_hamradio_station'] = 'Station';
$lang['gen_hamradio_call'] = 'Signal';
$lang['gen_hamradio_callsign'] = 'Signal';
$lang['gen_hamradio_de'] = 'De';
$lang['gen_hamradio_dx'] = 'Dx';
$lang['gen_hamradio_mode'] = 'Mode';
$lang['gen_hamradio_rst_sent'] = 'Skickat';
$lang['gen_hamradio_rst_rcvd'] = 'Mottagen\'d';
$lang['gen_hamradio_band'] = 'Band';
$lang['gen_hamradio_qso'] = 'QSO';
$lang['gen_hamradio_station'] = 'Station';
$lang['gen_hamradio_call'] = 'Signal';
$lang['gen_hamradio_callsign'] = 'Signal';
$lang['gen_hamradio_de'] = 'De';
$lang['gen_hamradio_dx'] = 'Dx';
$lang['gen_hamradio_mode'] = 'Mode';
$lang['gen_hamradio_rst_sent'] = 'Skickat';
$lang['gen_hamradio_rst_rcvd'] = 'Mottagen\'d';
$lang['gen_hamradio_band'] = 'Band';
$lang['gen_hamradio_bandgroup'] = "Bandgroup";
$lang['gen_hamradio_band_rx'] = 'Band (RX)';
$lang['gen_hamradio_frequency'] = 'Frekvens';
$lang['gen_hamradio_frequency_rx'] = 'Frekvens (RX)';
$lang['gen_hamradio_radio'] = 'Radio';
$lang['gen_hamradio_rsts'] = 'RST (S)';
$lang['gen_hamradio_rstr'] = 'RST (R)';
$lang['gen_hamradio_refs'] = 'Refs';
$lang['gen_hamradio_myrefs'] = 'My Refs';
$lang['gen_hamradio_exchange_sent_short'] = 'Exch (S)';
$lang['gen_hamradio_exchange_rcvd_short'] = 'Exch (R)';
$lang['gen_hamradio_qsl'] = 'QSL';
$lang['gen_hamradio_band_rx'] = 'Band (RX)';
$lang['gen_hamradio_frequency'] = 'Frekvens';
$lang['gen_hamradio_frequency_rx'] = 'Frekvens (RX)';
$lang['gen_hamradio_radio'] = 'Radio';
$lang['gen_hamradio_rsts'] = 'RST (S)';
$lang['gen_hamradio_rstr'] = 'RST (R)';
$lang['gen_hamradio_refs'] = 'Refs';
$lang['gen_hamradio_myrefs'] = 'My Refs';
$lang['gen_hamradio_exchange_sent_short'] = 'Exch (S)';
$lang['gen_hamradio_exchange_rcvd_short'] = 'Exch (R)';
$lang['gen_hamradio_qsl'] = 'QSL';
$lang['gen_hamradio_qsltype'] = "QSL Type";
$lang['gen_hamradio_qslvia'] = 'QSL via';
$lang['gen_hamradio_qslmsg'] = 'QSL Msg';
$lang['gen_hamradio_locator'] = 'Lokator';
$lang['gen_hamradio_transmit_power'] = 'Effekt (W)';
$lang['gen_hamradio_propagation_mode'] = 'Propagation Mode';
$lang['gen_hamradio_satellite_name'] = 'Satellitnamn';
$lang['gen_hamradio_satellite_mode'] = 'Satellite-mode';
$lang['gen_hamradio_logbook'] = 'Loggbok';
$lang['gen_hamradio_zones'] = 'Zones';
$lang['gen_hamradio_cq_zone'] = 'CQ Zone';
$lang['gen_hamradio_itu_zone'] = 'ITU Zone';
$lang['gen_hamradio_dxcc'] = 'DXCC';
$lang['gen_hamradio_deleted_dxcc'] = 'Struket DXCC';
$lang['gen_hamradio_continent'] = 'Kontinent';
$lang['gen_hamradio_usa_state'] = 'USA State';
$lang['gen_hamradio_county_reference'] = 'USA County';
$lang['gen_hamradio_iota_reference'] = 'IOTA Reference';
$lang['gen_hamradio_sota_reference'] = 'SOTA Reference';
$lang['gen_hamradio_wwff_reference'] = 'WWFF Reference';
$lang['gen_hamradio_pota_reference'] = 'POTA Reference';
$lang['gen_hamradio_dok'] = 'DOK';
$lang['gen_hamradio_state'] = 'State';
$lang['gen_hamradio_iota'] = 'IOTA';
$lang['gen_hamradio_sota'] = 'SOTA';
$lang['gen_hamradio_wwff'] = 'WWFF';
$lang['gen_hamradio_pota'] = 'POTA';
$lang['gen_hamradio_gridsquare'] = 'Lokator/Gridsquare';
$lang['gen_hamradio_get_gridsquare'] = 'Get Gridsquare';
$lang['gen_hamradio_distance'] = 'Distance';
$lang['gen_hamradio_operator'] = 'Operatör';
$lang['gen_hamradio_sig'] = 'Sig';
$lang['gen_hamradio_sig_info'] = 'Sig Info';
// Find your CQ/ITU Zone
$lang['gen_find_zone_cq_part1'] = "If you don't know your CQ Zone then ";
$lang['gen_find_zone_itu_part1'] = "If you don't know your ITU Zone then ";
$lang['gen_find_zone_part2'] = 'click here';
$lang['gen_find_zone_part3'] = ' to find it!';
// Dashboard Words
$lang['dashboard_you_have_had'] = 'Du har kört';
$lang['dashboard_qsos_today'] = 'QSOs idag!';
$lang['dashboard_qso_breakdown'] = 'QSOs Breakdown';
$lang['dashboard_countries_breakdown'] = 'Länder Breakdown';
$lang['gen_hamradio_qslvia'] = 'QSL via';
$lang['gen_hamradio_qslmsg'] = 'QSL Msg';
$lang['gen_hamradio_locator'] = 'Lokator';
$lang['gen_hamradio_transmit_power'] = 'Effekt (W)';
$lang['gen_hamradio_propagation_mode'] = 'Propagation Mode';
$lang['gen_hamradio_satellite_name'] = 'Satellitnamn';
$lang['gen_hamradio_satellite_mode'] = 'Satellite-mode';
$lang['gen_hamradio_logbook'] = 'Loggbok';
$lang['gen_hamradio_zones'] = 'Zones';
$lang['gen_hamradio_cq_zone'] = 'CQ Zone';
$lang['gen_hamradio_itu_zone'] = 'ITU Zone';
$lang['gen_hamradio_dxcc'] = 'DXCC';
$lang['gen_hamradio_deleted_dxcc'] = 'Struket DXCC';
$lang['gen_hamradio_continent'] = 'Kontinent';
$lang['gen_hamradio_usa_state'] = 'USA State';
$lang['gen_hamradio_county_reference'] = 'USA County';
$lang['gen_hamradio_iota_reference'] = 'IOTA Reference';
$lang['gen_hamradio_sota_reference'] = 'SOTA Reference';
$lang['gen_hamradio_wwff_reference'] = 'WWFF Reference';
$lang['gen_hamradio_pota_reference'] = 'POTA Reference';
$lang['gen_hamradio_dok'] = 'DOK';
$lang['gen_hamradio_state'] = 'State';
$lang['gen_hamradio_iota'] = 'IOTA';
$lang['gen_hamradio_sota'] = 'SOTA';
$lang['gen_hamradio_wwff'] = 'WWFF';
$lang['gen_hamradio_pota'] = 'POTA';
$lang['gen_hamradio_gridsquare'] = 'Lokator/Gridsquare';
$lang['gen_hamradio_get_gridsquare'] = 'Get Gridsquare';
$lang['gen_hamradio_distance'] = 'Distance';
$lang['gen_hamradio_operator'] = 'Operatör';
$lang['gen_hamradio_sig'] = 'Sig';
$lang['gen_hamradio_sig_info'] = 'Sig Info';
// Find your CQ/ITU Zone
$lang['gen_find_zone_cq_part1'] = "If you don't know your CQ Zone then ";
$lang['gen_find_zone_itu_part1'] = "If you don't know your ITU Zone then ";
$lang['gen_find_zone_part2'] = 'click here';
$lang['gen_find_zone_part3'] = ' to find it!';
// Dashboard Words
$lang['dashboard_you_have_had'] = 'Du har kört';
$lang['dashboard_qsos_today'] = 'QSOs idag!';
$lang['dashboard_qso_breakdown'] = 'QSOs Breakdown';
$lang['dashboard_countries_breakdown'] = 'Länder Breakdown';
$lang['gen_to_date'] = 'To date';
$lang['gen_from_date'] = 'Från datum';
$lang['gen_this_qso_was_confirmed_on'] = 'Detta QSO blev konfirmerat';
$lang['error_no_logbook_found'] = 'Ingen loggbok hittades. Du måste konfigurera en loggbok under Station Logbooks. Gör det här:';
$lang['copy_to_clipboard'] = 'Kopiera till clipboard';
$lang['africa'] = 'Afrika';
$lang['antarctica'] = 'Antarktis';
$lang['asia'] = 'Asien';
$lang['europe'] = 'Europa';
$lang['northamerica'] = 'Nordamerika';
$lang['oceania'] = 'Oceanien';
$lang['southamerica'] = 'Sydamerika';
$lang['gen_band_selection'] = 'Band val';
$lang['general_word_today'] = 'Today';
$lang['gen_from_date'] = 'Från datum';
$lang['gen_this_qso_was_confirmed_on'] = 'Detta QSO blev konfirmerat';
$lang['error_no_logbook_found'] = 'Ingen loggbok hittades. Du måste konfigurera en loggbok under Station Logbooks. Gör det här:';
$lang['copy_to_clipboard'] = 'Kopiera till clipboard';
$lang['africa'] = 'Afrika';
$lang['antarctica'] = 'Antarktis';
$lang['asia'] = 'Asien';
$lang['europe'] = 'Europa';
$lang['northamerica'] = 'Nordamerika';
$lang['oceania'] = 'Oceanien';
$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!';

Wyświetl plik

@ -192,3 +192,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!';

Wyświetl plik

@ -4114,10 +4114,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;
}
@ -4170,24 +4172,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)

Wyświetl plik

@ -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;
}
}
?>

Wyświetl plik

@ -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">

Wyświetl plik

@ -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>';

Wyświetl plik

@ -2335,7 +2335,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({
@ -2397,7 +2397,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({

Wyświetl plik

@ -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>

Wyświetl plik

@ -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>';

Wyświetl plik

@ -486,7 +486,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

Wyświetl plik

@ -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;
}