Upstream/Plan
1
0
Fork 0
mirror of https://github.com/plan-player-analytics/Plan.git synced 2025-03-12 14:49:56 +01:00
Code Issues Projects Releases Wiki Activity

Small fixes

Browse Source
This commit is contained in:
Rsl1122 2019-08-23 15:23:01 +03:00
parent 378df81f64
commit 4af2601c44
2 changed files with 6 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
Plan/common/src/main/java/com/djrapitops/plan/db/access/queries/objects/SessionQueries.java
View File

@ -29,7 +29,6 @@ import com.djrapitops.plan.db.access.QueryStatement;
import com.djrapitops.plan.db.sql.parsing.Sql;
import com.djrapitops.plan.db.sql.tables.*;
import com.djrapitops.plan.utilities.comparators.DateHolderRecentComparator;
import org.apache.commons.lang3.StringUtils;
import java.sql.PreparedStatement;
import java.sql.ResultSet;
@ -377,14 +376,12 @@ public class SessionQueries {
}
public static Query<List<Session>> fetchLatestSessions(int limit) {
String modifiedSQL = SELECT_SESSIONS_STATEMENT +
String sql = SELECT_SESSIONS_STATEMENT
// Fix for "First Session" icons in the Most recent sessions on network page
.replace(LEFT_JOIN + UserInfoTable.TABLE_NAME + " u_info on (u_info." + UserInfoTable.USER_UUID + "=s." + SessionsTable.USER_UUID + AND + "u_info." + UserInfoTable.SERVER_UUID + "=s." + SessionsTable.SERVER_UUID + ')', "")
.replace("u_info", "u") +
WHERE + "s." + SessionsTable.SESSION_START + ">=?" +
ORDER_BY_SESSION_START_DESC;
// Fix for "First Session" icons in the Most recent sessions on network page
modifiedSQL = StringUtils.remove(modifiedSQL, LEFT_JOIN + UserInfoTable.TABLE_NAME + " u_info on u_info." + UserInfoTable.USER_UUID + "=s." + SessionsTable.USER_UUID + AND + "u_info." + UserInfoTable.SERVER_UUID + "=s." + SessionsTable.SERVER_UUID);
modifiedSQL = StringUtils.replace(modifiedSQL, "u_info", "u");
String sql = modifiedSQL; // Make effectively final for lambda
return db -> {
Long start = db.query(fetchLatestSessionStartLimit(limit));
return db.query(new QueryStatement<List<Session>>(sql) {

4
Plan/common/src/main/resources/assets/plan/web/js/player-values.js
View File

@ -194,8 +194,8 @@ function onOpenServer(i, servers) {
function createServerAccordionTitle(i, server) {
return '<tr id="server_h_' + i + '" aria-controls="server_t_' + i + '" aria-expanded="false" class="clickable collapsed bg-light-green" data-target="#server_t_' + i + '" data-toggle="collapse"><td>'
+ server.server_name +
(server.operator ? ' <i class="col-blue fab fa-fw fa-superpowers"></i>' : '') +
(server.banned ? ' <i class="col-red fas fa-fw fa-gavel"></i>' : '') +
(server.operator ? ' <i class="fab fa-fw fa-superpowers"></i>' : '') +
(server.banned ? ' <i class="fas fa-fw fa-gavel"></i>' : '') +
'</td>'
+ '<td>' + server.playtime + '</td>'
+ '<td>' + server.registered + '</td>'