From 130d35c37703935e34948419f2ee900cc1b6b28c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sedat=20=C3=96zt=C3=BCrk?= Date: Sat, 28 Mar 2026 10:04:13 +0300 Subject: [PATCH] Report Template View / Design --- .../CustomReportDesignerController.cs | 5 +++-- .../TemplateReport.Designer.cs | 7 ++++--- .../PredefinedReports/TestReport.Designer.cs | 19 ++++++++++++------- 3 files changed, 19 insertions(+), 12 deletions(-) diff --git a/api/src/Sozsoft.Platform.HttpApi.Host/Controllers/CustomReportDesignerController.cs b/api/src/Sozsoft.Platform.HttpApi.Host/Controllers/CustomReportDesignerController.cs index 5537cb5..4a47159 100644 --- a/api/src/Sozsoft.Platform.HttpApi.Host/Controllers/CustomReportDesignerController.cs +++ b/api/src/Sozsoft.Platform.HttpApi.Host/Controllers/CustomReportDesignerController.cs @@ -4,6 +4,7 @@ using DevExpress.DataAccess.Sql; using DevExpress.XtraReports.Web.ReportDesigner; using DevExpress.XtraReports.Web.ReportDesigner.Services; using Microsoft.AspNetCore.Mvc; +using Sozsoft.Platform.Enums; namespace Sozsoft.Platform.Controllers; @@ -23,9 +24,9 @@ public class CustomReportDesignerController : ReportDesignerController var ds = new SqlDataSource("SqlServer"); SelectQuery query = SelectQueryFluentBuilder - .AddTable("Sas_T_Sector") + .AddTable(TableNameResolver.GetFullTableName(nameof(TableNameEnum.Sector))) .SelectAllColumnsFromTable() - .Build("Sas_T_Sector"); + .Build(TableNameResolver.GetFullTableName(nameof(TableNameEnum.Sector))); ds.Queries.Add(query); ds.RebuildResultSchema(); diff --git a/api/src/Sozsoft.Platform.HttpApi.Host/PredefinedReports/TemplateReport.Designer.cs b/api/src/Sozsoft.Platform.HttpApi.Host/PredefinedReports/TemplateReport.Designer.cs index 4bb588b..8593c03 100644 --- a/api/src/Sozsoft.Platform.HttpApi.Host/PredefinedReports/TemplateReport.Designer.cs +++ b/api/src/Sozsoft.Platform.HttpApi.Host/PredefinedReports/TemplateReport.Designer.cs @@ -1,4 +1,5 @@ using DevExpress.XtraReports.UI; +using Sozsoft.Platform.Enums; namespace Sozsoft.Reports.PredefinedReports { @@ -104,12 +105,12 @@ namespace Sozsoft.Reports.PredefinedReports // this.sqlDataSource1.ConnectionName = "SqlServer"; this.sqlDataSource1.Name = "sqlDataSource1"; - table1.Name = "Sas_T_ReportTemplate"; + table1.Name = TableNameResolver.GetFullTableName(nameof(TableNameEnum.ReportTemplate)); columnExpression1.ColumnName = "HtmlContent"; columnExpression1.Table = table1; column1.Expression = columnExpression1; selectQuery1.Columns.Add(column1); - selectQuery1.Name = "Sas_T_ReportTemplate"; + selectQuery1.Name = TableNameResolver.GetFullTableName(nameof(TableNameEnum.ReportTemplate)); selectQuery1.Tables.Add(table1); this.sqlDataSource1.Queries.AddRange(new DevExpress.DataAccess.Sql.SqlQuery[] { selectQuery1 }); this.sqlDataSource1.ResultSchemaSerializable = resources.GetString("sqlDataSource1.ResultSchemaSerializable"); @@ -176,7 +177,7 @@ namespace Sozsoft.Reports.PredefinedReports this.Detail}); this.ComponentStorage.AddRange(new System.ComponentModel.IComponent[] { this.sqlDataSource1}); - this.DataMember = "Sas_T_ReportTemplate"; + this.DataMember = TableNameResolver.GetFullTableName(nameof(TableNameEnum.ReportTemplate)); this.DataSource = this.sqlDataSource1; this.Font = new DevExpress.Drawing.DXFont("Arial", 9.75F); this.StyleSheet.AddRange(new DevExpress.XtraReports.UI.XRControlStyle[] { diff --git a/api/src/Sozsoft.Platform.HttpApi.Host/PredefinedReports/TestReport.Designer.cs b/api/src/Sozsoft.Platform.HttpApi.Host/PredefinedReports/TestReport.Designer.cs index ff966ec..36448e7 100644 --- a/api/src/Sozsoft.Platform.HttpApi.Host/PredefinedReports/TestReport.Designer.cs +++ b/api/src/Sozsoft.Platform.HttpApi.Host/PredefinedReports/TestReport.Designer.cs @@ -1,4 +1,6 @@ -namespace Sozsoft.Reports.PredefinedReports +using Sozsoft.Platform.Enums; + +namespace Sozsoft.Reports.PredefinedReports { partial class TestReport { @@ -11,8 +13,10 @@ /// Clean up any resources being used. /// /// true if managed resources should be disposed; otherwise, false. - protected override void Dispose(bool disposing) { - if(disposing && (components != null)) { + protected override void Dispose(bool disposing) + { + if (disposing && (components != null)) + { components.Dispose(); } base.Dispose(disposing); @@ -24,7 +28,8 @@ /// Required method for Designer support - do not modify /// the contents of this method with the code editor. /// - private void InitializeComponent() { + private void InitializeComponent() + { this.components = new System.ComponentModel.Container(); DevExpress.DataAccess.Sql.SelectQuery selectQuery1 = new DevExpress.DataAccess.Sql.SelectQuery(); DevExpress.DataAccess.Sql.Column column1 = new DevExpress.DataAccess.Sql.Column(); @@ -145,7 +150,7 @@ this.sqlDataSource1.ConnectionName = "SqlServer"; this.sqlDataSource1.Name = "sqlDataSource1"; columnExpression1.ColumnName = "Id"; - table1.Name = "Sas_T_Sector"; + table1.Name = TableNameResolver.GetFullTableName(nameof(TableNameEnum.Sector)); columnExpression1.Table = table1; column1.Expression = columnExpression1; columnExpression2.ColumnName = "Name"; @@ -153,7 +158,7 @@ column2.Expression = columnExpression2; selectQuery1.Columns.Add(column1); selectQuery1.Columns.Add(column2); - selectQuery1.Name = "Sas_T_Sector"; + selectQuery1.Name = TableNameResolver.GetFullTableName(nameof(TableNameEnum.Sector)); selectQuery1.Tables.Add(table1); this.sqlDataSource1.Queries.AddRange(new DevExpress.DataAccess.Sql.SqlQuery[] { selectQuery1}); @@ -221,7 +226,7 @@ this.Detail}); this.ComponentStorage.AddRange(new System.ComponentModel.IComponent[] { this.sqlDataSource1}); - this.DataMember = "Sas_T_Sector"; + this.DataMember = TableNameResolver.GetFullTableName(nameof(TableNameEnum.Sector)); this.DataSource = this.sqlDataSource1; this.Font = new DevExpress.Drawing.DXFont("Arial", 9.75F); this.StyleSheet.AddRange(new DevExpress.XtraReports.UI.XRControlStyle[] {