Skip to content

#3-Time clock find project #54

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 11 commits into from
Closed

#3-Time clock find project #54

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
22b7119
added test
daros10 Mar 25, 2020
e15d20c
Merge branch 'master' of https://github.com/ioet/time-tracker-ui into…
daros10 Mar 25, 2020
c501044
Update time-clock.component.html
daros10 Mar 25, 2020
56247f6
#3 serach project in view project
daros10 Mar 27, 2020
f4b586c
#3 added search in time clock view
daros10 Mar 27, 2020
de4fbd6
Merge branch 'master' of https://github.com/ioet/time-tracker-ui into…
daros10 Mar 27, 2020
75b33b3
#3 added comma in modules
daros10 Mar 27, 2020
ae78b3d
added unit test
daros10 Mar 27, 2020
e2ac439
#3 find project
daros10 Mar 27, 2020
01696cf
Merge branch 'TimeClock-find-project-#3' of https://github.com/ioet/t…
daros10 Mar 28, 2020
7c8ca50
format code indentation based in 2 spaces.
daros10 Mar 30, 2020
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
#3 added search in time clock view
  • Loading branch information
@daros10
daros10 committed Mar 27, 2020
commit f4b586c52fb7dd5cc707409d1416962631c803b9
1 change: 0 additions & 1 deletion src/app/components/options-sidebar/time-clock/time-clock.component.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,6 @@ <h3>00:00</h3>
</div>
</div>
<h6 class="text-left"><strong>Projects</strong></h6>
<app-search-project></app-search-project>
<p class="text-left"><i class="fas fa-folder"></i><strong> Top</strong></p>
<ul class="list-group">
<app-project-list-hover [projects]="projects" (showFields)="setShowFields($event)"></app-project-list-hover>
Expand Down
20 changes: 6 additions & 14 deletions src/app/components/shared/project-list-hover/project-list-hover.component.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,17 +1,9 @@
<app-search-project (changeFilterProject)="filterProjects = $event"></app-search-project>
<ul class="list-group content-projects">
<li
class="list-group-item list-group-item-action d-flex justify-content-between align-items-center"
*ngFor="let item of projects; let i = index"
(mouseenter)="showButton = i"
(mouseleave)="showButton = -1"
(click)="clockIn(item.id)"
[ngClass]="{ active: selectedId === item.id }"
>
{{ item.name }}
<span
*ngIf="showButton === i && selectedId !== item.id"
class="badge badge-light"
>Clock In</span
<li class="list-group-item list-group-item-action d-flex justify-content-between align-items-center" *ngFor="let item of projects | filterProject:filterProjects; let i = index" (mouseenter)="showButton = i" (mouseleave)="showButton = -1" (click)="clockIn(item.id)"
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Please, fix the indentation, remember that we are using an indentation based in 2 spaces.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

done

[ngClass]="{ active: selectedId === item.id }">
{{ item.name }}
<span *ngIf="showButton === i && selectedId !== item.id" class="badge badge-light">Clock In</span
>
</li>
</ul>
</ul>
1 change: 1 addition & 0 deletions src/app/components/shared/project-list-hover/project-list-hover.component.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@ export class ProjectListHoverComponent implements OnInit {

selectedId: string;
showButton: number;
filterProjects = '';

constructor() {
this.showButton = -1;
Expand Down