Merge branch 'dmp-refactoring' of code-repo.d4science.org:MaDgiK-CITE/argos into dmp-refactoring

backend/core/src/main/java/org/opencdmp/commons/types/descriptiontemplate/FieldEntity.java

@@ -12,8 +12,8 @@ public class FieldEntity {
     private String id;
     @XmlAttribute(name="ordinal")
     private int ordinal;
-    @XmlElementWrapper(name = "schematics")
-    @XmlElement(name = "schematic")
+    @XmlElementWrapper(name = "semantics")
+    @XmlElement(name = "semantic")
     private List<String> semantics;
     @XmlElement(name="defaultValue")
     private DefaultValueEntity defaultValue;

backend/core/src/main/java/org/opencdmp/commons/types/descriptiontemplate/importexport/DescriptionTemplateFieldImportExport.java

@@ -40,8 +40,8 @@ public class DescriptionTemplateFieldImportExport {
     })
     private BaseFieldDataImportExport data;
 
-    @XmlElementWrapper(name = "schematics")
-    @XmlElement(name = "schematic")
+    @XmlElementWrapper(name = "semantics")
+    @XmlElement(name = "semantic")
     private List<String> semantics;
 
     @XmlAttribute(name="includeInExport")

backend/core/src/main/java/org/opencdmp/model/publicapi/datasetwizard/Field.java

@@ -189,7 +189,7 @@ public class Field implements Comparable, PropertiesModelBuilder {
 //        fieldEntity.setDefaultValue(this.defaultValue.getValue());
 //        fieldEntity.setVisibilityRules(this.visible.getRules());
 //        fieldEntity.setValidations(this.validations);
-//        fieldEntity.setSchematics(this.schematics);
+//        fieldEntity.setSchematics(this.semantics);
 //        fieldEntity.setIncludeInExport(this.export);
 //        return fieldEntity;
     }

dmp-frontend/src/app/ui/description/overview/description-overview.component.html

@@ -89,8 +89,8 @@
 					<div class="row">
 						<div class="col-12" *ngFor="let dmpReference of researchers let last = last">
 							<span *ngIf="isOrcid(dmpReference.reference)">
-								<a href="{{ getOrcidPathForResearcher(dmpReference.reference?.reference) }}" target="blank" class="researcher">
-									<div class="id-btn">&nbsp;</div>
+								<a href="{{ getOrcidPathForResearcher(dmpReference.reference?.reference) }}" target="blank" class="researcher align-items-center">
+									<div class="id-btn" [matTooltip]="unauthorizedTootipText">&nbsp;</div>
 									<div *ngIf="!last">{{ dmpReference.reference?.label }}, </div>
 									<div *ngIf="last">{{ dmpReference.reference?.label }}</div>
 								</a>

dmp-frontend/src/app/ui/description/overview/description-overview.component.scss

@@ -52,8 +52,9 @@
 }
 
 .id-btn {
-  background: url("../../../../assets/images/orcid.png") no-repeat center;
-  width: 1em;
+  background: url("../../../../assets/images/orcid_unauth.png") no-repeat center;
+  width: 1rem;
+  height: 1rem;
   margin-right: 0.3em;
   align-self: center;
 }

dmp-frontend/src/app/ui/description/overview/description-overview.component.ts

@@ -174,6 +174,10 @@ export class DescriptionOverviewComponent extends BaseComponent implements OnIni
 			});
 	}
 
+	get unauthorizedTootipText(): string {
+		return this.language.instant('DESCRIPTION-OVERVIEW.INFOS.UNAUTHORIZED-ORCID');
+	}
+
 	checkLockStatus(id: Guid) {
 		this.lockService.checkLockStatus(id).pipe(takeUntil(this._destroyed))
 			.subscribe(lockStatus => {

dmp-frontend/src/app/ui/dmp/overview/dmp-overview.component.html

@@ -78,8 +78,8 @@
 							<ng-container *ngFor="let dmpReference of researchers let last = last">
 								<ng-container *ngIf="isOrcid(dmpReference.reference)">
 									<div class="d-inline-block">
-										<a href="{{ getOrcidPathForResearcher(dmpReference.reference?.reference) }}" target="blank" class="researcher">
-											<span class="id-btn">&nbsp;</span>
+										<a href="{{ getOrcidPathForResearcher(dmpReference.reference?.reference) }}" target="blank" class="researcher align-items-center">
+											<span class="id-btn" [matTooltip]="unauthorizedTootipText">&nbsp;</span>
 											<span *ngIf="!last">{{ dmpReference.reference?.label }},</span><span>&nbsp;</span>
 											<span *ngIf="last">{{ dmpReference.reference?.label }}</span>
 										</a>

dmp-frontend/src/app/ui/dmp/overview/dmp-overview.component.scss

@@ -36,8 +36,9 @@
 // ********BUTTONS********
 
 .id-btn {
-	background: url("../../../../assets/images/orcid.png") no-repeat center;
-	width: 1em;
+	background: url("../../../../assets/images/orcid_unauth.png") no-repeat center;
+	width: 1rem;
+	height: 1rem;
 	margin-right: 0.3em;
 	align-self: center;
 }

dmp-frontend/src/app/ui/dmp/overview/dmp-overview.component.ts

@@ -201,6 +201,10 @@ export class DmpOverviewComponent extends BaseComponent implements OnInit {
 		}
 	}
 
+	get unauthorizedTootipText(): string {
+		return this.language.instant('DMP-OVERVIEW.INFOS.UNAUTHORIZED-ORCID');
+	}
+
 	onFetchingDeletedCallbackError(redirectRoot: string) {
 		this.uiNotificationService.snackBarNotification(this.language.instant('DMP-OVERVIEW.ERROR.DELETED-DMP'), SnackBarNotificationLevel.Error);
 		this.router.navigate([redirectRoot]);

dmp-frontend/src/app/ui/user-profile/user-profile.component.scss

@@ -290,13 +290,13 @@
 	}
 
 	span.orcidIconMedium {
-		background: url("../../../assets/images/login/orcid.png") no-repeat;
+		background: url("../../../assets/images/login/orcid_unauth.png") no-repeat;
 		background-position: center;
 		float: left;
-		transform: scale(0.45);
-		width: 50px;
-		height: 45px;
-	}
+		width: 1rem;
+		height: 1rem;
+    margin-left: 0.3rem;
+}
 
 	span.openaireIcon {
 		background: url("../../../assets/images/login/openaire.png") no-repeat;

dmp-frontend/src/assets/i18n/en.json

@@ -709,6 +709,9 @@
 		},
 		"ROLES": {
 			"ALL-SECTIONS": "All Sections"
+		},
+		"INFOS": {
+			"UNAUTHORIZED-ORCID": "This ORCID is entered by the Plan creators, without further acknowledgement of the owner."
 		}
 	},
 	"DESCRIPTION-OVERVIEW": {
@@ -759,6 +762,9 @@
 		"FINALISE-POPUP": {},
 		"ROLES": {
 			"ALL-SECTIONS": "All Sections"
+		},
+		"INFOS": {
+			"UNAUTHORIZED-ORCID": "This ORCID is entered by the Plan creators, without further acknowledgement of the owner."
 		}
 	},
 	"DESCRIPTION-LISTING": {