inteligr8/alfresco-ng2-components
1
0
Fork 0
mirror of https://github.com/Alfresco/alfresco-ng2-components.git synced 2025-07-24 17:32:15 +00:00
Code Issues Packages Projects Releases Wiki Activity

Move the comment component inside a dialog as we did for the Involved people (#2070)

Browse Source
This commit is contained in:
Maurizio Vitale
2017-07-12 11:14:40 +01:00
committed by Eugenio Romano
parent b52888144e
commit 6aa04a519a
4 changed files with 36 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
ng2-components/ng2-activiti-tasklist/src/components/activiti-task-details.component.css
View File

@@ -31,3 +31,10 @@
transform: translate(0, -50%);
width: 40%;
}
.comments-dialog {
position: fixed;
top: 50%;
transform: translate(0, -50%);
width: 40%;
}

15
ng2-components/ng2-activiti-tasklist/src/components/activiti-task-details.component.html
View File

@@ -23,10 +23,7 @@
<button type="button" md-button md-raised-button (click)="showPeopleDialog()">{{'TASK_DETAILS.LABELS.INVOLVED_PEOPLE'|translate}}</button>
</div>
<div *ngIf="showComments" class="mdl-cell mdl-cell--4-col">
<adf-comments #activiticomments
[readOnly]="readOnlyForm"
[taskId]="taskDetails.id">
</adf-comments>
<button type="button" md-button md-raised-button (click)="showCommentsDialog()">{{'TASK_DETAILS.LABELS.COMMENTS'|translate}}</button>
</div>
<div *ngIf="showChecklist" class="mdl-cell mdl-cell--4-col">
<adf-checklist #activitichecklist
@@ -81,4 +78,14 @@
<button type="button" md-button md-raised-button (click)="closePeopleDialog()">{{'TASK_DETAILS.ERROR.CLOSE'|translate}}</button>
</div>
</dialog>
<dialog class="mdl-dialog comments-dialog" #dialogComments>
<div class="mdl-dialog__content">
<adf-comments #activiticomments
[readOnly]="readOnlyForm"
[taskId]="taskDetails.id">
</adf-comments>
<br><br>
<button type="button" md-button md-raised-button (click)="closeCommentsDialog()">{{'TASK_DETAILS.ERROR.CLOSE'|translate}}</button>
</div>
</dialog>
</div>

16
ng2-components/ng2-activiti-tasklist/src/components/activiti-task-details.component.ts
View File

@@ -55,6 +55,9 @@ export class ActivitiTaskDetails implements OnInit, OnChanges {
@ViewChild('dialogPeople')
peopleDialog: any;
@ViewChild('dialogComments')
commentsDialog: any;
@Input()
debugMode: boolean = false;
@@ -303,6 +306,19 @@ export class ActivitiTaskDetails implements OnInit, OnChanges {
}
}
public showCommentsDialog(): void {
if (!this.commentsDialog.nativeElement.showModal) {
dialogPolyfill.registerDialog(this.commentsDialog.nativeElement);
}
this.commentsDialog.nativeElement.showModal();
}
public closeCommentsDialog(): void {
if (this.commentsDialog) {
this.commentsDialog.nativeElement.close();
}
}
onClaimTask(taskId: string): void {
this.loadDetails(taskId);
}

4
ng2-components/ng2-activiti-tasklist/src/components/adf-comment-list.component.css
View File

@@ -28,7 +28,7 @@
.adf-comment-message {
float: left;
width: calc(100% - 20px);
width: calc(100% - 10px);
padding: 2px 10px;
font-family: Muli;
font-style: italic;
@@ -47,7 +47,7 @@
.adf-comment-contents {
float: left;
width: calc(100% - 60px);
width: calc(100% - 10px);
}
adf-datatable >>> table thead {