From 8e7960aa8e34ff59127611cb76719e81c18169e5 Mon Sep 17 00:00:00 2001
From: Arno Kaimbacher <arno.kaimbacher@geologie.ac.at>
Date: Tue, 15 Jun 2021 14:39:37 +0200
Subject: [PATCH] - edit forms for editor and submitter: add new keywords with
 language - Publish\IndexController.php: case sensitive relatedIdentifierTypes
 for later DOI creation

---
 app/Http/Controllers/Publish/IndexController.php   | 3 ++-
 resources/views/workflow/editor/_form.blade.php    | 4 ++++
 resources/views/workflow/submitter/_form.blade.php | 4 ++++
 3 files changed, 10 insertions(+), 1 deletion(-)

diff --git a/app/Http/Controllers/Publish/IndexController.php b/app/Http/Controllers/Publish/IndexController.php
index aa22100..6c61cc5 100644
--- a/app/Http/Controllers/Publish/IndexController.php
+++ b/app/Http/Controllers/Publish/IndexController.php
@@ -61,7 +61,8 @@ class IndexController extends Controller
             ->pluck('help_text', 'metadata_element');
 
         $projects = Project::pluck('label', 'id');
-        $relatedIdentifierTypes = ["doi", "handle", "isbn", "issn", "url", "urn"];
+        // $relatedIdentifierTypes = ["doi", "handle", "isbn", "issn", "url", "urn"];
+        $relatedIdentifierTypes = ["DOI", "Handle", "ISBN", "ISSN",  "URL", "URN"];
         $relatedIdentifierTypes = array_combine($relatedIdentifierTypes, $relatedIdentifierTypes);
 
         $relationTypes = ["IsSupplementTo", "IsSupplementedBy", "IsContinuedBy", "Continues",
diff --git a/resources/views/workflow/editor/_form.blade.php b/resources/views/workflow/editor/_form.blade.php
index 05268c8..1b31d5f 100644
--- a/resources/views/workflow/editor/_form.blade.php
+++ b/resources/views/workflow/editor/_form.blade.php
@@ -538,6 +538,7 @@
             <tr>
                 <th style="width: 20px;">Keyword</th>
                 <th>Type</th>
+                <th>Language</th>
                 <th style="width: 130px;"></th>
             </tr>
         </thead>
@@ -564,6 +565,9 @@
                     <input v-bind:name="'subjects[' +  index +'][type]'" readonly class="form-control"
                         placeholder="[KEYWORD TYPE]" v-model="item.type" v-validate="'required'" />
                 </td>
+                <td>
+                    <input v-bind:name="'subjects[' +  index +'][language]'" readonly class="form-control" v-model="item.language" v-validate="'required'" />
+                </td>
                 <td>
                     <button v-if="item.id == undefined" class="pure-button button-small is-warning"
                         @click.prevent="removeKeyword(index)">
diff --git a/resources/views/workflow/submitter/_form.blade.php b/resources/views/workflow/submitter/_form.blade.php
index be2856e..1821a6f 100644
--- a/resources/views/workflow/submitter/_form.blade.php
+++ b/resources/views/workflow/submitter/_form.blade.php
@@ -534,6 +534,7 @@
             <tr>
                 <th style="width: 20px;">Keyword</th>
                 <th>Type</th>
+                <th>Language</th>
                 <th style="width: 130px;"></th>
             </tr>
         </thead>
@@ -560,6 +561,9 @@
                     <input v-bind:name="'subjects[' +  index +'][type]'" readonly class="form-control"
                         placeholder="[KEYWORD TYPE]" v-model="item.type" v-validate="'required'" />
                 </td>
+                <td>
+                    <input v-bind:name="'subjects[' +  index +'][language]'" readonly class="form-control" v-model="item.language" v-validate="'required'" />
+                </td>
                 <td>
                     <button v-if="item.id == undefined" class="pure-button button-small is-warning"
                         @click.prevent="removeKeyword(index)">