Skip to content

TTL-910 Custom filters #1001

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 20 commits into from
Sep 6, 2023
Merged

TTL-910 Custom filters #1001

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
20 commits
Select commit Hold shift + click to select a range
13399b9
feat: TTL-910 add project dropdown
mmaquina Jul 29, 2023
771c347
feat: TTL-910 add activity and project filters
Santiago220991 Jul 31, 2023
c1f8258
refactor: TTL-910 if statements
Santiago220991 Jul 31, 2023
027b7a2
test: TTL-910 add test
Santiago220991 Jul 31, 2023
ba7e34b
test: TTL-910 update tests
Santiago220991 Aug 1, 2023
3d36d14
feat: TTL-910 update ui
Santiago220991 Aug 1, 2023
4c2c5f9
test: TTL-910 update tests
Santiago220991 Aug 1, 2023
d777878
test: TTL-910 fix tests
Santiago220991 Aug 1, 2023
f7bc7f3
test: TTL-910 fix tests
Santiago220991 Aug 1, 2023
599b743
test: TTL-910 fix tests
Santiago220991 Aug 1, 2023
57e0809
test: TTL-910 fix tests
Santiago220991 Aug 1, 2023
13fcb10
test: TTL-910 fix tests
Santiago220991 Aug 1, 2023
5dc8991
test: TTL-910 fix tests
Santiago220991 Aug 1, 2023
590c5dd
test: TTL-910 fix tests
Santiago220991 Aug 1, 2023
89ddb0a
test: TTL-910 fix tests
Santiago220991 Aug 1, 2023
6dc631f
test: TTL-910 fix tests
Santiago220991 Aug 1, 2023
638d5d4
refactor: TTL-910 modify ngOnchange feature
Santiago220991 Aug 3, 2023
a71577b
refactor: TTL-910 modify ngOnChange feature
Santiago220991 Aug 3, 2023
3fb60b6
feat: TTL-925 update overlap message (#1002)
Santiago220991 Aug 4, 2023
0e16cac
Merge branch 'master' into TTL-910-custom-filters
Santiago220991 Aug 17, 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-910 fix tests
  • Loading branch information
@Santiago220991
Santiago220991 committed Aug 1, 2023
commit 57e0809cd8c20cd7864fdc2d22544c067e367668
12 changes: 6 additions & 6 deletions src/app/modules/reports/components/time-range-custom/time-range-custom.component.spec.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -131,15 +131,15 @@ describe('TimeRangeCustomComponent', () => {
});

it('When the ngOnChanges method is the first change, the onSubmit method is not called', () => {
const userIdNotCalled = 'user-2';
const projectIdNotCalled = 'project_id';
const activityIdNotCalled = 'activity_id';
const userId = 'user-2';
const projectId = 'project_id';
const activityId = 'activity_id';
spyOn(component, 'onSubmit');

component.ngOnChanges({
userId: new SimpleChange(null, userIdNotCalled, true),
projectId: new SimpleChange(null, projectIdNotCalled, true),
activityId: new SimpleChange(null, activityIdNotCalled, true),
userId: new SimpleChange(null, userId, true),
projectId: new SimpleChange(null, projectId, true),
activityId: new SimpleChange(null, activityId, true),
});

expect(component.onSubmit).not.toHaveBeenCalled();
Expand Down
12 changes: 6 additions & 6 deletions src/app/modules/reports/components/time-range-form/time-range.component.spec.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -147,15 +147,15 @@ describe('Reports Page', () => {
});

it('When the ngOnChanges method is the first change, the onSubmit method is not called', () => {
const userIdNotCalled = 'user_id';
const projectIdNotCalled = 'project_id';
const activityIdNotCalled = 'activity_id';
const userId = 'user_id';
const projectId = 'project_id';
const activityId = 'activity_id';
spyOn(component, 'onSubmit');

component.ngOnChanges({
userId: new SimpleChange(null, userIdNotCalled, true),
projectId: new SimpleChange(null, projectIdNotCalled, true),
activityId: new SimpleChange(null, activityIdNotCalled, true),
userId: new SimpleChange(null, userId, true),
projectId: new SimpleChange(null, projectId, true),
activityId: new SimpleChange(null, activityId, true),
});

expect(component.onSubmit).not.toHaveBeenCalled();
Expand Down