diff --git a/client/components/cards/LazyBookCard.vue b/client/components/cards/LazyBookCard.vue index 649b25a8..c4d3e967 100644 --- a/client/components/cards/LazyBookCard.vue +++ b/client/components/cards/LazyBookCard.vue @@ -325,8 +325,13 @@ export default { if (this.episodeProgress) return this.episodeProgress return this.store.getters['user/getUserMediaProgress'](this.libraryItemId) }, + useEBookProgress() { + if (!this.userProgress || this.userProgress.progress) return false + return this.userProgress.ebookProgress > 0 + }, userProgressPercent() { - return this.userProgress ? Math.max(this.userProgress.progress || 0, this.userProgress.ebookProgress || 0) : 0 + if (this.useEBookProgress) return Math.max(Math.min(1, this.userProgress.ebookProgress), 0) + return this.userProgress ? Math.max(Math.min(1, this.userProgress.progress), 0) || 0 : 0 }, itemIsFinished() { return this.userProgress ? !!this.userProgress.isFinished : false diff --git a/client/components/readers/EpubReader.vue b/client/components/readers/EpubReader.vue index e8fb0cff..8e7d016c 100644 --- a/client/components/readers/EpubReader.vue +++ b/client/components/readers/EpubReader.vue @@ -2,26 +2,22 @@
Table of Contents
+{{ $strings.LabelYourProgress }}: {{ Math.round(progressPercent * 100) }}%
{{ $strings.LabelFinished }} {{ $formatDate(userProgressFinishedAt, dateFormat) }}
-{{ $getString('LabelTimeRemaining', [$elapsedPretty(userTimeRemaining)]) }}
+{{ $getString('LabelTimeRemaining', [$elapsedPretty(userTimeRemaining)]) }}
{{ $strings.LabelStarted }} {{ $formatDate(userProgressStartedAt, dateFormat) }}