Merge branch 'r2024.12.12'

ThULB · Dec 12, 2024 · 827cffa · 827cffa
2 parents bb17b60 + 0539692
commit 827cffa
Show file tree

Hide file tree

Showing 36 changed files with 229 additions and 209 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,11 @@
 # Changelog
 
+## 2024.12.12-2023.06.x
+- [#665](https://github.com/ThULB/ThUniBib/issues/665) Reflect changes introduced with UBO-372 (#666)
+- [#669](https://github.com/ThULB/ThUniBib/issues/669) Add status "Review pending" (Jena) (#670)
+- [FSU040THUL-5394](https://servicedesk.uni-jena.de/plugins/servlet/desk/portal/140/FSU040THUL-5394) [#667](https://github.com/ThULB/ThUniBib/issues/667) Added 'Austellungskatalog' to ubogenre.xml (#668)
+---
+
 ## 2024.12.03-2023.06.x
 - [#614](https://github.com/ThULB/ThUniBib/issues/614) Updated solr request handlers to reflect recent changes due to migration from fachreferate to destatis classification (#649)
 - [#614](https://github.com/ThULB/ThUniBib/issues/614) Use class mapping for determining destatis from ORIGIN.xml (#615)

diff --git a/common/pom.xml b/common/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <groupId>de.uni-jena.thulb.ubo</groupId>
     <artifactId>ThUniBib</artifactId>
-    <version>2024.12.03-2023.06.x</version>
+    <version>2024.12.12-2023.06.x</version>
   </parent>
 
   <artifactId>thunibib-common</artifactId>

diff --git a/common/src/main/resources/META-INF/resources/edit-admin.xed b/common/src/main/resources/META-INF/resources/edit-admin.xed
@@ -126,10 +126,12 @@
                 </xed:choose>
               </xed:bind>
             </fieldset>
+
             <fieldset>
               <legend>
                 <xed:output value="concat(i18n:translate('ubo.project.information'), ': ')" />
               </legend>
+
               <xed:include ref="projectInformation" />
             </fieldset>
           </xed:bind>

diff --git a/common/src/main/resources/META-INF/resources/edit-publication.xed b/common/src/main/resources/META-INF/resources/edit-publication.xed
@@ -124,6 +124,7 @@
               </fieldset>
             </xed:if>
           </xed:bind>
+
           <xed:include ref="cleanup" />
           <xed:include ref="cancel.submit" />
           <xed:include ref="javascript" />

diff --git a/common/src/main/resources/META-INF/resources/import-editor.xed b/common/src/main/resources/META-INF/resources/import-editor.xed
@@ -50,24 +50,16 @@
                   test="string-length(.) &gt; 0"
                   relevant-if="not(//mods:mods/mods:relatedItem[@type='series']) and (string-length(//mods:mods/mods:relatedItem[@type='host']/mods:genre[@type='intern']) &gt; 0)"
                   i18n="ubo.title.validation.genre.intern.present" display="global"/>
+  </xed:template>
 
-    <script type="text/javascript">
-      <![CDATA[
+  <xed:template id="javascript">
+      <script>
         $(document).ready(function () {
-            $('select[class*="autocomplete"]').chosen({search_contains: true});
-            $(document).popover({
-                selector: "[data-toggle=popover]",
-                container: "body",
-                html: true,
-                trigger: "focus"
-            });
+          $('select[class*="autocomplete"]').selectpicker({liveSearch:true, liveSearchNormalize:true, virtualScroll:true, showSubtext:true, size:10});
         });
-      ]]>
-    </script>
-  </xed:template>
+      </script>
 
-  <xed:template id="javascript">
-    <script src="{$WebApplicationBaseURL}js/language-search.js"/>
+      <script src="{$WebApplicationBaseURL}js/language-search.js"/>
   </xed:template>
 
   <xed:template id="common.metafields">
@@ -136,7 +128,7 @@
           <option value="">
             <xed:output i18n="search.select.autocomplete"/>
           </option>
-          <xed:include uri="xslStyle:items2options:classification:editor:-1:children:destatis"/>
+          <xed:include uri="xslStyle:mycoreclass-options?omitSubtext=true:classification:metadata:-1:children:destatis"/>
         </select>
         <xed:controls/>
       </div>
@@ -158,7 +150,7 @@
           <option value="">
             <xed:output i18n="search.select.autocomplete"/>
           </option>
-          <xed:include uri="xslStyle:items2options:classification:editor:-1:children:ORIGIN"/>
+          <xed:include uri="xslStyle:mycoreclass-options?omitSubtext=true:classification:metadata:-1:children:ORIGIN"/>
         </select>
         <a tabindex="0" class="btn btn-secondary info-button" role="button" data-toggle="popover" data-placement="right"
            data-content="{i18n:ubo.help.department}">

diff --git a/common/src/main/resources/META-INF/resources/import-genres.xed b/common/src/main/resources/META-INF/resources/import-genres.xed
@@ -32,6 +32,10 @@
     <xed:include ref="genre.book.common"/>
   </xed:template>
 
+  <xed:template id="genre.exhibition_catalogue">
+    <xed:include ref="genre.book.common"/>
+  </xed:template>
+
   <xed:template id="genre.researchpaper">
     <xed:include ref="genre.book.common"/>
   </xed:template>

diff --git a/common/src/main/resources/META-INF/resources/scss/base/_thunibib_common.scss b/common/src/main/resources/META-INF/resources/scss/base/_thunibib_common.scss
@@ -0,0 +1,29 @@
+i.flag {
+  margin-right: .5rem;
+  position: relative;
+  display: inline-block;
+  width: 1.33333333em;
+  line-height: 1em;
+  height: 1em;
+  background-size: contain;
+  background-position: 50%;
+  background-repeat: no-repeat;
+  vertical-align: middle;
+}
+
+i.flag-de {
+  background-image: url("/images/flag-de.svg");
+}
+
+i.flag-en {
+  background-image: url("/images/flag-en.svg");
+}
+
+.ubo-import-list-select-fachreferate {
+  display: none;
+}
+
+/* Fix color of bootstrap-select items */
+div[id^="bs-select"] ul.dropdown-menu li.active a {
+  color: white;
+}
diff --git a/common/src/main/resources/META-INF/resources/statistics.xml b/common/src/main/resources/META-INF/resources/statistics.xml
@@ -21,13 +21,13 @@
     </div>
   </article>
 
-  <xinclude uri="xslStyle:statistics-oa:solr:requestHandler:select:q=partOf%3Atrue+AND+status%3A(confirmed+OR+unchecked)+AND+year%3A[2018+TO+*]&amp;rows=0&amp;json.facet=%7Byear%3A%7Btype%3Aterms,field%3Ayear,sort%3A%7Bindex%3Aasc%7D,facet%3A%7Boa%3A%7Btype%3Aterms,field%3Aoa,sort%3A%7Bindex%3Aasc%7D%7D%7D%7D%7D"/>
-  <xinclude uri="xslStyle:statistics:solr:requestHandler:select:q=partOf%3Atrue+AND+%2B(status%3Aconfirmed+status%3Aunchecked)+AND+year%3A%5B1980+TO+*%5D&amp;rows=0&amp;facet.field=year"/>
-  <xinclude uri="xslStyle:statistics:solr:requestHandler:select:q=partOf%3Atrue+AND+%2B(status%3Aconfirmed+status%3Aunchecked)&amp;rows=0&amp;facet.field=destatis"/>
-  <xinclude uri="xslStyle:statistics:solr:requestHandler:select:q=partOf%3Atrue+AND+%2B(status%3Aconfirmed+status%3Aunchecked)&amp;rows=0&amp;facet.field=origin_exact"/>
-  <xinclude uri="xslStyle:statistics:solr:requestHandler:select:q=partOf%3Atrue+AND+%2B(status%3Aconfirmed+status%3Aunchecked)&amp;rows=0&amp;facet.field=genre"/>
-  <xinclude uri="xslStyle:statistics:solr:requestHandler:select:q=partOf%3Atrue+AND+%2B(status%3Aconfirmed+status%3Aunchecked)&amp;rows=0&amp;facet.field=fundingType"/>
-  <xinclude uri="xslStyle:statistics:solr:requestHandler:select:q=partOf%3Atrue+%2B(status%3Aconfirmed+status%3Aunchecked)+AND+year%3A%5B2015+TO+*%5D&amp;rows=0&amp;facet.field=nid_connection&amp;facet.limit=50"/>
+  <xinclude uri="xslStyle:statistics-oa:solr:requestHandler:select:q=partOf%3Atrue+AND+status%3A(confirmed+OR+unchecked+OR+status%3AreviewPending)+AND+year%3A[2018+TO+*]&amp;rows=0&amp;json.facet=%7Byear%3A%7Btype%3Aterms,field%3Ayear,sort%3A%7Bindex%3Aasc%7D,facet%3A%7Boa%3A%7Btype%3Aterms,field%3Aoa,sort%3A%7Bindex%3Aasc%7D%7D%7D%7D%7D"/>
+  <xinclude uri="xslStyle:statistics:solr:requestHandler:select:q=partOf%3Atrue+AND+%2B(status%3Aconfirmed+status%3Aunchecked+status%3AreviewPending)+AND+year%3A%5B1980+TO+*%5D&amp;rows=0&amp;facet.field=year"/>
+  <xinclude uri="xslStyle:statistics:solr:requestHandler:select:q=partOf%3Atrue+AND+%2B(status%3Aconfirmed+status%3Aunchecked+status%3AreviewPending)&amp;rows=0&amp;facet.field=destatis"/>
+  <xinclude uri="xslStyle:statistics:solr:requestHandler:select:q=partOf%3Atrue+AND+%2B(status%3Aconfirmed+status%3Aunchecked+status%3AreviewPending)&amp;rows=0&amp;facet.field=origin_exact"/>
+  <xinclude uri="xslStyle:statistics:solr:requestHandler:select:q=partOf%3Atrue+AND+%2B(status%3Aconfirmed+status%3Aunchecked+status%3AreviewPending)&amp;rows=0&amp;facet.field=genre"/>
+  <xinclude uri="xslStyle:statistics:solr:requestHandler:select:q=partOf%3Atrue+AND+%2B(status%3Aconfirmed+status%3Aunchecked+status%3AreviewPending)&amp;rows=0&amp;facet.field=fundingType"/>
+  <xinclude uri="xslStyle:statistics:solr:requestHandler:select:q=partOf%3Atrue+%2B(status%3Aconfirmed+status%3Aunchecked+status%3AreviewPending)+AND+year%3A%5B2015+TO+*%5D&amp;rows=0&amp;facet.field=nid_connection&amp;facet.limit=50"/>
   <xinclude uri="xslStyle:statistics:solr:requestHandler:select:q=objectKind%3Aname&amp;rows=0&amp;facet.pivot=name_id_type,name_id_type"/>
 
 </webpage>
diff --git a/common/src/main/resources/config/thunibib-common/messages_de.properties b/common/src/main/resources/config/thunibib-common/messages_de.properties
@@ -19,15 +19,17 @@ result.dozbib.status.detailed.confirmed         = Redaktionell gepr\u00FCft
 result.dozbib.status.detailed.deleted           = Gel\u00F6scht
 result.dozbib.status.detailed.imported          = Importiert
 result.dozbib.status.detailed.review            = Wird bearbeitet
+result.dozbib.status.detailed.reviewPending     = Pr\u00FCfung ausstehend
 result.dozbib.status.detailed.submitted         = Eingereicht
 result.dozbib.status.detailed.unchecked         = Keine Redaktion
 search.dozbib.degree.supervisor                 = Akademische*r Betreuer*in
 search.dozbib.partOf.false                      = nein
 search.dozbib.partOf.true                       = ja
 search.dozbib.partOf.unknown                    = unbekannt
+search.dozbib.status.reviewpending              = Pr\u00FCfung ausstehend
 search.dozbib.status.unchecked                  = keine Redaktion
 search.update                                   = (Zuordnung anpassen)
-thunibib.classification.fachreferate.validation = Bitte w\u00E4hlen sie mindestens ein Fachgebiet aus
+thunibib.classification.fachreferate.validation = Bitte w\u00E4hlen Sie mindestens ein Fachgebiet aus
 thunibib.comment.intern                         = Zus\u00E4tzliche Hinweise f\u00FCr das Bibliothekspersonal
 thunibib.condition.partOf                       = Bitte geben Sie an, ob die Publikation in der Statistik der Bibliographie gez\u00E4hlt werden soll.
 thunibib.editor.affiliation.checkbox            = Autor geh\u00F6rte im Publikationszeitraum nicht der Einrichtung an

diff --git a/common/src/main/resources/config/thunibib-common/messages_en.properties b/common/src/main/resources/config/thunibib-common/messages_en.properties
@@ -25,12 +25,14 @@ result.dozbib.status.detailed.confirmed         = Confirmed
 result.dozbib.status.detailed.deleted           = Deleted
 result.dozbib.status.detailed.imported          = Imported
 result.dozbib.status.detailed.review            = In review
+result.dozbib.status.detailed.reviewPending     = Review pending
 result.dozbib.status.detailed.submitted         = Submitted
 result.dozbib.status.detailed.unchecked         = No editing
 search.dozbib.degree.supervisor                 = Degree Supervisor
 search.dozbib.partOf.false                      = no
 search.dozbib.partOf.true                       = yes
 search.dozbib.partOf.unknown                    = unknown
+search.dozbib.status.reviewpending              = Review pending
 search.dozbib.status.unchecked                  = keine Redaktion
 search.update                                   = (update link)
 thunibib.classification.fachreferate.validation = Please select at least one subject

diff --git a/common/src/main/resources/config/thunibib-common/mycore.properties b/common/src/main/resources/config/thunibib-common/mycore.properties
@@ -44,6 +44,7 @@ MCR.MODS.EnrichmentResolver.DataSources.scopus-import    = Unpaywall GBV ZDB JOP
 MCR.MODS.EnrichmentResolver.DataSources.scopusImport     = %MCR.MODS.EnrichmentResolver.DataSources.withoutScopus%
 MCR.MODS.EnrichmentResolver.DataSources.withScopus       = (GBV CrossRef DataCite) PPN2DBT-ID Scopus (PubMed IEEE arXiv) Unpaywall ZDB JOP
 MCR.MODS.EnrichmentResolver.DataSources.withoutScopus    = (GBV CrossRef DataCite) PPN2DBT-ID (PubMed IEEE arXiv) Unpaywall ZDB JOP
+MCR.MODS.EnrichmentResolver.DataSources.gbvdbt           = GBV PPN2DBT-ID
 UBO.Scopus.Importer.ImportURI                            = xslStyle:mods2mycoreobject:enrich:scopus-import:xslStyle:%ThUniBib.Scopus.XSL%,%UBO.SupportedMODSFilterName%:%UBO.Scopus.Importer.ImportURI.Scopus%
 
 #pica2mods default configuration
@@ -143,3 +144,5 @@ MCR.ContentTransformer.import.DBTList.Steps                       = import.DBTId
 MCR.ContentTransformer.import.DBTList.Filter                      = supportedmods
 MCR.ContentTransformer.import.DBTList2MCRObj.Class                = org.mycore.common.content.transformer.MCRXSLTransformer
 MCR.ContentTransformer.import.DBTList2MCRObj.Stylesheet           = xsl/import/dbt2mods-genre2uri.xsl,xsl/import-mods2mycoreobject.xsl
+
+UBO.Editor.import-list.omitSubtext = true
diff --git a/common/src/main/resources/config/thunibib-common/solr/main/solr-config.json b/common/src/main/resources/config/thunibib-common/solr/main/solr-config.json
@@ -63,7 +63,7 @@
         ],
         "json.facet": "{year:{type:terms,field:year,limit:100,sort:{index:asc},facet:{oa:{type:terms,field:oa,sort:{index:asc}}}}}",
         "fq": "+objectType:mods",
-        "fq": "status:unchecked OR status:confirmed"
+        "fq": "status:unchecked OR status:confirmed OR status:reviewPending"
       },
       "invariants": {
         "fl": "",
@@ -188,7 +188,7 @@
       },
       "appends": {
         "fq": "+objectType:mods",
-        "fq": "status:unchecked OR status:confirmed"
+        "fq": "status:unchecked OR status:confirmed OR status:reviewPending"
       }
     }
   }

diff --git a/common/src/main/resources/setup/classifications/ubogenre.xml b/common/src/main/resources/setup/classifications/ubogenre.xml
@@ -171,6 +171,15 @@
       <label xml:lang="x-group" text="true"/>
       <label xml:lang="de" text="Selbstständige Werke"/>
       <label xml:lang="en" text="Independent"/>
+
+      <category ID="exhibition_catalogue">
+        <label xml:lang="x-hosts" text="standalone"/>
+        <label xml:lang="x-color" text="#573d95"/>
+        <label xml:lang="x-mapping" text="orcidWorkType:other"/>
+
+        <label xml:lang="de" text="Ausstellungskatalog"/>
+        <label xml:lang="en" text="Exhibition Catalogue"/>
+      </category>
       <category ID="book">
         <label xml:lang="x-hosts" text="standalone"/>
         <label xml:lang="x-color" text="#573d90"/>
@@ -190,6 +199,7 @@
       </category>
       <category ID="collection">
         <label xml:lang="x-hosts" text="standalone"/>
+        <label xml:lang="x-color" text="#174490"/>
         <label xml:lang="x-marcgt" text="book"/>
         <label xml:lang="x-mapping" text="marcgt:book orcidWorkType:book"/>
 
@@ -199,6 +209,7 @@
         <category ID="special_issue">
           <label xml:lang="x-hosts" text="standalone"/>
           <label xml:lang="x-mapping" text="orcidWorkType:journal-issue"/>
+          <label xml:lang="x-color" text="#5671a5"/>
 
           <label xml:lang="de" text="Sonderheft"/>
           <label xml:lang="en" text="Special Issue"/>
@@ -223,6 +234,7 @@
       </category>
       <category ID="interview">
         <label xml:lang="x-hosts" text="standalone journal collection book newspaper video others"/>
+        <label xml:lang="x-color" text="#e02f8b"/>
         <label xml:lang="x-mapping" text="orcidWorkType:other"/>
 
         <label xml:lang="de" text="Interview"/>
@@ -256,6 +268,7 @@
       </category>
       <category ID="workingpaper">
         <label xml:lang="x-hosts" text="standalone"/>
+        <label xml:lang="x-color" text="#953a4b"/>
         <label xml:lang="x-marcgt" text="book"/>
         <label xml:lang="x-mapping" text="marcgt:book orcidWorkType:working-paper"/>
 
@@ -273,20 +286,23 @@
       </category>
       <category ID="poster">
         <label xml:lang="x-hosts" text="standalone proceedings collection book newspaper video others"/>
+        <label xml:lang="x-color" text="#7671b1"/>
         <label xml:lang="x-mapping" text="orcidWorkType:conference-poster"/>
 
         <label xml:lang="de" text="Poster"/>
         <label xml:lang="en" text="Poster"/>
       </category>
       <category ID="preprint">
         <label xml:lang="x-hosts" text="standalone"/>
+        <label xml:lang="x-color" text="#1671c1"/>
         <label xml:lang="x-mapping" text="orcidWorkType:preprint"/>
 
         <label xml:lang="de" text="Preprint"/>
         <label xml:lang="en" text="Preprint"/>
       </category>
       <category ID="authors_version">
         <label xml:lang="x-hosts" text="standalone"/>
+        <label xml:lang="x-color" text="#2691DF"/>
         <label xml:lang="x-mapping" text="orcidWorkType:journal-article"/>
 
         <label xml:lang="de" text="Autorenversion"/>
@@ -302,48 +318,55 @@
       </category>
       <category ID="image">
         <label xml:lang="x-hosts" text="standalone"/>
+        <label xml:lang="x-color" text="#df9526"/>
         <label xml:lang="x-mapping" text="orcidWorkType:other"/>
 
         <label xml:lang="de" text="Bild"/>
         <label xml:lang="en" text="Image/picture"/>
       </category>
       <category ID="software">
         <label xml:lang="x-hosts" text="standalone"/>
+        <label xml:lang="x-color" text="#df1526"/>
         <label xml:lang="x-mapping" text="orcidWorkType:software"/>
 
         <label xml:lang="de" text="Software"/>
         <label xml:lang="en" text="Software"/>
       </category>
       <category ID="video">
         <label xml:lang="x-hosts" text="standalone"/>
+        <label xml:lang="x-color" text="#ac0026"/>
         <label xml:lang="x-mapping" text="orcidWorkType:other"/>
 
         <label xml:lang="de" text="Video/Film"/>
         <label xml:lang="en" text="Video/film"/>
       </category>
       <category ID="speech">
         <label xml:lang="x-hosts" text="standalone journal collection book newspaper video others"/>
+        <label xml:lang="x-color" text="#467040"/>
         <label xml:lang="x-mapping" text="orcidWorkType:lecture-speech"/>
 
         <label xml:lang="de" text="Vortrag/Redebeitrag"/>
         <label xml:lang="en" text="Speech/lecture"/>
       </category>
       <category ID="map">
         <label xml:lang="x-hosts" text="standalone"/>
+        <label xml:lang="x-color" text="#997950"/>
         <label xml:lang="x-mapping" text="orcidWorkType:other"/>
 
         <label xml:lang="de" text="Karte"/>
         <label xml:lang="en" text="Map"/>
       </category>
       <category ID="sheet_music">
         <label xml:lang="x-hosts" text="standalone collection book newspaper video others"/>
+        <label xml:lang="x-color" text="#eeeee0"/>
         <label xml:lang="x-mapping" text="orcidWorkType:other"/>
 
         <label xml:lang="de" text="Noten"/>
         <label xml:lang="en" text="Sheet music"/>
       </category>
       <category ID="object">
         <label xml:lang="x-hosts" text="standalone"/>
+        <label xml:lang="x-color" text="#856468"/>
         <label xml:lang="x-mapping" text="orcidWorkType:physical-object"/>
 
         <label xml:lang="de" text="Objekt/Artefakt"/>
@@ -373,13 +396,15 @@
       </category>
       <category ID="newspaper">
         <label xml:lang="x-hosts" text="standalone"/>
+        <label xml:lang="x-color" text="#456468"/>
         <label xml:lang="x-mapping" text="orcidWorkType:newspaper-article"/>
 
         <label xml:lang="de" text="Zeitung"/>
         <label xml:lang="en" text="Newspaper"/>
       </category>
       <category ID="blog">
         <label xml:lang="x-hosts" text="standalone"/>
+        <label xml:lang="x-color" text="#1a3000"/>
         <label xml:lang="x-mapping" text="orcidWorkType:website"/>
 
         <label xml:lang="de" text="Website/Blog"/>
@@ -388,6 +413,7 @@
     </category>
     <category ID="others">
       <label xml:lang="x-hosts" text="standalone"/>
+      <label xml:lang="x-color" text="#eeeeed"/>
       <label xml:lang="x-mapping" text="orcidWorkType:other"/>
 
       <label xml:lang="de" text="Sonstiges"/>

diff --git a/erfurt/pom.xml b/erfurt/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <groupId>de.uni-jena.thulb.ubo</groupId>
     <artifactId>ThUniBib</artifactId>
-    <version>2024.12.03-2023.06.x</version>
+    <version>2024.12.12-2023.06.x</version>
     <relativePath>../pom.xml</relativePath>
   </parent>
   <artifactId>thunibib-erfurt</artifactId>