Changed finance page

Author: nmakhmutov

.editorconfig

@@ -34,6 +34,8 @@ dotnet_style_require_accessibility_modifiers = for_non_interface_members:suggest
 # ReSharper properties
 resharper_align_multiline_binary_expressions_chain = false
 resharper_align_multiline_statement_conditions = false
+resharper_blank_lines_around_single_line_auto_property = 1
+resharper_blank_lines_around_single_line_property = 1
 resharper_braces_for_ifelse = not_required_for_both
 resharper_braces_for_lock = required_for_multiline
 resharper_braces_for_using = required_for_multiline
@@ -43,45 +45,51 @@ resharper_braces_for_dowhile = required_for_multiline
 resharper_braces_for_while = required_for_multiline
 resharper_braces_for_fixed = required_for_multiline
 resharper_builtin_type_apply_to_native_integer = true
+resharper_csharp_blank_lines_around_single_line_invocable = 1
 resharper_csharp_int_align_fix_in_adjacent = false
 resharper_csharp_keep_blank_lines_in_code = 1
 resharper_csharp_keep_blank_lines_in_declarations = 1
 resharper_csharp_max_enum_members_on_line = 1
+resharper_csharp_wrap_after_declaration_lpar = true
 resharper_csharp_wrap_before_binary_opsign = true
+resharper_csharp_wrap_before_declaration_rpar = true
 resharper_csharp_wrap_before_first_type_parameter_constraint = true
-resharper_csharp_wrap_extends_list_style = chop_always
+resharper_csharp_wrap_extends_list_style = chop_if_long
+resharper_csharp_wrap_parameters_style = chop_if_long
 resharper_enforce_line_ending_style = true
 resharper_force_attribute_style = join
 resharper_int_align_methods = true
 resharper_keep_existing_embedded_arrangement = false
 resharper_keep_existing_expr_member_arrangement = false
-resharper_keep_existing_initializer_arrangement = false
-resharper_keep_existing_primary_constructor_declaration_parens_arrangement = true
+resharper_keep_existing_initializer_arrangement = true
+resharper_keep_existing_primary_constructor_declaration_parens_arrangement = false
 resharper_keep_existing_property_patterns_arrangement = false
 resharper_keep_existing_switch_expression_arrangement = false
 resharper_local_function_body = expression_body
 resharper_max_attribute_length_for_same_line = 120
 resharper_new_line_before_while = true
 resharper_place_accessorholder_attribute_on_same_line = false
 resharper_place_accessor_attribute_on_same_line = true
+resharper_place_constructor_initializer_on_same_line = true
 resharper_place_expr_accessor_on_single_line = true
 resharper_place_expr_method_on_single_line = false
 resharper_place_expr_property_on_single_line = false
 resharper_place_field_attribute_on_same_line = false
 resharper_place_record_field_attribute_on_same_line = true
 resharper_place_simple_accessor_on_single_line = false
+resharper_place_simple_anonymousmethod_on_single_line = true
 resharper_place_simple_embedded_statement_on_same_line = false
-resharper_place_simple_initializer_on_single_line = false
+resharper_place_simple_initializer_on_single_line = true
 resharper_show_autodetect_configure_formatting_tip = false
 resharper_static_members_qualify_with = current_type
 resharper_use_indent_from_vs = false
-resharper_wrap_array_initializer_style = chop_always
+resharper_wrap_array_initializer_style = chop_if_long
 resharper_wrap_before_primary_constructor_declaration_lpar = false
 resharper_wrap_before_primary_constructor_declaration_rpar = true
 resharper_wrap_for_stmt_header_style = wrap_if_long
 resharper_wrap_lines = true
 resharper_wrap_linq_expressions = chop_always
-resharper_wrap_list_pattern = chop_always
+resharper_wrap_list_pattern = chop_if_long
 resharper_wrap_object_and_collection_initializer_style = chop_always
 
 # ReSharper inspection severities

src/Education.Client/Clients/ApiClient.cs

@@ -54,7 +54,7 @@ public async Task<ApiResult<T>> PostAsync<T>(string url, CancellationToken ct =
         return await ExecuteAsync<T>(token => _anonymous.PostAsync(url, null, token), ct);
     }
 
-    public async Task<ApiResult<T>> PostAsync<T, TK>(string url, TK data, CancellationToken ct = default)
+    public async Task<ApiResult<T>> PostAsync<T, U>(string url, U data, CancellationToken ct = default)
     {
         var state = await _provider.GetAuthenticationStateAsync();
         var content = CreateJson(data);
@@ -68,7 +68,7 @@ public async Task<ApiResult<T>> PostAsync<T, TK>(string url, TK data, Cancellati
     public Task<ApiResult<T>> PutAsync<T>(string url, CancellationToken ct = default) =>
         ExecuteAsync<T>(token => _authenticated.PutAsync(url, null, token), ct);
 
-    public Task<ApiResult<T>> PutAsync<T, TK>(string url, TK data, CancellationToken ct = default) =>
+    public Task<ApiResult<T>> PutAsync<T, U>(string url, U data, CancellationToken ct = default) =>
         ExecuteAsync<T>(token => _authenticated.PutAsync(url, CreateJson(data), token), ct);
 
     public Task<ApiResult<T>> DeleteAsync<T>(string url, CancellationToken ct = default) =>

src/Education.Client/Clients/ApiResult.cs

@@ -54,7 +54,7 @@ public static ApiResult<T> Success(T data) =>
     public static ApiResult<T> Fail(Error error) =>
         new(error);
 
-    public TU Match<TU>(Func<T, TU> success, Func<Error, TU> error, Func<TU> loading) =>
+    public U Match<U>(Func<T, U> success, Func<Error, U> error, Func<U> loading) =>
         Status switch
         {
             Status.Loading => loading(),
@@ -105,8 +105,8 @@ public bool MatchError(Action<Error> error)
     public bool MatchError(Func<Error, bool> fn) =>
         IsError && fn(Error);
 
-    public ApiResult<TU> Map<TU>(Func<T, TU> fn) =>
-        Match(x => ApiResult<TU>.Success(fn(x)), ApiResult<TU>.Fail, ApiResult<TU>.Loading);
+    public ApiResult<U> Map<U>(Func<T, U> fn) =>
+        Match(x => ApiResult<U>.Success(fn(x)), ApiResult<U>.Fail, ApiResult<U>.Loading);
 
     public ApiResult<T> Or(Func<T> fn) =>
         Match(Success, _ => Success(fn()), () => Success(fn()));

src/Education.Client/Education.Client.csproj

@@ -8,14 +8,14 @@
     <WasmEnableWebcil>true</WasmEnableWebcil>
   </PropertyGroup>
   <ItemGroup>
-    <PackageReference Include="Blazor-ApexCharts" Version="5.1.0"/>
-    <PackageReference Include="Blazored.FluentValidation" Version="2.2.0"/>
-    <PackageReference Include="Blazored.LocalStorage" Version="4.5.0"/>
+    <PackageReference Include="Blazor-ApexCharts" Version="5.1.0" />
+    <PackageReference Include="Blazored.FluentValidation" Version="2.2.0" />
+    <PackageReference Include="Blazored.LocalStorage" Version="4.5.0" />
     <PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly" Version="9.0.3" />
     <PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly.Authentication" Version="9.0.3" />
     <PackageReference Include="Microsoft.AspNetCore.SignalR.Client" Version="9.0.3" />
     <PackageReference Include="Microsoft.Extensions.Http.Resilience" Version="9.3.0" />
     <PackageReference Include="Microsoft.Extensions.Localization" Version="9.0.3" />
-    <PackageReference Include="MudBlazor" Version="8.3.0" />
+    <PackageReference Include="MudBlazor" Version="8.5.1" />
   </ItemGroup>
 </Project>

src/Education.Client/Extensions/HostExtensions.cs

@@ -52,7 +52,7 @@ public static WebAssemblyHostBuilder AddInfrastructure(this WebAssemblyHostBuild
 
         return builder;
 
-        void ResilienceOptions(HttpStandardResilienceOptions options)
+        static void ResilienceOptions(HttpStandardResilienceOptions options)
         {
             options.AttemptTimeout.Timeout = TimeSpan.FromMinutes(1);
             options.TotalRequestTimeout.Timeout = TimeSpan.FromMinutes(2);

src/Education.Client/Features/Customer/Pages/Account/Page.razor

@@ -59,15 +59,16 @@
             ReadOnly/>
 
         <div>
-            <MudButton Class="text-transform-none"
-                       Color="Color.Primary"
-                       DropShadow="false"
-                       Ripple="false"
-                       EndIcon="@Icons.Material.Outlined.OpenInNew"
-                       Href="@_configuration["Urls:Account"]"
-                       IconSize="Size.Small"
-                       Target="_blank"
-                       Variant="Variant.Filled">
+            <MudButton
+                Class="text-transform-none"
+                Color="Color.Primary"
+                DropShadow="false"
+                Ripple="false"
+                EndIcon="@Icons.Material.Outlined.OpenInNew"
+                Href="@_configuration["Urls:Account"]"
+                IconSize="Size.Small"
+                Target="_blank"
+                Variant="Variant.Filled">
                 @_localizer["ManageYourElwarkAccount_Title"]
             </MudButton>
         </div>

src/Education.Client/Features/Customer/Services/CustomerHub.cs

@@ -104,10 +104,10 @@ private RetryPolicy()
             {
                 0 => TimeSpan.Zero,
                 1 => TimeSpan.FromSeconds(2),
-                2 => TimeSpan.FromSeconds(10),
-                3 => TimeSpan.FromSeconds(30),
-                4 => TimeSpan.FromMinutes(1),
-                _ => TimeSpan.FromMinutes(5)
+                2 => TimeSpan.FromSeconds(5),
+                3 => TimeSpan.FromSeconds(15),
+                4 => TimeSpan.FromSeconds(30),
+                _ => TimeSpan.FromMinutes(1)
             };
     }
 

…s/Learner/Model/Quiz/AnswerRatioModel.cs …ures/History/Clients/AnswerRatioModel.cssrc/Education.Client/Features/History/Clients/Learner/Model/Quiz/AnswerRatioModel.cs renamed to src/Education.Client/Features/History/Clients/AnswerRatioModel.cs src/Education.Client/Features/History/Clients/Learner/Model/Quiz/AnswerRatioModel.cs renamed to src/Education.Client/Features/History/Clients/AnswerRatioModel.cs

@@ -1,3 +1,3 @@
-namespace Education.Client.Features.History.Clients.Learner.Model.Quiz;
+namespace Education.Client.Features.History.Clients;
 
 public sealed record AnswerRatioModel(uint Questions, uint Answered, uint NotAnswered, uint Correct, uint Incorrect);

src/Education.Client/Features/History/Clients/Examination/Model/ExaminationConclusionModel.cs

@@ -14,11 +14,12 @@ public sealed record ExaminationConclusionModel(
     PerformanceModel<uint> TotalScore,
     PerformanceModel<TimeSpan> TimeSpent,
     ExaminationConclusionModel.MetricsModel Metrics,
+    AnswerRatioModel Ratio,
     ExaminationConclusionModel.Question[] Questions,
     Reward[] Rewards
 )
 {
     public sealed record MetricsModel(double AverageScore, double SuccessRate);
 
-    public sealed record Question(string Title, bool IsAnswered, bool IsCorrect);
+    public sealed record Question(string Title, bool IsCorrect);
 }