diff --git a/Plan/src/main/java/com/djrapitops/plan/data/store/containers/AnalysisContainer.java b/Plan/src/main/java/com/djrapitops/plan/data/store/containers/AnalysisContainer.java index 95bae67e9..e24b3985b 100644 --- a/Plan/src/main/java/com/djrapitops/plan/data/store/containers/AnalysisContainer.java +++ b/Plan/src/main/java/com/djrapitops/plan/data/store/containers/AnalysisContainer.java @@ -110,7 +110,8 @@ public class AnalysisContainer extends DataContainer { putRawData(AnalysisKeys.ANALYSIS_TIME_DAY_AGO, now - TimeUnit.DAYS.toMillis(1L)); putRawData(AnalysisKeys.ANALYSIS_TIME_WEEK_AGO, now - TimeAmount.WEEK.toMillis(1L)); putRawData(AnalysisKeys.ANALYSIS_TIME_MONTH_AGO, now - TimeAmount.MONTH.toMillis(1L)); - putSupplier(AnalysisKeys.REFRESH_TIME_F, () -> formatters.secondLong().apply(getUnsafe(AnalysisKeys.ANALYSIS_TIME))); + putSupplier(AnalysisKeys.REFRESH_TIME_F, () -> formatters.clockLong().apply(getUnsafe(AnalysisKeys.ANALYSIS_TIME))); + putSupplier(AnalysisKeys.REFRESH_TIME_FULL_F, () -> formatters.secondLong().apply(getUnsafe(AnalysisKeys.ANALYSIS_TIME))); putRawData(AnalysisKeys.VERSION, version); putSupplier(AnalysisKeys.TIME_ZONE, config::getTimeZoneOffsetHours); diff --git a/Plan/src/main/java/com/djrapitops/plan/data/store/keys/AnalysisKeys.java b/Plan/src/main/java/com/djrapitops/plan/data/store/keys/AnalysisKeys.java index 9d7ea83dd..bab8e4adb 100644 --- a/Plan/src/main/java/com/djrapitops/plan/data/store/keys/AnalysisKeys.java +++ b/Plan/src/main/java/com/djrapitops/plan/data/store/keys/AnalysisKeys.java @@ -60,6 +60,7 @@ public class AnalysisKeys { public static final PlaceholderKey PLUGINS_TAB_NAV = new PlaceholderKey<>(String.class, "navPluginsTabs"); // Formatted time values public static final PlaceholderKey REFRESH_TIME_F = CommonPlaceholderKeys.REFRESH_TIME_F; + public static final PlaceholderKey REFRESH_TIME_FULL_F = CommonPlaceholderKeys.REFRESH_TIME_FULL_F; public static final PlaceholderKey LAST_PEAK_TIME_F = CommonPlaceholderKeys.LAST_PEAK_TIME_F; public static final PlaceholderKey ALL_TIME_PEAK_TIME_F = CommonPlaceholderKeys.ALL_TIME_PEAK_TIME_F; public static final PlaceholderKey AVERAGE_SESSION_LENGTH_F = new PlaceholderKey<>(String.class, "sessionAverage"); diff --git a/Plan/src/main/java/com/djrapitops/plan/data/store/keys/CommonPlaceholderKeys.java b/Plan/src/main/java/com/djrapitops/plan/data/store/keys/CommonPlaceholderKeys.java index 25b253555..f8722b99d 100644 --- a/Plan/src/main/java/com/djrapitops/plan/data/store/keys/CommonPlaceholderKeys.java +++ b/Plan/src/main/java/com/djrapitops/plan/data/store/keys/CommonPlaceholderKeys.java @@ -22,8 +22,8 @@ class CommonPlaceholderKeys { static final PlaceholderKey ACTIVITY_STACK_SERIES = new PlaceholderKey<>(String.class, "activityStackSeries"); static final PlaceholderKey ACTIVITY_STACK_CATEGORIES = new PlaceholderKey<>(String.class, "activityStackCategories"); static final PlaceholderKey ACTIVITY_PIE_SERIES = new PlaceholderKey<>(String.class, "activityPieSeries"); - public static final PlaceholderKey COUNTRY_CATEGORIES = new PlaceholderKey<>(String.class, "countryCategories"); - public static final PlaceholderKey COUNTRY_SERIES = new PlaceholderKey<>(String.class, "countrySeries"); + static final PlaceholderKey COUNTRY_CATEGORIES = new PlaceholderKey<>(String.class, "countryCategories"); + static final PlaceholderKey COUNTRY_SERIES = new PlaceholderKey<>(String.class, "countrySeries"); static final PlaceholderKey HEALTH_NOTES = new PlaceholderKey<>(String.class, "healthNotes"); static final PlaceholderKey HEALTH_INDEX = new PlaceholderKey<>(Double.class, "healthIndex"); @@ -36,6 +36,7 @@ class CommonPlaceholderKeys { static final PlaceholderKey PLAYERS_NEW_MONTH = new PlaceholderKey<>(Integer.class, "playersNewMonth"); static final PlaceholderKey REFRESH_TIME_F = new PlaceholderKey<>(String.class, "refresh"); + static final PlaceholderKey REFRESH_TIME_FULL_F = new PlaceholderKey<>(String.class, "refreshFull"); static final PlaceholderKey LAST_PEAK_TIME_F = new PlaceholderKey<>(String.class, "lastPeakTime"); static final PlaceholderKey ALL_TIME_PEAK_TIME_F = new PlaceholderKey<>(String.class, "bestPeakTime"); static final PlaceholderKey PLAYERS_LAST_PEAK = new PlaceholderKey<>(String.class, "playersLastPeak"); diff --git a/Plan/src/main/java/com/djrapitops/plan/utilities/html/pages/AnalysisPage.java b/Plan/src/main/java/com/djrapitops/plan/utilities/html/pages/AnalysisPage.java index 01ac0c301..1f1ef8501 100644 --- a/Plan/src/main/java/com/djrapitops/plan/utilities/html/pages/AnalysisPage.java +++ b/Plan/src/main/java/com/djrapitops/plan/utilities/html/pages/AnalysisPage.java @@ -110,7 +110,7 @@ public class AnalysisPage implements Page { private void miscTotals(PlaceholderReplacer placeholderReplacer) { timings.start(CHANNEL + " Misc. totals"); placeholderReplacer.addAllPlaceholdersFrom(analysisContainer, - REFRESH_TIME_F, LAST_PEAK_TIME_F, ALL_TIME_PEAK_TIME_F, + REFRESH_TIME_F, REFRESH_TIME_FULL_F, LAST_PEAK_TIME_F, ALL_TIME_PEAK_TIME_F, AVERAGE_SESSION_LENGTH_F, AVERAGE_PLAYTIME_F, PLAYTIME_F, PLAYERS_LAST_PEAK, PLAYERS_ALL_TIME_PEAK, OPERATORS, diff --git a/Plan/src/main/java/com/djrapitops/plan/utilities/html/pages/InspectPage.java b/Plan/src/main/java/com/djrapitops/plan/utilities/html/pages/InspectPage.java index 852473332..b2fa69619 100644 --- a/Plan/src/main/java/com/djrapitops/plan/utilities/html/pages/InspectPage.java +++ b/Plan/src/main/java/com/djrapitops/plan/utilities/html/pages/InspectPage.java @@ -60,6 +60,7 @@ public class InspectPage implements Page { private final Formatter timeAmountFormatter; private final Formatter clockLongFormatter; + private final Formatter secondLongFormatter; private final Formatter yearLongFormatter; private final Formatter decimalFormatter; @@ -90,6 +91,7 @@ public class InspectPage implements Page { timeAmountFormatter = formatters.timeAmount(); clockLongFormatter = formatters.clockLong(); + secondLongFormatter = formatters.secondLong(); yearLongFormatter = formatters.yearLong(); decimalFormatter = formatters.decimals(); } @@ -118,6 +120,7 @@ public class InspectPage implements Page { PlaceholderReplacer replacer = new PlaceholderReplacer(); replacer.put("refresh", clockLongFormatter.apply(now)); + replacer.put("refreshFull", secondLongFormatter.apply(now)); replacer.put("version", version); replacer.put("timeZone", config.getTimeZoneOffsetHours());