Skip to content
This repository was archived by the owner on Dec 26, 2022. It is now read-only.

Commit 09f07d4

Browse files
committed
Fix duration display
1 parent 6f009d6 commit 09f07d4

File tree

3 files changed

+16
-10
lines changed

3 files changed

+16
-10
lines changed

src/base/repositories/AbstractFileRepository.ts

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,10 @@ const path = require('path');
44
import FsHelper from '../../helpers/FsHelper';
55
import PromiseQueue from '../../helpers/PromiseQueueHellper';
66

7-
const APP_DIR = 'YadroTimeTracker';
7+
const APP_DIR =
8+
process.env.NODE_ENV === 'development'
9+
? 'YadroTimeTracker_test'
10+
: 'YadroTimeTracker';
811

912
export default abstract class AbstractFileRepository<T = any> {
1013
dirWithProfileData: string = 'profile1';

src/hooks/TaskHooks.ts

Lines changed: 11 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ import { calcDuration, calcDurationGaps, msToTime } from '../helpers/DateTime';
55
import TaskModel, { ITimeRangeModel } from '../modules/tasks/models/TaskModel';
66
import TaskTimeItemModel from '../modules/tasks/models/TaskTimeItemModel';
77

8-
export function useTaskDuration(model: TaskModel | undefined) {
8+
export function useTaskDuration(model?: TaskModel, showZero?: boolean) {
99
const intervalRef = useRef<NodeJS.Timeout>();
1010
const [duration, setDuration] = useState<string>('');
1111

@@ -14,9 +14,12 @@ export function useTaskDuration(model: TaskModel | undefined) {
1414
return;
1515
}
1616
const duration = model.duration;
17-
if (duration !== 0) {
18-
setDuration(msToTime(duration, model.active));
19-
}
17+
18+
const durationMs =
19+
duration !== 0 || showZero ? msToTime(duration, model.active) : '';
20+
21+
setDuration(durationMs);
22+
2023
if (model.active) {
2124
intervalRef.current = setInterval(() => {
2225
setDuration(msToTime(model?.duration || 0));
@@ -39,12 +42,12 @@ export function useTimeItemsDuration(taskTime: TaskTimeItemModel[]) {
3942

4043
const calcTaskDuration = useCallback(
4144
() => calcDuration(taskTime.map((t) => t.time)),
42-
[taskTime],
45+
[taskTime]
4346
);
4447

4548
const calcTaskGapsDuration = useCallback(
4649
() => calcDurationGaps(taskTime.map((t) => t.time)),
47-
[taskTime],
50+
[taskTime]
4851
);
4952

5053
const setTimes = useCallback(() => {
@@ -78,7 +81,7 @@ export function useTimeRangeDuration(timeRange: ITimeRangeModel | undefined) {
7881

7982
const calcTimeRangeDuration = useCallback(
8083
() => msToTime(timeRange ? calcDuration([timeRange]) : 0),
81-
[timeRange],
84+
[timeRange]
8285
);
8386

8487
useEffect(() => {
@@ -104,7 +107,7 @@ export function useTimeRangeDuration(timeRange: ITimeRangeModel | undefined) {
104107
}
105108

106109
export function useStartWorkingTime(
107-
timeItems: TaskTimeItemModel[],
110+
timeItems: TaskTimeItemModel[]
108111
): Date | undefined {
109112
return useMemo(() => {
110113
let minTime: Date | undefined;

src/screens/projects/components/DrawerTask/components/Duration.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ interface DurationProps {
1414

1515
export default observer(function Duration({ task }: DurationProps) {
1616
const classes = useStyle();
17-
const duration = TaskHooks.useTaskDuration(task);
17+
const duration = TaskHooks.useTaskDuration(task, true);
1818

1919
return (
2020
<div className={classes.root}>

0 commit comments

Comments
 (0)