Dev

applications/Unity.GrantManager/modules/Unity.AI/src/Unity.AI.Application.Contracts/Automation/IApplicationAIGenerationQueue.cs

@@ -5,5 +5,8 @@ namespace Unity.AI.Automation;
 
 public interface IApplicationAIGenerationQueue
 {
-    Task QueueApplicationPipelineAsync(Guid applicationId, Guid? tenantId, string? promptVersion = null);
+    Task QueueAttachmentSummaryAsync(Guid applicationId, Guid? tenantId, string? promptVersion = null);
+    Task QueueApplicationAnalysisAsync(Guid applicationId, Guid? tenantId, string? promptVersion = null);
+    Task QueueApplicationScoringAsync(Guid applicationId, Guid? tenantId, string? promptVersion = null);
+    Task QueueAllAIStagesAsync(Guid applicationId, Guid? tenantId, string? promptVersion = null);
 }

applications/Unity.GrantManager/modules/Unity.AI/src/Unity.AI.Application/GrantApplications/ApplicationAnalysisAppService.cs

@@ -2,17 +2,20 @@
 using System;
 using System.Threading.Tasks;
 using Unity.AI;
-using Unity.AI.Operations;
+using Unity.AI.Automation;
 using Unity.AI.Permissions;
 using Volo.Abp;
 using Volo.Abp.Features;
+using Volo.Abp.MultiTenancy;
 
 namespace Unity.GrantManager.GrantApplications;
 
 [Authorize(AIPermissions.Analysis.GenerateApplicationAnalysis)]
 public class ApplicationAnalysisAppService(
-    IApplicationAnalysisService applicationAnalysisService,
-    IFeatureChecker featureChecker)
+    Unity.AI.Operations.IApplicationAnalysisService applicationAnalysisService,
+    IApplicationAIGenerationQueue aiGenerationQueue,
+    IFeatureChecker featureChecker,
+    ICurrentTenant currentTenant)
     : AIAppService, IApplicationAnalysisAppService
 {
     public virtual async Task<ApplicationAnalysisResultDto> GenerateApplicationAnalysisAsync(Guid applicationId, string? promptVersion = null)
@@ -22,8 +25,8 @@ public virtual async Task<ApplicationAnalysisResultDto> GenerateApplicationAnaly
             throw new UserFriendlyException("AI application analysis is not enabled.");
         }
 
-        await applicationAnalysisService.RegenerateAndSaveAsync(applicationId, promptVersion);
-        return new ApplicationAnalysisResultDto { Completed = true };
+        await aiGenerationQueue.QueueApplicationAnalysisAsync(applicationId, currentTenant.Id, promptVersion);
+        return new ApplicationAnalysisResultDto { Completed = false };
     }
 
     // Internal-only: no HTTP endpoint, no auth check — safe for background job callers

applications/Unity.GrantManager/modules/Unity.AI/src/Unity.AI.Application/GrantApplications/ApplicationContentAppService.cs

@@ -30,7 +30,7 @@ public async Task<ApplicationContentResultDto> GenerateContentAsync(Guid applica
             throw new UserFriendlyException("AI generate all is not enabled.");
         }
 
-        await aiGenerationQueue.QueueApplicationPipelineAsync(applicationId, currentTenant.Id, promptVersion);
+        await aiGenerationQueue.QueueAllAIStagesAsync(applicationId, currentTenant.Id, promptVersion);
 
         return new ApplicationContentResultDto
         {

applications/Unity.GrantManager/modules/Unity.Flex/src/Unity.Flex.Application.Contracts/Worksheets/ICustomFieldAppService.cs

@@ -8,5 +8,6 @@ public interface ICustomFieldAppService
         Task<CustomFieldDto> GetAsync(Guid id);
         Task<CustomFieldDto> EditAsync(Guid id, EditCustomFieldDto dto);
         Task DeleteAsync(Guid id);
+        Task MoveToSectionAsync(Guid fieldId, Guid targetSectionId, uint newIndex);
     }
 }

applications/Unity.GrantManager/modules/Unity.Flex/src/Unity.Flex.Application/Domain/Worksheets/CustomField.cs

@@ -32,7 +32,7 @@ public virtual WorksheetSection Section
             get => _section
                    ?? throw new InvalidOperationException("Uninitialized property: " + nameof(Section));
         }
-        public virtual Guid SectionId { get; }
+        public virtual Guid SectionId { get; internal set; }
         private WorksheetSection? _section;
 
         protected CustomField()

applications/Unity.GrantManager/modules/Unity.Flex/src/Unity.Flex.Application/Worksheets/CustomFieldAppService.cs

@@ -5,6 +5,7 @@
 using Volo.Abp.Domain.Entities;
 using System.Linq;
 using Unity.Flex.Worksheets.Definitions;
+using Volo.Abp;
 
 namespace Unity.Flex.Worksheets
 {
@@ -39,5 +40,31 @@ public async Task DeleteAsync(Guid id)
 
             section.RemoveField(field);
         }
+
+        public async Task MoveToSectionAsync(Guid fieldId, Guid targetSectionId, uint newIndex)
+        {
+            var field = await customFieldRepostitory.GetAsync(fieldId) ?? throw new EntityNotFoundException();
+            if (field.SectionId == targetSectionId) return;
+
+            var worksheet = await worksheetRepository.GetBySectionAsync(field.SectionId, true) ?? throw new EntityNotFoundException();
+            if (worksheet.Published) throw new UserFriendlyException("Cannot move fields in a published worksheet.");
+
+            var sourceSection = worksheet.Sections.FirstOrDefault(s => s.Id == field.SectionId) ?? throw new EntityNotFoundException();
+            var targetSection = worksheet.Sections.FirstOrDefault(s => s.Id == targetSectionId) ?? throw new EntityNotFoundException();
+
+            // Renumber source section, excluding the moving field
+            var sourceFields = sourceSection.Fields.Where(f => f.Id != fieldId).OrderBy(f => f.Order).ToList();
+            for (int i = 0; i < sourceFields.Count; i++)
+                sourceFields[i].SetOrder((uint)(i + 1));
+
+            // Make room in target section at the insertion point
+            uint insertAt = Math.Min(newIndex + 1, (uint)(targetSection.Fields.Count + 1));
+            foreach (var f in targetSection.Fields.Where(f => f.Order >= insertAt))
+                f.SetOrder(f.Order + 1);
+
+            // Update FK directly — EF Core change tracker issues a single UPDATE, avoids orphan-deletion
+            field.SetOrder(insertAt);
+            field.SectionId = targetSectionId;
+        }
     }
 }

applications/Unity.GrantManager/modules/Unity.Flex/src/Unity.Flex.Web/Views/Shared/Components/DataGridWidget/DataGridWidget.cs

@@ -389,7 +389,8 @@ private static DataGridViewSummary GenerateSummary(DataGridColumn[]? dataColumns
         private static string SumCells(string? key, DataGridViewModelRow[] rows)
         {
             decimal sum = 0;
-            foreach (var cell in rows.Select(row => row.Cells.Find(x => x.Key == key)).Where(cell => cell != null))
+            var cells = rows.Select(row => row.Cells.Find(x => x.Key == key)).Where(cell => cell != null);
+            foreach (var cell in cells)
             {
                 var preparse = cell!.Value.Replace("$", "").Replace(",", "");
                 if (decimal.TryParse(preparse, out decimal value))

applications/Unity.GrantManager/modules/Unity.Flex/src/Unity.Flex.Web/Views/Shared/Components/QuestionSelectListDefinitionWidget/QuestionSelectListDefinitionWidget.cs

@@ -28,30 +28,27 @@ public class QuestionSelectListDefinitionWidget : AbpViewComponent
             var seenKeys = new HashSet<string>();
             var counter = 1;
 
-            foreach (var key in form.Keys)
+            var optionKeys = form.Keys.Where(key => key.StartsWith("Options[") && key.EndsWith("].Text"));
+            foreach (var key in optionKeys)
             {
-                if (key.StartsWith("Options[") && key.EndsWith("].Text"))
-                {
-                    var index = key.Split('[')[1].Split(']')[0];
+                var index = key.Split('[')[1].Split(']')[0];
+                var optionKey = form[key].ToString() ?? string.Empty;
+                var scoreKey = $"Options[{index}].Score";
+                var optionScore = form[scoreKey].ToString() ?? string.Empty;
 
-                    var optionKey = form[key].ToString() ?? string.Empty;
-                    var scoreKey = $"Options[{index}].Score";
-                    var optionScore = form[scoreKey].ToString() ?? string.Empty;
+                // Ensure optionKey is unique and not empty
+                if (!seenKeys.Contains(optionKey) && !string.IsNullOrEmpty(optionKey))
+                {
+                    seenKeys.Add(optionKey);
 
-                    // Ensure optionKey is unique and not empty
-                    if (!seenKeys.Contains(optionKey) && !string.IsNullOrEmpty(optionKey))
+                    var questionOption = new QuestionSelectListOption
                     {
-                        seenKeys.Add(optionKey);
-
-                        var questionOption = new QuestionSelectListOption
-                        {
-                            Key = "key" + counter++,
-                            NumericValue = long.TryParse(optionScore, out var score) ? score : 0,
-                            Value = optionKey
-                        };
+                        Key = "key" + counter++,
+                        NumericValue = long.TryParse(optionScore, out var score) ? score : 0,
+                        Value = optionKey
+                    };
 
-                        options.Add(questionOption);
-                    }
+                    options.Add(questionOption);
                 }
             }
 

applications/Unity.GrantManager/modules/Unity.Flex/src/Unity.Flex.Web/Views/Shared/Components/WorksheetListWidget/WorksheetList.js

@@ -104,7 +104,9 @@ function makeCustomFieldsSortable() {
     document.querySelectorAll('.custom-fields-wrapper').forEach(function (div) {
         const wrapper = div.closest('.sections-wrapper-outer');
         const isArchived = wrapper?.dataset.isArchived === 'true';
+        const worksheetId = wrapper?.dataset.worksheetId;
         customFieldSortables.push(new Sortable(div, {
+            group: `custom-fields-${worksheetId}`,
             animation: 150,
             disabled: isArchived,
             onEnd: function (evt) {
@@ -138,18 +140,36 @@ function makeSectionsSortable() {
 }
 
 function updateCustomFieldsSequence(evt) {
-    let sectionId = evt.target.dataset.sectionId;
-    let oldIndex = evt.oldIndex;
-    let newIndex = evt.newIndex;
-
-    unity.flex.worksheets.worksheetSection
-        .resequenceCustomFields(sectionId, oldIndex, newIndex, {})
-        .done(function () {
-            updatePreview();
-            abp.notify.success(
-                'Custom fields order updated.'
-            );
-        });
+    if (evt.from === evt.to) {
+        // Reorder within the same section
+        const sectionId = evt.from.dataset.sectionId;
+        const oldIndex = evt.oldIndex;
+        const newIndex = evt.newIndex;
+
+        unity.flex.worksheets.worksheetSection
+            .resequenceCustomFields(sectionId, oldIndex, newIndex, {})
+            .done(function () {
+                updatePreview();
+                abp.notify.success('Custom fields order updated.');
+            });
+    } else {
+        // Move to a different section
+        const fieldId = evt.item.dataset.id;
+        const targetSectionId = evt.to.dataset.sectionId;
+        const newIndex = evt.newIndex;
+
+        unity.flex.worksheets.customField
+            .moveToSection(fieldId, targetSectionId, newIndex, {})
+            .done(function () {
+                updatePreview();
+                abp.notify.success('Field moved to new section.');
+            })
+            .fail(function () {
+                // Revert the DOM move on failure
+                evt.from.insertBefore(evt.item, evt.from.children[evt.oldIndex] || null);
+                abp.notify.error('Failed to move field.');
+            });
+    }
 }
 
 function updateSectionSequence(evt) {

applications/Unity.GrantManager/modules/Unity.Identity.Web/src/Pages/Identity/Roles/CreateModal.cshtml

@@ -25,34 +25,31 @@
 
             <abp-input asp-for="Role.IsPublic" />
 
-            @foreach (var propertyInfo in ObjectExtensionManager.Instance.GetProperties<CreateModalModel.RoleInfoModel>())
+            @foreach (ObjectExtensionPropertyInfo propertyInfo in ObjectExtensionManager.Instance.GetProperties<CreateModalModel.RoleInfoModel>().Where(p => !p.Name.EndsWith("_Text")))
             {
-                if (!propertyInfo.Name.EndsWith("_Text"))
+                if (propertyInfo.Type.IsEnum || !propertyInfo.Lookup.Url.IsNullOrEmpty())
                 {
-                    if (propertyInfo.Type.IsEnum || !propertyInfo.Lookup.Url.IsNullOrEmpty())
+                    if (propertyInfo.Type.IsEnum)
                     {
-                        if (propertyInfo.Type.IsEnum)
-                        {
-                            Model.Role.ExtraProperties.ToEnum(propertyInfo.Name, propertyInfo.Type);
-                        }
-                        <abp-select asp-for="Role.ExtraProperties[propertyInfo.Name]"
-                                    label="@propertyInfo.GetLocalizedDisplayName(StringLocalizerFactory)"
-                                    autocomplete-api-url="@propertyInfo.Lookup.Url"
-                                    autocomplete-selected-item-name="@Model.Role.GetProperty(propertyInfo.Name+"_Text")"
-                                    autocomplete-selected-item-value="@Model.Role.GetProperty(propertyInfo.Name)"
-                                    autocomplete-filter-param-name="@propertyInfo.Lookup.FilterParamName"
-                                    autocomplete-items-property-name="@propertyInfo.Lookup.ResultListPropertyName"
-                                    autocomplete-display-property-name="@propertyInfo.Lookup.DisplayPropertyName"
-                                    autocomplete-value-property-name="@propertyInfo.Lookup.ValuePropertyName"></abp-select>
-                    }
-                    else
-                    {
-                        <abp-input type="@propertyInfo.GetInputType()"
-                                   asp-for="Role.ExtraProperties[propertyInfo.Name]"
-                                   label="@propertyInfo.GetLocalizedDisplayName(StringLocalizerFactory)"
-                                   asp-format="@propertyInfo.GetInputFormatOrNull()"
-                                   value="@propertyInfo.GetInputValueOrNull(Model.Role.GetProperty(propertyInfo.Name))" />
+                        Model.Role.ExtraProperties.ToEnum(propertyInfo.Name, propertyInfo.Type);
                     }
+                    <abp-select asp-for="Role.ExtraProperties[propertyInfo.Name]"
+                                label="@propertyInfo.GetLocalizedDisplayName(StringLocalizerFactory)"
+                                autocomplete-api-url="@propertyInfo.Lookup.Url"
+                                autocomplete-selected-item-name="@Model.Role.GetProperty(propertyInfo.Name+"_Text")"
+                                autocomplete-selected-item-value="@Model.Role.GetProperty(propertyInfo.Name)"
+                                autocomplete-filter-param-name="@propertyInfo.Lookup.FilterParamName"
+                                autocomplete-items-property-name="@propertyInfo.Lookup.ResultListPropertyName"
+                                autocomplete-display-property-name="@propertyInfo.Lookup.DisplayPropertyName"
+                                autocomplete-value-property-name="@propertyInfo.Lookup.ValuePropertyName"></abp-select>
+                }
+                else
+                {
+                    <abp-input type="@propertyInfo.GetInputType()"
+                               asp-for="Role.ExtraProperties[propertyInfo.Name]"
+                               label="@propertyInfo.GetLocalizedDisplayName(StringLocalizerFactory)"
+                               asp-format="@propertyInfo.GetInputFormatOrNull()"
+                               value="@propertyInfo.GetInputValueOrNull(Model.Role.GetProperty(propertyInfo.Name))" />
                 }
             }
         </abp-modal-body>

applications/Unity.GrantManager/modules/Unity.Identity.Web/src/Pages/Identity/Roles/EditModal.cshtml

@@ -36,34 +36,31 @@
 
             <abp-input asp-for="Role.IsPublic" />
 
-            @foreach (var propertyInfo in ObjectExtensionManager.Instance.GetProperties<CreateModalModel.RoleInfoModel>())
+            @foreach (ObjectExtensionPropertyInfo propertyInfo in ObjectExtensionManager.Instance.GetProperties<CreateModalModel.RoleInfoModel>().Where(p => !p.Name.EndsWith("_Text")))
             {
-                if (!propertyInfo.Name.EndsWith("_Text"))
+                if (propertyInfo.Type.IsEnum || !propertyInfo.Lookup.Url.IsNullOrEmpty())
                 {
-                    if (propertyInfo.Type.IsEnum || !propertyInfo.Lookup.Url.IsNullOrEmpty())
+                    if (propertyInfo.Type.IsEnum)
                     {
-                        if (propertyInfo.Type.IsEnum)
-                        {
-                            Model.Role.ExtraProperties.ToEnum(propertyInfo.Name, propertyInfo.Type);
-                        }
-                        <abp-select asp-for="Role.ExtraProperties[propertyInfo.Name]"
-                                    label="@propertyInfo.GetLocalizedDisplayName(StringLocalizerFactory)"
-                                    autocomplete-api-url="@propertyInfo.Lookup.Url"
-                                    autocomplete-selected-item-name="@Model.Role.GetProperty(propertyInfo.Name+"_Text")"
-                                    autocomplete-selected-item-value="@Model.Role.GetProperty(propertyInfo.Name)"
-                                    autocomplete-filter-param-name="@propertyInfo.Lookup.FilterParamName"
-                                    autocomplete-items-property-name="@propertyInfo.Lookup.ResultListPropertyName"
-                                    autocomplete-display-property-name="@propertyInfo.Lookup.DisplayPropertyName"
-                                    autocomplete-value-property-name="@propertyInfo.Lookup.ValuePropertyName"></abp-select>
-                    }
-                    else
-                    {
-                        <abp-input type="@propertyInfo.GetInputType()"
-                                   asp-for="Role.ExtraProperties[propertyInfo.Name]"
-                                   label="@propertyInfo.GetLocalizedDisplayName(StringLocalizerFactory)"
-                                   asp-format="@propertyInfo.GetInputFormatOrNull()"
-                                   value="@propertyInfo.GetInputValueOrNull(Model.Role.GetProperty(propertyInfo.Name))" />
+                        Model.Role.ExtraProperties.ToEnum(propertyInfo.Name, propertyInfo.Type);
                     }
+                    <abp-select asp-for="Role.ExtraProperties[propertyInfo.Name]"
+                                label="@propertyInfo.GetLocalizedDisplayName(StringLocalizerFactory)"
+                                autocomplete-api-url="@propertyInfo.Lookup.Url"
+                                autocomplete-selected-item-name="@Model.Role.GetProperty(propertyInfo.Name+"_Text")"
+                                autocomplete-selected-item-value="@Model.Role.GetProperty(propertyInfo.Name)"
+                                autocomplete-filter-param-name="@propertyInfo.Lookup.FilterParamName"
+                                autocomplete-items-property-name="@propertyInfo.Lookup.ResultListPropertyName"
+                                autocomplete-display-property-name="@propertyInfo.Lookup.DisplayPropertyName"
+                                autocomplete-value-property-name="@propertyInfo.Lookup.ValuePropertyName"></abp-select>
+                }
+                else
+                {
+                    <abp-input type="@propertyInfo.GetInputType()"
+                               asp-for="Role.ExtraProperties[propertyInfo.Name]"
+                               label="@propertyInfo.GetLocalizedDisplayName(StringLocalizerFactory)"
+                               asp-format="@propertyInfo.GetInputFormatOrNull()"
+                               value="@propertyInfo.GetInputValueOrNull(Model.Role.GetProperty(propertyInfo.Name))" />
                 }
             }
         </abp-modal-body>