Dev

applications/Unity.GrantManager/modules/Unity.Flex/src/Unity.Flex.Application.Contracts/Reporting/Configuration/IWorksheetsMetadataService.cs

@@ -5,7 +5,7 @@ namespace Unity.Flex.Reporting.Configuration
 {
     public interface IWorksheetsMetadataService
     {        
-        Task<WorksheetComponentMetaDataDto> GetWorksheetSchemaMetaDataAsync(Guid worksheetId);
+        Task<WorksheetComponentMetaDataDto> GetWorksheetSchemaMetaDataAsync(Guid worksheetId, Guid formVersionId);
         Task<WorksheetComponentMetaDataDto> GetWorksheetSchemaMetaDataItemAsync(Guid worksheetId, string fieldKey);
     }
 }

applications/Unity.GrantManager/modules/Unity.Flex/src/Unity.Flex.Application/Reporting/Configuration/WorksheetsMetadataService.cs

@@ -2,19 +2,22 @@
 using System.Linq;
 using System.Threading.Tasks;
 using Unity.Flex.Domain.Worksheets;
+using Unity.GrantManager.ApplicationForms;
 using Volo.Abp.DependencyInjection;
 
 namespace Unity.Flex.Reporting.Configuration
 {
-    public class WorksheetsMetadataService(IWorksheetRepository worksheetRepository)
+    public class WorksheetsMetadataService(IWorksheetRepository worksheetRepository,
+        IApplicationFormVersionAppService formVersionAppService)
         : IWorksheetsMetadataService, ITransientDependency
     {
-        public async Task<WorksheetComponentMetaDataDto> GetWorksheetSchemaMetaDataAsync(Guid worksheetId)
+        public async Task<WorksheetComponentMetaDataDto> GetWorksheetSchemaMetaDataAsync(Guid worksheetId, Guid formVersionId)
         {
             var worksheet = await worksheetRepository.GetAsync(worksheetId);
-
+            var version = await formVersionAppService.GetAsync(formVersionId);            
+
             // Use the utility class to parse all fields in the worksheet
-            var components = WorksheetFieldSchemaParser.ParseWorksheet(worksheet);
+            var components = WorksheetFieldSchemaParser.ParseWorksheet(worksheet, version.FormSchema, version.SubmissionHeaderMapping);
 
             return new WorksheetComponentMetaDataDto()
             {

applications/Unity.GrantManager/modules/Unity.Flex/src/Unity.Flex.Shared/Worksheets/Definitions/DataGridDefinition.cs

@@ -27,6 +27,9 @@ public class DataGridDefinitionColumn
 
         [JsonPropertyName("type")]
         public string Type { get; set; } = string.Empty;
+
+        [JsonPropertyName("key")]
+        public string Key { get; set; } = string.Empty;
     }
 
     public enum DataGridDefinitionSummaryOption