bugfix searchTask
This commit is contained in:
parent
aeca4a1d43
commit
59006cd65b
2 changed files with 19 additions and 12 deletions
|
|
@ -4,6 +4,7 @@ import { CommonModule } from '@angular/common';
|
||||||
import { Task } from '../../interfaces/task.interface';
|
import { Task } from '../../interfaces/task.interface';
|
||||||
import { TaskService } from '../../services/task.service';
|
import { TaskService } from '../../services/task.service';
|
||||||
import { TaskComponent } from './task/task.component';
|
import { TaskComponent } from './task/task.component';
|
||||||
|
import { EMPTY, isEmpty } from 'rxjs';
|
||||||
|
|
||||||
@Component({
|
@Component({
|
||||||
selector: 'app-board',
|
selector: 'app-board',
|
||||||
|
|
@ -26,26 +27,29 @@ export class BoardComponent {
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
|
ngOnDestroy() {
|
||||||
|
this.taskService.unsubTask();
|
||||||
|
}
|
||||||
|
|
||||||
getTask(status: string) {
|
getTask(status: string) {
|
||||||
return this.taskService.allTasks.filter((task) => task.status === status);
|
if (this.taskService.filteredTasks.length > 0) {
|
||||||
|
return this.taskService.filteredTasks.filter(
|
||||||
|
(task) => task.status === status
|
||||||
|
);
|
||||||
|
} else {
|
||||||
|
return this.taskService.allTasks.filter((task) => task.status === status);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
handleItemDropped(id: string, status: string): void {
|
handleItemDropped(id: string, status: string): void {
|
||||||
const index = this.taskService.allTasks.findIndex((task) => task.id === id);
|
const index = this.taskService.allTasks.findIndex((task) => task.id === id);
|
||||||
if (index !== -1) {
|
if (index !== -1) {
|
||||||
this.taskService.allTasks[index].status = status;
|
this.taskService.allTasks[index].status = status;
|
||||||
|
if (this.taskService.filteredTasks.length > 0) {
|
||||||
|
this.taskService.filteredTasks[index].status = status;
|
||||||
|
}
|
||||||
this.taskService.updateTask(id, index);
|
this.taskService.updateTask(id, index);
|
||||||
}
|
}
|
||||||
this.searchField.nativeElement.value = '';
|
|
||||||
}
|
|
||||||
|
|
||||||
isTaskRendered(taskColumn: string): boolean {
|
|
||||||
for (let task of this.taskService.filteredTasks) {
|
|
||||||
if (task.status === taskColumn) {
|
|
||||||
return true;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
return false;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
searchTask(): void {
|
searchTask(): void {
|
||||||
|
|
|
||||||
|
|
@ -29,7 +29,6 @@ export class TaskService {
|
||||||
const taskData = element.data();
|
const taskData = element.data();
|
||||||
taskData['id'] = element.id;
|
taskData['id'] = element.id;
|
||||||
this.allTasks.push(taskData);
|
this.allTasks.push(taskData);
|
||||||
this.filteredTasks.push(taskData);
|
|
||||||
});
|
});
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
@ -55,4 +54,8 @@ export class TaskService {
|
||||||
status: task.status,
|
status: task.status,
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|
||||||
|
ngOnDestroy() {
|
||||||
|
this.unsubTask;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue