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

TSK-1221: Added copy functionality to classifications

This commit is contained in:
Tristan Eisermann 2020-06-22 10:18:46 +02:00 committed by Tristan2357
parent 018ac2ebc1
commit b0dc2663e5
2 changed files with 17 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
web/src/app/administration/components/classification-details/classification-details.component.html
View File

@ -12,12 +12,15 @@
<button type="button" (click)="onRestore()" class="btn btn-default" data-toggle="tooltip" title="Restore Previous Version"> <button type="button" (click)="onRestore()" class="btn btn-default" data-toggle="tooltip" title="Restore Previous Version">
<span class="material-icons md-20 blue">restore</span> <span class="material-icons md-20 blue">restore</span>
</button> </button>
<button type="button" (click)="onCopy()" data-toggle="tooltip" title="Copy" class="btn btn-default">
<span class="material-icons md-20 green-blue">content_copy</span>
</button>
<button type="button" (click)="removeClassification()" data-toggle="tooltip" title="Delete" class="btn btn-default"> <button type="button" (click)="removeClassification()" data-toggle="tooltip" title="Delete" class="btn btn-default">
<span class="material-icons md-20 red">delete</span> <span class="material-icons md-20 red">delete</span>
</button> </button>
</div> </div>
<h4 class="panel-header">{{classification.name}}&nbsp; [{{classification.type}}] <h4 class="panel-header">{{classification.name}}&nbsp; [{{classification.type}}]
<span *ngIf="action=== 0" class="badge warning"> {{badgeMessage}}</span> <span *ngIf="action" class="badge warning"> {{badgeMessage}}</span>
</h4> </h4>
</div> </div>
@ -30,9 +33,9 @@
<!-- KEY --> <!-- KEY -->
<div class="form-group required"> <div class="form-group required">
<label for="classification-key" class="control-label">Key</label> <label for="classification-key" class="control-label">Key</label>
<input type="text" required #key="ngModel" [disabled]="action!== 0" class="form-control" <input type="text" required #key="ngModel" [disabled]="!action" class="form-control"
id="classification-key" placeholder="Key" [(ngModel)]="classification.key" name="classification.key"> id="classification-key" placeholder="Key" [(ngModel)]="classification.key" name="classification.key">
<taskana-field-error-display *ngIf="action === 0" [displayError]="!isFieldValid('classification.key')" <taskana-field-error-display *ngIf="action" [displayError]="!isFieldValid('classification.key')"
[validationTrigger]="this.toogleValidationMap.get('classification.key')" errorMessage="* Key is required"> [validationTrigger]="this.toogleValidationMap.get('classification.key')" errorMessage="* Key is required">
</taskana-field-error-display> </taskana-field-error-display>
</div> </div>

13
web/src/app/administration/components/classification-details/classification-details.component.ts
View File

@ -28,7 +28,8 @@ import { ClassificationCategoryImages,
import { CreateClassification, import { CreateClassification,
RemoveSelectedClassification, RemoveSelectedClassification,
RestoreSelectedClassification, RestoreSelectedClassification,
SaveClassification } from '../../../shared/store/classification-store/classification.actions'; SaveClassification,
SetActiveAction } from '../../../shared/store/classification-store/classification.actions';
@Component({ @Component({
selector: 'taskana-classification-details', selector: 'taskana-classification-details',
@ -82,6 +83,8 @@ export class ClassificationDetailsComponent implements OnInit, OnDestroy {
this.classification = { ...initialClassification }; this.classification = { ...initialClassification };
}); });
this.badgeMessage = 'Creating new classification'; this.badgeMessage = 'Creating new classification';
} else if (this.action === ACTION.COPY) {
this.badgeMessage = `Copying Classification: ${this.classification.name}`;
} else { } else {
this.badgeMessage = ''; this.badgeMessage = '';
} }
@ -131,6 +134,11 @@ export class ClassificationDetailsComponent implements OnInit, OnDestroy {
} }
} }
onCopy() {
this.store.dispatch(new SetActiveAction(ACTION.COPY));
this.classification.key = '';
}
selectCategory(category: string) { selectCategory(category: string) {
this.classification.category = category; this.classification.category = category;
} }
@ -157,7 +165,8 @@ export class ClassificationDetailsComponent implements OnInit, OnDestroy {
private async onSave() { private async onSave() {
this.requestInProgressService.setRequestInProgress(true); this.requestInProgressService.setRequestInProgress(true);
if (this.action === ACTION.CREATE) { if (this.action) {
this.classification.classificationId = null; // in case the id has been set, but a new classification should be created
this.store.dispatch( this.store.dispatch(
new CreateClassification(this.classification) new CreateClassification(this.classification)
).pipe(take(1)).subscribe(store => { ).pipe(take(1)).subscribe(store => {