Skip to content

Commit 0cf1c2c

Browse files
author
sheepzh
committed
Fix habit error
1 parent 1695f96 commit 0cf1c2c

File tree

2 files changed

+5
-9
lines changed

2 files changed

+5
-9
lines changed

src/app/components/habit/index.ts

Lines changed: 4 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ import { daysAgo, isSameDay } from "@util/time"
1414
import ContentContainer from "@app/components/common/content-container"
1515
import HabitChart from "./component/chart"
1616
import HabitFilter from "./component/filter"
17-
import { keyOf, MAX_PERIOD_ORDER } from "@util/period"
17+
import { keyOf, MAX_PERIOD_ORDER, keyBefore } from "@util/period"
1818

1919
function computeParam(periodSize: Ref<number>, dateRange: Ref<Date[]>, averageByDate: Ref<boolean>) {
2020
let dateRangeVal = dateRange.value
@@ -28,16 +28,16 @@ function computeParam(periodSize: Ref<number>, dateRange: Ref<Date[]>, averageBy
2828
if (endIsToday) {
2929
periodEnd = keyOf(now)
3030
periodStart = keyOf(startDate, periodEnd.order)
31-
periodEnd = before(periodEnd, 1)
31+
periodEnd = keyBefore(periodEnd, 1)
3232
} else {
3333
periodEnd = keyOf(endDate, MAX_PERIOD_ORDER)
3434
periodStart = keyOf(startDate, 0)
3535
}
3636

3737
const remainder = (periodEnd.order + 1) % periodSize.value
3838
if (remainder) {
39-
periodEnd = before(periodEnd, remainder)
40-
periodStart = before(periodStart, remainder)
39+
periodEnd = keyBefore(periodEnd, remainder)
40+
periodStart = keyBefore(periodStart, remainder)
4141
}
4242

4343
return {
@@ -84,7 +84,3 @@ const _default = defineComponent({
8484
})
8585

8686
export default _default
87-
88-
function before(periodEnd: timer.period.Key, arg1: number): timer.period.Key {
89-
throw new Error("Function not implemented.")
90-
}

src/util/period.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ export function compare(a: timer.period.Key, b: timer.period.Key) {
4040
return indexOf(a) - indexOf(b)
4141
}
4242

43-
function keyBefore(key: timer.period.Key, orderCount: number) {
43+
export function keyBefore(key: timer.period.Key, orderCount: number) {
4444
let order = key.order
4545
let decomposition = 0
4646

0 commit comments

Comments
 (0)