Skip to content

TT-39 fix: comments #588

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

Merged
merged 9 commits into from
Dec 29, 2020
Merged

TT-39 fix: comments #588

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
8cdf916
TT-39 feat: allow switching among year
scastillo-jp Dec 16, 2020
e839109
TT-39 fix: resolve tests
scastillo-jp Dec 17, 2020
da55e06
TT-39 fix: creating test
scastillo-jp Dec 21, 2020
e23f6e8
TT-39 fix: code coverage
scastillo-jp Dec 22, 2020
5582e15
TT-39 fix: resolve comments
scastillo-jp Dec 24, 2020
d472a63
TT-39 fix: code coverage
scastillo-jp Dec 24, 2020
42aea4b
TT-39 fix: testing increment() and decrement()
scastillo-jp Dec 28, 2020
fc2587a
TT-39 fix: code refactor
Dec 29, 2020
881c520
TT-39 fix: variable refactor
Dec 29, 2020
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
TT-39 fix: code coverage
  • Loading branch information
@scastillo-jp
scastillo-jp authored and Guido Quezada committed Dec 28, 2020
commit e23f6e8d5e38433be99e74173e24aeeaa3ca8347
4 changes: 3 additions & 1 deletion src/app/modules/time-clock/components/entry-fields/entry-fields.component.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,8 @@ export class EntryFieldsComponent implements OnInit {
newData;
lastEntry;
showTimeInbuttons = false;
month = new Date().getMonth();
year = new Date().getFullYear();

constructor(
private formBuilder: FormBuilder,
Expand All @@ -50,7 +52,7 @@ export class EntryFieldsComponent implements OnInit {

ngOnInit(): void {
this.store.dispatch(new LoadActivities());
this.store.dispatch(new entryActions.LoadEntries(12, 2020));
this.store.dispatch(new entryActions.LoadEntries(this.month, this.year));
this.actionsSubject$
.pipe(filter((action: any) => action.type === ActivityManagementActionTypes.LOAD_ACTIVITIES_SUCCESS))
.subscribe((action) => {
Expand Down
2 changes: 1 addition & 1 deletion src/app/modules/time-clock/store/entry.effects.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -228,7 +228,7 @@ export class EntryEffects {
ofType(actions.EntryActionTypes.UPDATE_CURRENT_OR_LAST_ENTRY),
map((action: actions.UpdateCurrentOrLastEntry) => action.payload),
switchMap((entry) =>
this.entryService.loadEntries(new Date().getMonth() + 1).pipe(
this.entryService.loadEntries(new Date().getMonth() + 1, new Date().getFullYear()).pipe(
map((entries) => {
const lastEntry = entries[1];
const isStartTimeInLastEntry = moment(entry.start_date).isBefore(lastEntry.end_date);
Expand Down