From 39e4e448d77ec790af4ab4b27a0d28e452808777 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Sedat=20=C3=96zt=C3=BCrk?= <sedat.ozturk@sozsoft.com>
Date: Sun, 21 Jun 2026 23:07:24 +0300
Subject: [PATCH] =?UTF-8?q?GridReport=20Filtre=20ve=20S=C4=B1ralama=20?=
 =?UTF-8?q?=C3=A7=C4=B1kmas=C4=B1n?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../PredefinedReports/DynamicGridReport.cs    | 28 +++++++++++++++++--
 .../StackedSideNavSecondary.tsx               |  2 +-
 2 files changed, 26 insertions(+), 4 deletions(-)

diff --git a/api/src/Sozsoft.Platform.HttpApi.Host/PredefinedReports/DynamicGridReport.cs b/api/src/Sozsoft.Platform.HttpApi.Host/PredefinedReports/DynamicGridReport.cs
index 8739aa8..bcd2171 100644
--- a/api/src/Sozsoft.Platform.HttpApi.Host/PredefinedReports/DynamicGridReport.cs
+++ b/api/src/Sozsoft.Platform.HttpApi.Host/PredefinedReports/DynamicGridReport.cs
@@ -253,7 +253,10 @@ public class DynamicGridReport : XtraReport
 
         var topMargin = new TopMarginBand { HeightF = Margins.Top };
         var bottomMargin = new BottomMarginBand { HeightF = 32 };
-        var reportHeader = new ReportHeaderBand { HeightF = string.IsNullOrWhiteSpace(criteriaText) ? 32 : 50 };
+        var reportHeader = new ReportHeaderBand
+        {
+            HeightF = !isSubReport && !string.IsNullOrWhiteSpace(criteriaText) ? 50 : 32
+        };
         var pageHeader = new PageHeaderBand { HeightF = 28 };
         var detailHeight = fields.Any(x => x.IsImage)
             ? DynamicReportImageHelper.GetGridImageHeight()
@@ -277,7 +280,10 @@ public class DynamicGridReport : XtraReport
         {
             DynamicReportImageHelper.AddGeneratedAtToHeader(reportHeader.Controls, pageWidth);
         }
-        DynamicReportImageHelper.AddReportCriteriaToHeader(reportHeader.Controls, criteriaText, pageWidth);
+        if (!isSubReport)
+        {
+            DynamicReportImageHelper.AddReportCriteriaToHeader(reportHeader.Controls, criteriaText, pageWidth);
+        }
 
         DynamicReportImageHelper.AddFooterTopLine(bottomMargin.Controls, pageWidth);
         DynamicReportImageHelper.AddCurrentUserNameToFooter(bottomMargin.Controls, currentUserName, pageWidth);
@@ -429,7 +435,10 @@ public class DynamicGridReport : XtraReport
         cell.ExpressionBindings.Add(new ExpressionBinding(
             "BeforePrint",
             "Text",
-            DynamicReportImageHelper.CreateFormatValueExpression($"sumSum([{column.BindingName}])", field, column.EditorType)));
+            DynamicReportImageHelper.CreateFormatValueExpression(
+                CreateSummaryExpression(summaryType.Value, column.BindingName),
+                field,
+                column.EditorType)));
         cell.Summary = new XRSummary
         {
             Running = SummaryRunning.Report,
@@ -440,6 +449,19 @@ public class DynamicGridReport : XtraReport
         return cell;
     }
 
+    private static string CreateSummaryExpression(SummaryFunc summaryType, string bindingName)
+    {
+        return summaryType switch
+        {
+            SummaryFunc.Sum => $"sumSum([{bindingName}])",
+            SummaryFunc.Avg => $"sumAvg([{bindingName}])",
+            SummaryFunc.Min => $"sumMin([{bindingName}])",
+            SummaryFunc.Max => $"sumMax([{bindingName}])",
+            SummaryFunc.Count => "sumCount()",
+            _ => $"sumSum([{bindingName}])"
+        };
+    }
+
     private static float[] CalculateWidths(IReadOnlyList<ListFormField> fields, float pageWidth)
     {
         var raw = fields.Select(x => (float)Math.Max(x.Width ?? 90, 60)).ToArray();
diff --git a/ui/src/components/template/StackedSideNav/StackedSideNavSecondary.tsx b/ui/src/components/template/StackedSideNav/StackedSideNavSecondary.tsx
index 1fdc968..85e23ba 100644
--- a/ui/src/components/template/StackedSideNav/StackedSideNavSecondary.tsx
+++ b/ui/src/components/template/StackedSideNav/StackedSideNavSecondary.tsx
@@ -36,7 +36,7 @@ const StackedSideNavSecondary = (props: StackedSideNavSecondaryProps) => {
   }
 
   return (
-    <div className={classNames('h-full', className)} {...rest}>
+    <div className={classNames('h-full mt-2', className)} {...rest}>
       <div
         // className={`${HEADER_HEIGHT_CLASS} flex items-center justify-between gap-4 pl-6 pr-4`}
         className={'flex items-center justify-between gap-4 pl-6 pr-4'}