Skip to content
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions pom-dependency-tree.txt
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
ai.elimu:webapp:war:2.6.142-SNAPSHOT
+- ai.elimu:model:jar:model-2.0.127:compile
ai.elimu:webapp:war:2.6.148-SNAPSHOT
+- ai.elimu:model:jar:model-2.0.128:compile
| \- com.google.code.gson:gson:jar:2.13.1:compile
| \- com.google.errorprone:error_prone_annotations:jar:2.38.0:compile
+- org.springframework:spring-context:jar:6.0.11:compile
Expand Down
Original file line number Diff line number Diff line change
@@ -1,17 +1,8 @@
package ai.elimu.web.content.letter;

import ai.elimu.dao.LetterDao;
import ai.elimu.dao.StoryBookParagraphDao;
import ai.elimu.entity.content.Letter;
import ai.elimu.entity.content.StoryBookParagraph;
import ai.elimu.model.v2.enums.Language;
import ai.elimu.util.ConfigHelper;
import ai.elimu.util.LetterFrequencyHelper;

import java.util.ArrayList;
import java.util.List;
import java.util.Map;

import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;
import org.springframework.stereotype.Controller;
Expand All @@ -27,8 +18,6 @@ public class LetterListController {

private final LetterDao letterDao;

private final StoryBookParagraphDao storyBookParagraphDao;

@GetMapping
public String handleRequest(Model model) {
log.info("handleRequest");
Expand All @@ -44,15 +33,6 @@ public String handleRequest(Model model) {
}
model.addAttribute("maxUsageCount", maxUsageCount);

// Extract letter frequency distribution from storybook paragraphs
List<String> paragraphs = new ArrayList<>();
for (StoryBookParagraph storyBookParagraph : storyBookParagraphDao.readAll()) {
paragraphs.add(storyBookParagraph.getOriginalText());
}
Language language = Language.valueOf(ConfigHelper.getProperty("content.language"));
Map<String, Integer> letterFrequencyMap = LetterFrequencyHelper.getLetterFrequency(paragraphs, language);
model.addAttribute("letterFrequencyMap", letterFrequencyMap);

return "content/letter/list";
}
}
32 changes: 0 additions & 32 deletions src/main/webapp/WEB-INF/jsp/content/letter/list.jsp
Original file line number Diff line number Diff line change
Expand Up @@ -4,38 +4,6 @@

<content:section cssId="letterListPage">
<div class="section row">
<div class="card-panel">
<script src="https://cdn.jsdelivr.net/npm/chart.js@4.4.4/dist/chart.umd.min.js"></script>
<canvas id="chart"></canvas>
<script>
var ctx = document.getElementById('chart');
var data = {
labels: [
<c:forEach var="key" items="${letterFrequencyMap.keySet()}">
'<c:out value="${key}" escapeXml="true" />',
</c:forEach>
],
datasets: [
{
data: [
<c:forEach var="key" items="${letterFrequencyMap}">
${key.value},
</c:forEach>
],
label: 'Letter frequency distribution',
backgroundColor: 'rgba(149,117,205, 0.5)', // #9575cd deep-purple lighten-2
}
]
};
var options = {};
new Chart(ctx, {
type: 'bar',
data: data,
options: options
});
</script>
</div>

<a id="exportToCsvButton" class="right btn waves-effect waves-light grey-text white"
href="<spring:url value='/content/letter/list/letters.csv' />">
Export to CSV<i class="material-icons right">vertical_align_bottom</i>
Expand Down
Loading