Skip to content

Commit 541eeb8

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

File tree

6 files changed

+11
-26
lines changed

6 files changed

+11
-26
lines changed

package-lock.json

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

src/app/app.module.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ import { SearchProjectComponent } from './modules/shared/components/search-proje
4949
CreateActivityComponent,
5050
ActivityListComponent,
5151
FilterProjectPipe,
52-
SearchProjectComponent,
52+
SearchProjectComponent
5353
],
5454
imports: [
5555
CommonModule,

src/app/modules/project-management/components/create-project/create-project.component.html

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -4,22 +4,24 @@ <h1 class="card-title">Project</h1>
44

55
<div class="form-group">
66
<label for="name">Name:</label>
7-
<input class="form-control" [class.is-invalid]="(name.invalid && name.touched)" id="name" type="text" formControlName="name" required>
8-
<p class="text-form text-danger" *ngIf="(name.dirty || name.touched) && name.invalid && name.errors.required">Name project is required.</p>
7+
<input class="form-control" id="name" type="text" formControlName="name" required>
8+
<p class="alert alert-danger" *ngIf="(name.dirty || name.touched) && name.invalid && name.errors.required">NameProject is required.</p>
99
</div>
1010

1111
<div class="form-group">
1212
<label for="details">Details:</label>
13-
<textarea class="form-control" [class.is-invalid]="(details.invalid && details.touched)" rows="3" id="details" type="text" formControlName="details" required></textarea>
14-
<p class="text-danger" *ngIf="(details.dirty || details.touched) && details.invalid && details.errors.required">Details project is required.</p>
13+
<textarea class="form-control" rows="3" id="details" type="text" formControlName="details" required></textarea>
14+
<p class="alert alert-danger" *ngIf="(details.dirty || details.touched) && details.invalid && details.errors.required">Details Project is
15+
required.</p>
1516
</div>
1617

1718
<div class="form-group">
1819
<label for="status">Status:</label>
1920
<select class="form-control" [class.is-invalid]="(status.invalid && status.touched)" formControlName="status">
2021
<option *ngFor="let status of projectStatus" [value]="status">{{status}}</option>
2122
</select>
22-
<p class="text-danger" *ngIf="(status.dirty || status.touched) && status.invalid && status.errors.required">Status project is required.</p>
23+
<p class="alert alert-danger" *ngIf="(status.dirty || status.touched) && status.invalid && status.errors.required">Status Project is required.
24+
</p>
2325
</div>
2426

2527
<div class="form-group form-check" [hidden]="!projectToEdit">
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 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 active projects..." name="filterProject" [(ngModel)]="filterProject" style="font-family:'Segoe UI', Tahoma, Geneva, Verdana, sans-serif, FontAwesome">
33
</div>

src/app/modules/shared/pipes/filter-project/filter-project.pipe.spec.ts

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,4 @@ describe('FilterProjectPipe', () => {
55
const pipe = new FilterProjectPipe();
66
expect(pipe).toBeTruthy();
77
});
8-
9-
it('test method of pipe', () => {
10-
expect(new FilterProjectPipe().transform([], '')).toEqual([]);
11-
});
128
});

src/app/modules/time-clock/pages/time-clock.component.spec.ts

Lines changed: 1 addition & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,6 @@ import { DebugElement, inject } from '@angular/core';
33
import { By } from '@angular/platform-browser';
44
import { TimeClockComponent } from './time-clock.component';
55
import { ProjectListHoverComponent } from '../components';
6-
import { HttpClientTestingModule } from '@angular/common/http/testing';
7-
import { ProjectService } from '../../project-management/services/project.service';
86
import { FilterProjectPipe } from '../../shared/pipes/filter-project/filter-project.pipe';
97

108
describe('TimeClockComponent', () => {
@@ -14,9 +12,7 @@ describe('TimeClockComponent', () => {
1412

1513
beforeEach(async(() => {
1614
TestBed.configureTestingModule({
17-
imports: [HttpClientTestingModule],
18-
declarations: [TimeClockComponent, ProjectListHoverComponent, FilterProjectPipe],
19-
providers: [ProjectService]
15+
declarations: [TimeClockComponent, ProjectListHoverComponent, FilterProjectPipe]
2016
}).compileComponents();
2117
}));
2218

@@ -27,15 +23,6 @@ describe('TimeClockComponent', () => {
2723
fixture.detectChanges();
2824
});
2925

30-
it('service should be created', () => {
31-
const service: ProjectService = TestBed.get(ProjectService);
32-
expect(service).toBeTruthy();
33-
});
34-
35-
it('should have getProject function', () => {
36-
const service: ProjectService = TestBed.get(ProjectService);
37-
expect(service.getProjects).toBeTruthy();
38-
});
3926

4027
it('should be created', () => {
4128
expect(component).toBeTruthy();

0 commit comments

Comments
 (0)