diff --git a/application/config/migration.php b/application/config/migration.php index ed733d72..aebf9841 100644 --- a/application/config/migration.php +++ b/application/config/migration.php @@ -22,7 +22,7 @@ $config['migration_enabled'] = TRUE; | */ -$config['migration_version'] = 191; +$config['migration_version'] = 195; /* |-------------------------------------------------------------------------- diff --git a/application/migrations/177_add_dxped_url_option.php b/application/migrations/177_add_dxped_url_option.php index d461ec87..cfbec47f 100644 --- a/application/migrations/177_add_dxped_url_option.php +++ b/application/migrations/177_add_dxped_url_option.php @@ -11,11 +11,17 @@ class Migration_add_dxped_url_option extends CI_Migration { public function up() { - $data = array( - array('option_name' => "dxped_url", 'option_value' => "https://cdn.cloudlog.org/read_ng3k_dxped_list.php", 'autoload' => "yes"), - ); + // Check if dxped_url is already in the options table + if ($this->db->where('option_name', 'dxped_url')->count_all_results('options') == 0) { + // Insert dxped_url option + $data = array( + 'option_name' => "dxped_url", + 'option_value' => "https://cdn.cloudlog.org/read_ng3k_dxped_list.php", + 'autoload' => "yes" + ); + $this->db->insert('options', $data); + } - $this->db->insert_batch('options', $data); } public function down() diff --git a/application/migrations/192_increase_lotwpass_field_val.php b/application/migrations/192_increase_lotwpass_field_val.php new file mode 100644 index 00000000..b5001a41 --- /dev/null +++ b/application/migrations/192_increase_lotwpass_field_val.php @@ -0,0 +1,31 @@ +dbforge->modify_column('users', array( + 'user_lotw_password' => array( + 'name' => 'user_lotw_password', + 'type' => 'VARCHAR', + 'constraint' => '255', + 'null' => TRUE + ) + )); + } + + public function down() + { + // Reset it back to 64 + $this->dbforge->modify_column('users', array( + 'user_lotw_password' => array( + 'name' => 'user_lotw_password', + 'type' => 'VARCHAR', + 'constraint' => '64', + 'null' => TRUE + ) + )); + } +} diff --git a/application/migrations/193_increase_qth_column_size.php b/application/migrations/193_increase_qth_column_size.php new file mode 100644 index 00000000..7f76b910 --- /dev/null +++ b/application/migrations/193_increase_qth_column_size.php @@ -0,0 +1,31 @@ +config->item('table_name') change COL_QTH to be varchar 255 + $this->dbforge->modify_column($this->config->item('table_name'), array( + 'COL_QTH' => array( + 'name' => 'COL_QTH', + 'type' => 'VARCHAR', + 'constraint' => '255', + 'null' => TRUE + ) + )); + } + + public function down() + { + // Change it back to 64 + $this->dbforge->modify_column($this->config->item('table_name'), array( + 'COL_QTH' => array( + 'name' => 'COL_QTH', + 'type' => 'VARCHAR', + 'constraint' => '64', + 'null' => TRUE + ) + )); + } +} diff --git a/application/migrations/194_upload_so124_to_lotw.php b/application/migrations/194_upload_so124_to_lotw.php new file mode 100644 index 00000000..d8abb8a7 --- /dev/null +++ b/application/migrations/194_upload_so124_to_lotw.php @@ -0,0 +1,27 @@ +db->set('COL_SAT_NAME', 'SO-124'); + $this->db->where('COL_SAT_NAME', 'HADES-R'); + $this->db->update($this->config->item('table_name')); + log_message('info', 'Migration: Updated COL_SAT_NAME to SO-124 for HADES-R'); + + // update column COL_LOTW_QSL_SENT to N if its SO-124 + $this->db->set('COL_LOTW_QSL_SENT', 'N'); + $this->db->where('COL_SAT_NAME', 'SO-124'); + $this->db->update($this->config->item('table_name')); + log_message('info', 'Migration: Set COL_LOTW_QSL_SENT to N for SO-124'); + + } + + public function down() + { + // Not Possible + } +} diff --git a/application/migrations/195_tag_2_6_17.php b/application/migrations/195_tag_2_6_17.php new file mode 100644 index 00000000..458828d6 --- /dev/null +++ b/application/migrations/195_tag_2_6_17.php @@ -0,0 +1,30 @@ +db->where('option_name', 'version'); + $this->db->update('options', array('option_value' => '2.6.17')); + + // Trigger Version Info Dialog + $this->db->where('option_type', 'version_dialog'); + $this->db->where('option_name', 'confirmed'); + $this->db->update('user_options', array('option_value' => 'false')); + + } + + public function down() + { + $this->db->where('option_name', 'version'); + $this->db->update('options', array('option_value' => '2.6.16')); + } +} \ No newline at end of file diff --git a/application/views/interface_assets/header.php b/application/views/interface_assets/header.php index 50fea142..12f282d8 100644 --- a/application/views/interface_assets/header.php +++ b/application/views/interface_assets/header.php @@ -22,10 +22,7 @@ - - - - + diff --git a/assets/json/satellite_data.json b/assets/json/satellite_data.json index 02a3d4c6..34616d5e 100644 --- a/assets/json/satellite_data.json +++ b/assets/json/satellite_data.json @@ -499,6 +499,18 @@ ] } }, + "SO-124":{ + "Modes":{ + "V/U":[ + { + "Uplink_Mode":"FM", + "Uplink_Freq":"145925000", + "Downlink_Mode":"FM", + "Downlink_Freq":"436885000" + } + ] + } + }, "SONATE-2":{ "Modes":{ "V":[