diff --git a/dmp-frontend/src/app/dataset-wizard/dataset-wizard.component.html b/dmp-frontend/src/app/dataset-wizard/dataset-wizard.component.html index 0da875d67..3ec275bbe 100644 --- a/dmp-frontend/src/app/dataset-wizard/dataset-wizard.component.html +++ b/dmp-frontend/src/app/dataset-wizard/dataset-wizard.component.html @@ -65,7 +65,7 @@ {{option.name}} - + - + diff --git a/dmp-frontend/src/app/form/dynamic-fields/dynamic-field-autocomplete/autocomplete-remote.component.ts b/dmp-frontend/src/app/form/dynamic-fields/dynamic-field-autocomplete/autocomplete-remote.component.ts index 10b451e1c..294f4a41b 100644 --- a/dmp-frontend/src/app/form/dynamic-fields/dynamic-field-autocomplete/autocomplete-remote.component.ts +++ b/dmp-frontend/src/app/form/dynamic-fields/dynamic-field-autocomplete/autocomplete-remote.component.ts @@ -64,7 +64,6 @@ export class AutocompleteRemoteComponent implements OnInit/* , ControlValueAcces // }); */ // }, // error => { - // console.log(error); // } // ); } diff --git a/dmp-frontend/src/app/form/dynamic-fields/dynamic-form-field.component.ts b/dmp-frontend/src/app/form/dynamic-fields/dynamic-form-field.component.ts index a5742847d..d1472b899 100644 --- a/dmp-frontend/src/app/form/dynamic-fields/dynamic-form-field.component.ts +++ b/dmp-frontend/src/app/form/dynamic-fields/dynamic-form-field.component.ts @@ -33,7 +33,6 @@ export class DynamicFormFieldComponent { } clearInput(){ -debugger; } get isValid() { diff --git a/dmp-frontend/src/app/form/dynamic-form-composite-field/dynamic-form-composite-field.ts b/dmp-frontend/src/app/form/dynamic-form-composite-field/dynamic-form-composite-field.ts index e338d8880..f90ca0daf 100644 --- a/dmp-frontend/src/app/form/dynamic-form-composite-field/dynamic-form-composite-field.ts +++ b/dmp-frontend/src/app/form/dynamic-form-composite-field/dynamic-form-composite-field.ts @@ -22,7 +22,6 @@ export class DynamicFormCompositeFieldComponent implements OnInit { constructor(private visibilityRulesService: VisibilityRulesService) { } ngOnInit() { - console.log(this.form); } addMultipleField(fieldIndex: number) { diff --git a/dmp-frontend/src/app/form/dynamic-form-group/dynamic-form-group.component.ts b/dmp-frontend/src/app/form/dynamic-form-group/dynamic-form-group.component.ts index 356918176..e7e0b1331 100644 --- a/dmp-frontend/src/app/form/dynamic-form-group/dynamic-form-group.component.ts +++ b/dmp-frontend/src/app/form/dynamic-form-group/dynamic-form-group.component.ts @@ -26,7 +26,6 @@ export class DynamicFormGroupComponent implements OnInit { } ngOnInit() { - console.log(this.group); //let st = this.group.style == "any" ? "" : this.group.style; //this.classFromJson = this.group.class == "" ? "" : this.group.class; diff --git a/dmp-frontend/src/app/form/dynamic-form-section/dynamic-form-section.ts b/dmp-frontend/src/app/form/dynamic-form-section/dynamic-form-section.ts index 9f5668b7e..7a6901833 100644 --- a/dmp-frontend/src/app/form/dynamic-form-section/dynamic-form-section.ts +++ b/dmp-frontend/src/app/form/dynamic-form-section/dynamic-form-section.ts @@ -22,7 +22,6 @@ export class DynamicFormSectionComponent implements OnInit { constructor(private visibilityRulesService: VisibilityRulesService) { } ngOnInit() { - console.log(this.section); } addMultipleField(fieldsetIndex: number) { diff --git a/dmp-frontend/src/app/form/dynamic-form.component.css b/dmp-frontend/src/app/form/dynamic-form.component.css index fc9ad2d56..6cc1d4664 100644 --- a/dmp-frontend/src/app/form/dynamic-form.component.css +++ b/dmp-frontend/src/app/form/dynamic-form.component.css @@ -39,7 +39,7 @@ } -.mat-progress-bar { +.form-progress-bar { margin: 20px 0; diff --git a/dmp-frontend/src/app/form/dynamic-form.component.html b/dmp-frontend/src/app/form/dynamic-form.component.html index f19765878..499570846 100644 --- a/dmp-frontend/src/app/form/dynamic-form.component.html +++ b/dmp-frontend/src/app/form/dynamic-form.component.html @@ -6,31 +6,31 @@ - - -
-
- - +
+ + +
+
+ + +
-
-
- -
-
- - +
+ +
- {{section.title}} -
+
+ +
@@ -41,8 +41,9 @@
--> - -
+ +
+
diff --git a/dmp-frontend/src/app/form/dynamic-form.component.ts b/dmp-frontend/src/app/form/dynamic-form.component.ts index 2bc2340d7..18275821d 100644 --- a/dmp-frontend/src/app/form/dynamic-form.component.ts +++ b/dmp-frontend/src/app/form/dynamic-form.component.ts @@ -34,7 +34,7 @@ export class DynamicFormComponent implements OnInit { @Input() path: string; form: FormGroup; id: string; - datasetId: string; + // @Input() datasetId: string; pathName: string; pages: Array; activeStepperIndex: number = 1; @@ -51,7 +51,7 @@ export class DynamicFormComponent implements OnInit { private http: BaseHttpService, private datasetWizardService: DatasetWizardService, ) { - this.datasetId = route.snapshot.params['id']; + //this.datasetId = route.snapshot.params['id']; } getSubForm(subformName) { @@ -94,8 +94,8 @@ export class DynamicFormComponent implements OnInit { } onSubmit(){ - this.datasetWizardService.saveDataset(this.datasetId, this.form.value).subscribe(data => { - this.router.navigateByUrl("/datasets"); + this.datasetWizardService.saveDataset(this.dataModel.id, this.form.value).subscribe(data => { + this.router.navigateByUrl("/datasets/" + this.dataModel.dmp.id); }); } diff --git a/dmp-frontend/src/app/form/pprogress-bar/progress-bar.component.html b/dmp-frontend/src/app/form/pprogress-bar/progress-bar.component.html index 772e29463..07b6bc6d6 100644 --- a/dmp-frontend/src/app/form/pprogress-bar/progress-bar.component.html +++ b/dmp-frontend/src/app/form/pprogress-bar/progress-bar.component.html @@ -1,5 +1,5 @@ 
- +
\ No newline at end of file diff --git a/dmp-frontend/src/app/models/criteria/dataset/DatasetCriteria.ts b/dmp-frontend/src/app/models/criteria/dataset/DatasetCriteria.ts index 8520a2330..a74ddc498 100644 --- a/dmp-frontend/src/app/models/criteria/dataset/DatasetCriteria.ts +++ b/dmp-frontend/src/app/models/criteria/dataset/DatasetCriteria.ts @@ -2,5 +2,5 @@ import { BaseCriteria } from "../BaseCriteria"; export class DatasetCriteria extends BaseCriteria { public status: Number; - public dmpIds: string[] = []; + public dmpIds: String[] = []; } diff --git a/dmp-frontend/src/app/services/auth/auth.service.ts b/dmp-frontend/src/app/services/auth/auth.service.ts index 6a074b8be..be6a91dd8 100644 --- a/dmp-frontend/src/app/services/auth/auth.service.ts +++ b/dmp-frontend/src/app/services/auth/auth.service.ts @@ -124,7 +124,6 @@ export class AuthService { } public onLogOutError(errorMessage: string) { - console.log(errorMessage); this.snackBar.openFromComponent(SnackBarNotificationComponent, { data: { message: 'GENERAL.SNACK-BAR.UNSUCCESSFUL-LOGOUT', language: this.language }, duration: 3000, diff --git a/dmp-frontend/src/app/services/data-management-plan/data-management-plan.service.ts b/dmp-frontend/src/app/services/data-management-plan/data-management-plan.service.ts index 937f6acd5..59610030d 100644 --- a/dmp-frontend/src/app/services/data-management-plan/data-management-plan.service.ts +++ b/dmp-frontend/src/app/services/data-management-plan/data-management-plan.service.ts @@ -33,7 +33,7 @@ export class DataManagementPlanService { return this.http.post>(this.actionUrl + 'getPaged', dataTableRequest, { headers: this.headers }); } - getSingle(id: string): Observable { + getSingle(id: String): Observable { return this.http.get(this.actionUrl + 'getSingle/' + id, { headers: this.headers }); } diff --git a/dmp-frontend/src/app/user-management/utilties/login-service.ts b/dmp-frontend/src/app/user-management/utilties/login-service.ts index 9397447fe..eaf123d60 100644 --- a/dmp-frontend/src/app/user-management/utilties/login-service.ts +++ b/dmp-frontend/src/app/user-management/utilties/login-service.ts @@ -186,7 +186,6 @@ export class LoginService { } public onLogInError(errorMessage: string) { - console.log(errorMessage); this.snackBar.openFromComponent(SnackBarNotificationComponent, { data: { message: 'GENERAL.SNACK-BAR.UNSUCCESSFUL-LOGIN', language: this.language }, duration: 3000,