diff --git a/UI/Web/src/app/_models/chapter.ts b/UI/Web/src/app/_models/chapter.ts index 33a2588cf..f3010fb95 100644 --- a/UI/Web/src/app/_models/chapter.ts +++ b/UI/Web/src/app/_models/chapter.ts @@ -7,7 +7,7 @@ import { AgeRating } from './metadata/age-rating'; export interface Chapter { id: number; range: string; - minNumber: string; + number: string; files: Array; /** * This is used in the UI, it is not updated or sent to Backend diff --git a/UI/Web/src/app/cards/_modals/edit-series-modal/edit-series-modal.component.ts b/UI/Web/src/app/cards/_modals/edit-series-modal/edit-series-modal.component.ts index eed04a27d..515d9dace 100644 --- a/UI/Web/src/app/cards/_modals/edit-series-modal/edit-series-modal.component.ts +++ b/UI/Web/src/app/cards/_modals/edit-series-modal/edit-series-modal.component.ts @@ -282,7 +282,7 @@ export class EditSeriesModalComponent implements OnInit { }); this.seriesVolumes.forEach(vol => { vol.volumeFiles = vol.chapters?.sort(this.utilityService.sortChapters).map((c: Chapter) => c.files.map((f: any) => { - f.chapter = c.minNumber; + f.chapter = c.number; return f; })).flat(); }); diff --git a/UI/Web/src/app/cards/card-detail-drawer/card-detail-drawer.component.html b/UI/Web/src/app/cards/card-detail-drawer/card-detail-drawer.component.html index 2ef7b5dfc..183d56e19 100644 --- a/UI/Web/src/app/cards/card-detail-drawer/card-detail-drawer.component.html +++ b/UI/Web/src/app/cards/card-detail-drawer/card-detail-drawer.component.html @@ -123,7 +123,7 @@ - + {{utilityService.formatChapterName(libraryType, true, false) }} {{formatChapterNumber(chapter)}} diff --git a/UI/Web/src/app/cards/card-detail-drawer/card-detail-drawer.component.ts b/UI/Web/src/app/cards/card-detail-drawer/card-detail-drawer.component.ts index 56d3049a3..d4a4a85e6 100644 --- a/UI/Web/src/app/cards/card-detail-drawer/card-detail-drawer.component.ts +++ b/UI/Web/src/app/cards/card-detail-drawer/card-detail-drawer.component.ts @@ -182,10 +182,10 @@ export class CardDetailDrawerComponent implements OnInit { } formatChapterNumber(chapter: Chapter) { - if (chapter.minNumber === '0') { + if (chapter.number === '0') { return '1'; } - return chapter.minNumber; + return chapter.number; } performAction(action: ActionItem, chapter: Chapter) { diff --git a/UI/Web/src/app/cards/entity-title/entity-title.component.html b/UI/Web/src/app/cards/entity-title/entity-title.component.html index 9f7fddabf..6e1745d30 100644 --- a/UI/Web/src/app/cards/entity-title/entity-title.component.html +++ b/UI/Web/src/app/cards/entity-title/entity-title.component.html @@ -7,9 +7,9 @@ {{seriesName.length > 0 ? seriesName + ' - ' : ''}} - {{entity.minNumber !== 0 ? (isChapter && includeVolume ? volumeTitle : '') : ''}} + {{Number !== 0 ? (isChapter && includeVolume ? volumeTitle : '') : ''}} - {{entity.minNumber !== 0 ? (isChapter ? t('issue-num') + entity.minNumber : volumeTitle) : t('special')}} + {{Number !== 0 ? (isChapter ? t('issue-num') + Number : volumeTitle) : t('special')}} @@ -19,9 +19,9 @@ {{seriesName.length > 0 ? seriesName + ' - ' : ''}} - {{entity.minNumber !== 0 ? (isChapter && includeVolume ? volumeTitle : '') : ''}} + {{Number !== 0 ? (isChapter && includeVolume ? volumeTitle : '') : ''}} - {{entity.minNumber !== 0 ? (isChapter ? (t('chapter') + ' ') + entity.minNumber : volumeTitle) : t('special')}} + {{Number !== 0 ? (isChapter ? (t('chapter') + ' ') + Number : volumeTitle) : t('special')}} diff --git a/UI/Web/src/app/cards/entity-title/entity-title.component.ts b/UI/Web/src/app/cards/entity-title/entity-title.component.ts index 13c7f4bb8..564c5eaaa 100644 --- a/UI/Web/src/app/cards/entity-title/entity-title.component.ts +++ b/UI/Web/src/app/cards/entity-title/entity-title.component.ts @@ -39,6 +39,10 @@ export class EntityTitleComponent implements OnInit { titleName: string = ''; volumeTitle: string = ''; + get Number() { + if (this.utilityService.isVolume(this.entity)) return (this.entity as Volume).minNumber; + return (this.entity as Chapter).number; + } get LibraryType() { return LibraryType; diff --git a/UI/Web/src/app/series-detail/_components/series-detail/series-detail.component.ts b/UI/Web/src/app/series-detail/_components/series-detail/series-detail.component.ts index 3c4054433..2d27cad1a 100644 --- a/UI/Web/src/app/series-detail/_components/series-detail/series-detail.component.ts +++ b/UI/Web/src/app/series-detail/_components/series-detail/series-detail.component.ts @@ -226,7 +226,7 @@ export class SeriesDetailComponent implements OnInit, AfterContentChecked { /** * Track by function for Chapter to tell when to refresh card data */ - trackByChapterIdentity = (index: number, item: Chapter) => `${item.title}_${item.minNumber}_${item.volumeId}_${item.pagesRead}`; + trackByChapterIdentity = (index: number, item: Chapter) => `${item.title}_${item.number}_${item.volumeId}_${item.pagesRead}`; trackByRelatedSeriesIdentify = (index: number, item: RelatedSeriesPair) => `${item.series.name}_${item.series.libraryId}_${item.series.pagesRead}_${item.relation}`; trackBySeriesIdentify = (index: number, item: Series) => `${item.name}_${item.libraryId}_${item.pagesRead}`; trackByStoryLineIdentity = (index: number, item: StoryLineItem) => { @@ -341,13 +341,13 @@ export class SeriesDetailComponent implements OnInit, AfterContentChecked { // This is a lone chapter if (vol.length === 0) { - return 'Ch ' + this.currentlyReadingChapter.minNumber; + return 'Ch ' + this.currentlyReadingChapter.number; } - if (this.currentlyReadingChapter.minNumber === "0") { + if (this.currentlyReadingChapter.number === "0") { return 'Vol ' + vol[0].minNumber; } - return 'Vol ' + vol[0].minNumber + ' Ch ' + this.currentlyReadingChapter.minNumber; + return 'Vol ' + vol[0].minNumber + ' Ch ' + this.currentlyReadingChapter.number; } return this.currentlyReadingChapter.title; diff --git a/UI/Web/src/app/shared/_services/download.service.ts b/UI/Web/src/app/shared/_services/download.service.ts index 673906a52..be9dfb98d 100644 --- a/UI/Web/src/app/shared/_services/download.service.ts +++ b/UI/Web/src/app/shared/_services/download.service.ts @@ -115,7 +115,7 @@ export class DownloadService { case 'volume': return (downloadEntity as Volume).minNumber + ''; case 'chapter': - return (downloadEntity as Chapter).minNumber; + return (downloadEntity as Chapter).number; case 'bookmark': return ''; case 'logs': diff --git a/UI/Web/src/app/shared/_services/utility.service.ts b/UI/Web/src/app/shared/_services/utility.service.ts index 0c6577823..8c2382cb5 100644 --- a/UI/Web/src/app/shared/_services/utility.service.ts +++ b/UI/Web/src/app/shared/_services/utility.service.ts @@ -43,7 +43,7 @@ export class UtilityService { sortChapters = (a: Chapter, b: Chapter) => { - return parseFloat(a.minNumber) - parseFloat(b.minNumber); + return parseFloat(a.number) - parseFloat(b.number); } mangaFormatToText(format: MangaFormat): string {