feat: #64 For non-standard vocabularies, title in the header in now a…

… link to the vocabulary page.
kghackers · Nov 25, 2024 · 666d1de · 666d1de
1 parent 855c4bd
commit 666d1de
Show file tree

Hide file tree

Showing 7 changed files with 236 additions and 54 deletions.
diff --git a/kgparserSrv/src/main/java/ru/klavogonki/kgparser/NonStandardDictionary.java b/kgparserSrv/src/main/java/ru/klavogonki/kgparser/NonStandardDictionary.java
@@ -1,5 +1,7 @@
 package ru.klavogonki.kgparser;
 
+import ru.klavogonki.kgparser.http.UrlConstructor;
+
 import java.util.Comparator;
 import java.util.List;
 import java.util.stream.Collectors;
@@ -205,6 +207,11 @@ public String getNamePrepositional() {
         return namePrepositional;
     }
 
+    @Override
+    public String getLink() {
+        return UrlConstructor.dictionaryPage(getId());
+    }
+
     public final String code;
     public final String name;
     public final String namePrepositional;

diff --git a/kgparserSrv/src/main/java/ru/klavogonki/kgparser/StandardDictionary.java b/kgparserSrv/src/main/java/ru/klavogonki/kgparser/StandardDictionary.java
@@ -187,4 +187,9 @@ public String getName() {
 	public String getNamePrepositional() {
 		return getDisplayNameInPrepositionalCase(this);
 	}
+
+	@Override
+	public String getLink() {
+		return null; // todo: is there a link to normal dictionaries page?
+	}
 }
diff --git a/kgparserSrv/src/main/java/ru/klavogonki/kgparser/Vocabulary.java b/kgparserSrv/src/main/java/ru/klavogonki/kgparser/Vocabulary.java
@@ -7,4 +7,6 @@ public interface Vocabulary {
     String getName();
 
     String getNamePrepositional();
+
+    String getLink(); // ссылка на страницу словаря
 }
diff --git a/kgstatsSrv/src/main/java/ru/klavogonki/statistics/dto/VocabularyDto.java b/kgstatsSrv/src/main/java/ru/klavogonki/statistics/dto/VocabularyDto.java
@@ -10,4 +10,6 @@ public class VocabularyDto {
     private String name;
 
     private String namePrepositional;
+
+    private String link;
 }
diff --git a/kgstatsSrv/src/main/resources/ftl/multi-vocabulary-top-by-speed-sum.ftl b/kgstatsSrv/src/main/resources/ftl/multi-vocabulary-top-by-speed-sum.ftl
@@ -35,6 +35,8 @@
 
     <div class="section" id="table-container">
 
+        <#import "./vocabulary-link.ftl" as vl>  <#-- link to dictionary -->
+
         <table class="data" aria-label="${header}">
             <tr>
                 <th scope="col" rowspan="2">#</th>
@@ -43,8 +45,7 @@
 
                 <#list vocabularies as vocabulary>
 
-                <#-- todo: link to vocabulary, get right from Dto, use ftl template -->
-                <th scope="col" colspan="7">${vocabulary.name}</th>
+                <th scope="col" colspan="7"><@vl.vocabularyLink vocabulary=vocabulary/></th>
 
                 </#list>
             </tr>

diff --git a/kgstatsSrv/src/main/resources/ftl/vocabulary-link.ftl b/kgstatsSrv/src/main/resources/ftl/vocabulary-link.ftl
@@ -0,0 +1,10 @@
+<#-- expects Vocabulary as vocabulary -->
+<#macro vocabularyLink vocabulary>
+    <#if vocabulary.link??>
+        <a href="${vocabulary.link}" target="_blank" rel="noopener noreferrer">
+            ${vocabulary.name}
+        </a>
+    <#else>
+        ${vocabulary.name}
+    </#if>
+</#macro>