From bebf0c74ceabc1e4729f6e992a6d8bae9434fb8f Mon Sep 17 00:00:00 2001
From: Johannes Buechele <johannes@bujo.at>
Date: Wed, 2 Aug 2023 13:26:00 +0200
Subject: [PATCH] #42: fixed wording, added missing inputs
---
.../components/bundel/UserWorkListElement.jsx | 44 +++++++++++++++++--
Frontend/src/locate/de/translate.json | 4 +-
Frontend/src/locate/en/translate.json | 11 +++--
.../common/models/views/WorkView.java | 1 -
4 files changed, 51 insertions(+), 9 deletions(-)
diff --git a/Frontend/src/components/bundel/UserWorkListElement.jsx b/Frontend/src/components/bundel/UserWorkListElement.jsx
index 317f65a..d63fab2 100644
--- a/Frontend/src/components/bundel/UserWorkListElement.jsx
+++ b/Frontend/src/components/bundel/UserWorkListElement.jsx
@@ -219,6 +219,32 @@ const UserWorkListElement = (props) => {
}
>
<dl className="mt-7">
+ <InputField
+ label={
+ <EasyTrans>
+ MyWorks.WorkListElement.FileName
+ </EasyTrans>
+ }
+ type="text"
+ name=""
+ id="filename"
+ searchwork={props.searchWork.toString()}
+ defaultValue={props.userWork.filename}
+ className="focus:ring-fairblue focus:border-fairblue enabled:hover:ring-green-300 enabled:hover:border-green-300 block w-full shadow-sm sm:text-sm border-gray-300 disabled:border-white rounded-md"
+ disabled="false"
+ />
+ <InputField
+ label={
+ <EasyTrans>MyWorks.WorkListElement.Title</EasyTrans>
+ }
+ type="text"
+ name=""
+ id="title"
+ searchwork={props.searchWork.toString()}
+ defaultValue={props.userWork.title}
+ className="focus:ring-fairblue focus:border-fairblue enabled:hover:ring-green-300 enabled:hover:border-green-300 block w-full shadow-sm sm:text-sm border-gray-300 disabled:border-white rounded-md"
+ disabled="false"
+ />
<InputField
label={
<EasyTrans>
@@ -232,17 +258,29 @@ const UserWorkListElement = (props) => {
defaultValue={props.userWork.description}
disabled="false"
></InputField>
+ <InputField
+ label={
+ <EasyTrans>MyWorks.WorkListElement.Type</EasyTrans>
+ }
+ type="text"
+ name=""
+ id="type"
+ searchwork={props.searchWork.toString()}
+ defaultValue={props.userWork.type}
+ className="focus:ring-fairblue focus:border-fairblue enabled:hover:ring-green-300 enabled:hover:border-green-300 block w-full shadow-sm sm:text-sm border-gray-300 disabled:border-white rounded-md"
+ disabled="false"
+ />
<InputField
label={
<EasyTrans>
- MyWorks.WorkListElement.FileName
+ MyWorks.WorkListElement.Registrar
</EasyTrans>
}
type="text"
name=""
- id="2"
+ id="registrar"
searchwork={props.searchWork.toString()}
- defaultValue={props.userWork.filename}
+ defaultValue={props.userWork.registrar}
className="focus:ring-fairblue focus:border-fairblue enabled:hover:ring-green-300 enabled:hover:border-green-300 block w-full shadow-sm sm:text-sm border-gray-300 disabled:border-white rounded-md"
disabled="false"
/>
diff --git a/Frontend/src/locate/de/translate.json b/Frontend/src/locate/de/translate.json
index 3a90d50..2427413 100644
--- a/Frontend/src/locate/de/translate.json
+++ b/Frontend/src/locate/de/translate.json
@@ -274,7 +274,9 @@
"HashMetaAlgorithm": "Hash-Algorithm Meta",
"IpfsFileCid": "IPFS CID File",
"IpfsMetaCid": "IPFS CID Meta",
- "Visibility": "Visibility"
+ "Visibility": "Visibility",
+ "Type": "Type",
+ "Registrar": "Registrar"
},
"WalletRequired": "A Wallet is Required",
"ConnectWallet": "Connect Wallet",
diff --git a/Frontend/src/locate/en/translate.json b/Frontend/src/locate/en/translate.json
index 4bd00ee..1ffcfa8 100644
--- a/Frontend/src/locate/en/translate.json
+++ b/Frontend/src/locate/en/translate.json
@@ -243,11 +243,12 @@
"NoElementsFound": "No elements found"
},
"WorkListElement": {
+ "Title": "Title",
"WorkDescription": "Description",
"Name": "Workname",
"Edit": "Edit",
- "Info": "General information",
- "FileName": "File Name",
+ "Info": "General Work Information",
+ "FileName": "Filename",
"RegistrationDate": "Registration Date",
"CreationDate": "Creation Date",
"Identifier": "Identifier",
@@ -259,7 +260,7 @@
"License": "License",
"DALICCLizenz": "DALICC-License",
"Participant": "Creator or Contributors",
- "Authors": "Authors",
+ "Authors": "Creator",
"DeleteAuthor": "delete author",
"AddAuthor": "add author",
"Publisher": "publisher",
@@ -274,7 +275,9 @@
"HashMetaAlgorithm": "Hash-Algorithm Meta",
"IpfsFileCid": "IPFS CID File",
"IpfsMetaCid": "IPFS CID Meta",
- "Visibility": "Visibility"
+ "Visibility": "Visibility",
+ "Type": "Type",
+ "Registrar": "Registrar"
},
"WalletRequired": "A Wallet is Required",
"ConnectWallet": "Connect Wallet",
diff --git a/faircommons-services/common/src/main/lombok/eu/fairkom/faircommons/common/models/views/WorkView.java b/faircommons-services/common/src/main/lombok/eu/fairkom/faircommons/common/models/views/WorkView.java
index 306658c..544d828 100644
--- a/faircommons-services/common/src/main/lombok/eu/fairkom/faircommons/common/models/views/WorkView.java
+++ b/faircommons-services/common/src/main/lombok/eu/fairkom/faircommons/common/models/views/WorkView.java
@@ -40,7 +40,6 @@ public class WorkView implements IdentifiableView<UUID> {
Set<StorageOption> storageOptions;
@JsonIgnore
WorkFileView workFile;
- @JsonIgnore
String registrar;
WorkVisibility visibility;
RevocationView revocation;
--
GitLab