diff --git a/application/config/migration.php b/application/config/migration.php index 85bf1542..82ace1a0 100644 --- a/application/config/migration.php +++ b/application/config/migration.php @@ -21,7 +21,7 @@ $config['migration_enabled'] = TRUE; | be upgraded / downgraded to. | */ -$config['migration_version'] = 68; +$config['migration_version'] = 69; /* |-------------------------------------------------------------------------- diff --git a/application/controllers/Logbook.php b/application/controllers/Logbook.php index 682197f3..78ec6208 100755 --- a/application/controllers/Logbook.php +++ b/application/controllers/Logbook.php @@ -223,7 +223,7 @@ class Logbook extends CI_Controller { function worked_grid_before($gridsquare, $type, $band, $mode) { if (strlen($gridsquare) < 4) - return false; + return false; $CI =& get_instance(); $CI->load->model('Stations'); @@ -231,14 +231,14 @@ class Logbook extends CI_Controller { if($type == "SAT") { - $this->db->where('COL_PROP_MODE', 'SAT'); + $this->db->where('COL_PROP_MODE', 'SAT'); } else { - $this->db->where('COL_MODE', $mode); - $this->db->where('COL_BAND', $band); + $this->db->where('COL_MODE', $mode); + $this->db->where('COL_BAND', $band); $this->db->where('COL_PROP_MODE !=','SAT'); } - $this->db->where('station_id', $station_id); + $this->db->where('station_id', $station_id); $this->db->like('SUBSTRING(COL_GRIDSQUARE, 1, 4)', substr($gridsquare, 0, 4)); $this->db->order_by($this->config->item('table_name').".COL_TIME_ON", "desc"); $this->db->limit(1); @@ -257,7 +257,7 @@ class Logbook extends CI_Controller { /* * Function: jsonlookupgrid * - * Usage: Used to look up gridsquares when creating a QSO to check whether its needed or not + * Usage: Used to look up gridsquares when creating a QSO to check whether its needed or not * the $type variable is only used for satellites, set this to SAT. * */ @@ -271,16 +271,16 @@ class Logbook extends CI_Controller { $station_id = $CI->Stations->find_active(); if($type == "SAT") { - $this->db->where('COL_PROP_MODE', 'SAT'); + $this->db->where('COL_PROP_MODE', 'SAT'); } else { - $this->db->where('COL_MODE', $mode); - $this->db->where('COL_BAND', $band); + $this->db->where('COL_MODE', $mode); + $this->db->where('COL_BAND', $band); $this->db->where('COL_PROP_MODE !=','SAT'); } - $this->db->where('station_id', $station_id); - + $this->db->where('station_id', $station_id); + $this->db->like('SUBSTRING(COL_GRIDSQUARE, 1, 4)', substr($gridsquare, 0, 4)); $query = $this->db->get($this->config->item('table_name'), 1, 0); foreach ($query->result() as $workedBeforeRow) @@ -295,7 +295,7 @@ class Logbook extends CI_Controller { } function jsonlookupdxcc($country, $type, $band, $mode) { - + $return = [ "workedBefore" => false, ]; @@ -305,17 +305,17 @@ class Logbook extends CI_Controller { $station_id = $CI->Stations->find_active(); if($type == "SAT") { - $this->db->where('COL_PROP_MODE', 'SAT'); + $this->db->where('COL_PROP_MODE', 'SAT'); } else { - $this->db->where('COL_MODE', $mode); - $this->db->where('COL_BAND', $band); + $this->db->where('COL_MODE', $mode); + $this->db->where('COL_BAND', $band); $this->db->where('COL_PROP_MODE !=','SAT'); } - $this->db->where('station_id', $station_id); - $this->db->where('COL_COUNTRY', urldecode($country)); - + $this->db->where('station_id', $station_id); + $this->db->where('COL_COUNTRY', urldecode($country)); + $query = $this->db->get($this->config->item('table_name'), 1, 0); foreach ($query->result() as $workedBeforeRow) { @@ -329,7 +329,7 @@ class Logbook extends CI_Controller { } function jsonlookupcallsign($callsign, $type, $band, $mode) { - + // Convert - in Callsign to / Used for URL processing $callsign = str_replace("-","/",$callsign); @@ -342,17 +342,17 @@ class Logbook extends CI_Controller { $station_id = $CI->Stations->find_active(); if($type == "SAT") { - $this->db->where('COL_PROP_MODE', 'SAT'); + $this->db->where('COL_PROP_MODE', 'SAT'); } else { - $this->db->where('COL_MODE', $mode); - $this->db->where('COL_BAND', $band); + $this->db->where('COL_MODE', $mode); + $this->db->where('COL_BAND', $band); $this->db->where('COL_PROP_MODE !=','SAT'); } - $this->db->where('station_id', $station_id); - $this->db->where('COL_CALL', strtoupper($callsign)); - + $this->db->where('station_id', $station_id); + $this->db->where('COL_CALL', strtoupper($callsign)); + $query = $this->db->get($this->config->item('table_name'), 1, 0); foreach ($query->result() as $workedBeforeRow) { @@ -413,7 +413,7 @@ class Logbook extends CI_Controller { echo "]"; echo "}"; } - + function view($id) { $this->load->model('user_model'); if(!$this->user_model->authorize($this->config->item('auth_mode'))) { return; } @@ -437,11 +437,11 @@ class Logbook extends CI_Controller { $this->load->view('view_log/qso'); $this->load->view('interface_assets/footer'); } - + function partial($id) { $this->load->model('user_model'); if(!$this->user_model->authorize($this->config->item('auth_mode'))) { return; } - + $html = ""; @@ -563,12 +563,12 @@ 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')); $this->db->join('station_profile', 'station_profile.station_id = '.$this->config->item('table_name').'.station_id'); - + $this->db->like(''.$this->config->item('table_name').'.COL_CALL', $id); $this->db->or_like(''.$this->config->item('table_name').'.COL_GRIDSQUARE', $id); $this->db->or_like(''.$this->config->item('table_name').'.COL_VUCC_GRIDS', $id); @@ -716,4 +716,4 @@ class Logbook extends CI_Controller { } -} \ No newline at end of file +} diff --git a/application/controllers/User.php b/application/controllers/User.php index 85bc1ce7..d47b9004 100644 --- a/application/controllers/User.php +++ b/application/controllers/User.php @@ -57,6 +57,10 @@ 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'); $this->load->view('user/add', $data); } else { $this->load->view('user/add', $data); @@ -65,7 +69,24 @@ 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'))) { // Check for errors case EUSERNAMEEXISTS: $data['username_error'] = 'Username '.$this->input->post('user_name').' already in use!'; @@ -97,6 +118,10 @@ 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'); $this->load->view('user/add', $data); $this->load->view('interface_assets/footer'); } @@ -265,6 +290,30 @@ 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; + } + $this->load->view('user/edit', $data); $this->load->view('interface_assets/footer'); } @@ -308,6 +357,10 @@ 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'); $this->load->view('user/edit'); $this->load->view('interface_assets/footer'); } diff --git a/application/migrations/069_add_user_definable_columns.php b/application/migrations/069_add_user_definable_columns.php new file mode 100644 index 00000000..064269e9 --- /dev/null +++ b/application/migrations/069_add_user_definable_columns.php @@ -0,0 +1,46 @@ +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'); + } +} diff --git a/application/models/Logbook_model.php b/application/models/Logbook_model.php index 40e5db32..733dc39a 100755 --- a/application/models/Logbook_model.php +++ b/application/models/Logbook_model.php @@ -790,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'); @@ -865,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); diff --git a/application/models/User_model.php b/application/models/User_model.php index d2e23a09..6d5f07c4 100644 --- a/application/models/User_model.php +++ b/application/models/User_model.php @@ -114,6 +114,10 @@ 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), ); // Check the password is valid @@ -157,6 +161,10 @@ 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']), ); // Check to see if the user is allowed to change user levels @@ -266,6 +274,10 @@ 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, ); $this->session->set_userdata($userdata); diff --git a/application/views/dashboard/index.php b/application/views/dashboard/index.php index 9a691545..32b7dd27 100644 --- a/application/views/dashboard/index.php +++ b/application/views/dashboard/index.php @@ -40,19 +40,65 @@ lang->line('general_word_time'); ?> lang->line('gen_hamradio_call'); ?> - lang->line('gen_hamradio_mode'); ?> - lang->line('gen_hamradio_rst_sent'); ?> - lang->line('gen_hamradio_rst_recv'); ?> - lang->line('gen_hamradio_band'); ?> + '; + 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_rst_sent'); break; + case 'RSTR': echo $this->lang->line('gen_hamradio_rst_recv'); break; + case 'Country': echo $this->lang->line('general_word_country'); break; + case 'IOTA': echo 'IOTA'; break; + case 'State': echo 'State'; break; + case 'Grid': echo 'Gridsquare'; break; + case 'Band': echo $this->lang->line('gen_hamradio_band'); break; + } + echo '' . + ''; + 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_rst_sent'); break; + case 'RSTR': echo $this->lang->line('gen_hamradio_rst_recv'); break; + case 'Country': echo $this->lang->line('general_word_country'); break; + case 'IOTA': echo 'IOTA'; break; + case 'State': echo 'State'; break; + case 'Grid': echo 'Gridsquare'; break; + case 'Band': echo $this->lang->line('gen_hamradio_band'); break; + } + echo '' . + ''; + 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_rst_sent'); break; + case 'RSTR': echo $this->lang->line('gen_hamradio_rst_recv'); break; + case 'Country': echo $this->lang->line('general_word_country'); break; + case 'IOTA': echo 'IOTA'; break; + case 'State': echo 'State'; break; + case 'Grid': echo 'Gridsquare'; break; + case 'Band': echo $this->lang->line('gen_hamradio_band'); break; + } + echo '' . + ''; + 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_rst_sent'); break; + case 'RSTR': echo $this->lang->line('gen_hamradio_rst_recv'); break; + case 'Country': echo $this->lang->line('general_word_country'); break; + case 'IOTA': echo 'IOTA'; break; + case 'State': echo 'State'; break; + case 'Grid': echo 'Gridsquare'; break; + case 'Band': echo $this->lang->line('gen_hamradio_band'); break; + } + echo ''; + ?> - result() as $row) { ?> '; ?> - session->userdata('user_date_format')) { @@ -68,19 +114,60 @@ COL_TIME_ON); echo date($custom_date_format, $timestamp); ?> config->item('use_auth') && ($this->session->userdata('user_type') >= 2)) || $this->config->item('use_auth') === FALSE || ($this->config->item('show_time'))) { ?> COL_TIME_ON); echo date('H:i', $timestamp); ?> - + COL_CALL)); ?> - COL_SUBMODE==null?$row->COL_MODE:$row->COL_SUBMODE; ?> - COL_RST_SENT; ?> COL_STX_STRING) { ?>COL_STX_STRING;?> - COL_RST_RCVD; ?> COL_SRX_STRING) { ?>COL_SRX_STRING;?> - COL_SAT_NAME != null) { ?> - COL_SAT_NAME; ?> - - COL_BAND); ?> - + session->userdata('user_column1')==""?'Mode':$this->session->userdata('user_column1')) { + case 'Mode': echo ''; echo $row->COL_SUBMODE==null?$row->COL_MODE:$row->COL_SUBMODE; break; + case 'RSTS': echo '' . $row->COL_RST_SENT; if ($row->COL_STX_STRING) { echo '' . $row->COL_STX_STRING . '';}; break; + case 'RSTR': echo '' . $row->COL_RST_RCVD; if ($row->COL_SRX_STRING) { echo '' . $row->COL_SRX_STRING . '';}; break; + case 'Country': echo '' . ucwords(strtolower(($row->COL_COUNTRY)));; break; + case 'IOTA': echo '' . ($row->COL_IOTA); break; + case 'Grid': echo '' . ($row->COL_GRIDSQUARE); break; + case 'Band': echo ''; if($row->COL_SAT_NAME != null) { echo $row->COL_SAT_NAME; } else { echo strtolower($row->COL_BAND); }; break; + case 'State': echo '' . ($row->COL_STATE); break; + } + echo ''; + + switch($this->session->userdata('user_column2')==""?'RSTS':$this->session->userdata('user_column2')) { + case 'Mode': echo ''; echo $row->COL_SUBMODE==null?$row->COL_MODE:$row->COL_SUBMODE; break; + case 'RSTS': echo '' . $row->COL_RST_SENT; if ($row->COL_STX_STRING) { echo '' . $row->COL_STX_STRING . '';}; break; + case 'RSTR': echo '' . $row->COL_RST_RCVD; if ($row->COL_SRX_STRING) { echo '' . $row->COL_SRX_STRING . '';}; break; + case 'Country': echo '' . ucwords(strtolower(($row->COL_COUNTRY)));; break; + case 'IOTA': echo '' . ($row->COL_IOTA); break; + case 'Grid': echo '' . ($row->COL_GRIDSQUARE); break; + case 'Band': echo ''; if($row->COL_SAT_NAME != null) { echo $row->COL_SAT_NAME; } else { echo strtolower($row->COL_BAND); }; break; + case 'State': echo '' . ($row->COL_STATE); break; + } + echo ''; + + switch($this->session->userdata('user_column3')==""?'RSTR':$this->session->userdata('user_column3')) { + case 'Mode': echo ''; echo $row->COL_SUBMODE==null?$row->COL_MODE:$row->COL_SUBMODE; break; + case 'RSTS': echo '' . $row->COL_RST_SENT; if ($row->COL_STX_STRING) { echo '' . $row->COL_STX_STRING . '';}; break; + case 'RSTR': echo '' . $row->COL_RST_RCVD; if ($row->COL_SRX_STRING) { echo '' . $row->COL_SRX_STRING . '';}; break; + case 'Country': echo '' . ucwords(strtolower(($row->COL_COUNTRY)));; break; + case 'IOTA': echo '' . ($row->COL_IOTA); break; + case 'Grid': echo '' . ($row->COL_GRIDSQUARE); break; + case 'Band': echo ''; if($row->COL_SAT_NAME != null) { echo $row->COL_SAT_NAME; } else { echo strtolower($row->COL_BAND); }; break; + case 'State': echo '' . ($row->COL_STATE); break; + } + echo ''; + + switch($this->session->userdata('user_column4')==""?'Band':$this->session->userdata('user_column4')) { + case 'Mode': echo ''; echo $row->COL_SUBMODE==null?$row->COL_MODE:$row->COL_SUBMODE; break; + case 'RSTS': echo '' . $row->COL_RST_SENT; if ($row->COL_STX_STRING) { echo '' . $row->COL_STX_STRING . '';}; break; + case 'RSTR': echo '' . $row->COL_RST_RCVD; if ($row->COL_SRX_STRING) { echo '' . $row->COL_SRX_STRING . '';}; break; + case 'Country': echo '' . ucwords(strtolower(($row->COL_COUNTRY)));; break; + case 'IOTA': echo '' . ($row->COL_IOTA); break; + case 'Grid': echo '' . ($row->COL_GRIDSQUARE); break; + case 'Band': echo ''; if($row->COL_SAT_NAME != null) { echo $row->COL_SAT_NAME; } else { echo strtolower($row->COL_BAND); }; break; + case 'State': echo '' . ($row->COL_STATE); break; + } + echo ''; + ?> @@ -96,7 +183,7 @@ Radio Status - + result_array() as $row) { ?> @@ -114,8 +201,8 @@ - lang->line('dashboard_qso_breakdown'); ?> - + lang->line('general_word_total'); ?> - + lang->line('general_word_year'); ?> @@ -149,7 +236,7 @@ lang->line('dashboard_countries_breakdown'); ?> - + lang->line('general_word_worked'); ?> @@ -162,7 +249,7 @@ - + lang->line('general_word_needed'); ?> @@ -170,21 +257,21 @@ config->item('use_auth') && ($this->session->userdata('user_type') >= 2)) || $this->config->item('use_auth') === FALSE) { ?> - +
- + - + - + diff --git a/application/views/user/add.php b/application/views/user/add.php index 64d61119..2d4d3283 100644 --- a/application/views/user/add.php +++ b/application/views/user/add.php @@ -136,6 +136,62 @@ +
+
+ + +
+ +
+ + +
+ +
+ + +
+ +
+ + +
diff --git a/application/views/user/edit.php b/application/views/user/edit.php index 712310ae..bbe6b2b2 100644 --- a/application/views/user/edit.php +++ b/application/views/user/edit.php @@ -314,6 +314,76 @@
+
+
+
+
+
+ Logbook fields +
+
+
+
+ + +
+ +
+ + +
+ +
+ + +
+ +
+ + +
+
+ +
+
+
+

@@ -321,6 +391,4 @@

- - diff --git a/application/views/view_log/partial/log_ajax.php b/application/views/view_log/partial/log_ajax.php index 0ec354f3..4e9a778f 100644 --- a/application/views/view_log/partial/log_ajax.php +++ b/application/views/view_log/partial/log_ajax.php @@ -6,10 +6,56 @@ - - - - +'; + 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_rst_sent'); break; + case 'RSTR': echo $this->lang->line('gen_hamradio_rst_recv'); break; + case 'Country': echo $this->lang->line('general_word_country'); break; + case 'IOTA': echo 'IOTA'; break; + case 'State': echo 'State'; break; + case 'Grid': echo 'Gridsquare'; break; + case 'Band': echo $this->lang->line('gen_hamradio_band'); break; + } + echo ''; + echo ''; + echo ''; + echo ''; + ?> config->item('use_auth')) && ($this->session->userdata('user_type') >= 2)) { ?> @@ -27,7 +73,7 @@ result() as $row) { ?> - session->userdata('user_date_format')) { // If Logged in and session exists @@ -45,14 +91,55 @@ - - - - COL_SAT_NAME != null) { ?> - - - - + session->userdata('user_column1')==""?'Mode':$this->session->userdata('user_column1')) { + case 'Mode': echo ''; + switch($this->session->userdata('user_column2')==""?'RSTS':$this->session->userdata('user_column2')) { + case 'Mode': echo ''; + + switch($this->session->userdata('user_column3')==""?'RSTR':$this->session->userdata('user_column3')) { + case 'Mode': echo ''; + switch($this->session->userdata('user_column4')==""?'Band':$this->session->userdata('user_column4')) { + case 'Mode': echo ''; + ?> + config->item('use_auth')) && ($this->session->userdata('user_type') >= 2)) { ?> - + - + station_callsign)) { ?> - + config->item('use_auth')) && ($this->session->userdata('user_type') >= 2)) { ?>
lang->line('general_word_qslcards'); ?>
lang->line('general_word_sent'); ?>
lang->line('general_word_received'); ?>
lang->line('general_word_requested'); ?> lang->line('general_word_time'); ?> lang->line('gen_hamradio_call'); ?>lang->line('gen_hamradio_mode'); ?>lang->line('gen_hamradio_rsts'); ?>lang->line('gen_hamradio_rstr'); ?>lang->line('gen_hamradio_band'); ?>'; + 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_rst_sent'); break; + case 'RSTR': echo $this->lang->line('gen_hamradio_rst_recv'); break; + case 'Country': echo $this->lang->line('general_word_country'); break; + case 'IOTA': echo 'IOTA'; break; + case 'State': echo 'State'; break; + case 'Grid': echo 'Gridsquare'; break; + case 'Band': echo $this->lang->line('gen_hamradio_band'); break; + } + echo ''; + 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_rst_sent'); break; + case 'RSTR': echo $this->lang->line('gen_hamradio_rst_recv'); break; + case 'Country': echo $this->lang->line('general_word_country'); break; + case 'IOTA': echo 'IOTA'; break; + case 'State': echo 'State'; break; + case 'Grid': echo 'Gridsquare'; break; + case 'Band': echo $this->lang->line('gen_hamradio_band'); break; + } + echo ''; + 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_rst_sent'); break; + case 'RSTR': echo $this->lang->line('gen_hamradio_rst_recv'); break; + case 'Country': echo $this->lang->line('general_word_country'); break; + case 'IOTA': echo 'IOTA'; break; + case 'State': echo 'State'; break; + case 'Grid': echo 'Gridsquare'; break; + case 'Band': echo $this->lang->line('gen_hamradio_band'); break; + } + echo 'lang->line('general_word_country'); ?> QSL
COL_CALL)); ?> COL_SUBMODE==null?$row->COL_MODE:$row->COL_SUBMODE; ?>COL_RST_SENT; ?> COL_STX) { ?>COL_STX;?>COL_STX_STRING) { ?>COL_STX_STRING;?>COL_RST_RCVD; ?> COL_SRX) { ?>COL_SRX;?>COL_SRX_STRING) { ?>COL_SRX_STRING;?>COL_SAT_NAME; ?>COL_BAND); ?>'; echo $row->COL_SUBMODE==null?$row->COL_MODE:$row->COL_SUBMODE; break; + case 'RSTS': echo '' . $row->COL_RST_SENT; if ($row->COL_STX) { echo '' . $row->COL_STX . '';}if ($row->COL_STX_STRING) { echo '' . $row->COL_STX_STRING . '';}; break; + case 'RSTR': echo '' . $row->COL_RST_RCVD; if ($row->COL_SRX) { echo '' . $row->COL_SRX . '';}if ($row->COL_SRX_STRING) { echo '' . $row->COL_SRX_STRING . '';}; break; + case 'Country': echo '' . ucwords(strtolower(($row->COL_COUNTRY)));; break; + case 'IOTA': echo '' . ($row->COL_IOTA); break; + case 'Grid': echo '' . ($row->COL_GRIDSQUARE); break; + case 'Band': echo ''; if($row->COL_SAT_NAME != null) { echo $row->COL_SAT_NAME; } else { echo strtolower($row->COL_BAND); }; break; + case 'State': echo '' . ($row->COL_STATE); break; + } + echo ''; echo $row->COL_SUBMODE==null?$row->COL_MODE:$row->COL_SUBMODE; break; + case 'RSTS': echo '' . $row->COL_RST_SENT; if ($row->COL_STX) { echo '' . $row->COL_STX . '';}if ($row->COL_STX_STRING) { echo '' . $row->COL_STX_STRING . '';}; break; + case 'RSTR': echo '' . $row->COL_RST_RCVD; if ($row->COL_SRX) { echo '' . $row->COL_SRX . '';}if ($row->COL_SRX_STRING) { echo '' . $row->COL_SRX_STRING . '';}; break; + case 'Country': echo '' . ucwords(strtolower(($row->COL_COUNTRY)));; break; + case 'IOTA': echo '' . ($row->COL_IOTA); break; + case 'Grid': echo '' . ($row->COL_GRIDSQUARE); break; + case 'Band': echo ''; if($row->COL_SAT_NAME != null) { echo $row->COL_SAT_NAME; } else { echo strtolower($row->COL_BAND); }; break; + case 'State': echo '' . ($row->COL_STATE); break; + } + echo ''; echo $row->COL_SUBMODE==null?$row->COL_MODE:$row->COL_SUBMODE; break; + case 'RSTS': echo '' . $row->COL_RST_SENT; if ($row->COL_STX) { echo '' . $row->COL_STX . '';}if ($row->COL_STX_STRING) { echo '' . $row->COL_STX_STRING . '';}; break; + case 'RSTR': echo '' . $row->COL_RST_RCVD; if ($row->COL_SRX) { echo '' . $row->COL_SRX . '';}if ($row->COL_SRX_STRING) { echo '' . $row->COL_SRX_STRING . '';}; break; + case 'Country': echo '' . ucwords(strtolower(($row->COL_COUNTRY)));; break; + case 'IOTA': echo '' . ($row->COL_IOTA); break; + case 'Grid': echo '' . ($row->COL_GRIDSQUARE); break; + case 'Band': echo ''; if($row->COL_SAT_NAME != null) { echo $row->COL_SAT_NAME; } else { echo strtolower($row->COL_BAND); }; break; + case 'State': echo '' . ($row->COL_STATE); break; + } + echo ''; echo $row->COL_SUBMODE==null?$row->COL_MODE:$row->COL_SUBMODE; break; + case 'RSTS': echo '' . $row->COL_RST_SENT; if ($row->COL_STX) { echo '' . $row->COL_STX . '';}if ($row->COL_STX_STRING) { echo '' . $row->COL_STX_STRING . '';}; break; + case 'RSTR': echo '' . $row->COL_RST_RCVD; if ($row->COL_SRX) { echo '' . $row->COL_SRX . '';}if ($row->COL_SRX_STRING) { echo '' . $row->COL_SRX_STRING . '';}; break; + case 'Country': echo '' . ucwords(strtolower(($row->COL_COUNTRY)));; break; + case 'IOTA': echo '' . ($row->COL_IOTA); break; + case 'Grid': echo '' . ($row->COL_GRIDSQUARE); break; + case 'Band': echo ''; if($row->COL_SAT_NAME != null) { echo $row->COL_SAT_NAME; } else { echo strtolower($row->COL_BAND); }; break; + case 'State': echo '' . ($row->COL_STATE); break; + } + echo 'COL_COUNTRY))); ?> @@ -115,15 +202,15 @@ station_callsign; ?>