Skip to content

Dev #1363

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
jimmyPasta merged 7 commits into from
May 28, 2025
Merged

Dev #1363

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
ae22199
Merge branch 'feature/ab#27405-css-improvement' of https://github.com…
samsaravillo May 28, 2025
fae536c
SQ S1128 Remove unnecessary using, SQ remove unnecessary assignment o…
Stephan-McColm May 28, 2025
883cf4c
ab#27405 css build fix
samsaravillo May 28, 2025
ea11e51
Merge branch 'dev' into feature/ab#27405-css-improvement
samsaravillo May 28, 2025
78e3a00
Merge pull request #1361 from bcgov/feature/AB#29148-SQ-S1128-Remove-…
jimmyPasta May 28, 2025
5893b71
AB#27405 - cleanup flex project file (embedded resources)
AndreGAot May 28, 2025
f5c05fb
Merge pull request #1362 from bcgov/feature/ab#27405-css-improvement
AndreGAot May 28, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
194 changes: 53 additions & 141 deletions applications/Unity.GrantManager/modules/Unity.Flex/src/Unity.Flex.Web/Unity.Flex.Web.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,152 +1,64 @@
<Project Sdk="Microsoft.NET.Sdk.Web">

<Import Project="..\..\common.props" />
<Import Project="..\..\common.props" />

<PropertyGroup>
<TargetFramework>net8.0</TargetFramework>
<Nullable>enable</Nullable>
<AssetTargetFallback>$(AssetTargetFallback);portable-net45+win8+wp8+wpa81;</AssetTargetFallback>
<IsPackable>true</IsPackable>
<OutputType>Library</OutputType>
<RootNamespace>Unity.Flex.Web</RootNamespace>
<GenerateEmbeddedFilesManifest>true</GenerateEmbeddedFilesManifest>
</PropertyGroup>
<PropertyGroup>
<TargetFramework>net8.0</TargetFramework>
<Nullable>enable</Nullable>
<AssetTargetFallback>$(AssetTargetFallback);portable-net45+win8+wp8+wpa81;</AssetTargetFallback>
<IsPackable>true</IsPackable>
<OutputType>Library</OutputType>
<RootNamespace>Unity.Flex.Web</RootNamespace>
<GenerateEmbeddedFilesManifest>true</GenerateEmbeddedFilesManifest>
</PropertyGroup>

<ItemGroup>
<PackageReference Include="Microsoft.Extensions.Caching.Memory" Version="8.0.1" />
<PackageReference Include="Microsoft.Extensions.Options" Version="9.0.0" />
<PackageReference Include="System.Text.Json" Version="8.0.5" />
<PackageReference Include="Volo.Abp.AutoMapper" Version="8.3.4" />
<PackageReference Include="Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared" Version="8.3.4" />
</ItemGroup>
<ItemGroup>
<PackageReference Include="Microsoft.Extensions.Caching.Memory" Version="8.0.1" />
<PackageReference Include="Microsoft.Extensions.Options" Version="9.0.0" />
<PackageReference Include="System.Text.Json" Version="8.0.5" />
<PackageReference Include="Volo.Abp.AutoMapper" Version="8.3.4" />
<PackageReference Include="Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared" Version="8.3.4" />
</ItemGroup>

<ItemGroup>
<PackageReference Include="Microsoft.Extensions.FileProviders.Embedded" Version="8.0.8" />
</ItemGroup>
<ItemGroup>
<PackageReference Include="Microsoft.Extensions.FileProviders.Embedded" Version="8.0.8" />
</ItemGroup>

<ItemGroup>
<EmbeddedResource Include="Pages\**\*.css" />
<EmbeddedResource Include="Pages\**\*.js" />
<EmbeddedResource Include="Components\**\*.js" />
<EmbeddedResource Include="Components\**\*.css" />
<EmbeddedResource Include="wwwroot\**\*.*" />
</ItemGroup>
<ItemGroup>
<EmbeddedResource Include="Pages\**\*.css" />
<EmbeddedResource Include="Pages\**\*.js" />
<EmbeddedResource Include="Components\**\*.js" />
<EmbeddedResource Include="Components\**\*.css" />
<EmbeddedResource Include="Views\**\*.js" />
<EmbeddedResource Include="Views\**\*.css" />
<EmbeddedResource Include="wwwroot\**\*.*" />
<Content Remove="Pages\**\*.css" />
<Content Remove="Pages\**\*.js" />
<Content Remove="Components\**\*.js" />
<Content Remove="Components\**\*.css" />
<Content Remove="Views\**\*.js" />
<Content Remove="Views\**\*.css" />
<Content Remove="wwwroot\**\*.*" />
</ItemGroup>

<ItemGroup>
<None Remove="Pages\WorksheetConfiguration\Index.css" />
<None Remove="Pages\WorksheetConfiguration\Index.js" />
<None Remove="Views\Shared\Components\BCAddressWidget\Default.js" />
<None Remove="Views\Shared\Components\CheckboxGroupDefinitionWidget\Default.css" />
<None Remove="Views\Shared\Components\CheckboxGroupDefinitionWidget\Default.js" />
<None Remove="Views\Shared\Components\CheckboxGroupWidget\Default.css" />
<None Remove="Views\Shared\Components\CheckboxGroupWidget\Default.js" />
<None Remove="Views\Shared\Components\CheckboxWidget\Default.css" />
<None Remove="Views\Shared\Components\CheckboxWidget\Default.js" />
<None Remove="Views\Shared\Components\Common\KeyValueComponents.js" />
<None Remove="Views\Shared\Components\CurrencyWidget\Default.js" />
<None Remove="Views\Shared\Components\CustomFieldDefinitionWidget\Default.js" />
<None Remove="Views\Shared\Components\CustomTabWidget\Default.css" />
<None Remove="Views\Shared\Components\CustomTabWidget\Default.js" />
<None Remove="Views\Shared\Components\DataGridDefinitionWidget\Default.css" />
<None Remove="Views\Shared\Components\DataGridDefinitionWidget\Default.js" />
<None Remove="Views\Shared\Components\DataGridWidget\Default.css" />
<None Remove="Views\Shared\Components\DataGridWidget\Default.js" />
<None Remove="Views\Shared\Components\DateWidget\Default.js" />
<None Remove="Views\Shared\Components\NumericDefinitionWidget\Default.js" />
<None Remove="Views\Shared\Components\QuestionDefinitionWidget\Default.css" />
<None Remove="Views\Shared\Components\QuestionDefinitionWidget\Default.js" />
<None Remove="Views\Shared\Components\QuestionSelectListDefinitionWidget\Default.css" />
<None Remove="Views\Shared\Components\QuestionSelectListDefinitionWidget\Default.js" />
<None Remove="Views\Shared\Components\RadioDefinitionWidget\Default.css" />
<None Remove="Views\Shared\Components\RadioDefinitionWidget\Default.js" />
<None Remove="Views\Shared\Components\RadioWidget\Default.css" />
<None Remove="Views\Shared\Components\RadioWidget\Default.js" />
<None Remove="Views\Shared\Components\Scoresheet\Scoresheet.css" />
<None Remove="Views\Shared\Components\Scoresheet\Scoresheet.js" />
<None Remove="Views\Shared\Components\SelectListDefinitionWidget\Default.css" />
<None Remove="Views\Shared\Components\SelectListDefinitionWidget\Default.js" />
<None Remove="Views\Shared\Components\SelectListWidget\Default.js" />
<None Remove="Views\Shared\Components\CurrencyDefinitionWidget\Default.js" />
<None Remove="Views\Shared\Components\TextAreaWidget\Default.js" />
<None Remove="Views\Shared\Components\TextDefinitionWidget\Default.js" />
<None Remove="Views\Shared\Components\WorksheetInstanceWidget\Default.css" />
<None Remove="Views\Shared\Components\WorksheetInstanceWidget\Default.js" />
<None Remove="Views\Shared\Components\WorksheetListWidget\WorksheetList.css" />
<None Remove="Views\Shared\Components\WorksheetListWidget\WorksheetList.js" />
<None Remove="Views\Shared\Components\WorksheetWidget\Worksheet.css" />
<None Remove="Views\Shared\Components\WorksheetWidget\Worksheet.js" />
<None Remove="Views\Shared\Components\QuestionYesNoDefinitionWidget\Default.js" />
<None Remove="Views\Shared\Components\YesNoWidget\Default.js" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\..\..\..\src\Unity.GrantManager.Application.Contracts\Unity.GrantManager.Application.Contracts.csproj" />
<ProjectReference Include="..\Unity.Flex.Application.Contracts\Unity.Flex.Application.Contracts.csproj" />
</ItemGroup>

<ItemGroup>
<EmbeddedResource Include="Views\Shared\Components\BCAddressWidget\Default.js" />
<EmbeddedResource Include="Views\Shared\Components\CheckboxGroupDefinitionWidget\Default.css" />
<EmbeddedResource Include="Views\Shared\Components\CheckboxGroupDefinitionWidget\Default.js" />
<EmbeddedResource Include="Views\Shared\Components\CheckboxGroupWidget\Default.css" />
<EmbeddedResource Include="Views\Shared\Components\CheckboxGroupWidget\Default.js" />
<EmbeddedResource Include="Views\Shared\Components\CheckboxWidget\Default.css" />
<EmbeddedResource Include="Views\Shared\Components\CheckboxWidget\Default.js" />
<EmbeddedResource Include="Views\Shared\Components\Common\KeyValueComponents.js" />
<EmbeddedResource Include="Views\Shared\Components\CurrencyWidget\Default.js" />
<EmbeddedResource Include="Views\Shared\Components\CustomFieldDefinitionWidget\Default.js" />
<EmbeddedResource Include="Views\Shared\Components\CustomTabWidget\Default.js">
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
</EmbeddedResource>
<EmbeddedResource Include="Views\Shared\Components\CustomTabWidget\Default.css">
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
</EmbeddedResource>
<EmbeddedResource Include="Views\Shared\Components\DataGridDefinitionWidget\Default.css" />
<EmbeddedResource Include="Views\Shared\Components\DataGridDefinitionWidget\Default.js" />
<EmbeddedResource Include="Views\Shared\Components\DataGridWidget\Default.css" />
<EmbeddedResource Include="Views\Shared\Components\DataGridWidget\Default.js" />
<EmbeddedResource Include="Views\Shared\Components\DateWidget\Default.js" />
<EmbeddedResource Include="Views\Shared\Components\NumericDefinitionWidget\Default.js" />
<EmbeddedResource Include="Views\Shared\Components\QuestionDefinitionWidget\Default.css" />
<EmbeddedResource Include="Views\Shared\Components\QuestionDefinitionWidget\Default.js" />
<EmbeddedResource Include="Views\Shared\Components\QuestionSelectListDefinitionWidget\Default.css" />
<EmbeddedResource Include="Views\Shared\Components\QuestionSelectListDefinitionWidget\Default.js" />
<EmbeddedResource Include="Views\Shared\Components\RadioDefinitionWidget\Default.css" />
<EmbeddedResource Include="Views\Shared\Components\RadioDefinitionWidget\Default.js" />
<EmbeddedResource Include="Views\Shared\Components\RadioWidget\Default.css" />
<EmbeddedResource Include="Views\Shared\Components\RadioWidget\Default.js" />
<EmbeddedResource Include="Views\Shared\Components\Scoresheet\Scoresheet.css" />
<EmbeddedResource Include="Views\Shared\Components\Scoresheet\Scoresheet.js" />
<EmbeddedResource Include="Views\Shared\Components\SelectListDefinitionWidget\Default.css" />
<EmbeddedResource Include="Views\Shared\Components\SelectListDefinitionWidget\Default.js" />
<EmbeddedResource Include="Views\Shared\Components\SelectListWidget\Default.js" />
<EmbeddedResource Include="Views\Shared\Components\CurrencyDefinitionWidget\Default.js" />
<EmbeddedResource Include="Views\Shared\Components\TextAreaDefinitionWidget\Default.js" />
<EmbeddedResource Include="Views\Shared\Components\TextAreaWidget\Default.js" />
<EmbeddedResource Include="Views\Shared\Components\TextDefinitionWidget\Default.js" />
<EmbeddedResource Include="Views\Shared\Components\WorksheetInstanceWidget\Default.css" />
<EmbeddedResource Include="Views\Shared\Components\WorksheetInstanceWidget\Default.js" />
<EmbeddedResource Include="Views\Shared\Components\WorksheetListWidget\WorksheetList.css" />
<EmbeddedResource Include="Views\Shared\Components\WorksheetListWidget\WorksheetList.js" />
<EmbeddedResource Include="Views\Shared\Components\WorksheetWidget\Worksheet.css" />
<EmbeddedResource Include="Views\Shared\Components\WorksheetWidget\Worksheet.js" />
<EmbeddedResource Include="Views\Shared\Components\QuestionYesNoDefinitionWidget\Default.js" />
<EmbeddedResource Include="Views\Shared\Components\YesNoWidget\Default.js" />
</ItemGroup>
<ItemGroup>
<Content Update="Views\Shared\Components\RadioDefinitionWidget\Default.cshtml">
<ExcludeFromSingleFile>true</ExcludeFromSingleFile>
<CopyToPublishDirectory>PreserveNewest</CopyToPublishDirectory>
</Content>
</ItemGroup>

<ItemGroup>
<ProjectReference Include="..\..\..\..\src\Unity.GrantManager.Application.Contracts\Unity.GrantManager.Application.Contracts.csproj" />
<ProjectReference Include="..\Unity.Flex.Application.Contracts\Unity.Flex.Application.Contracts.csproj" />
</ItemGroup>

<ItemGroup>
<Content Update="Views\Shared\Components\RadioDefinitionWidget\Default.cshtml">
<ExcludeFromSingleFile>true</ExcludeFromSingleFile>
<CopyToPublishDirectory>PreserveNewest</CopyToPublishDirectory>
</Content>
</ItemGroup>

<ItemGroup>
<PackageReference Update="ConfigureAwait.Fody" Version="3.3.2" />
<PackageReference Update="Fody" Version="6.8.1">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
</PackageReference>
</ItemGroup>
<ItemGroup>
<PackageReference Update="ConfigureAwait.Fody" Version="3.3.2" />
<PackageReference Update="Fody" Version="6.8.1">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
</PackageReference>
</ItemGroup>

</Project>
3 changes: 1 addition & 2 deletions ...n.Contracts/Permissions/GrantApplications/GrantApplicationPermissionDefinitionProvider.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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;
Expand Down
9 changes: 6 additions & 3 deletions ...rc/Unity.GrantManager.Web/Views/Shared/Components/ProjectInfo/ProjectInfoViewComponent.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -118,16 +118,19 @@ public async Task<IViewComponentResult> 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<double>();

if (projectFundingTotal == 0)
{
projectFundingTotal = decimal.Multiply(application.TotalProjectBudget, ProjectFundingMultiply);
projectFundingTotal = (projectFundingTotal > ProjectFundingMax) ? ProjectFundingMax : projectFundingTotal;
}

percentageTotalProjectBudget = application.TotalProjectBudget == 0 ? 0 : decimal.Multiply(decimal.Divide(application.RequestedAmount, application.TotalProjectBudget), 100).To<double>();

model.ProjectInfo = new()
{
ProjectName = application.ProjectName,
Expand Down