diff --git a/src/Vegasco-Web/src/app/modules/entries/entries/entries.component.ts b/src/Vegasco-Web/src/app/modules/entries/entries/entries.component.ts index 23d19ed..2429d27 100644 --- a/src/Vegasco-Web/src/app/modules/entries/entries/entries.component.ts +++ b/src/Vegasco-Web/src/app/modules/entries/entries/entries.component.ts @@ -73,7 +73,7 @@ export class EntriesComponent implements OnInit { const entries = this.consumptionClient.getAll() .pipe( takeUntilDestroyed(), - map(response => response.consumptions), + map(response => response.consumptions.sort((a, b) => b.dateTime.localeCompare(a.dateTime))), catchError((error) => this.handleGetEntriesError(error)) ); diff --git a/src/Vegasco.Server.Api/Consumptions/GetConsumptions.cs b/src/Vegasco.Server.Api/Consumptions/GetConsumptions.cs index b440142..37b1169 100644 --- a/src/Vegasco.Server.Api/Consumptions/GetConsumptions.cs +++ b/src/Vegasco.Server.Api/Consumptions/GetConsumptions.cs @@ -52,10 +52,9 @@ public static class GetConsumptions CancellationToken cancellationToken) { Dictionary> consumptionsByCar = await dbContext.Consumptions - .OrderByDescending(x => x.DateTime) .Include(x => x.Car) .GroupBy(x => x.CarId) - .ToDictionaryAsync(x => x.Key, x => x.ToList(), cancellationToken); + .ToDictionaryAsync(x => x.Key, x => x.OrderByDescending(x => x.DateTime).ToList(), cancellationToken); List responses = []; @@ -85,7 +84,10 @@ public static class GetConsumptions } } - ApiResponse apiResponse = new() { Consumptions = responses }; + ApiResponse apiResponse = new() + { + Consumptions = responses + }; return TypedResults.Ok(apiResponse); } } \ No newline at end of file