SortBy Options: Started Date & Finished Date implemented. English-only strings

client/components/cards/LazyBookCard.vue

@@ -353,6 +353,14 @@ export default {
         if (!this.userProgressLastUpdated) return '\u00A0'
         return this.$getString('LabelLastProgressDate', [this.$formatDatetime(this.userProgressLastUpdated, this.dateFormat, this.timeFormat)])
       }
+      if (this.orderBy === 'startedDate') {
+        if (!this.userProgressStartedDate) return '\u00A0'
+        return this.$getString('LabelFileStartedDate', [this.$formatDate(this.userProgressStartedDate, this.dateFormat, this.timeFormat)])
+      }
+      if (this.orderBy === 'finishedDate') {
+        if (!this.userProgressFinishedDate) return '\u00A0'
+        return this.$getString('LabelFileFinishedDate', [this.$formatDate(this.userProgressFinishedDate, this.dateFormat, this.timeFormat)])
+      }
       return null
     },
     episodeProgress() {
@@ -389,6 +397,15 @@ export default {
       if (!this.userProgress) return null
       return this.userProgress.lastUpdate
     },
+    userProgressStartedDate() {
+      if (!this.userProgress) return null
+      return this.userProgress.startedAt
+    },
+    userProgressFinishedDate() {
+      if (!this.userProgress) return null
+      console.log(this.userProgress)
+      return this.userProgress.finishedAt
+    },
     itemIsFinished() {
       if (this.booksInSeries) return this.seriesIsFinished
       return this.userProgress ? !!this.userProgress.isFinished : false

client/components/controls/LibrarySortSelect.vue

@@ -134,6 +134,14 @@ export default {
           text: this.$strings.LabelLibrarySortByProgress,
           value: 'progress'
         },
+        {
+          text: this.$strings.LabelLibrarySortByStartDate,
+          value: 'startedDate'
+        },
+        {
+          text: this.$strings.LabelLibrarySortByFinishDate,
+          value: 'finishedDate'
+        },
         {
           text: this.$strings.LabelRandomly,
           value: 'random'
@@ -200,4 +208,4 @@ export default {
 .librarySortMenu {
   max-height: calc(100vh - 125px);
 }
-</style>
+</style>

client/strings/en-us.json

@@ -371,7 +371,9 @@
   "LabelFileBirthtime": "File Birthtime",
   "LabelFileBornDate": "Born {0}",
   "LabelFileModified": "File Modified",
+  "LabelFileFinishedDate": "Finished {0}",
   "LabelFileModifiedDate": "Modified {0}",
+  "LabelFileStartedDate": "Started {0}",
   "LabelFilename": "Filename",
   "LabelFilterByUser": "Filter by User",
   "LabelFindEpisodes": "Find Episodes",
@@ -433,7 +435,9 @@
   "LabelLibraryFilterSublistEmpty": "No {0}",
   "LabelLibraryItem": "Library Item",
   "LabelLibraryName": "Library Name",
+  "LabelLibrarySortByFinishDate": "Finish Date",
   "LabelLibrarySortByProgress": "Progress Updated",
+  "LabelLibrarySortByStartDate": "Start Date",
   "LabelLimit": "Limit",
   "LabelLineSpacing": "Line spacing",
   "LabelListenAgain": "Listen Again",
@@ -1137,4 +1141,4 @@
   "ToastUserPasswordMismatch": "Passwords do not match",
   "ToastUserPasswordMustChange": "New password cannot match old password",
   "ToastUserRootRequireName": "Must enter a root username"
-}
+}

server/utils/queries/libraryItemsBookFilters.js

@@ -290,6 +290,18 @@ module.exports = {
       return [[Sequelize.literal(`CAST(\`series.bookSeries.sequence\` AS FLOAT) ${nullDir}`)]]
     } else if (sortBy === 'progress') {
       return [[Sequelize.literal('mediaProgresses.updatedAt'), dir]]
+    } else if (sortBy === 'startedDate') {
+      // Sort started books first (not null), then unstarted (nulls last), then by createdAt desc
+      return [
+        [Sequelize.literal('(CASE WHEN mediaProgresses.createdAt IS NULL THEN 1 ELSE 0 END)'), 'ASC'],
+        ['mediaProgresses', 'createdAt', dir]
+      ]
+    } else if (sortBy === 'finishedDate') {
+      // Sort finished books first (not null), then unfinished (nulls last), then by finishedAt desc
+      return [
+        [Sequelize.literal('(CASE WHEN mediaProgresses.finishedAt IS NULL THEN 1 ELSE 0 END)'), 'ASC'],
+        ['mediaProgresses', 'finishedAt', dir]
+      ]
     } else if (sortBy === 'random') {
       return [Database.sequelize.random()]
     }
@@ -519,7 +531,7 @@ module.exports = {
       }
       bookIncludes.push({
         model: Database.mediaProgressModel,
-        attributes: ['id', 'isFinished', 'currentTime', 'ebookProgress', 'updatedAt'],
+        attributes: ['id', 'isFinished', 'currentTime', 'ebookProgress', 'updatedAt', 'createdAt', 'finishedAt'],
         where: mediaProgressWhere,
         required: false
       })
@@ -530,10 +542,10 @@ module.exports = {
     }
 
     // When sorting by progress but not filtering by progress, include media progresses
-    if (filterGroup !== 'progress' && sortBy === 'progress') {
+    if (filterGroup !== 'progress' && ['startedDate', 'finishedDate', 'progress'].includes(sortBy)) {
       bookIncludes.push({
         model: Database.mediaProgressModel,
-        attributes: ['id', 'isFinished', 'currentTime', 'ebookProgress', 'updatedAt'],
+        attributes: ['id', 'isFinished', 'currentTime', 'ebookProgress', 'updatedAt', 'createdAt', 'finishedAt'],
         where: {
           userId: user.id
         },