Skip to content

fix: TT-25 Empty selection in Activity drop-down(Time Clock page) #686

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 2 commits into from
May 18, 2021
Merged

fix: TT-25 Empty selection in Activity drop-down(Time Clock page) #686

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
c3701ff
fix: TT-25 Empty selection in Activity drop-down(Time Clock page)
lenshinoda May 17, 2021
69263bc
fix: TT-25 Delete the '-1' option from the html file
lenshinoda May 17, 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
fix: TT-25 Delete the '-1' option from the html file
  • Loading branch information
@lenshinoda
lenshinoda committed May 17, 2021
commit 69263bcfacaa4f27579f062e2169527d51b09317
3 changes: 1 addition & 2 deletions src/app/modules/time-clock/components/entry-fields/entry-fields.component.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,8 @@
(change)="onSubmit()"
class="form-control"
formControlName="activity_id"
[class.is-invalid]="activity_id.invalid && activity_id.touched || activity_id.value == '-1'"
[class.is-invalid]="activity_id.invalid && activity_id.touched"
required>
<option value="-1"></option>
<option *ngFor="let activity of activities" value="{{ activity.id }}">{{ activity.name }}</option>
</select>
</div>
Expand Down
10 changes: 0 additions & 10 deletions 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
Expand Up @@ -18,7 +18,6 @@ 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';
import { By } from '@angular/platform-browser';


describe('EntryFieldsComponent', () => {
Expand Down Expand Up @@ -467,15 +466,6 @@ describe('EntryFieldsComponent', () => {
expect(featureToggleGeneralService.isActivated).toHaveBeenCalled();
});
});

it('toastrService should be called when the activity field is empty', () => {
fixture.detectChanges();
const select: HTMLSelectElement = fixture.debugElement.query(By.css('select')).nativeElement;
spyOn(toastrServiceStub, 'error');
select.value = select.options[0].value;
select.dispatchEvent(new Event('change'));
expect(toastrServiceStub.error).toHaveBeenCalled();
});
});


4 changes: 0 additions & 4 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 @@ -133,10 +133,6 @@ export class EntryFieldsComponent implements OnInit, OnDestroy {
}

onSubmit() {
if (this.entryForm.value.activity_id === '-1') {
this.toastrService.error('Please enter a valid activity');
return;
}
this.store.dispatch(new entryActions.UpdateEntryRunning({ ...this.newData, ...this.entryForm.value }));
}

Expand Down