Skip to content

[Bad UX] Reports layout TT-664 #871

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

[Bad UX] Reports layout TT-664 #871

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
f3805cc
Added a task file to setup frontend (#857)
MarcoAguirre May 11, 2022
b46f511
fix: TT-653 Add conditions when an user is currently working on a tas…
almeida-erick May 12, 2022
39d9f0a
chore(release): 1.72.6 [skip ci]nn
semantic-release-bot May 12, 2022
c9d830a
Now supports TLS and DNS (#862)
MarcoAguirre May 12, 2022
e4e4838
TT-630 Removing use of keys.ts to store evironment variables (#859)
nicolsss May 17, 2022
67e3d46
Revert "TT-630 Removing use of keys.ts to store evironment variables …
nicolsss May 17, 2022
4a6f513
chore(release): 1.72.7 [skip ci]nn
semantic-release-bot May 17, 2022
74b556a
TT 630 Remove keys.ts to set env variables (#864)
nicolsss May 17, 2022
7b179d8
Revert "TT 630 Remove keys.ts to set env variables (#864)" (#866)
nicolsss May 17, 2022
78578be
TT-630 enviroment variables (#867)
nicolsss May 17, 2022
6932912
Revert "TT-630 enviroment variables (#867)" (#868)
nicolsss May 17, 2022
1735c6a
chore(release): 1.72.9 [skip ci]nn
semantic-release-bot May 17, 2022
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
fix: TT-653 Add conditions when an user is currently working on a task ( 
#860)
  • Loading branch information
@almeida-erick
almeida-erick authored May 12, 2022
commit b46f511db79d7c07829c02b77a6f5573e275c263
4 changes: 2 additions & 2 deletions src/app/modules/reports/components/time-entries-table/time-entries-table.component.spec.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -190,7 +190,7 @@ describe('Reports Page', () => {

it('Should populate the users with the payload from the action executed', () => {
const actionSubject = TestBed.inject(ActionsSubject) as ActionsSubject;
const usersArray = []
const usersArray = [];
const action = {
type: UserActionTypes.LOAD_USERS_SUCCESS,
payload: usersArray
Expand All @@ -201,7 +201,7 @@ describe('Reports Page', () => {

expect(component.users).toEqual(usersArray);
});

it('The sum of the data dates is equal to {"hours": 3, "minutes":20,"seconds":0}', () => {
let {hours,minutes,seconds}: TotalHours = component.sumDates(timeEntryList);
expect({hours, minutes, seconds}).toEqual({hours:3,minutes:20,seconds:0});
Expand Down
2 changes: 1 addition & 1 deletion src/app/modules/shared/components/details-fields/details-fields.component.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -361,7 +361,7 @@ export class DetailsFieldsComponent implements OnChanges, OnInit {

const isStartDateInTheFuture = moment(startDateToSubmit).isAfter(moment());
const isEndDateInTheFuture = moment(endDateToSubmit).isAfter(moment());
const timeEntryIsInTheFuture = isStartDateInTheFuture || isEndDateInTheFuture;
const timeEntryIsInTheFuture = isStartDateInTheFuture || (isEndDateInTheFuture && !this.goingToWorkOnThis);

if (timeEntryIsInTheFuture) {
this.toastrService.error('You cannot start a time-entry in the future');
Expand Down