From bb79ecdaa1e1930cdb611b6abfb531852771ac27 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Thu, 23 Nov 2023 17:49:34 +0200 Subject: [PATCH] Fix missing overtime print --- src/input.ts | 6 +++--- src/output.ts | 6 +++--- src/types/WtcPromptResult.ts | 2 +- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/src/input.ts b/src/input.ts index e49e582..96d2450 100644 --- a/src/input.ts +++ b/src/input.ts @@ -1,6 +1,5 @@ import chalk from 'chalk'; import { Duration } from 'dayjs/plugin/duration'; -import getConfig from './config'; import { parseDuration, parseTimestamp } from './parse'; import * as readline from 'readline/promises'; import { formatDuration, formatTime } from './format'; @@ -110,10 +109,10 @@ const input = async (config: WtcConfig): Promise => { const unLogged = worked.subtract(logged); const workLeft = workDayDuration.subtract(worked); let workLeftMinutes = workLeft.asMinutes(); - let workedOverTime: Duration | undefined; + let workedOvertime: Duration | undefined; if (workLeftMinutes < 0) { - workedOverTime = dayjs.duration(Math.round(workLeftMinutes * -1), 'minutes'); + workedOvertime = dayjs.duration(Math.round(workLeftMinutes * -1), 'minutes'); } return { @@ -125,6 +124,7 @@ const input = async (config: WtcConfig): Promise => { hadLunch, worked, workLeft, + workedOvertime, }; } finally { rl.close(); diff --git a/src/output.ts b/src/output.ts index 5e98780..0bcd8c7 100644 --- a/src/output.ts +++ b/src/output.ts @@ -10,7 +10,7 @@ const output = (result: WtcPromptResult, config: WtcConfig) => { const msg = message(config.language); const fmtDuration = formatDuration(config.language); const hoursRounded = getHoursRoundedStr(config.language); - const { startedAt, stoppedAt, stoppedWorking, worked, unLogged, workLeft, workedOverTime } = result; + const { startedAt, stoppedAt, stoppedWorking, worked, unLogged, workLeft, workedOvertime } = result; log(); log(msg(MessageKey.startedWorking), formatTimestamp(startedAt)); log( @@ -33,8 +33,8 @@ const output = (result: WtcPromptResult, config: WtcConfig) => { if (workLeft.asMinutes() > 0) { log(msg(MessageKey.workLeft, chalk.green(fmtDuration(workLeft)))); - } else if (workedOverTime) { - log(msg(MessageKey.workedOvertime, chalk.green(fmtDuration(workedOverTime)))); + } else if (workedOvertime) { + log(msg(MessageKey.workedOvertime, chalk.green(fmtDuration(workedOvertime)))); } }; diff --git a/src/types/WtcPromptResult.ts b/src/types/WtcPromptResult.ts index ed3ee0f..9e0f269 100644 --- a/src/types/WtcPromptResult.ts +++ b/src/types/WtcPromptResult.ts @@ -10,5 +10,5 @@ export interface WtcPromptResult { hadLunch: boolean; worked: Duration; workLeft: Duration; - workedOverTime?: Duration; + workedOvertime?: Duration; }