Enhancement/#15/worked time difference (#16)

README.md

@@ -64,7 +64,7 @@ USAGE
 OPTIONS
   -b, --debug                    Debug - Exibe mais informações na execução
   -c, --company=company          (required) ID da empresa no sistema de ponto
-  -d, --date=date                [default: 2020-10-03] Data relacionada a consulta de horas no padrão YYYY-MM-DD
+  -d, --date=date                [default: 2020-10-13] Data relacionada a consulta de horas no padrão YYYY-MM-DD
   -h, --help                     show CLI help
   -j, --journeytime=journeytime  [default: 08:00] Quantidade de horas a serem trabalhadas por dia
   -p, --password=password        (required) Senha do usuário no sistema
@@ -77,7 +77,7 @@ EXAMPLES
   $ my-worktime check -u 321 -p 123 -s ahgora -c a22 -j 08:48 -d 2020-09-23
 ```
 
-_See code: [src/commands/check.ts](https://github.com/carloshpds/my-worktime/blob/v1.1.0/src/commands/check.ts)_
+_See code: [src/commands/check.ts](https://github.com/carloshpds/my-worktime/blob/v1.2.0/src/commands/check.ts)_
 
 ## `my-worktime help [COMMAND]`
 

package.json

@@ -1,6 +1,6 @@
 {
   "name": "my-worktime",
-  "version": "1.1.0",
+  "version": "1.2.0",
   "author": "Carlos Henrique <carloshpds@gmail.com> https://github.com/carloshpds",
   "contributors": [
     "Matheus Soares <matheusb95@gmail.com> https://github.com/Matheusss",

src/commands/check.ts

@@ -80,8 +80,8 @@ export default class CheckCommand extends Command {
         const worktimeDayResume: WorktimeDayResume = await worktimeProvider.getWorktimeDayResume()
 
         if(worktimeDayResume.marks.length){
-          loader.succeed(`Dados encontrados, seu horário de saída ideal é ${chalk.black.bgGreen(' ' + worktimeDayResume.shouldLeaveClockTime + ' ')}`)
-          this.printResult(worktimeDayResume)
+          loader.succeed(`Dados encontrados, seu horário ideal de saída é ${chalk.black.bgBlueBright(' ' + worktimeDayResume.shouldLeaveClockTime + ' ')}`)
+          this.printResult(worktimeDayResume, options)
         } else {
           loader.fail('Não há nenhuma batida para esta data ainda.')
         }
@@ -95,10 +95,10 @@ export default class CheckCommand extends Command {
     }
   }
 
-  printResult(worktimeDayResume: WorktimeDayResume){
+  printResult(worktimeDayResume: WorktimeDayResume, options: Partial<WorktimeProviderOptions>){
     const marksToConsole = worktimeDayResume.marks.map((mark, index) => {
       const isLastMark = index === worktimeDayResume.marks.length - 1
-      let markOnConsole = chalk.green(mark.clock)
+      let markOnConsole = chalk.blueBright(mark.clock)
 
       if(isLastMark && worktimeDayResume.isMissingPairMark){
         markOnConsole = chalk.yellow(mark.clock) + chalk.gray(' Batida ímpar')
@@ -110,7 +110,18 @@ export default class CheckCommand extends Command {
     let workedMinutesUntilNowOnConsole = ClockHelper.humanizeMinutesToClock(worktimeDayResume.workedMinutesUntilNow)
 
     if(worktimeDayResume.isMissingPairMark){
-      workedMinutesUntilNowOnConsole = chalk.yellow(workedMinutesUntilNowOnConsole)
+      workedMinutesUntilNowOnConsole = chalk.yellow(workedMinutesUntilNowOnConsole) + ' '
+    }
+
+    if(worktimeDayResume.missingMinutesToCompleteJourney){
+      const humanizedMissingMinutes = ClockHelper.humanizeMinutesToClock(worktimeDayResume.missingMinutesToCompleteJourney)
+
+      workedMinutesUntilNowOnConsole += chalk.gray(` - ${options.journeyTime} = `)
+      if(worktimeDayResume.missingMinutesToCompleteJourney > 0) {
+        workedMinutesUntilNowOnConsole += chalk.red(`-${humanizedMissingMinutes} `)
+      } else {
+        workedMinutesUntilNowOnConsole += chalk.green(`+${humanizedMissingMinutes} `)
+      }
     }
 
     console.log('')

src/providers/WorktimeProvider.ts

@@ -84,18 +84,23 @@ export default abstract class WorktimeProvider {
       shouldLeaveMarks.pop()
     }
 
-    const missingMinutesToCompleteJourney = journeyTimeInMinutes - registeredWorkedMinutes
+    let missingMinutesToCompleteJourney = journeyTimeInMinutes - registeredWorkedMinutes
     const minutesFromTheLastMark = ClockHelper.convertClockStringToMinutes(shouldLeaveMarks[shouldLeaveMarks.length - 1].clock)
     const breakMinutesToCalculateShouldLeaveClockTime = breakMinutes > 60 && registeredWorkedMinutes > journeyTimeInMinutes && !lastPeriodIsOpen ? breakMinutes - 60 : 0
     const shouldLeaveClockTime = ClockHelper.humanizeMinutesToClock((minutesFromTheLastMark + missingMinutesToCompleteJourney) - breakMinutesToCalculateShouldLeaveClockTime)
 
+    if(lastPeriodIsOpen){
+      missingMinutesToCompleteJourney = journeyTimeInMinutes - workedMinutesUntilNow
+    }
+
     return {
       registeredWorkedMinutes,
       workedMinutesUntilNow,
       isMissingPairMark: lastPeriodIsOpen,
       shouldLeaveClockTime,
       breakMinutes,
       journeyTimeInMinutes,
+      missingMinutesToCompleteJourney,
       marks,
       now,
     }
@@ -106,6 +111,7 @@ export default abstract class WorktimeProvider {
       isMissingPairMark: false,
       registeredWorkedMinutes: 0,
       workedMinutesUntilNow: 0,
+      missingMinutesToCompleteJourney: 0,
       breakMinutes: 0,
       marks
     }

src/providers/__tests__/WorktimeProvider.spec.ts

@@ -116,6 +116,7 @@ describe('WorktimeProvier', () => {
         expect(worktimeDayResume.registeredWorkedMinutes).toBe(60 * 8)
         expect(worktimeDayResume.workedMinutesUntilNow).toBe(60 * 8)
         expect(worktimeDayResume.shouldLeaveClockTime).toBe('18:00')
+        expect(worktimeDayResume.missingMinutesToCompleteJourney).toBe(0)
         expect(worktimeDayResume.isMissingPairMark).toBe(false)
       })
 
@@ -138,10 +139,12 @@ describe('WorktimeProvier', () => {
         const worktimeProvider: WorktimeProvider = new AbstractProvider(defaultOptions)
         const worktimeDayResume: WorktimeDayWorkedTime = worktimeProvider.calculateWorkedTimeMinutes(marks, currentMomentDate.format())
         const twelveHours = 60 * 12
+        const fourExtraHours = -(60 * 4)
 
         expect(worktimeDayResume.registeredWorkedMinutes).toBe(twelveHours)
         expect(worktimeDayResume.workedMinutesUntilNow).toBe(twelveHours)
         expect(worktimeDayResume.shouldLeaveClockTime).toBe('18:00')
+        expect(worktimeDayResume.missingMinutesToCompleteJourney).toBe(fourExtraHours)
         expect(worktimeDayResume.isMissingPairMark).toBe(false)
       })
 
@@ -345,9 +348,12 @@ describe('WorktimeProvier', () => {
         const worktimeDayResume: WorktimeDayWorkedTime = worktimeProvider.calculateWorkedTimeMinutes(marks, currentMomentDate.format())
         const elevenHours = 60 * 11
         const twelveHoursAndFifthNineMinutes = elevenHours + 119 // 119 = 1h + 59m
+        const threeExtraHoursAndFifthNineMinutes = -(60 * 3 + 119) // 119 = 1h + 59m
 
         expect(worktimeDayResume.registeredWorkedMinutes).toBe(elevenHours)
         expect(worktimeDayResume.workedMinutesUntilNow).toBe(twelveHoursAndFifthNineMinutes)
+        expect(worktimeDayResume.missingMinutesToCompleteJourney).toBe(threeExtraHoursAndFifthNineMinutes)
+
       })
 
       it('Calulates to odd marks', () => {
@@ -370,6 +376,7 @@ describe('WorktimeProvier', () => {
 
         expect(worktimeDayResume.registeredWorkedMinutes).toBe(threeHours)
         expect(worktimeDayResume.workedMinutesUntilNow).toBe(eightHours)
+        expect(worktimeDayResume.missingMinutesToCompleteJourney).toBe(0)
       })
 
       it('Calulates to values less than an hour', () => {

src/providers/types.ts

@@ -9,11 +9,13 @@ export interface WorktimeDayWorkedTime {
   breakMinutes: number;
   now: Moment;
   marks: WorktimeDayMark[];
+  missingMinutesToCompleteJourney: number;
 }
 
 export interface WorktimeDayResume {
   registeredWorkedMinutes: number;
   workedMinutesUntilNow: number;
+  missingMinutesToCompleteJourney: number;
   breakMinutes: number;
   shouldLeaveClockTime?: string;
   isMissingPairMark: boolean;

src/utils/ClockHelper/__tests__/index.spec.ts

@@ -42,6 +42,11 @@ describe('Clock Helper', () => {
         const clock = ClockHelper.humanizeMinutesToClock(1290)
         expect(clock).toBe('21:30')
       })
+
+      it('Humanizes negative numbers', () => {
+        const clock = ClockHelper.humanizeMinutesToClock(-1290)
+        expect(clock).toBe('21:30')
+      })
     })
   })
 

src/utils/ClockHelper/index.ts

@@ -12,7 +12,7 @@ class ClockHelper {
   }
 
   humanizeMinutesToClock(minutes: number | string, options = {separator: ':'}): string {
-    const minutesNumber = typeof minutes === 'number' ? minutes : parseInt(minutes, 10)
+    const minutesNumber = typeof minutes === 'number' ? Math.abs(minutes) : Math.abs(parseInt(minutes, 10))
     const realHoursNumbers = Math.floor(minutesNumber / 60)
     const realMinutes = minutesNumber % 60