From fae536c0325bdd8a54038346ce7869b61875909a Mon Sep 17 00:00:00 2001 From: Stephan McColm Date: Wed, 28 May 2025 09:05:57 -0700 Subject: [PATCH 1/3] SQ S1128 Remove unnecessary using, SQ remove unnecessary assignment of a local variable. --- .../GrantApplicationPermissionDefinitionProvider.cs | 3 +-- .../Components/ProjectInfo/ProjectInfoViewComponent.cs | 9 ++++++--- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/applications/Unity.GrantManager/src/Unity.GrantManager.Application.Contracts/Permissions/GrantApplications/GrantApplicationPermissionDefinitionProvider.cs b/applications/Unity.GrantManager/src/Unity.GrantManager.Application.Contracts/Permissions/GrantApplications/GrantApplicationPermissionDefinitionProvider.cs index 118f08dc5..5359600df 100644 --- a/applications/Unity.GrantManager/src/Unity.GrantManager.Application.Contracts/Permissions/GrantApplications/GrantApplicationPermissionDefinitionProvider.cs +++ b/applications/Unity.GrantManager/src/Unity.GrantManager.Application.Contracts/Permissions/GrantApplications/GrantApplicationPermissionDefinitionProvider.cs @@ -1,5 +1,4 @@ -using System.Diagnostics.Metrics; -using Unity.GrantManager.Localization; +using Unity.GrantManager.Localization; using Unity.Modules.Shared; using Volo.Abp.Authorization.Permissions; using Volo.Abp.Localization; diff --git a/applications/Unity.GrantManager/src/Unity.GrantManager.Web/Views/Shared/Components/ProjectInfo/ProjectInfoViewComponent.cs b/applications/Unity.GrantManager/src/Unity.GrantManager.Web/Views/Shared/Components/ProjectInfo/ProjectInfoViewComponent.cs index bf2b2e44d..1dc9206fe 100644 --- a/applications/Unity.GrantManager/src/Unity.GrantManager.Web/Views/Shared/Components/ProjectInfo/ProjectInfoViewComponent.cs +++ b/applications/Unity.GrantManager/src/Unity.GrantManager.Web/Views/Shared/Components/ProjectInfo/ProjectInfoViewComponent.cs @@ -118,7 +118,12 @@ public async Task InvokeAsync(Guid applicationId, Guid app decimal projectFundingTotal = application.ProjectFundingTotal ?? 0; - double percentageTotalProjectBudget = application.PercentageTotalProjectBudget ?? 0; + double percentageTotalProjectBudget; + + if (application.TotalProjectBudget == 0) + percentageTotalProjectBudget = application.PercentageTotalProjectBudget ?? 0; + else + percentageTotalProjectBudget = decimal.Multiply(decimal.Divide(application.RequestedAmount, application.TotalProjectBudget), 100).To(); if (projectFundingTotal == 0) { @@ -126,8 +131,6 @@ public async Task InvokeAsync(Guid applicationId, Guid app projectFundingTotal = (projectFundingTotal > ProjectFundingMax) ? ProjectFundingMax : projectFundingTotal; } - percentageTotalProjectBudget = application.TotalProjectBudget == 0 ? 0 : decimal.Multiply(decimal.Divide(application.RequestedAmount, application.TotalProjectBudget), 100).To(); - model.ProjectInfo = new() { ProjectName = application.ProjectName, From 883cf4ce108c16776d820fdbab40a6dd9ca0e198 Mon Sep 17 00:00:00 2001 From: Sam Saravillo <7529759+samsaravillo@users.noreply.github.com> Date: Wed, 28 May 2025 09:14:53 -0700 Subject: [PATCH 2/3] ab#27405 css build fix --- .../Unity.Flex/src/Unity.Flex.Web/Unity.Flex.Web.csproj | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/applications/Unity.GrantManager/modules/Unity.Flex/src/Unity.Flex.Web/Unity.Flex.Web.csproj b/applications/Unity.GrantManager/modules/Unity.Flex/src/Unity.Flex.Web/Unity.Flex.Web.csproj index 4e5ca7220..8f4f59933 100644 --- a/applications/Unity.GrantManager/modules/Unity.Flex/src/Unity.Flex.Web/Unity.Flex.Web.csproj +++ b/applications/Unity.GrantManager/modules/Unity.Flex/src/Unity.Flex.Web/Unity.Flex.Web.csproj @@ -90,12 +90,8 @@ - - Always - - - Always - + + From 5893b7109739ddd862abd282e747394883cd705e Mon Sep 17 00:00:00 2001 From: Andre Goncalves Date: Wed, 28 May 2025 12:17:23 -0700 Subject: [PATCH 3/3] AB#27405 - cleanup flex project file (embedded resources) --- .../src/Unity.Flex.Web/Unity.Flex.Web.csproj | 190 +++++------------- 1 file changed, 53 insertions(+), 137 deletions(-) diff --git a/applications/Unity.GrantManager/modules/Unity.Flex/src/Unity.Flex.Web/Unity.Flex.Web.csproj b/applications/Unity.GrantManager/modules/Unity.Flex/src/Unity.Flex.Web/Unity.Flex.Web.csproj index 8f4f59933..ddc37cbf5 100644 --- a/applications/Unity.GrantManager/modules/Unity.Flex/src/Unity.Flex.Web/Unity.Flex.Web.csproj +++ b/applications/Unity.GrantManager/modules/Unity.Flex/src/Unity.Flex.Web/Unity.Flex.Web.csproj @@ -1,148 +1,64 @@ - + - - net8.0 - enable - $(AssetTargetFallback);portable-net45+win8+wp8+wpa81; - true - Library - Unity.Flex.Web - true - + + net8.0 + enable + $(AssetTargetFallback);portable-net45+win8+wp8+wpa81; + true + Library + Unity.Flex.Web + true + - - - - - - - + + + + + + + - - - + + + - - - - - - - + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + true + PreserveNewest + + - - - - - - - - true - PreserveNewest - - - - - - - all - runtime; build; native; contentfiles; analyzers - - + + + + all + runtime; build; native; contentfiles; analyzers + +