MaDgiK-CITE
/
argos
13
0
Fork 0
Code Issues Pull Requests Projects Releases 3 Wiki Activity

Merge branch 'Development' of https://gitlab.eudat.eu/dmp/OpenAIRE-EUDAT-DMP-service-pilot.git into Development

This commit is contained in:
George Kalampokis 2020-10-07 14:22:59 +03:00
parent 7a3b4a18ca 7cc584ac33
commit f4f3099b50
5 changed files with 19 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
dmp-frontend/src/app/ui/dmp/editor/dmp-editor.component.ts
View File

@ -839,7 +839,11 @@ export class DmpEditorComponent extends BaseComponent implements OnInit, IBreadC
this.formGroup.patchValue(JSON.parse(JSON.stringify(this.formGroupRawValue))); this.formGroup.patchValue(JSON.parse(JSON.stringify(this.formGroupRawValue)));
this.formGroup.get('grant').get('existGrant').setValue(grantControl.existGrant); if(this.formGroup.get('grant').get('existGrant')) {
this.formGroup.get('grant').get('existGrant').setValue(grantControl.existGrant);
} else {
this.formGroup.get('grant').setValue(grantControl);
}
} else { } else {
this.formGroup.reset(); this.formGroup.reset();
this.formGroup.get('extraProperties').get('visible').setValue(false); this.formGroup.get('extraProperties').get('visible').setValue(false);

1
dmp-frontend/src/app/ui/dmp/listing/upload-dialogue/dmp-upload-dialogue.component.ts
View File

@ -62,7 +62,6 @@ export class DmpUploadDialogue {
} }
selectFile(event) { selectFile(event) {
console.log(event)
const fileList: FileList = event.addedFiles const fileList: FileList = event.addedFiles
this.data.fileList = fileList; this.data.fileList = fileList;
if (this.data.fileList.length > 0) { if (this.data.fileList.length > 0) {

4
dmp-frontend/src/app/ui/misc/dataset-description-form/components/form-composite-field/form-composite-field.component.html
View File

@ -30,14 +30,14 @@
<app-form-composite-title class="row" [form]="form" [isChild]="isChild"></app-form-composite-title> <app-form-composite-title class="row" [form]="form" [isChild]="isChild"></app-form-composite-title>
</div> </div>
<div class="col align-self-center"> <div class="col align-self-center">
<div *ngFor="let fieldFormGroup of form.get('fields')['controls']; let i = index;" class="col-12 copositeField"> <div *ngFor="let fieldFormGroup of form.get('fields')['controls']; let i = index;" class="col-12 compositeField">
<!-- <div class="row"> <!-- <div class="row">
<div class="col-12" *ngIf="(fieldFormGroup.get('multiplicity')?.value?.max - 1) > (fieldFormGroup.get('multiplicityItems')?.length)"> <div class="col-12" *ngIf="(fieldFormGroup.get('multiplicity')?.value?.max - 1) > (fieldFormGroup.get('multiplicityItems')?.length)">
<a (click)="addMultipleField(i+1)" style="cursor: pointer"> <a (click)="addMultipleField(i+1)" style="cursor: pointer">
Add one more field + Add one more field +
</a> </a>
</div> --> </div> -->
<app-form-field [form]="fieldFormGroup" class="col-12 copositeField" [datasetProfileId]="datasetProfileId" <app-form-field [form]="fieldFormGroup" class="col-12 compositeField" [datasetProfileId]="datasetProfileId"
[isChild]="true"></app-form-field> [isChild]="true"></app-form-field>
<!-- <div *ngIf="fieldFormGroup" class="col-12"> <!-- <div *ngIf="fieldFormGroup" class="col-12">
<div *ngFor="let multipleField of fieldFormGroup.get('multiplicityItems')['controls']; let j = index" class="row"> <div *ngFor="let multipleField of fieldFormGroup.get('multiplicityItems')['controls']; let j = index" class="row">

11
dmp-frontend/src/app/ui/misc/dataset-description-form/components/form-composite-field/form-composite-field.component.scss
View File

@ -1,4 +1,13 @@
.copositeField { .compositeField {
padding-left: 0em !important; padding-left: 0em !important;
padding-top: 2em !important; padding-top: 2em !important;
} }
// ::ng-deep .mat-form-field-appearance-outline .mat-form-field-outline {
// background: #fafafa !important;
// }
// ::ng-deep .mat-form-field-appearance-outline .mat-form-field-infix {
// font-size: 1rem;
// padding: 0.6em 0 1em 0 !important;
// }

4
dmp-frontend/src/app/ui/misc/dataset-description-form/tableOfContentsMaterial/table-of-contents.ts
View File

@ -32,7 +32,7 @@ export class TableOfContents extends BaseComponent implements OnInit {
links: Link[] = []; links: Link[] = [];
container: string; container: string;
headerSelectors = '.toc-page-header, .toc-section-header, .toc-copositeField-header'; headerSelectors = '.toc-page-header, .toc-section-header, .toc-compositeField-header';
@Output() stepFound = new EventEmitter<LinkToScroll>(); @Output() stepFound = new EventEmitter<LinkToScroll>();
subscription: Subscription; subscription: Subscription;
linksSubject: Subject<HTMLElement[]> = new Subject<HTMLElement[]>(); linksSubject: Subject<HTMLElement[]> = new Subject<HTMLElement[]>();
@ -79,7 +79,7 @@ export class TableOfContents extends BaseComponent implements OnInit {
section = header.id; section = header.id;
if (header.id.split('.')[4]) { show = false; } if (header.id.split('.')[4]) { show = false; }
else { show = true; } else { show = true; }
} else if (header.classList.contains('toc-copositeField-header')) { } else if (header.classList.contains('toc-compositeField-header')) {
name = (header.childNodes[0]).nodeValue.trim().replace(/^link/, ''); name = (header.childNodes[0]).nodeValue.trim().replace(/^link/, '');
id = header.id; id = header.id;
// id = header.parentElement.parentElement.parentElement.id; // id = header.parentElement.parentElement.parentElement.id;