From 94a71913654eb57dc46638f7b1a21c0ac3420080 Mon Sep 17 00:00:00 2001 From: giovanni Date: Tue, 14 Apr 2026 15:23:08 +0700 Subject: [PATCH] fix get dashboard --- .../dashboards/repositories/dashboard_stats.repository.go | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/internal/modules/dashboards/repositories/dashboard_stats.repository.go b/internal/modules/dashboards/repositories/dashboard_stats.repository.go index 5cba9acf..c79879fb 100644 --- a/internal/modules/dashboards/repositories/dashboard_stats.repository.go +++ b/internal/modules/dashboards/repositories/dashboard_stats.repository.go @@ -172,7 +172,7 @@ func (r *DashboardRepositoryImpl) GetUniformityWeeklyMetrics(ctx context.Context db = applyDashboardFilters(db, filters) - if err := db.Group("week").Order("week ASC").Scan(&rows).Error; err != nil { + if err := db.Group(weekExpr).Order("1 ASC").Scan(&rows).Error; err != nil { return nil, err } @@ -561,8 +561,8 @@ func (r *DashboardRepositoryImpl) GetComparisonWeeklyUniformityMetrics(ctx conte db = applyDashboardFilters(db, filters) - groupBy := fmt.Sprintf("week, %s", groupExpr) - orderBy := fmt.Sprintf("week ASC, %s", orderExpr) + groupBy := fmt.Sprintf("%s, %s", weekExpr, groupExpr) + orderBy := fmt.Sprintf("1 ASC, %s", orderExpr) if err := db.Group(groupBy).Order(orderBy).Scan(&rows).Error; err != nil { return nil, err }