diff --git a/installer/ElfisaPharmacy.iss b/installer/ElfisaPharmacy.iss index 1f9f77b..768fc1b 100644 --- a/installer/ElfisaPharmacy.iss +++ b/installer/ElfisaPharmacy.iss @@ -3,7 +3,7 @@ #define MyAppName "Электронная Фармация" #define MyAppBrand "ЭльФиСА" -#define MyAppVersion "2.0.6" +#define MyAppVersion "2.0.7" #define MyAppPublisher "PharmData" #define MyAppURL "https://cdn.24pharmdata.ru" #define MyAppSupportURL "https://24pharmdata.ru" diff --git a/src/Elfisa.Avalonia/Elfisa.Avalonia.csproj b/src/Elfisa.Avalonia/Elfisa.Avalonia.csproj index fdfd879..fa58a39 100644 --- a/src/Elfisa.Avalonia/Elfisa.Avalonia.csproj +++ b/src/Elfisa.Avalonia/Elfisa.Avalonia.csproj @@ -5,9 +5,9 @@ enable app.manifest true - 2.0.6 - 2.0.6.0 - 2.0.6.0 + 2.0.7 + 2.0.7.0 + 2.0.7.0 ЭльФиСА — Электронная Фармация PharmData diff --git a/src/Elfisa.Avalonia/ViewModels/PriceListViewModel.cs b/src/Elfisa.Avalonia/ViewModels/PriceListViewModel.cs index 5b1f018..8f20957 100644 --- a/src/Elfisa.Avalonia/ViewModels/PriceListViewModel.cs +++ b/src/Elfisa.Avalonia/ViewModels/PriceListViewModel.cs @@ -128,7 +128,9 @@ public partial class PriceListViewModel : ViewModelBase try { Busy = true; - var resp = await _api.GetPriceSummaryAsync(Search, limit: 300, priceListId: SelectedPriceList?.PriceListId); + // Без лимита показа: тянем весь прайс/все совпадения одним запросом (сервер + // при одном большом запросе прогоняет дедупликацию один раз, без COUNT). + var resp = await _api.GetPriceSummaryAsync(Search, limit: 500000, priceListId: SelectedPriceList?.PriceListId); RebuildIndex(resp.Summary ?? new()); Total = resp.TotalDrugs; } diff --git a/src/Elfisa.Avalonia/Views/SettingsWindow.axaml b/src/Elfisa.Avalonia/Views/SettingsWindow.axaml index 7219608..d350377 100644 --- a/src/Elfisa.Avalonia/Views/SettingsWindow.axaml +++ b/src/Elfisa.Avalonia/Views/SettingsWindow.axaml @@ -3,7 +3,7 @@ xmlns:vm="using:Elfisa.Avalonia.ViewModels" x:Class="Elfisa.Avalonia.Views.SettingsWindow" x:DataType="vm:SettingsViewModel" - Width="460" Height="360" CanResize="False" + Width="460" Height="440" CanResize="False" WindowStartupLocation="CenterOwner" Background="{DynamicResource Bg}" Title="Настройки"> @@ -26,6 +26,15 @@ + + + +