Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
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: 4 additions & 0 deletions src/main/java/ai/elimu/dao/StoryBookChapterDao.java
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,13 @@
import ai.elimu.model.content.StoryBook;
import ai.elimu.model.content.StoryBookChapter;

import ai.elimu.model.content.multimedia.Image;
import org.springframework.dao.DataAccessException;

public interface StoryBookChapterDao extends GenericDao<StoryBookChapter> {

List<StoryBookChapter> readAll(StoryBook storyBook) throws DataAccessException;

List<StoryBookChapter> readAllWithImage(Image image) throws DataAccessException;

}
3 changes: 3 additions & 0 deletions src/main/java/ai/elimu/dao/StoryBookDao.java
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
import java.util.List;
import ai.elimu.model.content.StoryBook;

import ai.elimu.model.content.multimedia.Image;
import ai.elimu.model.v2.enums.ReadingLevel;

import org.springframework.dao.DataAccessException;
Expand All @@ -16,4 +17,6 @@ public interface StoryBookDao extends GenericDao<StoryBook> {
List<StoryBook> readAllOrdered(ReadingLevel readingLevel) throws DataAccessException;

List<StoryBook> readAllUnleveled() throws DataAccessException;

List<StoryBook> readAllWithCoverImage(Image image) throws DataAccessException;
}
12 changes: 12 additions & 0 deletions src/main/java/ai/elimu/dao/jpa/StoryBookChapterDaoJpa.java
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
import ai.elimu.dao.StoryBookChapterDao;
import java.util.List;

import ai.elimu.model.content.multimedia.Image;
import org.springframework.dao.DataAccessException;

import ai.elimu.model.content.StoryBook;
Expand All @@ -20,4 +21,15 @@ public List<StoryBookChapter> readAll(StoryBook storyBook) throws DataAccessExce
.setParameter("storyBook", storyBook)
.getResultList();
}

@Override
public List<StoryBookChapter> readAllWithImage(Image image) throws DataAccessException {
return em.createQuery(
"SELECT ch " +
"FROM StoryBookChapter ch " +
"WHERE ch.image = :image ")
.setParameter("image", image)
.getResultList();
}

}
12 changes: 12 additions & 0 deletions src/main/java/ai/elimu/dao/jpa/StoryBookDaoJpa.java
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@
import javax.persistence.NoResultException;
import ai.elimu.dao.StoryBookDao;

import ai.elimu.model.content.multimedia.Image;
import org.springframework.dao.DataAccessException;

import ai.elimu.model.content.StoryBook;
Expand Down Expand Up @@ -54,4 +55,15 @@ public List<StoryBook> readAllUnleveled() throws DataAccessException {
"ORDER BY book.title")
.getResultList();
}

@Override
public List<StoryBook> readAllWithCoverImage(Image image) throws DataAccessException {
return em.createQuery(
"SELECT book " +
"FROM StoryBook book " +
"WHERE book.coverImage = :image")
.setParameter("image", image)
.getResultList();
}

}
Original file line number Diff line number Diff line change
Expand Up @@ -6,20 +6,13 @@
import java.util.Set;
import javax.servlet.ServletException;
import javax.servlet.http.HttpServletRequest;

import ai.elimu.dao.*;
import ai.elimu.model.content.*;
import ai.elimu.model.content.Number;
import org.apache.commons.lang.StringUtils;

import org.apache.logging.log4j.Logger;
import ai.elimu.dao.AudioDao;
import ai.elimu.dao.EmojiDao;
import ai.elimu.dao.ImageContributionEventDao;
import ai.elimu.dao.ImageDao;
import ai.elimu.dao.LetterDao;
import ai.elimu.dao.NumberDao;
import ai.elimu.dao.WordDao;
import ai.elimu.model.content.Emoji;
import ai.elimu.model.content.Letter;
import ai.elimu.model.content.Number;
import ai.elimu.model.content.Word;
import ai.elimu.model.content.multimedia.Audio;
import ai.elimu.model.content.multimedia.Image;
import ai.elimu.model.contributor.Contributor;
Expand All @@ -36,6 +29,7 @@
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import java.util.stream.Collectors;
import javax.servlet.http.HttpSession;
import org.apache.logging.log4j.LogManager;
import org.springframework.beans.factory.annotation.Autowired;
Expand Down Expand Up @@ -79,6 +73,12 @@ public class ImageEditController {
@Autowired
private AudioDao audioDao;

@Autowired
private StoryBookDao storyBookDao;

@Autowired
private StoryBookChapterDao storyBookChapterDao;

@RequestMapping(value = "/{id}", method = RequestMethod.GET)
public String handleRequest(
Model model,
Expand All @@ -98,7 +98,8 @@ public String handleRequest(
model.addAttribute("numbers", numberDao.readAllOrdered());
model.addAttribute("words", wordDao.readAllOrdered());
model.addAttribute("emojisByWordId", getEmojisByWordId());

model.addAttribute("imageUsed", getStoryBooksUsedImage(image));

Audio audio = audioDao.readByTranscription(image.getTitle());
model.addAttribute("audio", audio);

Expand Down Expand Up @@ -372,4 +373,17 @@ private Map<Long, String> getEmojisByWordId() {

return emojisByWordId;
}

private Map<Long, String> getStoryBooksUsedImage(Image image) {
List<StoryBook> storyBooks = storyBookDao.readAllWithCoverImage(image);
List<StoryBookChapter> storyBookChapters = storyBookChapterDao.readAllWithImage(image);

Map<Long, String> storyBooksTitle = storyBooks.stream().collect(Collectors.toMap(StoryBook::getId, StoryBook::getTitle));
Map<Long, String> storyBookChaptersTitle = storyBookChapters.stream().collect(Collectors.toMap(i -> i.getStoryBook().getId(), i -> i.getStoryBook().getTitle()));

storyBooksTitle.putAll(storyBookChaptersTitle);

return storyBooksTitle;
}

}
2 changes: 2 additions & 0 deletions src/main/webapp/WEB-INF/i18n/messages_en.properties
Original file line number Diff line number Diff line change
Expand Up @@ -255,3 +255,5 @@ word.type=Word type
words=Words
words.pending=Words pending
yes=Yes
image.used=It is used in:
story.books=Story books:
Original file line number Diff line number Diff line change
Expand Up @@ -406,4 +406,13 @@
});
});
</script>
<h5 class="center"><fmt:message key="image.used" /></h5>
<b><fmt:message key="story.books" /></b>
<br/>
<div id="storyBooksContainer">
<c:forEach var="mapEntry" items="${imageUsed}">
<a href="<spring:url value='/content/storybook/edit/${mapEntry.key}' />"> ${mapEntry.value} </a>
<br/>
</c:forEach>
</div>
</content:aside>