Skip to content

Ttl 898 fix bug that lets you save without required fields #994

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 7 commits into from
Jul 14, 2023
Merged

Ttl 898 fix bug that lets you save without required fields #994

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
2876e06
fix: TTL-898 cant save time entry without required fields
mmaquina Jul 7, 2023
2a59216
test: TTL-898 add tests
mmaquina Jul 7, 2023
6c919a8
fix: TTL-898 fdescribe - describe
mmaquina Jul 7, 2023
823743b
fix: TTL-898 tests
mmaquina Jul 10, 2023
4058709
test: TTL-989 add tests for entryFormIsValidate function
mmaquina Jul 10, 2023
01ad644
test: TTL-898 add tests for entryFormIsValidate function
mmaquina Jul 10, 2023
66764cf
refactor: TTL-898 skip previously commented test
mmaquina Jul 10, 2023
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
test: TTL-898 add tests for entryFormIsValidate function
  • Loading branch information
@mmaquina
mmaquina committed Jul 10, 2023
commit 01ad644e88f12bd02896ff3d15005218b20d35a7
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
Expand Up @@ -338,7 +338,7 @@ describe('EntryFieldsComponent', () => {
it('entryFormIsValidate returns false when data in the form is not valid', () => {
component.newData = mockEntryOverlap;

const invalidEntry = {...entry, 'activity_id': ''}
const invalidEntry = {...entry, activity_id: ''};
component.activeEntry = invalidEntry;
component.setDataToUpdate(invalidEntry);

Expand Down
16 changes: 8 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 @@ -134,10 +134,10 @@ export class EntryFieldsComponent implements OnInit, OnDestroy {
}
}

/**
* Makes activity mandatory when clocking in.
* Also makes uri or description mandatory if it is an internal app.
*/
/**
* Makes activity mandatory when clocking in.
* Also makes uri or description mandatory if it is an internal app.
*/
entryFormIsValidate() {
let customerName = '';
let projectName = '';
Expand Down Expand Up @@ -214,10 +214,10 @@ export class EntryFieldsComponent implements OnInit, OnDestroy {
this.actionSetDateSubscription.unsubscribe();
}

/**
* Manages the conditions for requiring uri or description fields
* when clocking in an internal app.
*/
/**
* Manages the conditions for requiring uri or description fields
* when clocking in an internal app.
*/
requiredFieldsForInternalAppExist(customerName: string, projectName: string) {
const emptyValue = '';
const areEmptyValues = [this.entryForm.value.uri, this.entryForm.value.description].every(
Expand Down