Skip to content

feat: TT-217 Add FT in EntryFieldsComponent component and Add flag at validate current entry and last entry #663

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 5 commits into from
Apr 16, 2021
Merged

feat: TT-217 Add FT in EntryFieldsComponent component and Add flag at validate current entry and last entry #663

Changes from 1 commit
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
03d055d
feat: TT-217 Add FT in EntryFieldsComponent component to get the new …
VanessaIniguezG Apr 13, 2021
f128eef
fix: TT-2017 Remove blank lines
VanessaIniguezG Apr 14, 2021
b14ee76
fix: TT-217 Update test description, change the updateEntry method to…
VanessaIniguezG Apr 15, 2021
d1beacb
refactor: TT-217 Remove comments
VanessaIniguezG Apr 15, 2021
86032d5
refactor: TT-217 Remove getOwnerId method
VanessaIniguezG Apr 15, 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
Prev Previous commit
refactor: TT-217 Remove getOwnerId method
  • Loading branch information
@VanessaIniguezG
VanessaIniguezG committed Apr 15, 2021
commit 86032d559d51cf301866b260cef8397eaf3eaa7a
8 changes: 0 additions & 8 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 @@ -17,8 +17,6 @@ import { getTimeEntriesDataSource } from '../../store/entry.selectors';
import { DATE_FORMAT } from 'src/environments/environment';
import { Subscription, Observable } from 'rxjs';
import { FeatureManagerService } from './../../../shared/feature-toggles/feature-toggle-manager.service';
import { AzureAdB2CService } from 'src/app/modules/login/services/azure.ad.b2c.service';


type Merged = TechnologyState & ProjectState & ActivityState;

Expand Down Expand Up @@ -46,7 +44,6 @@ export class EntryFieldsComponent implements OnInit, OnDestroy {
private store: Store<Merged>,
private actionsSubject$: ActionsSubject,
private toastrService: ToastrService,
private azureService: AzureAdB2CService,
private featureManagerService: FeatureManagerService
) {
this.entryForm = this.formBuilder.group({
Expand Down Expand Up @@ -158,7 +155,6 @@ export class EntryFieldsComponent implements OnInit, OnDestroy {
}
this.entryForm.patchValue({ start_date: newHourEntered });
if (this.isFeatureToggleActive) {
this.newData.owner_id = this.getOwnerId();
this.newData.update_last_entry_if_overlap = true;
this.store.dispatch(new entryActions.UpdateEntryRunning({ ...this.newData, ...this.entryForm.value }));
} else {
Expand All @@ -167,10 +163,6 @@ export class EntryFieldsComponent implements OnInit, OnDestroy {
this.showTimeInbuttons = false;
}

getOwnerId(){
return this.azureService.getUserId();
}

private getLastEntry() {
const lastEntry$ = this.store.pipe(select(getTimeEntriesDataSource));
lastEntry$.subscribe((entry) => {
Expand Down