diff --git a/application/config/migration.php b/application/config/migration.php index ccd36559..4597be3c 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'] = 33; +$config['migration_version'] = 34; /* |-------------------------------------------------------------------------- diff --git a/application/controllers/Dashboard.php b/application/controllers/Dashboard.php index eeb38495..34eee31a 100644 --- a/application/controllers/Dashboard.php +++ b/application/controllers/Dashboard.php @@ -31,6 +31,9 @@ class Dashboard extends CI_Controller { } else { $data['qra'] = "none"; } + + $this->load->model('stations'); + $data['current_active'] = $this->stations->find_active(); // Store info $data['todays_qsos'] = $this->logbook_model->todays_qsos(); diff --git a/application/controllers/Station.php b/application/controllers/Station.php index 826c5c64..e47ccbd0 100644 --- a/application/controllers/Station.php +++ b/application/controllers/Station.php @@ -78,6 +78,13 @@ class Station extends CI_Controller { redirect('station'); } + function assign_all() { + $this->load->model('Logbook_model'); + $this->Logbook_model->update_all_station_ids(); + + redirect('station'); + } + public function delete($id) { $this->load->model('stations'); $this->stations->delete($id); diff --git a/application/migrations/034_add_eqslqthnickname_to_stationprofile.php b/application/migrations/034_add_eqslqthnickname_to_stationprofile.php new file mode 100644 index 00000000..19cac985 --- /dev/null +++ b/application/migrations/034_add_eqslqthnickname_to_stationprofile.php @@ -0,0 +1,20 @@ +dbforge->add_column('station_profile', $fields); + } + + public function down() + { + $this->dbforge->drop_column('station_profile', 'eqslqthnickname'); + } +} \ No newline at end of file diff --git a/application/models/Logbook_model.php b/application/models/Logbook_model.php index 0824cc6e..3c5678ec 100755 --- a/application/models/Logbook_model.php +++ b/application/models/Logbook_model.php @@ -1429,8 +1429,9 @@ class Logbook_model extends CI_Model { print("$count updated\n"); } + public function check_for_station_id() { - $this->db->where('station_id !=', ""); + $this->db->where('station_id =', 'NULL'); $query = $this->db->get($this->config->item('table_name')); if($query->num_rows() >= 1) { return 1; @@ -1439,6 +1440,17 @@ class Logbook_model extends CI_Model { } } + + public function update_all_station_ids() { + + $data = array( + 'station_id' => '1', + ); + + $this->db->where(array('station_id' => NULL)); + return $this->db->update($this->config->item('table_name'), $data); + } + public function parse_frequency($frequency) { if (is_int($frequency)) diff --git a/application/views/dashboard/index.php b/application/views/dashboard/index.php index 23416cd4..a405c7cb 100644 --- a/application/views/dashboard/index.php +++ b/application/views/dashboard/index.php @@ -10,6 +10,13 @@ Important You have made no QSOs today, time to turn on the radio! + + + + + diff --git a/application/views/station_profile/index.php b/application/views/station_profile/index.php index df4aec67..3135987a 100644 --- a/application/views/station_profile/index.php +++ b/application/views/station_profile/index.php @@ -24,9 +24,11 @@ - + = 1) { ?> @@ -79,6 +81,7 @@ +

Create a Station Profile