#3-Time clock find project #54
#3 serach project in view project
- Loading branch information
commit 56247f6685b72b713f7889a2c1e412161cd8bf54
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,18 +1,8 @@ | ||
| <div class="parent"> | ||
| <app-create-project class="item" [projectToEdit]="project" (savedProject)="updateProject($event)" (cancelForm)="cancelForm()"> | ||
| </app-create-project> | ||
|
|
||
|
|
||
| <app-project-list class="item" [projects]="projects" (editProject)="editProject($event)" (deleteProject)="deleteProject($event)"> | ||
| </app-project-list> | ||
| </div> | ||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,8 @@ | ||
| import { FilterProjectPipe } from './filter-project.pipe'; | ||
|
|
||
| describe('FilterProjectPipe', () => { | ||
| it('create an instance', () => { | ||
| const pipe = new FilterProjectPipe(); | ||
| expect(pipe).toBeTruthy(); | ||
| }); | ||
| }); |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,17 @@ | ||
| import { Pipe, PipeTransform } from '@angular/core'; | ||
|
|
||
| @Pipe({ | ||
| name: 'filterProject' | ||
| }) | ||
| export class FilterProjectPipe implements PipeTransform { | ||
|
|
||
| transform(value: any, arg: any): any { | ||
| const restultProjects = []; | ||
| for ( const projects of value ) { | ||
| if ( projects.name.toLowerCase().indexOf(arg.toLowerCase()) > -1 ) { | ||
| restultProjects.push(projects); | ||
| } | ||
| } | ||
| return restultProjects; | ||
| } | ||
| } |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,47 +1,47 @@ | ||
| <div class="card-body"> | ||
| <h1 class="card-title">Project List</h1> | ||
| <hr> | ||
| <app-search-project (changeFilterProject)="filterProjects = $event"></app-search-project> | ||
| <hr> | ||
| <div class="scroll"> | ||
| <div class="accordion" id="accordionProject"> | ||
| <div *ngIf="projects?.length > 0; else notShow"> | ||
| <div class="card" *ngFor="let project of projects | filterProject:filterProjects; let rowIndex = index"> | ||
| <div class="card-header"> | ||
| <h2 class="mb-0"> | ||
| <a type="button" data-toggle="collapse" [attr.data-target]="'#row'+rowIndex" [attr.aria-controls]="'row'+rowIndex"> | ||
|
There was a problem hiding this comment. Please, fix the indentation, remember that we are using an indentation based in 2 spaces. |
||
| {{project.name}} | ||
| </a> | ||
| <div class="btn-group float-right" role="group"> | ||
| <i (click)="editProject.emit(project.id)" class="far fa-edit btn btn-link"></i> | ||
| <i (click)="openModal(project)" data-toggle="modal" data-target="#deleteModal" class="far fa-trash-alt btn btn-link"></i> | ||
| </div> | ||
| </h2> | ||
| </div> | ||
|
|
||
| <div [id]="'row'+rowIndex" class="collapse" data-parent="#accordionProject"> | ||
| <div class="card-body"> | ||
| <h5>Details:</h5> | ||
| <p>{{project.details}}</p> | ||
| <h5>Status:</h5> | ||
| <p>{{project.status}}</p> | ||
| <h5>Completed project:</h5> | ||
| <p>{{project.completed ? 'Yes' : 'No'}}</p> | ||
| </div> | ||
| </div> | ||
| </div> | ||
| </div> | ||
| <ng-template #notShow> | ||
| <div class="card"> | ||
| <div class="card-body"> | ||
| <h4 class="card-text">There is no any project.</h4> | ||
| <h5 class="card-text">Please, create one.</h5> | ||
| </div> | ||
| </div> | ||
| </ng-template> | ||
| </div> | ||
| </div> | ||
| </div> | ||
|
|
||
| <app-modal *ngIf="openDeleteModal" class="modal fade" id="deleteModal" tabindex="-1" role="dialog" aria-hidden="true" [list]="projectToDelete" (removeList)="removeProject($event)"> | ||
| </app-modal> | ||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Empty file.
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,3 @@ | ||
| <div class="form-group"> | ||
| <input (keyup)="changeFilterValue()" type="text" class="form-control" placeholder=" Search project" name="filterProject" [(ngModel)]="filterProject" style="font-family:'Segoe UI', Tahoma, Geneva, Verdana, sans-serif, FontAwesome"> | ||
|
There was a problem hiding this comment. Please, fix the indentation, remember that we are using an indentation based in 2 spaces. |
||
| </div> | ||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,25 @@ | ||
| import { async, ComponentFixture, TestBed } from '@angular/core/testing'; | ||
|
|
||
| import { SearchProjectComponent } from './search-project.component'; | ||
|
|
||
| describe('SearchProjectComponent', () => { | ||
| let component: SearchProjectComponent; | ||
| let fixture: ComponentFixture<SearchProjectComponent>; | ||
|
|
||
| beforeEach(async(() => { | ||
| TestBed.configureTestingModule({ | ||
| declarations: [ SearchProjectComponent ] | ||
| }) | ||
| .compileComponents(); | ||
| })); | ||
|
|
||
| beforeEach(() => { | ||
| fixture = TestBed.createComponent(SearchProjectComponent); | ||
| component = fixture.componentInstance; | ||
| fixture.detectChanges(); | ||
| }); | ||
|
|
||
| it('should create', () => { | ||
| expect(component).toBeTruthy(); | ||
| }); | ||
| }); |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,21 @@ | ||
| import { Component, OnInit, Input, Output, EventEmitter } from '@angular/core'; | ||
|
|
||
| @Component({ | ||
| selector: 'app-search-project', | ||
| templateUrl: './search-project.component.html', | ||
| styleUrls: ['./search-project.component.css'] | ||
| }) | ||
| export class SearchProjectComponent implements OnInit { | ||
|
|
||
| filterProject: string; | ||
| @Output() changeFilterProject = new EventEmitter(); | ||
|
|
||
| constructor() { } | ||
|
|
||
| ngOnInit(): void { | ||
| } | ||
|
|
||
| changeFilterValue() { | ||
| this.changeFilterProject.emit( this.filterProject ); | ||
| } | ||
| } |
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
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.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
done