UBO-475 Migrate from Highcharts to Apache ECharts

pom.xml

@@ -46,6 +46,7 @@
     <bootstrap-select.version>1.13.18</bootstrap-select.version>
     <bootstrap.version>4.4.1</bootstrap.version>
     <cargo.container>tomcat10x</cargo.container>
+    <charts.common.version>2.2</charts.common.version>
     <font-awesome.version>5.13.0</font-awesome.version>
     <jakarta.xml.bind.version>3.0.1</jakarta.xml.bind.version>
     <jquery.ui.version>1.13.2</jquery.ui.version>
@@ -149,6 +150,11 @@
       <name>Central Portal Snapshots</name>
       <url>https://central.sonatype.com/repository/maven-snapshots/</url>
     </repository>
+    <repository>
+      <id>gitlab-maven-releases</id>
+      <name>git.thulb.uni-jena.de</name>
+      <url>https://git.thulb.uni-jena.de/api/v4/projects/98/packages/maven</url>
+    </repository>
   </repositories>
 
   <pluginRepositories>
@@ -264,6 +270,11 @@
           </exclusion>
         </exclusions>
       </dependency>
+      <dependency>
+        <groupId>de.uni-jena.thulb</groupId>
+        <artifactId>charts-common</artifactId>
+        <version>${charts.common.version}</version>
+      </dependency>
       <dependency>
         <groupId>jakarta.xml.ws</groupId>
         <artifactId>jakarta.xml.ws-api</artifactId>
@@ -329,11 +340,6 @@
         <artifactId>font-awesome</artifactId>
         <version>${font-awesome.version}</version>
       </dependency>
-      <dependency>
-        <groupId>org.webjars</groupId>
-        <artifactId>highcharts</artifactId>
-        <version>5.0.1</version>
-      </dependency>
       <dependency>
         <groupId>org.webjars</groupId>
         <artifactId>highlightjs</artifactId>

ubo-common/pom.xml

@@ -369,6 +369,11 @@
       <artifactId>commons-discovery</artifactId>
       <scope>runtime</scope>
     </dependency>
+    <dependency>
+      <groupId>de.uni-jena.thulb</groupId>
+      <artifactId>charts-common</artifactId>
+      <scope>runtime</scope>
+    </dependency>
     <dependency>
       <groupId>jakarta.xml.ws</groupId>
       <artifactId>jakarta.xml.ws-api</artifactId>
@@ -465,11 +470,6 @@
       <artifactId>font-awesome</artifactId>
       <scope>runtime</scope>
     </dependency>
-    <dependency>
-      <groupId>org.webjars</groupId>
-      <artifactId>highcharts</artifactId>
-      <scope>runtime</scope>
-    </dependency>
     <dependency>
       <groupId>org.webjars</groupId>
       <artifactId>highlightjs</artifactId>

ubo-common/src/main/resources/META-INF/resources/statistics.xml

@@ -1,11 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
-<webpage lastModified="$Date: 2017-02-10 07:55:23 +0100 (Fr, 10 Feb 2017) $" id="dozbib.stats">
+<webpage lastModified="$Date: 2017-02-10 07:55:23 +0100 (Fr, 10 Feb 2017) $" id="dozbib.stats"  xmlns:i18n="http://www.mycore.org/i18n">
   <title xml:lang="de">Statistiken über alle verzeichneten Publikationen</title>
   <title xml:lang="en">Statistics for all publications listed here</title>
 
-  <script src="webjars/highcharts/5.0.1/highcharts.src.js" type="text/javascript"></script>
-  <script src="webjars/highcharts/5.0.1/themes/grid.js" type="text/javascript"></script>
+  <script src="assets/echarts/dist/echarts.js"/>
 
   <div id="chartDialog" />
 
@@ -31,36 +30,19 @@
     </div>
   </article>
 
-  <xinclude uri="xslStyle:statistics-oa:solr:q=status%3Aconfirmed+AND+year%3A[2021+TO+2024]&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:charts/bar-stacked-oa-chart:solr:requestHandler:select:q=status%3Aconfirmed+AND+year%3A[2021+TO+2024]&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_exact,sort%3A%7Bindex%3Aasc%7D%7D%7D%7D%7D"/>
+  <xinclude uri="xslStyle:charts/bar-chart?horizontal=false&amp;facet=year:solr:requestHandler:select:q=status%3Aconfirmed+AND+year%3A%5B2000+TO+*%5D&amp;rows=0&amp;facet.field=year"/>
+  <xinclude uri="xslStyle:charts/bar-chart?facet=subject:solr:requestHandler:select:q=status%3Aconfirmed&amp;rows=0&amp;facet.field=subject"/>
+  <xinclude uri="xslStyle:charts/pie-chart?classification=ubogenre&amp;facet=genre:solr:requestHandler:select:q=status%3Aconfirmed&amp;rows=0&amp;facet.field=genre"/>
 
-  <xinclude uri="xslStyle:statistics:solr:q=status%3Aconfirmed+AND+year%3A%5B2000+TO+*%5D&amp;rows=0&amp;facet.field=year" />
-  <xinclude uri="xslStyle:statistics:solr:q=status%3Aconfirmed&amp;rows=0&amp;facet.field=subject" />
-  <xinclude uri="xslStyle:statistics:solr:q=status%3Aconfirmed&amp;rows=0&amp;facet.field=genre" />
-
-  <article class="card mb-3" xml:lang="de">
-    <div class="card-body">
-      <h3>Am häufigsten verzeichnete Personen (nur mit UDE LSF Zuordnung, Top 50, in Publikationen ab 2015):</h3>
-    <xinclude uri="xslStyle:statistics:solr:q=status%3Aconfirmed+AND+year%3A%5B2015+TO+*%5D&amp;rows=0&amp;facet.field=nid_connection&amp;facet.limit=50" />
-    </div>
-  </article>
-  <article class="card mb-3" xml:lang="en">
-    <div class="card-body">
-      <h3>Most frequently listed staff (University members only that are linked to HIS LSF, top 50, in publications from 2015):</h3>
-    <xinclude uri="xslStyle:statistics:solr:q=status%3Aconfirmed+AND+year%3A%5B2015+TO+*%5D&amp;rows=0&amp;facet.field=nid_connection&amp;facet.limit=50" />
-    </div>
-  </article>
-
-  <article class="card" xml:lang="de">
-    <div class="card-body">
-      <h3>In Publikationen verwendete Autoren-Identifikatoren:</h3>
-      <xinclude uri="xslStyle:statistics:solr:q=objectKind%3Aname&amp;rows=0&amp;facet.pivot=name_id_type,name_id_type" />
-    </div>
-  </article>
-  <article class="card" xml:lang="en">
+  <article class="card mb-3">
     <div class="card-body">
-      <h3>Author identifier schemes used in publications:</h3>
-      <xinclude uri="xslStyle:statistics:solr:q=objectKind%3Aname&amp;rows=0&amp;facet.pivot=name_id_type,name_id_type" />
+      <h3>
+        <i18n:code>ChartsCommon.chart.title.nid_connection.headline</i18n:code>:
+      </h3>
+      <xinclude uri="xslStyle:charts/bar-chart?facet=nid_connection&amp;labelsFromPivot=true:solr:requestHandler:select:q=status%3Aconfirmed+AND+year%3A%5B2015+TO+*%5D&amp;rows=0&amp;facet.field=nid_connection&amp;facet.limit=50"/>
     </div>
   </article>
 
- </webpage>
+  <xinclude uri="xslStyle:statistics:solr:requestHandler:select:q=objectKind%3Aname&amp;rows=0&amp;facet.pivot=name_id_type,name_id_type"/>
+</webpage>

ubo-common/src/main/resources/config/ubo-common/messages_de.properties

@@ -1,3 +1,10 @@
+ChartsCommon.chart.title.genre                             = Publikationen / Publikationstyp
+ChartsCommon.chart.title.name_id_type.headline             = In Publikationen verwendete Autoren-Identifikatoren
+ChartsCommon.chart.title.nid_connection                    = Publikationen / Person
+ChartsCommon.chart.title.nid_connection.headline           = Am h\u00E4ufigsten verzeichnete Personen (nur mit UDE LSF Zuordnung, Top 50, in Publikationen ab 2015)
+ChartsCommon.chart.title.oa                                = Open Access?
+ChartsCommon.chart.title.subject                           = Publikationen / Fach
+ChartsCommon.chart.title.year                              = Publikationen / Erscheinungsjahr
 MCRUploadApplet.altsel                                     = oder absoluten Pfad eingeben:
 MCRUploadApplet.choose                                     = Datei(en) oder Verzeichnis(se) w\u00E4hlen
 MCRUploadApplet.dirsel                                     = Datei(en) oder Verzeichnis(se) w\u00E4hlen

ubo-common/src/main/resources/config/ubo-common/messages_en.properties

@@ -1,3 +1,10 @@
+ChartsCommon.chart.title.genre                             = Publications / Publication type
+ChartsCommon.chart.title.name_id_type.headline             = Author identifier schemes used in publications
+ChartsCommon.chart.title.nid_connection                    = Publications / Person
+ChartsCommon.chart.title.nid_connection.headline           = Most frequently listed staff (University members only that are linked to HIS LSF, top 50, in publications from 2015)
+ChartsCommon.chart.title.oa                                = Open Access?
+ChartsCommon.chart.title.subject                           = Publications / Subject
+ChartsCommon.chart.title.year                              = Publications / Year issued
 MCRUploadApplet.altsel                                     = or enter an absolute path:
 MCRUploadApplet.choose                                     = Select files or directories
 MCRUploadApplet.dirsel                                     = Select files or directories

ubo-common/src/main/resources/config/ubo-common/mycore.properties

@@ -1146,6 +1146,15 @@ MCR.JPA.GloballyQuotedIdentifiers                       = true
 #MCR.ContentTransformer.modsCsl-xhtml-pdf.FontResources=fonts/FreeSerif.ttf,fonts/FreeSerifBold.ttf,fonts/FreeSerifBoldItalic.ttf,fonts/FreeSerifItalic.ttf
 MCR.URIResolver.ModuleResolver.solr-require-results=org.mycore.ubo.mail.SolrRequireResultsResolver
 
+###############
+# Statistics
+###############
+ChartsCommon.Chart.nid_connection.always.visible = true
+ChartsCommon.Chart.solr.requestHandler           = select
+ChartsCommon.Default.Statistics.Bar.Color        = %UBO.Statistics.Color.Bar%
+ChartsCommon.border.class                        = border rounded
+ChartsCommon.dataLabels.style.colors             = ['#123']
+
 ######################################################################
 #                                                                    #
 #                        UBO-Customization                           #

ubo-common/src/main/resources/config/ubo-common/solr/main/solr-config.json

@@ -70,20 +70,25 @@
 			"defaults": {
 				"echoParams": "explicit",
 				"defType": "edismax",
+				"q.alt": "*:*",
 				"qs": "5",
 				"mm": "100%",
-				"q.op": "AND",
 				"df": "all",
-				"wt": "xml"
+				"wt": "xml",
+				"f.year.facet.limit": -1,
+				"sort":"year desc"
 			},
 			"appends": {
 				"facet.field": [
 					"year",
 					"subject",
 					"genre",
 					"facet_person",
-					"oa"
-				]
+					"oa",
+					"connection_nid_text",
+					"nid_connection"
+				],
+				"fq": "+objectType:mods"
 			},
 			"invariants": {
 				"fl": "",

ubo-common/src/main/resources/xsl/response-statistics.xsl

@@ -6,6 +6,10 @@
   xmlns:i18n="xalan://org.mycore.services.i18n.MCRTranslation"
   exclude-result-prefixes="xsl xalan i18n">
 
+  <xsl:import href="resource:xsl/charts/bar-chart.xsl"/>
+  <xsl:import href="resource:xsl/charts/oa-chart.xsl" />
+  <xsl:import href="resource:xsl/charts/pie-chart.xsl"/>
+
   <xsl:include href="statistics.xsl" />
 
   <xsl:param name="WebApplicationBaseURL" />
@@ -16,6 +20,8 @@
         <title>
           <xsl:call-template name="page.title" />
         </title>
+
+        <script src="{$WebApplicationBaseURL}assets/echarts/dist/echarts.js"/>
       </head>
       <body>
         <xsl:apply-templates select="response" />
@@ -32,18 +38,36 @@
   </xsl:template>
 
   <xsl:template match="response" priority="1">
-    <script src="{$WebApplicationBaseURL}webjars/highcharts/5.0.1/highcharts.src.js" type="text/javascript"></script>
-    <script src="{$WebApplicationBaseURL}webjars/highcharts/5.0.1/themes/grid.js" type="text/javascript"></script>
-
-    <div id="chartDialog" />
-
-    <xsl:for-each select="lst[@name='facet_counts']/lst[@name='facet_fields']">
-      <xsl:apply-templates select="lst[@name='year']" />
-      <xsl:apply-templates select="lst[@name='subject']" />
-      <xsl:apply-templates select="lst[@name='genre']" />
-      <xsl:apply-templates select="lst[@name='oa']" />
-      <xsl:apply-templates select="lst[@name='facet_person']" />
-    </xsl:for-each>
-  </xsl:template>
 
+    <xsl:apply-templates select="." mode="bar-chart">
+      <xsl:with-param name="chart-title" select="document('notnull:i18n:ChartsCommon.chart.title.year')/i18n/text()"/>
+      <xsl:with-param name="facet-name" select="'year'"/>
+      <xsl:with-param name="horizontal-bars" select="'false'"/>
+    </xsl:apply-templates>
+
+    <xsl:apply-templates select="." mode="bar-chart">
+      <xsl:with-param name="chart-title" select="document('notnull:i18n:ChartsCommon.chart.title.subject')/i18n/text()"/>
+      <xsl:with-param name="facet-name" select="'subject'"/>
+      <xsl:with-param name="height" select="800"/>
+    </xsl:apply-templates>
+
+    <xsl:apply-templates select="." mode="pie-chart">
+      <xsl:with-param name="chart-title" select="document('notnull:i18n:ChartsCommon.chart.title.genre')/i18n/text()"/>
+      <xsl:with-param name="classId" select="'ubogenre'"/>
+      <xsl:with-param name="facet-name" select="'genre'"/>
+    </xsl:apply-templates>
+
+    <xsl:apply-templates select="." mode="pie-chart">
+      <xsl:with-param name="chart-title" select="document('notnull:i18n:ChartsCommon.chart.title.oa')/i18n/text()"/>
+      <xsl:with-param name="classId" select="'oa'"/>
+      <xsl:with-param name="facet-name" select="'oa'"/>
+    </xsl:apply-templates>
+
+    <xsl:apply-templates select="." mode="bar-chart">
+      <xsl:with-param name="chart-title" select="document('notnull:i18n:ChartsCommon.chart.title.nid_connection')/i18n/text()"/>
+      <xsl:with-param name="facet-name" select="'nid_connection'"/>
+      <xsl:with-param name="generate-labels-from-pivot" select="'true'"/>
+      <xsl:with-param name="height" select="1500"/>
+    </xsl:apply-templates>
+  </xsl:template>
 </xsl:stylesheet>