diff --git a/application/language/bulgarian/admin_lang.php b/application/language/bulgarian/admin_lang.php index 6346ae857..6958c6a10 100644 --- a/application/language/bulgarian/admin_lang.php +++ b/application/language/bulgarian/admin_lang.php @@ -13,6 +13,8 @@ $lang['admin_user'] = 'User'; $lang['admin_email'] = 'E-mail'; $lang['admin_type'] = 'Type'; $lang['admin_last_seen'] = "Last seen"; +$lang['admin_last_qso'] = "Last QSO:"; +$lang['admin_no_qso_in_log'] = "No QSOs in Log"; $lang['admin_options'] = 'Options'; $lang['admin_station_logbooks'] = 'Logbooks'; diff --git a/application/language/chinese_simplified/admin_lang.php b/application/language/chinese_simplified/admin_lang.php index 0ea6ddde3..49144b860 100644 --- a/application/language/chinese_simplified/admin_lang.php +++ b/application/language/chinese_simplified/admin_lang.php @@ -13,6 +13,8 @@ $lang['admin_user'] = '用户名'; $lang['admin_email'] = '电子邮件'; $lang['admin_type'] = '用户类型'; $lang['admin_last_seen'] = "Last seen"; +$lang['admin_last_qso'] = "Last QSO:"; +$lang['admin_no_qso_in_log'] = "No QSOs in Log"; $lang['admin_options'] = '设置'; $lang['admin_station_logbooks'] = 'Logbooks'; diff --git a/application/language/czech/admin_lang.php b/application/language/czech/admin_lang.php index df615ae56..9ab8a346a 100644 --- a/application/language/czech/admin_lang.php +++ b/application/language/czech/admin_lang.php @@ -13,6 +13,8 @@ $lang['admin_user'] = 'Uživatel'; $lang['admin_email'] = 'E-mail'; $lang['admin_type'] = 'Typ'; $lang['admin_last_seen'] = "Last seen"; +$lang['admin_last_qso'] = "Last QSO:"; +$lang['admin_no_qso_in_log'] = "No QSOs in Log"; $lang['admin_options'] = 'Možnosti'; $lang['admin_station_logbooks'] = 'Logbooks'; diff --git a/application/language/dutch/admin_lang.php b/application/language/dutch/admin_lang.php index 5c9385f2c..9c542bac9 100644 --- a/application/language/dutch/admin_lang.php +++ b/application/language/dutch/admin_lang.php @@ -13,6 +13,8 @@ $lang['admin_user'] = 'User'; $lang['admin_email'] = 'E-mail'; $lang['admin_type'] = 'Type'; $lang['admin_last_seen'] = "Last seen"; +$lang['admin_last_qso'] = "Last QSO:"; +$lang['admin_no_qso_in_log'] = "No QSOs in Log"; $lang['admin_options'] = 'Options'; $lang['admin_station_logbooks'] = 'Logbooks'; diff --git a/application/language/english/admin_lang.php b/application/language/english/admin_lang.php index dc3d0257b..5b2f7cb0f 100644 --- a/application/language/english/admin_lang.php +++ b/application/language/english/admin_lang.php @@ -13,6 +13,8 @@ $lang['admin_user'] = 'User'; $lang['admin_email'] = 'E-mail'; $lang['admin_type'] = 'Type'; $lang['admin_last_seen'] = "Last seen"; +$lang['admin_last_qso'] = "Last QSO:"; +$lang['admin_no_qso_in_log'] = "No QSOs in Log"; $lang['admin_options'] = 'Options'; $lang['admin_station_logbooks'] = 'Logbooks'; diff --git a/application/language/finnish/admin_lang.php b/application/language/finnish/admin_lang.php index 02e2b9127..93d80132a 100644 --- a/application/language/finnish/admin_lang.php +++ b/application/language/finnish/admin_lang.php @@ -13,6 +13,8 @@ $lang['admin_user'] = 'Käyttäjä'; $lang['admin_email'] = 'E-mail'; $lang['admin_type'] = 'Rooli'; $lang['admin_last_seen'] = "Last seen"; +$lang['admin_last_qso'] = "Last QSO:"; +$lang['admin_no_qso_in_log'] = "No QSOs in Log"; $lang['admin_options'] = 'Valinnat'; $lang['admin_station_logbooks'] = 'Logbooks'; diff --git a/application/language/french/admin_lang.php b/application/language/french/admin_lang.php index 90529a104..3bd1263c2 100644 --- a/application/language/french/admin_lang.php +++ b/application/language/french/admin_lang.php @@ -13,6 +13,8 @@ $lang['admin_user'] = "Utilisateur"; $lang['admin_email'] = "E-mail"; $lang['admin_type'] = "Type"; $lang['admin_last_seen'] = "Last seen"; +$lang['admin_last_qso'] = "Last QSO:"; +$lang['admin_no_qso_in_log'] = "No QSOs in Log"; $lang['admin_options'] = "Options"; $lang['admin_station_logbooks'] = 'Logbooks'; diff --git a/application/language/german/admin_lang.php b/application/language/german/admin_lang.php index df7213e0b..69cf96f8f 100644 --- a/application/language/german/admin_lang.php +++ b/application/language/german/admin_lang.php @@ -13,6 +13,8 @@ $lang['admin_user'] = 'Benutzer'; $lang['admin_email'] = 'E-Mail'; $lang['admin_type'] = 'Typ'; $lang['admin_last_seen'] = "Zuletzt gesehen"; +$lang['admin_last_qso'] = "Letztes QSO:"; +$lang['admin_no_qso_in_log'] = "Keine QSOs im Log"; $lang['admin_options'] = 'Optionen'; $lang['admin_station_logbooks'] = 'Logbücher'; diff --git a/application/language/greek/admin_lang.php b/application/language/greek/admin_lang.php index dc3d0257b..5b2f7cb0f 100644 --- a/application/language/greek/admin_lang.php +++ b/application/language/greek/admin_lang.php @@ -13,6 +13,8 @@ $lang['admin_user'] = 'User'; $lang['admin_email'] = 'E-mail'; $lang['admin_type'] = 'Type'; $lang['admin_last_seen'] = "Last seen"; +$lang['admin_last_qso'] = "Last QSO:"; +$lang['admin_no_qso_in_log'] = "No QSOs in Log"; $lang['admin_options'] = 'Options'; $lang['admin_station_logbooks'] = 'Logbooks'; diff --git a/application/language/italian/admin_lang.php b/application/language/italian/admin_lang.php index dc3d0257b..5b2f7cb0f 100644 --- a/application/language/italian/admin_lang.php +++ b/application/language/italian/admin_lang.php @@ -13,6 +13,8 @@ $lang['admin_user'] = 'User'; $lang['admin_email'] = 'E-mail'; $lang['admin_type'] = 'Type'; $lang['admin_last_seen'] = "Last seen"; +$lang['admin_last_qso'] = "Last QSO:"; +$lang['admin_no_qso_in_log'] = "No QSOs in Log"; $lang['admin_options'] = 'Options'; $lang['admin_station_logbooks'] = 'Logbooks'; diff --git a/application/language/polish/admin_lang.php b/application/language/polish/admin_lang.php index dc3d0257b..5b2f7cb0f 100644 --- a/application/language/polish/admin_lang.php +++ b/application/language/polish/admin_lang.php @@ -13,6 +13,8 @@ $lang['admin_user'] = 'User'; $lang['admin_email'] = 'E-mail'; $lang['admin_type'] = 'Type'; $lang['admin_last_seen'] = "Last seen"; +$lang['admin_last_qso'] = "Last QSO:"; +$lang['admin_no_qso_in_log'] = "No QSOs in Log"; $lang['admin_options'] = 'Options'; $lang['admin_station_logbooks'] = 'Logbooks'; diff --git a/application/language/russian/admin_lang.php b/application/language/russian/admin_lang.php index 522f62d23..95ad9fd0b 100644 --- a/application/language/russian/admin_lang.php +++ b/application/language/russian/admin_lang.php @@ -13,6 +13,8 @@ $lang['admin_user'] = 'Пользователь'; $lang['admin_email'] = 'Емэйл'; $lang['admin_type'] = 'Роль'; $lang['admin_last_seen'] = "Last seen"; +$lang['admin_last_qso'] = "Last QSO:"; +$lang['admin_no_qso_in_log'] = "No QSOs in Log"; $lang['admin_options'] = 'Опции'; $lang['admin_station_logbooks'] = 'Logbooks'; diff --git a/application/language/spanish/admin_lang.php b/application/language/spanish/admin_lang.php index 89f7b8a2e..95d18aa9f 100644 --- a/application/language/spanish/admin_lang.php +++ b/application/language/spanish/admin_lang.php @@ -13,6 +13,8 @@ $lang['admin_email'] = 'Email'; $lang['admin_type'] = 'Tipo'; $lang['admin_last_seen'] = "Last seen"; $lang['admin_options'] = 'Opciones'; +$lang['admin_last_qso'] = "Last QSO:"; +$lang['admin_no_qso_in_log'] = "No QSOs in Log"; $lang['admin_station_logbooks'] = 'Logbooks'; $lang['admin_station_locations'] = 'Locations'; diff --git a/application/language/swedish/admin_lang.php b/application/language/swedish/admin_lang.php index 0d617a80d..61a677f29 100644 --- a/application/language/swedish/admin_lang.php +++ b/application/language/swedish/admin_lang.php @@ -13,6 +13,8 @@ $lang['admin_user'] = 'Användare'; $lang['admin_email'] = 'E-post'; $lang['admin_type'] = 'Typ'; $lang['admin_last_seen'] = "Last seen"; +$lang['admin_last_qso'] = "Last QSO:"; +$lang['admin_no_qso_in_log'] = "No QSOs in Log"; $lang['admin_options'] = 'Alternativ'; $lang['admin_station_logbooks'] = 'Logbooks'; diff --git a/application/language/turkish/admin_lang.php b/application/language/turkish/admin_lang.php index c35c6b1fb..34239065c 100644 --- a/application/language/turkish/admin_lang.php +++ b/application/language/turkish/admin_lang.php @@ -13,6 +13,8 @@ $lang['admin_user'] = 'User'; $lang['admin_email'] = 'E-mail'; $lang['admin_type'] = 'Type'; $lang['admin_last_seen'] = "Last seen"; +$lang['admin_last_qso'] = "Last QSO:"; +$lang['admin_no_qso_in_log'] = "No QSOs in Log"; $lang['admin_options'] = 'Options'; $lang['admin_station_logbooks'] = 'Logbooks'; diff --git a/application/models/User_model.php b/application/models/User_model.php index 6b580d058..b26681cba 100644 --- a/application/models/User_model.php +++ b/application/models/User_model.php @@ -464,9 +464,13 @@ class User_Model extends CI_Model { // FUNCTION: object users() // Returns a list of users with additional counts function users() { - $this->db->select('(SELECT count(*) FROM station_profile WHERE user_id = users.user_id) as stationcount'); - $this->db->select('(SELECT count(*) FROM station_logbooks WHERE user_id = users.user_id) as logbookcount'); - $this->db->select('(SELECT count(*) FROM ' . $this->config->item('table_name') . ' WHERE station_id IN (SELECT station_id from station_profile WHERE user_id = users.user_id)) as qsocount'); + $this->db->select('(SELECT COUNT(*) FROM station_profile WHERE user_id = users.user_id) as stationcount'); + $this->db->select('(SELECT COUNT(*) FROM station_logbooks WHERE user_id = users.user_id) as logbookcount'); + $this->db->select('(SELECT COUNT(*) FROM ' . $this->config->item('table_name') . ' WHERE station_id IN (SELECT station_id from station_profile WHERE user_id = users.user_id)) as qsocount'); + $this->db->select(' + (SELECT COUNT(*) FROM ' . $this->config->item('table_name') . ' WHERE station_id IN (SELECT station_id FROM station_profile WHERE user_id = users.user_id)) as qsocount, + (SELECT MAX(COL_TIME_ON) FROM ' . $this->config->item('table_name') . ' WHERE station_id IN (SELECT station_id FROM station_profile WHERE user_id = users.user_id)) as lastqso + '); $this->db->select('users.*'); $this->db->from('users'); diff --git a/application/views/user/main.php b/application/views/user/main.php index 4f58d1e6a..89c037e3f 100644 --- a/application/views/user/main.php +++ b/application/views/user/main.php @@ -80,7 +80,11 @@ : stationcount; ?>
: logbookcount; ?> - qsocount; ?> + qsocount > 0) { ?> + qsocount; ?> + + qsocount; ?> + user_id; ?>" class="btn btn-outline-primary btn-sm">