Skip to content

Tt 279 angular calendar implementation #703

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 6 commits into from
Jul 15, 2021
Merged

Tt 279 angular calendar implementation #703

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
76d763f
fix: TT-258 modificate atribute star_date to view time in
kevinjlope Jun 1, 2021
1d2028e
feat: TT-279 Implement calendar view
jase156 Jul 7, 2021
d3aaafb
fix: TT-279 Fix the comparison if var is null
jase156 Jul 8, 2021
da2aedd
fix: TT-279 fix visual errors
jase156 Jul 13, 2021
7ca1c90
fix: TT-279 delete unnecessary imports
jase156 Jul 13, 2021
8d988b4
fix: TT-279 Remove bold style
jase156 Jul 13, 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
Next Next commit
fix: TT-279 Fix the comparison if var is null
  • Loading branch information
@jase156
jase156 committed Jul 8, 2021
commit d3aaafb5e95396c9599c8c46175b0b8612faea80
2 changes: 1 addition & 1 deletion src/app/modules/shared/pipes/substract-date/substract-date.pipe.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ export class SubstractDatePipe implements PipeTransform {

transformInMinutes(fromDate: Date, substractDate: Date): number{

if (fromDate === null || substractDate === null) {
if (!fromDate || !substractDate) {
return 0;
}

Expand Down
4 changes: 2 additions & 2 deletions src/app/modules/time-entries/components/calendar/calendar.component.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@ export class CalendarComponent implements OnInit {
map((timeEntriesDatasorce) => timeEntriesDatasorce.data.map(
(timeEntries) => ({
start: new Date(timeEntries.start_date),
end: timeEntries.end_date === null ? null : new Date(timeEntries.end_date),
end: timeEntries.end_date ? new Date(timeEntries.end_date) : null ,
title: timeEntries.description,
id: timeEntries.id,
meta: timeEntries
Expand Down Expand Up @@ -105,7 +105,7 @@ export class CalendarComponent implements OnInit {
}

getTimeWork(startDate: Date, endDate: Date): number{
if (endDate === null){
if (!endDate){
return 30;
}
return new SubstractDatePipe().transformInMinutes( endDate , startDate);
Expand Down