Skip to content

Commit bd595a9

Browse files
committed
#3 search active projects in view timeClockIn
1 parent 541eeb8 commit bd595a9

File tree

4 files changed

+10
-31
lines changed

4 files changed

+10
-31
lines changed
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
<div class="form-group">
2-
<input (keyup)="changeFilterValue()" type="text" class="form-control" placeholder="&#xF002; Search active projects..." name="filterProject" [(ngModel)]="filterProject" style="font-family:'Segoe UI', Tahoma, Geneva, Verdana, sans-serif, FontAwesome">
2+
<input (keyup)="changeFilterValue()" type="text" class="form-control" placeholder="&#xF002; Search projects..." name="filterProject" [(ngModel)]="filterProject" style="font-family:'Segoe UI', Tahoma, Geneva, Verdana, sans-serif, FontAwesome">
33
</div>
Lines changed: 6 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,7 @@
11
<app-search-project (changeFilterProject)="filterProjects = $event"></app-search-project>
2-
<div class="container-fluid border rounded">
3-
<ul class="list-group list-group-flush content-projects mt-2 mb-2">
4-
<div *ngFor="let item of listProjects | filterProject:filterProjects; let i = index" class="container">
5-
<li *ngIf="item.status === 'Active'" class="list-group-item list-group-item-action d-flex justify-content-between align-items-center" (mouseenter)="showButton = i" (mouseleave)="showButton = -1" (click)="clockIn(item.id)" [ngClass]="{ active: selectedId === item.id }">
6-
{{ item.name }}
7-
<span *ngIf="showButton != i" class="badge badge-success">{{ item.status }}</span>
8-
<span *ngIf="showButton === i && selectedId !== item.id" class="badge badge-light">Clock In</span>
9-
</li>
10-
</div>
11-
</ul>
12-
</div>
2+
<ul class="list-group content-projects">
3+
<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)" [ngClass]="{ active: selectedId === item.id }">
4+
{{ item.name }}
5+
<span *ngIf="showButton === i && selectedId !== item.id" class="badge badge-light">Clock In</span>
6+
</li>
7+
</ul>

src/app/modules/time-clock/components/project-list-hover/project-list-hover.component.spec.ts

Lines changed: 1 addition & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,6 @@
11
import { async, ComponentFixture, TestBed, inject } from '@angular/core/testing';
22

33
import { ProjectListHoverComponent } from './project-list-hover.component';
4-
import { HttpClientTestingModule, HttpTestingController } from '@angular/common/http/testing';
5-
import { ProjectService } from 'src/app/modules/project-management/services/project.service';
64
import { FilterProjectPipe } from 'src/app/modules/shared/pipes/filter-project/filter-project.pipe';
75

86
describe('ProjectListHoverComponent', () => {
@@ -11,9 +9,7 @@ describe('ProjectListHoverComponent', () => {
119

1210
beforeEach(async(() => {
1311
TestBed.configureTestingModule({
14-
imports: [HttpClientTestingModule],
15-
declarations: [ProjectListHoverComponent, FilterProjectPipe],
16-
providers: [ProjectService]
12+
declarations: [ProjectListHoverComponent, FilterProjectPipe]
1713
}).compileComponents();
1814
}));
1915

@@ -23,16 +19,6 @@ describe('ProjectListHoverComponent', () => {
2319
fixture.detectChanges();
2420
});
2521

26-
it('service should be created', () => {
27-
const service: ProjectService = TestBed.get(ProjectService);
28-
expect(service).toBeTruthy();
29-
});
30-
31-
it('should have getProjects function', () => {
32-
const service: ProjectService = TestBed.get(ProjectService);
33-
expect(service.getProjects).toBeTruthy();
34-
});
35-
3622
it('should create', () => {
3723
expect(component).toBeTruthy();
3824
});

src/app/modules/time-clock/components/project-list-hover/project-list-hover.component.ts

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -16,13 +16,11 @@ export class ProjectListHoverComponent implements OnInit {
1616
filterProjects: string = '';
1717
listProjects: Project[] = [];
1818

19-
constructor(private projectService: ProjectService) {
19+
constructor() {
2020
this.showButton = -1;
2121
}
2222

23-
ngOnInit(): void {
24-
this.projectService.getProjects().subscribe(data => this.listProjects = data);
25-
}
23+
ngOnInit(): void { }
2624

2725
clockIn(id: string) {
2826
this.selectedId = id;

0 commit comments

Comments
 (0)