diff --git a/application/models/Logbook_model.php b/application/models/Logbook_model.php index 80f4f5ec..0e8400cf 100755 --- a/application/models/Logbook_model.php +++ b/application/models/Logbook_model.php @@ -259,7 +259,7 @@ class Logbook_model extends CI_Model { $this->db->where('COL_STATE', $state); $this->db->where_in('COL_DXCC', ['291', '6', '110']); if($band != "SAT") { - $this->db->where('COL_BAND !=', 'SAT'); + $this->db->where('COL_PROP_MODE !=', 'SAT'); $this->db->where('COL_BAND', $band); } else { $this->db->where('COL_PROP_MODE', "SAT"); diff --git a/application/models/Was.php b/application/models/Was.php index 932c3abf..451e342d 100644 --- a/application/models/Was.php +++ b/application/models/Was.php @@ -74,10 +74,14 @@ class was extends CI_Model { $states = array(); // Used for keeping track of which states that are not worked + foreach ($stateArray as $state) { // Generating array for use in the table + $states[$state]['count'] = 0; // Inits each state's count + } + + foreach ($bands as $band) { foreach ($stateArray as $state) { // Generating array for use in the table $bandWas[$state][$band] = '-'; // Sets all to dash to indicate no result - $states[$state]['count'] = 0; // Inits each state's count } if ($postdata['worked'] != NULL) {