Speakr is a personal, self-hosted web application designed for transcribing audio recordings
Python
Fix sort toggle to actually sort recordings and add Upcoming group for future dates
Murtaza Nasir6330c4d06d63
diff --git a/src/api/recordings.py b/src/api/recordings.pyindex 8b11eb5a..c83dbc6f 100644--- a/src/api/recordings.py+++ b/src/api/recordings.py@@ -1335,6 +1335,7 @@ def get_recordings_paginated():show_shared = request.args.get('shared', '').lower() == 'true'show_starred = request.args.get('starred', '').lower() == 'true'show_inbox = request.args.get('inbox', '').lower() == 'true'+ sort_by = request.args.get('sort_by', 'created_at') # 'created_at' or 'meeting_date'# Get all accessible recording IDs (own + shared)accessible_recording_ids = get_accessible_recording_ids(current_user.id)@@ -1625,14 +1626,19 @@ def get_recordings_paginated():stmt = stmt.where(db.or_(*text_conditions))- # Apply ordering (most recent first based on meeting_date or created_at)- stmt = stmt.order_by(- db.case(- (Recording.meeting_date.is_not(None), Recording.meeting_date),- else_=db.func.date(Recording.created_at)- ).desc(),- Recording.created_at.desc()- )+ # Apply ordering based on sort_by parameter+ if sort_by == 'meeting_date':+ # Sort by meeting_date first, fall back to created_at if no meeting_date+ stmt = stmt.order_by(+ db.case(+ (Recording.meeting_date.is_not(None), Recording.meeting_date),+ else_=db.func.date(Recording.created_at)+ ).desc(),+ Recording.created_at.desc()+ )+ else:+ # Default: sort by created_at (upload/processing date)+ stmt = stmt.order_by(Recording.created_at.desc())# Get total count for pagination infocount_stmt = select(db.func.count()).select_from(stmt.subquery())diff --git a/static/js/app.modular.js b/static/js/app.modular.jsindex 29b13351..e68b3b49 100644--- a/static/js/app.modular.js+++ b/static/js/app.modular.js@@ -979,21 +979,50 @@ document.addEventListener('DOMContentLoaded', async () => {const groupedRecordings = computed(() => {const groups = {};+ const groupDates = {}; // Track the most recent date in each group+recordings.value.forEach(recording => {const date = getDateForSorting(recording);if (!date) return;+let group;- if (isToday(date)) group = t('sidebar.today');- else if (isYesterday(date)) group = t('sidebar.yesterday');- else if (isThisWeek(date)) group = t('sidebar.thisWeek');- else if (isLastWeek(date)) group = t('sidebar.lastWeek');- else if (isThisMonth(date)) group = t('sidebar.thisMonth');- else if (isLastMonth(date)) group = t('sidebar.lastMonth');- else group = t('sidebar.older');- if (!groups[group]) groups[group] = [];+ const now = new Date();++ // Check for future dates first+ if (date > now && !isToday(date)) {+ group = t('sidebar.upcoming');+ } else if (isToday(date)) {+ group = t('sidebar.today');+ } else if (isYesterday(date)) {+ group = t('sidebar.yesterday');+ } else if (isThisWeek(date)) {+ group = t('sidebar.thisWeek');+ } else if (isLastWeek(date)) {+ group = t('sidebar.lastWeek');+ } else if (isThisMonth(date)) {+ group = t('sidebar.thisMonth');+ } else if (isLastMonth(date)) {+ group = t('sidebar.lastMonth');+ } else {+ group = t('sidebar.older');+ }++ if (!groups[group]) {+ groups[group] = [];+ groupDates[group] = date;+ }groups[group].push(recording);++ // Track the most recent (largest) date in each group+ if (date > groupDates[group]) {+ groupDates[group] = date;+ }});- return Object.entries(groups).map(([title, items]) => ({ title, items }));++ // Sort groups by their most recent date (descending - newest first)+ return Object.entries(groups)+ .sort(([a], [b]) => groupDates[b] - groupDates[a])+ .map(([title, items]) => ({ title, items }));});const filteredAvailableTags = computed(() => {@@ -1618,6 +1647,10 @@ document.addEventListener('DOMContentLoaded', async () => {recordingsComposable.loadRecordings(1, false, searchQuery.value);});+ watch(sortBy, () => {+ recordingsComposable.loadRecordings(1, false, searchQuery.value);+ });+watch(showArchivedRecordings, (newValue, oldValue) => {// Prevent unnecessary reloads when being set by the other watcherif (newValue === oldValue) return;diff --git a/static/js/modules/composables/recordings.js b/static/js/modules/composables/recordings.jsindex fa19e526..f7fa1ec5 100644--- a/static/js/modules/composables/recordings.js+++ b/static/js/modules/composables/recordings.js@@ -9,7 +9,7 @@ export function useRecordings(state, utils, reprocessComposable) {currentPage, perPage, totalRecordings, totalPages, hasNextPage, hasPrevPage,showSharedWithMe, showArchivedRecordings, searchQuery, searchDebounceTimer,filterTags, filterSpeakers, filterDatePreset, filterDateRange, filterTextQuery,- filterStarred, filterInbox,+ filterStarred, filterInbox, sortBy,availableTags, availableSpeakers, selectedTagIds, uploadLanguage, uploadMinSpeakers, uploadMaxSpeakers,useAsrEndpoint, globalError, uploadQueue, isProcessingActive, currentView,isMobileScreen, isSidebarCollapsed, isRecording, audioBlobURL@@ -38,6 +38,11 @@ export function useRecordings(state, utils, reprocessComposable) {params.set('q', searchQueryParam.trim());}+ // Add sort parameter+ if (sortBy.value) {+ params.set('sort_by', sortBy.value);+ }+// Add archived/shared/starred/inbox filters as query params (ANDed with other filters)if (showArchivedRecordings.value) {params.set('archived', 'true');diff --git a/static/locales/de.json b/static/locales/de.jsonindex 9d39edec..20e216ad 100644--- a/static/locales/de.json+++ b/static/locales/de.json@@ -879,6 +879,7 @@"moveToInbox": "In Posteingang verschieben","noRecordings": "Keine Aufnahmen gefunden","older": "Älter",+ "upcoming": "Bevorstehend","removeFromHighlighted": "Von Favoriten entfernen","searchRecordings": "Aufnahmen suchen...","sharedWithMe": "Mit mir geteilt",diff --git a/static/locales/en.json b/static/locales/en.jsonindex 22f6ae1c..4f3fd230 100644--- a/static/locales/en.json+++ b/static/locales/en.json@@ -873,6 +873,7 @@"moveToInbox": "Move to Inbox","noRecordings": "No recordings found","older": "Older",+ "upcoming": "Upcoming","removeFromHighlighted": "Remove from starred","searchRecordings": "Search recordings...","sharedWithMe": "Shared with Me",diff --git a/static/locales/es.json b/static/locales/es.jsonindex 49c5f94d..022d02c2 100644--- a/static/locales/es.json+++ b/static/locales/es.json@@ -848,6 +848,7 @@"moveToInbox": "Mover a bandeja de entrada","noRecordings": "No se encontraron grabaciones","older": "Más Antiguo",+ "upcoming": "Próximo","removeFromHighlighted": "Quitar de destacados","searchRecordings": "Buscar grabaciones...","sharedWithMe": "Compartido Conmigo",diff --git a/static/locales/fr.json b/static/locales/fr.jsonindex b650e50b..379718c9 100644--- a/static/locales/fr.json+++ b/static/locales/fr.json@@ -842,6 +842,7 @@"moveToInbox": "Déplacer vers la boîte de réception","noRecordings": "Aucun enregistrement trouvé","older": "Plus Ancien",+ "upcoming": "À venir","removeFromHighlighted": "Retirer des favoris","searchRecordings": "Rechercher des enregistrements...","sharedWithMe": "Partagé avec Moi",diff --git a/static/locales/zh.json b/static/locales/zh.jsonindex e60a0b52..69cc0c63 100644--- a/static/locales/zh.json+++ b/static/locales/zh.json@@ -998,6 +998,7 @@"moveToInbox": "移至收件箱","noRecordings": "没有录音","older": "更早",+ "upcoming": "即将到来","removeFromHighlighted": "取消标记","searchRecordings": "搜索录音","sharedWithMe": "分享给我",