From cffbc412093735cc3edb985c93502c3c390aa2b7 Mon Sep 17 00:00:00 2001 From: Rene Enriquez Date: Thu, 25 Jun 2020 12:12:28 -0500 Subject: [PATCH 1/5] fix: #428 show required fields in form --- .../details-fields/details-fields.component.html | 6 +++--- .../details-fields/details-fields.component.spec.ts | 8 ++++++++ .../details-fields/details-fields.component.ts | 12 ++++++++---- 3 files changed, 19 insertions(+), 7 deletions(-) diff --git a/src/app/modules/shared/components/details-fields/details-fields.component.html b/src/app/modules/shared/components/details-fields/details-fields.component.html index 5f9f8a0eb..047242461 100644 --- a/src/app/modules/shared/components/details-fields/details-fields.component.html +++ b/src/app/modules/shared/components/details-fields/details-fields.component.html @@ -8,7 +8,7 @@ Project
- + diff --git a/src/app/modules/shared/components/details-fields/details-fields.component.spec.ts b/src/app/modules/shared/components/details-fields/details-fields.component.spec.ts index eb1effcf2..2a35c264d 100644 --- a/src/app/modules/shared/components/details-fields/details-fields.component.spec.ts +++ b/src/app/modules/shared/components/details-fields/details-fields.component.spec.ts @@ -106,6 +106,14 @@ describe('DetailsFieldsComponent', () => { expect(component).toBeTruthy(); }); + it('if form is invalid then no save is emited', () => { + spyOn(component.saveEntry, 'emit'); + + component.onSubmit(); + + expect(component.saveEntry.emit).toHaveBeenCalledTimes(0); + }); + [ {actionType: EntryActionTypes.CREATE_ENTRY_SUCCESS}, {actionType: EntryActionTypes.UPDATE_ENTRY_SUCCESS}, diff --git a/src/app/modules/shared/components/details-fields/details-fields.component.ts b/src/app/modules/shared/components/details-fields/details-fields.component.ts index b7160bdeb..acf3416f6 100644 --- a/src/app/modules/shared/components/details-fields/details-fields.component.ts +++ b/src/app/modules/shared/components/details-fields/details-fields.component.ts @@ -2,7 +2,7 @@ import { EntryActionTypes } from './../../../time-clock/store/entry.actions'; import { filter } from 'rxjs/operators'; import { NumberFormatter } from './../../formatters/number.formatter'; import { Component, ElementRef, EventEmitter, Input, OnChanges, OnInit, Output, ViewChild, } from '@angular/core'; -import { FormBuilder, FormGroup } from '@angular/forms'; +import { FormBuilder, FormGroup, Validators } from '@angular/forms'; import { ActionsSubject, select, Store } from '@ngrx/store'; import { formatDate } from '@angular/common'; @@ -36,10 +36,11 @@ export class DetailsFieldsComponent implements OnChanges, OnInit { goingToWorkOnThis = false; shouldRestartEntry = false; - constructor(private formBuilder: FormBuilder, private store: Store, private actionsSubject$: ActionsSubject) { + constructor(private formBuilder: FormBuilder, private store: Store, + private actionsSubject$: ActionsSubject) { this.entryForm = this.formBuilder.group({ - project_id: '', - activity_id: '', + project_id: ['', Validators.required], + activity_id: ['', Validators.required], description: '', entry_date: '', start_hour: '', @@ -150,6 +151,9 @@ export class DetailsFieldsComponent implements OnChanges, OnInit { } onSubmit() { + if (this.entryForm.invalid) { + return; + } // start&end date same for now const entryDate = this.entryForm.value.entry_date; const entry = { From 800346ec5e120b968eebc026b81d7929aa9dd2a4 Mon Sep 17 00:00:00 2001 From: semantic-release-bot Date: Thu, 25 Jun 2020 17:27:44 +0000 Subject: [PATCH 2/5] chore(release): 1.9.7 [skip ci]nn --- package-lock.json | 2 +- package.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package-lock.json b/package-lock.json index fd4575b1d..4ebfdb0d1 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,6 +1,6 @@ { "name": "time-tracker", - "version": "1.9.6", + "version": "1.9.7", "lockfileVersion": 1, "requires": true, "dependencies": { diff --git a/package.json b/package.json index 22a24800d..13288f625 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "time-tracker", - "version": "1.9.6", + "version": "1.9.7", "scripts": { "ng": "ng", "start": "ng serve", From c9384d445cf3a682b6a50da1b7f3ff69a155d636 Mon Sep 17 00:00:00 2001 From: Rene Enriquez Date: Mon, 29 Jun 2020 03:27:19 -0500 Subject: [PATCH 3/5] fix: #414 fix time in stop --- .../time-entries-table.component.ts | 5 +- .../details-fields.component.html | 4 +- .../details-fields.component.spec.ts | 87 ++++++------------- .../details-fields.component.ts | 24 ++--- .../entry-fields/entry-fields.component.html | 2 +- .../time-clock/store/entry.effects.spec.ts | 18 ++-- .../modules/time-clock/store/entry.effects.ts | 6 +- .../pages/time-entries.component.ts | 23 ----- 8 files changed, 51 insertions(+), 118 deletions(-) diff --git a/src/app/modules/reports/components/time-entries-table/time-entries-table.component.ts b/src/app/modules/reports/components/time-entries-table/time-entries-table.component.ts index 9a6c7dd28..902ebbec6 100644 --- a/src/app/modules/reports/components/time-entries-table/time-entries-table.component.ts +++ b/src/app/modules/reports/components/time-entries-table/time-entries-table.component.ts @@ -1,3 +1,4 @@ +import { formatDate } from '@angular/common'; import {AfterViewInit, Component, OnDestroy, OnInit, ViewChild} from '@angular/core'; import {select, Store} from '@ngrx/store'; import {EntryState} from '../../../time-clock/store/entry.reducer'; @@ -24,12 +25,12 @@ export class TimeEntriesTableComponent implements OnInit, OnDestroy, AfterViewIn { extend: 'excel', text: 'Excel', - filename: `time-entries-${ new Date() }` + filename: `time-entries-${ formatDate(new Date(), 'yyyy_MM_dd-hh_mm', 'en') }` }, { extend: 'csv', text: 'CSV', - filename: `time-entries-${ new Date() }` + filename: `time-entries-${ formatDate(new Date(), 'yyyy_MM_dd-hh_mm', 'en') }` } ] }; diff --git a/src/app/modules/shared/components/details-fields/details-fields.component.html b/src/app/modules/shared/components/details-fields/details-fields.component.html index 047242461..c935f1cf1 100644 --- a/src/app/modules/shared/components/details-fields/details-fields.component.html +++ b/src/app/modules/shared/components/details-fields/details-fields.component.html @@ -78,7 +78,7 @@ [showMaskTyped]="true" [dropSpecialCharacters]="false" matInput - mask="Hh:m0" + mask="Hh:m0:s0" formControlName="start_hour" id="start_hour" type="text" @@ -97,7 +97,7 @@ [showMaskTyped]="true" [dropSpecialCharacters]="false" matInput - mask="Hh:m0" + mask="Hh:m0:s0" formControlName="end_hour" type="text" id="end_hour" diff --git a/src/app/modules/shared/components/details-fields/details-fields.component.spec.ts b/src/app/modules/shared/components/details-fields/details-fields.component.spec.ts index 2a35c264d..504a3f894 100644 --- a/src/app/modules/shared/components/details-fields/details-fields.component.spec.ts +++ b/src/app/modules/shared/components/details-fields/details-fields.component.spec.ts @@ -58,8 +58,8 @@ describe('DetailsFieldsComponent', () => { activity_id: '', uri: '', entry_date: formatDate(new Date(), 'yyyy-MM-dd', 'en'), - start_hour: '00:00', - end_hour: '00:00', + start_hour: '00:00:00', + end_hour: '00:00:00', description: '', technology: '', }; @@ -91,12 +91,12 @@ describe('DetailsFieldsComponent', () => { id: 'xyz' }; formValues = { - project_id: '', - activity_id: '', + project_id: 'p1', + activity_id: 'a1', uri: 'ticketUri', entry_date: '', - start_hour: '00:00', - end_hour: '00:00', + start_hour: '00:00:10', + end_hour: '00:00:11', description: '', technology: '', }; @@ -138,44 +138,6 @@ describe('DetailsFieldsComponent', () => { expect(component.entryForm.value).toEqual(initialData); }); - it('should emit ngOnChange with new data', () => { - component.entryToEdit = entryToEdit; - - component.ngOnChanges(); - - expect(component.entryForm.value).toEqual(formValues); - }); - - it('returns the current elapsed seconds when date has more than 2', () => { - const seconds = 12; - const date = new Date(); - date.setSeconds(seconds); - - const elapsedSeconds = component.getElapsedSeconds(date); - - expect(elapsedSeconds).toEqual(seconds.toString()); - }); - - it('returns 02 when seconds 0', () => { - const seconds = 0; - const date = new Date(); - date.setSeconds(seconds); - - const elapsedSeconds = component.getElapsedSeconds(date); - - expect(elapsedSeconds).toEqual('02'); - }); - - it('returns 02 when seconds 1', () => { - const seconds = 1; - const date = new Date(); - date.setSeconds(seconds); - - const elapsedSeconds = component.getElapsedSeconds(date); - - expect(elapsedSeconds).toEqual('02'); - }); - it('should emit ngOnChange with new data', () => { const childComponent = jasmine.createSpyObj('ChildComponent', ['closeModal']); component.closeModal = childComponent; @@ -184,8 +146,8 @@ describe('DetailsFieldsComponent', () => { activity_id: '', uri: '', entry_date: formatDate(new Date(), 'yyyy-MM-dd', 'en'), - start_hour: '00:00', - end_hour: '00:00', + start_hour: '00:00:00', + end_hour: '00:00:00', description: '', technology: '', }; @@ -214,26 +176,27 @@ describe('DetailsFieldsComponent', () => { it('should emit saveEntry event', () => { spyOn(component.saveEntry, 'emit'); - spyOn(component, 'getElapsedSeconds').and.returnValue('11'); component.entryForm.setValue({ - project_id: '', - activity_id: '', + project_id: 'p1', + activity_id: 'a1', uri: '', entry_date: '2020-02-05', - start_hour: '00:00', - end_hour: '00:01', + start_hour: '00:00:01', + end_hour: '00:01:01', description: '', technology: '', }); + component.onSubmit(); + const data: SaveEntryEvent = { entry: { - project_id: '', - activity_id: '', + project_id: 'p1', + activity_id: 'a1', technologies: [], description: '', - start_date: '2020-02-05T00:00:11', - end_date: '2020-02-05T00:01:01', + start_date: new Date('2020-02-05T00:00:01').toISOString(), + end_date: new Date('2020-02-05T00:01:01').toISOString(), uri: '' }, shouldRestartEntry: false @@ -289,30 +252,30 @@ describe('DetailsFieldsComponent', () => { it('when submitting a entry that is currently running, the end date should not be sent ', () => { component.goingToWorkOnThis = true; - spyOn(component, 'getElapsedSeconds').and.returnValue('10'); spyOn(component.saveEntry, 'emit'); component.entryForm.setValue({...formValues, entry_date: '2020-06-11'}); + component.onSubmit(); + const data: SaveEntryEvent = { entry: { - project_id: '', - activity_id: '', + project_id: 'p1', + activity_id: 'a1', technologies: [], description: '', - start_date: '2020-06-11T00:00:10', + start_date: new Date('2020-06-11T00:00:10').toISOString(), uri: 'ticketUri', }, shouldRestartEntry: false }; - expect(component.saveEntry.emit - ).toHaveBeenCalledWith(data); + expect(component.saveEntry.emit).toHaveBeenCalledWith(data); }); it('when disabling going to work on this, then the end hour should be set to the current time', () => { const datePipe: DatePipe = new DatePipe('en'); - const currentTime = datePipe.transform(new Date(), 'HH:mm'); + const currentTime = datePipe.transform(new Date(), 'HH:mm:ss'); const checkIsEntryRunning: Element = fixture.debugElement.nativeElement.querySelector('#isEntryRunning'); checkIsEntryRunning.dispatchEvent(new Event('change')); diff --git a/src/app/modules/shared/components/details-fields/details-fields.component.ts b/src/app/modules/shared/components/details-fields/details-fields.component.ts index acf3416f6..eaa53562e 100644 --- a/src/app/modules/shared/components/details-fields/details-fields.component.ts +++ b/src/app/modules/shared/components/details-fields/details-fields.component.ts @@ -1,6 +1,5 @@ import { EntryActionTypes } from './../../../time-clock/store/entry.actions'; import { filter } from 'rxjs/operators'; -import { NumberFormatter } from './../../formatters/number.formatter'; import { Component, ElementRef, EventEmitter, Input, OnChanges, OnInit, Output, ViewChild, } from '@angular/core'; import { FormBuilder, FormGroup, Validators } from '@angular/forms'; import { ActionsSubject, select, Store } from '@ngrx/store'; @@ -97,8 +96,8 @@ export class DetailsFieldsComponent implements OnChanges, OnInit { activity_id: this.entryToEdit.activity_id, description: this.entryToEdit.description, entry_date: this.entryToEdit.start_date ? formatDate(this.entryToEdit.start_date, 'yyyy-MM-dd', 'en') : '', - start_hour: this.entryToEdit.start_date ? formatDate(this.entryToEdit.start_date, 'HH:mm', 'en') : '00:00', - end_hour: this.entryToEdit.end_date ? formatDate(this.entryToEdit.end_date, 'HH:mm', 'en') : '00:00', + start_hour: this.entryToEdit.start_date ? formatDate(this.entryToEdit.start_date, 'HH:mm:ss', 'en') : '00:00:00', + end_hour: this.entryToEdit.end_date ? formatDate(this.entryToEdit.end_date, 'HH:mm:ss', 'en') : '00:00:00', uri: this.entryToEdit.uri, technology: '', }); @@ -114,8 +113,8 @@ export class DetailsFieldsComponent implements OnChanges, OnInit { activity_id: '', description: '', entry_date: formatDate(new Date(), 'yyyy-MM-dd', 'en'), - start_hour: '00:00', - end_hour: '00:00', + start_hour: '00:00:00', + end_hour: '00:00:00', uri: '', technology: '', }); @@ -161,8 +160,8 @@ export class DetailsFieldsComponent implements OnChanges, OnInit { activity_id: this.entryForm.value.activity_id, technologies: this.selectedTechnologies ? this.selectedTechnologies : [], description: this.entryForm.value.description, - start_date: `${entryDate}T${this.entryForm.value.start_hour.trim()}:${this.getElapsedSeconds(new Date())}`, - end_date: `${entryDate}T${this.entryForm.value.end_hour.trim()}:01`, + start_date: new Date(`${entryDate}T${this.entryForm.value.start_hour.trim()}`).toISOString(), + end_date: new Date(`${entryDate}T${this.entryForm.value.end_hour.trim()}`).toISOString(), uri: this.entryForm.value.uri, }; if (this.goingToWorkOnThis) { @@ -171,19 +170,10 @@ export class DetailsFieldsComponent implements OnChanges, OnInit { this.saveEntry.emit({entry, shouldRestartEntry: this.shouldRestartEntry}); } - getElapsedSeconds(date: Date): string { - const currentSeconds = date.getSeconds(); - if (currentSeconds < 2) { - return '02'; - } else { - return new NumberFormatter(currentSeconds).getAsAtLeastTwoDigitString(); - } - } - onGoingToWorkOnThisChange(event: any) { this.goingToWorkOnThis = event.currentTarget.checked; if (!this.goingToWorkOnThis) { - this.entryForm.patchValue({end_hour: formatDate(new Date(), 'HH:mm', 'en')}); + this.entryForm.patchValue({end_hour: formatDate(new Date(), 'HH:mm:ss', 'en')}); } this.shouldRestartEntry = !this.entryToEdit?.running && this.goingToWorkOnThis; } diff --git a/src/app/modules/time-clock/components/entry-fields/entry-fields.component.html b/src/app/modules/time-clock/components/entry-fields/entry-fields.component.html index 272e9d57e..fdacc65f2 100644 --- a/src/app/modules/time-clock/components/entry-fields/entry-fields.component.html +++ b/src/app/modules/time-clock/components/entry-fields/entry-fields.component.html @@ -5,7 +5,7 @@