Skip to content

333 allow edit entry running #375

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 4 commits into from
Jun 11, 2020
Merged

333 allow edit entry running #375

Changes from 1 commit
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
a006e26
feat: #333 Allow edit current time entry
Jun 11, 2020
1b0e548
feat: #333 Enabling toastr messages when updating time entries
Jun 11, 2020
36d0fcf
style: #333 Removing dead code
Jun 11, 2020
a3907c6
feat: #333 Refreshing data when creating/updating time entries
Jun 11, 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
feat: #333 Enabling toastr messages when updating time entries
  • Loading branch information
Juan Gabriel Guzman committed Jun 11, 2020
commit 1b0e5488ca7e844082f5499e6d89a5c919eca4cb
25 changes: 12 additions & 13 deletions src/app/modules/time-clock/store/entry.effects.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,16 +1,17 @@
import { INFO_SAVED_SUCCESSFULLY, INFO_DELETE_SUCCESSFULLY } from './../../shared/messages';
import { Injectable } from '@angular/core';
import { ofType, Actions, Effect } from '@ngrx/effects';
import { Action } from '@ngrx/store';
import { of, Observable } from 'rxjs';
import { ToastrService } from 'ngx-toastr';
import { catchError, map, mergeMap } from 'rxjs/operators';
import { EntryService } from '../services/entry.service';
import {INFO_SAVED_SUCCESSFULLY, INFO_DELETE_SUCCESSFULLY} from './../../shared/messages';
import {Injectable} from '@angular/core';
import {ofType, Actions, Effect} from '@ngrx/effects';
import {Action} from '@ngrx/store';
import {of, Observable} from 'rxjs';
import {ToastrService} from 'ngx-toastr';
import {catchError, map, mergeMap} from 'rxjs/operators';
import {EntryService} from '../services/entry.service';
import * as actions from './entry.actions';

@Injectable()
export class EntryEffects {
constructor(private actions$: Actions, private entryService: EntryService, private toastrService: ToastrService) { }
constructor(private actions$: Actions, private entryService: EntryService, private toastrService: ToastrService) {
}

@Effect()
loadEntriesSummary$: Observable<Action> = this.actions$.pipe(
Expand Down Expand Up @@ -45,7 +46,7 @@ export class EntryEffects {
} else {
const endDate = new Date(activeEntry.start_date);
endDate.setHours(23, 59, 59);
return new actions.UpdateActiveEntry({ id: activeEntry.id, end_date: endDate.toISOString() });
return new actions.UpdateActiveEntry({id: activeEntry.id, end_date: endDate.toISOString()});
}
}
}),
Expand Down Expand Up @@ -118,9 +119,7 @@ export class EntryEffects {
mergeMap((entry) =>
this.entryService.updateActiveEntry(entry).pipe(
map((entryResponse) => {
if (entryResponse.end_date && entry.start_date === null) {
this.toastrService.success(INFO_SAVED_SUCCESSFULLY);
}
this.toastrService.success(INFO_SAVED_SUCCESSFULLY);
return new actions.UpdateActiveEntrySuccess(entryResponse);
}),
catchError((error) => {
Expand Down