diff --git a/dmp-frontend/src/app/library/auto-complete/multiple/multiple-auto-complete.component.html b/dmp-frontend/src/app/library/auto-complete/multiple/multiple-auto-complete.component.html index 83b01d997..3c89cd3ff 100644 --- a/dmp-frontend/src/app/library/auto-complete/multiple/multiple-auto-complete.component.html +++ b/dmp-frontend/src/app/library/auto-complete/multiple/multiple-auto-complete.component.html @@ -10,7 +10,7 @@ - + arrow_drop_down diff --git a/dmp-frontend/src/app/library/auto-complete/multiple/multiple-auto-complete.component.scss b/dmp-frontend/src/app/library/auto-complete/multiple/multiple-auto-complete.component.scss index 1230c73a7..76cfcb18e 100644 --- a/dmp-frontend/src/app/library/auto-complete/multiple/multiple-auto-complete.component.scss +++ b/dmp-frontend/src/app/library/auto-complete/multiple/multiple-auto-complete.component.scss @@ -44,3 +44,24 @@ max-height: 4.8em !important; overflow: auto !important; } +.hide-placeholder{ + &::-webkit-input-placeholder { + /* WebKit browsers */ + color: transparent; + } + &:-moz-placeholder { + /* Mozilla Firefox 4 to 18 */ + color: transparent; + } + &::-moz-placeholder { + /* Mozilla Firefox 19+ */ + color: transparent; + } + &:-ms-input-placeholder { + /* Internet Explorer 10+ */ + color: transparent; + } + &::placeholder { + color: transparent; + } + } \ No newline at end of file diff --git a/dmp-frontend/src/app/library/auto-complete/multiple/multiple-auto-complete.component.ts b/dmp-frontend/src/app/library/auto-complete/multiple/multiple-auto-complete.component.ts index 89470bca2..fd9854690 100644 --- a/dmp-frontend/src/app/library/auto-complete/multiple/multiple-auto-complete.component.ts +++ b/dmp-frontend/src/app/library/auto-complete/multiple/multiple-auto-complete.component.ts @@ -66,6 +66,7 @@ export class MultipleAutoCompleteComponent extends _CustomComponentMixinBase imp get shouldLabelFloat() { return this.focused || !this.empty; } + @Input() hidePlaceholder: boolean = false; @Input() get placeholder() { return this._placeholder; } set placeholder(placeholder) { diff --git a/dmp-frontend/src/app/ui/dataset/dataset-wizard/dataset-wizard.component.ts b/dmp-frontend/src/app/ui/dataset/dataset-wizard/dataset-wizard.component.ts index 72377dc5e..db210e626 100644 --- a/dmp-frontend/src/app/ui/dataset/dataset-wizard/dataset-wizard.component.ts +++ b/dmp-frontend/src/app/ui/dataset/dataset-wizard/dataset-wizard.component.ts @@ -619,7 +619,10 @@ export class DatasetWizardComponent extends BaseComponent implements OnInit, IBr if(aControl.errors){ //check if has placeholder if( (aControl).nativeElement !== undefined && (aControl).nativeElement !== null){ - controlName = this._getPlaceHolder(aControl); + const placeholder = this._getPlaceHolder(aControl); + if(placeholder){ + controlName = placeholder; + } } const errorMessage = this._getErrorMessage(aControl, controlName); diff --git a/dmp-frontend/src/app/ui/dmp/editor/dataset-info/dataset-info.component.html b/dmp-frontend/src/app/ui/dmp/editor/dataset-info/dataset-info.component.html index 79a8c1464..b46adb5fc 100644 --- a/dmp-frontend/src/app/ui/dmp/editor/dataset-info/dataset-info.component.html +++ b/dmp-frontend/src/app/ui/dmp/editor/dataset-info/dataset-info.component.html @@ -14,7 +14,7 @@
{{'DMP-EDITOR.FIELDS.SELECT-TEMPLATE' | translate}} - + {{formGroup.get('profiles').getError('backendError').message}} diff --git a/dmp-frontend/src/app/ui/dmp/editor/dmp-editor.component.html b/dmp-frontend/src/app/ui/dmp/editor/dmp-editor.component.html index ea6fc8b49..7c979743a 100644 --- a/dmp-frontend/src/app/ui/dmp/editor/dmp-editor.component.html +++ b/dmp-frontend/src/app/ui/dmp/editor/dmp-editor.component.html @@ -33,17 +33,17 @@
{{'DMP-EDITOR.STEPPER.USER-GUIDE' | translate}}
    -
  1. {{'DMP-EDITOR.STEPPER.MAIN-INFO' | translate}} (1)
  2. +
  3. {{'DMP-EDITOR.STEPPER.MAIN-INFO' | translate}} (1)
  4. {{'DMP-EDITOR.STEPPER.MAIN-INFO' | translate}} (done)
  5. -
  6. {{'DMP-EDITOR.STEPPER.MAIN-INFO' | translate}} (2)
  7. +
  8. {{'DMP-EDITOR.STEPPER.MAIN-INFO' | translate}} (2)
  9. {{'DMP-EDITOR.STEPPER.MAIN-INFO' | translate}} (done)
  10. -
  11. {{'DMP-EDITOR.STEPPER.FUNDING-INFO' | translate}} (2)
  12. +
  13. {{'DMP-EDITOR.STEPPER.FUNDING-INFO' | translate}} (2)
  14. {{'DMP-EDITOR.STEPPER.FUNDING-INFO' | translate}} (done)
  15. {{'DMP-EDITOR.STEPPER.LICENSE-INFO' | translate}}
  16. -
  17. {{'DMP-EDITOR.STEPPER.DATASET-INFO' | translate}} (1)
  18. +
  19. {{'DMP-EDITOR.STEPPER.DATASET-INFO' | translate}} (1)
  20. {{'DMP-EDITOR.STEPPER.DATASET-INFO' | translate}} (done)
  21. diff --git a/dmp-frontend/src/app/ui/dmp/editor/dmp-editor.component.ts b/dmp-frontend/src/app/ui/dmp/editor/dmp-editor.component.ts index c9b412943..e6aef200c 100644 --- a/dmp-frontend/src/app/ui/dmp/editor/dmp-editor.component.ts +++ b/dmp-frontend/src/app/ui/dmp/editor/dmp-editor.component.ts @@ -99,6 +99,7 @@ export class DmpEditorComponent extends BaseComponent implements OnInit, IBreadC maxStep: number = 4; scrollTop: number; + hintErrors:boolean = false; constructor( private dmpProfileService: DmpProfileService, @@ -412,6 +413,7 @@ export class DmpEditorComponent extends BaseComponent implements OnInit, IBreadC // console.log("update ", this.formGroup); if (!this.isFormValid()) { this.showValidationErrorsDialog(); + this.hintErrors = true; return; } this.onSubmit(addNew, showAddDatasetDialog); @@ -815,7 +817,10 @@ export class DmpEditorComponent extends BaseComponent implements OnInit, IBreadC if(aControl.errors){ //check if has placeholder if( (aControl).nativeElement !== undefined && (aControl).nativeElement !== null){ - controlName = this._getPlaceHolder(aControl); + const placeholder = this._getPlaceHolder(aControl); + if(placeholder){ + controlName = placeholder; + } } const errorMessage = this._getErrorMessage(aControl, controlName); @@ -856,6 +861,7 @@ export class DmpEditorComponent extends BaseComponent implements OnInit, IBreadC if(!this._isDMPDescriptionValid()){ const errmess = this._buildDMPDescriptionErrorMessages(); this.showValidationErrorsDialog(undefined, errmess); + this.hintErrors = true; return; }