nosu
/
taskana
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

TSK-1340: Classification now gets displayed correctly in Workplace

This commit is contained in:
Tristan Eisermann 2020-07-16 14:32:52 +02:00 committed by Tristan2357
parent f9814fa68d
commit 72d46b9324
5 changed files with 7 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
web/src/app/shared/components/dropdown/dropdown.component.ts
View File

@ -7,7 +7,7 @@ import { Component, EventEmitter, Input, OnInit, Output } from '@angular/core';
}) })
export class DropdownComponent implements OnInit { export class DropdownComponent implements OnInit {
@Input() itemSelected: any; @Input() itemSelected: any;
@Input() list: Array<any>; @Input() list: any[];
@Output() performClassification = new EventEmitter<any>(); @Output() performClassification = new EventEmitter<any>();
ngOnInit(): void { ngOnInit(): void {

2
web/src/app/workplace/components/task/task.component.ts
View File

@ -43,7 +43,7 @@ export class TaskComponent implements OnInit, OnDestroy {
this.requestInProgress = true; this.requestInProgress = true;
this.task = await this.taskService.getTask(id).toPromise(); this.task = await this.taskService.getTask(id).toPromise();
const classification = await this.classificationService.getClassification( const classification = await this.classificationService.getClassification(
this.task.classificationSummaryResource.classificationId this.task.classificationSummary.classificationId
).toPromise(); ).toPromise();
this.address = this.extractUrl(classification.applicationEntryPoint) || `${this.address}/?q=${this.task.name}`; this.address = this.extractUrl(classification.applicationEntryPoint) || `${this.address}/?q=${this.task.name}`;
this.link = this.sanitizer.bypassSecurityTrustResourceUrl(this.address); this.link = this.sanitizer.bypassSecurityTrustResourceUrl(this.address);

2
web/src/app/workplace/components/taskdetails-general/general-fields.component.html
View File

@ -58,7 +58,7 @@
<div class="row"> <div class="row">
<div class="form-group col-xs-6 required"> <div class="form-group col-xs-6 required">
<label for="classification" class="control-label">Classification</label> <label for="classification" class="control-label">Classification</label>
<taskana-shared-dropdown [list]="classifications" (performClassification)="changedClassification($event)" [itemSelected]="task?.classificationSummaryResource" id="classification"></taskana-shared-dropdown> <taskana-shared-dropdown [list]="classifications" (performClassification)="changedClassification($event)" [itemSelected]="task?.classificationSummary" id="classification"></taskana-shared-dropdown>
</div> </div>
<div class="form-group col-xs-4"> <div class="form-group col-xs-4">
<label for="task-due" class="control-label">Due date</label> <label for="task-due" class="control-label">Due date</label>

8
web/src/app/workplace/components/taskdetails-general/general-fields.component.ts
View File

@ -52,10 +52,6 @@ export class TaskdetailsGeneralFieldsComponent implements OnInit, OnChanges {
} }
} }
selectClassification(classification: Classification) {
this.task.classificationSummaryResource = classification;
}
isFieldValid(field: string): boolean { isFieldValid(field: string): boolean {
return this.formsValidatorService.isFieldValid(this.taskForm, field); return this.formsValidatorService.isFieldValid(this.taskForm, field);
} }
@ -77,8 +73,8 @@ export class TaskdetailsGeneralFieldsComponent implements OnInit, OnChanges {
}); });
} }
private changedClassification(itemSelected: any) { changedClassification(itemSelected: Classification) {
this.task.classificationSummaryResource = itemSelected; this.task.classificationSummary = itemSelected;
} }
private async getClassificationByDomain() { private async getClassificationByDomain() {

4
web/src/app/workplace/models/task.ts
View File

@ -1,12 +1,12 @@
import { Classification } from 'app/shared/models/classification';
import { Workbasket } from 'app/shared/models/workbasket'; import { Workbasket } from 'app/shared/models/workbasket';
import { ObjectReference } from './object-reference'; import { ObjectReference } from './object-reference';
import { ClassificationSummary } from '../../shared/models/classification-summary';
export class Task { export class Task {
constructor(public taskId: string, constructor(public taskId: string,
public primaryObjRef: ObjectReference = new ObjectReference(), public primaryObjRef: ObjectReference = new ObjectReference(),
public workbasketSummaryResource?: Workbasket, public workbasketSummaryResource?: Workbasket,
public classificationSummaryResource?: Classification, public classificationSummary?: ClassificationSummary,
public businessProcessId?: string, public businessProcessId?: string,
public parentBusinessProcessId?: string, public parentBusinessProcessId?: string,
public owner?: string, public owner?: string,