fix Dmp Version Clone
remove Dmp Edite And Lock on Final Dmps
This commit is contained in:
parent
bbfd5e9812
commit
d2b15a2885
|
@ -12,12 +12,12 @@
|
||||||
<div class="col"></div>
|
<div class="col"></div>
|
||||||
<div *ngIf="!isNew" class="col-auto">
|
<div *ngIf="!isNew" class="col-auto">
|
||||||
<div class="row actions-row">
|
<div class="row actions-row">
|
||||||
<div class="col-auto" *ngIf="!editMode">
|
<div class="col-auto" *ngIf="!editMode && formGroup.get('status').value !== 1">
|
||||||
<button mat-icon-button (click)="enableForm()">
|
<button mat-icon-button (click)="enableForm()">
|
||||||
<mat-icon class="mat-24">edit</mat-icon>
|
<mat-icon class="mat-24">edit</mat-icon>
|
||||||
</button>
|
</button>
|
||||||
</div>
|
</div>
|
||||||
<div class="col-auto" *ngIf="editMode">
|
<div class="col-auto" *ngIf="editMode && formGroup.get('status').value !== 1">
|
||||||
<button mat-icon-button (click)="disableForm()">
|
<button mat-icon-button (click)="disableForm()">
|
||||||
<mat-icon class="mat-24">lock</mat-icon>
|
<mat-icon class="mat-24">lock</mat-icon>
|
||||||
</button>
|
</button>
|
||||||
|
|
|
@ -39,6 +39,7 @@ import { AddResearcherComponent } from './add-researcher/add-researcher.componen
|
||||||
import { AvailableProfilesComponent } from './available-profiles/available-profiles.component';
|
import { AvailableProfilesComponent } from './available-profiles/available-profiles.component';
|
||||||
import { DmpEditorModel } from './dmp-editor.model';
|
import { DmpEditorModel } from './dmp-editor.model';
|
||||||
import { DmpFinalizeDialogComponent } from './dmp-finalize-dialog/dmp-finalize-dialog.component';
|
import { DmpFinalizeDialogComponent } from './dmp-finalize-dialog/dmp-finalize-dialog.component';
|
||||||
|
import { DmpProfileStatus } from '../../../core/common/enum/dmp-profile-status';
|
||||||
|
|
||||||
@Component({
|
@Component({
|
||||||
selector: 'app-dmp-editor-component',
|
selector: 'app-dmp-editor-component',
|
||||||
|
@ -185,9 +186,6 @@ export class DmpEditorComponent extends BaseComponent implements OnInit, IBreadC
|
||||||
.subscribe(params => {
|
.subscribe(params => {
|
||||||
this.createNewVersion = params['clone'];
|
this.createNewVersion = params['clone'];
|
||||||
});
|
});
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
registerFormEventsForDmpProfile(): void {
|
registerFormEventsForDmpProfile(): void {
|
||||||
|
@ -435,15 +433,16 @@ export class DmpEditorComponent extends BaseComponent implements OnInit, IBreadC
|
||||||
if (this.formGroup.get('status').value !== DmpStatus.Finalized) {
|
if (this.formGroup.get('status').value !== DmpStatus.Finalized) {
|
||||||
this.editMode = true;
|
this.editMode = true;
|
||||||
this.formGroup.enable();
|
this.formGroup.enable();
|
||||||
} else {
|
|
||||||
this.dmpService.unlock(this.formGroup.get('id').value)
|
|
||||||
.pipe(takeUntil(this._destroyed))
|
|
||||||
.subscribe(x => {
|
|
||||||
this.editMode = true;
|
|
||||||
this.formGroup.get('status').patchValue(DmpStatus.Draft);
|
|
||||||
this.formGroup.enable();
|
|
||||||
});
|
|
||||||
}
|
}
|
||||||
|
//else {
|
||||||
|
// this.dmpService.unlock(this.formGroup.get('id').value)
|
||||||
|
// .pipe(takeUntil(this._destroyed))
|
||||||
|
// .subscribe(x => {
|
||||||
|
// this.editMode = true;
|
||||||
|
// this.formGroup.get('status').patchValue(DmpStatus.Draft);
|
||||||
|
// this.formGroup.enable();
|
||||||
|
// });
|
||||||
|
// }
|
||||||
}
|
}
|
||||||
|
|
||||||
public disableForm() {
|
public disableForm() {
|
||||||
|
|
|
@ -46,15 +46,16 @@ export class DmpWizardComponent extends BaseComponent implements OnInit, IBreadC
|
||||||
.pipe(takeUntil(this._destroyed))
|
.pipe(takeUntil(this._destroyed))
|
||||||
.subscribe(data => {
|
.subscribe(data => {
|
||||||
this.dmp = new DmpWizardEditorModel().fromModel(data);
|
this.dmp = new DmpWizardEditorModel().fromModel(data);
|
||||||
this.isClone = this.route.snapshot.data.clone;
|
|
||||||
this.formGroup = this.dmp.buildForm();
|
this.formGroup = this.dmp.buildForm();
|
||||||
|
|
||||||
if (this.route.routeConfig.path.startsWith('new_version/')) {
|
if (this.route.routeConfig.path.startsWith('new_version/')) {
|
||||||
this.formGroup.get('version').setValue(this.dmp.version + 1);
|
this.formGroup.get('version').setValue(this.formGroup.get('version').value + 1);
|
||||||
this.formGroup.controls['label'].disable();
|
this.formGroup.controls['label'].disable();
|
||||||
this.formGroup.controls['project'].disable();
|
this.formGroup.controls['project'].disable();
|
||||||
|
this.isClone = false;
|
||||||
} else if (this.route.routeConfig.path.startsWith('clone/')) {
|
} else if (this.route.routeConfig.path.startsWith('clone/')) {
|
||||||
this.formGroup.get('label').setValue(this.dmp.label + " New");
|
this.formGroup.get('label').setValue(this.dmp.label + " New");
|
||||||
|
this.isClone = true;
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
});
|
});
|
||||||
|
|
|
@ -4,42 +4,65 @@
|
||||||
<mat-card-content>
|
<mat-card-content>
|
||||||
<div class="row">
|
<div class="row">
|
||||||
<mat-form-field class="col-md-6">
|
<mat-form-field class="col-md-6">
|
||||||
<input matInput placeholder="{{'DMP-EDITOR.FIELDS.NAME' | translate}}" type="text" name="label" formControlName="label" required>
|
<input matInput placeholder="{{'DMP-EDITOR.FIELDS.NAME' | translate}}" type="text" name="label"
|
||||||
<mat-error *ngIf="formGroup.get('label').hasError('backendError')">{{formGroup.get('label').getError('backendError').message}}</mat-error>
|
formControlName="label" required>
|
||||||
<mat-error *ngIf="formGroup.get('label').hasError('required')">{{'GENERAL.VALIDATION.REQUIRED' | translate}}</mat-error>
|
<mat-error *ngIf="formGroup.get('label').hasError('backendError')">
|
||||||
|
{{formGroup.get('label').getError('backendError').message}}</mat-error>
|
||||||
|
<mat-error *ngIf="formGroup.get('label').hasError('required')">
|
||||||
|
{{'GENERAL.VALIDATION.REQUIRED' | translate}}</mat-error>
|
||||||
</mat-form-field>
|
</mat-form-field>
|
||||||
<mat-form-field class="col-md-6">
|
<mat-form-field class="col-md-6">
|
||||||
<app-single-auto-complete [formControl]="formGroup.get('project')" placeholder="{{this.languageResolverService.getBy('dmpEditor') | translate}}" [configuration]="projectAutoCompleteConfiguration">
|
<app-single-auto-complete [formControl]="formGroup.get('project')"
|
||||||
|
placeholder="{{this.languageResolverService.getBy('dmpEditor') | translate}}"
|
||||||
|
[configuration]="projectAutoCompleteConfiguration">
|
||||||
</app-single-auto-complete>
|
</app-single-auto-complete>
|
||||||
<mat-error *ngIf="formGroup.get('project').hasError('backendError')">{{formGroup.get('project').getError('backendError').message}}</mat-error>
|
<mat-error *ngIf="formGroup.get('project').hasError('backendError')">
|
||||||
<mat-error *ngIf="formGroup.get('project').hasError('required')">{{'GENERAL.VALIDATION.REQUIRED' | translate}}</mat-error>
|
{{formGroup.get('project').getError('backendError').message}}</mat-error>
|
||||||
|
<mat-error *ngIf="formGroup.get('project').hasError('required')">
|
||||||
|
{{'GENERAL.VALIDATION.REQUIRED' | translate}}</mat-error>
|
||||||
</mat-form-field>
|
</mat-form-field>
|
||||||
|
|
||||||
<mat-form-field class="col-md-12">
|
<mat-form-field class="col-md-12">
|
||||||
<textarea matInput class="description-area" placeholder="{{'DMP-EDITOR.FIELDS.DESCRIPTION' | translate}}" formControlName="description" required></textarea>
|
<textarea matInput class="description-area"
|
||||||
<mat-error *ngIf="formGroup.get('description').hasError('backendError')">{{formGroup.get('description').getError('backendError').message}}</mat-error>
|
placeholder="{{'DMP-EDITOR.FIELDS.DESCRIPTION' | translate}}" formControlName="description"
|
||||||
<mat-error *ngIf="formGroup.get('description').hasError('required')">{{'GENERAL.VALIDATION.REQUIRED' | translate}}</mat-error>
|
required></textarea>
|
||||||
|
<mat-error *ngIf="formGroup.get('description').hasError('backendError')">
|
||||||
|
{{formGroup.get('description').getError('backendError').message}}</mat-error>
|
||||||
|
<mat-error *ngIf="formGroup.get('description').hasError('required')">
|
||||||
|
{{'GENERAL.VALIDATION.REQUIRED' | translate}}</mat-error>
|
||||||
</mat-form-field>
|
</mat-form-field>
|
||||||
<mat-form-field class="col-md-6">
|
<mat-form-field class="col-md-6">
|
||||||
<app-multiple-auto-complete class="col-md-10" [formControl]="formGroup.get('profiles')" placeholder="{{'DMP-EDITOR.FIELDS.PROFILES' | translate}}" [configuration]="profilesAutoCompleteConfiguration">
|
<app-multiple-auto-complete class="col-md-10" [formControl]="formGroup.get('profiles')"
|
||||||
|
placeholder="{{'DMP-EDITOR.FIELDS.PROFILES' | translate}}"
|
||||||
|
[configuration]="profilesAutoCompleteConfiguration">
|
||||||
</app-multiple-auto-complete>
|
</app-multiple-auto-complete>
|
||||||
<mat-error *ngIf="formGroup.get('profiles').hasError('backendError')">{{formGroup.get('profiles').getError('backendError').message}}</mat-error>
|
<mat-error *ngIf="formGroup.get('profiles').hasError('backendError')">
|
||||||
<mat-error *ngIf="formGroup.get('profiles').hasError('required')">{{'GENERAL.VALIDATION.REQUIRED' | translate}}</mat-error>
|
{{formGroup.get('profiles').getError('backendError').message}}</mat-error>
|
||||||
|
<mat-error *ngIf="formGroup.get('profiles').hasError('required')">
|
||||||
|
{{'GENERAL.VALIDATION.REQUIRED' | translate}}</mat-error>
|
||||||
<button mat-icon-button matSuffix type="button" (click)="availableProfiles()">
|
<button mat-icon-button matSuffix type="button" (click)="availableProfiles()">
|
||||||
<mat-icon>view_list</mat-icon>
|
<mat-icon>view_list</mat-icon>
|
||||||
</button>
|
</button>
|
||||||
</mat-form-field>
|
</mat-form-field>
|
||||||
<mat-form-field class="col-md-6">
|
<mat-form-field class="col-md-6">
|
||||||
<app-multiple-auto-complete [formControl]="formGroup.get('organisations')" placeholder="{{'DMP-EDITOR.FIELDS.ORGANISATIONS' | translate}}" [configuration]="organisationsAutoCompleteConfiguration">
|
<app-multiple-auto-complete [formControl]="formGroup.get('organisations')"
|
||||||
|
placeholder="{{'DMP-EDITOR.FIELDS.ORGANISATIONS' | translate}}"
|
||||||
|
[configuration]="organisationsAutoCompleteConfiguration">
|
||||||
</app-multiple-auto-complete>
|
</app-multiple-auto-complete>
|
||||||
<mat-error *ngIf="formGroup.get('organisations').hasError('backendError')">{{formGroup.get('organisations').getError('backendError').message}}</mat-error>
|
<mat-error *ngIf="formGroup.get('organisations').hasError('backendError')">
|
||||||
<mat-error *ngIf="formGroup.get('organisations').hasError('required')">{{'GENERAL.VALIDATION.REQUIRED' | translate}}</mat-error>
|
{{formGroup.get('organisations').getError('backendError').message}}</mat-error>
|
||||||
|
<mat-error *ngIf="formGroup.get('organisations').hasError('required')">
|
||||||
|
{{'GENERAL.VALIDATION.REQUIRED' | translate}}</mat-error>
|
||||||
</mat-form-field>
|
</mat-form-field>
|
||||||
<mat-form-field class="col-md-6">
|
<mat-form-field class="col-md-6">
|
||||||
<app-multiple-auto-complete [formControl]="formGroup.get('researchers')" placeholder="{{'DMP-EDITOR.FIELDS.RESEARCHERS' | translate}}" [configuration]="researchersAutoCompleteConfiguration">
|
<app-multiple-auto-complete [formControl]="formGroup.get('researchers')"
|
||||||
|
placeholder="{{'DMP-EDITOR.FIELDS.RESEARCHERS' | translate}}"
|
||||||
|
[configuration]="researchersAutoCompleteConfiguration">
|
||||||
</app-multiple-auto-complete>
|
</app-multiple-auto-complete>
|
||||||
<mat-error *ngIf="formGroup.get('researchers').hasError('backendError')">{{formGroup.get('researchers').getError('backendError').message}}</mat-error>
|
<mat-error *ngIf="formGroup.get('researchers').hasError('backendError')">
|
||||||
<mat-error *ngIf="formGroup.get('researchers').hasError('required')">{{'GENERAL.VALIDATION.REQUIRED' | translate}}</mat-error>
|
{{formGroup.get('researchers').getError('backendError').message}}</mat-error>
|
||||||
|
<mat-error *ngIf="formGroup.get('researchers').hasError('required')">
|
||||||
|
{{'GENERAL.VALIDATION.REQUIRED' | translate}}</mat-error>
|
||||||
<button mat-icon-button matSuffix type="button" (click)="addResearcher()">
|
<button mat-icon-button matSuffix type="button" (click)="addResearcher()">
|
||||||
<mat-icon>add_circle</mat-icon>
|
<mat-icon>add_circle</mat-icon>
|
||||||
</button>
|
</button>
|
||||||
|
|
Loading…
Reference in New Issue