Merge branch 'magicbug:master' into master
这个提交包含在：
abarrau
当前提交
2fa4452946
共有 48 个文件被更改，包括 7705 次插入 和 157 次删除
|
|
@ -42,7 +42,6 @@ Thanks to Andy (VE7CXZ), Gavin (M1BXF), Graham (W5ISP), Robert (M0VFC), Corby (K
|
|||
|
||||
Cloudlog is supported by Patreon and donations via PayPal, thanks to the following people:
|
||||
|
||||
Paul (M0TZO), Tim (G4VXE), Paul (N8HM), Michelle (W5NYV), Mitchell (AD0HJ), Dan (M0TCB), Martin (DK3ML), Juan Carlos (EA5WA), Iain (M0PCB), Charlie (GM1TGY), Ondrej (OK1CDJ), Trystan (G0KAY), Oliver (DL6KBG), Volkmar Schirmer, Jordan (M0PIR), Thomas Ziegler, Mathis (DB9MAT), Ken (VE3HLS), Tyler (WL7T), Jeremy Taylor, Ben Kuhn, Eric Thresher, Michael Cullen, Juuso (OH1JW), Anthony Castiglia, Fernando Ramirez-Ferrer, Robert Dixon, Mark Percival, Julia (KV1V), Timo Tomasini.
|
||||
Paul (M0TZO), Tim (G4VXE), Paul (N8HM), Michelle (W5NYV), Mitchell (AD0HJ), Dan (M0TCB), Martin (DK3ML), Juan Carlos (EA5WA), Iain (M0PCB), Charlie (GM1TGY), Ondrej (OK1CDJ), Trystan (G0KAY), Oliver (DL6KBG), Volkmar Schirmer, Jordan (M0PIR), Thomas Ziegler, Mathis (DB9MAT), Ken (VE3HLS), Tyler (WL7T), Jeremy Taylor, Ben Kuhn, Eric Thresher, Michael Cullen, Juuso (OH1JW), Anthony Castiglia, Fernando Ramirez-Ferrer, Robert Dixon, Mark Percival, Julia (KV1V), Timo Tomasini, Ant (NU1U), Christopher Williams, Danny Barnes, Vic.
|
||||
|
||||
If you'd like to donate to Cloudlog to help allow @magicbug spend less time doing commercial work and more time coding Cloudlog then you can donate via [PayPal](https://paypal.me/PGoodhall), [Github Sponsor](https://github.com/sponsors/magicbug) or become a [Patreon](https://www.patreon.com/2m0sql)
|
||||
|
||||
|
|
|
|||
|
|
@ -52,7 +52,7 @@ $autoload['packages'] = array(APPPATH.'third_party');
|
|||
| $autoload['libraries'] = array('database', 'session', 'xmlrpc');
|
||||
*/
|
||||
|
||||
$autoload['libraries'] = array('database', 'session', 'curl', 'OptionsLib');
|
||||
$autoload['libraries'] = array('database', 'session', 'curl', 'OptionsLib', 'Frequency');
|
||||
|
||||
|
||||
/*
|
||||
|
|
|
|||
|
|
@ -21,7 +21,7 @@ $config['migration_enabled'] = TRUE;
|
|||
| be upgraded / downgraded to.
|
||||
|
|
||||
*/
|
||||
$config['migration_version'] = 67;
|
||||
$config['migration_version'] = 70;
|
||||
|
||||
/*
|
||||
|--------------------------------------------------------------------------
|
||||
|
|
|
|||
|
|
@ -226,7 +226,7 @@ class adif extends CI_Controller {
|
|||
|
||||
|
||||
$custom_errors .= $this->logbook_model->import($record, $this->input->post('station_profile'),
|
||||
$this->input->post('skipDuplicate'), $this->input->post('markLotw'), $this->input->post('dxccAdif'), $this->input->post('markQrz'), true);
|
||||
$this->input->post('skipDuplicate'), $this->input->post('markLotw'), $this->input->post('dxccAdif'), $this->input->post('markQrz'), true, $this->input->post('operatorName'));
|
||||
|
||||
};
|
||||
|
||||
|
|
|
|||
|
|
@ -429,9 +429,9 @@ class API extends CI_Controller {
|
|||
|
||||
|
||||
if(isset($obj['station_profile_id'])) {
|
||||
$this->logbook_model->import($record, $obj['station_profile_id'], NULL, NULL, NULL, NULL, false);
|
||||
$this->logbook_model->import($record, $obj['station_profile_id'], NULL, NULL, NULL, NULL, false, false);
|
||||
} else {
|
||||
$this->logbook_model->import($record, 0, NULL, NULL, NULL, NULL, false);
|
||||
$this->logbook_model->import($record, 0, NULL, NULL, NULL, NULL, false, false);
|
||||
}
|
||||
|
||||
};
|
||||
|
|
|
|||
|
|
@ -492,4 +492,33 @@ class Awards extends CI_Controller {
|
|||
|
||||
$this->load->view('adif/data/exportall', $data);
|
||||
}
|
||||
|
||||
/*
|
||||
function was_map
|
||||
|
||||
This displays the WAS map and requires the $band_type
|
||||
*/
|
||||
public function was_map($band_type) {
|
||||
|
||||
$this->load->model('was');
|
||||
$data['worked_bands'] = $this->was->get_worked_bands();
|
||||
|
||||
$bands[] = $band_type;
|
||||
|
||||
$data['bands'] = $bands; // Used for displaying selected band(s) in the table in the view
|
||||
|
||||
$postdata['lotw'] = 1;
|
||||
$postdata['qsl'] = 1;
|
||||
$postdata['worked'] = 1;
|
||||
$postdata['confirmed'] = 1;
|
||||
$postdata['notworked'] = 1;
|
||||
$postdata['band'] = $band_type;
|
||||
|
||||
|
||||
$data['was_array'] = $this->was->get_was_array($bands, $postdata);
|
||||
|
||||
$data['page_title'] = "";
|
||||
|
||||
$this->load->view('awards/was/map', $data);
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -44,6 +44,12 @@ class Dashboard extends CI_Controller {
|
|||
$this->load->view('setup/check_list');
|
||||
$this->load->view('interface_assets/footer');
|
||||
} else {
|
||||
|
||||
//
|
||||
$this->load->model('cat');
|
||||
|
||||
$data['radio_status'] = $this->cat->recent_status();
|
||||
|
||||
// Store info
|
||||
$data['todays_qsos'] = $this->logbook_model->todays_qsos();
|
||||
$data['total_qsos'] = $this->logbook_model->total_qsos();
|
||||
|
|
|
|||
|
|
@ -551,6 +551,7 @@ class eqsl extends CI_Controller {
|
|||
|
||||
// Dump out a table with the results
|
||||
$data['eqsl_results_table'] = $table;
|
||||
log_message('debug', $result);
|
||||
}
|
||||
else
|
||||
{
|
||||
|
|
|
|||
|
|
@ -563,7 +563,7 @@ class Logbook extends CI_Controller {
|
|||
|
||||
if(!$this->user_model->authorize($this->config->item('auth_mode'))) { return; }
|
||||
|
||||
$this->db->select(''.$this->config->item('table_name').'.COL_CALL, '.$this->config->item('table_name').'.COL_BAND, '.$this->config->item('table_name').'.COL_TIME_ON, '.$this->config->item('table_name').'.COL_RST_RCVD, '.$this->config->item('table_name').'.COL_RST_SENT, '.$this->config->item('table_name').'.COL_MODE, '.$this->config->item('table_name').'.COL_SUBMODE, '.$this->config->item('table_name').'.COL_NAME, '.$this->config->item('table_name').'.COL_COUNTRY, '.$this->config->item('table_name').'.COL_PRIMARY_KEY, '.$this->config->item('table_name').'.COL_SAT_NAME, '.$this->config->item('table_name').'.COL_GRIDSQUARE, '.$this->config->item('table_name').'.COL_QSL_RCVD, '.$this->config->item('table_name').'.COL_EQSL_QSL_RCVD, '.$this->config->item('table_name').'.COL_EQSL_QSL_SENT, '.$this->config->item('table_name').'.COL_QSL_SENT, '.$this->config->item('table_name').'.COL_STX, '.$this->config->item('table_name').'.COL_STX_STRING, '.$this->config->item('table_name').'.COL_SRX, '.$this->config->item('table_name').'.COL_SRX_STRING, '.$this->config->item('table_name').'.COL_LOTW_QSL_SENT, '.$this->config->item('table_name').'.COL_LOTW_QSL_RCVD, '.$this->config->item('table_name').'.COL_VUCC_GRIDS, station_profile.*');
|
||||
//$this->db->select(''.$this->config->item('table_name').'.COL_CALL, '.$this->config->item('table_name').'.COL_BAND, '.$this->config->item('table_name').'.COL_TIME_ON, '.$this->config->item('table_name').'.COL_RST_RCVD, '.$this->config->item('table_name').'.COL_RST_SENT, '.$this->config->item('table_name').'.COL_MODE, '.$this->config->item('table_name').'.COL_SUBMODE, '.$this->config->item('table_name').'.COL_NAME, '.$this->config->item('table_name').'.COL_COUNTRY, '.$this->config->item('table_name').'.COL_PRIMARY_KEY, '.$this->config->item('table_name').'.COL_SAT_NAME, '.$this->config->item('table_name').'.COL_GRIDSQUARE, '.$this->config->item('table_name').'.COL_QSL_RCVD, '.$this->config->item('table_name').'.COL_EQSL_QSL_RCVD, '.$this->config->item('table_name').'.COL_EQSL_QSL_SENT, '.$this->config->item('table_name').'.COL_QSL_SENT, '.$this->config->item('table_name').'.COL_STX, '.$this->config->item('table_name').'.COL_STX_STRING, '.$this->config->item('table_name').'.COL_SRX, '.$this->config->item('table_name').'.COL_SRX_STRING, '.$this->config->item('table_name').'.COL_LOTW_QSL_SENT, '.$this->config->item('table_name').'.COL_LOTW_QSL_RCVD, '.$this->config->item('table_name').'.COL_VUCC_GRIDS, station_profile.*');
|
||||
|
||||
$this->db->from($this->config->item('table_name'));
|
||||
|
||||
|
|
|
|||
|
|
@ -498,7 +498,7 @@ class Lotw extends CI_Controller {
|
|||
$station_id = $this->logbook_model->find_correct_station_id($record['station_callsign'], $record['my_gridsquare']);
|
||||
|
||||
if ($station_id != NULL) {
|
||||
$result = $this->logbook_model->import($record, $station_id, NULL, TRUE, NULL, NULL, true); // Create the Entry
|
||||
$result = $this->logbook_model->import($record, $station_id, NULL, TRUE, NULL, NULL, true, false); // Create the Entry
|
||||
if ($result == "") {
|
||||
$lotw_status = 'QSO imported';
|
||||
} else {
|
||||
|
|
|
|||
|
|
@ -99,4 +99,50 @@ class Options extends CI_Controller {
|
|||
}
|
||||
}
|
||||
|
||||
// function used to display the /radio url
|
||||
function radio() {
|
||||
|
||||
$data['page_title'] = "Cloudlog Options";
|
||||
$data['sub_heading'] = "Radio Settings";
|
||||
|
||||
$this->load->view('interface_assets/header', $data);
|
||||
$this->load->view('options/radios');
|
||||
$this->load->view('interface_assets/footer');
|
||||
}
|
||||
|
||||
// Handles saving the radio options to the options system.
|
||||
function radio_save() {
|
||||
|
||||
// Get Language Options
|
||||
|
||||
$data['page_title'] = "Cloudlog Options";
|
||||
$data['sub_heading'] = "Radio Settings";
|
||||
|
||||
$this->load->helper(array('form', 'url'));
|
||||
|
||||
$this->load->library('form_validation');
|
||||
|
||||
$this->form_validation->set_rules('radioTimeout', 'radioTimeout', 'required');
|
||||
|
||||
if ($this->form_validation->run() == FALSE)
|
||||
{
|
||||
$this->load->view('interface_assets/header', $data);
|
||||
$this->load->view('options/radios');
|
||||
$this->load->view('interface_assets/footer');
|
||||
}
|
||||
else
|
||||
{
|
||||
// Update theme choice within the options system
|
||||
$radioTimeout_update = $this->optionslib->update('cat_timeout_interval', $this->input->post('radioTimeout'));
|
||||
|
||||
// If theme update is complete set a flashsession with a success note
|
||||
if($radioTimeout_update == TRUE) {
|
||||
$this->session->set_flashdata('success', 'Radio Timeout Warning changed to '.$this->input->post('radioTimeout').' seconds');
|
||||
}
|
||||
|
||||
// Redirect back to /appearance
|
||||
redirect('/options/radio');
|
||||
}
|
||||
}
|
||||
|
||||
}
|
||||
|
|
|
|||
|
|
@ -2,6 +2,15 @@
|
|||
|
||||
class User extends CI_Controller {
|
||||
|
||||
function __construct()
|
||||
{
|
||||
parent::__construct();
|
||||
|
||||
// Load language files
|
||||
$this->lang->load(array(
|
||||
'account',
|
||||
));
|
||||
}
|
||||
|
||||
public function index()
|
||||
{
|
||||
|
|
@ -57,6 +66,11 @@ class User extends CI_Controller {
|
|||
$data['user_stylesheet'] = $this->input->post('user_stylesheet');
|
||||
$data['user_sota_lookup'] = $this->input->post('user_sota_lookup');
|
||||
$data['user_show_notes'] = $this->input->post('user_show_notes');
|
||||
$data['user_column1'] = $this->input->post('user_column1');
|
||||
$data['user_column2'] = $this->input->post('user_column2');
|
||||
$data['user_column3'] = $this->input->post('user_column3');
|
||||
$data['user_column4'] = $this->input->post('user_column4');
|
||||
$data['user_column5'] = $this->input->post('user_column5');
|
||||
$this->load->view('user/add', $data);
|
||||
} else {
|
||||
$this->load->view('user/add', $data);
|
||||
|
|
@ -65,7 +79,25 @@ class User extends CI_Controller {
|
|||
}
|
||||
else
|
||||
{
|
||||
switch($this->user_model->add($this->input->post('user_name'), $this->input->post('user_password'), $this->input->post('user_email'), $this->input->post('user_type'), $this->input->post('user_firstname'), $this->input->post('user_lastname'), $this->input->post('user_callsign'), $this->input->post('user_locator'), $this->input->post('user_timezone'), $this->input->post('user_measurement_base'), $this->input->post('user_date_format'), $this->input->post('user_stylesheet'), $this->input->post('user_sota_lookup'), $this->input->post('user_show_notes'))) {
|
||||
switch($this->user_model->add($this->input->post('user_name'),
|
||||
$this->input->post('user_password'),
|
||||
$this->input->post('user_email'),
|
||||
$this->input->post('user_type'),
|
||||
$this->input->post('user_firstname'),
|
||||
$this->input->post('user_lastname'),
|
||||
$this->input->post('user_callsign'),
|
||||
$this->input->post('user_locator'),
|
||||
$this->input->post('user_timezone'),
|
||||
$this->input->post('user_measurement_base'),
|
||||
$this->input->post('user_date_format'),
|
||||
$this->input->post('user_stylesheet'),
|
||||
$this->input->post('user_sota_lookup'),
|
||||
$this->input->post('user_show_notes'),
|
||||
$this->input->post('user_column1'),
|
||||
$this->input->post('user_column2'),
|
||||
$this->input->post('user_column3'),
|
||||
$this->input->post('user_column4'),
|
||||
$this->input->post('user_column5'))) {
|
||||
// Check for errors
|
||||
case EUSERNAMEEXISTS:
|
||||
$data['username_error'] = 'Username <b>'.$this->input->post('user_name').'</b> already in use!';
|
||||
|
|
@ -97,6 +129,11 @@ class User extends CI_Controller {
|
|||
$data['user_stylesheet'] = $this->input->post('user_stylesheet');
|
||||
$data['user_sota_lookup'] = $this->input->post('user_sota_lookup');
|
||||
$data['user_show_notes'] = $this->input->post('user_show_notes');
|
||||
$data['user_column1'] = $this->input->post('user_column1');
|
||||
$data['user_column2'] = $this->input->post('user_column2');
|
||||
$data['user_column3'] = $this->input->post('user_column3');
|
||||
$data['user_column4'] = $this->input->post('user_column4');
|
||||
$data['user_column5'] = $this->input->post('user_column5');
|
||||
$this->load->view('user/add', $data);
|
||||
$this->load->view('interface_assets/footer');
|
||||
}
|
||||
|
|
@ -265,6 +302,36 @@ class User extends CI_Controller {
|
|||
$data['user_show_notes'] = $q->user_show_notes;
|
||||
}
|
||||
|
||||
if($this->input->post('user_column1')) {
|
||||
$data['user_column1'] = $this->input->post('user_column1', true);
|
||||
} else {
|
||||
$data['user_column1'] = $q->user_column1;
|
||||
}
|
||||
|
||||
if($this->input->post('user_column2')) {
|
||||
$data['user_column2'] = $this->input->post('user_column2', true);
|
||||
} else {
|
||||
$data['user_column2'] = $q->user_column2;
|
||||
}
|
||||
|
||||
if($this->input->post('user_column3')) {
|
||||
$data['user_column3'] = $this->input->post('user_column3', true);
|
||||
} else {
|
||||
$data['user_column3'] = $q->user_column3;
|
||||
}
|
||||
|
||||
if($this->input->post('user_column4')) {
|
||||
$data['user_column4'] = $this->input->post('user_column4', true);
|
||||
} else {
|
||||
$data['user_column4'] = $q->user_column4;
|
||||
}
|
||||
|
||||
if($this->input->post('user_column5')) {
|
||||
$data['user_column5'] = $this->input->post('user_column5', true);
|
||||
} else {
|
||||
$data['user_column5'] = $q->user_column5;
|
||||
}
|
||||
|
||||
$this->load->view('user/edit', $data);
|
||||
$this->load->view('interface_assets/footer');
|
||||
}
|
||||
|
|
@ -308,6 +375,12 @@ class User extends CI_Controller {
|
|||
$data['user_stylesheet'] = $this->input->post('user_stylesheet');
|
||||
$data['user_sota_lookup'] = $this->input->post('user_sota_lookup');
|
||||
$data['user_show_notes'] = $this->input->post('user_show_notes');
|
||||
$data['user_column1'] = $this->input->post('user_column1');
|
||||
$data['user_column2'] = $this->input->post('user_column2');
|
||||
$data['user_column3'] = $this->input->post('user_column3');
|
||||
$data['user_column4'] = $this->input->post('user_column4');
|
||||
$data['user_column4'] = $this->input->post('user_column4');
|
||||
$data['user_column5'] = $this->input->post('user_column5');
|
||||
$this->load->view('user/edit');
|
||||
$this->load->view('interface_assets/footer');
|
||||
}
|
||||
|
|
|
|||
|
|
@ -0,0 +1,10 @@
|
|||
<?php
|
||||
|
||||
defined('BASEPATH') OR exit('No direct script access allowed');
|
||||
|
||||
$lang['account_logbook_fields'] = 'Logbook fields';
|
||||
$lang['account_column1_text'] = 'Choose column 1';
|
||||
$lang['account_column2_text'] = 'Choose column 2';
|
||||
$lang['account_column3_text'] = 'Choose column 3';
|
||||
$lang['account_column4_text'] = 'Choose column 4';
|
||||
$lang['account_column5_text'] = 'Choose column 5 (only for logbook)';
|
||||
|
|
@ -92,6 +92,9 @@ $lang['gen_hamradio_iota_reference'] = 'IOTA Reference';
|
|||
$lang['gen_hamradio_sota_reference'] = 'SOTA Reference';
|
||||
$lang['gen_hamradio_wwff_reference'] = 'WWFF Reference';
|
||||
$lang['gen_hamradio_dok'] = 'DOK';
|
||||
$lang['gen_hamradio_state'] = 'State';
|
||||
$lang['gen_hamradio_iota'] = 'IOTA';
|
||||
$lang['gen_hamradio_gridsquare'] = 'Gridsquare';
|
||||
|
||||
$lang['gen_hamradio_sig'] = 'Sig';
|
||||
$lang['gen_hamradio_sig_info'] = 'Sig Info';
|
||||
|
|
|
|||
|
|
@ -0,0 +1,10 @@
|
|||
<?php
|
||||
|
||||
defined('BASEPATH') OR exit('No direct script access allowed');
|
||||
|
||||
$lang['account_logbook_fields'] = 'Lokin sarakkeiden sisältö';
|
||||
$lang['account_column1_text'] = 'Sarake 1';
|
||||
$lang['account_column2_text'] = 'Sarake 2';
|
||||
$lang['account_column3_text'] = 'Sarake 3';
|
||||
$lang['account_column4_text'] = 'Sarake 4';
|
||||
$lang['account_column5_text'] = 'Sarake 5 (vain lokikirjassa)';
|
||||
|
|
@ -92,6 +92,9 @@ $lang['gen_hamradio_iota_reference'] = 'IOTA ref.numero';
|
|||
$lang['gen_hamradio_sota_reference'] = 'SOTA ref.numero';
|
||||
$lang['gen_hamradio_wwff_reference'] = 'WWFF ref.nro';
|
||||
$lang['gen_hamradio_dok'] = 'DOK';
|
||||
$lang['gen_hamradio_state'] = 'osavaltio';
|
||||
$lang['gen_hamradio_iota'] = 'IOTA';
|
||||
$lang['gen_hamradio_gridsquare'] = 'Gridsquare';
|
||||
|
||||
$lang['gen_hamradio_sig'] = 'Sig';
|
||||
$lang['gen_hamradio_sig_info'] = 'Sig Info';
|
||||
|
|
|
|||
|
|
@ -154,5 +154,11 @@ class Frequency {
|
|||
}
|
||||
return $Band;
|
||||
}
|
||||
|
||||
// converts a frequency in Hz to MHz output
|
||||
function hz_to_mhz($frequency)
|
||||
{
|
||||
return number_format (($frequency / 1000 / 1000), 3) . " MHz";
|
||||
}
|
||||
}
|
||||
/* End of file Frequency.php */
|
||||
|
|
|
|||
|
|
@ -0,0 +1,25 @@
|
|||
<?php
|
||||
|
||||
defined('BASEPATH') OR exit('No direct script access allowed');
|
||||
|
||||
/*
|
||||
* This migration creates a table called options which will hold global options needed within cloudlog
|
||||
* removing the need for lots of configuration files.
|
||||
*/
|
||||
|
||||
class Migration_add_cat_timeout_to_options extends CI_Migration {
|
||||
|
||||
public function up()
|
||||
{
|
||||
$data = array(
|
||||
array('option_name' => "cat_timeout_interval", 'option_value' => "1800", 'autoload' => "yes"),
|
||||
);
|
||||
|
||||
$this->db->insert_batch('options', $data);
|
||||
}
|
||||
|
||||
public function down()
|
||||
{
|
||||
// No option to down
|
||||
}
|
||||
}
|
||||
|
|
@ -0,0 +1,46 @@
|
|||
<?php
|
||||
|
||||
defined('BASEPATH') OR exit('No direct script access allowed');
|
||||
|
||||
/*
|
||||
* This migration creates a table called options which will hold global options needed within cloudlog
|
||||
* removing the need for lots of configuration files.
|
||||
*/
|
||||
|
||||
class Migration_add_user_definable_columns extends CI_Migration {
|
||||
|
||||
public function up()
|
||||
{
|
||||
$fields = array(
|
||||
'user_column1 varchar(32) default "Mode"',
|
||||
);
|
||||
|
||||
$this->dbforge->add_column('users', $fields);
|
||||
|
||||
$fields = array(
|
||||
'user_column2 varchar(32) default "RSTS"',
|
||||
);
|
||||
|
||||
$this->dbforge->add_column('users', $fields);
|
||||
|
||||
$fields = array(
|
||||
'user_column3 varchar(32) default "RSTR"',
|
||||
);
|
||||
|
||||
$this->dbforge->add_column('users', $fields);
|
||||
|
||||
$fields = array(
|
||||
'user_column4 varchar(32) default "Band"',
|
||||
);
|
||||
|
||||
$this->dbforge->add_column('users', $fields);
|
||||
}
|
||||
|
||||
public function down()
|
||||
{
|
||||
$this->dbforge->drop_column('users', 'user_column1');
|
||||
$this->dbforge->drop_column('users', 'user_column2');
|
||||
$this->dbforge->drop_column('users', 'user_column3');
|
||||
$this->dbforge->drop_column('users', 'user_column4');
|
||||
}
|
||||
}
|
||||
|
|
@ -0,0 +1,25 @@
|
|||
<?php
|
||||
|
||||
defined('BASEPATH') OR exit('No direct script access allowed');
|
||||
|
||||
/*
|
||||
* This migration creates a table called options which will hold global options needed within cloudlog
|
||||
* removing the need for lots of configuration files.
|
||||
*/
|
||||
|
||||
class Migration_add_fifth_column extends CI_Migration {
|
||||
|
||||
public function up()
|
||||
{
|
||||
$fields = array(
|
||||
'user_column5 varchar(32) default "Country"',
|
||||
);
|
||||
|
||||
$this->dbforge->add_column('users', $fields);
|
||||
}
|
||||
|
||||
public function down()
|
||||
{
|
||||
$this->dbforge->drop_column('users', 'user_column5');
|
||||
}
|
||||
}
|
||||
|
|
@ -82,6 +82,13 @@
|
|||
return $query;
|
||||
}
|
||||
|
||||
function recent_status() {
|
||||
$this->db->where("timestamp > date_sub(now(), interval 15 minute)", NULL, FALSE);
|
||||
|
||||
$query = $this->db->get('cat');
|
||||
return $query;
|
||||
}
|
||||
|
||||
/* Return list of radios */
|
||||
function radios() {
|
||||
$this->db->select('id, radio');
|
||||
|
|
|
|||
|
|
@ -95,7 +95,7 @@ class DOK extends CI_Model {
|
|||
{
|
||||
$exceptions = $this->db->query('
|
||||
SELECT *
|
||||
FROM `dxccexceptions`
|
||||
FROM `dxcc_exceptions`
|
||||
WHERE `prefix` = \''.$callsign.'\'
|
||||
LIMIT 1
|
||||
');
|
||||
|
|
|
|||
|
|
@ -137,7 +137,7 @@ class DXCC extends CI_Model {
|
|||
{
|
||||
$exceptions = $this->db->query('
|
||||
SELECT *
|
||||
FROM `dxccexceptions`
|
||||
FROM `dxcc_exceptions`
|
||||
WHERE `prefix` = \''.$callsign.'\'
|
||||
LIMIT 1
|
||||
');
|
||||
|
|
|
|||
|
|
@ -346,12 +346,14 @@ class Logbook_model extends CI_Model {
|
|||
$this->db->where('station_id', $station_id);
|
||||
$this->db->where('COL_STATE', $state);
|
||||
$this->db->where_in('COL_DXCC', ['291', '6', '110']);
|
||||
if($band != 'All') {
|
||||
if($band != "SAT") {
|
||||
$this->db->where('COL_PROP_MODE !=', 'SAT');
|
||||
$this->db->where('COL_BAND', $band);
|
||||
} else {
|
||||
$this->db->where('COL_PROP_MODE', "SAT");
|
||||
}
|
||||
}
|
||||
|
||||
return $this->db->get($this->config->item('table_name'));
|
||||
}
|
||||
|
|
@ -788,7 +790,7 @@ class Logbook_model extends CI_Model {
|
|||
}
|
||||
|
||||
function get_qsos($num, $offset) {
|
||||
$this->db->select(''.$this->config->item('table_name').'.COL_CALL, '.$this->config->item('table_name').'.COL_BAND, '.$this->config->item('table_name').'.COL_TIME_ON, '.$this->config->item('table_name').'.COL_RST_RCVD, '.$this->config->item('table_name').'.COL_RST_SENT, '.$this->config->item('table_name').'.COL_MODE, '.$this->config->item('table_name').'.COL_SUBMODE, '.$this->config->item('table_name').'.COL_NAME, '.$this->config->item('table_name').'.COL_COUNTRY, '.$this->config->item('table_name').'.COL_PRIMARY_KEY, '.$this->config->item('table_name').'.COL_SAT_NAME, '.$this->config->item('table_name').'.COL_GRIDSQUARE, '.$this->config->item('table_name').'.COL_QSL_RCVD, '.$this->config->item('table_name').'.COL_EQSL_QSL_RCVD, '.$this->config->item('table_name').'.COL_EQSL_QSL_SENT, '.$this->config->item('table_name').'.COL_QSL_SENT, '.$this->config->item('table_name').'.COL_STX, '.$this->config->item('table_name').'.COL_STX_STRING, '.$this->config->item('table_name').'.COL_SRX, '.$this->config->item('table_name').'.COL_SRX_STRING, '.$this->config->item('table_name').'.COL_LOTW_QSL_SENT, '.$this->config->item('table_name').'.COL_LOTW_QSL_RCVD, '.$this->config->item('table_name').'.COL_VUCC_GRIDS, station_profile.*');
|
||||
//$this->db->select(''.$this->config->item('table_name').'.COL_CALL, '.$this->config->item('table_name').'.COL_BAND, '.$this->config->item('table_name').'.COL_TIME_ON, '.$this->config->item('table_name').'.COL_RST_RCVD, '.$this->config->item('table_name').'.COL_RST_SENT, '.$this->config->item('table_name').'.COL_MODE, '.$this->config->item('table_name').'.COL_SUBMODE, '.$this->config->item('table_name').'.COL_NAME, '.$this->config->item('table_name').'.COL_COUNTRY, '.$this->config->item('table_name').'.COL_PRIMARY_KEY, '.$this->config->item('table_name').'.COL_SAT_NAME, '.$this->config->item('table_name').'.COL_GRIDSQUARE, '.$this->config->item('table_name').'.COL_QSL_RCVD, '.$this->config->item('table_name').'.COL_EQSL_QSL_RCVD, '.$this->config->item('table_name').'.COL_EQSL_QSL_SENT, '.$this->config->item('table_name').'.COL_QSL_SENT, '.$this->config->item('table_name').'.COL_STX, '.$this->config->item('table_name').'.COL_STX_STRING, '.$this->config->item('table_name').'.COL_SRX, '.$this->config->item('table_name').'.COL_SRX_STRING, '.$this->config->item('table_name').'.COL_LOTW_QSL_SENT, '.$this->config->item('table_name').'.COL_LOTW_QSL_RCVD, '.$this->config->item('table_name').'.COL_VUCC_GRIDS, station_profile.*');
|
||||
$this->db->from($this->config->item('table_name'));
|
||||
|
||||
$this->db->join('station_profile', 'station_profile.station_id = '.$this->config->item('table_name').'.station_id');
|
||||
|
|
@ -863,7 +865,7 @@ class Logbook_model extends CI_Model {
|
|||
$CI->load->model('Stations');
|
||||
$station_id = $CI->Stations->find_active();
|
||||
|
||||
$this->db->select('COL_CALL, COL_BAND, COL_TIME_ON, COL_RST_RCVD, COL_RST_SENT, COL_MODE, COL_SUBMODE, COL_NAME, COL_COUNTRY, COL_PRIMARY_KEY, COL_SAT_NAME, COL_STX_STRING, COL_SRX_STRING');
|
||||
//$this->db->select('COL_CALL, COL_BAND, COL_TIME_ON, COL_RST_RCVD, COL_RST_SENT, COL_MODE, COL_SUBMODE, COL_NAME, COL_COUNTRY, COL_PRIMARY_KEY, COL_SAT_NAME, COL_STX_STRING, COL_SRX_STRING, COL_IOTA, COL_STATE, COL_GRIDSQUARE');
|
||||
$this->db->where("station_id", $station_id);
|
||||
$this->db->order_by("COL_TIME_ON", "desc");
|
||||
$this->db->limit($num);
|
||||
|
|
@ -1502,7 +1504,7 @@ class Logbook_model extends CI_Model {
|
|||
* $markQrz - used in ADIF import to mark QSOs as exported to QRZ Logbook when importing QSOs
|
||||
* $skipexport - used in ADIF import to skip the realtime upload to QRZ Logbook when importing QSOs from ADIF
|
||||
*/
|
||||
function import($record, $station_id = "0", $skipDuplicate = false, $markLotw = false, $dxccAdif = false, $markQrz = false, $skipexport = false) {
|
||||
function import($record, $station_id = "0", $skipDuplicate = false, $markLotw = false, $dxccAdif = false, $markQrz = false, $skipexport = false, $operatorName = false) {
|
||||
$CI =& get_instance();
|
||||
$CI->load->library('frequency');
|
||||
$my_error = "";
|
||||
|
|
@ -1805,6 +1807,12 @@ class Logbook_model extends CI_Model {
|
|||
}
|
||||
}
|
||||
|
||||
if ($operatorName != false) {
|
||||
$operatorName = $this->session->userdata('user_callsign');
|
||||
} else {
|
||||
$operatorName = (!empty($record['operator'])) ? $record['operator'] : '';
|
||||
}
|
||||
|
||||
// If user checked to mark QSOs as uploaded to QRZ Logbook, or else we try to find info in ADIF import.
|
||||
if ($markQrz != null) {
|
||||
$input_qrzcom_qso_upload_status = 'Y';
|
||||
|
|
@ -1918,7 +1926,7 @@ class Logbook_model extends CI_Model {
|
|||
'COL_NOTES_INTL' => (!empty($record['notes_intl'])) ? $record['notes_intl'] : '',
|
||||
'COL_NR_BURSTS' => (!empty($record['nr_bursts'])) ? $record['nr_bursts'] : null,
|
||||
'COL_NR_PINGS' => (!empty($record['nr_pings'])) ? $record['nr_pings'] : null,
|
||||
'COL_OPERATOR' => (!empty($record['operator'])) ? $record['operator'] : '',
|
||||
'COL_OPERATOR' => $operatorName,
|
||||
'COL_OWNER_CALLSIGN' => (!empty($record['owner_callsign'])) ? $record['owner_callsign'] : '',
|
||||
'COL_PFX' => (!empty($record['pfx'])) ? $record['pfx'] : '',
|
||||
'COL_PRECEDENCE' => (!empty($record['precedence'])) ? $record['precedence'] : '',
|
||||
|
|
|
|||
|
|
@ -96,7 +96,9 @@ class User_Model extends CI_Model {
|
|||
|
||||
// FUNCTION: bool add($username, $password, $email, $type)
|
||||
// Add a user
|
||||
function add($username, $password, $email, $type, $firstname, $lastname, $callsign, $locator, $timezone, $measurement, $user_date_format, $user_stylesheet, $user_sota_lookup, $user_show_notes) {
|
||||
function add($username, $password, $email, $type, $firstname, $lastname, $callsign, $locator, $timezone,
|
||||
$measurement, $user_date_format, $user_stylesheet, $user_sota_lookup, $user_show_notes,
|
||||
$user_column1, $user_column2, $user_column3, $user_column4, $user_column5) {
|
||||
// Check that the user isn't already used
|
||||
if(!$this->exists($username)) {
|
||||
$data = array(
|
||||
|
|
@ -114,6 +116,11 @@ class User_Model extends CI_Model {
|
|||
'user_stylesheet' => xss_clean($user_stylesheet),
|
||||
'user_sota_lookup' => xss_clean($user_sota_lookup),
|
||||
'user_show_notes' => xss_clean($user_show_notes),
|
||||
'user_column1' => xss_clean($user_column1),
|
||||
'user_column2' => xss_clean($user_column2),
|
||||
'user_column3' => xss_clean($user_column3),
|
||||
'user_column4' => xss_clean($user_column4),
|
||||
'user_column5' => xss_clean($user_column5),
|
||||
);
|
||||
|
||||
// Check the password is valid
|
||||
|
|
@ -157,6 +164,11 @@ class User_Model extends CI_Model {
|
|||
'user_stylesheet' => xss_clean($fields['user_stylesheet']),
|
||||
'user_sota_lookup' => xss_clean($fields['user_sota_lookup']),
|
||||
'user_show_notes' => xss_clean($fields['user_show_notes']),
|
||||
'user_column1' => xss_clean($fields['user_column1']),
|
||||
'user_column2' => xss_clean($fields['user_column2']),
|
||||
'user_column3' => xss_clean($fields['user_column3']),
|
||||
'user_column4' => xss_clean($fields['user_column4']),
|
||||
'user_column5' => xss_clean($fields['user_column5']),
|
||||
);
|
||||
|
||||
// Check to see if the user is allowed to change user levels
|
||||
|
|
@ -266,6 +278,11 @@ class User_Model extends CI_Model {
|
|||
'user_stylesheet' => $u->row()->user_stylesheet,
|
||||
'user_sota_lookup' => $u->row()->user_sota_lookup,
|
||||
'user_show_notes' => $u->row()->user_show_notes,
|
||||
'user_column1' => $u->row()->user_column1,
|
||||
'user_column2' => $u->row()->user_column2,
|
||||
'user_column3' => $u->row()->user_column3,
|
||||
'user_column4' => $u->row()->user_column4,
|
||||
'user_column5' => $u->row()->user_column5,
|
||||
);
|
||||
|
||||
$this->session->set_userdata($userdata);
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
<ADIF_VERS:5>3.1.0
|
||||
<PROGRAMID:<?php echo strlen($this->config->item('app_name')); ?>><?php echo $this->config->item('app_name')."\n"; ?>
|
||||
<PROGRAMVERSION:<?php echo strlen($this->config->item('app_version')); ?>>Version <?php echo $this->config->item('app_version')."\n"; ?>
|
||||
<PROGRAMID:<?php echo strlen($this->config->item('app_name')); ?>><?php echo $this->config->item('app_name')."\r\n"; ?>
|
||||
<PROGRAMVERSION:<?php echo strlen('Version ' . $this->config->item('app_version')); ?>>Version <?php echo $this->config->item('app_version')."\r\n"; ?>
|
||||
<EOH>
|
||||
|
||||
<?php
|
||||
|
|
|
|||
|
|
@ -3,8 +3,8 @@
|
|||
header('Content-Disposition: attachment; filename="'.$this->session->userdata('user_callsign').'-'.date('dmY-Hi').'.adi"')
|
||||
?>
|
||||
<ADIF_VERS:5>3.1.0
|
||||
<PROGRAMID:<?php echo strlen($this->config->item('app_name')); ?>><?php echo $this->config->item('app_name')."\n"; ?>
|
||||
<PROGRAMVERSION:<?php echo strlen($this->config->item('app_version')); ?>>Version <?php echo $this->config->item('app_version')."\n"; ?>
|
||||
<PROGRAMID:<?php echo strlen($this->config->item('app_name')); ?>><?php echo $this->config->item('app_name')."\r\n"; ?>
|
||||
<PROGRAMVERSION:<?php echo strlen('Version ' . $this->config->item('app_version')); ?>>Version <?php echo $this->config->item('app_version')."\r\n"; ?>
|
||||
<EOH>
|
||||
|
||||
<?php
|
||||
|
|
|
|||
|
|
@ -3,8 +3,8 @@
|
|||
header('Content-Disposition: attachment; filename="'.$this->session->userdata('user_callsign').'-'.date('dmY-Hi').'.adi"')
|
||||
?>
|
||||
<ADIF_VERS:5>3.1.0
|
||||
<PROGRAMID:<?php echo strlen($this->config->item('app_name')); ?>><?php echo $this->config->item('app_name')."\n"; ?>
|
||||
<PROGRAMVERSION:<?php echo strlen($this->config->item('app_version')); ?>>Version <?php echo $this->config->item('app_version')."\n"; ?>
|
||||
<PROGRAMID:<?php echo strlen($this->config->item('app_name')); ?>><?php echo $this->config->item('app_name')."\r\n"; ?>
|
||||
<PROGRAMVERSION:<?php echo strlen('Version ' . $this->config->item('app_version')); ?>>Version <?php echo $this->config->item('app_version')."\r\n"; ?>
|
||||
<EOH>
|
||||
|
||||
<?php
|
||||
|
|
|
|||
|
|
@ -82,6 +82,15 @@
|
|||
</div>
|
||||
</div>
|
||||
|
||||
<div class="form-group row">
|
||||
<div class="col-md-10">
|
||||
<div class="form-check-inline">
|
||||
<input class="form-check-input" type="checkbox" name="operatorName" value="1" id="operatorName">
|
||||
<label class="form-check-label" for="operatorName">Always use login-callsign as operator-name on import</label>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<button type="submit" class="btn-sm btn-primary mb-2" value="Upload">Upload</button>
|
||||
</form>
|
||||
</div>
|
||||
|
|
|
|||
|
|
@ -59,11 +59,13 @@
|
|||
<div class="col-md-10">
|
||||
<button id="button2id" type="reset" name="button2id" class="btn btn-warning">Reset</button>
|
||||
<button id="button1id" type="submit" name="button1id" class="btn btn-primary">Show</button>
|
||||
<button type="button" onclick="load_was_map();" class="btn btn-info"><i class="fas fa-globe-americas"></i> Show WAS Map</button>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
</fieldset>
|
||||
</form>
|
||||
|
||||
<?php
|
||||
if ($was_array) {
|
||||
$i = 1;
|
||||
|
|
|
|||
155
application/views/awards/was/map.php
普通文件
155
application/views/awards/was/map.php
普通文件
|
|
@ -0,0 +1,155 @@
|
|||
<!DOCTYPE html>
|
||||
<html>
|
||||
<head>
|
||||
<title>US Map Demo</title>
|
||||
|
||||
<style>
|
||||
#alert {
|
||||
font-family: Arial, Helvetica, sans-serif;
|
||||
font-size: 16px;
|
||||
background-color: #ddd;
|
||||
color: #333;
|
||||
padding: 5px;
|
||||
font-weight: bold;
|
||||
}
|
||||
</style>
|
||||
|
||||
<script src="<?php echo base_url(); ?>assets/js/raphael.js"></script>
|
||||
<script src="<?php echo base_url(); ?>assets/js/jquery-3.3.1.min.js"></script>
|
||||
<script src="<?php echo base_url(); ?>assets/js/color.jquery.js"></script>
|
||||
<script src="<?php echo base_url(); ?>assets/js/jquery.usmap.min.js"></script>
|
||||
|
||||
<script>
|
||||
$(document).ready(function() {
|
||||
$('#map').usmap({
|
||||
showLabels: true,
|
||||
'stateStyles': {
|
||||
fill: '#4ECDC4',
|
||||
"stroke-width": 1,
|
||||
'stroke' : '#036'
|
||||
},
|
||||
'stateHoverStyles': {
|
||||
fill: 'blue'
|
||||
},
|
||||
'stateSpecificStyles': {
|
||||
<?php foreach ($was_array as $was => $value) { ?>
|
||||
'<?php echo $was; ?>' :
|
||||
<?php
|
||||
foreach ($value as $key) {
|
||||
if($key != "") {
|
||||
if (strpos($key, '>W<') !== false) {
|
||||
echo "{fill: 'orange'},";
|
||||
break;
|
||||
}
|
||||
if (strpos($key, '>C<') !== false) {
|
||||
echo "{fill: '#32a852'},";
|
||||
break;
|
||||
}
|
||||
if (strpos($key, '-') !== false) {
|
||||
echo "{fill: '#DB4325'},";
|
||||
break;
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
?>
|
||||
},
|
||||
// Show tooltip when hovering over state
|
||||
mouseover: function(event, data) {
|
||||
let nameList = {
|
||||
"AL":"Alabama",
|
||||
"AK":"Alaska",
|
||||
"AZ":"Arizona",
|
||||
"AR":"Arkansas",
|
||||
"CA":"California",
|
||||
"CO":"Colorado",
|
||||
"CT":"Connecticut",
|
||||
"DE":"Delaware",
|
||||
"DC":"District Of Columbia",
|
||||
"FL":"Florida",
|
||||
"GA":"Georgia",
|
||||
"HI":"Hawaii",
|
||||
"ID":"Idaho",
|
||||
"IL":"Illinois",
|
||||
"IN":"Indiana",
|
||||
"IA":"Iowa",
|
||||
"KS":"Kansas",
|
||||
"KY":"Kentucky",
|
||||
"LA":"Louisiana",
|
||||
"ME":"Maine",
|
||||
"MD":"Maryland",
|
||||
"MA":"Massachusetts",
|
||||
"MI":"Michigan",
|
||||
"MN":"Minnesota",
|
||||
"MS":"Mississippi",
|
||||
"MO":"Missouri",
|
||||
"MT":"Montana",
|
||||
"NE":"Nebraska",
|
||||
"NV":"Nevada",
|
||||
"NH":"New Hampshire",
|
||||
"NJ":"New Jersey",
|
||||
"NM":"New Mexico",
|
||||
"NY":"New York",
|
||||
"NC":"North Carolina",
|
||||
"ND":"North Dakota",
|
||||
"OH":"Ohio",
|
||||
"OK":"Oklahoma",
|
||||
"OR":"Oregon",
|
||||
"PA":"Pennsylvania",
|
||||
"RI":"Rhode Island",
|
||||
"SC":"South Carolina",
|
||||
"SD":"South Dakota",
|
||||
"TN":"Tennessee",
|
||||
"TX":"Texas",
|
||||
"UT":"Utah",
|
||||
"VT":"Vermont",
|
||||
"VA":"Virginia",
|
||||
"WA":"Washington",
|
||||
"WV":"West Virginia",
|
||||
"WI":"Wisconsin",
|
||||
"WY":"Wyoming"
|
||||
}
|
||||
|
||||
$('#tooltip').text(nameList[data.name]).show();
|
||||
$('#map').mousemove(function(e){
|
||||
var mouseX = e.pageX - 350;
|
||||
var mouseY = e.pageY - 90;
|
||||
$('#tooltip').css({
|
||||
top:mouseY,
|
||||
left:mouseX,
|
||||
'position': 'absolute',
|
||||
'border':'1px solid black',
|
||||
'background': '#fff',
|
||||
'color': '#000',
|
||||
'font-size': '1.5 em',
|
||||
'padding': '5px',
|
||||
'opacity': '1',
|
||||
'border-radius': '2px'
|
||||
});
|
||||
});
|
||||
},
|
||||
// Hide tooltip when not hovering over state
|
||||
mouseout: function(event, data){
|
||||
$('#tooltip').hide();
|
||||
},
|
||||
|
||||
|
||||
'click' : function(event, data) {
|
||||
displayWasContacts(data.name,$('#band2').val());
|
||||
}
|
||||
});
|
||||
|
||||
});
|
||||
</script>
|
||||
</head>
|
||||
<body>
|
||||
<div id="map" style="width: 930px; height: 630px;"></div>
|
||||
<div id="tooltip2"></div>
|
||||
|
||||
<ul>
|
||||
<li>Red - Not Worked</li>
|
||||
<li>Orange - Worked but not confirmed</li>
|
||||
<li>Green - Confirmed</li>
|
||||
</ul>
|
||||
</body>
|
||||
</html>
|
||||
|
|
@ -40,10 +40,56 @@
|
|||
<th><?php echo $this->lang->line('general_word_time'); ?></th>
|
||||
<?php } ?>
|
||||
<th><?php echo $this->lang->line('gen_hamradio_call'); ?></th>
|
||||
<th><?php echo $this->lang->line('gen_hamradio_mode'); ?></th>
|
||||
<th class="d-none d-sm-table-cell"><?php echo $this->lang->line('gen_hamradio_rst_sent'); ?></th>
|
||||
<th class="d-none d-sm-table-cell"><?php echo $this->lang->line('gen_hamradio_rst_recv'); ?></th>
|
||||
<th><?php echo $this->lang->line('gen_hamradio_band'); ?></th>
|
||||
<?php
|
||||
echo '<th>';
|
||||
switch($this->session->userdata('user_column1')==""?'Mode':$this->session->userdata('user_column1')) {
|
||||
case 'Mode': echo $this->lang->line('gen_hamradio_mode'); break;
|
||||
case 'RSTS': echo $this->lang->line('gen_hamradio_rsts'); break;
|
||||
case 'RSTR': echo $this->lang->line('gen_hamradio_rstr'); break;
|
||||
case 'Country': echo $this->lang->line('general_word_country'); break;
|
||||
case 'IOTA': echo $this->lang->line('gen_hamradio_iota'); break;
|
||||
case 'State': echo $this->lang->line('gen_hamradio_state'); break;
|
||||
case 'Grid': echo $this->lang->line('gen_hamradio_gridsquare'); break;
|
||||
case 'Band': echo $this->lang->line('gen_hamradio_band'); break;
|
||||
}
|
||||
echo '</th>' .
|
||||
'<th>';
|
||||
switch($this->session->userdata('user_column2')==""?'RSTS':$this->session->userdata('user_column2')) {
|
||||
case 'Mode': echo $this->lang->line('gen_hamradio_mode'); break;
|
||||
case 'RSTS': echo $this->lang->line('gen_hamradio_rsts'); break;
|
||||
case 'RSTR': echo $this->lang->line('gen_hamradio_rstr'); break;
|
||||
case 'Country': echo $this->lang->line('general_word_country'); break;
|
||||
case 'IOTA': echo $this->lang->line('gen_hamradio_iota'); break;
|
||||
case 'State': echo $this->lang->line('gen_hamradio_state'); break;
|
||||
case 'Grid': echo $this->lang->line('gen_hamradio_gridsquare'); break;
|
||||
case 'Band': echo $this->lang->line('gen_hamradio_band'); break;
|
||||
}
|
||||
echo '</th>' .
|
||||
'<th>';
|
||||
switch($this->session->userdata('user_column3')==""?'RSTR':$this->session->userdata('user_column3')) {
|
||||
case 'Mode': echo $this->lang->line('gen_hamradio_mode'); break;
|
||||
case 'RSTS': echo $this->lang->line('gen_hamradio_rsts'); break;
|
||||
case 'RSTR': echo $this->lang->line('gen_hamradio_rstr'); break;
|
||||
case 'Country': echo $this->lang->line('general_word_country'); break;
|
||||
case 'IOTA': echo $this->lang->line('gen_hamradio_iota'); break;
|
||||
case 'State': echo $this->lang->line('gen_hamradio_state'); break;
|
||||
case 'Grid': echo $this->lang->line('gen_hamradio_gridsquare'); break;
|
||||
case 'Band': echo $this->lang->line('gen_hamradio_band'); break;
|
||||
}
|
||||
echo '</th>' .
|
||||
'<th>';
|
||||
switch($this->session->userdata('user_column4')==""?'Band':$this->session->userdata('user_column4')) {
|
||||
case 'Mode': echo $this->lang->line('gen_hamradio_mode'); break;
|
||||
case 'RSTS': echo $this->lang->line('gen_hamradio_rsts'); break;
|
||||
case 'RSTR': echo $this->lang->line('gen_hamradio_rstr'); break;
|
||||
case 'Country': echo $this->lang->line('general_word_country'); break;
|
||||
case 'IOTA': echo $this->lang->line('gen_hamradio_iota'); break;
|
||||
case 'State': echo $this->lang->line('gen_hamradio_state'); break;
|
||||
case 'Grid': echo $this->lang->line('gen_hamradio_gridsquare'); break;
|
||||
case 'Band': echo $this->lang->line('gen_hamradio_band'); break;
|
||||
}
|
||||
echo '</th>';
|
||||
?>
|
||||
</tr>
|
||||
</thead>
|
||||
|
||||
|
|
@ -68,19 +114,60 @@
|
|||
<td><?php $timestamp = strtotime($row->COL_TIME_ON); echo date($custom_date_format, $timestamp); ?></td>
|
||||
<?php if(($this->config->item('use_auth') && ($this->session->userdata('user_type') >= 2)) || $this->config->item('use_auth') === FALSE || ($this->config->item('show_time'))) { ?>
|
||||
<td><?php $timestamp = strtotime($row->COL_TIME_ON); echo date('H:i', $timestamp); ?></td>
|
||||
<?php } else { ?>
|
||||
|
||||
<?php } ?>
|
||||
<td>
|
||||
<a id="edit_qso" href="javascript:displayQso(<?php echo $row->COL_PRIMARY_KEY; ?>)"><?php echo str_replace("0","Ø",strtoupper($row->COL_CALL)); ?></a>
|
||||
</td>
|
||||
<td><?php echo $row->COL_SUBMODE==null?$row->COL_MODE:$row->COL_SUBMODE; ?></td>
|
||||
<td class="d-none d-sm-table-cell"><?php echo $row->COL_RST_SENT; ?> <?php if ($row->COL_STX_STRING) { ?><span class="label"><?php echo $row->COL_STX_STRING;?></span><?php } ?></td>
|
||||
<td class="d-none d-sm-table-cell"><?php echo $row->COL_RST_RCVD; ?> <?php if ($row->COL_SRX_STRING) { ?><span class="label"><?php echo $row->COL_SRX_STRING;?></span><?php } ?></td>
|
||||
<?php if($row->COL_SAT_NAME != null) { ?>
|
||||
<td><?php echo $row->COL_SAT_NAME; ?></td>
|
||||
<?php } else { ?>
|
||||
<td><?php echo strtolower($row->COL_BAND); ?></td>
|
||||
<?php } ?>
|
||||
<?php
|
||||
switch($this->session->userdata('user_column1')==""?'Mode':$this->session->userdata('user_column1')) {
|
||||
case 'Mode': echo '<td>'; echo $row->COL_SUBMODE==null?$row->COL_MODE:$row->COL_SUBMODE; break;
|
||||
case 'RSTS': echo '<td class="d-none d-sm-table-cell">' . $row->COL_RST_SENT; if ($row->COL_STX_STRING) { echo '<span class="label">' . $row->COL_STX_STRING . '</span>';}; break;
|
||||
case 'RSTR': echo '<td class="d-none d-sm-table-cell">' . $row->COL_RST_RCVD; if ($row->COL_SRX_STRING) { echo '<span class="label">' . $row->COL_SRX_STRING . '</span>';}; break;
|
||||
case 'Country': echo '<td>' . ucwords(strtolower(($row->COL_COUNTRY)));; break;
|
||||
case 'IOTA': echo '<td>' . ($row->COL_IOTA); break;
|
||||
case 'Grid': echo '<td>'; echo strlen($row->COL_GRIDSQUARE)==0?$row->COL_VUCC_GRIDS:$row->COL_GRIDSQUARE; break;
|
||||
case 'Band': echo '<td>'; if($row->COL_SAT_NAME != null) { echo $row->COL_SAT_NAME; } else { echo strtolower($row->COL_BAND); }; break;
|
||||
case 'State': echo '<td>' . ($row->COL_STATE); break;
|
||||
}
|
||||
echo '</td>';
|
||||
|
||||
switch($this->session->userdata('user_column2')==""?'RSTS':$this->session->userdata('user_column2')) {
|
||||
case 'Mode': echo '<td>'; echo $row->COL_SUBMODE==null?$row->COL_MODE:$row->COL_SUBMODE; break;
|
||||
case 'RSTS': echo '<td class="d-none d-sm-table-cell">' . $row->COL_RST_SENT; if ($row->COL_STX_STRING) { echo '<span class="label">' . $row->COL_STX_STRING . '</span>';}; break;
|
||||
case 'RSTR': echo '<td class="d-none d-sm-table-cell">' . $row->COL_RST_RCVD; if ($row->COL_SRX_STRING) { echo '<span class="label">' . $row->COL_SRX_STRING . '</span>';}; break;
|
||||
case 'Country': echo '<td>' . ucwords(strtolower(($row->COL_COUNTRY)));; break;
|
||||
case 'IOTA': echo '<td>' . ($row->COL_IOTA); break;
|
||||
case 'Grid': echo '<td>'; echo strlen($row->COL_GRIDSQUARE)==0?$row->COL_VUCC_GRIDS:$row->COL_GRIDSQUARE; break;
|
||||
case 'Band': echo '<td>'; if($row->COL_SAT_NAME != null) { echo $row->COL_SAT_NAME; } else { echo strtolower($row->COL_BAND); }; break;
|
||||
case 'State': echo '<td>' . ($row->COL_STATE); break;
|
||||
}
|
||||
echo '</td>';
|
||||
|
||||
switch($this->session->userdata('user_column3')==""?'RSTR':$this->session->userdata('user_column3')) {
|
||||
case 'Mode': echo '<td>'; echo $row->COL_SUBMODE==null?$row->COL_MODE:$row->COL_SUBMODE; break;
|
||||
case 'RSTS': echo '<td class="d-none d-sm-table-cell">' . $row->COL_RST_SENT; if ($row->COL_STX_STRING) { echo '<span class="label">' . $row->COL_STX_STRING . '</span>';}; break;
|
||||
case 'RSTR': echo '<td class="d-none d-sm-table-cell">' . $row->COL_RST_RCVD; if ($row->COL_SRX_STRING) { echo '<span class="label">' . $row->COL_SRX_STRING . '</span>';}; break;
|
||||
case 'Country': echo '<td>' . ucwords(strtolower(($row->COL_COUNTRY)));; break;
|
||||
case 'IOTA': echo '<td>' . ($row->COL_IOTA); break;
|
||||
case 'Grid': echo '<td>'; echo strlen($row->COL_GRIDSQUARE)==0?$row->COL_VUCC_GRIDS:$row->COL_GRIDSQUARE; break;
|
||||
case 'Band': echo '<td>'; if($row->COL_SAT_NAME != null) { echo $row->COL_SAT_NAME; } else { echo strtolower($row->COL_BAND); }; break;
|
||||
case 'State': echo '<td>' . ($row->COL_STATE); break;
|
||||
}
|
||||
echo '</td>';
|
||||
|
||||
switch($this->session->userdata('user_column4')==""?'Band':$this->session->userdata('user_column4')) {
|
||||
case 'Mode': echo '<td>'; echo $row->COL_SUBMODE==null?$row->COL_MODE:$row->COL_SUBMODE; break;
|
||||
case 'RSTS': echo '<td class="d-none d-sm-table-cell">' . $row->COL_RST_SENT; if ($row->COL_STX_STRING) { echo '<span class="label">' . $row->COL_STX_STRING . '</span>';}; break;
|
||||
case 'RSTR': echo '<td class="d-none d-sm-table-cell">' . $row->COL_RST_RCVD; if ($row->COL_SRX_STRING) { echo '<span class="label">' . $row->COL_SRX_STRING . '</span>';}; break;
|
||||
case 'Country': echo '<td>' . ucwords(strtolower(($row->COL_COUNTRY)));; break;
|
||||
case 'IOTA': echo '<td>' . ($row->COL_IOTA); break;
|
||||
case 'Grid': echo '<td>'; echo strlen($row->COL_GRIDSQUARE)==0?$row->COL_VUCC_GRIDS:$row->COL_GRIDSQUARE; break;
|
||||
case 'Band': echo '<td>'; if($row->COL_SAT_NAME != null) { echo $row->COL_SAT_NAME; } else { echo strtolower($row->COL_BAND); }; break;
|
||||
case 'State': echo '<td>' . ($row->COL_STATE); break;
|
||||
}
|
||||
echo '</td>';
|
||||
?>
|
||||
</tr>
|
||||
<?php $i++; } ?>
|
||||
</table>
|
||||
|
|
@ -89,6 +176,31 @@
|
|||
|
||||
<div class="col-sm-4">
|
||||
<div class="table-responsive">
|
||||
|
||||
<?php if($radio_status->num_rows()) { ?>
|
||||
|
||||
<table class="table table-striped">
|
||||
<tr class="titles">
|
||||
<td colspan="2"><i class="fas fa-broadcast-tower"></i> Radio Status</td>
|
||||
</tr>
|
||||
|
||||
<?php foreach ($radio_status->result_array() as $row) { ?>
|
||||
<tr>
|
||||
<td><?php echo $row['radio']; ?></td>
|
||||
<td>
|
||||
<?php if($row['radio'] == "SatPC32") { ?>
|
||||
<?php echo $row['sat_name']; ?>
|
||||
<?php } else { ?>
|
||||
<?php echo $this->frequency->hz_to_mhz($row['frequency']); ?> (<?php echo $row['mode']; ?>)
|
||||
<?php } ?>
|
||||
</td>
|
||||
</tr>
|
||||
<?php } ?>
|
||||
|
||||
</table>
|
||||
|
||||
<?php } ?>
|
||||
|
||||
<table class="table table-striped">
|
||||
<tr class="titles">
|
||||
<td colspan="2"><i class="fas fa-chart-bar"></i> <?php echo $this->lang->line('dashboard_qso_breakdown'); ?></td>
|
||||
|
|
|
|||
|
|
@ -18,6 +18,19 @@
|
|||
var icon_dot_url = "<?php echo base_url();?>assets/images/dot.png";
|
||||
</script>
|
||||
|
||||
|
||||
<script>
|
||||
|
||||
function load_was_map() {
|
||||
BootstrapDialog.show({
|
||||
title: 'Worked All States Map ('+$('#band2').val()+')',
|
||||
cssClass: 'was-map-dialog',
|
||||
message: $('<div></div>').load(site_url + '/awards/was_map/' + $('#band2').val())
|
||||
});
|
||||
}
|
||||
|
||||
</script>
|
||||
|
||||
<?php if ($this->uri->segment(1) == "adif") { ?>
|
||||
<!-- Javascript used for ADIF Import and Export Areas -->
|
||||
<script type="text/javascript" src="<?php echo base_url(); ?>assets/js/moment.min.js"></script>
|
||||
|
|
|
|||
|
|
@ -0,0 +1,52 @@
|
|||
<div class="container settings">
|
||||
|
||||
<div class="row">
|
||||
<!-- Nav Start -->
|
||||
<?php $this->load->view('options/sidebar') ?>
|
||||
<!-- Nav End -->
|
||||
|
||||
<!-- Content -->
|
||||
<div class="col-md-9">
|
||||
<div class="card">
|
||||
<div class="card-header"><h2><?php echo $page_title; ?> - <?php echo $sub_heading; ?></h2></div>
|
||||
|
||||
<div class="card-body">
|
||||
<?php if($this->session->flashdata('success')) { ?>
|
||||
<!-- Display Success Message -->
|
||||
<div class="alert alert-success">
|
||||
<?php echo $this->session->flashdata('success'); ?>
|
||||
</div>
|
||||
<?php } ?>
|
||||
|
||||
<?php if($this->session->flashdata('message')) { ?>
|
||||
<!-- Display Message -->
|
||||
<div class="alert-message error">
|
||||
<?php echo $this->session->flashdata('message'); ?>
|
||||
</div>
|
||||
<?php } ?>
|
||||
|
||||
<?php if(validation_errors()) { ?>
|
||||
<div class="alert alert-danger">
|
||||
<a class="close" data-dismiss="alert">x</a>
|
||||
<?php echo validation_errors(); ?>
|
||||
</div>
|
||||
<?php } ?>
|
||||
|
||||
<?php echo form_open('options/radio_save'); ?>
|
||||
|
||||
<div class="form-group">
|
||||
<label for="globalSearch">Radio Timeout Warning</label>
|
||||
<p>The Radio Timeout Warning is used on the QSO entry panel to alert you to radio interface disconnects.</p>
|
||||
<input type="text" name="radioTimeout" class="form-control" id="radioTimeout" aria-describedby="radioTimeoutHelp" value="<?php echo $this->optionslib->get_option('cat_timeout_interval'); ?>">
|
||||
<small id="radioTimeoutHelp" class="form-text text-muted">This number is in seconds.</small>
|
||||
</div>
|
||||
|
||||
<!-- Save the Form -->
|
||||
<input class="btn btn-primary" type="submit" value="Save" />
|
||||
</form>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
</div>
|
||||
|
|
@ -2,6 +2,7 @@
|
|||
<div class="card">
|
||||
<ul class="list-group list-group-flush">
|
||||
<li class="list-group-item"><a class="nav-link" href="<?php echo site_url('options/appearance'); ?>">Appearance</a></li>
|
||||
<li class="list-group-item"><a class="nav-link" href="<?php echo site_url('options/radio'); ?>">Radios</a></li>
|
||||
</ul>
|
||||
</div>
|
||||
</div>
|
||||
|
|
@ -344,7 +344,7 @@
|
|||
<option value="MS" <?php if($qso->COL_STATE == "MS") { echo "selected=\"selected\""; } ?>>Mississippi (MS)</option>
|
||||
<option value="MO" <?php if($qso->COL_STATE == "MO") { echo "selected=\"selected\""; } ?>>Missouri (MO)</option>
|
||||
<option value="MT" <?php if($qso->COL_STATE == "MT") { echo "selected=\"selected\""; } ?>>Montana (MT)</option>
|
||||
<option value="NE" <?php if($qso->COL_STATE == "ME") { echo "selected=\"selected\""; } ?>>Nebraska (NE)</option>
|
||||
<option value="NE" <?php if($qso->COL_STATE == "NE") { echo "selected=\"selected\""; } ?>>Nebraska (NE)</option>
|
||||
<option value="NV" <?php if($qso->COL_STATE == "NV") { echo "selected=\"selected\""; } ?>>Nevada (NV)</option>
|
||||
<option value="NH" <?php if($qso->COL_STATE == "NH") { echo "selected=\"selected\""; } ?>>New Hampshire (NH)</option>
|
||||
<option value="NJ" <?php if($qso->COL_STATE == "NJ") { echo "selected=\"selected\""; } ?>>New Jersey (NJ)</option>
|
||||
|
|
|
|||
|
|
@ -136,6 +136,77 @@
|
|||
<option value="1"><?php echo $this->lang->line('general_word_yes'); ?></option>
|
||||
</select>
|
||||
</div>
|
||||
<div class="form-row">
|
||||
<div class="form-group col-md-3">
|
||||
<label for="column1"><?php echo $this->lang->line('account_column1_text'); ?></label>
|
||||
<select class="custom-select" id="column1" name="user_column1">
|
||||
<option value="Band"> <?php echo $this->lang->line('gen_hamradio_band'); ?></option>
|
||||
<option value="Mode" selected ='selected'> <?php echo $this->lang->line('gen_hamradio_mode'); ?></option>
|
||||
<option value="RSTS"><?php echo $this->lang->line('gen_hamradio_rsts'); ?></option>
|
||||
<option value="RSTR"><?php echo $this->lang->line('gen_hamradio_rstr'); ?></option>
|
||||
<option value="Country"><?php echo $this->lang->line('general_word_country'); ?></option>
|
||||
<option value="IOTA"><?php echo $this->lang->line('gen_hamradio_iota'); ?></option>
|
||||
<option value="State"><?php echo $this->lang->line('gen_hamradio_state'); ?></option>
|
||||
<option value="Grid"><?php echo $this->lang->line('gen_hamradio_gridsquare'); ?></option>
|
||||
</select>
|
||||
</div>
|
||||
|
||||
<div class="form-group col-md-3">
|
||||
<label for="column2"><?php echo $this->lang->line('account_column2_text'); ?></label>
|
||||
<select class="custom-select" id="column2" name="user_column2">
|
||||
<option value="Band"> <?php echo $this->lang->line('gen_hamradio_band'); ?></option>
|
||||
<option value="Mode"> <?php echo $this->lang->line('gen_hamradio_mode'); ?></option>
|
||||
<option value="RSTS" selected ='selected'><?php echo $this->lang->line('gen_hamradio_rsts'); ?></option>
|
||||
<option value="RSTR"><?php echo $this->lang->line('gen_hamradio_rstr'); ?></option>
|
||||
<option value="Country"><?php echo $this->lang->line('general_word_country'); ?></option>
|
||||
<option value="IOTA"><?php echo $this->lang->line('gen_hamradio_iota'); ?></option>
|
||||
<option value="State"><?php echo $this->lang->line('gen_hamradio_state'); ?></option>
|
||||
<option value="Grid"><?php echo $this->lang->line('gen_hamradio_gridsquare'); ?></option>
|
||||
</select>
|
||||
</div>
|
||||
|
||||
<div class="form-group col-md-3">
|
||||
<label for="column3"><?php echo $this->lang->line('account_column3_text'); ?></label>
|
||||
<select class="custom-select" id="column3" name="user_column3">
|
||||
<option value="Band"> <?php echo $this->lang->line('gen_hamradio_band'); ?></option>
|
||||
<option value="Mode"> <?php echo $this->lang->line('gen_hamradio_mode'); ?></option>
|
||||
<option value="RSTS"><?php echo $this->lang->line('gen_hamradio_rsts'); ?></option>
|
||||
<option value="RSTR" selected ='selected'><?php echo $this->lang->line('gen_hamradio_rstr'); ?></option>
|
||||
<option value="Country"><?php echo $this->lang->line('general_word_country'); ?></option>
|
||||
<option value="IOTA"><?php echo $this->lang->line('gen_hamradio_iota'); ?></option>
|
||||
<option value="State"><?php echo $this->lang->line('gen_hamradio_state'); ?></option>
|
||||
<option value="Grid"><?php echo $this->lang->line('gen_hamradio_gridsquare'); ?></option>
|
||||
</select>
|
||||
</div>
|
||||
|
||||
<div class="form-group col-md-3">
|
||||
<label for="column4"><?php echo $this->lang->line('account_column4_text'); ?></label>
|
||||
<select class="custom-select" id="column4" name="user_column4">
|
||||
<option value="Band" selected ='selected'> <?php echo $this->lang->line('gen_hamradio_band'); ?></option>
|
||||
<option value="Mode"> <?php echo $this->lang->line('gen_hamradio_mode'); ?></option>
|
||||
<option value="RSTS"><?php echo $this->lang->line('gen_hamradio_rsts'); ?></option>
|
||||
<option value="RSTR"><?php echo $this->lang->line('gen_hamradio_rstr'); ?></option>
|
||||
<option value="Country"><?php echo $this->lang->line('general_word_country'); ?></option>
|
||||
<option value="IOTA"><?php echo $this->lang->line('gen_hamradio_iota'); ?></option>
|
||||
<option value="State"><?php echo $this->lang->line('gen_hamradio_state'); ?></option>
|
||||
<option value="Grid"><?php echo $this->lang->line('gen_hamradio_gridsquare'); ?></option>
|
||||
</select>
|
||||
</div>
|
||||
|
||||
<div class="form-group col-md-3">
|
||||
<label for="column5"><?php echo $this->lang->line('account_column5_text'); ?></label>
|
||||
<select class="custom-select" id="column5" name="user_column5">
|
||||
<option value="Band"> <?php echo $this->lang->line('gen_hamradio_band'); ?></option>
|
||||
<option value="Mode"> <?php echo $this->lang->line('gen_hamradio_mode'); ?></option>
|
||||
<option value="RSTS"><?php echo $this->lang->line('gen_hamradio_rsts'); ?></option>
|
||||
<option value="RSTR"><?php echo $this->lang->line('gen_hamradio_rstr'); ?></option>
|
||||
<option value="Country" selected ='selected'><?php echo $this->lang->line('general_word_country'); ?></option>
|
||||
<option value="IOTA"><?php echo $this->lang->line('gen_hamradio_iota'); ?></option>
|
||||
<option value="State"><?php echo $this->lang->line('gen_hamradio_state'); ?></option>
|
||||
<option value="Grid"><?php echo $this->lang->line('gen_hamradio_gridsquare'); ?></option>
|
||||
</select>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<input type="hidden" name="id" value="<?php echo $this->uri->segment(3); ?>" />
|
||||
<button type="submit" class="btn btn-primary">Create Account</button>
|
||||
|
|
|
|||
|
|
@ -314,6 +314,89 @@
|
|||
</div>
|
||||
|
||||
</div>
|
||||
<br>
|
||||
<div class="row">
|
||||
<div class="col-md">
|
||||
<div class="card">
|
||||
<div class="card-header">
|
||||
<?php echo $this->lang->line('account_logbook_fields'); ?>
|
||||
</div>
|
||||
<div class="card-body">
|
||||
<div class="form-row">
|
||||
<div class="form-group col-md-3">
|
||||
<label for="column1"><?php echo $this->lang->line('account_column1_text'); ?></label>
|
||||
<select class="custom-select" id="column1" name="user_column1">
|
||||
<option value="Band" <?php if ($user_column1 == "Band") { echo " selected =\"selected\""; } ?>><?php echo $this->lang->line('gen_hamradio_band'); ?></option>
|
||||
<option value="Mode" <?php if ($user_column1 == "Mode") { echo " selected =\"selected\""; } ?>><?php echo $this->lang->line('gen_hamradio_mode'); ?></option>
|
||||
<option value="RSTS" <?php if ($user_column1 == "RSTS") { echo " selected =\"selected\""; } ?>><?php echo $this->lang->line('gen_hamradio_rsts'); ?></option>
|
||||
<option value="RSTR" <?php if ($user_column1 == "RSTR") { echo " selected =\"selected\""; } ?>><?php echo $this->lang->line('gen_hamradio_rstr'); ?></option>
|
||||
<option value="Country" <?php if ($user_column1 == "Country") { echo " selected =\"selected\""; } ?>><?php echo $this->lang->line('general_word_country'); ?></option>
|
||||
<option value="IOTA" <?php if ($user_column1 == "IOTA") { echo " selected =\"selected\""; } ?>><?php echo $this->lang->line('gen_hamradio_iota'); ?></option>
|
||||
<option value="State" <?php if ($user_column1 == "State") { echo " selected =\"selected\""; } ?>><?php echo $this->lang->line('gen_hamradio_state'); ?></option>
|
||||
<option value="Grid" <?php if ($user_column1 == "Grid") { echo " selected =\"selected\""; } ?>><?php echo $this->lang->line('gen_hamradio_gridsquare'); ?></option>
|
||||
</select>
|
||||
</div>
|
||||
|
||||
<div class="form-group col-md-3">
|
||||
<label for="column2"><?php echo $this->lang->line('account_column2_text'); ?></label>
|
||||
<select class="custom-select" id="column2" name="user_column2">
|
||||
<option value="Band" <?php if ($user_column2 == "Band") { echo " selected =\"selected\""; } ?>><?php echo $this->lang->line('gen_hamradio_band'); ?></option>
|
||||
<option value="Mode" <?php if ($user_column2 == "Mode") { echo " selected =\"selected\""; } ?>><?php echo $this->lang->line('gen_hamradio_mode'); ?></option>
|
||||
<option value="RSTS" <?php if ($user_column2 == "RSTS") { echo " selected =\"selected\""; } ?>><?php echo $this->lang->line('gen_hamradio_rsts'); ?></option>
|
||||
<option value="RSTR" <?php if ($user_column2 == "RSTR") { echo " selected =\"selected\""; } ?>><?php echo $this->lang->line('gen_hamradio_rstr'); ?></option>
|
||||
<option value="Country" <?php if ($user_column2 == "Country") { echo " selected =\"selected\""; } ?>><?php echo $this->lang->line('general_word_country'); ?></option>
|
||||
<option value="IOTA" <?php if ($user_column2 == "IOTA") { echo " selected =\"selected\""; } ?>><?php echo $this->lang->line('gen_hamradio_iota'); ?></option>
|
||||
<option value="State" <?php if ($user_column2 == "State") { echo " selected =\"selected\""; } ?>><?php echo $this->lang->line('gen_hamradio_state'); ?></option>
|
||||
<option value="Grid" <?php if ($user_column2 == "Grid") { echo " selected =\"selected\""; } ?>><?php echo $this->lang->line('gen_hamradio_gridsquare'); ?></option>
|
||||
</select>
|
||||
</div>
|
||||
|
||||
<div class="form-group col-md-3">
|
||||
<label for="column3"><?php echo $this->lang->line('account_column3_text'); ?></label>
|
||||
<select class="custom-select" id="column3" name="user_column3">
|
||||
<option value="Band" <?php if ($user_column3 == "Band") { echo " selected =\"selected\""; } ?>><?php echo $this->lang->line('gen_hamradio_band'); ?></option>
|
||||
<option value="Mode" <?php if ($user_column3 == "Mode") { echo " selected =\"selected\""; } ?>><?php echo $this->lang->line('gen_hamradio_mode'); ?></option>
|
||||
<option value="RSTS" <?php if ($user_column3 == "RSTS") { echo " selected =\"selected\""; } ?>><?php echo $this->lang->line('gen_hamradio_rsts'); ?></option>
|
||||
<option value="RSTR" <?php if ($user_column3 == "RSTR") { echo " selected =\"selected\""; } ?>><?php echo $this->lang->line('gen_hamradio_rstr'); ?></option>
|
||||
<option value="Country" <?php if ($user_column3 == "Country") { echo " selected =\"selected\""; } ?>><?php echo $this->lang->line('general_word_country'); ?></option>
|
||||
<option value="IOTA" <?php if ($user_column3 == "IOTA") { echo " selected =\"selected\""; } ?>><?php echo $this->lang->line('gen_hamradio_iota'); ?></option>
|
||||
<option value="State" <?php if ($user_column3 == "State") { echo " selected =\"selected\""; } ?>><?php echo $this->lang->line('gen_hamradio_state'); ?></option>
|
||||
<option value="Grid" <?php if ($user_column3 == "Grid") { echo " selected =\"selected\""; } ?>><?php echo $this->lang->line('gen_hamradio_gridsquare'); ?></option>
|
||||
</select>
|
||||
</div>
|
||||
|
||||
<div class="form-group col-md-3">
|
||||
<label for="column4"><?php echo $this->lang->line('account_column4_text'); ?></label>
|
||||
<select class="custom-select" id="column4" name="user_column4">
|
||||
<option value="Band" <?php if ($user_column4 == "Band") { echo " selected =\"selected\""; } ?>><?php echo $this->lang->line('gen_hamradio_band'); ?></option>
|
||||
<option value="Mode" <?php if ($user_column4 == "Mode") { echo " selected =\"selected\""; } ?>><?php echo $this->lang->line('gen_hamradio_mode'); ?></option>
|
||||
<option value="RSTS" <?php if ($user_column4 == "RSTS") { echo " selected =\"selected\""; } ?>><?php echo $this->lang->line('gen_hamradio_rsts'); ?></option>
|
||||
<option value="RSTR" <?php if ($user_column4 == "RSTR") { echo " selected =\"selected\""; } ?>><?php echo $this->lang->line('gen_hamradio_rstr'); ?></option>
|
||||
<option value="Country" <?php if ($user_column4 == "Country") { echo " selected =\"selected\""; } ?>><?php echo $this->lang->line('general_word_country'); ?></option>
|
||||
<option value="IOTA" <?php if ($user_column4 == "IOTA") { echo " selected =\"selected\""; } ?>><?php echo $this->lang->line('gen_hamradio_iota'); ?></option>
|
||||
<option value="State" <?php if ($user_column4 == "State") { echo " selected =\"selected\""; } ?>><?php echo $this->lang->line('gen_hamradio_state'); ?></option>
|
||||
<option value="Grid" <?php if ($user_column4 == "Grid") { echo " selected =\"selected\""; } ?>><?php echo $this->lang->line('gen_hamradio_gridsquare'); ?></option>
|
||||
</select>
|
||||
</div>
|
||||
<div class="form-group col-md-3">
|
||||
<label for="column5"><?php echo $this->lang->line('account_column5_text'); ?></label>
|
||||
<select class="custom-select" id="column5" name="user_column5">
|
||||
<option value="Band" <?php if ($user_column5 == "Band") { echo " selected =\"selected\""; } ?>><?php echo $this->lang->line('gen_hamradio_band'); ?></option>
|
||||
<option value="Mode" <?php if ($user_column5 == "Mode") { echo " selected =\"selected\""; } ?>><?php echo $this->lang->line('gen_hamradio_mode'); ?></option>
|
||||
<option value="RSTS" <?php if ($user_column5 == "RSTS") { echo " selected =\"selected\""; } ?>><?php echo $this->lang->line('gen_hamradio_rsts'); ?></option>
|
||||
<option value="RSTR" <?php if ($user_column5 == "RSTR") { echo " selected =\"selected\""; } ?>><?php echo $this->lang->line('gen_hamradio_rstr'); ?></option>
|
||||
<option value="Country" <?php if ($user_column5 == "Country") { echo " selected =\"selected\""; } ?>><?php echo $this->lang->line('general_word_country'); ?></option>
|
||||
<option value="IOTA" <?php if ($user_column5 == "IOTA") { echo " selected =\"selected\""; } ?>><?php echo $this->lang->line('gen_hamradio_iota'); ?></option>
|
||||
<option value="State" <?php if ($user_column5 == "State") { echo " selected =\"selected\""; } ?>><?php echo $this->lang->line('gen_hamradio_state'); ?></option>
|
||||
<option value="Grid" <?php if ($user_column5 == "Grid") { echo " selected =\"selected\""; } ?>><?php echo $this->lang->line('gen_hamradio_gridsquare'); ?></option>
|
||||
</select>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<input type="hidden" name="id" value="<?php echo $this->uri->segment(3); ?>" />
|
||||
<br>
|
||||
|
|
@ -321,6 +404,4 @@
|
|||
<br>
|
||||
<br>
|
||||
</form>
|
||||
|
||||
</div>
|
||||
|
||||
|
|
|
|||
|
|
@ -6,12 +6,69 @@
|
|||
<td><?php echo $this->lang->line('general_word_time'); ?></td>
|
||||
<?php } ?>
|
||||
<td><?php echo $this->lang->line('gen_hamradio_call'); ?></td>
|
||||
<td><?php echo $this->lang->line('gen_hamradio_mode'); ?></td>
|
||||
<td><?php echo $this->lang->line('gen_hamradio_rsts'); ?></td>
|
||||
<td><?php echo $this->lang->line('gen_hamradio_rstr'); ?></td>
|
||||
<td><?php echo $this->lang->line('gen_hamradio_band'); ?></td>
|
||||
<td><?php echo $this->lang->line('general_word_country'); ?></td>
|
||||
<?php if(($this->config->item('use_auth')) && ($this->session->userdata('user_type') >= 2)) { ?>
|
||||
<?php
|
||||
echo '<td>';
|
||||
switch($this->session->userdata('user_column1')==""?'Mode':$this->session->userdata('user_column1')) {
|
||||
case 'Mode': echo $this->lang->line('gen_hamradio_mode'); break;
|
||||
case 'RSTS': echo $this->lang->line('gen_hamradio_rsts'); break;
|
||||
case 'RSTR': echo $this->lang->line('gen_hamradio_rstr'); break;
|
||||
case 'Country': echo $this->lang->line('general_word_country'); break;
|
||||
case 'IOTA': echo $this->lang->line('gen_hamradio_iota'); break;
|
||||
case 'State': echo $this->lang->line('gen_hamradio_state'); break;
|
||||
case 'Grid': echo $this->lang->line('gen_hamradio_gridsquare'); break;
|
||||
case 'Band': echo $this->lang->line('gen_hamradio_band'); break;
|
||||
}
|
||||
echo '</td>';
|
||||
echo '<td>';
|
||||
switch($this->session->userdata('user_column2')==""?'RSTS':$this->session->userdata('user_column2')) {
|
||||
case 'Mode': echo $this->lang->line('gen_hamradio_mode'); break;
|
||||
case 'RSTS': echo $this->lang->line('gen_hamradio_rsts'); break;
|
||||
case 'RSTR': echo $this->lang->line('gen_hamradio_rstr'); break;
|
||||
case 'Country': echo $this->lang->line('general_word_country'); break;
|
||||
case 'IOTA': echo $this->lang->line('gen_hamradio_iota'); break;
|
||||
case 'State': echo $this->lang->line('gen_hamradio_state'); break;
|
||||
case 'Grid': echo $this->lang->line('gen_hamradio_gridsquare'); break;
|
||||
case 'Band': echo $this->lang->line('gen_hamradio_band'); break;
|
||||
}
|
||||
echo '</td>';
|
||||
echo '<td>';
|
||||
switch($this->session->userdata('user_column3')==""?'RSTR':$this->session->userdata('user_column3')) {
|
||||
case 'Mode': echo $this->lang->line('gen_hamradio_mode'); break;
|
||||
case 'RSTS': echo $this->lang->line('gen_hamradio_rsts'); break;
|
||||
case 'RSTR': echo $this->lang->line('gen_hamradio_rstr'); break;
|
||||
case 'Country': echo $this->lang->line('general_word_country'); break;
|
||||
case 'IOTA': echo $this->lang->line('gen_hamradio_iota'); break;
|
||||
case 'State': echo $this->lang->line('gen_hamradio_state'); break;
|
||||
case 'Grid': echo $this->lang->line('gen_hamradio_gridsquare'); break;
|
||||
case 'Band': echo $this->lang->line('gen_hamradio_band'); break;
|
||||
}
|
||||
echo '</td>';
|
||||
echo '<td>';
|
||||
switch($this->session->userdata('user_column4')==""?'Band':$this->session->userdata('user_column4')) {
|
||||
case 'Mode': echo $this->lang->line('gen_hamradio_mode'); break;
|
||||
case 'RSTS': echo $this->lang->line('gen_hamradio_rsts'); break;
|
||||
case 'RSTR': echo $this->lang->line('gen_hamradio_rstr'); break;
|
||||
case 'Country': echo $this->lang->line('general_word_country'); break;
|
||||
case 'IOTA': echo $this->lang->line('gen_hamradio_iota'); break;
|
||||
case 'State': echo $this->lang->line('gen_hamradio_state'); break;
|
||||
case 'Grid': echo $this->lang->line('gen_hamradio_gridsquare'); break;
|
||||
case 'Band': echo $this->lang->line('gen_hamradio_band'); break;
|
||||
}
|
||||
echo '</td>';
|
||||
echo '<td>';
|
||||
switch($this->session->userdata('user_column5')==""?'Country':$this->session->userdata('user_column5')) {
|
||||
case 'Mode': echo $this->lang->line('gen_hamradio_mode'); break;
|
||||
case 'RSTS': echo $this->lang->line('gen_hamradio_rsts'); break;
|
||||
case 'RSTR': echo $this->lang->line('gen_hamradio_rstr'); break;
|
||||
case 'Country': echo $this->lang->line('general_word_country'); break;
|
||||
case 'IOTA': echo $this->lang->line('gen_hamradio_iota'); break;
|
||||
case 'State': echo $this->lang->line('gen_hamradio_state'); break;
|
||||
case 'Grid': echo $this->lang->line('gen_hamradio_gridsquare'); break;
|
||||
case 'Band': echo $this->lang->line('gen_hamradio_band'); break;
|
||||
}
|
||||
echo '</td>';
|
||||
|
||||
if(($this->config->item('use_auth')) && ($this->session->userdata('user_type') >= 2)) { ?>
|
||||
<td>QSL</td>
|
||||
<?php if($this->session->userdata('user_eqsl_name') != "") { ?>
|
||||
<td>eQSL</td>
|
||||
|
|
@ -45,16 +102,65 @@
|
|||
<td>
|
||||
<a id="edit_qso" href="javascript:displayQso(<?php echo $row->COL_PRIMARY_KEY; ?>)"><?php echo str_replace("0","Ø",strtoupper($row->COL_CALL)); ?></a>
|
||||
</td>
|
||||
<td><?php echo $row->COL_SUBMODE==null?$row->COL_MODE:$row->COL_SUBMODE; ?></td>
|
||||
<td><?php echo $row->COL_RST_SENT; ?> <?php if ($row->COL_STX) { ?><span class="badge badge-light"><?php echo $row->COL_STX;?></span><?php } ?><?php if ($row->COL_STX_STRING) { ?><span class="badge badge-light"><?php echo $row->COL_STX_STRING;?></span><?php } ?></td>
|
||||
<td><?php echo $row->COL_RST_RCVD; ?> <?php if ($row->COL_SRX) { ?><span class="badge badge-light"><?php echo $row->COL_SRX;?></span><?php } ?><?php if ($row->COL_SRX_STRING) { ?><span class="badge badge-light"><?php echo $row->COL_SRX_STRING;?></span><?php } ?></td>
|
||||
<?php if($row->COL_SAT_NAME != null) { ?>
|
||||
<td><?php echo $row->COL_SAT_NAME; ?></td>
|
||||
<?php } else { ?>
|
||||
<td><?php echo strtolower($row->COL_BAND); ?></td>
|
||||
<?php } ?>
|
||||
<td><?php echo ucwords(strtolower(($row->COL_COUNTRY))); ?></td>
|
||||
<?php if(($this->config->item('use_auth')) && ($this->session->userdata('user_type') >= 2)) { ?>
|
||||
<?php
|
||||
|
||||
switch($this->session->userdata('user_column1')==""?'Mode':$this->session->userdata('user_column1')) {
|
||||
case 'Mode': echo '<td>'; echo $row->COL_SUBMODE==null?$row->COL_MODE:$row->COL_SUBMODE; break;
|
||||
case 'RSTS': echo '<td>' . $row->COL_RST_SENT; if ($row->COL_STX) { echo '<span class="badge badge-light">' . $row->COL_STX . '</span>';}if ($row->COL_STX_STRING) { echo '<span class="badge badge-light">' . $row->COL_STX_STRING . '</span>';}; break;
|
||||
case 'RSTR': echo '<td>' . $row->COL_RST_RCVD; if ($row->COL_SRX) { echo '<span class="badge badge-light">' . $row->COL_SRX . '</span>';}if ($row->COL_SRX_STRING) { echo '<span class="badge badge-light">' . $row->COL_SRX_STRING . '</span>';}; break;
|
||||
case 'Country': echo '<td>' . ucwords(strtolower(($row->COL_COUNTRY)));; break;
|
||||
case 'IOTA': echo '<td>' . ($row->COL_IOTA); break;
|
||||
case 'Grid': echo '<td>'; echo strlen($row->COL_GRIDSQUARE)==0?$row->COL_VUCC_GRIDS:$row->COL_GRIDSQUARE; break;
|
||||
case 'Band': echo '<td>'; if($row->COL_SAT_NAME != null) { echo $row->COL_SAT_NAME; } else { echo strtolower($row->COL_BAND); }; break;
|
||||
case 'State': echo '<td>' . ($row->COL_STATE); break;
|
||||
}
|
||||
echo '</td>';
|
||||
switch($this->session->userdata('user_column2')==""?'RSTS':$this->session->userdata('user_column2')) {
|
||||
case 'Mode': echo '<td>'; echo $row->COL_SUBMODE==null?$row->COL_MODE:$row->COL_SUBMODE; break;
|
||||
case 'RSTS': echo '<td>' . $row->COL_RST_SENT; if ($row->COL_STX) { echo '<span class="badge badge-light">' . $row->COL_STX . '</span>';}if ($row->COL_STX_STRING) { echo '<span class="badge badge-light">' . $row->COL_STX_STRING . '</span>';}; break;
|
||||
case 'RSTR': echo '<td>' . $row->COL_RST_RCVD; if ($row->COL_SRX) { echo '<span class="badge badge-light">' . $row->COL_SRX . '</span>';}if ($row->COL_SRX_STRING) { echo '<span class="badge badge-light">' . $row->COL_SRX_STRING . '</span>';}; break;
|
||||
case 'Country': echo '<td>' . ucwords(strtolower(($row->COL_COUNTRY)));; break;
|
||||
case 'IOTA': echo '<td>' . ($row->COL_IOTA); break;
|
||||
case 'Grid': echo '<td>'; echo strlen($row->COL_GRIDSQUARE)==0?$row->COL_VUCC_GRIDS:$row->COL_GRIDSQUARE; break;
|
||||
case 'Band': echo '<td>'; if($row->COL_SAT_NAME != null) { echo $row->COL_SAT_NAME; } else { echo strtolower($row->COL_BAND); }; break;
|
||||
case 'State': echo '<td>' . ($row->COL_STATE); break;
|
||||
}
|
||||
echo '</td>';
|
||||
|
||||
switch($this->session->userdata('user_column3')==""?'RSTR':$this->session->userdata('user_column3')) {
|
||||
case 'Mode': echo '<td>'; echo $row->COL_SUBMODE==null?$row->COL_MODE:$row->COL_SUBMODE; break;
|
||||
case 'RSTS': echo '<td>' . $row->COL_RST_SENT; if ($row->COL_STX) { echo '<span class="badge badge-light">' . $row->COL_STX . '</span>';}if ($row->COL_STX_STRING) { echo '<span class="badge badge-light">' . $row->COL_STX_STRING . '</span>';}; break;
|
||||
case 'RSTR': echo '<td>' . $row->COL_RST_RCVD; if ($row->COL_SRX) { echo '<span class="badge badge-light">' . $row->COL_SRX . '</span>';}if ($row->COL_SRX_STRING) { echo '<span class="badge badge-light">' . $row->COL_SRX_STRING . '</span>';}; break;
|
||||
case 'Country': echo '<td>' . ucwords(strtolower(($row->COL_COUNTRY)));; break;
|
||||
case 'IOTA': echo '<td>' . ($row->COL_IOTA); break;
|
||||
case 'Grid': echo '<td>'; echo strlen($row->COL_GRIDSQUARE)==0?$row->COL_VUCC_GRIDS:$row->COL_GRIDSQUARE; break;
|
||||
case 'Band': echo '<td>'; if($row->COL_SAT_NAME != null) { echo $row->COL_SAT_NAME; } else { echo strtolower($row->COL_BAND); }; break;
|
||||
case 'State': echo '<td>' . ($row->COL_STATE); break;
|
||||
}
|
||||
echo '</td>';
|
||||
switch($this->session->userdata('user_column4')==""?'Band':$this->session->userdata('user_column4')) {
|
||||
case 'Mode': echo '<td>'; echo $row->COL_SUBMODE==null?$row->COL_MODE:$row->COL_SUBMODE; break;
|
||||
case 'RSTS': echo '<td>' . $row->COL_RST_SENT; if ($row->COL_STX) { echo '<span class="badge badge-light">' . $row->COL_STX . '</span>';}if ($row->COL_STX_STRING) { echo '<span class="badge badge-light">' . $row->COL_STX_STRING . '</span>';}; break;
|
||||
case 'RSTR': echo '<td>' . $row->COL_RST_RCVD; if ($row->COL_SRX) { echo '<span class="badge badge-light">' . $row->COL_SRX . '</span>';}if ($row->COL_SRX_STRING) { echo '<span class="badge badge-light">' . $row->COL_SRX_STRING . '</span>';}; break;
|
||||
case 'Country': echo '<td>' . ucwords(strtolower(($row->COL_COUNTRY)));; break;
|
||||
case 'IOTA': echo '<td>' . ($row->COL_IOTA); break;
|
||||
case 'Grid': echo '<td>'; echo strlen($row->COL_GRIDSQUARE)==0?$row->COL_VUCC_GRIDS:$row->COL_GRIDSQUARE; break;
|
||||
case 'Band': echo '<td>'; if($row->COL_SAT_NAME != null) { echo $row->COL_SAT_NAME; } else { echo strtolower($row->COL_BAND); }; break;
|
||||
case 'State': echo '<td>' . ($row->COL_STATE); break;
|
||||
}
|
||||
echo '</td>';
|
||||
switch($this->session->userdata('user_column5')==""?'Country':$this->session->userdata('user_column5')) {
|
||||
case 'Mode': echo '<td>'; echo $row->COL_SUBMODE==null?$row->COL_MODE:$row->COL_SUBMODE; break;
|
||||
case 'RSTS': echo '<td>' . $row->COL_RST_SENT; if ($row->COL_STX) { echo '<span class="badge badge-light">' . $row->COL_STX . '</span>';}if ($row->COL_STX_STRING) { echo '<span class="badge badge-light">' . $row->COL_STX_STRING . '</span>';}; break;
|
||||
case 'RSTR': echo '<td>' . $row->COL_RST_RCVD; if ($row->COL_SRX) { echo '<span class="badge badge-light">' . $row->COL_SRX . '</span>';}if ($row->COL_SRX_STRING) { echo '<span class="badge badge-light">' . $row->COL_SRX_STRING . '</span>';}; break;
|
||||
case 'Country': echo '<td>' . ucwords(strtolower(($row->COL_COUNTRY)));; break;
|
||||
case 'IOTA': echo '<td>' . ($row->COL_IOTA); break;
|
||||
case 'Grid': echo '<td>'; echo strlen($row->COL_GRIDSQUARE)==0?$row->COL_VUCC_GRIDS:$row->COL_GRIDSQUARE; break;
|
||||
case 'Band': echo '<td>'; if($row->COL_SAT_NAME != null) { echo $row->COL_SAT_NAME; } else { echo strtolower($row->COL_BAND); }; break;
|
||||
case 'State': echo '<td>' . ($row->COL_STATE); break;
|
||||
}
|
||||
echo '</td>';
|
||||
if(($this->config->item('use_auth')) && ($this->session->userdata('user_type') >= 2)) { ?>
|
||||
<td class="qsl">
|
||||
<span class="qsl-<?php
|
||||
switch ($row->COL_QSL_SENT) {
|
||||
|
|
|
|||
|
|
@ -70,12 +70,12 @@
|
|||
<?php if($this->config->item('display_freq') == true) { ?>
|
||||
<tr>
|
||||
<td><?php echo $this->lang->line('gen_hamradio_frequency'); ?></td>
|
||||
<td><?php echo frequency_display_string($row->COL_FREQ); ?></td>
|
||||
<td><?php echo $this->frequency->hz_to_mhz($row->COL_FREQ); ?></td>
|
||||
</tr>
|
||||
<?php if($row->COL_FREQ_RX != 0) { ?>
|
||||
<tr>
|
||||
<td><?php echo $this->lang->line('gen_hamradio_frequency_rx'); ?></td>
|
||||
<td><?php echo frequency_display_string($row->COL_FREQ_RX); ?></td>
|
||||
<td><?php echo $this->frequency->hz_to_mhz($row->COL_FREQ_RX); ?></td>
|
||||
</tr>
|
||||
<?php }} ?>
|
||||
|
||||
|
|
@ -456,10 +456,3 @@ var callsign = "<?php echo $row->COL_CALL; ?>";
|
|||
<div hidden id ='qsoid'><?php echo $row->COL_PRIMARY_KEY; ?></div>
|
||||
|
||||
<?php } } ?>
|
||||
<?php
|
||||
// converts a frequency in Hz (e.g. 3650) to 3.650 MHz
|
||||
function frequency_display_string($frequency)
|
||||
{
|
||||
return number_format (($frequency / 1000 / 1000), 3) . " MHz";
|
||||
}
|
||||
?>
|
||||
|
|
@ -233,3 +233,13 @@ color: #ffffff;
|
|||
.debug_main .card {
|
||||
margin-bottom: 10px;
|
||||
}
|
||||
|
||||
.was-map-dialog .modal-dialog {
|
||||
width: 100%;
|
||||
}
|
||||
|
||||
@media (min-width: 576px) {
|
||||
.was-map-dialog .modal-dialog {
|
||||
max-width: 73% !important;
|
||||
}
|
||||
}
|
||||
123
assets/js/color.jquery.js
可执行文件
123
assets/js/color.jquery.js
可执行文件
|
|
@ -0,0 +1,123 @@
|
|||
/*
|
||||
* jQuery Color Animations
|
||||
* Copyright 2007 John Resig
|
||||
* Released under the MIT and GPL licenses.
|
||||
*/
|
||||
|
||||
(function(jQuery){
|
||||
|
||||
// We override the animation for all of these color styles
|
||||
jQuery.each(['backgroundColor', 'borderBottomColor', 'borderLeftColor', 'borderRightColor', 'borderTopColor', 'color', 'outlineColor'], function(i,attr){
|
||||
jQuery.fx.step[attr] = function(fx){
|
||||
if ( fx.state == 0 ) {
|
||||
fx.start = getColor( fx.elem, attr );
|
||||
fx.end = getRGB( fx.end );
|
||||
}
|
||||
|
||||
fx.elem.style[attr] = "rgb(" + [
|
||||
Math.max(Math.min( parseInt((fx.pos * (fx.end[0] - fx.start[0])) + fx.start[0]), 255), 0),
|
||||
Math.max(Math.min( parseInt((fx.pos * (fx.end[1] - fx.start[1])) + fx.start[1]), 255), 0),
|
||||
Math.max(Math.min( parseInt((fx.pos * (fx.end[2] - fx.start[2])) + fx.start[2]), 255), 0)
|
||||
].join(",") + ")";
|
||||
}
|
||||
});
|
||||
|
||||
// Color Conversion functions from highlightFade
|
||||
// By Blair Mitchelmore
|
||||
// http://jquery.offput.ca/highlightFade/
|
||||
|
||||
// Parse strings looking for color tuples [255,255,255]
|
||||
function getRGB(color) {
|
||||
var result;
|
||||
|
||||
// Check if we're already dealing with an array of colors
|
||||
if ( color && color.constructor == Array && color.length == 3 )
|
||||
return color;
|
||||
|
||||
// Look for rgb(num,num,num)
|
||||
if (result = /rgb\(\s*([0-9]{1,3})\s*,\s*([0-9]{1,3})\s*,\s*([0-9]{1,3})\s*\)/.exec(color))
|
||||
return [parseInt(result[1]), parseInt(result[2]), parseInt(result[3])];
|
||||
|
||||
// Look for rgb(num%,num%,num%)
|
||||
if (result = /rgb\(\s*([0-9]+(?:\.[0-9]+)?)\%\s*,\s*([0-9]+(?:\.[0-9]+)?)\%\s*,\s*([0-9]+(?:\.[0-9]+)?)\%\s*\)/.exec(color))
|
||||
return [parseFloat(result[1])*2.55, parseFloat(result[2])*2.55, parseFloat(result[3])*2.55];
|
||||
|
||||
// Look for #a0b1c2
|
||||
if (result = /#([a-fA-F0-9]{2})([a-fA-F0-9]{2})([a-fA-F0-9]{2})/.exec(color))
|
||||
return [parseInt(result[1],16), parseInt(result[2],16), parseInt(result[3],16)];
|
||||
|
||||
// Look for #fff
|
||||
if (result = /#([a-fA-F0-9])([a-fA-F0-9])([a-fA-F0-9])/.exec(color))
|
||||
return [parseInt(result[1]+result[1],16), parseInt(result[2]+result[2],16), parseInt(result[3]+result[3],16)];
|
||||
|
||||
// Otherwise, we're most likely dealing with a named color
|
||||
return colors[jQuery.trim(color).toLowerCase()];
|
||||
}
|
||||
|
||||
function getColor(elem, attr) {
|
||||
var color;
|
||||
|
||||
do {
|
||||
color = jQuery.curCSS(elem, attr);
|
||||
|
||||
// Keep going until we find an element that has color, or we hit the body
|
||||
if ( color != '' && color != 'transparent' || jQuery.nodeName(elem, "body") )
|
||||
break;
|
||||
|
||||
attr = "backgroundColor";
|
||||
} while ( elem = elem.parentNode );
|
||||
|
||||
return getRGB(color);
|
||||
};
|
||||
|
||||
// Some named colors to work with
|
||||
// From Interface by Stefan Petre
|
||||
// http://interface.eyecon.ro/
|
||||
|
||||
var colors = {
|
||||
aqua:[0,255,255],
|
||||
azure:[240,255,255],
|
||||
beige:[245,245,220],
|
||||
black:[0,0,0],
|
||||
blue:[0,0,255],
|
||||
brown:[165,42,42],
|
||||
cyan:[0,255,255],
|
||||
darkblue:[0,0,139],
|
||||
darkcyan:[0,139,139],
|
||||
darkgrey:[169,169,169],
|
||||
darkgreen:[0,100,0],
|
||||
darkkhaki:[189,183,107],
|
||||
darkmagenta:[139,0,139],
|
||||
darkolivegreen:[85,107,47],
|
||||
darkorange:[255,140,0],
|
||||
darkorchid:[153,50,204],
|
||||
darkred:[139,0,0],
|
||||
darksalmon:[233,150,122],
|
||||
darkviolet:[148,0,211],
|
||||
fuchsia:[255,0,255],
|
||||
gold:[255,215,0],
|
||||
green:[0,128,0],
|
||||
indigo:[75,0,130],
|
||||
khaki:[240,230,140],
|
||||
lightblue:[173,216,230],
|
||||
lightcyan:[224,255,255],
|
||||
lightgreen:[144,238,144],
|
||||
lightgrey:[211,211,211],
|
||||
lightpink:[255,182,193],
|
||||
lightyellow:[255,255,224],
|
||||
lime:[0,255,0],
|
||||
magenta:[255,0,255],
|
||||
maroon:[128,0,0],
|
||||
navy:[0,0,128],
|
||||
olive:[128,128,0],
|
||||
orange:[255,165,0],
|
||||
pink:[255,192,203],
|
||||
purple:[128,0,128],
|
||||
violet:[128,0,128],
|
||||
red:[255,0,0],
|
||||
silver:[192,192,192],
|
||||
white:[255,255,255],
|
||||
yellow:[255,255,0]
|
||||
};
|
||||
|
||||
})(jQuery);
|
||||
656
assets/js/jquery.usmap.js
普通文件
656
assets/js/jquery.usmap.js
普通文件
文件差异因一行或多行过长而隐藏
1
assets/js/jquery.usmap.min.js
vendored
普通文件
1
assets/js/jquery.usmap.min.js
vendored
普通文件
文件差异因一行或多行过长而隐藏
5381
assets/js/raphael.js
可执行文件
5381
assets/js/raphael.js
可执行文件
文件差异内容过多而无法显示
加载差异
|
|
@ -143,7 +143,7 @@
|
|||
]
|
||||
}
|
||||
},
|
||||
"CAS-6":{
|
||||
"TO-108":{
|
||||
"Modes":{
|
||||
"U/V":[
|
||||
{
|
||||
|
|
|
|||
142
assets/svg/Blank_USA,_w_territories.svg
可执行文件
142
assets/svg/Blank_USA,_w_territories.svg
可执行文件
文件差异因一行或多行过长而隐藏
|
之后 宽度: | 高度: | 大小: 100 KiB |
326
assets/svg/Blank_US_Map.svg
普通文件
326
assets/svg/Blank_US_Map.svg
普通文件
文件差异因一行或多行过长而隐藏
|
之后 宽度: | 高度: | 大小: 89 KiB |
正在加载…
在新工单中引用