diff --git a/application/models/Dxcc.php b/application/models/Dxcc.php index cfa3b65c..a440c592 100644 --- a/application/models/Dxcc.php +++ b/application/models/Dxcc.php @@ -87,7 +87,7 @@ class DXCC extends CI_Model { $dxccMatrix[$dxcc->adif]['name'] = ucwords(strtolower($dxcc->name), "- (/"); $dxccMatrix[$dxcc->adif]['Dxccprefix'] = $dxcc->prefix; if ($postdata['includedeleted']) - $dxccMatrix[$dxcc->adif]['Deleted'] = isset($dxcc->Enddate) ? "
Y
" : ''; + $dxccMatrix[$dxcc->adif]['Deleted'] = isset($dxcc->Enddate) ? 1 : 0; $dxccMatrix[$dxcc->adif][$band] = '-'; } diff --git a/application/views/awards/dxcc/index.php b/application/views/awards/dxcc/index.php index 54aa3dab..d8ef7ffc 100644 --- a/application/views/awards/dxcc/index.php +++ b/application/views/awards/dxcc/index.php @@ -198,9 +198,6 @@ # DXCC Name Prefix'; - if ($this->input->post('includedeleted')) - echo ' - Deleted'; foreach($bands as $band) { echo '' . $band . ''; } @@ -210,8 +207,14 @@ foreach ($dxcc_array as $dxcc => $value) { // Fills the table with the data echo ' '. $i++ .''; - foreach ($value as $key) { - echo '' . $key . ''; + foreach ($value as $name => $key) { + if (isset($value['Deleted']) && $value['Deleted'] == 1 && $name == "name") { + echo '' . $key . ' '.$this->lang->line('gen_hamradio_deleted_dxcc').''; + } else if ($name == "Deleted") { + continue; + } else { + echo '' . $key . ''; + } } echo ''; }