reivilibre/TaskBoard
Archived
1
0
Fork 0
Code Issues 1 Pull Requests Projects Releases 2 Wiki Activity

Initial edit task modal work

Browse Source
This commit is contained in:
kiswa 2017-05-23 21:53:08 +00:00
parent 89c12750c9
commit bdf7393ca4
4 changed files with 22 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/app/board/column/column.component.html
View File

@ -29,9 +29,10 @@
</div>
<div class="tasks">
<tb-task class="task-container" *ngFor="let task of columnData.ownTask"
<tb-task class="task-container" *ngFor="let task of columnData.tasks"
[task]="task" [boards]="boards"
[add-task]="getShowModalFunction(task.id)"
[add-task]="getShowModalFunction()"
[edit-task]="getShowModalFunction(task.id)"
[remove-task]="getRemoveTaskFunction(task.id)"></tb-task>
</div>
@ -48,7 +49,8 @@
</div>
</tb-modal>
<tb-modal *ngIf="activeBoard" modal-title="Add Task"
<tb-modal *ngIf="activeBoard"
modal-title="{{ modalProps.id === 0 ? 'Add' : 'Edit' }} Task"
modal-id="{{ MODAL_ID + columnData.id }}">
<label>
Title

17
src/app/board/column/column.component.ts
View File

@ -187,8 +187,8 @@ export class ColumnDisplay implements OnInit {
};
}
private getShowModalFunction(): Function {
return () => { this.showModal(); };
private getShowModalFunction(taskId: number = 0): Function {
return () => { this.showModal(taskId); };
}
private quickAddClicked() {
@ -203,10 +203,17 @@ export class ColumnDisplay implements OnInit {
this.quickAdd = new Task();
}
private showModal() {
this.modalProps = new Task();
this.modalProps.column_id = this.columnData.id;
private showModal(taskId: number = 0) {
if (taskId === 0) {
this.modalProps = new Task();
this.modalProps.column_id = this.columnData.id;
this.modal.open(this.MODAL_ID + this.columnData.id);
return;
}
this.modalProps = this.columnData.tasks
.filter(task => task.id === taskId)[0];
this.modal.open(this.MODAL_ID + this.columnData.id);
}

3
src/app/board/task/task.component.ts
View File

@ -37,6 +37,7 @@ export class TaskDisplay implements OnInit {
@Input('task') taskData: Task;
@Input('add-task') addTask: Function;
@Input('edit-task') editTask: Function;
@Input('remove-task') removeTask: Function;
@Input('boards')
@ -93,7 +94,7 @@ export class TaskDisplay implements OnInit {
private generateContextMenuItems() {
this.contextMenuItems = [
new ContextMenuItem('View Task'),
new ContextMenuItem('Edit Task'),
new ContextMenuItem('Edit Task', this.editTask),
new ContextMenuItem('Remove Task', this.removeTask),
new ContextMenuItem('', null, true),
this.selectMenuItem,

4
src/app/shared/context-menu/context-menu.component.ts
View File

@ -25,7 +25,9 @@ export class ContextMenu {
let parentElement = el.nativeElement.parentElement;
parentElement.oncontextmenu = this.eventHandler;
parentElement.oncontextmenu = (event: MouseEvent) => {
this.eventHandler(event);
};
}
getText(item: ContextMenuItem): SafeHtml {