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

Add cancel option when editing comments

Browse Source
This commit is contained in:
Matthew Ross 2017-10-07 09:20:41 -04:00
parent 7531d645b4
commit 6987bb9338
2 changed files with 35 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -169,7 +169,7 @@
*ngIf="!comment.isEdit"></div> *ngIf="!comment.isEdit"></div>
<textarea *ngIf="comment.isEdit" <textarea *ngIf="comment.isEdit"
[(ngModel)]="comment.text" [(ngModel)]="commentEdit.text"
(keyup.enter)="$event.stopPropagation()"></textarea> (keyup.enter)="$event.stopPropagation()"></textarea>
<div class="byline"> <div class="byline">
@ -180,14 +180,19 @@
</div> </div>
<div class="actions" *ngIf="canAdminComment(comment)"> <div class="actions" *ngIf="canAdminComment(comment)">
<i class="icon icon-cancel"
[title]="strings['cancel']"
*ngIf="comment.isEdit"
(click)="comment.isEdit = false"></i>
<i class="icon icon-floppy color-primary" <i class="icon icon-floppy color-primary"
[title]="strings['save']" [title]="strings['save']"
*ngIf="comment.isEdit" *ngIf="comment.isEdit"
(click)="comment.isEdit = false;editComment(comment)"></i> (click)="comment.isEdit = false;editComment()"></i>
<i class="icon icon-edit color-primary" <i class="icon icon-edit color-primary"
[title]="strings['boards_taskEditComment']" [title]="strings['boards_taskEditComment']"
*ngIf="!comment.isEdit" *ngIf="!comment.isEdit"
(click)="comment.isEdit = true"></i> (click)="comment.isEdit = true;beginEditComment(comment)"></i>
<i class="icon icon-trash-empty color-secondary" <i class="icon icon-trash-empty color-secondary"
[title]="strings['boards_taskRemoveComment']" [title]="strings['boards_taskRemoveComment']"
(click)="commentToRemove=comment; (click)="commentToRemove=comment;

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

@ -62,6 +62,7 @@ export class ColumnDisplay implements OnInit {
private viewModalProps: Task; private viewModalProps: Task;
private taskToRemove: number; private taskToRemove: number;
private taskLimit: number; private taskLimit: number;
private commentEdit: Comment;
private commentToRemove: Comment; private commentToRemove: Comment;
private newComment: string; private newComment: string;
@ -274,11 +275,15 @@ export class ColumnDisplay implements OnInit {
}); });
} }
editComment(comment: Comment) { beginEditComment(comment: Comment) {
comment.is_edited = true; this.commentEdit = { ...comment };
comment.user_id = this.activeUser.id; }
this.boardService.updateComment(comment) editComment() {
this.commentEdit.is_edited = true;
this.commentEdit.user_id = this.activeUser.id;
this.boardService.updateComment(this.commentEdit)
.subscribe((response: ApiResponse) => { .subscribe((response: ApiResponse) => {
response.alerts.forEach(note => this.notes.add(note)); response.alerts.forEach(note => this.notes.add(note));
@ -288,6 +293,8 @@ export class ColumnDisplay implements OnInit {
let updatedTask = response.data[1][0]; let updatedTask = response.data[1][0];
this.replaceUpdatedTask(updatedTask); this.replaceUpdatedTask(updatedTask);
this.viewModalProps = this.convertToTask(updatedTask);
}); });
} }
@ -364,6 +371,22 @@ export class ColumnDisplay implements OnInit {
return yiq >= 140 ? '#333333' : '#efefef'; return yiq >= 140 ? '#333333' : '#efefef';
} }
private convertToTask(updatedTask: any) {
let task = new Task(updatedTask.id,
updatedTask.title,
updatedTask.description,
updatedTask.color,
updatedTask.due,
updatedTask.points,
updatedTask.position,
updatedTask.column_id,
updatedTask.ownComment,
updatedTask.ownAttachment,
updatedTask.sharedUser,
updatedTask.sharedCategory);
return task;
}
private replaceUpdatedTask(updatedTask: any) { private replaceUpdatedTask(updatedTask: any) {
this.activeBoard.columns.forEach(column => { this.activeBoard.columns.forEach(column => {
if (+column.id !== +updatedTask.column_id) { if (+column.id !== +updatedTask.column_id) {