Skip to content

Tta 206 UI creating overlapping entries #950

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 8 commits into from
Closed

Tta 206 UI creating overlapping entries #950

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
4a69245
fix: TTA-206 implement functions tu validate a running activity in cl…
Oct 31, 2022
9783d05
FIX: TTA-206 validate if there is a time entry running
Nov 1, 2022
e25af33
test: TTA-206 implement test for validate time entry running in clock…
Nov 2, 2022
472b09d
fix: TTA-206 validate clockin
Nov 9, 2022
d284f37
Merge branch 'master' into TTA-206-ui-creating-overlapping-entries
Nov 9, 2022
631f4a4
refactor: refactor tests for TT-206 and fix linters
Nov 9, 2022
0d39c98
fix: TTA-206 solve comment of CR
Nov 9, 2022
2f2cff2
fix: TTA-206 clock in succesfull after clock out
Nov 11, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
fix: TTA-206 validate clockin
  • Loading branch information
Abigail Cabascango committed Nov 9, 2022
commit 472b09db6e9dc30fcc799e0e23c8e5da6a7a3e1e
21 changes: 0 additions & 21 deletions ...app/modules/time-clock/components/project-list-hover/project-list-hover.component.spec.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -206,25 +206,4 @@ describe('ProjectListHoverComponent', () => {
expect(component.clockIn).toHaveBeenCalledWith(id, customer, name);
});

// TODO Fix this test since it is throwing this error
// Expected spy dispatch to have been called with:
// [CreateEntry({ payload: Object({ project_id: '1', start_date: '2020-07-27T22:30:26.743Z', timezone_offset: 300 }),
// type: '[Entry] CREATE_ENTRY' })]
// but actual calls were:
// [CreateEntry({ payload: Object({ project_id: '1', start_date: '2020-07-27T22:30:26.742Z', timezone_offset: 300 }),
// type: '[Entry] CREATE_ENTRY' })].

// Call 0:
// Expected $[0].payload.start_date = '2020-07-27T22:30:26.742Z' to equal '2020-07-27T22:30:26.743Z'.
// it('creates time-entry with timezone_offset property', () => {
// spyOn(store, 'dispatch');
// component.clockIn('1', 'customer', 'project');
// expect(store.dispatch).toHaveBeenCalledWith(
// new CreateEntry({
// project_id: '1',
// start_date: new Date().toISOString(),
// timezone_offset: new Date().getTimezoneOffset()
// })
// );
// });
});
16 changes: 11 additions & 5 deletions src/app/modules/time-clock/components/project-list-hover/project-list-hover.component.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@ import { LoadActivities } from './../../../activities-management/store/activity-
import { allActivities } from 'src/app/modules/activities-management/store/activity-management.selectors';
import { head } from 'lodash';
import { Entry } from '../../../shared/models';
import { EntryState } from '../../store/entry.reducer';

@Component({
selector: 'app-project-list-hover',
Expand All @@ -41,10 +42,11 @@ export class ProjectListHoverComponent implements OnInit, OnDestroy {
recentProjectsSubscription: Subscription;
activeEntrySubscription: Subscription;
loadActivitiesSubscription: Subscription;
canMarkEntryAsWIP = true;
canMarkEntryAsWIP : boolean;

constructor(
private formBuilder: FormBuilder,
private storeEntry: Store<EntryState>,
private store: Store<ProjectState>,
private actionsSubject$: ActionsSubject,
private toastrService: ToastrService
Expand Down Expand Up @@ -116,11 +118,13 @@ export class ProjectListHoverComponent implements OnInit, OnDestroy {
technologies: [],
activity_id: head(this.activities).id,
};
this.store.pipe(select(getTimeEntriesDataSource)).subscribe(ds => {
this.canMarkEntryAsWIP = !this.isThereAnEntryRunning(ds.data);
this.canMarkEntryAsWIP = true;
this.storeEntry.pipe(select(getTimeEntriesDataSource)).subscribe(ds => {
this.canMarkEntryAsWIP = this.isThereAnEntryRunning(ds.data);
});
if (this.canMarkEntryAsWIP !== false ){
this.toastrService.error('There is an existing time entry running please check your time entries')

if (this.canMarkEntryAsWIP === true ){
this.toastrService.error('There is an existing time entry running please check your time entries');
return;
}
this.store.dispatch(new entryActions.ClockIn(entry));
Expand All @@ -134,7 +138,9 @@ export class ProjectListHoverComponent implements OnInit, OnDestroy {
const runningEntry: Entry = entries.find(entry => entry.running === true);
return runningEntry;
}

isThereAnEntryRunning(entries: Entry[]) {
console.log(!!this.getEntryRunning(entries))
return !!this.getEntryRunning(entries);
}

Expand Down