diff --git a/api/src/Erp.Platform.Application.Contracts/ListForms/Chart/ChartCommonSeriesSettingsDto.cs b/api/src/Erp.Platform.Application.Contracts/ListForms/Chart/ChartCommonSeriesSettingsDto.cs index fe904f77..9e148377 100644 --- a/api/src/Erp.Platform.Application.Contracts/ListForms/Chart/ChartCommonSeriesSettingsDto.cs +++ b/api/src/Erp.Platform.Application.Contracts/ListForms/Chart/ChartCommonSeriesSettingsDto.cs @@ -34,7 +34,7 @@ public class ChartCommonSeriesSettingsDto /// Paint server address /// public string Color { get; set; } - /// Çubukların yuvarlak görünmesini sağlar. Yalnızca çubuk benzeri seriler için geçerlidir. + /// Çubukların yuvarlak görünmesini sağlar. Yalnızca çubuk benzeri seriler için geçerlidir. /// Default Value: 0 /// Bu üye şu seriler tarafından kullanılır: BarSeries, StackedBarSeries, FullStackedBarSeries, RangeBarSeries /// diff --git a/api/src/Erp.Platform.Application.Contracts/ListForms/Chart/ChartPanesDto.cs b/api/src/Erp.Platform.Application.Contracts/ListForms/Chart/ChartPanesDto.cs index 43573182..c3184ecc 100644 --- a/api/src/Erp.Platform.Application.Contracts/ListForms/Chart/ChartPanesDto.cs +++ b/api/src/Erp.Platform.Application.Contracts/ListForms/Chart/ChartPanesDto.cs @@ -7,7 +7,7 @@ public class ChartPanesDto /// Bölmenin arka planının rengini belirtir. /// public string BackgroundColor { get; set; } - /// Çok bölmeli bir grafikte bölmenin yüksekliğini (veya grafik döndürüldüğünde genişliğini) belirtir. + /// Çok bölmeli bir grafikte bölmenin yüksekliğini (veya grafik döndürüldüğünde genişliğini) belirtir. /// public int Height { get; set; } = 250; /// Bölmenin adını belirtir. diff --git a/api/src/Erp.Platform.Application.Contracts/ListForms/Chart/ChartSeriesDto.cs b/api/src/Erp.Platform.Application.Contracts/ListForms/Chart/ChartSeriesDto.cs index fa58829f..42a0a625 100644 --- a/api/src/Erp.Platform.Application.Contracts/ListForms/Chart/ChartSeriesDto.cs +++ b/api/src/Erp.Platform.Application.Contracts/ListForms/Chart/ChartSeriesDto.cs @@ -33,7 +33,7 @@ public class ChartSeriesDto /// Paint server address /// public string Color { get; set; } - /// Çubukların yuvarlak görünmesini sağlar. Yalnızca çubuk benzeri seriler için geçerlidir. + /// Çubukların yuvarlak görünmesini sağlar. Yalnızca çubuk benzeri seriler için geçerlidir. /// Default Value: 0 /// Bu üye şu seriler tarafından kullanılır: BarSeries, StackedBarSeries, FullStackedBarSeries, RangeBarSeries /// diff --git a/api/src/Erp.Platform.DbMigrator/Seeds/ListFormSeeder_Crm.cs b/api/src/Erp.Platform.DbMigrator/Seeds/ListFormSeeder_Crm.cs index 52037d10..6f8d9f59 100644 --- a/api/src/Erp.Platform.DbMigrator/Seeds/ListFormSeeder_Crm.cs +++ b/api/src/Erp.Platform.DbMigrator/Seeds/ListFormSeeder_Crm.cs @@ -52,7 +52,7 @@ public class ListFormSeeder_Crm : IDataSeedContributor, ITransientDependency new ListForm() { ListFormType = ListFormTypeEnum.List, - IsSubForm = true, + IsSubForm = false, ShowNote = true, LayoutJson = DefaultLayoutJson, CultureName = LanguageCodes.En, @@ -173,7 +173,7 @@ public class ListFormSeeder_Crm : IDataSeedContributor, ITransientDependency new ListForm() { ListFormType = ListFormTypeEnum.List, - IsSubForm = true, + IsSubForm = false, ShowNote = true, LayoutJson = DefaultLayoutJson, CultureName = LanguageCodes.En, @@ -387,7 +387,7 @@ public class ListFormSeeder_Crm : IDataSeedContributor, ITransientDependency Hint = "Manage", Text ="Manage", UrlTarget="_blank", - AuthName = AppCodes.Crm.Customer + ".Update", + AuthName = AppCodes.Crm.Customer, Url=$"/admin/form/{utils.GetDefaultFormCodes(ListFormCodes.Lists.Customer)}/@Id" }, }), @@ -988,7 +988,7 @@ public class ListFormSeeder_Crm : IDataSeedContributor, ITransientDependency new ListForm() { ListFormType = ListFormTypeEnum.List, - IsSubForm = true, + IsSubForm = false, ShowNote = true, LayoutJson = DefaultLayoutJson, CultureName = LanguageCodes.En, @@ -1157,7 +1157,7 @@ public class ListFormSeeder_Crm : IDataSeedContributor, ITransientDependency new ListForm() { ListFormType = ListFormTypeEnum.List, - IsSubForm = true, + IsSubForm = false, ShowNote = true, LayoutJson = DefaultLayoutJson, CultureName = LanguageCodes.En, @@ -1220,7 +1220,7 @@ public class ListFormSeeder_Crm : IDataSeedContributor, ITransientDependency Hint = "Manage", Text ="Manage", UrlTarget="_blank", - AuthName = AppCodes.Crm.Opportunity + ".Update", + AuthName = AppCodes.Crm.Opportunity, Url=$"/admin/form/{utils.GetDefaultFormCodes(ListFormCodes.Lists.Opportunity)}/@Id" }, }), diff --git a/api/src/Erp.Platform.DbMigrator/Seeds/ListFormSeeder_Hr.cs b/api/src/Erp.Platform.DbMigrator/Seeds/ListFormSeeder_Hr.cs index e54ba8ac..da8c2614 100644 --- a/api/src/Erp.Platform.DbMigrator/Seeds/ListFormSeeder_Hr.cs +++ b/api/src/Erp.Platform.DbMigrator/Seeds/ListFormSeeder_Hr.cs @@ -53,7 +53,7 @@ public class ListFormSeeder_Hr : IDataSeedContributor, ITransientDependency new ListForm() { ListFormType = ListFormTypeEnum.List, - IsSubForm = true, + IsSubForm = false, ShowNote = true, LayoutJson = DefaultLayoutJson, CultureName = LanguageCodes.En, @@ -151,7 +151,7 @@ public class ListFormSeeder_Hr : IDataSeedContributor, ITransientDependency new ListForm() { ListFormType = ListFormTypeEnum.List, - IsSubForm = true, + IsSubForm = false, ShowNote = true, LayoutJson = DefaultLayoutJson, CultureName = LanguageCodes.En, @@ -448,7 +448,7 @@ public class ListFormSeeder_Hr : IDataSeedContributor, ITransientDependency new ListForm() { ListFormType = ListFormTypeEnum.List, - IsSubForm = true, + IsSubForm = false, ShowNote = true, LayoutJson = DefaultLayoutJson, CultureName = LanguageCodes.En, @@ -666,7 +666,7 @@ public class ListFormSeeder_Hr : IDataSeedContributor, ITransientDependency new ListForm() { ListFormType = ListFormTypeEnum.List, - IsSubForm = true, + IsSubForm = false, ShowNote = true, LayoutJson = DefaultLayoutJson, CultureName = LanguageCodes.En, @@ -972,7 +972,7 @@ public class ListFormSeeder_Hr : IDataSeedContributor, ITransientDependency new ListForm() { ListFormType = ListFormTypeEnum.List, - IsSubForm = true, + IsSubForm = false, ShowNote = true, LayoutJson = DefaultLayoutJson, CultureName = LanguageCodes.En, @@ -1266,7 +1266,7 @@ public class ListFormSeeder_Hr : IDataSeedContributor, ITransientDependency new ListForm() { ListFormType = ListFormTypeEnum.List, - IsSubForm = true, + IsSubForm = false, ShowNote = true, LayoutJson = DefaultLayoutJson, CultureName = LanguageCodes.En, @@ -1983,7 +1983,7 @@ public class ListFormSeeder_Hr : IDataSeedContributor, ITransientDependency new ListForm() { ListFormType = ListFormTypeEnum.List, - IsSubForm = true, + IsSubForm = false, ShowNote = true, LayoutJson = DefaultLayoutJson, CultureName = LanguageCodes.En, @@ -2310,7 +2310,7 @@ public class ListFormSeeder_Hr : IDataSeedContributor, ITransientDependency new ListForm() { ListFormType = ListFormTypeEnum.List, - IsSubForm = true, + IsSubForm = false, ShowNote = true, LayoutJson = DefaultLayoutJson, CultureName = LanguageCodes.En, @@ -2916,7 +2916,7 @@ public class ListFormSeeder_Hr : IDataSeedContributor, ITransientDependency new ListForm() { ListFormType = ListFormTypeEnum.List, - IsSubForm = true, + IsSubForm = false, ShowNote = true, LayoutJson = DefaultLayoutJson, CultureName = LanguageCodes.En, @@ -3278,7 +3278,7 @@ public class ListFormSeeder_Hr : IDataSeedContributor, ITransientDependency new ListForm() { ListFormType = ListFormTypeEnum.List, - IsSubForm = true, + IsSubForm = false, ShowNote = true, LayoutJson = DefaultLayoutJson, CultureName = LanguageCodes.En, @@ -3429,7 +3429,7 @@ public class ListFormSeeder_Hr : IDataSeedContributor, ITransientDependency new ListForm() { ListFormType = ListFormTypeEnum.List, - IsSubForm = true, + IsSubForm = false, ShowNote = true, LayoutJson = DefaultLayoutJson, CultureName = LanguageCodes.En, @@ -3662,7 +3662,7 @@ public class ListFormSeeder_Hr : IDataSeedContributor, ITransientDependency new ListForm() { ListFormType = ListFormTypeEnum.List, - IsSubForm = true, + IsSubForm = false, ShowNote = true, LayoutJson = DefaultLayoutJson, CultureName = LanguageCodes.En, @@ -4047,7 +4047,7 @@ public class ListFormSeeder_Hr : IDataSeedContributor, ITransientDependency Hint = "Manage", Text ="Manage", UrlTarget="_blank", - AuthName = AppCodes.Hr.Survey + ".Update", + AuthName = AppCodes.Hr.Survey, Url=$"/admin/form/{utils.GetDefaultFormCodes(ListFormCodes.Lists.Survey)}/@Id", } }), @@ -4253,7 +4253,7 @@ public class ListFormSeeder_Hr : IDataSeedContributor, ITransientDependency Hint = "Options", Text ="Options", UrlTarget="_blank", - AuthName = AppCodes.Hr.Survey + ".Update", + AuthName = AppCodes.Hr.Survey, Url="/admin/list/list-employees/@Id" }, }), @@ -4427,7 +4427,7 @@ public class ListFormSeeder_Hr : IDataSeedContributor, ITransientDependency Hint = "Answers", Text ="Answers", UrlTarget="_blank", - AuthName = AppCodes.Hr.SurveyResponse + ".Update", + AuthName = AppCodes.Hr.SurveyResponse, Url="/admin/list/list-employees/@Id" }, }), diff --git a/api/src/Erp.Platform.DbMigrator/Seeds/ListFormSeeder_Intranet.cs b/api/src/Erp.Platform.DbMigrator/Seeds/ListFormSeeder_Intranet.cs index 4c0d0504..220f10bf 100644 --- a/api/src/Erp.Platform.DbMigrator/Seeds/ListFormSeeder_Intranet.cs +++ b/api/src/Erp.Platform.DbMigrator/Seeds/ListFormSeeder_Intranet.cs @@ -43,6 +43,8 @@ public class ListFormSeeder_Intranet : IDataSeedContributor, ITransientDependenc public async Task SeedAsync(DataSeedContext context) { + using var utils = new SeederUtils(); + #region EventType if (!await _listFormRepository.AnyAsync(a => a.ListFormCode == ListFormCodes.Lists.EventType)) { @@ -621,12 +623,12 @@ public class ListFormSeeder_Intranet : IDataSeedContributor, ITransientDependenc DisplayExpr = "name", ValueExpr = "key", LookupQuery = JsonSerializer.Serialize(new LookupDataDto[] { - new () { Key="Mercimek Çorbası", Name="Mercimek Çorbası" }, + new () { Key="Mercimek Çorbası", Name="Mercimek Çorbası" }, new () { Key="Tavuk Şinitzel", Name="Tavuk Şinitzel" }, new () { Key="Bulgur Pilavı", Name="Bulgur Pilavı" }, new () { Key="Salata", Name="Salata" }, new () { Key="Meyve", Name="Meyve" }, - new () { Key="Domates Çorbası", Name="Domates Çorbası" }, + new () { Key="Domates Çorbası", Name="Domates Çorbası" }, new () { Key="Etli Kuru Fasulye", Name="Etli Kuru Fasulye" }, new () { Key="Pilav", Name="Pilav" }, new () { Key="Turşu", Name="Turşu" }, @@ -657,7 +659,7 @@ public class ListFormSeeder_Intranet : IDataSeedContributor, ITransientDependenc new ListForm() { ListFormType = ListFormTypeEnum.List, - IsSubForm = true, + IsSubForm = false, ShowNote = true, LayoutJson = DefaultLayoutJson, CultureName = LanguageCodes.En, @@ -906,7 +908,7 @@ public class ListFormSeeder_Intranet : IDataSeedContributor, ITransientDependenc new ListForm() { ListFormType = ListFormTypeEnum.List, - IsSubForm = true, + IsSubForm = false, ShowNote = true, LayoutJson = DefaultLayoutJson, CultureName = LanguageCodes.En, @@ -1132,7 +1134,7 @@ public class ListFormSeeder_Intranet : IDataSeedContributor, ITransientDependenc new ListForm() { ListFormType = ListFormTypeEnum.List, - IsSubForm = true, + IsSubForm = false, ShowNote = true, LayoutJson = DefaultLayoutJson, CultureName = LanguageCodes.En, @@ -1656,7 +1658,7 @@ public class ListFormSeeder_Intranet : IDataSeedContributor, ITransientDependenc new ListForm() { ListFormType = ListFormTypeEnum.List, - IsSubForm = true, + IsSubForm = false, ShowNote = true, LayoutJson = DefaultLayoutJson, CultureName = LanguageCodes.En, @@ -1702,8 +1704,8 @@ public class ListFormSeeder_Intranet : IDataSeedContributor, ITransientDependenc Hint = "Comments", Text ="Comments", UrlTarget="_blank", - AuthName = AppCodes.Hr.SurveyResponse + ".Update", - Url="/admin/list/list-employees/@Id" + AuthName = AppCodes.Intranet.SocialComment, + Url=$"/admin/form/{utils.GetDefaultFormCodes(ListFormCodes.Lists.SocialComment)}/@Id", }, }), FormFieldsDefaultValueJson = JsonSerializer.Serialize(new FieldsDefaultValue[] @@ -1815,6 +1817,109 @@ public class ListFormSeeder_Intranet : IDataSeedContributor, ITransientDependenc #endregion } #endregion + + #region Social Comment + if (!await _listFormRepository.AnyAsync(a => a.ListFormCode == ListFormCodes.Lists.SocialComment)) + { + var listForm = await _listFormRepository.InsertAsync( + new ListForm() + { + ListFormType = ListFormTypeEnum.List, + IsSubForm = false, + ShowNote = true, + LayoutJson = DefaultLayoutJson, + CultureName = LanguageCodes.En, + ListFormCode = ListFormCodes.Lists.SocialComment, + Name = AppCodes.Intranet.SocialComment, + Title = AppCodes.Intranet.SocialComment, + DataSourceCode = SeedConsts.DataSources.DefaultCode, + IsTenant = true, + IsBranch = false, + IsOrganizationUnit = false, + Description = AppCodes.Intranet.SocialComment, + SelectCommandType = SelectCommandTypeEnum.Table, + SelectCommand = TableNameResolver.GetFullTableName(nameof(TableNameEnum.SocialComment)), + KeyFieldName = "Id", + KeyFieldDbSourceType = DbType.Guid, + DefaultFilter = DefaultFilterJson, + SortMode = GridOptions.SortModeSingle, + FilterRowJson = DefaultFilterRowJson, + HeaderFilterJson = DefaultHeaderFilterJson, + SearchPanelJson= DefaultSearchPanelJson, + GroupPanelJson = DefaultGroupPanelJson, + SelectionJson = DefaultSelectionSingleJson, + ColumnOptionJson = DefaultColumnOptionJson, + PermissionJson = DefaultPermissionJson(AppCodes.Intranet.SocialComment), + DeleteCommand = DefaultDeleteCommand(nameof(TableNameEnum.SocialComment)), + DeleteFieldsDefaultValueJson = DefaultDeleteFieldsDefaultValueJson, + PagerOptionJson = DefaultPagerOptionJson, + EditingOptionJson = DefaultEditingOptionJson(AppCodes.Intranet.SocialComment, 500, 250, true, true, true, true, false), + EditingFormJson = JsonSerializer.Serialize(new List() { + new() { Order=1, ColCount=1, ColSpan=1, ItemType="group", Items=[ + new EditingFormItemDto { Order = 1, DataField = "Content", ColSpan = 1, IsRequired = true, EditorType2=EditorTypes.dxTextArea }, + new EditingFormItemDto { Order = 2, DataField = "SocialPostId", ColSpan = 1, IsRequired = true, EditorType2=EditorTypes.dxSelectBox }, + ]} + }), + InsertFieldsDefaultValueJson = DefaultInsertFieldsDefaultValueJson, + } + ); + + #region Social Comment Fields + await _listFormFieldRepository.InsertManyAsync([ + new() { + ListFormCode = listForm.ListFormCode, + CultureName = LanguageCodes.En, + SourceDbType = DbType.Guid, + FieldName = "Id", + Width = 100, + ListOrderNo = 1, + Visible = false, + IsActive = true, + IsDeleted = false, + ValidationRuleJson = DefaultValidationRuleRequiredJson, + ColumnCustomizationJson = DefaultColumnCustomizationJson, + PermissionJson = DefaultFieldPermissionJson(listForm.Name), + PivotSettingsJson = DefaultPivotSettingsJson + }, + new() { + ListFormCode = listForm.ListFormCode, + CultureName = LanguageCodes.En, + SourceDbType = DbType.String, + FieldName = "Content", + Width = 500, + ListOrderNo = 2, + Visible = true, + IsActive = true, + IsDeleted = false, + SortIndex = 1, + SortDirection = GridColumnOptions.SortOrderAsc, + AllowSearch = true, + ValidationRuleJson = DefaultValidationRuleRequiredJson, + ColumnCustomizationJson = DefaultColumnCustomizationJson, + PermissionJson = DefaultFieldPermissionJson(listForm.Name), + PivotSettingsJson = DefaultPivotSettingsJson + }, + new() { + ListFormCode = listForm.ListFormCode, + CultureName = LanguageCodes.En, + SourceDbType = DbType.Guid, + FieldName = "SocialPostId", + Width = 100, + ListOrderNo = 3, + Visible = true, + IsActive = true, + IsDeleted = false, + AllowSearch = true, + LookupJson = LookupQueryValues.DefaultLookupQueryJson(nameof(TableNameEnum.SocialPost), "Id", "Content"), + ValidationRuleJson = DefaultValidationRuleRequiredJson, + ColumnCustomizationJson = DefaultColumnCustomizationJson, + PermissionJson = DefaultFieldPermissionJson(listForm.Name), + PivotSettingsJson = DefaultPivotSettingsJson + } + ]); + #endregion + } + #endregion } } diff --git a/api/src/Erp.Platform.DbMigrator/Seeds/ListFormSeeder_SupplyChain.cs b/api/src/Erp.Platform.DbMigrator/Seeds/ListFormSeeder_SupplyChain.cs index 6d5205f1..e2f8987f 100644 --- a/api/src/Erp.Platform.DbMigrator/Seeds/ListFormSeeder_SupplyChain.cs +++ b/api/src/Erp.Platform.DbMigrator/Seeds/ListFormSeeder_SupplyChain.cs @@ -681,7 +681,7 @@ public class ListFormSeeder_SupplyChain : IDataSeedContributor, ITransientDepend new ListForm() { ListFormType = ListFormTypeEnum.List, - IsSubForm = true, + IsSubForm = false, ShowNote = true, LayoutJson = DefaultLayoutJson, CultureName = LanguageCodes.En, @@ -804,7 +804,7 @@ public class ListFormSeeder_SupplyChain : IDataSeedContributor, ITransientDepend new ListForm() { ListFormType = ListFormTypeEnum.List, - IsSubForm = true, + IsSubForm = false, ShowNote = true, LayoutJson = DefaultLayoutJson, CultureName = LanguageCodes.En, @@ -927,7 +927,7 @@ public class ListFormSeeder_SupplyChain : IDataSeedContributor, ITransientDepend new ListForm() { ListFormType = ListFormTypeEnum.List, - IsSubForm = true, + IsSubForm = false, ShowNote = true, LayoutJson = DefaultLayoutJson, CultureName = LanguageCodes.En, @@ -1143,7 +1143,7 @@ public class ListFormSeeder_SupplyChain : IDataSeedContributor, ITransientDepend Hint = "Manage", Text ="Manage", UrlTarget="_blank", - AuthName = AppCodes.SupplyChain.Supply + ".Update", + AuthName = AppCodes.SupplyChain.Supply, Url=$"/admin/form/{utils.GetDefaultFormCodes(ListFormCodes.Lists.Supply)}/@Id" }, }), @@ -2806,7 +2806,7 @@ public class ListFormSeeder_SupplyChain : IDataSeedContributor, ITransientDepend new ListForm() { ListFormType = ListFormTypeEnum.List, - IsSubForm = true, + IsSubForm = false, ShowNote = true, LayoutJson = DefaultLayoutJson, CultureName = LanguageCodes.En, @@ -2988,7 +2988,7 @@ public class ListFormSeeder_SupplyChain : IDataSeedContributor, ITransientDepend Hint = "Manage", Text ="Manage", UrlTarget="_blank", - AuthName = AppCodes.SupplyChain.Request + ".Update", + AuthName = AppCodes.SupplyChain.Request, Url=$"/admin/form/{utils.GetDefaultFormCodes(ListFormCodes.Lists.Request)}/@Id" }, }), diff --git a/api/src/Erp.Platform.DbMigrator/Seeds/PermissionsData.json b/api/src/Erp.Platform.DbMigrator/Seeds/PermissionsData.json index 701e2401..f7e83720 100644 --- a/api/src/Erp.Platform.DbMigrator/Seeds/PermissionsData.json +++ b/api/src/Erp.Platform.DbMigrator/Seeds/PermissionsData.json @@ -9706,6 +9706,71 @@ "MultiTenancySide": 3, "MenuGroup": "Kurs" }, + + { + "GroupName": "App.Intranet", + "Name": "App.Intranet.SocialComment", + "ParentName": null, + "DisplayName": "App.Intranet.SocialComment", + "IsEnabled": true, + "MultiTenancySide": 3, + "MenuGroup": "Kurs" + }, + { + "GroupName": "App.Intranet", + "Name": "App.Intranet.SocialComment.Create", + "ParentName": "App.Intranet.SocialComment", + "DisplayName": "Create", + "IsEnabled": true, + "MultiTenancySide": 3, + "MenuGroup": "Kurs" + }, + { + "GroupName": "App.Intranet", + "Name": "App.Intranet.SocialComment.Update", + "ParentName": "App.Intranet.SocialComment", + "DisplayName": "Update", + "IsEnabled": true, + "MultiTenancySide": 3, + "MenuGroup": "Kurs" + }, + { + "GroupName": "App.Intranet", + "Name": "App.Intranet.SocialComment.Delete", + "ParentName": "App.Intranet.SocialComment", + "DisplayName": "Delete", + "IsEnabled": true, + "MultiTenancySide": 3, + "MenuGroup": "Kurs" + }, + { + "GroupName": "App.Intranet", + "Name": "App.Intranet.SocialComment.Export", + "ParentName": "App.Intranet.SocialComment", + "DisplayName": "Export", + "IsEnabled": true, + "MultiTenancySide": 3, + "MenuGroup": "Kurs" + }, + { + "GroupName": "App.Intranet", + "Name": "App.Intranet.SocialComment.Import", + "ParentName": "App.Intranet.SocialComment", + "DisplayName": "Import", + "IsEnabled": true, + "MultiTenancySide": 3, + "MenuGroup": "Kurs" + }, + { + "GroupName": "App.Intranet", + "Name": "App.Intranet.SocialComment.Note", + "ParentName": "App.Intranet.SocialComment", + "DisplayName": "Note", + "IsEnabled": true, + "MultiTenancySide": 3, + "MenuGroup": "Kurs" + }, + { "GroupName": "App.Intranet", "Name": "App.Intranet.SocialPost.Widget", @@ -11291,4 +11356,4 @@ "MenuGroup": "Erp" } ] -} \ No newline at end of file +} diff --git a/api/src/Erp.Platform.Domain.Shared/PlatformConsts.cs b/api/src/Erp.Platform.Domain.Shared/PlatformConsts.cs index 2b8bdfbd..cddb3f44 100644 --- a/api/src/Erp.Platform.Domain.Shared/PlatformConsts.cs +++ b/api/src/Erp.Platform.Domain.Shared/PlatformConsts.cs @@ -503,6 +503,7 @@ public static class PlatformConsts public const string SurveyQuestionOption = "list-surveyquestionoption"; public const string SurveyResponse = "list-surveyresponse"; public const string SocialPost = "list-socialpost"; + public const string SocialComment = "list-socialcomment"; //Supply Chain public const string MaterialType = "list-materialtype"; diff --git a/api/src/Erp.Platform.Domain/Data/SeedConsts.cs b/api/src/Erp.Platform.Domain/Data/SeedConsts.cs index cb81b69e..c7fd4c12 100644 --- a/api/src/Erp.Platform.Domain/Data/SeedConsts.cs +++ b/api/src/Erp.Platform.Domain/Data/SeedConsts.cs @@ -463,6 +463,7 @@ public static class SeedConsts public const string Announcement = Default + ".Announcement"; public const string Visitor = Default + ".Visitor"; public const string SocialPost = Default + ".SocialPost"; + public const string SocialComment = Default + ".SocialComment"; } public static class Hr diff --git a/api/src/Erp.Platform.EntityFrameworkCore/Tenants/Seeds/TenantData.json b/api/src/Erp.Platform.EntityFrameworkCore/Tenants/Seeds/TenantData.json index e4bcc108..f80aea13 100644 --- a/api/src/Erp.Platform.EntityFrameworkCore/Tenants/Seeds/TenantData.json +++ b/api/src/Erp.Platform.EntityFrameworkCore/Tenants/Seeds/TenantData.json @@ -975,17 +975,9 @@ "UomCategoryName": "Adet" }, { - "Name": "ADET", + "Name": "Deste", "Type": "SmallerThanReference", - "Ratio": 1.0, - "IsActive": true, - "Rounding": 0.01, - "UomCategoryName": "Adet" - }, - { - "Name": "TAKIM", - "Type": "SmallerThanReference", - "Ratio": 1.0, + "Ratio": 10.0, "IsActive": true, "Rounding": 0.01, "UomCategoryName": "Adet" diff --git a/ui/src/views/list/Grid.tsx b/ui/src/views/list/Grid.tsx index f3cd8987..10148df2 100644 --- a/ui/src/views/list/Grid.tsx +++ b/ui/src/views/list/Grid.tsx @@ -282,7 +282,7 @@ const Grid = (props: GridProps) => { typeof colFormat.defaultValue === 'string' && colFormat.defaultValue === '@AUTONUMBER' ) { - e.data[colFormat.fieldName] = autoNumber + e.data[colFormat.fieldName] = autoNumber() } else { e.data[colFormat.fieldName] = colFormat.defaultValue } @@ -1073,6 +1073,18 @@ const Grid = (props: GridProps) => { } } + // Set defaultValue for @AUTONUMBER fields + if ( + typeof listFormField?.defaultValue === 'string' && + listFormField?.defaultValue === '@AUTONUMBER' && + mode === 'new' + ) { + editorOptions = { + ...editorOptions, + value: autoNumber(), + } + } + const item: SimpleItemWithColData = { canRead: listFormField?.canRead ?? false, canUpdate: listFormField?.canUpdate ?? false,