minor bugs

GaziYucel · Feb 29, 2024 · c6480c7 · c6480c7
1 parent fcc6e8a
commit c6480c7
Show file tree

Hide file tree

Showing 3 changed files with 24 additions and 24 deletions.
diff --git a/classes/External/Wikidata/Deposit.php b/classes/External/Wikidata/Deposit.php
@@ -14,6 +14,7 @@
 
 use APP\plugins\generic\citationManager\CitationManagerPlugin;
 use APP\plugins\generic\citationManager\classes\DataModels\Citation\CitationModel;
+use APP\plugins\generic\citationManager\classes\DataModels\Metadata\MetadataAuthor;
 use APP\plugins\generic\citationManager\classes\DataModels\Metadata\MetadataJournal;
 use APP\plugins\generic\citationManager\classes\DataModels\Metadata\MetadataPublication;
 use APP\plugins\generic\citationManager\classes\Db\PluginDAO;
@@ -74,9 +75,10 @@ public function execute(): bool
         // author(s)
         $countAuthors = count($this->authors);
         for ($i = 0; $i < $countAuthors; $i++) {
-            /* @var Author $author */
+            /** @var Author $author */
             $author = $this->authors[$i];
-            $metadata = $author->getData(CitationManagerPlugin::CITATION_MANAGER_METADATA_AUTHOR);
+            $metadata = json_decode($author->getData(CitationManagerPlugin::CITATION_MANAGER_METADATA_AUTHOR), true);
+            $metadata = ClassHelper::getClassWithValuesAssigned(new MetadataAuthor(), $metadata);
 
             $orcidId = Orcid::removePrefix($author->getData('orcid'));
             $displayName = trim($author->getGivenName($locale) . ' ' . $author->getFamilyName($locale));
@@ -115,16 +117,17 @@ public function execute(): bool
             $this->property->publishedIn['id']);
 
         // authors in main article
-        foreach ($this->authors as $index => $entity) {
+        foreach ($this->authors as $index => $author) {
+            /** @var Author $author */
             $this->addReferenceClaim($item,
-                (array)$entity['_data'][CitationManagerPlugin::CITATION_MANAGER_METADATA_AUTHOR],
+                (array)$author->getData(CitationManagerPlugin::CITATION_MANAGER_METADATA_AUTHOR),
                 $this->property->author['id']);
         }
 
         // cites work in main article
-        foreach ($this->citations as $index => $entity) {
+        foreach ($this->citations as $index => $citation) {
             $this->addReferenceClaim($item,
-                (array)$entity,
+                (array)$citation,
                 $this->property->citesWork['id']);
         }
 

diff --git a/classes/Workflow/WorkflowTab.php b/classes/Workflow/WorkflowTab.php
@@ -79,10 +79,9 @@ public function execute(string $hookName, array $args): void
         $authors = [];
         foreach ($publication->getData('authors') as $id => $author) {
             /* @var Author $author */
-            $metadataAuthor = $author->getData(CitationManagerPlugin::CITATION_MANAGER_METADATA_AUTHOR);
-            if (empty($metadataAuthor)) {
-                $author->setData(CitationManagerPlugin::CITATION_MANAGER_METADATA_AUTHOR, new MetadataAuthor());
-            }
+            $metadataAuthor = json_decode($author->getData(CitationManagerPlugin::CITATION_MANAGER_METADATA_AUTHOR));
+            if (empty($metadataAuthor)) $metadataAuthor = new MetadataAuthor();
+            $author->setData(CitationManagerPlugin::CITATION_MANAGER_METADATA_AUTHOR, $metadataAuthor);
             $authors[] = $author;
         }
 

diff --git a/templates/workflowTab.tpl b/templates/workflowTab.tpl
@@ -5,21 +5,19 @@
      label="{translate key="plugins.generic.citationManager.publication.label"}">
 
     <div class="header">
+        <div>
+            <label class="pkpFormFieldLabel">
+                {translate key="plugins.generic.citationManager.process.label"}
+            </label>
+            <br/>
+            <div class="pkpFormField__description">
+                {translate key="plugins.generic.citationManager.process.description"}
+            </div>
+        </div>
         <table>
             <tr>
+                <td style="width: 80px;"><strong>{translate key="context.context"}</strong></td>
                 <td colspan="2">
-                    <label class="pkpFormFieldLabel">
-                        {translate key="plugins.generic.citationManager.process.label"}
-                    </label>
-                    <br/>
-                    <div class="pkpFormField__description">
-                        {translate key="plugins.generic.citationManager.process.description"}
-                    </div>
-                </td>
-            </tr>
-            <tr>
-                <td colspan="2">
-                    <strong>Journal</strong>
                     <a class="citationManager-Button citationManager-ButtonGreen"
                        v-if="citationManagerApp.metadataJournal.openalex_id"
                        :href="'{$url.openAlex}/' + citationManagerApp.metadataJournal.openalex_id"
@@ -37,8 +35,8 @@
                 </td>
             </tr>
             <tr>
+                <td><strong>{translate key="article.authors"}</strong></td>
                 <td colspan="2">
-                    <strong>Authors</strong>
                     <span v-for="(row, i) in citationManagerApp.authors" class="citationManager-Outline" style="margin-right: 5px;">
                         <span class="citationManager-Tag">
                             {{ row._data.givenName[citationManagerApp.locale] }} {{ row._data.familyName[citationManagerApp.locale] }}
@@ -56,8 +54,8 @@
                 </td>
             </tr>
             <tr>
+                <td><strong>{translate key="common.publication"}</strong></td>
                 <td>
-                    <strong>Publication</strong>
                     <a class="citationManager-Button citationManager-ButtonGreen"
                        v-if="citationManagerApp.metadataPublication.wikidata_id"
                        :href="'{$url.wikidata}/' + citationManagerApp.metadataPublication.wikidata_id"