diff --git a/komga-webui/src/views/BrowseCollection.vue b/komga-webui/src/views/BrowseCollection.vue index 007d5ba01..43b48f3ab 100644 --- a/komga-webui/src/views/BrowseCollection.vue +++ b/komga-webui/src/views/BrowseCollection.vue @@ -118,7 +118,7 @@ import {COLLECTION_CHANGED, COLLECTION_DELETED, SERIES_CHANGED} from '@/types/ev import Vue from 'vue' import SeriesMultiSelectBar from '@/components/bars/SeriesMultiSelectBar.vue' import {LIBRARIES_ALL} from '@/types/library' -import {ReadStatus} from '@/types/enum-books' +import {ReadStatus, replaceCompositeReadStatus} from '@/types/enum-books' import {SeriesStatus, SeriesStatusKeyValue} from '@/types/enum-series' import {mergeFilterParams, toNameValue} from '@/functions/filter' import FilterDrawer from '@/components/FilterDrawer.vue' @@ -221,7 +221,13 @@ export default Vue.extend({ computed: { filterOptionsList(): FiltersOptions { return { - readStatus: {values: [{name: this.$i18n.t('filter.unread').toString(), value: ReadStatus.UNREAD}]}, + readStatus: { + values: [ + {name: this.$i18n.t('filter.unread').toString(), value: ReadStatus.UNREAD_AND_IN_PROGRESS}, + {name: this.$t('filter.in_progress').toString(), value: ReadStatus.IN_PROGRESS}, + {name: this.$t('filter.read').toString(), value: ReadStatus.READ}, + ], + }, } as FiltersOptions }, filterOptionsPanel(): FiltersOptions { @@ -351,7 +357,7 @@ export default Vue.extend({ })) }) - this.series = (await this.$komgaCollections.getSeries(collectionId, {unpaged: true} as PageRequest, this.filters.library, this.filters.status, this.filters.readStatus, this.filters.genre, this.filters.tag, this.filters.language, this.filters.publisher, this.filters.ageRating, this.filters.releaseDate, authorsFilter)).content + this.series = (await this.$komgaCollections.getSeries(collectionId, {unpaged: true} as PageRequest, this.filters.library, this.filters.status, replaceCompositeReadStatus(this.filters.readStatus), this.filters.genre, this.filters.tag, this.filters.language, this.filters.publisher, this.filters.ageRating, this.filters.releaseDate, authorsFilter)).content this.seriesCopy = [...this.series] this.selectedSeries = [] }, diff --git a/komga-webui/src/views/BrowseSeries.vue b/komga-webui/src/views/BrowseSeries.vue index 9d81b6711..2c416f36a 100644 --- a/komga-webui/src/views/BrowseSeries.vue +++ b/komga-webui/src/views/BrowseSeries.vue @@ -90,87 +90,87 @@ - - - {{ series.metadata.title }} - - + + + {{ series.metadata.title }} + + - - - - + + + + {{ new Intl.DateTimeFormat($i18n.locale, {year: 'numeric'}).format(new Date(series.booksMetadata.releaseDate)) }} - - {{ $t('browse_series.earliest_year_from_release_dates') }} - - - - - - - - {{ $t(`enums.series_status.${series.metadata.status}`) }} - - - - - {{ series.metadata.ageRating }}+ - - - - - {{ languageDisplay }} - - - - - {{ $t(`enums.reading_direction.${series.metadata.readingDirection}`) }} - - - - - - - - - mdi-file-download - {{ $t('common.download') }} - + + {{ $t('browse_series.earliest_year_from_release_dates') }} + - - - {{ series.metadata.summary }} + + + + {{ $t(`enums.series_status.${series.metadata.status}`) }} + + + + + {{ series.metadata.ageRating }}+ + + + + + {{ languageDisplay }} + + + + + {{ $t(`enums.reading_direction.${series.metadata.readingDirection}`) }} + - - - - + + + + + mdi-file-download + {{ $t('common.download') }} + + + + + + + {{ series.metadata.summary }} + + + + + + + {{ $t('browse_series.summary_from_book', {number: series.booksMetadata.summaryNumber}) }} - - {{ $t('browse_series.series_no_summary') }} - - {{ series.booksMetadata.summary }} - - - + + {{ $t('browse_series.series_no_summary') }} + + {{ series.booksMetadata.summary }} + + + @@ -292,39 +292,39 @@ - - {{ $t(`author_roles.${role}`) }} - - - - - mdi-chevron-left - - + + {{ $t(`author_roles.${role}`) }} + + + + + mdi-chevron-left + + - - - mdi-chevron-right - - + + + mdi-chevron-right + + - {{ name }} - - - - + {{ name }} + + + + @@ -454,7 +454,13 @@ export default Vue.extend({ }, filterOptionsList(): FiltersOptions { return { - readStatus: {values: [{name: this.$t('filter.unread').toString(), value: ReadStatus.UNREAD_AND_IN_PROGRESS}]}, + readStatus: { + values: [ + {name: this.$t('filter.unread').toString(), value: ReadStatus.UNREAD_AND_IN_PROGRESS}, + {name: this.$t('filter.in_progress').toString(), value: ReadStatus.IN_PROGRESS}, + {name: this.$t('filter.read').toString(), value: ReadStatus.READ}, + ], + }, } as FiltersOptions }, filterOptionsPanel(): FiltersOptions {