mirror of
https://github.com/MrUnknownDE/VRCX.git
synced 2026-05-07 14:56:06 +02:00
fix: instance activity chart wrong online time calculation
This commit is contained in:
@@ -196,7 +196,8 @@
|
|||||||
activityDetailData,
|
activityDetailData,
|
||||||
isDetailVisible,
|
isDetailVisible,
|
||||||
isSoloInstanceVisible,
|
isSoloInstanceVisible,
|
||||||
isNoFriendInstanceVisible
|
isNoFriendInstanceVisible,
|
||||||
|
selectedDate
|
||||||
);
|
);
|
||||||
|
|
||||||
const { isDetailDataFiltered, findMatchingDetailData, generateYAxisLabel } = useChartHelpers();
|
const { isDetailDataFiltered, findMatchingDetailData, generateYAxisLabel } = useChartHelpers();
|
||||||
|
|||||||
@@ -1,14 +1,27 @@
|
|||||||
import { computed } from 'vue';
|
import { computed } from 'vue';
|
||||||
|
|
||||||
|
import dayjs from 'dayjs';
|
||||||
|
|
||||||
export function useActivityDataProcessor(
|
export function useActivityDataProcessor(
|
||||||
activityData,
|
activityData,
|
||||||
activityDetailData,
|
activityDetailData,
|
||||||
isDetailVisible,
|
isDetailVisible,
|
||||||
isSoloInstanceVisible,
|
isSoloInstanceVisible,
|
||||||
isNoFriendInstanceVisible
|
isNoFriendInstanceVisible,
|
||||||
|
selectedDate
|
||||||
) {
|
) {
|
||||||
const totalOnlineTime = computed(() => {
|
const totalOnlineTime = computed(() => {
|
||||||
return activityData.value?.reduce((acc, item) => acc + item.time, 0);
|
return activityData.value?.reduce((acc, item, idx) => {
|
||||||
|
// If the joinTime of the first data is on the previous day,
|
||||||
|
// and the data traverses midnight, the duration starts at midnight
|
||||||
|
if (idx === 0) {
|
||||||
|
const midnight = dayjs.tz(selectedDate.value).startOf('day');
|
||||||
|
if (midnight.isAfter(item.joinTime)) {
|
||||||
|
return item.leaveTime - dayjs.tz(midnight).valueOf();
|
||||||
|
}
|
||||||
|
}
|
||||||
|
return acc + item.time;
|
||||||
|
}, 0);
|
||||||
});
|
});
|
||||||
|
|
||||||
const filteredActivityDetailData = computed(() => {
|
const filteredActivityDetailData = computed(() => {
|
||||||
|
|||||||
Reference in New Issue
Block a user