Michael/LogiFlow
1
0 Fork 0
mirror of https://github.com/R0m1k3/LogiFlow.git synced 2026-10-21 14:08:15 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #515 from R0m1k3/1.1

Browse Source 
Display processed products first and visually indicate their status
This commit is contained in:
LogiFlow authored and GitHub committed 2025-11-04 15:26:29 +01:00
2 parents c776f4c5e3 42a7c494f2
commit e0b8fdfec9
2 files changed
+7 -6
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

client/src/pages/DlcPage.tsx
+1
View File
@@ -894,6 +894,7 @@ export default function DlcPage() {
key={product.id} key={product.id}
className={ className={
product.status === "valides" ? "opacity-60 bg-gray-50 dark:bg-gray-800" : product.status === "valides" ? "opacity-60 bg-gray-50 dark:bg-gray-800" :
product.processedUntilExpiry ? "opacity-60 bg-blue-50 dark:bg-blue-900/20" :
product.stockEpuise ? "opacity-50 bg-yellow-50 dark:bg-yellow-900/20" : "" product.stockEpuise ? "opacity-50 bg-yellow-50 dark:bg-yellow-900/20" : ""
} }
> >
server/storage.ts
+6 -6
View File
@@ -1948,14 +1948,14 @@ export class DatabaseStorage implements IStorage {
query = query.where(and(...conditions)); query = query.where(and(...conditions));
} }
// Tri intelligent : produits actifs en premier, puis produits traités/validés en dernier // Tri intelligent : produits traités/validés en premier (grisés), puis produits actifs
const results = await query.orderBy( const results = await query.orderBy(
// Priorité 1 : Produits actifs d'abord (non validés, non traités, stock disponible) // Priorité 1 : Produits traités/validés d'abord (affichés en grisé)
sql`CASE sql`CASE
WHEN ${dlcProducts.status} = 'valides' THEN 3 WHEN ${dlcProducts.processedUntilExpiry} = true THEN 1
WHEN ${dlcProducts.stockEpuise} = true THEN 2 WHEN ${dlcProducts.status} = 'valides' THEN 1
WHEN ${dlcProducts.processedUntilExpiry} = true THEN 2 WHEN ${dlcProducts.stockEpuise} = true THEN 1
ELSE 1 ELSE 2
END`, END`,
// Priorité 2 : Date d'expiration (croissante) // Priorité 2 : Date d'expiration (croissante)
asc(dlcProducts.expiryDate) asc(dlcProducts.expiryDate)