diff --git a/api/src/Sozsoft.Platform.DbMigrator/Seeds/LanguagesData.json b/api/src/Sozsoft.Platform.DbMigrator/Seeds/LanguagesData.json index 487fc47..1bfc56b 100644 --- a/api/src/Sozsoft.Platform.DbMigrator/Seeds/LanguagesData.json +++ b/api/src/Sozsoft.Platform.DbMigrator/Seeds/LanguagesData.json @@ -4288,7 +4288,25 @@ "resourceName": "Platform", "key": "ListForms.ListFormField.Filter", "en": "Filter", - "tr": "Filtrele" + "tr": "Filtre" + }, + { + "resourceName": "Platform", + "key": "ListForms.ListFormField.Sorting", + "en": "Sorting", + "tr": "Sıralama" + }, + { + "resourceName": "Platform", + "key": "ListForms.ListFormField.Sorting_Ascending", + "en": "Ascending", + "tr": "Artan" + }, + { + "resourceName": "Platform", + "key": "ListForms.ListFormField.Sorting_Descending", + "en": "Descending", + "tr": "Azalan" }, { "resourceName": "Platform", diff --git a/api/src/Sozsoft.Platform.DbMigrator/Seeds/ListFormSeeder_Administration.cs b/api/src/Sozsoft.Platform.DbMigrator/Seeds/ListFormSeeder_Administration.cs index 2479a3d..ce1598e 100644 --- a/api/src/Sozsoft.Platform.DbMigrator/Seeds/ListFormSeeder_Administration.cs +++ b/api/src/Sozsoft.Platform.DbMigrator/Seeds/ListFormSeeder_Administration.cs @@ -1523,7 +1523,7 @@ public class ListFormSeeder_Administration : IDataSeedContributor, ITransientDep } #endregion - #region ReportTemplates + #region Report Templates listFormName = AppCodes.Reports.ReportTemplates; if (!await _listFormRepository.AnyAsync(a => a.ListFormCode == listFormName)) { @@ -1664,7 +1664,7 @@ public class ListFormSeeder_Administration : IDataSeedContributor, ITransientDep new() { ListFormCode = listForm.ListFormCode, CultureName = LanguageCodes.En, - SourceDbType = DbType.Guid, + SourceDbType = DbType.String, FieldName = "CategoryId", CaptionName = "App.Listform.ListformField.CategoryId", Width = 0, diff --git a/api/src/Sozsoft.Platform.HttpApi.Host/PredefinedReports/DynamicReportImageHelper.cs b/api/src/Sozsoft.Platform.HttpApi.Host/PredefinedReports/DynamicReportImageHelper.cs index 8e30b36..df0f563 100644 --- a/api/src/Sozsoft.Platform.HttpApi.Host/PredefinedReports/DynamicReportImageHelper.cs +++ b/api/src/Sozsoft.Platform.HttpApi.Host/PredefinedReports/DynamicReportImageHelper.cs @@ -345,16 +345,16 @@ internal static class DynamicReportImageHelper var parts = new List(); var fieldCaptions = CreateFieldCaptionMap(fields, localizer); var filterText = FormatFilterText(filter, fieldCaptions); - var sortText = FormatSortText(sort, fieldCaptions); + var sortText = FormatSortText(sort, fieldCaptions, localizer); if (!string.IsNullOrWhiteSpace(filterText)) { - parts.Add("Filtre: " + filterText); + parts.Add(localizer["ListForms.ListFormField.Filter"] + ": " + filterText); } if (!string.IsNullOrWhiteSpace(sortText)) { - parts.Add("Sıralama: " + sortText); + parts.Add(localizer["ListForms.ListFormField.Sorting"] + ": " + sortText); } return string.Join(" | ", parts); @@ -736,7 +736,7 @@ internal static class DynamicReportImageHelper StringComparer.OrdinalIgnoreCase); } - private static string FormatSortText(string sort, IReadOnlyDictionary fieldCaptions) + private static string FormatSortText(string sort, IReadOnlyDictionary fieldCaptions, IStringLocalizer localizer) { if (string.IsNullOrWhiteSpace(sort)) { @@ -756,8 +756,8 @@ internal static class DynamicReportImageHelper var fieldName = parts[0].Trim('"'); var direction = parts.Length > 1 ? parts[1] : "asc"; var directionText = string.Equals(direction, "desc", StringComparison.OrdinalIgnoreCase) - ? "azalan" - : "artan"; + ? localizer["ListForms.ListFormField.Sorting_Descending"] + : localizer["ListForms.ListFormField.Sorting_Ascending"]; return $"{GetFieldCaption(fieldName, fieldCaptions)} {directionText}"; }) diff --git a/api/src/Sozsoft.Platform.HttpApi.Host/ReportServices/CustomReportStorageWebExtension.cs b/api/src/Sozsoft.Platform.HttpApi.Host/ReportServices/CustomReportStorageWebExtension.cs index e993f7d..6817621 100644 --- a/api/src/Sozsoft.Platform.HttpApi.Host/ReportServices/CustomReportStorageWebExtension.cs +++ b/api/src/Sozsoft.Platform.HttpApi.Host/ReportServices/CustomReportStorageWebExtension.cs @@ -254,7 +254,7 @@ public class CustomReportStorageWebExtension : DevExpress.XtraReports.Web.Extens using var scope = _serviceProvider.CreateScope(); var currentUser = scope.ServiceProvider.GetService(); - userNameLabel.Text = currentUser?.Name ?? currentUser?.UserName ?? string.Empty; + userNameLabel.Text = currentUser?.UserName ?? string.Empty; userNameLabel.BoundsF = new System.Drawing.RectangleF(0, 8, pageWidth / 2, 18); userNameLabel.Font = new DevExpress.Drawing.DXFont("Arial", 7.5F); userNameLabel.TextAlignment = TextAlignment.MiddleLeft;