Skip to content

TT 217 validate current entry and last entry #672

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
VanessaIniguez wants to merge 2 commits into from
Closed

TT 217 validate current entry and last entry #672

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
6f698a0
feat: TT-217 Add FT in EntryFieldsComponent component to get the new …
VanessaIniguezG Apr 13, 2021
a90d69b
fix: TT-2017 Remove blank lines
VanessaIniguezG Apr 14, 2021
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
2 changes: 1 addition & 1 deletion src/app/modules/time-clock/components/entry-fields/entry-fields.component.spec.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
import { FeatureToggleGeneralService } from './../../../shared/feature-toggles/feature-toggle-general/feature-toggle-general.service';
import { Subscription, of, Observable } from 'rxjs';
import { LoadActiveEntry, EntryActionTypes, UpdateEntry } from './../../store/entry.actions';
import { ActivityManagementActionTypes } from './../../../activities-management/store/activity-management.actions';
Expand All @@ -16,7 +17,6 @@ import { NgxMaterialTimepickerModule } from 'ngx-material-timepicker';
import * as moment from 'moment';
import { DATE_FORMAT_YEAR } from 'src/environments/environment';
import { FeatureManagerService } from './../../../shared/feature-toggles/feature-toggle-manager.service';
import { FeatureToggleGeneralService } from './../../../shared/feature-toggles/feature-toggle-general/feature-toggle-general.service';
import { FeatureToggle } from 'src/environments/enum';


Expand Down
2 changes: 2 additions & 0 deletions 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 @@ -48,6 +48,7 @@ export class EntryFieldsComponent implements OnInit, OnDestroy {
private actionsSubject$: ActionsSubject,
private toastrService: ToastrService,
private featureToggleGeneralService: FeatureToggleGeneralService,
private azureAdB2CService: AzureAdB2CService
) {
this.entryForm = this.formBuilder.group({
description: '',
Expand Down Expand Up @@ -159,6 +160,7 @@ export class EntryFieldsComponent implements OnInit, OnDestroy {
this.entryForm.patchValue({ start_date: newHourEntered });
if (this.isFeatureToggleActive) {
this.newData.update_last_entry_if_overlap = true;
this.newData.owner_id = this.azureAdB2CService.getUserId();
this.store.dispatch(new entryActions.UpdateEntryRunning({ ...this.newData, ...this.entryForm.value }));
} else {
this.store.dispatch(new entryActions.UpdateCurrentOrLastEntry({ ...this.newData, ...this.entryForm.value }));
Expand Down