diff --git a/api/src/Erp.Platform.Application.Contracts/FileManagement/FileManagementDtos.cs b/api/src/Erp.Platform.Application.Contracts/FileManagement/FileManagementDtos.cs index 4eb321b9..2d65d1ed 100644 --- a/api/src/Erp.Platform.Application.Contracts/FileManagement/FileManagementDtos.cs +++ b/api/src/Erp.Platform.Application.Contracts/FileManagement/FileManagementDtos.cs @@ -34,7 +34,7 @@ public class UploadFileDto public string? ParentId { get; set; } - // ActivityModal pattern - Files array + // NoteModal pattern - Files array public IRemoteStreamContent[]? Files { get; set; } } diff --git a/api/src/Erp.Platform.Application.Contracts/ListForms/Dto/PermissionCrudDto.cs b/api/src/Erp.Platform.Application.Contracts/ListForms/Dto/PermissionCrudDto.cs index a5d1de5d..413a13c7 100644 --- a/api/src/Erp.Platform.Application.Contracts/ListForms/Dto/PermissionCrudDto.cs +++ b/api/src/Erp.Platform.Application.Contracts/ListForms/Dto/PermissionCrudDto.cs @@ -8,6 +8,6 @@ public class PermissionCrudDto public string D { get; set; } //Delete public string E { get; set; } //Export public string I { get; set; } //Import - public string A { get; set; } //Activity + public string N { get; set; } //Note } diff --git a/api/src/Erp.Platform.Application.Contracts/ListForms/GridOptionsDto/GridOptionsDto.cs b/api/src/Erp.Platform.Application.Contracts/ListForms/GridOptionsDto/GridOptionsDto.cs index fafc211e..b9aa694e 100644 --- a/api/src/Erp.Platform.Application.Contracts/ListForms/GridOptionsDto/GridOptionsDto.cs +++ b/api/src/Erp.Platform.Application.Contracts/ListForms/GridOptionsDto/GridOptionsDto.cs @@ -320,8 +320,8 @@ public class GridOptionsDto : AuditedEntityDto public string ListFormType { get; set; } = ListFormTypeEnum.List; public bool IsSubForm { get; set; } = false; - /// Bu listform show activity gösterilsin mi? - public bool ShowActivity { get; set; } = true; + /// Bu listform show note gösterilsin mi? + public bool ShowNote { get; set; } = true; [JsonIgnore] public string SubFormsJson { get; set; } // Cagrilacak ListFormlar diff --git a/api/src/Erp.Platform.Application.Contracts/Activity/ActivityDto.cs b/api/src/Erp.Platform.Application.Contracts/Note/NoteDto.cs similarity index 90% rename from api/src/Erp.Platform.Application.Contracts/Activity/ActivityDto.cs rename to api/src/Erp.Platform.Application.Contracts/Note/NoteDto.cs index 7ba9cd45..6b6b6832 100644 --- a/api/src/Erp.Platform.Application.Contracts/Activity/ActivityDto.cs +++ b/api/src/Erp.Platform.Application.Contracts/Note/NoteDto.cs @@ -4,7 +4,7 @@ using Volo.Abp.Content; namespace Erp.Platform.Entities; -public class ActivityDto : FullAuditedEntityDto +public class NoteDto : FullAuditedEntityDto { public Guid? TenantId { get; set; } public string EntityName { get; set; } diff --git a/api/src/Erp.Platform.Application.Contracts/Activity/ActivityFileDto.cs b/api/src/Erp.Platform.Application.Contracts/Note/NoteFileDto.cs similarity index 83% rename from api/src/Erp.Platform.Application.Contracts/Activity/ActivityFileDto.cs rename to api/src/Erp.Platform.Application.Contracts/Note/NoteFileDto.cs index 15ba01b8..0aaa687c 100644 --- a/api/src/Erp.Platform.Application.Contracts/Activity/ActivityFileDto.cs +++ b/api/src/Erp.Platform.Application.Contracts/Note/NoteFileDto.cs @@ -1,6 +1,6 @@ -namespace Erp.Platform.Activities; +namespace Erp.Platform.Notes; -public class ActivityFileDto +public class NoteFileDto { public string FileName { get; set; } // Dosya adı public string FileType { get; set; } // MIME tipi diff --git a/api/src/Erp.Platform.Application.Contracts/Activity/ActivityListRequestDto.cs b/api/src/Erp.Platform.Application.Contracts/Note/NoteListRequestDto.cs similarity index 66% rename from api/src/Erp.Platform.Application.Contracts/Activity/ActivityListRequestDto.cs rename to api/src/Erp.Platform.Application.Contracts/Note/NoteListRequestDto.cs index 7d9ad135..216d3193 100644 --- a/api/src/Erp.Platform.Application.Contracts/Activity/ActivityListRequestDto.cs +++ b/api/src/Erp.Platform.Application.Contracts/Note/NoteListRequestDto.cs @@ -1,6 +1,6 @@ using Volo.Abp.Application.Dtos; -public class ActivityListRequestDto : PagedAndSortedResultRequestDto +public class NoteListRequestDto : PagedAndSortedResultRequestDto { public string EntityName { get; set; } public string EntityId { get; set; } diff --git a/api/src/Erp.Platform.Application/FileManagement/FileManagementAppService.cs b/api/src/Erp.Platform.Application/FileManagement/FileManagementAppService.cs index 0518a5e1..fe370164 100644 --- a/api/src/Erp.Platform.Application/FileManagement/FileManagementAppService.cs +++ b/api/src/Erp.Platform.Application/FileManagement/FileManagementAppService.cs @@ -32,7 +32,7 @@ public class FileManagementAppService : ApplicationService, IFileManagementAppSe { BlobContainerNames.Avatar, BlobContainerNames.Import, - BlobContainerNames.Activity, + BlobContainerNames.Note, BlobContainerNames.Intranet }; diff --git a/api/src/Erp.Platform.Application/Forum/ForumAppService.cs b/api/src/Erp.Platform.Application/Forum/ForumAppService.cs index 47d9bc74..f82000e0 100644 --- a/api/src/Erp.Platform.Application/Forum/ForumAppService.cs +++ b/api/src/Erp.Platform.Application/Forum/ForumAppService.cs @@ -611,7 +611,7 @@ public class ForumAppService : PlatformAppService, IForumAppService TotalTopics = totalTopics, TotalPosts = totalPosts, TotalUsers = totalUsers, - ActiveUsers = totalUsers // This could be calculated based on recent activity + ActiveUsers = totalUsers }; } } diff --git a/api/src/Erp.Platform.Application/ListForms/Administration/ListFormsAppService.cs b/api/src/Erp.Platform.Application/ListForms/Administration/ListFormsAppService.cs index d645dfe9..fb10c5ff 100644 --- a/api/src/Erp.Platform.Application/ListForms/Administration/ListFormsAppService.cs +++ b/api/src/Erp.Platform.Application/ListForms/Administration/ListFormsAppService.cs @@ -65,7 +65,7 @@ public class ListFormsAppService : CrudAppService< item.FullHeight = input.FullHeight; item.Description = input.Description; item.IsSubForm = input.IsSubForm; - item.ShowActivity = input.ShowActivity; + item.ShowNote = input.ShowNote; item.ListFormType = input.ListFormType; item.LayoutJson = JsonSerializer.Serialize(input.LayoutDto); diff --git a/api/src/Erp.Platform.Application/Activity/ActivityAppService.cs b/api/src/Erp.Platform.Application/Note/NoteAppService.cs similarity index 80% rename from api/src/Erp.Platform.Application/Activity/ActivityAppService.cs rename to api/src/Erp.Platform.Application/Note/NoteAppService.cs index 6cee2938..2d515d17 100644 --- a/api/src/Erp.Platform.Application/Activity/ActivityAppService.cs +++ b/api/src/Erp.Platform.Application/Note/NoteAppService.cs @@ -16,20 +16,20 @@ using Volo.Abp.Application.Services; using Volo.Abp.Domain.Repositories; using Volo.Abp.Identity; -namespace Erp.Platform.Activities; +namespace Erp.Platform.Notes; [Authorize] -public class ActivityAppService : CrudAppService< - Activity, - ActivityDto, +public class NoteAppService : CrudAppService< + Note, + NoteDto, Guid, - ActivityListRequestDto> + NoteListRequestDto> { private readonly IRepository _repositoryUser; private readonly BlobManager _blobContainer; - public ActivityAppService( - IRepository repo, + public NoteAppService( + IRepository repo, IRepository repositoryUser, BlobManager blobContainer ) : base(repo) @@ -48,18 +48,18 @@ public class ActivityAppService : CrudAppService< // } } - public async Task GetDownloadAsync(string savedFileName) + public async Task GetDownloadAsync(string savedFileName) { if (string.IsNullOrWhiteSpace(savedFileName)) throw new UserFriendlyException("Dosya adı geçersiz"); - var stream = await _blobContainer.GetAsync(BlobContainerNames.Activity, savedFileName); + var stream = await _blobContainer.GetAsync(BlobContainerNames.Note, savedFileName); if (stream == null) throw new UserFriendlyException("Dosya bulunamadı"); var activities = await Repository.GetListAsync(); var fileDto = activities - .SelectMany(a => JsonSerializer.Deserialize>(a.FilesJson ?? "[]")) + .SelectMany(a => JsonSerializer.Deserialize>(a.FilesJson ?? "[]")) .FirstOrDefault(f => f.SavedFileName == savedFileName); using var ms = new MemoryStream(); @@ -67,7 +67,7 @@ public class ActivityAppService : CrudAppService< var bytes = ms.ToArray(); // Base64 olarak encode ediyoruz - return new ActivityFileDto + return new NoteFileDto { FileName = fileDto?.FileName ?? savedFileName, FileType = fileDto?.FileType ?? "application/octet-stream", @@ -75,7 +75,7 @@ public class ActivityAppService : CrudAppService< }; } - public override async Task> GetListAsync(ActivityListRequestDto input) + public override async Task> GetListAsync(NoteListRequestDto input) { // 1️⃣ Filtreleme var query = await Repository.GetQueryableAsync(); @@ -107,21 +107,21 @@ public class ActivityAppService : CrudAppService< .ToListAsync(); // 5️⃣ DTO map ve kullanıcı adı ekleme - var activityDtos = activities.Select(a => + var noteDtos = activities.Select(a => { - var dto = ObjectMapper.Map(a); + var dto = ObjectMapper.Map(a); dto.CreateUserName = users.FirstOrDefault(u => u.Id == a.CreatorId)?.UserName ?? "Unknown"; return dto; }).ToList(); // 6️⃣ Sonuç dön - return new PagedResultDto(totalCount, activityDtos); + return new PagedResultDto(totalCount, noteDtos); } - public override async Task CreateAsync([FromForm] ActivityDto input) + public override async Task CreateAsync([FromForm] NoteDto input) { - var fileDtos = new List(); + var fileDtos = new List(); if (input.Files != null && input.Files.Length > 0) { @@ -131,14 +131,14 @@ public class ActivityAppService : CrudAppService< var savedFileName = $"{Guid.NewGuid()}_{file.FileName}"; await _blobContainer.SaveAsync( - BlobContainerNames.Activity, + BlobContainerNames.Note, savedFileName, stream, true ); // Dosya bilgisini DTO olarak ekle - fileDtos.Add(new ActivityFileDto + fileDtos.Add(new NoteFileDto { FileName = file.FileName, FileType = file.ContentType, @@ -160,21 +160,21 @@ public class ActivityAppService : CrudAppService< public override async Task DeleteAsync(Guid id) { // Önce entity'i alıyoruz - var activity = await Repository.GetAsync(id); + var note = await Repository.GetAsync(id); - // if (!string.IsNullOrEmpty(activity.FilesJson)) + // if (!string.IsNullOrEmpty(note.FilesJson)) // { // try // { // // FilesJson içindeki dosya bilgilerini deserialize ediyoruz - // var files = JsonSerializer.Deserialize>(activity.FilesJson); + // var files = JsonSerializer.Deserialize>(note.FilesJson); // if (files != null) // { // foreach (var file in files) // { // // Blob storage'dan sil - // await _activityBlobContainer.DeleteAsync(file.SavedFileName, cancellationToken: default); + // await _noteBlobContainer.DeleteAsync(file.SavedFileName, cancellationToken: default); // } // } // } diff --git a/api/src/Erp.Platform.Application/Activity/ActivityAutoMapperProfile.cs b/api/src/Erp.Platform.Application/Note/NoteAutoMapperProfile.cs similarity index 76% rename from api/src/Erp.Platform.Application/Activity/ActivityAutoMapperProfile.cs rename to api/src/Erp.Platform.Application/Note/NoteAutoMapperProfile.cs index 6d8e4587..c5edd01f 100644 --- a/api/src/Erp.Platform.Application/Activity/ActivityAutoMapperProfile.cs +++ b/api/src/Erp.Platform.Application/Note/NoteAutoMapperProfile.cs @@ -1,19 +1,19 @@ using AutoMapper; using Erp.Platform.Entities; -namespace Erp.Platform.Activities; +namespace Erp.Platform.Notes; -public class ActivityAutoMapperProfile : Profile +public class NoteAutoMapperProfile : Profile { - public ActivityAutoMapperProfile() + public NoteAutoMapperProfile() { - // Map from Activity to ActivityDto - CreateMap() + // Map from Note to NoteDto + CreateMap() .ForMember(dest => dest.FilesJson, opt => opt.MapFrom(src => src.FilesJson)) .ForMember(dest => dest.Files, opt => opt.Ignore()); // Ignore Files property as we handle it manually - // Mapping from ActivityDto to Activity - CreateMap() + // Mapping from NoteDto to Note + CreateMap() .ForMember(dest => dest.TenantId, opt => opt.MapFrom(src => src.TenantId)) .ForMember(dest => dest.EntityName, opt => opt.MapFrom(src => src.EntityName)) .ForMember(dest => dest.EntityId, opt => opt.MapFrom(src => src.EntityId)) diff --git a/api/src/Erp.Platform.DbMigrator/Seeds/LanguagesData.json b/api/src/Erp.Platform.DbMigrator/Seeds/LanguagesData.json index 0795f078..5ff4cd54 100644 --- a/api/src/Erp.Platform.DbMigrator/Seeds/LanguagesData.json +++ b/api/src/Erp.Platform.DbMigrator/Seeds/LanguagesData.json @@ -3765,9 +3765,9 @@ }, { "resourceName": "Platform", - "key": "ListForms.ListFormEdit.ShowActivity", - "en": "Show Activity", - "tr": "Etkinliği Göster" + "key": "ListForms.ListFormEdit.ShowNote", + "en": "Show Note", + "tr": "Notu Göster" }, { "resourceName": "Platform", @@ -4095,9 +4095,9 @@ }, { "resourceName": "Platform", - "key": "ListForms.ListFormEdit.PermissionsActivity", - "en": "Activity", - "tr": "Etkinlik" + "key": "ListForms.ListFormEdit.PermissionsNote", + "en": "Note", + "tr": "Not" }, { "resourceName": "Platform", @@ -9525,9 +9525,9 @@ }, { "resourceName": "Platform", - "key": "App.Crm.OpportunityAction", - "tr": "Eylemler", - "en": "Actions" + "key": "App.Crm.OpportunityActivity", + "tr": "Aktiviteler", + "en": "Activities" }, { "resourceName": "Platform", diff --git a/api/src/Erp.Platform.DbMigrator/Seeds/ListFormSeeder_Accounting.cs b/api/src/Erp.Platform.DbMigrator/Seeds/ListFormSeeder_Accounting.cs index 5375bf91..305efb74 100644 --- a/api/src/Erp.Platform.DbMigrator/Seeds/ListFormSeeder_Accounting.cs +++ b/api/src/Erp.Platform.DbMigrator/Seeds/ListFormSeeder_Accounting.cs @@ -53,6 +53,7 @@ public class ListFormSeeder_Accounting : IDataSeedContributor, ITransientDepende { ListFormType = ListFormTypeEnum.List, IsSubForm = false, + ShowNote = true, LayoutJson = DefaultLayoutJson, CultureName = LanguageCodes.En, ListFormCode = ListFormCodes.Lists.Bank, @@ -376,6 +377,7 @@ public class ListFormSeeder_Accounting : IDataSeedContributor, ITransientDepende { ListFormType = ListFormTypeEnum.List, IsSubForm = false, + ShowNote = true, LayoutJson = DefaultLayoutJson, CultureName = LanguageCodes.En, ListFormCode = ListFormCodes.Lists.BankAccount, diff --git a/api/src/Erp.Platform.DbMigrator/Seeds/ListFormSeeder_Administration.cs b/api/src/Erp.Platform.DbMigrator/Seeds/ListFormSeeder_Administration.cs index a69671b9..e9a13e53 100644 --- a/api/src/Erp.Platform.DbMigrator/Seeds/ListFormSeeder_Administration.cs +++ b/api/src/Erp.Platform.DbMigrator/Seeds/ListFormSeeder_Administration.cs @@ -56,6 +56,7 @@ public class ListFormSeeder_Administration : IDataSeedContributor, ITransientDep { ListFormType = ListFormTypeEnum.List, IsSubForm = false, + ShowNote = true, LayoutJson = DefaultLayoutJson, CultureName = LanguageCodes.En, ListFormCode = ListFormCodes.Lists.PermissionGroup, @@ -77,7 +78,7 @@ public class ListFormSeeder_Administration : IDataSeedContributor, ITransientDep GroupPanelJson = DefaultGroupPanelJson, SelectionJson = DefaultSelectionSingleJson, ColumnOptionJson = DefaultColumnOptionJson, - PermissionJson = DefaultPermissionJson(AbpIdentity.PermissionGroups.Create, AbpIdentity.PermissionGroups.Default, AbpIdentity.PermissionGroups.Update, AbpIdentity.PermissionGroups.Delete, AbpIdentity.PermissionGroups.Export, AbpIdentity.PermissionGroups.Import, AbpIdentity.PermissionGroups.Activity), + PermissionJson = DefaultPermissionJson(AbpIdentity.PermissionGroups.Create, AbpIdentity.PermissionGroups.Default, AbpIdentity.PermissionGroups.Update, AbpIdentity.PermissionGroups.Delete, AbpIdentity.PermissionGroups.Export, AbpIdentity.PermissionGroups.Import, AbpIdentity.PermissionGroups.Note), PagerOptionJson = DefaultPagerOptionJson, EditingOptionJson = DefaultEditingOptionJson(AbpIdentity.PermissionGroups.Default, 800, 350, true, true, true, true, false), EditingFormJson = JsonSerializer.Serialize(new List() @@ -171,6 +172,7 @@ public class ListFormSeeder_Administration : IDataSeedContributor, ITransientDep { ListFormType = ListFormTypeEnum.List, IsSubForm = false, + ShowNote = true, LayoutJson = DefaultLayoutJson, CultureName = LanguageCodes.En, ListFormCode = ListFormCodes.Lists.Permission, @@ -191,7 +193,7 @@ public class ListFormSeeder_Administration : IDataSeedContributor, ITransientDep SearchPanelJson= DefaultSearchPanelJson, GroupPanelJson = DefaultGroupPanelJson, ColumnOptionJson = DefaultColumnOptionJson, - PermissionJson = DefaultPermissionJson(AbpIdentity.Permissions.Create, AbpIdentity.Permissions.Default, AbpIdentity.Permissions.Update, AbpIdentity.Permissions.Delete, AbpIdentity.Permissions.Export, AbpIdentity.Permissions.Import, AbpIdentity.Permissions.Activity), + PermissionJson = DefaultPermissionJson(AbpIdentity.Permissions.Create, AbpIdentity.Permissions.Default, AbpIdentity.Permissions.Update, AbpIdentity.Permissions.Delete, AbpIdentity.Permissions.Export, AbpIdentity.Permissions.Import, AbpIdentity.Permissions.Note), PagerOptionJson = DefaultPagerOptionJson, EditingOptionJson = DefaultEditingOptionJson(AbpIdentity.Permissions.Default, 600, 350, true, true, true, true, false), EditingFormJson = JsonSerializer.Serialize(new List() @@ -390,6 +392,7 @@ public class ListFormSeeder_Administration : IDataSeedContributor, ITransientDep { ListFormType = ListFormTypeEnum.List, IsSubForm = false, + ShowNote = true, LayoutJson = DefaultLayoutJson, CultureName = LanguageCodes.En, ListFormCode = ListFormCodes.Lists.ClaimType, @@ -595,6 +598,7 @@ public class ListFormSeeder_Administration : IDataSeedContributor, ITransientDep { ListFormType = ListFormTypeEnum.List, IsSubForm = false, + ShowNote = true, LayoutJson = DefaultLayoutJson, CultureName = LanguageCodes.En, ListFormCode = ListFormCodes.Lists.Role, @@ -616,7 +620,7 @@ public class ListFormSeeder_Administration : IDataSeedContributor, ITransientDep GroupPanelJson = DefaultGroupPanelJson, SelectionJson = DefaultSelectionSingleJson, ColumnOptionJson = DefaultColumnOptionJson, - PermissionJson = DefaultPermissionJson(PlatformConsts.IdentityPermissions.Roles.Create, PlatformConsts.IdentityPermissions.Roles.Default, PlatformConsts.IdentityPermissions.Roles.Update, PlatformConsts.IdentityPermissions.Roles.Delete, PlatformConsts.IdentityPermissions.Roles.Export, PlatformConsts.IdentityPermissions.Roles.Import, PlatformConsts.IdentityPermissions.Roles.Activity), + PermissionJson = DefaultPermissionJson(PlatformConsts.IdentityPermissions.Roles.Create, PlatformConsts.IdentityPermissions.Roles.Default, PlatformConsts.IdentityPermissions.Roles.Update, PlatformConsts.IdentityPermissions.Roles.Delete, PlatformConsts.IdentityPermissions.Roles.Export, PlatformConsts.IdentityPermissions.Roles.Import, PlatformConsts.IdentityPermissions.Roles.Note), EditingOptionJson = DefaultEditingOptionJson(PlatformConsts.IdentityPermissions.Roles.Default, 500, 300, true, true, true, true, false), EditingFormJson = JsonSerializer.Serialize(new List() { new() { Order=1, ColCount=1, ColSpan=1, ItemType="group", Items=[ @@ -725,6 +729,7 @@ public class ListFormSeeder_Administration : IDataSeedContributor, ITransientDep { ListFormType = ListFormTypeEnum.List, IsSubForm = false, + ShowNote = true, LayoutJson = DefaultLayoutJson, CultureName = LanguageCodes.En, ListFormCode = ListFormCodes.Lists.User, @@ -747,7 +752,7 @@ public class ListFormSeeder_Administration : IDataSeedContributor, ITransientDep GroupPanelJson = DefaultGroupPanelJson, SelectionJson = DefaultSelectionSingleJson, ColumnOptionJson = DefaultColumnOptionJson, - PermissionJson = DefaultPermissionJson(PlatformConsts.IdentityPermissions.Users.Create, PlatformConsts.IdentityPermissions.Users.Default, PlatformConsts.IdentityPermissions.Users.Update, PlatformConsts.IdentityPermissions.Users.Delete, PlatformConsts.IdentityPermissions.Users.Export, PlatformConsts.IdentityPermissions.Users.Import, PlatformConsts.IdentityPermissions.Users.Activity), + PermissionJson = DefaultPermissionJson(PlatformConsts.IdentityPermissions.Users.Create, PlatformConsts.IdentityPermissions.Users.Default, PlatformConsts.IdentityPermissions.Users.Update, PlatformConsts.IdentityPermissions.Users.Delete, PlatformConsts.IdentityPermissions.Users.Export, PlatformConsts.IdentityPermissions.Users.Import, PlatformConsts.IdentityPermissions.Users.Note), DeleteCommand = $"UPDATE \"AbpUsers\" SET \"DeleterId\"=@DeleterId, \"DeletionTime\"=CURRENT_TIMESTAMP, \"IsDeleted\"='true' WHERE \"Id\"=@Id", DeleteFieldsDefaultValueJson = DefaultDeleteFieldsDefaultValueJson, EditingOptionJson = DefaultEditingOptionJson(PlatformConsts.IdentityPermissions.Users.Default, 500, 400, true, true, true, true, false), @@ -930,6 +935,7 @@ public class ListFormSeeder_Administration : IDataSeedContributor, ITransientDep { ListFormType = ListFormTypeEnum.List, IsSubForm = false, + ShowNote = true, LayoutJson = DefaultLayoutJson, CultureName = LanguageCodes.En, ListFormCode = ListFormCodes.Lists.IpRestriction, @@ -1066,6 +1072,7 @@ public class ListFormSeeder_Administration : IDataSeedContributor, ITransientDep { ListFormType = ListFormTypeEnum.List, IsSubForm = false, + ShowNote = true, LayoutJson = DefaultLayoutJson, CultureName = LanguageCodes.En, ListFormCode = ListFormCodes.Lists.AuditLog, @@ -1253,6 +1260,7 @@ public class ListFormSeeder_Administration : IDataSeedContributor, ITransientDep { ListFormType = ListFormTypeEnum.List, IsSubForm = false, + ShowNote = true, LayoutJson = DefaultLayoutJson, CultureName = LanguageCodes.En, ListFormCode = ListFormCodes.Lists.CustomEndpoint, @@ -1468,6 +1476,7 @@ public class ListFormSeeder_Administration : IDataSeedContributor, ITransientDep { ListFormType = ListFormTypeEnum.List, IsSubForm = false, + ShowNote = true, LayoutJson = DefaultLayoutJson, CultureName = LanguageCodes.En, ListFormCode = ListFormCodes.Lists.ReportCategory, @@ -1584,6 +1593,7 @@ public class ListFormSeeder_Administration : IDataSeedContributor, ITransientDep { ListFormType = ListFormTypeEnum.List, IsSubForm = false, + ShowNote = true, LayoutJson = DefaultLayoutJson, CultureName = LanguageCodes.En, ListFormCode = ListFormCodes.Lists.About, @@ -1702,6 +1712,7 @@ public class ListFormSeeder_Administration : IDataSeedContributor, ITransientDep { ListFormType = ListFormTypeEnum.List, IsSubForm = false, + ShowNote = true, LayoutJson = DefaultLayoutJson, CultureName = LanguageCodes.En, ListFormCode = ListFormCodes.Lists.Service, @@ -1875,6 +1886,7 @@ public class ListFormSeeder_Administration : IDataSeedContributor, ITransientDep { ListFormType = ListFormTypeEnum.List, IsSubForm = false, + ShowNote = true, LayoutJson = DefaultLayoutJson, CultureName = LanguageCodes.En, ListFormCode = ListFormCodes.Lists.Product, @@ -2090,6 +2102,7 @@ public class ListFormSeeder_Administration : IDataSeedContributor, ITransientDep { ListFormType = ListFormTypeEnum.List, IsSubForm = false, + ShowNote = true, LayoutJson = DefaultLayoutJson, CultureName = LanguageCodes.En, ListFormCode = ListFormCodes.Lists.PaymentMethod, @@ -2212,6 +2225,7 @@ public class ListFormSeeder_Administration : IDataSeedContributor, ITransientDep { ListFormType = ListFormTypeEnum.List, IsSubForm = false, + ShowNote = true, LayoutJson = DefaultLayoutJson, CultureName = LanguageCodes.En, ListFormCode = ListFormCodes.Lists.InstallmentOption, @@ -2334,6 +2348,7 @@ public class ListFormSeeder_Administration : IDataSeedContributor, ITransientDep { ListFormType = ListFormTypeEnum.List, IsSubForm = false, + ShowNote = true, LayoutJson = DefaultLayoutJson, CultureName = LanguageCodes.En, ListFormCode = ListFormCodes.Lists.PurchaseOrder, @@ -2772,6 +2787,7 @@ public class ListFormSeeder_Administration : IDataSeedContributor, ITransientDep { ListFormType = ListFormTypeEnum.List, IsSubForm = false, + ShowNote = true, LayoutJson = DefaultLayoutJson, CultureName = LanguageCodes.En, ListFormCode = ListFormCodes.Lists.BlogCategory, @@ -2955,6 +2971,7 @@ public class ListFormSeeder_Administration : IDataSeedContributor, ITransientDep { ListFormType = ListFormTypeEnum.List, IsSubForm = false, + ShowNote = true, LayoutJson = DefaultLayoutJson, CultureName = LanguageCodes.En, ListFormCode = ListFormCodes.Lists.BlogPost, @@ -3277,6 +3294,7 @@ public class ListFormSeeder_Administration : IDataSeedContributor, ITransientDep { ListFormType = ListFormTypeEnum.List, IsSubForm = false, + ShowNote = true, LayoutJson = DefaultLayoutJson, CultureName = LanguageCodes.En, ListFormCode = ListFormCodes.Lists.Demo, @@ -3487,6 +3505,7 @@ public class ListFormSeeder_Administration : IDataSeedContributor, ITransientDep { ListFormType = ListFormTypeEnum.List, IsSubForm = false, + ShowNote = true, LayoutJson = DefaultLayoutJson, CultureName = LanguageCodes.En, ListFormCode = ListFormCodes.Lists.Contact, @@ -3697,6 +3716,7 @@ public class ListFormSeeder_Administration : IDataSeedContributor, ITransientDep { ListFormType = ListFormTypeEnum.List, IsSubForm = false, + ShowNote = true, LayoutJson = DefaultLayoutJson, CultureName = LanguageCodes.En, ListFormCode = ListFormCodes.Lists.WorkHour, @@ -3939,6 +3959,7 @@ public class ListFormSeeder_Administration : IDataSeedContributor, ITransientDep { ListFormType = ListFormTypeEnum.List, IsSubForm = false, + ShowNote = true, LayoutJson = DefaultLayoutJson, CultureName = LanguageCodes.En, ListFormCode = ListFormCodes.Lists.Sector, @@ -4027,6 +4048,7 @@ public class ListFormSeeder_Administration : IDataSeedContributor, ITransientDep { ListFormType = ListFormTypeEnum.List, IsSubForm = false, + ShowNote = true, LayoutJson = DefaultLayoutJson, CultureName = LanguageCodes.En, ListFormCode = ListFormCodes.Lists.SkillType, @@ -4151,6 +4173,7 @@ public class ListFormSeeder_Administration : IDataSeedContributor, ITransientDep { ListFormType = ListFormTypeEnum.List, IsSubForm = false, + ShowNote = true, LayoutJson = DefaultLayoutJson, CultureName = LanguageCodes.En, ListFormCode = ListFormCodes.Lists.SkillLevel, @@ -4291,6 +4314,7 @@ public class ListFormSeeder_Administration : IDataSeedContributor, ITransientDep { ListFormType = ListFormTypeEnum.List, IsSubForm = false, + ShowNote = true, LayoutJson = DefaultLayoutJson, CultureName = LanguageCodes.En, ListFormCode = ListFormCodes.Lists.Skill, @@ -4393,6 +4417,7 @@ public class ListFormSeeder_Administration : IDataSeedContributor, ITransientDep new ListForm { ListFormType = ListFormTypeEnum.List, IsSubForm = false, + ShowNote = true, LayoutJson = DefaultLayoutJson, CultureName = LanguageCodes.En, ListFormCode = ListFormCodes.Lists.UomCategory, @@ -4506,6 +4531,7 @@ public class ListFormSeeder_Administration : IDataSeedContributor, ITransientDep { ListFormType = ListFormTypeEnum.List, IsSubForm = false, + ShowNote = true, LayoutJson = DefaultLayoutJson, CultureName = LanguageCodes.En, ListFormCode = ListFormCodes.Lists.Uom, @@ -4682,6 +4708,7 @@ public class ListFormSeeder_Administration : IDataSeedContributor, ITransientDep { ListFormType = ListFormTypeEnum.List, IsSubForm = false, + ShowNote = true, LayoutJson = DefaultLayoutJson, CultureName = LanguageCodes.En, ListFormCode = ListFormCodes.Lists.Behavior, @@ -4767,6 +4794,7 @@ public class ListFormSeeder_Administration : IDataSeedContributor, ITransientDep { ListFormType = ListFormTypeEnum.List, IsSubForm = false, + ShowNote = true, LayoutJson = DefaultLayoutJson, CultureName = LanguageCodes.En, ListFormCode = ListFormCodes.Lists.Disease, @@ -4854,6 +4882,7 @@ public class ListFormSeeder_Administration : IDataSeedContributor, ITransientDep { ListFormType = ListFormTypeEnum.List, IsSubForm = false, + ShowNote = true, LayoutJson = DefaultLayoutJson, CultureName = LanguageCodes.En, ListFormCode = ListFormCodes.Lists.Document, @@ -4938,6 +4967,7 @@ public class ListFormSeeder_Administration : IDataSeedContributor, ITransientDep { ListFormType = ListFormTypeEnum.List, IsSubForm = false, + ShowNote = true, LayoutJson = DefaultLayoutJson, CultureName = LanguageCodes.En, ListFormCode = ListFormCodes.Lists.EducationStatus, @@ -5040,6 +5070,7 @@ public class ListFormSeeder_Administration : IDataSeedContributor, ITransientDep { ListFormType = ListFormTypeEnum.List, IsSubForm = false, + ShowNote = true, LayoutJson = DefaultLayoutJson, CultureName = LanguageCodes.En, ListFormCode = ListFormCodes.Lists.Vaccine, @@ -5125,6 +5156,7 @@ public class ListFormSeeder_Administration : IDataSeedContributor, ITransientDep { ListFormType = ListFormTypeEnum.List, IsSubForm = false, + ShowNote = true, LayoutJson = DefaultLayoutJson, CultureName = LanguageCodes.En, ListFormCode = ListFormCodes.Lists.Vehicle, @@ -5397,6 +5429,7 @@ public class ListFormSeeder_Administration : IDataSeedContributor, ITransientDep { ListFormType = ListFormTypeEnum.List, IsSubForm = false, + ShowNote = true, LayoutJson = DefaultLayoutJson, CultureName = LanguageCodes.En, ListFormCode = ListFormCodes.Lists.Psychologist, @@ -5572,6 +5605,7 @@ public class ListFormSeeder_Administration : IDataSeedContributor, ITransientDep { ListFormType = ListFormTypeEnum.List, IsSubForm = false, + ShowNote = true, LayoutJson = DefaultLayoutJson, CultureName = LanguageCodes.En, ListFormCode = ListFormCodes.Lists.Lawyer, diff --git a/api/src/Erp.Platform.DbMigrator/Seeds/ListFormSeeder_Coordinator.cs b/api/src/Erp.Platform.DbMigrator/Seeds/ListFormSeeder_Coordinator.cs index ec7db123..0d9b159d 100644 --- a/api/src/Erp.Platform.DbMigrator/Seeds/ListFormSeeder_Coordinator.cs +++ b/api/src/Erp.Platform.DbMigrator/Seeds/ListFormSeeder_Coordinator.cs @@ -53,6 +53,7 @@ public class ListFormSeeder_Coordinator : IDataSeedContributor, ITransientDepend { ListFormType = ListFormTypeEnum.List, IsSubForm = false, + ShowNote = true, LayoutJson = DefaultLayoutJson, CultureName = LanguageCodes.En, ListFormCode = ListFormCodes.Lists.Program, @@ -166,6 +167,7 @@ public class ListFormSeeder_Coordinator : IDataSeedContributor, ITransientDepend { ListFormType = ListFormTypeEnum.List, IsSubForm = false, + ShowNote = true, LayoutJson = DefaultLayoutJson, CultureName = LanguageCodes.En, ListFormCode = ListFormCodes.Lists.Schedule, @@ -559,6 +561,7 @@ public class ListFormSeeder_Coordinator : IDataSeedContributor, ITransientDepend { ListFormType = ListFormTypeEnum.List, IsSubForm = false, + ShowNote = true, LayoutJson = DefaultLayoutJson, CultureName = LanguageCodes.En, ListFormCode = ListFormCodes.Lists.RegistrationType, @@ -704,6 +707,7 @@ public class ListFormSeeder_Coordinator : IDataSeedContributor, ITransientDepend { ListFormType = ListFormTypeEnum.List, IsSubForm = false, + ShowNote = true, LayoutJson = DefaultLayoutJson, CultureName = LanguageCodes.En, ListFormCode = ListFormCodes.Lists.RegistrationMethod, @@ -876,6 +880,7 @@ public class ListFormSeeder_Coordinator : IDataSeedContributor, ITransientDepend { ListFormType = ListFormTypeEnum.List, IsSubForm = false, + ShowNote = true, LayoutJson = DefaultLayoutJson, CultureName = LanguageCodes.En, ListFormCode = ListFormCodes.Lists.ClassType, @@ -1083,6 +1088,7 @@ public class ListFormSeeder_Coordinator : IDataSeedContributor, ITransientDepend { ListFormType = ListFormTypeEnum.List, IsSubForm = false, + ShowNote = true, LayoutJson = DefaultLayoutJson, CultureName = LanguageCodes.En, ListFormCode = ListFormCodes.Lists.Class, @@ -1255,6 +1261,7 @@ public class ListFormSeeder_Coordinator : IDataSeedContributor, ITransientDepend { ListFormType = ListFormTypeEnum.List, IsSubForm = false, + ShowNote = true, LayoutJson = DefaultLayoutJson, CultureName = LanguageCodes.En, ListFormCode = ListFormCodes.Lists.Level, @@ -1526,6 +1533,7 @@ public class ListFormSeeder_Coordinator : IDataSeedContributor, ITransientDepend { ListFormType = ListFormTypeEnum.List, IsSubForm = false, + ShowNote = true, LayoutJson = DefaultLayoutJson, CultureName = LanguageCodes.En, ListFormCode = ListFormCodes.Lists.ClassCancellationReason, @@ -1639,6 +1647,7 @@ public class ListFormSeeder_Coordinator : IDataSeedContributor, ITransientDepend { ListFormType = ListFormTypeEnum.List, IsSubForm = false, + ShowNote = true, LayoutJson = DefaultLayoutJson, CultureName = LanguageCodes.En, ListFormCode = ListFormCodes.Lists.LessonPeriod, @@ -1877,6 +1886,7 @@ public class ListFormSeeder_Coordinator : IDataSeedContributor, ITransientDepend { ListFormType = ListFormTypeEnum.List, IsSubForm = false, + ShowNote = true, LayoutJson = DefaultLayoutJson, CultureName = LanguageCodes.En, ListFormCode = ListFormCodes.Lists.QuestionTag, @@ -1996,6 +2006,7 @@ public class ListFormSeeder_Coordinator : IDataSeedContributor, ITransientDepend { ListFormType = ListFormTypeEnum.List, IsSubForm = false, + ShowNote = true, LayoutJson = DefaultLayoutJson, CultureName = LanguageCodes.En, ListFormCode = ListFormCodes.Lists.QuestionPool, @@ -2144,6 +2155,7 @@ public class ListFormSeeder_Coordinator : IDataSeedContributor, ITransientDepend { ListFormType = ListFormTypeEnum.List, IsSubForm = true, + ShowNote = true, LayoutJson = DefaultLayoutJson, CultureName = LanguageCodes.En, ListFormCode = ListFormCodes.Lists.Question, diff --git a/api/src/Erp.Platform.DbMigrator/Seeds/ListFormSeeder_Crm.cs b/api/src/Erp.Platform.DbMigrator/Seeds/ListFormSeeder_Crm.cs index 72e43cf2..52037d10 100644 --- a/api/src/Erp.Platform.DbMigrator/Seeds/ListFormSeeder_Crm.cs +++ b/api/src/Erp.Platform.DbMigrator/Seeds/ListFormSeeder_Crm.cs @@ -53,6 +53,7 @@ public class ListFormSeeder_Crm : IDataSeedContributor, ITransientDependency { ListFormType = ListFormTypeEnum.List, IsSubForm = true, + ShowNote = true, LayoutJson = DefaultLayoutJson, CultureName = LanguageCodes.En, ListFormCode = ListFormCodes.Lists.CustomerType, @@ -173,6 +174,7 @@ public class ListFormSeeder_Crm : IDataSeedContributor, ITransientDependency { ListFormType = ListFormTypeEnum.List, IsSubForm = true, + ShowNote = true, LayoutJson = DefaultLayoutJson, CultureName = LanguageCodes.En, ListFormCode = ListFormCodes.Lists.CustomerSegment, @@ -292,6 +294,7 @@ public class ListFormSeeder_Crm : IDataSeedContributor, ITransientDependency { ListFormType = ListFormTypeEnum.List, IsSubForm = false, + ShowNote = true, LayoutJson = DefaultLayoutJson, CultureName = LanguageCodes.En, ListFormCode = ListFormCodes.Lists.Customer, @@ -986,6 +989,7 @@ public class ListFormSeeder_Crm : IDataSeedContributor, ITransientDependency { ListFormType = ListFormTypeEnum.List, IsSubForm = true, + ShowNote = true, LayoutJson = DefaultLayoutJson, CultureName = LanguageCodes.En, ListFormCode = ListFormCodes.Lists.LossReason, @@ -1154,6 +1158,7 @@ public class ListFormSeeder_Crm : IDataSeedContributor, ITransientDependency { ListFormType = ListFormTypeEnum.List, IsSubForm = true, + ShowNote = true, LayoutJson = DefaultLayoutJson, CultureName = LanguageCodes.En, ListFormCode = ListFormCodes.Lists.Opportunity, @@ -1180,12 +1185,12 @@ public class ListFormSeeder_Crm : IDataSeedContributor, ITransientDependency DeleteCommand = DefaultDeleteCommand(nameof(TableNameEnum.Opportunity)), DeleteFieldsDefaultValueJson = DefaultDeleteFieldsDefaultValueJson, PagerOptionJson = DefaultPagerOptionJson, - EditingOptionJson = DefaultEditingOptionJson(AppCodes.Crm.Opportunity, 500, 600, true, true, true, true, false), + EditingOptionJson = DefaultEditingOptionJson(AppCodes.Crm.Opportunity, 800, 400, true, true, true, true, false), InsertFieldsDefaultValueJson = DefaultInsertFieldsDefaultValueJson, EditingFormJson = JsonSerializer.Serialize(new List() { new() { - Order=1, ColCount=1, ColSpan=1, ItemType="group", Items =[ + Order=1, ColCount=2, ColSpan=1, ItemType="group", Items =[ new EditingFormItemDto { Order = 1, DataField="Title", ColSpan = 1, IsRequired = true, EditorType2 = EditorTypes.dxTextBox }, new EditingFormItemDto { Order = 2, DataField="Description", ColSpan = 1, EditorType2 = EditorTypes.dxTextBox }, new EditingFormItemDto { Order = 3, DataField="PartnerId", ColSpan = 1, IsRequired = true, EditorType2 = EditorTypes.dxSelectBox, EditorOptions=EditorOptionValues.ShowClearButton }, @@ -1534,9 +1539,9 @@ public class ListFormSeeder_Crm : IDataSeedContributor, ITransientDependency listForm.ListFormCode, JsonSerializer.Serialize(new List() { new { - TabTitle = "Actions", + TabTitle = "Activity", TabType = ListFormTabTypeEnum.List, - Code = ListFormCodes.Lists.OpportunityAction, + Code = ListFormCodes.Lists.OpportunityActivity, Relation = new List() { new { ParentFieldName = "Id", @@ -1560,26 +1565,27 @@ public class ListFormSeeder_Crm : IDataSeedContributor, ITransientDependency } #endregion - #region Action - if (!await _listFormRepository.AnyAsync(a => a.ListFormCode == ListFormCodes.Lists.OpportunityAction)) + #region Activity + if (!await _listFormRepository.AnyAsync(a => a.ListFormCode == ListFormCodes.Lists.OpportunityActivity)) { var listForm = await _listFormRepository.InsertAsync( new ListForm() { ListFormType = ListFormTypeEnum.List, IsSubForm = true, + ShowNote = true, LayoutJson = DefaultLayoutJson, CultureName = LanguageCodes.En, - ListFormCode = ListFormCodes.Lists.OpportunityAction, - Name = AppCodes.Crm.OpportunityAction, - Title = AppCodes.Crm.OpportunityAction, + ListFormCode = ListFormCodes.Lists.OpportunityActivity, + Name = AppCodes.Crm.OpportunityActivity, + Title = AppCodes.Crm.OpportunityActivity, DataSourceCode = SeedConsts.DataSources.DefaultCode, IsTenant = true, IsBranch = false, IsOrganizationUnit = false, - Description = AppCodes.Crm.OpportunityAction, + Description = AppCodes.Crm.OpportunityActivity, SelectCommandType = SelectCommandTypeEnum.Table, - SelectCommand = TableNameResolver.GetFullTableName(nameof(TableNameEnum.Action)), + SelectCommand = TableNameResolver.GetFullTableName(nameof(TableNameEnum.Activity)), KeyFieldName = "Id", KeyFieldDbSourceType = DbType.Guid, DefaultFilter = DefaultFilterJson, @@ -1590,21 +1596,21 @@ public class ListFormSeeder_Crm : IDataSeedContributor, ITransientDependency GroupPanelJson = DefaultGroupPanelJson, SelectionJson = DefaultSelectionSingleJson, ColumnOptionJson = DefaultColumnOptionJson, - PermissionJson = DefaultPermissionJson(AppCodes.Crm.OpportunityAction), - DeleteCommand = DefaultDeleteCommand(nameof(TableNameEnum.Action)), + PermissionJson = DefaultPermissionJson(AppCodes.Crm.OpportunityActivity), + DeleteCommand = DefaultDeleteCommand(nameof(TableNameEnum.Activity)), DeleteFieldsDefaultValueJson = DefaultDeleteFieldsDefaultValueJson, PagerOptionJson = DefaultPagerOptionJson, - EditingOptionJson = DefaultEditingOptionJson(AppCodes.Crm.OpportunityAction, 500, 600, true, true, true, true, false), + EditingOptionJson = DefaultEditingOptionJson(AppCodes.Crm.OpportunityActivity, 500, 600, true, true, true, true, false), InsertFieldsDefaultValueJson = DefaultInsertFieldsDefaultValueJson, EditingFormJson = JsonSerializer.Serialize(new List() { new() { Order=1, ColCount=1, ColSpan=1, ItemType="group", Items =[ - new EditingFormItemDto { Order = 1, DataField="ActionType", ColSpan = 1, IsRequired = true, EditorType2 = EditorTypes.dxSelectBox, EditorOptions=EditorOptionValues.ShowClearButton }, + new EditingFormItemDto { Order = 1, DataField="ActivityType", ColSpan = 1, IsRequired = true, EditorType2 = EditorTypes.dxSelectBox, EditorOptions=EditorOptionValues.ShowClearButton }, new EditingFormItemDto { Order = 2, DataField="Subject", ColSpan = 1, IsRequired = true, EditorType2 = EditorTypes.dxTextBox }, new EditingFormItemDto { Order = 3, DataField="Description", ColSpan = 1, EditorType2 = EditorTypes.dxTextArea }, new EditingFormItemDto { Order = 4, DataField="EmployeeId", ColSpan = 1, IsRequired = true, EditorType2 = EditorTypes.dxSelectBox, EditorOptions=EditorOptionValues.ShowClearButton }, - new EditingFormItemDto { Order = 5, DataField="ActionDate", ColSpan = 1, IsRequired = true, EditorType2 = EditorTypes.dxDateBox }, + new EditingFormItemDto { Order = 5, DataField="ActivityDate", ColSpan = 1, IsRequired = true, EditorType2 = EditorTypes.dxDateBox }, new EditingFormItemDto { Order = 6, DataField="StartTime", ColSpan = 1, EditorType2 = EditorTypes.dxDateBox }, new EditingFormItemDto { Order = 7, DataField="EndTime", ColSpan = 1, EditorType2 = EditorTypes.dxDateBox }, new EditingFormItemDto { Order = 8, DataField="Duration", ColSpan = 1, EditorType2 = EditorTypes.dxNumberBox }, @@ -1616,7 +1622,7 @@ public class ListFormSeeder_Crm : IDataSeedContributor, ITransientDependency ]} }), FormFieldsDefaultValueJson = JsonSerializer.Serialize(new FieldsDefaultValue[] { - new() { FieldName = "ActionDate", FieldDbType = DbType.DateTime, Value = "@NOW", CustomValueType = FieldCustomValueTypeEnum.CustomKey } + new() { FieldName = "ActivityDate", FieldDbType = DbType.DateTime, Value = "@DATE", CustomValueType = FieldCustomValueTypeEnum.CustomKey } }), } ); @@ -1643,7 +1649,7 @@ public class ListFormSeeder_Crm : IDataSeedContributor, ITransientDependency ListFormCode = listForm.ListFormCode, CultureName = LanguageCodes.En, SourceDbType = DbType.String, - FieldName = "ActionType", + FieldName = "ActivityType", Width = 100, ListOrderNo = 2, Visible = true, @@ -1722,7 +1728,7 @@ public class ListFormSeeder_Crm : IDataSeedContributor, ITransientDependency ListFormCode = listForm.ListFormCode, CultureName = LanguageCodes.En, SourceDbType = DbType.Date, - FieldName = "ActionDate", + FieldName = "ActivityDate", Width = 100, ListOrderNo = 6, Visible = true, @@ -1868,6 +1874,7 @@ public class ListFormSeeder_Crm : IDataSeedContributor, ITransientDependency { ListFormType = ListFormTypeEnum.List, IsSubForm = true, + ShowNote = true, LayoutJson = DefaultLayoutJson, CultureName = LanguageCodes.En, ListFormCode = ListFormCodes.Lists.OpportunityCompetitor, diff --git a/api/src/Erp.Platform.DbMigrator/Seeds/ListFormSeeder_Hr.cs b/api/src/Erp.Platform.DbMigrator/Seeds/ListFormSeeder_Hr.cs index 47ccaf74..e54ba8ac 100644 --- a/api/src/Erp.Platform.DbMigrator/Seeds/ListFormSeeder_Hr.cs +++ b/api/src/Erp.Platform.DbMigrator/Seeds/ListFormSeeder_Hr.cs @@ -54,6 +54,7 @@ public class ListFormSeeder_Hr : IDataSeedContributor, ITransientDependency { ListFormType = ListFormTypeEnum.List, IsSubForm = true, + ShowNote = true, LayoutJson = DefaultLayoutJson, CultureName = LanguageCodes.En, ListFormCode = ListFormCodes.Lists.EmploymentType, @@ -151,6 +152,7 @@ public class ListFormSeeder_Hr : IDataSeedContributor, ITransientDependency { ListFormType = ListFormTypeEnum.List, IsSubForm = true, + ShowNote = true, LayoutJson = DefaultLayoutJson, CultureName = LanguageCodes.En, ListFormCode = ListFormCodes.Lists.JobPosition, @@ -447,6 +449,7 @@ public class ListFormSeeder_Hr : IDataSeedContributor, ITransientDependency { ListFormType = ListFormTypeEnum.List, IsSubForm = true, + ShowNote = true, LayoutJson = DefaultLayoutJson, CultureName = LanguageCodes.En, ListFormCode = ListFormCodes.Lists.Department, @@ -664,6 +667,7 @@ public class ListFormSeeder_Hr : IDataSeedContributor, ITransientDependency { ListFormType = ListFormTypeEnum.List, IsSubForm = true, + ShowNote = true, LayoutJson = DefaultLayoutJson, CultureName = LanguageCodes.En, ListFormCode = ListFormCodes.Lists.Badge, @@ -969,6 +973,7 @@ public class ListFormSeeder_Hr : IDataSeedContributor, ITransientDependency { ListFormType = ListFormTypeEnum.List, IsSubForm = true, + ShowNote = true, LayoutJson = DefaultLayoutJson, CultureName = LanguageCodes.En, ListFormCode = ListFormCodes.Lists.CostCenter, @@ -1262,6 +1267,7 @@ public class ListFormSeeder_Hr : IDataSeedContributor, ITransientDependency { ListFormType = ListFormTypeEnum.List, IsSubForm = true, + ShowNote = true, LayoutJson = DefaultLayoutJson, CultureName = LanguageCodes.En, ListFormCode = ListFormCodes.Lists.Employee, @@ -1978,6 +1984,7 @@ public class ListFormSeeder_Hr : IDataSeedContributor, ITransientDependency { ListFormType = ListFormTypeEnum.List, IsSubForm = true, + ShowNote = true, LayoutJson = DefaultLayoutJson, CultureName = LanguageCodes.En, ListFormCode = ListFormCodes.Lists.Leave, @@ -2304,6 +2311,7 @@ public class ListFormSeeder_Hr : IDataSeedContributor, ITransientDependency { ListFormType = ListFormTypeEnum.List, IsSubForm = true, + ShowNote = true, LayoutJson = DefaultLayoutJson, CultureName = LanguageCodes.En, ListFormCode = ListFormCodes.Lists.Overtime, @@ -2628,6 +2636,7 @@ public class ListFormSeeder_Hr : IDataSeedContributor, ITransientDependency { ListFormType = ListFormTypeEnum.List, IsSubForm = false, + ShowNote = true, LayoutJson = DefaultLayoutJson, CultureName = LanguageCodes.En, ListFormCode = ListFormCodes.Lists.Expense, @@ -2908,6 +2917,7 @@ public class ListFormSeeder_Hr : IDataSeedContributor, ITransientDependency { ListFormType = ListFormTypeEnum.List, IsSubForm = true, + ShowNote = true, LayoutJson = DefaultLayoutJson, CultureName = LanguageCodes.En, ListFormCode = ListFormCodes.Lists.Payroll, @@ -3269,6 +3279,7 @@ public class ListFormSeeder_Hr : IDataSeedContributor, ITransientDependency { ListFormType = ListFormTypeEnum.List, IsSubForm = true, + ShowNote = true, LayoutJson = DefaultLayoutJson, CultureName = LanguageCodes.En, ListFormCode = ListFormCodes.Lists.Template360, @@ -3419,6 +3430,7 @@ public class ListFormSeeder_Hr : IDataSeedContributor, ITransientDependency { ListFormType = ListFormTypeEnum.List, IsSubForm = true, + ShowNote = true, LayoutJson = DefaultLayoutJson, CultureName = LanguageCodes.En, ListFormCode = ListFormCodes.Lists.Performance360, @@ -3651,6 +3663,7 @@ public class ListFormSeeder_Hr : IDataSeedContributor, ITransientDependency { ListFormType = ListFormTypeEnum.List, IsSubForm = true, + ShowNote = true, LayoutJson = DefaultLayoutJson, CultureName = LanguageCodes.En, ListFormCode = ListFormCodes.Lists.Training, @@ -3984,6 +3997,7 @@ public class ListFormSeeder_Hr : IDataSeedContributor, ITransientDependency { ListFormType = ListFormTypeEnum.List, IsSubForm = false, + ShowNote = true, LayoutJson = DefaultLayoutJson, CultureName = LanguageCodes.En, ListFormCode = ListFormCodes.Lists.Survey, @@ -4191,6 +4205,7 @@ public class ListFormSeeder_Hr : IDataSeedContributor, ITransientDependency { ListFormType = ListFormTypeEnum.List, IsSubForm = true, + ShowNote = true, LayoutJson = DefaultLayoutJson, CultureName = LanguageCodes.En, ListFormCode = ListFormCodes.Lists.SurveyQuestion, @@ -4368,6 +4383,7 @@ public class ListFormSeeder_Hr : IDataSeedContributor, ITransientDependency { ListFormType = ListFormTypeEnum.List, IsSubForm = true, + ShowNote = true, LayoutJson = DefaultLayoutJson, CultureName = LanguageCodes.En, ListFormCode = ListFormCodes.Lists.SurveyResponse, diff --git a/api/src/Erp.Platform.DbMigrator/Seeds/ListFormSeeder_Intranet.cs b/api/src/Erp.Platform.DbMigrator/Seeds/ListFormSeeder_Intranet.cs index fbab9f69..4c0d0504 100644 --- a/api/src/Erp.Platform.DbMigrator/Seeds/ListFormSeeder_Intranet.cs +++ b/api/src/Erp.Platform.DbMigrator/Seeds/ListFormSeeder_Intranet.cs @@ -51,6 +51,7 @@ public class ListFormSeeder_Intranet : IDataSeedContributor, ITransientDependenc { ListFormType = ListFormTypeEnum.List, IsSubForm = false, + ShowNote = true, LayoutJson = DefaultLayoutJson, CultureName = LanguageCodes.En, ListFormCode = ListFormCodes.Lists.EventType, @@ -135,6 +136,7 @@ public class ListFormSeeder_Intranet : IDataSeedContributor, ITransientDependenc { ListFormType = ListFormTypeEnum.List, IsSubForm = false, + ShowNote = true, LayoutJson = DefaultLayoutJson, CultureName = LanguageCodes.En, ListFormCode = ListFormCodes.Lists.EventCategory, @@ -219,6 +221,7 @@ public class ListFormSeeder_Intranet : IDataSeedContributor, ITransientDependenc { ListFormType = ListFormTypeEnum.List, IsSubForm = false, + ShowNote = true, LayoutJson = DefaultLayoutJson, CultureName = LanguageCodes.En, ListFormCode = ListFormCodes.Lists.Event, @@ -466,6 +469,7 @@ public class ListFormSeeder_Intranet : IDataSeedContributor, ITransientDependenc { ListFormType = ListFormTypeEnum.List, IsSubForm = false, + ShowNote = true, LayoutJson = DefaultLayoutJson, CultureName = LanguageCodes.En, ListFormCode = ListFormCodes.Lists.Meal, @@ -654,6 +658,7 @@ public class ListFormSeeder_Intranet : IDataSeedContributor, ITransientDependenc { ListFormType = ListFormTypeEnum.List, IsSubForm = true, + ShowNote = true, LayoutJson = DefaultLayoutJson, CultureName = LanguageCodes.En, ListFormCode = ListFormCodes.Lists.Reservation, @@ -902,6 +907,7 @@ public class ListFormSeeder_Intranet : IDataSeedContributor, ITransientDependenc { ListFormType = ListFormTypeEnum.List, IsSubForm = true, + ShowNote = true, LayoutJson = DefaultLayoutJson, CultureName = LanguageCodes.En, ListFormCode = ListFormCodes.Lists.ShuttleRoute, @@ -1127,6 +1133,7 @@ public class ListFormSeeder_Intranet : IDataSeedContributor, ITransientDependenc { ListFormType = ListFormTypeEnum.List, IsSubForm = true, + ShowNote = true, LayoutJson = DefaultLayoutJson, CultureName = LanguageCodes.En, ListFormCode = ListFormCodes.Lists.Announcement, @@ -1396,6 +1403,7 @@ public class ListFormSeeder_Intranet : IDataSeedContributor, ITransientDependenc { ListFormType = ListFormTypeEnum.List, IsSubForm = false, + ShowNote = true, LayoutJson = DefaultLayoutJson, CultureName = LanguageCodes.En, ListFormCode = ListFormCodes.Lists.Visitor, @@ -1649,6 +1657,7 @@ public class ListFormSeeder_Intranet : IDataSeedContributor, ITransientDependenc { ListFormType = ListFormTypeEnum.List, IsSubForm = true, + ShowNote = true, LayoutJson = DefaultLayoutJson, CultureName = LanguageCodes.En, ListFormCode = ListFormCodes.Lists.SocialPost, diff --git a/api/src/Erp.Platform.DbMigrator/Seeds/ListFormSeeder_Participant.cs b/api/src/Erp.Platform.DbMigrator/Seeds/ListFormSeeder_Participant.cs index 923c060f..a3d18002 100644 --- a/api/src/Erp.Platform.DbMigrator/Seeds/ListFormSeeder_Participant.cs +++ b/api/src/Erp.Platform.DbMigrator/Seeds/ListFormSeeder_Participant.cs @@ -51,6 +51,7 @@ public class ListFormSeeder_Participant : IDataSeedContributor, ITransientDepend { ListFormType = ListFormTypeEnum.List, IsSubForm = false, + ShowNote = true, LayoutJson = DefaultLayoutJson, CultureName = LanguageCodes.En, ListFormCode = ListFormCodes.Lists.MeetingMethod, @@ -193,6 +194,7 @@ public class ListFormSeeder_Participant : IDataSeedContributor, ITransientDepend { ListFormType = ListFormTypeEnum.List, IsSubForm = false, + ShowNote = true, LayoutJson = DefaultLayoutJson, CultureName = LanguageCodes.En, ListFormCode = ListFormCodes.Lists.MeetingResult, @@ -324,6 +326,7 @@ public class ListFormSeeder_Participant : IDataSeedContributor, ITransientDepend { ListFormType = ListFormTypeEnum.List, IsSubForm = false, + ShowNote = true, LayoutJson = DefaultLayoutJson, CultureName = LanguageCodes.En, ListFormCode = ListFormCodes.Lists.Source, @@ -437,6 +440,7 @@ public class ListFormSeeder_Participant : IDataSeedContributor, ITransientDepend { ListFormType = ListFormTypeEnum.List, IsSubForm = false, + ShowNote = true, LayoutJson = DefaultLayoutJson, CultureName = LanguageCodes.En, ListFormCode = ListFormCodes.Lists.Interesting, @@ -550,6 +554,7 @@ public class ListFormSeeder_Participant : IDataSeedContributor, ITransientDepend { ListFormType = ListFormTypeEnum.List, IsSubForm = false, + ShowNote = true, LayoutJson = DefaultLayoutJson, CultureName = LanguageCodes.En, ListFormCode = ListFormCodes.Lists.SalesRejectionReason, @@ -695,6 +700,7 @@ public class ListFormSeeder_Participant : IDataSeedContributor, ITransientDepend { ListFormType = ListFormTypeEnum.List, IsSubForm = false, + ShowNote = true, LayoutJson = DefaultLayoutJson, CultureName = LanguageCodes.En, ListFormCode = ListFormCodes.Lists.NoteType, diff --git a/api/src/Erp.Platform.DbMigrator/Seeds/ListFormSeeder_Saas.cs b/api/src/Erp.Platform.DbMigrator/Seeds/ListFormSeeder_Saas.cs index 4c2fdc8a..4c40e05f 100644 --- a/api/src/Erp.Platform.DbMigrator/Seeds/ListFormSeeder_Saas.cs +++ b/api/src/Erp.Platform.DbMigrator/Seeds/ListFormSeeder_Saas.cs @@ -56,7 +56,7 @@ public class ListFormSeeder_Saas : IDataSeedContributor, ITransientDependency { ListFormType = ListFormTypeEnum.List, IsSubForm = false, - ShowActivity = true, + ShowNote = true, LayoutJson = DefaultLayoutJson, CultureName = LanguageCodes.En, ListFormCode = ListFormCodes.Lists.Tenant, @@ -78,7 +78,7 @@ public class ListFormSeeder_Saas : IDataSeedContributor, ITransientDependency GroupPanelJson = DefaultGroupPanelJson, SelectionJson = DefaultSelectionSingleJson, ColumnOptionJson = DefaultColumnOptionJson, - PermissionJson = DefaultPermissionJson(TenantManagementPermissions.Tenants.Create, TenantManagementPermissions.Tenants.Default, TenantManagementPermissions.Tenants.Update, TenantManagementPermissions.Tenants.Delete, TenantManagementPermissions.Tenants.Default + ".Export", TenantManagementPermissions.Tenants.Default + ".Import", TenantManagementPermissions.Tenants.Default + ".Activity"), + PermissionJson = DefaultPermissionJson(TenantManagementPermissions.Tenants.Create, TenantManagementPermissions.Tenants.Default, TenantManagementPermissions.Tenants.Update, TenantManagementPermissions.Tenants.Delete, TenantManagementPermissions.Tenants.Default + ".Export", TenantManagementPermissions.Tenants.Default + ".Import", TenantManagementPermissions.Tenants.Default + ".Note"), PagerOptionJson = DefaultPagerOptionJson, EditingOptionJson = DefaultEditingOptionJson(TenantManagementPermissions.Tenants.Default, 800, 800, true, true, true, true, false), EditingFormJson = JsonSerializer.Serialize(new List() @@ -549,6 +549,7 @@ public class ListFormSeeder_Saas : IDataSeedContributor, ITransientDependency { ListFormType = ListFormTypeEnum.List, IsSubForm = false, + ShowNote = true, LayoutJson = DefaultLayoutJson, CultureName = LanguageCodes.En, ListFormCode = ListFormCodes.Lists.Branch, @@ -991,6 +992,7 @@ public class ListFormSeeder_Saas : IDataSeedContributor, ITransientDependency { ListFormType = ListFormTypeEnum.List, IsSubForm = false, + ShowNote = true, LayoutJson = DefaultLayoutJson, CultureName = LanguageCodes.En, ListFormCode = ListFormCodes.Lists.SettingDefinition, @@ -1361,6 +1363,7 @@ public class ListFormSeeder_Saas : IDataSeedContributor, ITransientDependency { ListFormType = ListFormTypeEnum.List, IsSubForm = false, + ShowNote = true, LayoutJson = DefaultLayoutJson, CultureName = LanguageCodes.En, ListFormCode = ListFormCodes.Lists.GlobalSearch, @@ -1511,6 +1514,7 @@ public class ListFormSeeder_Saas : IDataSeedContributor, ITransientDependency { ListFormType = ListFormTypeEnum.List, IsSubForm = false, + ShowNote = true, LayoutJson = DefaultLayoutJson, CultureName = LanguageCodes.En, ListFormCode = ListFormCodes.Lists.Language, @@ -1678,6 +1682,7 @@ public class ListFormSeeder_Saas : IDataSeedContributor, ITransientDependency { ListFormType = ListFormTypeEnum.List, IsSubForm = false, + ShowNote = true, LayoutJson = DefaultLayoutJson, CultureName = LanguageCodes.En, ListFormCode = ListFormCodes.Lists.LanguageText, @@ -1837,6 +1842,7 @@ public class ListFormSeeder_Saas : IDataSeedContributor, ITransientDependency { ListFormType = ListFormTypeEnum.List, IsSubForm = false, + ShowNote = true, LayoutJson = DefaultLayoutJson, CultureName = LanguageCodes.En, ListFormCode = ListFormCodes.Lists.Route, @@ -2009,6 +2015,7 @@ public class ListFormSeeder_Saas : IDataSeedContributor, ITransientDependency { ListFormType = ListFormTypeEnum.List, IsSubForm = false, + ShowNote = true, LayoutJson = DefaultLayoutJson, CultureName = LanguageCodes.En, ListFormCode = ListFormCodes.Lists.Menu, @@ -2288,6 +2295,7 @@ public class ListFormSeeder_Saas : IDataSeedContributor, ITransientDependency { ListFormType = ListFormTypeEnum.List, IsSubForm = false, + ShowNote = true, LayoutJson = DefaultLayoutJson, CultureName = LanguageCodes.En, ListFormCode = ListFormCodes.Lists.DataSource, @@ -2417,6 +2425,7 @@ public class ListFormSeeder_Saas : IDataSeedContributor, ITransientDependency { ListFormType = ListFormTypeEnum.List, IsSubForm = false, + ShowNote = true, LayoutJson = DefaultLayoutJson, CultureName = LanguageCodes.En, ListFormCode = ListFormCodes.Lists.Listform, @@ -2884,6 +2893,7 @@ public class ListFormSeeder_Saas : IDataSeedContributor, ITransientDependency { ListFormType = ListFormTypeEnum.List, IsSubForm = false, + ShowNote = true, LayoutJson = DefaultLayoutJson, CultureName = LanguageCodes.En, ListFormCode = ListFormCodes.Lists.NotificationRule, @@ -3115,6 +3125,7 @@ public class ListFormSeeder_Saas : IDataSeedContributor, ITransientDependency { ListFormType = ListFormTypeEnum.List, IsSubForm = false, + ShowNote = true, LayoutJson = DefaultLayoutJson, CultureName = LanguageCodes.En, ListFormCode = ListFormCodes.Lists.Notification, @@ -3304,6 +3315,7 @@ public class ListFormSeeder_Saas : IDataSeedContributor, ITransientDependency { ListFormType = ListFormTypeEnum.List, IsSubForm = false, + ShowNote = true, LayoutJson = DefaultLayoutJson, CultureName = LanguageCodes.En, ListFormCode = ListFormCodes.Lists.BackgroundWorker, @@ -3525,6 +3537,7 @@ public class ListFormSeeder_Saas : IDataSeedContributor, ITransientDependency { ListFormType = ListFormTypeEnum.List, IsSubForm = false, + ShowNote = true, LayoutJson = DefaultLayoutJson, CultureName = LanguageCodes.En, ListFormCode = ListFormCodes.Lists.ContactTag, @@ -3631,6 +3644,7 @@ public class ListFormSeeder_Saas : IDataSeedContributor, ITransientDependency { ListFormType = ListFormTypeEnum.List, IsSubForm = false, + ShowNote = true, LayoutJson = DefaultLayoutJson, CultureName = LanguageCodes.En, ListFormCode = ListFormCodes.Lists.ContactTitle, @@ -3737,6 +3751,7 @@ public class ListFormSeeder_Saas : IDataSeedContributor, ITransientDependency { ListFormType = ListFormTypeEnum.List, IsSubForm = false, + ShowNote = true, LayoutJson = DefaultLayoutJson, CultureName = LanguageCodes.En, ListFormCode = ListFormCodes.Lists.Currency, @@ -3890,6 +3905,7 @@ public class ListFormSeeder_Saas : IDataSeedContributor, ITransientDependency { ListFormType = ListFormTypeEnum.List, IsSubForm = false, + ShowNote = true, LayoutJson = DefaultLayoutJson, CultureName = LanguageCodes.En, ListFormCode = ListFormCodes.Lists.CountryGroup, @@ -3974,6 +3990,7 @@ public class ListFormSeeder_Saas : IDataSeedContributor, ITransientDependency { ListFormType = ListFormTypeEnum.List, IsSubForm = false, + ShowNote = true, LayoutJson = DefaultLayoutJson, CultureName = LanguageCodes.En, ListFormCode = ListFormCodes.Lists.Country, @@ -4172,6 +4189,7 @@ public class ListFormSeeder_Saas : IDataSeedContributor, ITransientDependency { ListFormType = ListFormTypeEnum.List, IsSubForm = false, + ShowNote = true, LayoutJson = DefaultLayoutJson, CultureName = LanguageCodes.En, ListFormCode = ListFormCodes.Lists.City, @@ -4317,6 +4335,7 @@ public class ListFormSeeder_Saas : IDataSeedContributor, ITransientDependency { ListFormType = ListFormTypeEnum.List, IsSubForm = false, + ShowNote = true, LayoutJson = DefaultLayoutJson, CultureName = LanguageCodes.En, ListFormCode = ListFormCodes.Lists.District, diff --git a/api/src/Erp.Platform.DbMigrator/Seeds/ListFormSeeder_SupplyChain.cs b/api/src/Erp.Platform.DbMigrator/Seeds/ListFormSeeder_SupplyChain.cs index 4d1fdb75..6ba5f190 100644 --- a/api/src/Erp.Platform.DbMigrator/Seeds/ListFormSeeder_SupplyChain.cs +++ b/api/src/Erp.Platform.DbMigrator/Seeds/ListFormSeeder_SupplyChain.cs @@ -53,6 +53,7 @@ public class ListFormSeeder_SupplyChain : IDataSeedContributor, ITransientDepend { ListFormType = ListFormTypeEnum.List, IsSubForm = false, + ShowNote = true, LayoutJson = DefaultLayoutJson, CultureName = LanguageCodes.En, ListFormCode = ListFormCodes.Lists.MaterialType, @@ -191,6 +192,7 @@ public class ListFormSeeder_SupplyChain : IDataSeedContributor, ITransientDepend { ListFormType = ListFormTypeEnum.List, IsSubForm = false, + ShowNote = true, LayoutJson = DefaultLayoutJson, CultureName = LanguageCodes.En, ListFormCode = ListFormCodes.Lists.MaterialGroup, @@ -366,6 +368,7 @@ public class ListFormSeeder_SupplyChain : IDataSeedContributor, ITransientDepend { ListFormType = ListFormTypeEnum.List, IsSubForm = false, + ShowNote = true, LayoutJson = DefaultLayoutJson, CultureName = LanguageCodes.En, ListFormCode = ListFormCodes.Lists.Material, @@ -679,6 +682,7 @@ public class ListFormSeeder_SupplyChain : IDataSeedContributor, ITransientDepend { ListFormType = ListFormTypeEnum.List, IsSubForm = true, + ShowNote = true, LayoutJson = DefaultLayoutJson, CultureName = LanguageCodes.En, ListFormCode = ListFormCodes.Lists.PaymentTerm, @@ -801,6 +805,7 @@ public class ListFormSeeder_SupplyChain : IDataSeedContributor, ITransientDepend { ListFormType = ListFormTypeEnum.List, IsSubForm = true, + ShowNote = true, LayoutJson = DefaultLayoutJson, CultureName = LanguageCodes.En, ListFormCode = ListFormCodes.Lists.SupplyType, @@ -923,6 +928,7 @@ public class ListFormSeeder_SupplyChain : IDataSeedContributor, ITransientDepend { ListFormType = ListFormTypeEnum.List, IsSubForm = true, + ShowNote = true, LayoutJson = DefaultLayoutJson, CultureName = LanguageCodes.En, ListFormCode = ListFormCodes.Lists.SupplyCardType, @@ -1044,6 +1050,7 @@ public class ListFormSeeder_SupplyChain : IDataSeedContributor, ITransientDepend { ListFormType = ListFormTypeEnum.List, IsSubForm = false, + ShowNote = true, LayoutJson = DefaultLayoutJson, CultureName = LanguageCodes.En, ListFormCode = ListFormCodes.Lists.Supply, @@ -1735,6 +1742,7 @@ public class ListFormSeeder_SupplyChain : IDataSeedContributor, ITransientDepend { ListFormType = ListFormTypeEnum.List, IsSubForm = true, + ShowNote = true, LayoutJson = DefaultLayoutJson, CultureName = LanguageCodes.En, ListFormCode = ListFormCodes.Lists.PartnerBank, @@ -2059,6 +2067,7 @@ public class ListFormSeeder_SupplyChain : IDataSeedContributor, ITransientDepend { ListFormType = ListFormTypeEnum.List, IsSubForm = true, + ShowNote = true, LayoutJson = DefaultLayoutJson, CultureName = LanguageCodes.En, ListFormCode = ListFormCodes.Lists.PartnerCertificate, @@ -2212,6 +2221,7 @@ public class ListFormSeeder_SupplyChain : IDataSeedContributor, ITransientDepend { ListFormType = ListFormTypeEnum.List, IsSubForm = true, + ShowNote = true, LayoutJson = DefaultLayoutJson, CultureName = LanguageCodes.En, ListFormCode = ListFormCodes.Lists.PartnerContact, @@ -2435,6 +2445,7 @@ public class ListFormSeeder_SupplyChain : IDataSeedContributor, ITransientDepend { ListFormType = ListFormTypeEnum.List, IsSubForm = false, + ShowNote = true, LayoutJson = DefaultLayoutJson, CultureName = LanguageCodes.En, ListFormCode = ListFormCodes.Lists.Approval, @@ -2622,6 +2633,7 @@ public class ListFormSeeder_SupplyChain : IDataSeedContributor, ITransientDepend { ListFormType = ListFormTypeEnum.List, IsSubForm = false, + ShowNote = true, LayoutJson = DefaultLayoutJson, CultureName = LanguageCodes.En, ListFormCode = ListFormCodes.Lists.ApprovalStep, diff --git a/api/src/Erp.Platform.DbMigrator/Seeds/PermissionsData.json b/api/src/Erp.Platform.DbMigrator/Seeds/PermissionsData.json index db548e43..1f6f7933 100644 --- a/api/src/Erp.Platform.DbMigrator/Seeds/PermissionsData.json +++ b/api/src/Erp.Platform.DbMigrator/Seeds/PermissionsData.json @@ -123,9 +123,9 @@ }, { "GroupName": "App.Saas", - "Name": "AbpTenantManagement.Tenants.Activity", + "Name": "AbpTenantManagement.Tenants.Note", "ParentName": "AbpTenantManagement.Tenants", - "DisplayName": "Activity", + "DisplayName": "Note", "IsEnabled": true, "MultiTenancySide": 2, "MenuGroup": "Erp|Kurs" @@ -204,9 +204,9 @@ }, { "GroupName": "App.Saas", - "Name": "App.Branches.Activity", + "Name": "App.Branches.Note", "ParentName": "App.Branches", - "DisplayName": "Activity", + "DisplayName": "Note", "IsEnabled": true, "MultiTenancySide": 2, "MenuGroup": "Erp|Kurs" @@ -267,9 +267,9 @@ }, { "GroupName": "App.Saas", - "Name": "App.Settings.SettingDefinitions.Activity", + "Name": "App.Settings.SettingDefinitions.Note", "ParentName": "App.Settings.SettingDefinitions", - "DisplayName": "Activity", + "DisplayName": "Note", "IsEnabled": true, "MultiTenancySide": 2, "MenuGroup": "Erp|Kurs" @@ -330,9 +330,9 @@ }, { "GroupName": "App.Saas", - "Name": "App.Settings.GlobalSearch.Activity", + "Name": "App.Settings.GlobalSearch.Note", "ParentName": "App.Settings.GlobalSearch", - "DisplayName": "Activity", + "DisplayName": "Note", "IsEnabled": true, "MultiTenancySide": 2, "MenuGroup": "Erp|Kurs" @@ -393,9 +393,9 @@ }, { "GroupName": "App.Saas", - "Name": "App.Languages.Language.Activity", + "Name": "App.Languages.Language.Note", "ParentName": "App.Languages.Language", - "DisplayName": "Activity", + "DisplayName": "Note", "IsEnabled": true, "MultiTenancySide": 2, "MenuGroup": "Erp|Kurs" @@ -456,9 +456,9 @@ }, { "GroupName": "App.Saas", - "Name": "App.Languages.LanguageText.Activity", + "Name": "App.Languages.LanguageText.Note", "ParentName": "App.Languages.LanguageText", - "DisplayName": "Activity", + "DisplayName": "Note", "IsEnabled": true, "MultiTenancySide": 2, "MenuGroup": "Erp|Kurs" @@ -519,9 +519,9 @@ }, { "GroupName": "App.Saas", - "Name": "App.Routes.Activity", + "Name": "App.Routes.Note", "ParentName": "App.Routes", - "DisplayName": "Activity", + "DisplayName": "Note", "IsEnabled": true, "MultiTenancySide": 2, "MenuGroup": "Erp|Kurs" @@ -591,9 +591,9 @@ }, { "GroupName": "App.Saas", - "Name": "App.Menus.Menu.Activity", + "Name": "App.Menus.Menu.Note", "ParentName": "App.Menus.Menu", - "DisplayName": "Activity", + "DisplayName": "Note", "IsEnabled": true, "MultiTenancySide": 2, "MenuGroup": "Erp|Kurs" @@ -654,9 +654,9 @@ }, { "GroupName": "App.Saas", - "Name": "App.Listforms.DataSource.Activity", + "Name": "App.Listforms.DataSource.Note", "ParentName": "App.Listforms.DataSource", - "DisplayName": "Activity", + "DisplayName": "Note", "IsEnabled": true, "MultiTenancySide": 2, "MenuGroup": "Erp|Kurs" @@ -726,9 +726,9 @@ }, { "GroupName": "App.Saas", - "Name": "App.Listforms.Listform.Activity", + "Name": "App.Listforms.Listform.Note", "ParentName": "App.Listforms.Listform", - "DisplayName": "Activity", + "DisplayName": "Note", "IsEnabled": true, "MultiTenancySide": 2, "MenuGroup": "Erp|Kurs" @@ -789,9 +789,9 @@ }, { "GroupName": "App.Saas", - "Name": "App.Listforms.ListformField.Activity", + "Name": "App.Listforms.ListformField.Note", "ParentName": "App.Listforms.ListformField", - "DisplayName": "Activity", + "DisplayName": "Note", "IsEnabled": true, "MultiTenancySide": 2, "MenuGroup": "Erp|Kurs" @@ -852,9 +852,9 @@ }, { "GroupName": "App.Saas", - "Name": "App.Notifications.NotificationRules.Activity", + "Name": "App.Notifications.NotificationRules.Note", "ParentName": "App.Notifications.NotificationRules", - "DisplayName": "Activity", + "DisplayName": "Note", "IsEnabled": true, "MultiTenancySide": 2, "MenuGroup": "Erp|Kurs" @@ -915,9 +915,9 @@ }, { "GroupName": "App.Saas", - "Name": "App.Notifications.Notification.Activity", + "Name": "App.Notifications.Notification.Note", "ParentName": "App.Notifications.Notification", - "DisplayName": "Activity", + "DisplayName": "Note", "IsEnabled": true, "MultiTenancySide": 2, "MenuGroup": "Erp|Kurs" @@ -978,9 +978,9 @@ }, { "GroupName": "App.Saas", - "Name": "App.BackgroundWorkers.Activity", + "Name": "App.BackgroundWorkers.Note", "ParentName": "App.BackgroundWorkers", - "DisplayName": "Activity", + "DisplayName": "Note", "IsEnabled": true, "MultiTenancySide": 2, "MenuGroup": "Erp|Kurs" @@ -1041,9 +1041,9 @@ }, { "GroupName": "App.Saas", - "Name": "App.ForumManagement.Activity", + "Name": "App.ForumManagement.Note", "ParentName": "App.ForumManagement", - "DisplayName": "Activity", + "DisplayName": "Note", "IsEnabled": true, "MultiTenancySide": 2, "MenuGroup": "Erp|Kurs" @@ -1113,9 +1113,9 @@ }, { "GroupName": "App.Saas", - "Name": "App.Definitions.ContactTag.Activity", + "Name": "App.Definitions.ContactTag.Note", "ParentName": "App.Definitions.ContactTag", - "DisplayName": "Activity", + "DisplayName": "Note", "IsEnabled": true, "MultiTenancySide": 2, "MenuGroup": "Erp|Kurs" @@ -1176,9 +1176,9 @@ }, { "GroupName": "App.Saas", - "Name": "App.Definitions.ContactTitle.Activity", + "Name": "App.Definitions.ContactTitle.Note", "ParentName": "App.Definitions.ContactTitle", - "DisplayName": "Activity", + "DisplayName": "Note", "IsEnabled": true, "MultiTenancySide": 2, "MenuGroup": "Erp|Kurs" @@ -1239,9 +1239,9 @@ }, { "GroupName": "App.Saas", - "Name": "App.Definitions.Currency.Activity", + "Name": "App.Definitions.Currency.Note", "ParentName": "App.Definitions.Currency", - "DisplayName": "Activity", + "DisplayName": "Note", "IsEnabled": true, "MultiTenancySide": 2, "MenuGroup": "Erp|Kurs" @@ -1302,9 +1302,9 @@ }, { "GroupName": "App.Saas", - "Name": "App.Definitions.CountryGroup.Activity", + "Name": "App.Definitions.CountryGroup.Note", "ParentName": "App.Definitions.CountryGroup", - "DisplayName": "Activity", + "DisplayName": "Note", "IsEnabled": true, "MultiTenancySide": 2, "MenuGroup": "Erp|Kurs" @@ -1365,9 +1365,9 @@ }, { "GroupName": "App.Saas", - "Name": "App.Definitions.Country.Activity", + "Name": "App.Definitions.Country.Note", "ParentName": "App.Definitions.Country", - "DisplayName": "Activity", + "DisplayName": "Note", "IsEnabled": true, "MultiTenancySide": 2, "MenuGroup": "Erp|Kurs" @@ -1428,9 +1428,9 @@ }, { "GroupName": "App.Saas", - "Name": "App.Definitions.City.Activity", + "Name": "App.Definitions.City.Note", "ParentName": "App.Definitions.City", - "DisplayName": "Activity", + "DisplayName": "Note", "IsEnabled": true, "MultiTenancySide": 2, "MenuGroup": "Erp|Kurs" @@ -1491,9 +1491,9 @@ }, { "GroupName": "App.Saas", - "Name": "App.Definitions.District.Activity", + "Name": "App.Definitions.District.Note", "ParentName": "App.Definitions.District", - "DisplayName": "Activity", + "DisplayName": "Note", "IsEnabled": true, "MultiTenancySide": 2, "MenuGroup": "Erp|Kurs" @@ -1761,9 +1761,9 @@ }, { "GroupName": "App.Administration", - "Name": "Abp.Identity.PermissionGroups.Activity", + "Name": "Abp.Identity.PermissionGroups.Note", "ParentName": "Abp.Identity.PermissionGroups", - "DisplayName": "Activity", + "DisplayName": "Note", "IsEnabled": true, "MultiTenancySide": 2, "MenuGroup": "Erp|Kurs" @@ -1824,9 +1824,9 @@ }, { "GroupName": "App.Administration", - "Name": "Abp.Identity.Permissions.Activity", + "Name": "Abp.Identity.Permissions.Note", "ParentName": "Abp.Identity.Permissions", - "DisplayName": "Activity", + "DisplayName": "Note", "IsEnabled": true, "MultiTenancySide": 2, "MenuGroup": "Erp|Kurs" @@ -1887,9 +1887,9 @@ }, { "GroupName": "App.Administration", - "Name": "App.ClaimType.Activity", + "Name": "App.ClaimType.Note", "ParentName": "App.ClaimType", - "DisplayName": "Activity", + "DisplayName": "Note", "IsEnabled": true, "MultiTenancySide": 3, "MenuGroup": "Erp|Kurs" @@ -1950,9 +1950,9 @@ }, { "GroupName": "App.Administration", - "Name": "AbpIdentity.Roles.Activity", + "Name": "AbpIdentity.Roles.Note", "ParentName": "AbpIdentity.Roles", - "DisplayName": "Activity", + "DisplayName": "Note", "IsEnabled": true, "MultiTenancySide": 3, "MenuGroup": "Erp|Kurs" @@ -2031,9 +2031,9 @@ }, { "GroupName": "App.Administration", - "Name": "AbpIdentity.Users.Activity", + "Name": "AbpIdentity.Users.Note", "ParentName": "AbpIdentity.Users", - "DisplayName": "Activity", + "DisplayName": "Note", "IsEnabled": true, "MultiTenancySide": 3, "MenuGroup": "Erp|Kurs" @@ -2121,9 +2121,9 @@ }, { "GroupName": "App.Administration", - "Name": "App.IpRestrictions.Activity", + "Name": "App.IpRestrictions.Note", "ParentName": "App.IpRestrictions", - "DisplayName": "Activity", + "DisplayName": "Note", "IsEnabled": true, "MultiTenancySide": 3, "MenuGroup": "Erp|Kurs" @@ -2184,9 +2184,9 @@ }, { "GroupName": "App.Administration", - "Name": "App.AuditLogs.Activity", + "Name": "App.AuditLogs.Note", "ParentName": "App.AuditLogs", - "DisplayName": "Activity", + "DisplayName": "Note", "IsEnabled": true, "MultiTenancySide": 3, "MenuGroup": "Erp|Kurs" @@ -2292,9 +2292,9 @@ }, { "GroupName": "App.Administration", - "Name": "App.DeveloperKit.CustomEndpoints.Activity", + "Name": "App.DeveloperKit.CustomEndpoints.Note", "ParentName": "App.DeveloperKit.CustomEndpoints", - "DisplayName": "Activity", + "DisplayName": "Note", "IsEnabled": true, "MultiTenancySide": 3, "MenuGroup": "Erp|Kurs" @@ -2454,9 +2454,9 @@ }, { "GroupName": "App.Administration", - "Name": "App.Reports.Categories.Activity", + "Name": "App.Reports.Categories.Note", "ParentName": "App.Reports.Categories", - "DisplayName": "Activity", + "DisplayName": "Note", "IsEnabled": true, "MultiTenancySide": 3, "MenuGroup": "Erp|Kurs" @@ -2517,9 +2517,9 @@ }, { "GroupName": "App.Administration", - "Name": "App.Reports.Management.Activity", + "Name": "App.Reports.Management.Note", "ParentName": "App.Reports.Management", - "DisplayName": "Activity", + "DisplayName": "Note", "IsEnabled": true, "MultiTenancySide": 3, "MenuGroup": "Erp|Kurs" @@ -2580,9 +2580,9 @@ }, { "GroupName": "App.Administration", - "Name": "App.About.Activity", + "Name": "App.About.Note", "ParentName": "App.About", - "DisplayName": "Activity", + "DisplayName": "Note", "IsEnabled": true, "MultiTenancySide": 3, "MenuGroup": "Erp|Kurs" @@ -2643,9 +2643,9 @@ }, { "GroupName": "App.Administration", - "Name": "App.Services.Activity", + "Name": "App.Services.Note", "ParentName": "App.Services", - "DisplayName": "Activity", + "DisplayName": "Note", "IsEnabled": true, "MultiTenancySide": 3, "MenuGroup": "Erp|Kurs" @@ -2706,9 +2706,9 @@ }, { "GroupName": "App.Administration", - "Name": "App.Orders.Products.Activity", + "Name": "App.Orders.Products.Note", "ParentName": "App.Orders.Products", - "DisplayName": "Activity", + "DisplayName": "Note", "IsEnabled": true, "MultiTenancySide": 3, "MenuGroup": "Erp|Kurs" @@ -2769,9 +2769,9 @@ }, { "GroupName": "App.Administration", - "Name": "App.Orders.PaymentMethods.Activity", + "Name": "App.Orders.PaymentMethods.Note", "ParentName": "App.Orders.PaymentMethods", - "DisplayName": "Activity", + "DisplayName": "Note", "IsEnabled": true, "MultiTenancySide": 3, "MenuGroup": "Erp|Kurs" @@ -2832,9 +2832,9 @@ }, { "GroupName": "App.Administration", - "Name": "App.Orders.InstallmentOptions.Activity", + "Name": "App.Orders.InstallmentOptions.Note", "ParentName": "App.Orders.InstallmentOptions", - "DisplayName": "Activity", + "DisplayName": "Note", "IsEnabled": true, "MultiTenancySide": 3, "MenuGroup": "Erp|Kurs" @@ -2895,9 +2895,9 @@ }, { "GroupName": "App.Administration", - "Name": "App.Orders.PurchaseOrders.Activity", + "Name": "App.Orders.PurchaseOrders.Note", "ParentName": "App.Orders.PurchaseOrders", - "DisplayName": "Activity", + "DisplayName": "Note", "IsEnabled": true, "MultiTenancySide": 3, "MenuGroup": "Erp|Kurs" @@ -2958,9 +2958,9 @@ }, { "GroupName": "App.Administration", - "Name": "App.BlogManagement.Category.Activity", + "Name": "App.BlogManagement.Category.Note", "ParentName": "App.BlogManagement.Category", - "DisplayName": "Activity", + "DisplayName": "Note", "IsEnabled": true, "MultiTenancySide": 3, "MenuGroup": "Erp|Kurs" @@ -3021,9 +3021,9 @@ }, { "GroupName": "App.Administration", - "Name": "App.BlogManagement.Posts.Activity", + "Name": "App.BlogManagement.Posts.Note", "ParentName": "App.BlogManagement.Posts", - "DisplayName": "Activity", + "DisplayName": "Note", "IsEnabled": true, "MultiTenancySide": 3, "MenuGroup": "Erp|Kurs" @@ -3102,9 +3102,9 @@ }, { "GroupName": "App.Administration", - "Name": "App.Demos.Activity", + "Name": "App.Demos.Note", "ParentName": "App.Demos", - "DisplayName": "Activity", + "DisplayName": "Note", "IsEnabled": true, "MultiTenancySide": 3, "MenuGroup": "Erp|Kurs" @@ -3165,9 +3165,9 @@ }, { "GroupName": "App.Administration", - "Name": "App.Contact.Activity", + "Name": "App.Contact.Note", "ParentName": "App.Contact", - "DisplayName": "Activity", + "DisplayName": "Note", "IsEnabled": true, "MultiTenancySide": 3, "MenuGroup": "Erp|Kurs" @@ -3273,9 +3273,9 @@ }, { "GroupName": "App.Administration", - "Name": "App.Definitions.Sector.Activity", + "Name": "App.Definitions.Sector.Note", "ParentName": "App.Definitions.Sector", - "DisplayName": "Activity", + "DisplayName": "Note", "IsEnabled": true, "MultiTenancySide": 3, "MenuGroup": "Erp|Kurs" @@ -3336,9 +3336,9 @@ }, { "GroupName": "App.Administration", - "Name": "App.Definitions.SkillType.Activity", + "Name": "App.Definitions.SkillType.Note", "ParentName": "App.Definitions.SkillType", - "DisplayName": "Activity", + "DisplayName": "Note", "IsEnabled": true, "MultiTenancySide": 3, "MenuGroup": "Erp|Kurs" @@ -3399,9 +3399,9 @@ }, { "GroupName": "App.Administration", - "Name": "App.Definitions.SkillLevel.Activity", + "Name": "App.Definitions.SkillLevel.Note", "ParentName": "App.Definitions.SkillLevel", - "DisplayName": "Activity", + "DisplayName": "Note", "IsEnabled": true, "MultiTenancySide": 3, "MenuGroup": "Erp|Kurs" @@ -3462,9 +3462,9 @@ }, { "GroupName": "App.Administration", - "Name": "App.Definitions.Skill.Activity", + "Name": "App.Definitions.Skill.Note", "ParentName": "App.Definitions.Skill", - "DisplayName": "Activity", + "DisplayName": "Note", "IsEnabled": true, "MultiTenancySide": 3, "MenuGroup": "Erp|Kurs" @@ -3525,9 +3525,9 @@ }, { "GroupName": "App.Administration", - "Name": "App.Definitions.UomCategory.Activity", + "Name": "App.Definitions.UomCategory.Note", "ParentName": "App.Definitions.UomCategory", - "DisplayName": "Activity", + "DisplayName": "Note", "IsEnabled": true, "MultiTenancySide": 3, "MenuGroup": "Erp|Kurs" @@ -3588,9 +3588,9 @@ }, { "GroupName": "App.Administration", - "Name": "App.Definitions.Uom.Activity", + "Name": "App.Definitions.Uom.Note", "ParentName": "App.Definitions.Uom", - "DisplayName": "Activity", + "DisplayName": "Note", "IsEnabled": true, "MultiTenancySide": 3, "MenuGroup": "Erp|Kurs" @@ -3651,9 +3651,9 @@ }, { "GroupName": "App.Administration", - "Name": "App.Definitions.Behavior.Activity", + "Name": "App.Definitions.Behavior.Note", "ParentName": "App.Definitions.Behavior", - "DisplayName": "Activity", + "DisplayName": "Note", "IsEnabled": true, "MultiTenancySide": 3, "MenuGroup": "Erp|Kurs" @@ -3714,9 +3714,9 @@ }, { "GroupName": "App.Administration", - "Name": "App.Definitions.Disease.Activity", + "Name": "App.Definitions.Disease.Note", "ParentName": "App.Definitions.Disease", - "DisplayName": "Activity", + "DisplayName": "Note", "IsEnabled": true, "MultiTenancySide": 3, "MenuGroup": "Kurs" @@ -3777,9 +3777,9 @@ }, { "GroupName": "App.Administration", - "Name": "App.Definitions.Document.Activity", + "Name": "App.Definitions.Document.Note", "ParentName": "App.Definitions.Document", - "DisplayName": "Activity", + "DisplayName": "Note", "IsEnabled": true, "MultiTenancySide": 3, "MenuGroup": "Kurs" @@ -3840,9 +3840,9 @@ }, { "GroupName": "App.Administration", - "Name": "App.Definitions.EducationStatus.Activity", + "Name": "App.Definitions.EducationStatus.Note", "ParentName": "App.Definitions.EducationStatus", - "DisplayName": "Activity", + "DisplayName": "Note", "IsEnabled": true, "MultiTenancySide": 3, "MenuGroup": "Kurs" @@ -3903,9 +3903,9 @@ }, { "GroupName": "App.Administration", - "Name": "App.Definitions.Vaccine.Activity", + "Name": "App.Definitions.Vaccine.Note", "ParentName": "App.Definitions.Vaccine", - "DisplayName": "Activity", + "DisplayName": "Note", "IsEnabled": true, "MultiTenancySide": 3, "MenuGroup": "Kurs" @@ -3966,9 +3966,9 @@ }, { "GroupName": "App.Administration", - "Name": "App.Definitions.Vehicle.Activity", + "Name": "App.Definitions.Vehicle.Note", "ParentName": "App.Definitions.Vehicle", - "DisplayName": "Activity", + "DisplayName": "Note", "IsEnabled": true, "MultiTenancySide": 3, "MenuGroup": "Kurs" @@ -4029,9 +4029,9 @@ }, { "GroupName": "App.Administration", - "Name": "App.Definitions.Psychologist.Activity", + "Name": "App.Definitions.Psychologist.Note", "ParentName": "App.Definitions.Psychologist", - "DisplayName": "Activity", + "DisplayName": "Note", "IsEnabled": true, "MultiTenancySide": 3, "MenuGroup": "Kurs" @@ -4092,9 +4092,9 @@ }, { "GroupName": "App.Administration", - "Name": "App.Definitions.WorkHour.Activity", + "Name": "App.Definitions.WorkHour.Note", "ParentName": "App.Definitions.WorkHour", - "DisplayName": "Activity", + "DisplayName": "Note", "IsEnabled": true, "MultiTenancySide": 3, "MenuGroup": "Kurs" @@ -4155,9 +4155,9 @@ }, { "GroupName": "App.Administration", - "Name": "App.Definitions.Lawyer.Activity", + "Name": "App.Definitions.Lawyer.Note", "ParentName": "App.Definitions.Lawyer", - "DisplayName": "Activity", + "DisplayName": "Note", "IsEnabled": true, "MultiTenancySide": 3, "MenuGroup": "Kurs" @@ -4218,9 +4218,9 @@ }, { "GroupName": "App.Participant", - "Name": "App.Definitions.MeetingMethod.Activity", + "Name": "App.Definitions.MeetingMethod.Note", "ParentName": "App.Definitions.MeetingMethod", - "DisplayName": "Activity", + "DisplayName": "Note", "IsEnabled": true, "MultiTenancySide": 3, "MenuGroup": "Kurs" @@ -4281,9 +4281,9 @@ }, { "GroupName": "App.Participant", - "Name": "App.Definitions.MeetingResult.Activity", + "Name": "App.Definitions.MeetingResult.Note", "ParentName": "App.Definitions.MeetingResult", - "DisplayName": "Activity", + "DisplayName": "Note", "IsEnabled": true, "MultiTenancySide": 3, "MenuGroup": "Kurs" @@ -4344,9 +4344,9 @@ }, { "GroupName": "App.Participant", - "Name": "App.Definitions.Source.Activity", + "Name": "App.Definitions.Source.Note", "ParentName": "App.Definitions.Source", - "DisplayName": "Activity", + "DisplayName": "Note", "IsEnabled": true, "MultiTenancySide": 3, "MenuGroup": "Kurs" @@ -4407,9 +4407,9 @@ }, { "GroupName": "App.Participant", - "Name": "App.Definitions.Interesting.Activity", + "Name": "App.Definitions.Interesting.Note", "ParentName": "App.Definitions.Interesting", - "DisplayName": "Activity", + "DisplayName": "Note", "IsEnabled": true, "MultiTenancySide": 3, "MenuGroup": "Kurs" @@ -4470,9 +4470,9 @@ }, { "GroupName": "App.Participant", - "Name": "App.Definitions.SalesRejectionReason.Activity", + "Name": "App.Definitions.SalesRejectionReason.Note", "ParentName": "App.Definitions.SalesRejectionReason", - "DisplayName": "Activity", + "DisplayName": "Note", "IsEnabled": true, "MultiTenancySide": 3, "MenuGroup": "Kurs" @@ -4533,9 +4533,9 @@ }, { "GroupName": "App.Participant", - "Name": "App.Definitions.NoteType.Activity", + "Name": "App.Definitions.NoteType.Note", "ParentName": "App.Definitions.NoteType", - "DisplayName": "Activity", + "DisplayName": "Note", "IsEnabled": true, "MultiTenancySide": 3, "MenuGroup": "Kurs" @@ -4596,9 +4596,9 @@ }, { "GroupName": "App.Coordinator", - "Name": "App.Definitions.Program.Activity", + "Name": "App.Definitions.Program.Note", "ParentName": "App.Definitions.Program", - "DisplayName": "Activity", + "DisplayName": "Note", "IsEnabled": true, "MultiTenancySide": 3, "MenuGroup": "Kurs" @@ -4659,9 +4659,9 @@ }, { "GroupName": "App.Coordinator", - "Name": "App.Definitions.Schedule.Activity", + "Name": "App.Definitions.Schedule.Note", "ParentName": "App.Definitions.Schedule", - "DisplayName": "Activity", + "DisplayName": "Note", "IsEnabled": true, "MultiTenancySide": 3, "MenuGroup": "Kurs" @@ -4722,9 +4722,9 @@ }, { "GroupName": "App.Coordinator", - "Name": "App.Definitions.ScheduleLesson.Activity", + "Name": "App.Definitions.ScheduleLesson.Note", "ParentName": "App.Definitions.ScheduleLesson", - "DisplayName": "Activity", + "DisplayName": "Note", "IsEnabled": true, "MultiTenancySide": 3, "MenuGroup": "Kurs" @@ -4785,9 +4785,9 @@ }, { "GroupName": "App.Coordinator", - "Name": "App.Definitions.RegistrationType.Activity", + "Name": "App.Definitions.RegistrationType.Note", "ParentName": "App.Definitions.RegistrationType", - "DisplayName": "Activity", + "DisplayName": "Note", "IsEnabled": true, "MultiTenancySide": 3, "MenuGroup": "Kurs" @@ -4848,9 +4848,9 @@ }, { "GroupName": "App.Coordinator", - "Name": "App.Definitions.RegistrationMethod.Activity", + "Name": "App.Definitions.RegistrationMethod.Note", "ParentName": "App.Definitions.RegistrationMethod", - "DisplayName": "Activity", + "DisplayName": "Note", "IsEnabled": true, "MultiTenancySide": 3, "MenuGroup": "Kurs" @@ -4911,9 +4911,9 @@ }, { "GroupName": "App.Coordinator", - "Name": "App.Definitions.ClassType.Activity", + "Name": "App.Definitions.ClassType.Note", "ParentName": "App.Definitions.ClassType", - "DisplayName": "Activity", + "DisplayName": "Note", "IsEnabled": true, "MultiTenancySide": 3, "MenuGroup": "Kurs" @@ -4974,9 +4974,9 @@ }, { "GroupName": "App.Coordinator", - "Name": "App.Definitions.Class.Activity", + "Name": "App.Definitions.Class.Note", "ParentName": "App.Definitions.Class", - "DisplayName": "Activity", + "DisplayName": "Note", "IsEnabled": true, "MultiTenancySide": 3, "MenuGroup": "Kurs" @@ -5037,9 +5037,9 @@ }, { "GroupName": "App.Coordinator", - "Name": "App.Definitions.Level.Activity", + "Name": "App.Definitions.Level.Note", "ParentName": "App.Definitions.Level", - "DisplayName": "Activity", + "DisplayName": "Note", "IsEnabled": true, "MultiTenancySide": 3, "MenuGroup": "Kurs" @@ -5100,9 +5100,9 @@ }, { "GroupName": "App.Coordinator", - "Name": "App.Definitions.ClassCancellationReason.Activity", + "Name": "App.Definitions.ClassCancellationReason.Note", "ParentName": "App.Definitions.ClassCancellationReason", - "DisplayName": "Activity", + "DisplayName": "Note", "IsEnabled": true, "MultiTenancySide": 3, "MenuGroup": "Kurs" @@ -5163,9 +5163,9 @@ }, { "GroupName": "App.Coordinator", - "Name": "App.Definitions.LessonPeriod.Activity", + "Name": "App.Definitions.LessonPeriod.Note", "ParentName": "App.Definitions.LessonPeriod", - "DisplayName": "Activity", + "DisplayName": "Note", "IsEnabled": true, "MultiTenancySide": 3, "MenuGroup": "Kurs" @@ -5226,9 +5226,9 @@ }, { "GroupName": "App.Coordinator", - "Name": "App.Definitions.QuestionTag.Activity", + "Name": "App.Definitions.QuestionTag.Note", "ParentName": "App.Definitions.QuestionTag", - "DisplayName": "Activity", + "DisplayName": "Note", "IsEnabled": true, "MultiTenancySide": 3, "MenuGroup": "Kurs" @@ -5289,9 +5289,9 @@ }, { "GroupName": "App.Coordinator", - "Name": "App.Definitions.QuestionPool.Activity", + "Name": "App.Definitions.QuestionPool.Note", "ParentName": "App.Definitions.QuestionPool", - "DisplayName": "Activity", + "DisplayName": "Note", "IsEnabled": true, "MultiTenancySide": 3, "MenuGroup": "Kurs" @@ -5352,9 +5352,9 @@ }, { "GroupName": "App.Coordinator", - "Name": "App.Definitions.Question.Activity", + "Name": "App.Definitions.Question.Note", "ParentName": "App.Definitions.Question", - "DisplayName": "Activity", + "DisplayName": "Note", "IsEnabled": true, "MultiTenancySide": 3, "MenuGroup": "Kurs" @@ -5487,9 +5487,9 @@ }, { "GroupName": "App.SupplyChain", - "Name": "App.SupplyChain.PaymentTerm.Activity", + "Name": "App.SupplyChain.PaymentTerm.Note", "ParentName": "App.SupplyChain.PaymentTerm", - "DisplayName": "Activity", + "DisplayName": "Note", "IsEnabled": true, "MultiTenancySide": 3, "MenuGroup": "Erp" @@ -5550,9 +5550,9 @@ }, { "GroupName": "App.SupplyChain", - "Name": "App.SupplyChain.SupplyType.Activity", + "Name": "App.SupplyChain.SupplyType.Note", "ParentName": "App.SupplyChain.SupplyType", - "DisplayName": "Activity", + "DisplayName": "Note", "IsEnabled": true, "MultiTenancySide": 3, "MenuGroup": "Erp" @@ -5613,9 +5613,9 @@ }, { "GroupName": "App.SupplyChain", - "Name": "App.SupplyChain.SupplyCardType.Activity", + "Name": "App.SupplyChain.SupplyCardType.Note", "ParentName": "App.SupplyChain.SupplyCardType", - "DisplayName": "Activity", + "DisplayName": "Note", "IsEnabled": true, "MultiTenancySide": 3, "MenuGroup": "Erp" @@ -5676,9 +5676,9 @@ }, { "GroupName": "App.SupplyChain", - "Name": "App.SupplyChain.PartnerBank.Activity", + "Name": "App.SupplyChain.PartnerBank.Note", "ParentName": "App.SupplyChain.PartnerBank", - "DisplayName": "Activity", + "DisplayName": "Note", "IsEnabled": true, "MultiTenancySide": 3, "MenuGroup": "Erp" @@ -5739,9 +5739,9 @@ }, { "GroupName": "App.SupplyChain", - "Name": "App.SupplyChain.PartnerCertificate.Activity", + "Name": "App.SupplyChain.PartnerCertificate.Note", "ParentName": "App.SupplyChain.PartnerCertificate", - "DisplayName": "Activity", + "DisplayName": "Note", "IsEnabled": true, "MultiTenancySide": 3, "MenuGroup": "Erp" @@ -5802,9 +5802,9 @@ }, { "GroupName": "App.SupplyChain", - "Name": "App.SupplyChain.PartnerContact.Activity", + "Name": "App.SupplyChain.PartnerContact.Note", "ParentName": "App.SupplyChain.PartnerContact", - "DisplayName": "Activity", + "DisplayName": "Note", "IsEnabled": true, "MultiTenancySide": 3, "MenuGroup": "Erp" @@ -5865,9 +5865,9 @@ }, { "GroupName": "App.SupplyChain", - "Name": "App.SupplyChain.MaterialType.Activity", + "Name": "App.SupplyChain.MaterialType.Note", "ParentName": "App.SupplyChain.MaterialType", - "DisplayName": "Activity", + "DisplayName": "Note", "IsEnabled": true, "MultiTenancySide": 3, "MenuGroup": "Erp" @@ -5928,9 +5928,9 @@ }, { "GroupName": "App.SupplyChain", - "Name": "App.SupplyChain.MaterialGroup.Activity", + "Name": "App.SupplyChain.MaterialGroup.Note", "ParentName": "App.SupplyChain.MaterialGroup", - "DisplayName": "Activity", + "DisplayName": "Note", "IsEnabled": true, "MultiTenancySide": 3, "MenuGroup": "Erp" @@ -5991,9 +5991,9 @@ }, { "GroupName": "App.SupplyChain", - "Name": "App.SupplyChain.Material.Activity", + "Name": "App.SupplyChain.Material.Note", "ParentName": "App.SupplyChain.Material", - "DisplayName": "Activity", + "DisplayName": "Note", "IsEnabled": true, "MultiTenancySide": 3, "MenuGroup": "Erp" @@ -6054,9 +6054,9 @@ }, { "GroupName": "App.SupplyChain", - "Name": "App.SupplyChain.Supply.Activity", + "Name": "App.SupplyChain.Supply.Note", "ParentName": "App.SupplyChain.Supply", - "DisplayName": "Activity", + "DisplayName": "Note", "IsEnabled": true, "MultiTenancySide": 3, "MenuGroup": "Erp" @@ -6117,9 +6117,9 @@ }, { "GroupName": "App.SupplyChain", - "Name": "App.SupplyChain.Request.Activity", + "Name": "App.SupplyChain.Request.Note", "ParentName": "App.SupplyChain.Request", - "DisplayName": "Activity", + "DisplayName": "Note", "IsEnabled": true, "MultiTenancySide": 3, "MenuGroup": "Erp" @@ -6180,9 +6180,9 @@ }, { "GroupName": "App.SupplyChain", - "Name": "App.SupplyChain.Quotation.Activity", + "Name": "App.SupplyChain.Quotation.Note", "ParentName": "App.SupplyChain.Quotation", - "DisplayName": "Activity", + "DisplayName": "Note", "IsEnabled": true, "MultiTenancySide": 3, "MenuGroup": "Erp" @@ -6243,9 +6243,9 @@ }, { "GroupName": "App.SupplyChain", - "Name": "App.SupplyChain.Approval.Activity", + "Name": "App.SupplyChain.Approval.Note", "ParentName": "App.SupplyChain.Approval", - "DisplayName": "Activity", + "DisplayName": "Note", "IsEnabled": true, "MultiTenancySide": 3, "MenuGroup": "Erp" @@ -6306,9 +6306,9 @@ }, { "GroupName": "App.SupplyChain", - "Name": "App.SupplyChain.ApprovalStep.Activity", + "Name": "App.SupplyChain.ApprovalStep.Note", "ParentName": "App.SupplyChain.ApprovalStep", - "DisplayName": "Activity", + "DisplayName": "Note", "IsEnabled": true, "MultiTenancySide": 3, "MenuGroup": "Erp" @@ -6369,9 +6369,9 @@ }, { "GroupName": "App.SupplyChain", - "Name": "App.SupplyChain.Order.Activity", + "Name": "App.SupplyChain.Order.Note", "ParentName": "App.SupplyChain.Order", - "DisplayName": "Activity", + "DisplayName": "Note", "IsEnabled": true, "MultiTenancySide": 3, "MenuGroup": "Erp" @@ -6432,9 +6432,9 @@ }, { "GroupName": "App.SupplyChain", - "Name": "App.SupplyChain.Delivery.Activity", + "Name": "App.SupplyChain.Delivery.Note", "ParentName": "App.SupplyChain.Delivery", - "DisplayName": "Activity", + "DisplayName": "Note", "IsEnabled": true, "MultiTenancySide": 3, "MenuGroup": "Erp" @@ -6495,9 +6495,9 @@ }, { "GroupName": "App.Maintenance", - "Name": "App.Maintenance.Workcenter.Activity", + "Name": "App.Maintenance.Workcenter.Note", "ParentName": "App.Maintenance.Workcenter", - "DisplayName": "Activity", + "DisplayName": "Note", "IsEnabled": true, "MultiTenancySide": 3, "MenuGroup": "Erp" @@ -6558,9 +6558,9 @@ }, { "GroupName": "App.Maintenance", - "Name": "App.Maintenance.Plans.Activity", + "Name": "App.Maintenance.Plans.Note", "ParentName": "App.Maintenance.Plans", - "DisplayName": "Activity", + "DisplayName": "Note", "IsEnabled": true, "MultiTenancySide": 3, "MenuGroup": "Erp" @@ -6621,9 +6621,9 @@ }, { "GroupName": "App.Maintenance", - "Name": "App.Maintenance.Calendar.Activity", + "Name": "App.Maintenance.Calendar.Note", "ParentName": "App.Maintenance.Calendar", - "DisplayName": "Activity", + "DisplayName": "Note", "IsEnabled": true, "MultiTenancySide": 3, "MenuGroup": "Erp" @@ -6684,9 +6684,9 @@ }, { "GroupName": "App.Maintenance", - "Name": "App.Maintenance.Teams.Activity", + "Name": "App.Maintenance.Teams.Note", "ParentName": "App.Maintenance.Teams", - "DisplayName": "Activity", + "DisplayName": "Note", "IsEnabled": true, "MultiTenancySide": 3, "MenuGroup": "Erp" @@ -6747,9 +6747,9 @@ }, { "GroupName": "App.Maintenance", - "Name": "App.Maintenance.Faults.Activity", + "Name": "App.Maintenance.Faults.Note", "ParentName": "App.Maintenance.Faults", - "DisplayName": "Activity", + "DisplayName": "Note", "IsEnabled": true, "MultiTenancySide": 3, "MenuGroup": "Erp" @@ -6810,9 +6810,9 @@ }, { "GroupName": "App.Maintenance", - "Name": "App.Maintenance.Workorders.Activity", + "Name": "App.Maintenance.Workorders.Note", "ParentName": "App.Maintenance.Workorders", - "DisplayName": "Activity", + "DisplayName": "Note", "IsEnabled": true, "MultiTenancySide": 3, "MenuGroup": "Erp" @@ -6873,9 +6873,9 @@ }, { "GroupName": "App.Warehouse", - "Name": "App.Warehouse.Definitions.Activity", + "Name": "App.Warehouse.Definitions.Note", "ParentName": "App.Warehouse.Definitions", - "DisplayName": "Activity", + "DisplayName": "Note", "IsEnabled": true, "MultiTenancySide": 3, "MenuGroup": "Erp" @@ -6936,9 +6936,9 @@ }, { "GroupName": "App.Warehouse", - "Name": "App.Warehouse.Tracking.Activity", + "Name": "App.Warehouse.Tracking.Note", "ParentName": "App.Warehouse.Tracking", - "DisplayName": "Activity", + "DisplayName": "Note", "IsEnabled": true, "MultiTenancySide": 3, "MenuGroup": "Erp" @@ -6999,9 +6999,9 @@ }, { "GroupName": "App.Warehouse", - "Name": "App.Warehouse.Putaway.Activity", + "Name": "App.Warehouse.Putaway.Note", "ParentName": "App.Warehouse.Putaway", - "DisplayName": "Activity", + "DisplayName": "Note", "IsEnabled": true, "MultiTenancySide": 3, "MenuGroup": "Erp" @@ -7062,9 +7062,9 @@ }, { "GroupName": "App.Warehouse", - "Name": "App.Warehouse.Receipt.Activity", + "Name": "App.Warehouse.Receipt.Note", "ParentName": "App.Warehouse.Receipt", - "DisplayName": "Activity", + "DisplayName": "Note", "IsEnabled": true, "MultiTenancySide": 3, "MenuGroup": "Erp" @@ -7125,9 +7125,9 @@ }, { "GroupName": "App.Warehouse", - "Name": "App.Warehouse.Issue.Activity", + "Name": "App.Warehouse.Issue.Note", "ParentName": "App.Warehouse.Issue", - "DisplayName": "Activity", + "DisplayName": "Note", "IsEnabled": true, "MultiTenancySide": 3, "MenuGroup": "Erp" @@ -7188,9 +7188,9 @@ }, { "GroupName": "App.Warehouse", - "Name": "App.Warehouse.Transfer.Activity", + "Name": "App.Warehouse.Transfer.Note", "ParentName": "App.Warehouse.Transfer", - "DisplayName": "Activity", + "DisplayName": "Note", "IsEnabled": true, "MultiTenancySide": 3, "MenuGroup": "Erp" @@ -7251,9 +7251,9 @@ }, { "GroupName": "App.Warehouse", - "Name": "App.Warehouse.Inventory.Activity", + "Name": "App.Warehouse.Inventory.Note", "ParentName": "App.Warehouse.Inventory", - "DisplayName": "Activity", + "DisplayName": "Note", "IsEnabled": true, "MultiTenancySide": 3, "MenuGroup": "Erp" @@ -7314,9 +7314,9 @@ }, { "GroupName": "App.Warehouse", - "Name": "App.Warehouse.Movements.Activity", + "Name": "App.Warehouse.Movements.Note", "ParentName": "App.Warehouse.Movements", - "DisplayName": "Activity", + "DisplayName": "Note", "IsEnabled": true, "MultiTenancySide": 3, "MenuGroup": "Erp" @@ -7377,9 +7377,9 @@ }, { "GroupName": "App.Warehouse", - "Name": "App.Warehouse.Stocklevel.Activity", + "Name": "App.Warehouse.Stocklevel.Note", "ParentName": "App.Warehouse.Stocklevel", - "DisplayName": "Activity", + "DisplayName": "Note", "IsEnabled": true, "MultiTenancySide": 3, "MenuGroup": "Erp" @@ -7440,9 +7440,9 @@ }, { "GroupName": "App.Projects", - "Name": "App.Projects.List.Activity", + "Name": "App.Projects.List.Note", "ParentName": "App.Projects.List", - "DisplayName": "Activity", + "DisplayName": "Note", "IsEnabled": true, "MultiTenancySide": 3, "MenuGroup": "Erp" @@ -7503,9 +7503,9 @@ }, { "GroupName": "App.Projects", - "Name": "App.Projects.Tasks.Activity", + "Name": "App.Projects.Tasks.Note", "ParentName": "App.Projects.Tasks", - "DisplayName": "Activity", + "DisplayName": "Note", "IsEnabled": true, "MultiTenancySide": 3, "MenuGroup": "Erp" @@ -7575,9 +7575,9 @@ }, { "GroupName": "App.Projects", - "Name": "App.Projects.Phases.Activity", + "Name": "App.Projects.Phases.Note", "ParentName": "App.Projects.Phases", - "DisplayName": "Activity", + "DisplayName": "Note", "IsEnabled": true, "MultiTenancySide": 3, "MenuGroup": "Erp" @@ -7638,9 +7638,9 @@ }, { "GroupName": "App.Projects", - "Name": "App.Projects.Activities.Activity", + "Name": "App.Projects.Activities.Note", "ParentName": "App.Projects.Activities", - "DisplayName": "Activity", + "DisplayName": "Note", "IsEnabled": true, "MultiTenancySide": 3, "MenuGroup": "Erp" @@ -7701,9 +7701,9 @@ }, { "GroupName": "App.Projects", - "Name": "App.Projects.Workload.Activity", + "Name": "App.Projects.Workload.Note", "ParentName": "App.Projects.Workload", - "DisplayName": "Activity", + "DisplayName": "Note", "IsEnabled": true, "MultiTenancySide": 3, "MenuGroup": "Erp" @@ -7764,9 +7764,9 @@ }, { "GroupName": "App.Projects", - "Name": "App.Projects.CostTracking.Activity", + "Name": "App.Projects.CostTracking.Note", "ParentName": "App.Projects.CostTracking", - "DisplayName": "Activity", + "DisplayName": "Note", "IsEnabled": true, "MultiTenancySide": 3, "MenuGroup": "Erp" @@ -7827,9 +7827,9 @@ }, { "GroupName": "App.Projects", - "Name": "App.Projects.DailyUpdates.Activity", + "Name": "App.Projects.DailyUpdates.Note", "ParentName": "App.Projects.DailyUpdates", - "DisplayName": "Activity", + "DisplayName": "Note", "IsEnabled": true, "MultiTenancySide": 3, "MenuGroup": "Erp" @@ -7890,9 +7890,9 @@ }, { "GroupName": "App.Hr", - "Name": "App.Hr.Employee.Activity", + "Name": "App.Hr.Employee.Note", "ParentName": "App.Hr.Employee", - "DisplayName": "Activity", + "DisplayName": "Note", "IsEnabled": true, "MultiTenancySide": 3, "MenuGroup": "Erp" @@ -7962,9 +7962,9 @@ }, { "GroupName": "App.Hr", - "Name": "App.Hr.Department.Activity", + "Name": "App.Hr.Department.Note", "ParentName": "App.Hr.Department", - "DisplayName": "Activity", + "DisplayName": "Note", "IsEnabled": true, "MultiTenancySide": 3, "MenuGroup": "Erp" @@ -8025,9 +8025,9 @@ }, { "GroupName": "App.Hr", - "Name": "App.Hr.JobPosition.Activity", + "Name": "App.Hr.JobPosition.Note", "ParentName": "App.Hr.JobPosition", - "DisplayName": "Activity", + "DisplayName": "Note", "IsEnabled": true, "MultiTenancySide": 3, "MenuGroup": "Erp" @@ -8088,9 +8088,9 @@ }, { "GroupName": "App.Hr", - "Name": "App.Hr.EmploymentType.Activity", + "Name": "App.Hr.EmploymentType.Note", "ParentName": "App.Hr.EmploymentType", - "DisplayName": "Activity", + "DisplayName": "Note", "IsEnabled": true, "MultiTenancySide": 3, "MenuGroup": "Erp" @@ -8151,9 +8151,9 @@ }, { "GroupName": "App.Hr", - "Name": "App.Hr.Organization.Activity", + "Name": "App.Hr.Organization.Note", "ParentName": "App.Hr.Organization", - "DisplayName": "Activity", + "DisplayName": "Note", "IsEnabled": true, "MultiTenancySide": 3, "MenuGroup": "Erp" @@ -8214,9 +8214,9 @@ }, { "GroupName": "App.Hr", - "Name": "App.Hr.Badge.Activity", + "Name": "App.Hr.Badge.Note", "ParentName": "App.Hr.Badge", - "DisplayName": "Activity", + "DisplayName": "Note", "IsEnabled": true, "MultiTenancySide": 3, "MenuGroup": "Erp" @@ -8277,9 +8277,9 @@ }, { "GroupName": "App.Hr", - "Name": "App.Hr.Leave.Activity", + "Name": "App.Hr.Leave.Note", "ParentName": "App.Hr.Leave", - "DisplayName": "Activity", + "DisplayName": "Note", "IsEnabled": true, "MultiTenancySide": 3, "MenuGroup": "Erp" @@ -8349,9 +8349,9 @@ }, { "GroupName": "App.Hr", - "Name": "App.Hr.Overtime.Activity", + "Name": "App.Hr.Overtime.Note", "ParentName": "App.Hr.Overtime", - "DisplayName": "Activity", + "DisplayName": "Note", "IsEnabled": true, "MultiTenancySide": 3, "MenuGroup": "Erp" @@ -8421,9 +8421,9 @@ }, { "GroupName": "App.Hr", - "Name": "App.Hr.Expense.Activity", + "Name": "App.Hr.Expense.Note", "ParentName": "App.Hr.Expense", - "DisplayName": "Activity", + "DisplayName": "Note", "IsEnabled": true, "MultiTenancySide": 3, "MenuGroup": "Erp" @@ -8493,9 +8493,9 @@ }, { "GroupName": "App.Hr", - "Name": "App.Hr.Payroll.Activity", + "Name": "App.Hr.Payroll.Note", "ParentName": "App.Hr.Payroll", - "DisplayName": "Activity", + "DisplayName": "Note", "IsEnabled": true, "MultiTenancySide": 3, "MenuGroup": "Erp" @@ -8556,9 +8556,9 @@ }, { "GroupName": "App.Hr", - "Name": "App.Hr.Training.Activity", + "Name": "App.Hr.Training.Note", "ParentName": "App.Hr.Training", - "DisplayName": "Activity", + "DisplayName": "Note", "IsEnabled": true, "MultiTenancySide": 3, "MenuGroup": "Erp" @@ -8628,9 +8628,9 @@ }, { "GroupName": "App.Hr", - "Name": "App.Hr.Survey.Activity", + "Name": "App.Hr.Survey.Note", "ParentName": "App.Hr.Survey", - "DisplayName": "Activity", + "DisplayName": "Note", "IsEnabled": true, "MultiTenancySide": 3, "MenuGroup": "Erp" @@ -8700,9 +8700,9 @@ }, { "GroupName": "App.Hr", - "Name": "App.Hr.SurveyQuestion.Activity", + "Name": "App.Hr.SurveyQuestion.Note", "ParentName": "App.Hr.SurveyQuestion", - "DisplayName": "Activity", + "DisplayName": "Note", "IsEnabled": true, "MultiTenancySide": 3, "MenuGroup": "Erp" @@ -8763,9 +8763,9 @@ }, { "GroupName": "App.Hr", - "Name": "App.Hr.SurveyResponse.Activity", + "Name": "App.Hr.SurveyResponse.Note", "ParentName": "App.Hr.SurveyResponse", - "DisplayName": "Activity", + "DisplayName": "Note", "IsEnabled": true, "MultiTenancySide": 3, "MenuGroup": "Erp" @@ -8826,9 +8826,9 @@ }, { "GroupName": "App.Hr", - "Name": "App.Hr.CostCenter.Activity", + "Name": "App.Hr.CostCenter.Note", "ParentName": "App.Hr.CostCenter", - "DisplayName": "Activity", + "DisplayName": "Note", "IsEnabled": true, "MultiTenancySide": 3, "MenuGroup": "Erp" @@ -8889,9 +8889,9 @@ }, { "GroupName": "App.Hr", - "Name": "App.Hr.Template360.Activity", + "Name": "App.Hr.Template360.Note", "ParentName": "App.Hr.Template360", - "DisplayName": "Activity", + "DisplayName": "Note", "IsEnabled": true, "MultiTenancySide": 3, "MenuGroup": "Erp" @@ -8952,9 +8952,9 @@ }, { "GroupName": "App.Hr", - "Name": "App.Hr.Performance360.Activity", + "Name": "App.Hr.Performance360.Note", "ParentName": "App.Hr.Performance360", - "DisplayName": "Activity", + "DisplayName": "Note", "IsEnabled": true, "MultiTenancySide": 3, "MenuGroup": "Erp" @@ -9015,9 +9015,9 @@ }, { "GroupName": "App.Intranet", - "Name": "App.Intranet.Events.EventType.Activity", + "Name": "App.Intranet.Events.EventType.Note", "ParentName": "App.Intranet.Events.EventType", - "DisplayName": "Activity", + "DisplayName": "Note", "IsEnabled": true, "MultiTenancySide": 3, "MenuGroup": "Kurs" @@ -9078,9 +9078,9 @@ }, { "GroupName": "App.Intranet", - "Name": "App.Intranet.Events.EventCategory.Activity", + "Name": "App.Intranet.Events.EventCategory.Note", "ParentName": "App.Intranet.Events.EventCategory", - "DisplayName": "Activity", + "DisplayName": "Note", "IsEnabled": true, "MultiTenancySide": 3, "MenuGroup": "Kurs" @@ -9141,9 +9141,9 @@ }, { "GroupName": "App.Intranet", - "Name": "App.Intranet.Events.Event.Activity", + "Name": "App.Intranet.Events.Event.Note", "ParentName": "App.Intranet.Events.Event", - "DisplayName": "Activity", + "DisplayName": "Note", "IsEnabled": true, "MultiTenancySide": 3, "MenuGroup": "Kurs" @@ -9213,9 +9213,9 @@ }, { "GroupName": "App.Intranet", - "Name": "App.Intranet.Meal.Activity", + "Name": "App.Intranet.Meal.Note", "ParentName": "App.Intranet.Meal", - "DisplayName": "Activity", + "DisplayName": "Note", "IsEnabled": true, "MultiTenancySide": 3, "MenuGroup": "Kurs" @@ -9285,9 +9285,9 @@ }, { "GroupName": "App.Intranet", - "Name": "App.Intranet.Reservation.Activity", + "Name": "App.Intranet.Reservation.Note", "ParentName": "App.Intranet.Reservation", - "DisplayName": "Activity", + "DisplayName": "Note", "IsEnabled": true, "MultiTenancySide": 3, "MenuGroup": "Kurs" @@ -9357,9 +9357,9 @@ }, { "GroupName": "App.Intranet", - "Name": "App.Intranet.ShuttleRoute.Activity", + "Name": "App.Intranet.ShuttleRoute.Note", "ParentName": "App.Intranet.ShuttleRoute", - "DisplayName": "Activity", + "DisplayName": "Note", "IsEnabled": true, "MultiTenancySide": 3, "MenuGroup": "Kurs" @@ -9429,9 +9429,9 @@ }, { "GroupName": "App.Intranet", - "Name": "App.Intranet.Announcement.Activity", + "Name": "App.Intranet.Announcement.Note", "ParentName": "App.Intranet.Announcement", - "DisplayName": "Activity", + "DisplayName": "Note", "IsEnabled": true, "MultiTenancySide": 3, "MenuGroup": "Kurs" @@ -9501,9 +9501,9 @@ }, { "GroupName": "App.Intranet", - "Name": "App.Intranet.Visitor.Activity", + "Name": "App.Intranet.Visitor.Note", "ParentName": "App.Intranet.Visitor", - "DisplayName": "Activity", + "DisplayName": "Note", "IsEnabled": true, "MultiTenancySide": 3, "MenuGroup": "Kurs" @@ -9573,9 +9573,9 @@ }, { "GroupName": "App.Intranet", - "Name": "App.Intranet.SocialPost.Activity", + "Name": "App.Intranet.SocialPost.Note", "ParentName": "App.Intranet.SocialPost", - "DisplayName": "Activity", + "DisplayName": "Note", "IsEnabled": true, "MultiTenancySide": 3, "MenuGroup": "Kurs" @@ -9645,9 +9645,9 @@ }, { "GroupName": "App.Crm", - "Name": "App.Crm.CustomerType.Activity", + "Name": "App.Crm.CustomerType.Note", "ParentName": "App.Crm.CustomerType", - "DisplayName": "Activity", + "DisplayName": "Note", "IsEnabled": true, "MultiTenancySide": 3, "MenuGroup": "Erp" @@ -9708,9 +9708,9 @@ }, { "GroupName": "App.Crm", - "Name": "App.Crm.CustomerSegment.Activity", + "Name": "App.Crm.CustomerSegment.Note", "ParentName": "App.Crm.CustomerSegment", - "DisplayName": "Activity", + "DisplayName": "Note", "IsEnabled": true, "MultiTenancySide": 3, "MenuGroup": "Erp" @@ -9771,9 +9771,9 @@ }, { "GroupName": "App.Crm", - "Name": "App.Crm.Customer.Activity", + "Name": "App.Crm.Customer.Note", "ParentName": "App.Crm.Customer", - "DisplayName": "Activity", + "DisplayName": "Note", "IsEnabled": true, "MultiTenancySide": 3, "MenuGroup": "Erp" @@ -9834,9 +9834,9 @@ }, { "GroupName": "App.Crm", - "Name": "App.Crm.SalesTeam.Activity", + "Name": "App.Crm.SalesTeam.Note", "ParentName": "App.Crm.SalesTeam", - "DisplayName": "Activity", + "DisplayName": "Note", "IsEnabled": true, "MultiTenancySide": 3, "MenuGroup": "Erp" @@ -9897,9 +9897,9 @@ }, { "GroupName": "App.Crm", - "Name": "App.Crm.LossReason.Activity", + "Name": "App.Crm.LossReason.Note", "ParentName": "App.Crm.LossReason", - "DisplayName": "Activity", + "DisplayName": "Note", "IsEnabled": true, "MultiTenancySide": 3, "MenuGroup": "Erp" @@ -9960,9 +9960,9 @@ }, { "GroupName": "App.Crm", - "Name": "App.Crm.Opportunity.Activity", + "Name": "App.Crm.Opportunity.Note", "ParentName": "App.Crm.Opportunity", - "DisplayName": "Activity", + "DisplayName": "Note", "IsEnabled": true, "MultiTenancySide": 3, "MenuGroup": "Erp" @@ -9970,17 +9970,17 @@ { "GroupName": "App.Crm", - "Name": "App.Crm.OpportunityAction", + "Name": "App.Crm.OpportunityActivity", "ParentName": null, - "DisplayName": "App.Crm.OpportunityAction", + "DisplayName": "App.Crm.OpportunityActivity", "IsEnabled": true, "MultiTenancySide": 3, "MenuGroup": "Erp" }, { "GroupName": "App.Crm", - "Name": "App.Crm.OpportunityAction.Create", - "ParentName": "App.Crm.OpportunityAction", + "Name": "App.Crm.OpportunityActivity.Create", + "ParentName": "App.Crm.OpportunityActivity", "DisplayName": "Create", "IsEnabled": true, "MultiTenancySide": 3, @@ -9988,8 +9988,8 @@ }, { "GroupName": "App.Crm", - "Name": "App.Crm.OpportunityAction.Update", - "ParentName": "App.Crm.OpportunityAction", + "Name": "App.Crm.OpportunityActivity.Update", + "ParentName": "App.Crm.OpportunityActivity", "DisplayName": "Update", "IsEnabled": true, "MultiTenancySide": 3, @@ -9997,8 +9997,8 @@ }, { "GroupName": "App.Crm", - "Name": "App.Crm.OpportunityAction.Delete", - "ParentName": "App.Crm.OpportunityAction", + "Name": "App.Crm.OpportunityActivity.Delete", + "ParentName": "App.Crm.OpportunityActivity", "DisplayName": "Delete", "IsEnabled": true, "MultiTenancySide": 3, @@ -10006,8 +10006,8 @@ }, { "GroupName": "App.Crm", - "Name": "App.Crm.OpportunityAction.Export", - "ParentName": "App.Crm.OpportunityAction", + "Name": "App.Crm.OpportunityActivity.Export", + "ParentName": "App.Crm.OpportunityActivity", "DisplayName": "Export", "IsEnabled": true, "MultiTenancySide": 3, @@ -10015,8 +10015,8 @@ }, { "GroupName": "App.Crm", - "Name": "App.Crm.OpportunityAction.Import", - "ParentName": "App.Crm.OpportunityAction", + "Name": "App.Crm.OpportunityActivity.Import", + "ParentName": "App.Crm.OpportunityActivity", "DisplayName": "Import", "IsEnabled": true, "MultiTenancySide": 3, @@ -10024,9 +10024,9 @@ }, { "GroupName": "App.Crm", - "Name": "App.Crm.OpportunityAction.Activity", - "ParentName": "App.Crm.OpportunityAction", - "DisplayName": "Activity", + "Name": "App.Crm.OpportunityActivity.Note", + "ParentName": "App.Crm.OpportunityActivity", + "DisplayName": "Note", "IsEnabled": true, "MultiTenancySide": 3, "MenuGroup": "Erp" @@ -10088,9 +10088,9 @@ }, { "GroupName": "App.Crm", - "Name": "App.Crm.OpportunityCompetitor.Activity", + "Name": "App.Crm.OpportunityCompetitor.Note", "ParentName": "App.Crm.OpportunityCompetitor", - "DisplayName": "Activity", + "DisplayName": "Note", "IsEnabled": true, "MultiTenancySide": 3, "MenuGroup": "Erp" @@ -10152,9 +10152,9 @@ }, { "GroupName": "App.Crm", - "Name": "App.Crm.Activities.Activity", + "Name": "App.Crm.Activities.Note", "ParentName": "App.Crm.Activities", - "DisplayName": "Activity", + "DisplayName": "Note", "IsEnabled": true, "MultiTenancySide": 3, "MenuGroup": "Erp" @@ -10215,9 +10215,9 @@ }, { "GroupName": "App.Crm", - "Name": "App.Crm.SalesOrder.Activity", + "Name": "App.Crm.SalesOrder.Note", "ParentName": "App.Crm.SalesOrder", - "DisplayName": "Activity", + "DisplayName": "Note", "IsEnabled": true, "MultiTenancySide": 3, "MenuGroup": "Erp" @@ -10278,9 +10278,9 @@ }, { "GroupName": "App.Mrp", - "Name": "App.Mrp.OperationType.Activity", + "Name": "App.Mrp.OperationType.Note", "ParentName": "App.Mrp.OperationType", - "DisplayName": "Activity", + "DisplayName": "Note", "IsEnabled": true, "MultiTenancySide": 3, "MenuGroup": "Erp" @@ -10341,9 +10341,9 @@ }, { "GroupName": "App.Mrp", - "Name": "App.Mrp.Workcenter.Activity", + "Name": "App.Mrp.Workcenter.Note", "ParentName": "App.Mrp.Workcenter", - "DisplayName": "Activity", + "DisplayName": "Note", "IsEnabled": true, "MultiTenancySide": 3, "MenuGroup": "Erp" @@ -10404,9 +10404,9 @@ }, { "GroupName": "App.Mrp", - "Name": "App.Mrp.Operation.Activity", + "Name": "App.Mrp.Operation.Note", "ParentName": "App.Mrp.Operation", - "DisplayName": "Activity", + "DisplayName": "Note", "IsEnabled": true, "MultiTenancySide": 3, "MenuGroup": "Erp" @@ -10467,9 +10467,9 @@ }, { "GroupName": "App.Mrp", - "Name": "App.Mrp.Bom.Activity", + "Name": "App.Mrp.Bom.Note", "ParentName": "App.Mrp.Bom", - "DisplayName": "Activity", + "DisplayName": "Note", "IsEnabled": true, "MultiTenancySide": 3, "MenuGroup": "Erp" @@ -10530,9 +10530,9 @@ }, { "GroupName": "App.Mrp", - "Name": "App.Mrp.ProductionOrder.Activity", + "Name": "App.Mrp.ProductionOrder.Note", "ParentName": "App.Mrp.ProductionOrder", - "DisplayName": "Activity", + "DisplayName": "Note", "IsEnabled": true, "MultiTenancySide": 3, "MenuGroup": "Erp" @@ -10593,9 +10593,9 @@ }, { "GroupName": "App.Mrp", - "Name": "App.Mrp.WorkOrder.Activity", + "Name": "App.Mrp.WorkOrder.Note", "ParentName": "App.Mrp.WorkOrder", - "DisplayName": "Activity", + "DisplayName": "Note", "IsEnabled": true, "MultiTenancySide": 3, "MenuGroup": "Erp" @@ -10656,9 +10656,9 @@ }, { "GroupName": "App.Mrp", - "Name": "App.Mrp.DemandPlanning.Activity", + "Name": "App.Mrp.DemandPlanning.Note", "ParentName": "App.Mrp.DemandPlanning", - "DisplayName": "Activity", + "DisplayName": "Note", "IsEnabled": true, "MultiTenancySide": 3, "MenuGroup": "Erp" @@ -10719,9 +10719,9 @@ }, { "GroupName": "App.Mrp", - "Name": "App.Mrp.MaterialRequirement.Activity", + "Name": "App.Mrp.MaterialRequirement.Note", "ParentName": "App.Mrp.MaterialRequirement", - "DisplayName": "Activity", + "DisplayName": "Note", "IsEnabled": true, "MultiTenancySide": 3, "MenuGroup": "Erp" @@ -10782,9 +10782,9 @@ }, { "GroupName": "App.Mrp", - "Name": "App.Mrp.PlanningGantt.Activity", + "Name": "App.Mrp.PlanningGantt.Note", "ParentName": "App.Mrp.PlanningGantt", - "DisplayName": "Activity", + "DisplayName": "Note", "IsEnabled": true, "MultiTenancySide": 3, "MenuGroup": "Erp" @@ -10845,9 +10845,9 @@ }, { "GroupName": "App.Accounting", - "Name": "App.Accounting.CurrentAccount.Activity", + "Name": "App.Accounting.CurrentAccount.Note", "ParentName": "App.Accounting.CurrentAccount", - "DisplayName": "Activity", + "DisplayName": "Note", "IsEnabled": true, "MultiTenancySide": 3, "MenuGroup": "Erp" @@ -10908,9 +10908,9 @@ }, { "GroupName": "App.Accounting", - "Name": "App.Accounting.Waybill.Activity", + "Name": "App.Accounting.Waybill.Note", "ParentName": "App.Accounting.Waybill", - "DisplayName": "Activity", + "DisplayName": "Note", "IsEnabled": true, "MultiTenancySide": 3, "MenuGroup": "Erp" @@ -10971,9 +10971,9 @@ }, { "GroupName": "App.Accounting", - "Name": "App.Accounting.Invoice.Activity", + "Name": "App.Accounting.Invoice.Note", "ParentName": "App.Accounting.Invoice", - "DisplayName": "Activity", + "DisplayName": "Note", "IsEnabled": true, "MultiTenancySide": 3, "MenuGroup": "Erp" @@ -11034,9 +11034,9 @@ }, { "GroupName": "App.Accounting", - "Name": "App.Accounting.Cash.Activity", + "Name": "App.Accounting.Cash.Note", "ParentName": "App.Accounting.Cash", - "DisplayName": "Activity", + "DisplayName": "Note", "IsEnabled": true, "MultiTenancySide": 3, "MenuGroup": "Erp" @@ -11097,9 +11097,9 @@ }, { "GroupName": "App.Accounting", - "Name": "App.Accounting.Bank.Activity", + "Name": "App.Accounting.Bank.Note", "ParentName": "App.Accounting.Bank", - "DisplayName": "Activity", + "DisplayName": "Note", "IsEnabled": true, "MultiTenancySide": 3, "MenuGroup": "Erp" @@ -11160,9 +11160,9 @@ }, { "GroupName": "App.Accounting", - "Name": "App.Accounting.CheckNote.Activity", + "Name": "App.Accounting.CheckNote.Note", "ParentName": "App.Accounting.CheckNote", - "DisplayName": "Activity", + "DisplayName": "Note", "IsEnabled": true, "MultiTenancySide": 3, "MenuGroup": "Erp" diff --git a/api/src/Erp.Platform.DbMigrator/Seeds/SeederDefaults.cs b/api/src/Erp.Platform.DbMigrator/Seeds/SeederDefaults.cs index 41faa847..959b5232 100644 --- a/api/src/Erp.Platform.DbMigrator/Seeds/SeederDefaults.cs +++ b/api/src/Erp.Platform.DbMigrator/Seeds/SeederDefaults.cs @@ -131,7 +131,7 @@ public static class SeederDefaults D = d, E = e, I = i, - A = a, + N = a, }); } public static string DefaultPermissionJson(string permissionName) @@ -144,7 +144,7 @@ public static class SeederDefaults D = permissionName + ".Delete", E = permissionName + ".Export", I = permissionName + ".Import", - A = permissionName + ".Activity", + N = permissionName + ".Note", }); } public static string DefaultFieldPermissionJson(string permissionName) diff --git a/api/src/Erp.Platform.DbMigrator/Seeds/SeederUtils.cs b/api/src/Erp.Platform.DbMigrator/Seeds/SeederUtils.cs index d14be482..6941a5fe 100644 --- a/api/src/Erp.Platform.DbMigrator/Seeds/SeederUtils.cs +++ b/api/src/Erp.Platform.DbMigrator/Seeds/SeederUtils.cs @@ -34,7 +34,7 @@ public class SeederUtils : IDisposable { ListFormType = sourceForm.ListFormType, IsSubForm = sourceForm.IsSubForm, - ShowActivity = sourceForm.ShowActivity, + ShowNote = sourceForm.ShowNote, LayoutJson = sourceForm.LayoutJson, SubFormsJson = subFormsJson ?? sourceForm.SubFormsJson, CultureName = sourceForm.CultureName, diff --git a/api/src/Erp.Platform.Domain.Shared/Enums/TableNameEnum.cs b/api/src/Erp.Platform.Domain.Shared/Enums/TableNameEnum.cs index ef9735cb..6c53bafd 100644 --- a/api/src/Erp.Platform.Domain.Shared/Enums/TableNameEnum.cs +++ b/api/src/Erp.Platform.Domain.Shared/Enums/TableNameEnum.cs @@ -24,7 +24,7 @@ public enum TableNameEnum ListFormCustomization, ListFormImport, ListFormImportExecute, - Activity, + Note, BackgroundWorker, ForumCategory, ForumTopic, @@ -153,6 +153,6 @@ public enum TableNameEnum ApprovalStep, LossReason, Opportunity, - Action, + Activity, Competitor } diff --git a/api/src/Erp.Platform.Domain.Shared/PlatformConsts.cs b/api/src/Erp.Platform.Domain.Shared/PlatformConsts.cs index 368319da..95605123 100644 --- a/api/src/Erp.Platform.Domain.Shared/PlatformConsts.cs +++ b/api/src/Erp.Platform.Domain.Shared/PlatformConsts.cs @@ -525,7 +525,7 @@ public static class PlatformConsts public const string Customer = "list-customer"; public const string LossReason = "list-lossreason"; public const string Opportunity = "list-opportunity"; - public const string OpportunityAction = "list-opportunityaction"; + public const string OpportunityActivity = "list-opportunityactivity"; public const string OpportunityCompetitor = "list-opportunitycompetitor"; } @@ -755,6 +755,7 @@ public static class PlatformConsts public const string UserId = "@USERID"; public const string UserName = "@USERNAME"; public const string Roles = "@ROLES"; + public const string Date = "@DATE"; public const string Now = "@NOW"; public const string Year = "@YEAR"; public const string Month = "@MONTH"; @@ -810,7 +811,7 @@ public static class PlatformConsts public const string Delete = Default + ".Delete"; public const string Export = Default + ".Export"; public const string Import = Default + ".Import"; - public const string Activity = Default + ".Activity"; + public const string Note = Default + ".Note"; public const string ManagePermissions = Default + ".ManagePermissions"; } @@ -822,7 +823,7 @@ public static class PlatformConsts public const string Delete = Default + ".Delete"; public const string Export = Default + ".Export"; public const string Import = Default + ".Import"; - public const string Activity = Default + ".Activity"; + public const string Note = Default + ".Note"; public const string ManagePermissions = Default + ".ManagePermissions"; public const string ManageRoles = Update + ".ManageRoles"; } diff --git a/api/src/Erp.Platform.Domain.Shared/TableNameResolver.cs b/api/src/Erp.Platform.Domain.Shared/TableNameResolver.cs index 1faff570..dbff3050 100644 --- a/api/src/Erp.Platform.Domain.Shared/TableNameResolver.cs +++ b/api/src/Erp.Platform.Domain.Shared/TableNameResolver.cs @@ -46,7 +46,7 @@ public static class TableNameResolver { nameof(TableNameEnum.ForumPost), (TablePrefix.PlatformByName, MenuPrefix.Saas) }, // 🔹 TENANT TABLOLARI (GENEL) - { nameof(TableNameEnum.Activity), (TablePrefix.TenantByName, MenuPrefix.Saas) }, + { nameof(TableNameEnum.Note), (TablePrefix.TenantByName, MenuPrefix.Saas) }, { nameof(TableNameEnum.Branch), (TablePrefix.TenantByName, MenuPrefix.Saas) }, { nameof(TableNameEnum.BranchUsers), (TablePrefix.TenantByName, MenuPrefix.Saas) }, { nameof(TableNameEnum.GlobalSearch), (TablePrefix.TenantByName, MenuPrefix.Saas) }, @@ -179,7 +179,7 @@ public static class TableNameResolver { nameof(TableNameEnum.CustomerType), (TablePrefix.TenantByName, MenuPrefix.Crm) }, { nameof(TableNameEnum.LossReason), (TablePrefix.TenantByName, MenuPrefix.Crm) }, { nameof(TableNameEnum.Opportunity), (TablePrefix.TenantByName, MenuPrefix.Crm) }, - { nameof(TableNameEnum.Action), (TablePrefix.TenantByName, MenuPrefix.Crm) }, + { nameof(TableNameEnum.Activity), (TablePrefix.TenantByName, MenuPrefix.Crm) }, { nameof(TableNameEnum.Competitor), (TablePrefix.TenantByName, MenuPrefix.Crm) }, // 🔹 ACCOUNTING diff --git a/api/src/Erp.Platform.Domain/BlobStoring/BlobContainerNames.cs b/api/src/Erp.Platform.Domain/BlobStoring/BlobContainerNames.cs index 7500412b..33cf1eb5 100644 --- a/api/src/Erp.Platform.Domain/BlobStoring/BlobContainerNames.cs +++ b/api/src/Erp.Platform.Domain/BlobStoring/BlobContainerNames.cs @@ -5,5 +5,5 @@ public static class BlobContainerNames public const string Intranet = "intranet"; public const string Avatar = "avatar"; public const string Import = "import"; - public const string Activity = "activity"; + public const string Note = "note"; } diff --git a/api/src/Erp.Platform.Domain/Data/SeedConsts.cs b/api/src/Erp.Platform.Domain/Data/SeedConsts.cs index 108333cc..24d935b3 100644 --- a/api/src/Erp.Platform.Domain/Data/SeedConsts.cs +++ b/api/src/Erp.Platform.Domain/Data/SeedConsts.cs @@ -28,7 +28,7 @@ public static class SeedConsts public const string Delete = Default + ".Delete"; public const string Export = Default + ".Export"; public const string Import = Default + ".Import"; - public const string Activity = Default + ".Activity"; + public const string Note = Default + ".Note"; } public static class Permissions @@ -39,7 +39,7 @@ public static class SeedConsts public const string Delete = Default + ".Delete"; public const string Export = Default + ".Export"; public const string Import = Default + ".Import"; - public const string Activity = Default + ".Activity"; + public const string Note = Default + ".Note"; } public static class Preferences @@ -495,7 +495,7 @@ public static class SeedConsts public const string Customer = Default + ".Customer"; public const string LossReason = Default + ".LossReason"; public const string Opportunity = Default + ".Opportunity"; - public const string OpportunityAction = Default + ".OpportunityAction"; + public const string OpportunityActivity = Default + ".OpportunityActivity"; public const string OpportunityCompetitor = Default + ".OpportunityCompetitor"; } diff --git a/api/src/Erp.Platform.Domain/Entities/Host/ListForm.cs b/api/src/Erp.Platform.Domain/Entities/Host/ListForm.cs index 12e8ddc6..f3813009 100644 --- a/api/src/Erp.Platform.Domain/Entities/Host/ListForm.cs +++ b/api/src/Erp.Platform.Domain/Entities/Host/ListForm.cs @@ -117,8 +117,8 @@ public class ListForm : FullAuditedEntity /// Bu listform sub olarak mı kullanılacak public bool IsSubForm { get; set; } - /// Bu listform show activity gösterilsin mi? - public bool ShowActivity { get; set; } + /// Bu listform show note gösterilsin mi? + public bool ShowNote { get; set; } = true; /// Bu listform'un sub listformlarının listesi ve ilişkileri public string SubFormsJson { get; set; } diff --git a/api/src/Erp.Platform.Domain/Entities/Tenant/Crm/Action.cs b/api/src/Erp.Platform.Domain/Entities/Tenant/Crm/Activity.cs similarity index 78% rename from api/src/Erp.Platform.Domain/Entities/Tenant/Crm/Action.cs rename to api/src/Erp.Platform.Domain/Entities/Tenant/Crm/Activity.cs index b78e85fc..92f24616 100644 --- a/api/src/Erp.Platform.Domain/Entities/Tenant/Crm/Action.cs +++ b/api/src/Erp.Platform.Domain/Entities/Tenant/Crm/Activity.cs @@ -4,20 +4,20 @@ using Volo.Abp.MultiTenancy; namespace Erp.Platform.Entities; -public class Action : FullAuditedEntity, IMultiTenant +public class Activity : FullAuditedEntity, IMultiTenant { public Guid? TenantId { get; set; } public Guid? OpportunityId { get; set; } public Opportunity? Opportunity { get; set; } - public string ActionType { get; set; } //Call, Email, Meeting, Task, Note, Demo, Proposal + public string ActivityType { get; set; } //Call, Email, Meeting, Task, Note, Demo, Proposal public string Subject { get; set; } public string Description { get; set; } public Guid EmployeeId { get; set; } - public DateTime ActionDate { get; set; } + public DateTime ActivityDate { get; set; } public DateTime? StartTime { get; set; } public DateTime? EndTime { get; set; } public int? Duration { get; set; } diff --git a/api/src/Erp.Platform.Domain/Entities/Tenant/Crm/Opportunity.cs b/api/src/Erp.Platform.Domain/Entities/Tenant/Crm/Opportunity.cs index f89d8f3c..caaed96f 100644 --- a/api/src/Erp.Platform.Domain/Entities/Tenant/Crm/Opportunity.cs +++ b/api/src/Erp.Platform.Domain/Entities/Tenant/Crm/Opportunity.cs @@ -39,12 +39,12 @@ public class Opportunity : FullAuditedEntity, IMultiTenant public string Status { get; set; } // Durum - public ICollection Actions { get; set; } //Aktiviteler + public ICollection Activities { get; set; } //Aktiviteler public ICollection Competitors { get; set; } //Rakipler public Opportunity() { - Actions = []; + Activities = []; Competitors = []; } } diff --git a/api/src/Erp.Platform.Domain/Entities/Tenant/Saas/Activity.cs b/api/src/Erp.Platform.Domain/Entities/Tenant/Saas/Note.cs similarity index 86% rename from api/src/Erp.Platform.Domain/Entities/Tenant/Saas/Activity.cs rename to api/src/Erp.Platform.Domain/Entities/Tenant/Saas/Note.cs index 2da149c8..57bd294a 100644 --- a/api/src/Erp.Platform.Domain/Entities/Tenant/Saas/Activity.cs +++ b/api/src/Erp.Platform.Domain/Entities/Tenant/Saas/Note.cs @@ -4,7 +4,7 @@ using Volo.Abp.MultiTenancy; namespace Erp.Platform.Entities; -public class Activity : FullAuditedEntity, IMultiTenant +public class Note : FullAuditedEntity, IMultiTenant { public Guid? TenantId { get; set; } public string EntityName { get; set; } diff --git a/api/src/Erp.Platform.Domain/Permissions/PermissionCrudValueObject.cs b/api/src/Erp.Platform.Domain/Permissions/PermissionCrudValueObject.cs index be7ae1e9..5a240111 100644 --- a/api/src/Erp.Platform.Domain/Permissions/PermissionCrudValueObject.cs +++ b/api/src/Erp.Platform.Domain/Permissions/PermissionCrudValueObject.cs @@ -11,7 +11,7 @@ public class PermissionCrudValueObject : ValueObject public string D { get; set; } //Delete public string I { get; set; } //Export public string E { get; set; } //Import - public string A { get; set; } //Activity + public string N { get; set; } //Note protected override IEnumerable GetAtomicValues() { @@ -21,7 +21,7 @@ public class PermissionCrudValueObject : ValueObject yield return D; yield return I; yield return E; - yield return A; + yield return N; } } diff --git a/api/src/Erp.Platform.Domain/Queries/DefaultValueHelper.cs b/api/src/Erp.Platform.Domain/Queries/DefaultValueHelper.cs index 0d2f812b..5b5fc320 100644 --- a/api/src/Erp.Platform.Domain/Queries/DefaultValueHelper.cs +++ b/api/src/Erp.Platform.Domain/Queries/DefaultValueHelper.cs @@ -11,7 +11,7 @@ public class DefaultValueHelper : ITransientDependency private readonly ICurrentUser _currentUser; private readonly ICurrentTenant _currentTenant; private readonly IClock _clock; - + public DefaultValueHelper( ICurrentUser currentUser, ICurrentTenant currentTenant, @@ -26,7 +26,7 @@ public class DefaultValueHelper : ITransientDependency public string GetDefaultValue(string strValue) { if (string.IsNullOrEmpty(strValue)) - return strValue; + return strValue; var now = _clock.Now; @@ -34,6 +34,7 @@ public class DefaultValueHelper : ITransientDependency .Replace(PlatformConsts.DefaultValues.UserId, _currentUser.Id?.ToString() ?? Guid.Empty.ToString()) .Replace(PlatformConsts.DefaultValues.UserName, _currentUser.UserName ?? string.Empty) .Replace(PlatformConsts.DefaultValues.Roles, string.Join("','", _currentUser.Roles ?? [])) + .Replace(PlatformConsts.DefaultValues.Date, now.Date.ToString("O", CultureInfo.InvariantCulture)) .Replace(PlatformConsts.DefaultValues.Now, now.ToString("O", CultureInfo.InvariantCulture)) .Replace(PlatformConsts.DefaultValues.Day, now.Day.ToString(CultureInfo.InvariantCulture)) .Replace(PlatformConsts.DefaultValues.Month, now.Month.ToString(CultureInfo.InvariantCulture)) diff --git a/api/src/Erp.Platform.Domain/Queries/DefaultValueManager.cs b/api/src/Erp.Platform.Domain/Queries/DefaultValueManager.cs index 9586e73c..7ff0b724 100644 --- a/api/src/Erp.Platform.Domain/Queries/DefaultValueManager.cs +++ b/api/src/Erp.Platform.Domain/Queries/DefaultValueManager.cs @@ -72,6 +72,8 @@ public class DefaultValueManager : PlatformDomainService, IDefaultValueManager value = CurrentUser.Name; else if (field.Value == PlatformConsts.DefaultValues.Roles) value = CurrentUser.Roles; //.JoinAsString("','"); + else if (field.Value == PlatformConsts.DefaultValues.Date) + value = Clock.Now.Date; else if (field.Value == PlatformConsts.DefaultValues.Now) value = Clock.Now; else if (field.Value == PlatformConsts.DefaultValues.Day) diff --git a/api/src/Erp.Platform.EntityFrameworkCore/EntityFrameworkCore/PlatformDbContext.cs b/api/src/Erp.Platform.EntityFrameworkCore/EntityFrameworkCore/PlatformDbContext.cs index 916b8920..cc978f2f 100644 --- a/api/src/Erp.Platform.EntityFrameworkCore/EntityFrameworkCore/PlatformDbContext.cs +++ b/api/src/Erp.Platform.EntityFrameworkCore/EntityFrameworkCore/PlatformDbContext.cs @@ -69,7 +69,7 @@ public class PlatformDbContext : public DbSet ReportParameters { get; set; } public DbSet ReportGenerated { get; set; } public DbSet ReportCategories { get; set; } - public DbSet Activities { get; set; } + public DbSet Activities { get; set; } public DbSet IpRestrictions { get; set; } public DbSet ContactTags { get; set; } public DbSet ContactTitles { get; set; } @@ -219,7 +219,7 @@ public class PlatformDbContext : #region Crm public DbSet LostReasons { get; set; } public DbSet Opportunities { get; set; } - public DbSet Actions { get; set; } + public DbSet Actions { get; set; } public DbSet Competitors { get; set; } #endregion @@ -546,9 +546,9 @@ public class PlatformDbContext : b.Property(x => x.ErrorsJson).HasColumnType("text"); }); - builder.Entity(b => + builder.Entity(b => { - b.ToTable(TableNameResolver.GetFullTableName(nameof(TableNameEnum.Activity)), Prefix.DbSchema); + b.ToTable(TableNameResolver.GetFullTableName(nameof(TableNameEnum.Note)), Prefix.DbSchema); b.ConfigureByConvention(); b.Property(x => x.Type).IsRequired(); @@ -2595,19 +2595,19 @@ public class PlatformDbContext : b.Property(x => x.Status).IsRequired().HasMaxLength(50); }); - builder.Entity(b => + builder.Entity(b => { - b.ToTable(TableNameResolver.GetFullTableName(nameof(TableNameEnum.Action)), Prefix.DbSchema); + b.ToTable(TableNameResolver.GetFullTableName(nameof(TableNameEnum.Activity)), Prefix.DbSchema); b.ConfigureByConvention(); - b.Property(x => x.ActionType).IsRequired().HasMaxLength(50); + b.Property(x => x.ActivityType).IsRequired().HasMaxLength(50); b.Property(x => x.Subject).IsRequired().HasMaxLength(200); b.Property(x => x.Description).HasMaxLength(1000); b.Property(x => x.EmployeeId).IsRequired(); - b.Property(x => x.ActionDate).IsRequired(); + b.Property(x => x.ActivityDate).IsRequired(); b.HasOne(x => x.Opportunity) - .WithMany(x => x.Actions) + .WithMany(x => x.Activities) .HasForeignKey(x => x.OpportunityId) .OnDelete(DeleteBehavior.Cascade); }); diff --git a/api/src/Erp.Platform.EntityFrameworkCore/Migrations/20251114120401_Initial.Designer.cs b/api/src/Erp.Platform.EntityFrameworkCore/Migrations/20251114204400_Initial.Designer.cs similarity index 99% rename from api/src/Erp.Platform.EntityFrameworkCore/Migrations/20251114120401_Initial.Designer.cs rename to api/src/Erp.Platform.EntityFrameworkCore/Migrations/20251114204400_Initial.Designer.cs index b0412def..fd06e043 100644 --- a/api/src/Erp.Platform.EntityFrameworkCore/Migrations/20251114120401_Initial.Designer.cs +++ b/api/src/Erp.Platform.EntityFrameworkCore/Migrations/20251114204400_Initial.Designer.cs @@ -13,7 +13,7 @@ using Volo.Abp.EntityFrameworkCore; namespace Erp.Platform.Migrations { [DbContext(typeof(PlatformDbContext))] - [Migration("20251114120401_Initial")] + [Migration("20251114204400_Initial")] partial class Initial { /// @@ -625,15 +625,15 @@ namespace Erp.Platform.Migrations b.ToTable("Adm_T_About", (string)null); }); - modelBuilder.Entity("Erp.Platform.Entities.Action", b => + modelBuilder.Entity("Erp.Platform.Entities.Activity", b => { b.Property("Id") .HasColumnType("uniqueidentifier"); - b.Property("ActionDate") + b.Property("ActivityDate") .HasColumnType("datetime2"); - b.Property("ActionType") + b.Property("ActivityType") .IsRequired() .HasMaxLength(50) .HasColumnType("nvarchar(50)"); @@ -712,74 +712,7 @@ namespace Erp.Platform.Migrations b.HasIndex("OpportunityId"); - b.ToTable("Crm_T_Action", (string)null); - }); - - modelBuilder.Entity("Erp.Platform.Entities.Activity", b => - { - b.Property("Id") - .HasColumnType("uniqueidentifier"); - - b.Property("Content") - .IsRequired() - .HasMaxLength(2000) - .HasColumnType("nvarchar(2000)"); - - b.Property("CreationTime") - .HasColumnType("datetime2") - .HasColumnName("CreationTime"); - - b.Property("CreatorId") - .HasColumnType("uniqueidentifier") - .HasColumnName("CreatorId"); - - b.Property("DeleterId") - .HasColumnType("uniqueidentifier") - .HasColumnName("DeleterId"); - - b.Property("DeletionTime") - .HasColumnType("datetime2") - .HasColumnName("DeletionTime"); - - b.Property("EntityId") - .HasColumnType("nvarchar(max)"); - - b.Property("EntityName") - .HasColumnType("nvarchar(max)"); - - b.Property("FilesJson") - .HasColumnType("nvarchar(max)"); - - b.Property("IsDeleted") - .ValueGeneratedOnAdd() - .HasColumnType("bit") - .HasDefaultValue(false) - .HasColumnName("IsDeleted"); - - b.Property("LastModificationTime") - .HasColumnType("datetime2") - .HasColumnName("LastModificationTime"); - - b.Property("LastModifierId") - .HasColumnType("uniqueidentifier") - .HasColumnName("LastModifierId"); - - b.Property("Subject") - .IsRequired() - .HasMaxLength(256) - .HasColumnType("nvarchar(256)"); - - b.Property("TenantId") - .HasColumnType("uniqueidentifier") - .HasColumnName("TenantId"); - - b.Property("Type") - .IsRequired() - .HasColumnType("nvarchar(max)"); - - b.HasKey("Id"); - - b.ToTable("Sas_T_Activity", (string)null); + b.ToTable("Crm_T_Activity", (string)null); }); modelBuilder.Entity("Erp.Platform.Entities.AiBot", b => @@ -5480,7 +5413,7 @@ namespace Erp.Platform.Migrations b.Property("SeriesJson") .HasColumnType("text"); - b.Property("ShowActivity") + b.Property("ShowNote") .HasColumnType("bit"); b.Property("SizeJson") @@ -6585,6 +6518,73 @@ namespace Erp.Platform.Migrations b.ToTable("Sas_H_Menu", (string)null); }); + modelBuilder.Entity("Erp.Platform.Entities.Note", b => + { + b.Property("Id") + .HasColumnType("uniqueidentifier"); + + b.Property("Content") + .IsRequired() + .HasMaxLength(2000) + .HasColumnType("nvarchar(2000)"); + + b.Property("CreationTime") + .HasColumnType("datetime2") + .HasColumnName("CreationTime"); + + b.Property("CreatorId") + .HasColumnType("uniqueidentifier") + .HasColumnName("CreatorId"); + + b.Property("DeleterId") + .HasColumnType("uniqueidentifier") + .HasColumnName("DeleterId"); + + b.Property("DeletionTime") + .HasColumnType("datetime2") + .HasColumnName("DeletionTime"); + + b.Property("EntityId") + .HasColumnType("nvarchar(max)"); + + b.Property("EntityName") + .HasColumnType("nvarchar(max)"); + + b.Property("FilesJson") + .HasColumnType("nvarchar(max)"); + + b.Property("IsDeleted") + .ValueGeneratedOnAdd() + .HasColumnType("bit") + .HasDefaultValue(false) + .HasColumnName("IsDeleted"); + + b.Property("LastModificationTime") + .HasColumnType("datetime2") + .HasColumnName("LastModificationTime"); + + b.Property("LastModifierId") + .HasColumnType("uniqueidentifier") + .HasColumnName("LastModifierId"); + + b.Property("Subject") + .IsRequired() + .HasMaxLength(256) + .HasColumnType("nvarchar(256)"); + + b.Property("TenantId") + .HasColumnType("uniqueidentifier") + .HasColumnName("TenantId"); + + b.Property("Type") + .IsRequired() + .HasColumnType("nvarchar(max)"); + + b.HasKey("Id"); + + b.ToTable("Sas_T_Note", (string)null); + }); + modelBuilder.Entity("Erp.Platform.Entities.NoteType", b => { b.Property("Id") @@ -13150,7 +13150,7 @@ namespace Erp.Platform.Migrations b.Navigation("NotificationRule"); }); - modelBuilder.Entity("Erp.Platform.Entities.Action", b => + modelBuilder.Entity("Erp.Platform.Entities.Activity", b => { b.HasOne("Erp.Platform.Entities.Opportunity", "Opportunity") .WithMany("Actions") diff --git a/api/src/Erp.Platform.EntityFrameworkCore/Migrations/20251114120401_Initial.cs b/api/src/Erp.Platform.EntityFrameworkCore/Migrations/20251114204400_Initial.cs similarity index 99% rename from api/src/Erp.Platform.EntityFrameworkCore/Migrations/20251114120401_Initial.cs rename to api/src/Erp.Platform.EntityFrameworkCore/Migrations/20251114204400_Initial.cs index 8239a34a..f126fbf1 100644 --- a/api/src/Erp.Platform.EntityFrameworkCore/Migrations/20251114120401_Initial.cs +++ b/api/src/Erp.Platform.EntityFrameworkCore/Migrations/20251114204400_Initial.cs @@ -1941,7 +1941,7 @@ namespace Erp.Platform.Migrations IsOrganizationUnit = table.Column(type: "bit", nullable: false), ListFormType = table.Column(type: "nvarchar(20)", maxLength: 20, nullable: true), IsSubForm = table.Column(type: "bit", nullable: false), - ShowActivity = table.Column(type: "bit", nullable: false), + ShowNote = table.Column(type: "bit", nullable: false), SubFormsJson = table.Column(type: "text", nullable: true), WidgetsJson = table.Column(type: "text", nullable: true), ExtraFilterJson = table.Column(type: "text", nullable: true), @@ -2039,31 +2039,6 @@ namespace Erp.Platform.Migrations table.PrimaryKey("PK_Sas_H_Route", x => x.Id); }); - migrationBuilder.CreateTable( - name: "Sas_T_Activity", - columns: table => new - { - Id = table.Column(type: "uniqueidentifier", nullable: false), - TenantId = table.Column(type: "uniqueidentifier", nullable: true), - EntityName = table.Column(type: "nvarchar(max)", nullable: true), - EntityId = table.Column(type: "nvarchar(max)", nullable: true), - Type = table.Column(type: "nvarchar(max)", nullable: false), - Subject = table.Column(type: "nvarchar(256)", maxLength: 256, nullable: false), - Content = table.Column(type: "nvarchar(2000)", maxLength: 2000, nullable: false), - FilesJson = table.Column(type: "nvarchar(max)", nullable: true), - CreationTime = table.Column(type: "datetime2", nullable: false), - CreatorId = table.Column(type: "uniqueidentifier", nullable: true), - LastModificationTime = table.Column(type: "datetime2", nullable: true), - LastModifierId = table.Column(type: "uniqueidentifier", nullable: true), - IsDeleted = table.Column(type: "bit", nullable: false, defaultValue: false), - DeleterId = table.Column(type: "uniqueidentifier", nullable: true), - DeletionTime = table.Column(type: "datetime2", nullable: true) - }, - constraints: table => - { - table.PrimaryKey("PK_Sas_T_Activity", x => x.Id); - }); - migrationBuilder.CreateTable( name: "Sas_T_Branch", columns: table => new @@ -2253,6 +2228,31 @@ namespace Erp.Platform.Migrations table.PrimaryKey("PK_Sas_T_IpRestriction", x => x.Id); }); + migrationBuilder.CreateTable( + name: "Sas_T_Note", + columns: table => new + { + Id = table.Column(type: "uniqueidentifier", nullable: false), + TenantId = table.Column(type: "uniqueidentifier", nullable: true), + EntityName = table.Column(type: "nvarchar(max)", nullable: true), + EntityId = table.Column(type: "nvarchar(max)", nullable: true), + Type = table.Column(type: "nvarchar(max)", nullable: false), + Subject = table.Column(type: "nvarchar(256)", maxLength: 256, nullable: false), + Content = table.Column(type: "nvarchar(2000)", maxLength: 2000, nullable: false), + FilesJson = table.Column(type: "nvarchar(max)", nullable: true), + CreationTime = table.Column(type: "datetime2", nullable: false), + CreatorId = table.Column(type: "uniqueidentifier", nullable: true), + LastModificationTime = table.Column(type: "datetime2", nullable: true), + LastModifierId = table.Column(type: "uniqueidentifier", nullable: true), + IsDeleted = table.Column(type: "bit", nullable: false, defaultValue: false), + DeleterId = table.Column(type: "uniqueidentifier", nullable: true), + DeletionTime = table.Column(type: "datetime2", nullable: true) + }, + constraints: table => + { + table.PrimaryKey("PK_Sas_T_Note", x => x.Id); + }); + migrationBuilder.CreateTable( name: "Sas_T_ReportCategory", columns: table => new @@ -4440,17 +4440,17 @@ namespace Erp.Platform.Migrations }); migrationBuilder.CreateTable( - name: "Crm_T_Action", + name: "Crm_T_Activity", columns: table => new { Id = table.Column(type: "uniqueidentifier", nullable: false), TenantId = table.Column(type: "uniqueidentifier", nullable: true), OpportunityId = table.Column(type: "uniqueidentifier", nullable: true), - ActionType = table.Column(type: "nvarchar(50)", maxLength: 50, nullable: false), + ActivityType = table.Column(type: "nvarchar(50)", maxLength: 50, nullable: false), Subject = table.Column(type: "nvarchar(200)", maxLength: 200, nullable: false), Description = table.Column(type: "nvarchar(1000)", maxLength: 1000, nullable: true), EmployeeId = table.Column(type: "uniqueidentifier", nullable: false), - ActionDate = table.Column(type: "datetime2", nullable: false), + ActivityDate = table.Column(type: "datetime2", nullable: false), StartTime = table.Column(type: "datetime2", nullable: true), EndTime = table.Column(type: "datetime2", nullable: true), Duration = table.Column(type: "int", nullable: true), @@ -4468,7 +4468,7 @@ namespace Erp.Platform.Migrations }, constraints: table => { - table.PrimaryKey("PK_Crm_T_Action", x => x.Id); + table.PrimaryKey("PK_Crm_T_Activity", x => x.Id); }); migrationBuilder.CreateTable( @@ -5939,8 +5939,8 @@ namespace Erp.Platform.Migrations column: "QuestionId"); migrationBuilder.CreateIndex( - name: "IX_Crm_T_Action_OpportunityId", - table: "Crm_T_Action", + name: "IX_Crm_T_Activity_OpportunityId", + table: "Crm_T_Activity", column: "OpportunityId"); migrationBuilder.CreateIndex( @@ -6475,8 +6475,8 @@ namespace Erp.Platform.Migrations principalColumn: "Id"); migrationBuilder.AddForeignKey( - name: "FK_Crm_T_Action_Crm_T_Opportunity_OpportunityId", - table: "Crm_T_Action", + name: "FK_Crm_T_Activity_Crm_T_Opportunity_OpportunityId", + table: "Crm_T_Activity", column: "OpportunityId", principalTable: "Crm_T_Opportunity", principalColumn: "Id", @@ -6725,7 +6725,7 @@ namespace Erp.Platform.Migrations name: "Crd_T_QuestionTag"); migrationBuilder.DropTable( - name: "Crm_T_Action"); + name: "Crm_T_Activity"); migrationBuilder.DropTable( name: "Crm_T_Competitor"); @@ -6859,9 +6859,6 @@ namespace Erp.Platform.Migrations migrationBuilder.DropTable( name: "Sas_H_Route"); - migrationBuilder.DropTable( - name: "Sas_T_Activity"); - migrationBuilder.DropTable( name: "Sas_T_ApiMigration"); @@ -6889,6 +6886,9 @@ namespace Erp.Platform.Migrations migrationBuilder.DropTable( name: "Sas_T_IpRestriction"); + migrationBuilder.DropTable( + name: "Sas_T_Note"); + migrationBuilder.DropTable( name: "Sas_T_ReportGenerated"); diff --git a/api/src/Erp.Platform.EntityFrameworkCore/Migrations/PlatformDbContextModelSnapshot.cs b/api/src/Erp.Platform.EntityFrameworkCore/Migrations/PlatformDbContextModelSnapshot.cs index 5a338019..e598a025 100644 --- a/api/src/Erp.Platform.EntityFrameworkCore/Migrations/PlatformDbContextModelSnapshot.cs +++ b/api/src/Erp.Platform.EntityFrameworkCore/Migrations/PlatformDbContextModelSnapshot.cs @@ -622,15 +622,15 @@ namespace Erp.Platform.Migrations b.ToTable("Adm_T_About", (string)null); }); - modelBuilder.Entity("Erp.Platform.Entities.Action", b => + modelBuilder.Entity("Erp.Platform.Entities.Activity", b => { b.Property("Id") .HasColumnType("uniqueidentifier"); - b.Property("ActionDate") + b.Property("ActivityDate") .HasColumnType("datetime2"); - b.Property("ActionType") + b.Property("ActivityType") .IsRequired() .HasMaxLength(50) .HasColumnType("nvarchar(50)"); @@ -709,74 +709,7 @@ namespace Erp.Platform.Migrations b.HasIndex("OpportunityId"); - b.ToTable("Crm_T_Action", (string)null); - }); - - modelBuilder.Entity("Erp.Platform.Entities.Activity", b => - { - b.Property("Id") - .HasColumnType("uniqueidentifier"); - - b.Property("Content") - .IsRequired() - .HasMaxLength(2000) - .HasColumnType("nvarchar(2000)"); - - b.Property("CreationTime") - .HasColumnType("datetime2") - .HasColumnName("CreationTime"); - - b.Property("CreatorId") - .HasColumnType("uniqueidentifier") - .HasColumnName("CreatorId"); - - b.Property("DeleterId") - .HasColumnType("uniqueidentifier") - .HasColumnName("DeleterId"); - - b.Property("DeletionTime") - .HasColumnType("datetime2") - .HasColumnName("DeletionTime"); - - b.Property("EntityId") - .HasColumnType("nvarchar(max)"); - - b.Property("EntityName") - .HasColumnType("nvarchar(max)"); - - b.Property("FilesJson") - .HasColumnType("nvarchar(max)"); - - b.Property("IsDeleted") - .ValueGeneratedOnAdd() - .HasColumnType("bit") - .HasDefaultValue(false) - .HasColumnName("IsDeleted"); - - b.Property("LastModificationTime") - .HasColumnType("datetime2") - .HasColumnName("LastModificationTime"); - - b.Property("LastModifierId") - .HasColumnType("uniqueidentifier") - .HasColumnName("LastModifierId"); - - b.Property("Subject") - .IsRequired() - .HasMaxLength(256) - .HasColumnType("nvarchar(256)"); - - b.Property("TenantId") - .HasColumnType("uniqueidentifier") - .HasColumnName("TenantId"); - - b.Property("Type") - .IsRequired() - .HasColumnType("nvarchar(max)"); - - b.HasKey("Id"); - - b.ToTable("Sas_T_Activity", (string)null); + b.ToTable("Crm_T_Activity", (string)null); }); modelBuilder.Entity("Erp.Platform.Entities.AiBot", b => @@ -5477,7 +5410,7 @@ namespace Erp.Platform.Migrations b.Property("SeriesJson") .HasColumnType("text"); - b.Property("ShowActivity") + b.Property("ShowNote") .HasColumnType("bit"); b.Property("SizeJson") @@ -6582,6 +6515,73 @@ namespace Erp.Platform.Migrations b.ToTable("Sas_H_Menu", (string)null); }); + modelBuilder.Entity("Erp.Platform.Entities.Note", b => + { + b.Property("Id") + .HasColumnType("uniqueidentifier"); + + b.Property("Content") + .IsRequired() + .HasMaxLength(2000) + .HasColumnType("nvarchar(2000)"); + + b.Property("CreationTime") + .HasColumnType("datetime2") + .HasColumnName("CreationTime"); + + b.Property("CreatorId") + .HasColumnType("uniqueidentifier") + .HasColumnName("CreatorId"); + + b.Property("DeleterId") + .HasColumnType("uniqueidentifier") + .HasColumnName("DeleterId"); + + b.Property("DeletionTime") + .HasColumnType("datetime2") + .HasColumnName("DeletionTime"); + + b.Property("EntityId") + .HasColumnType("nvarchar(max)"); + + b.Property("EntityName") + .HasColumnType("nvarchar(max)"); + + b.Property("FilesJson") + .HasColumnType("nvarchar(max)"); + + b.Property("IsDeleted") + .ValueGeneratedOnAdd() + .HasColumnType("bit") + .HasDefaultValue(false) + .HasColumnName("IsDeleted"); + + b.Property("LastModificationTime") + .HasColumnType("datetime2") + .HasColumnName("LastModificationTime"); + + b.Property("LastModifierId") + .HasColumnType("uniqueidentifier") + .HasColumnName("LastModifierId"); + + b.Property("Subject") + .IsRequired() + .HasMaxLength(256) + .HasColumnType("nvarchar(256)"); + + b.Property("TenantId") + .HasColumnType("uniqueidentifier") + .HasColumnName("TenantId"); + + b.Property("Type") + .IsRequired() + .HasColumnType("nvarchar(max)"); + + b.HasKey("Id"); + + b.ToTable("Sas_T_Note", (string)null); + }); + modelBuilder.Entity("Erp.Platform.Entities.NoteType", b => { b.Property("Id") @@ -13147,7 +13147,7 @@ namespace Erp.Platform.Migrations b.Navigation("NotificationRule"); }); - modelBuilder.Entity("Erp.Platform.Entities.Action", b => + modelBuilder.Entity("Erp.Platform.Entities.Activity", b => { b.HasOne("Erp.Platform.Entities.Opportunity", "Opportunity") .WithMany("Actions") diff --git a/ui/src/proxy/form/models.ts b/ui/src/proxy/form/models.ts index 18463bda..d4c72549 100644 --- a/ui/src/proxy/form/models.ts +++ b/ui/src/proxy/form/models.ts @@ -509,7 +509,7 @@ export interface GridOptionsDto extends AuditedEntityDto { isOrganizationUnit: boolean listFormType: string isSubForm: boolean - showActivity: boolean + showNote: boolean subFormsJson?: string subFormsDto: SubFormDto[] extraFilterJson?: string @@ -642,7 +642,7 @@ export interface PermissionCrudDto { d?: string e?: string i?: string - a?: string + n?: string } export interface ListFormFieldPermissionDto { diff --git a/ui/src/proxy/activity/models.ts b/ui/src/proxy/note/models.ts similarity index 77% rename from ui/src/proxy/activity/models.ts rename to ui/src/proxy/note/models.ts index 6447ed92..b9927c3b 100644 --- a/ui/src/proxy/activity/models.ts +++ b/ui/src/proxy/note/models.ts @@ -1,6 +1,6 @@ import { FullAuditedEntityDto } from '../abp' -export interface ActivityDto extends FullAuditedEntityDto { +export interface NoteDto extends FullAuditedEntityDto { tenantId?: string entityName: string entityId: string @@ -12,7 +12,7 @@ export interface ActivityDto extends FullAuditedEntityDto { files: File[] } -export interface ActivityFileDto { +export interface NoteFileDto { fileName: string fileType: string fileSize: number diff --git a/ui/src/services/fileManagement.service.ts b/ui/src/services/fileManagement.service.ts index 92678c27..f3f93053 100644 --- a/ui/src/services/fileManagement.service.ts +++ b/ui/src/services/fileManagement.service.ts @@ -38,7 +38,7 @@ class FileManagementService { formData.append('parentId', request.parentId) } - // ActivityModal pattern - Files array + // NoteModal pattern - Files array request.files.forEach(file => { formData.append('Files', file) }) @@ -51,7 +51,7 @@ class FileManagementService { }) } - // Upload a file directly with FormData (ActivityModal pattern) + // Upload a file directly with FormData (NoteModal pattern) async uploadFileDirectly(formData: FormData): Promise<{ data: FileItem }> { try { console.log('Uploading file directly with FormData') diff --git a/ui/src/services/activity.service.ts b/ui/src/services/note.service.ts similarity index 61% rename from ui/src/services/activity.service.ts rename to ui/src/services/note.service.ts index a29baf8d..a0e95762 100644 --- a/ui/src/services/activity.service.ts +++ b/ui/src/services/note.service.ts @@ -1,21 +1,21 @@ import { PagedResultDto } from '@/proxy' -import { ActivityDto, ActivityFileDto } from '@/proxy/activity/models' +import { NoteDto, NoteFileDto } from '@/proxy/note/models' import apiService from '@/services/api.service' import { AxiosError } from 'axios' -class ActivityService { - async getList(params?: any): Promise> { - const response = await apiService.fetchData>({ - url: '/api/app/activity', +class NoteService { + async getList(params?: any): Promise> { + const response = await apiService.fetchData>({ + url: '/api/app/note', method: 'GET', params, }) return response.data } - async get(id: string): Promise { - const response = await apiService.fetchData({ - url: `/api/app/activity/${id}`, + async get(id: string): Promise { + const response = await apiService.fetchData({ + url: `/api/app/note/${id}`, method: 'GET', }) return response.data @@ -24,14 +24,14 @@ class ActivityService { async create(data: FormData): Promise { try { const response = await apiService.fetchData({ - url: '/api/app/activity', + url: '/api/app/note', method: 'POST', data, // FormData olduğu için headers belirtmeye gerek yok }) return response.data } catch (error) { if (error instanceof AxiosError) { - console.error('Error creating activity:', error.response?.data) + console.error('Error creating note:', error.response?.data) return error.response?.data } else { console.error('Unexpected error:', error) @@ -40,9 +40,9 @@ class ActivityService { } } - async update(id: string, data: ActivityDto): Promise { - const response = await apiService.fetchData({ - url: `/api/app/activity/${id}`, + async update(id: string, data: NoteDto): Promise { + const response = await apiService.fetchData({ + url: `/api/app/note/${id}`, method: 'PUT', data: data as any, }) @@ -51,14 +51,14 @@ class ActivityService { async delete(id: string): Promise { await apiService.fetchData({ - url: `/api/app/activity/${id}`, + url: `/api/app/note/${id}`, method: 'DELETE', }) } async downloadFile(savedFileName: string, fileName: string, fileType: string) { - const response = await apiService.fetchData({ - url: `/api/app/activity/download?savedFileName=${savedFileName}`, + const response = await apiService.fetchData({ + url: `/api/app/note/download?savedFileName=${savedFileName}`, method: 'GET', }) @@ -78,4 +78,4 @@ class ActivityService { } } -export const activityService = new ActivityService() +export const noteService = new NoteService() diff --git a/ui/src/types/pm.ts b/ui/src/types/pm.ts index a9a9ad7c..c5876397 100644 --- a/ui/src/types/pm.ts +++ b/ui/src/types/pm.ts @@ -1,5 +1,5 @@ +import { DepartmentDto } from '@/proxy/intranet/models' import { PriorityEnum } from './common' -import { DepartmentDto } from './hr' import { MmMaterial } from './mm' export type CalendarView = 'month' | 'week' | 'day' diff --git a/ui/src/types/ps.ts b/ui/src/types/ps.ts index 274525f5..3e64a2fd 100644 --- a/ui/src/types/ps.ts +++ b/ui/src/types/ps.ts @@ -1,5 +1,5 @@ +import { EmployeeDto } from '@/proxy/intranet/models' import { BusinessParty, PriorityEnum } from './common' -import { EmployeeDto } from './hr' export interface PsProject { // Proje diff --git a/ui/src/views/admin/files/FileManager.tsx b/ui/src/views/admin/files/FileManager.tsx index c2c1a457..acac58df 100644 --- a/ui/src/views/admin/files/FileManager.tsx +++ b/ui/src/views/admin/files/FileManager.tsx @@ -78,7 +78,7 @@ const FileManager = () => { const items = response.data.items || [] // Manual protection for system folders const protectedItems = items.map((item) => { - const isSystemFolder = ['avatar', 'import', 'activity'].includes(item.name.toLowerCase()) + const isSystemFolder = ['avatar', 'import', 'note'].includes(item.name.toLowerCase()) return { ...item, isReadOnly: item.isReadOnly || isSystemFolder, @@ -228,10 +228,10 @@ const FileManager = () => { try { setUploading(true) for (const file of files) { - // ActivityModal pattern'ini kullan - Files array ile FormData + // NoteModal pattern'ini kullan - Files array ile FormData const formData = new FormData() formData.append('fileName', file.name) - formData.append('Files', file) // ActivityModal pattern - Files array + formData.append('Files', file) // NoteModal pattern - Files array if (currentFolderId) { formData.append('parentId', currentFolderId) } diff --git a/ui/src/views/admin/listForm/edit/FormTabDetails.tsx b/ui/src/views/admin/listForm/edit/FormTabDetails.tsx index e583b86e..769d7109 100644 --- a/ui/src/views/admin/listForm/edit/FormTabDetails.tsx +++ b/ui/src/views/admin/listForm/edit/FormTabDetails.tsx @@ -21,7 +21,7 @@ const schema = Yup.object().shape({ description: Yup.string(), pageSize: Yup.number(), isSubForm: Yup.boolean(), - showActivity: Yup.boolean(), + showNote: Yup.boolean(), layoutDto: Yup.object().shape({ grid: Yup.boolean(), card: Yup.boolean(), @@ -177,13 +177,13 @@ function FormTabDetails( diff --git a/ui/src/views/admin/listForm/edit/FormTabPermissions.tsx b/ui/src/views/admin/listForm/edit/FormTabPermissions.tsx index 8982eecd..9b2f0959 100644 --- a/ui/src/views/admin/listForm/edit/FormTabPermissions.tsx +++ b/ui/src/views/admin/listForm/edit/FormTabPermissions.tsx @@ -211,15 +211,15 @@ function FormTabPermissions(props: FormEditProps) { {({ field, form }: FieldProps) => (