diff --git a/application/config/migration.php b/application/config/migration.php index 46d1487dc..d77427460 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'] = 87; +$config['migration_version'] = 88; /* |-------------------------------------------------------------------------- diff --git a/application/controllers/Radio.php b/application/controllers/Radio.php index ecc000520..78162eba2 100755 --- a/application/controllers/Radio.php +++ b/application/controllers/Radio.php @@ -91,6 +91,8 @@ $uplink_freq = $row->uplink_freq; $downlink_freq = $row->downlink_freq; + $power = $row->power; + // Check Mode if(strtoupper($row->uplink_mode) == "FMN"){ $mode = "FM"; @@ -119,6 +121,8 @@ $uplink_freq = $row->frequency; $downlink_freq = ""; + $power = $row->power; + // Check Mode if(strtoupper($row->mode) == "FMN"){ $mode = "FM"; @@ -148,6 +152,7 @@ "mode" => $mode, "satmode" => $sat_mode, "satname" => $sat_name, + "power" => $power, "updated_minutes_ago" => $updated_at, ), JSON_PRETTY_PRINT); } diff --git a/application/migrations/088_add_power_to_cat.php b/application/migrations/088_add_power_to_cat.php new file mode 100644 index 000000000..3f4f60e1d --- /dev/null +++ b/application/migrations/088_add_power_to_cat.php @@ -0,0 +1,28 @@ +db->field_exists('powre', 'cat')) { + $fields = array( + 'power INT NULL DEFAULT 0', + ); + $this->dbforge->add_column('cat', $fields, 'sat_name'); + } + } + + public function down() + { + $this->dbforge->drop_column('cat', 'power'); + } +} diff --git a/application/models/Cat.php b/application/models/Cat.php index 27bf23bbe..545011d8c 100644 --- a/application/models/Cat.php +++ b/application/models/Cat.php @@ -30,6 +30,27 @@ 'uplink_mode' => $result['uplink_mode'], ); + $this->db->where('id', $radio_id); + $this->db->where('user_id', $user_id); + $this->db->update('cat', $data); + } + } else if($result['radio'] == "CloudLogCATQt") { + // Update the record + foreach ($query->result() as $row) + { + $radio_id = $row->id; + + $data = array( + 'sat_name' => $result['sat_name'], + 'downlink_freq' => $result['downlink_freq'], + 'uplink_freq' => $result['uplink_freq'], + 'downlink_mode' => $result['downlink_mode'], + 'uplink_mode' => $result['uplink_mode'], + ); + if (isset($result['power'])) { + $data['power'] = $result['power']; + } + $this->db->where('id', $radio_id); $this->db->where('user_id', $user_id); $this->db->update('cat', $data); @@ -66,6 +87,21 @@ 'uplink_mode' => $result['uplink_mode'], 'user_id' => $user_id, ); + } else if($result['radio'] == "CloudLogCATQt") { + $data = array( + 'radio' => $result['radio'], + 'frequency' => $result['frequency'], + 'mode' => $result['mode'], + 'sat_name' => $result['sat_name'], + 'downlink_freq' => $result['downlink_freq'], + 'uplink_freq' => $result['uplink_freq'], + 'downlink_mode' => $result['downlink_mode'], + 'uplink_mode' => $result['uplink_mode'], + 'user_id' => $user_id, + ); + if (isset($result['power'])) { + $data['power'] = $result['power']; + } } else { $data = array( 'radio' => $result['radio'], diff --git a/application/views/dashboard/index.php b/application/views/dashboard/index.php index 5954bbfe9..a9a2249b9 100644 --- a/application/views/dashboard/index.php +++ b/application/views/dashboard/index.php @@ -141,7 +141,7 @@ function echoQrbCalcLink($mygrid, $grid, $vucc) {