RegistryUtil and some fixes

This commit is contained in:
Sergey Chebotar 2021-12-22 17:07:37 +03:00
parent f97d344f39
commit ce5597d042
10 changed files with 101 additions and 79 deletions

View File

@ -100,11 +100,12 @@
<Reference Include="WindowsBase" /> <Reference Include="WindowsBase" />
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<Compile Include="Source\AddIn\FileDialog.cs" />
<Compile Include="Source\AddIn\RegistryUtil.cs" /> <Compile Include="Source\AddIn\RegistryUtil.cs" />
<Compile Include="Source\Assistant\MemoryCacheExtensions.cs" /> <Compile Include="Source\Assistant\MemoryCacheExtensions.cs" />
<Compile Include="Source\Assistant\ParseUtil.cs" /> <Compile Include="Source\Assistant\ParseUtil.cs" />
<Compile Include="Source\Assistant\RequestModifier.cs" /> <Compile Include="Source\Assistant\RequestModifier.cs" />
<Compile Include="Source\Assistant\SkuExtension.cs" /> <Compile Include="Source\Assistant\SkuExtensions.cs" />
<Compile Include="Source\Ribbon\RibbonController.cs" /> <Compile Include="Source\Ribbon\RibbonController.cs" />
<Compile Include="Source\Assistant\HttpClientUtil.cs" /> <Compile Include="Source\Assistant\HttpClientUtil.cs" />
<Compile Include="Source\Assistant\StoreResponse.cs" /> <Compile Include="Source\Assistant\StoreResponse.cs" />

View File

@ -1,12 +1,10 @@
 
Microsoft Visual Studio Solution File, Format Version 12.00 Microsoft Visual Studio Solution File, Format Version 12.00
# Visual Studio Version 16 # Visual Studio Version 17
VisualStudioVersion = 16.0.31829.152 VisualStudioVersion = 17.0.32014.148
MinimumVisualStudioVersion = 10.0.40219.1 MinimumVisualStudioVersion = 10.0.40219.1
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "RehauSku.Assist", "RehauSku.Assist.csproj", "{18A2FF67-0E46-4A86-B872-29F2B3F23ADF}" Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "RehauSku.Assist", "RehauSku.Assist.csproj", "{18A2FF67-0E46-4A86-B872-29F2B3F23ADF}"
EndProject EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "RehauSku.Testing", "..\RehauSku.Testing\RehauSku.Testing.csproj", "{3D257D07-0D29-4B5E-82E4-B341769E1B3F}"
EndProject
Global Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Any CPU = Debug|Any CPU Debug|Any CPU = Debug|Any CPU
@ -17,10 +15,6 @@ Global
{18A2FF67-0E46-4A86-B872-29F2B3F23ADF}.Debug|Any CPU.Build.0 = Debug|Any CPU {18A2FF67-0E46-4A86-B872-29F2B3F23ADF}.Debug|Any CPU.Build.0 = Debug|Any CPU
{18A2FF67-0E46-4A86-B872-29F2B3F23ADF}.Release|Any CPU.ActiveCfg = Release|Any CPU {18A2FF67-0E46-4A86-B872-29F2B3F23ADF}.Release|Any CPU.ActiveCfg = Release|Any CPU
{18A2FF67-0E46-4A86-B872-29F2B3F23ADF}.Release|Any CPU.Build.0 = Release|Any CPU {18A2FF67-0E46-4A86-B872-29F2B3F23ADF}.Release|Any CPU.Build.0 = Release|Any CPU
{3D257D07-0D29-4B5E-82E4-B341769E1B3F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{3D257D07-0D29-4B5E-82E4-B341769E1B3F}.Debug|Any CPU.Build.0 = Debug|Any CPU
{3D257D07-0D29-4B5E-82E4-B341769E1B3F}.Release|Any CPU.ActiveCfg = Release|Any CPU
{3D257D07-0D29-4B5E-82E4-B341769E1B3F}.Release|Any CPU.Build.0 = Release|Any CPU
EndGlobalSection EndGlobalSection
GlobalSection(SolutionProperties) = preSolution GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE HideSolutionNode = FALSE

View File

@ -22,6 +22,7 @@ namespace RehauSku
{ {
RegisterFunctions(); RegisterFunctions();
IntelliSenseServer.Install(); IntelliSenseServer.Install();
RegistryUtil.Initialize();
} }
public void AutoClose() public void AutoClose()

View File

@ -0,0 +1,24 @@
using System.Windows.Forms;
namespace RehauSku
{
static class FileDialog
{
public static string GetFilePath()
{
string filePath = string.Empty;
using (OpenFileDialog dialog = new OpenFileDialog())
{
dialog.Filter = "Все файлы (*.*)|*.*";
if (dialog.ShowDialog() == DialogResult.OK)
{
filePath = dialog.FileName;
}
}
return filePath;
}
}
}

View File

@ -1,42 +1,61 @@
using Microsoft.Win32; using Microsoft.Win32;
using System.IO;
namespace RehauSku namespace RehauSku
{ {
static class RegistryUtil static class RegistryUtil
{ {
private static string _priceListPath;
private static int? _storeResponseOrder;
private static RegistryKey _RootKey { get; set; }
public static void Initialize()
{
_RootKey = Registry.CurrentUser.CreateSubKey(@"SOFTWARE\REHAU\SkuAssist");
_priceListPath = _RootKey.GetValue("PriceListPath") as string;
_storeResponseOrder = _RootKey.GetValue("StoreResponseOrder") as int?;
}
public static bool IsPriceListPathEmpty()
{
return string.IsNullOrEmpty(_priceListPath);
}
public static string PriceListPath public static string PriceListPath
{ {
get => (string)_RootKey.GetValue("PriceListPath"); get
{
if (IsPriceListPathEmpty() || !File.Exists(_priceListPath))
{
string fileName = FileDialog.GetFilePath();
_priceListPath = fileName;
_RootKey.SetValue("PriceListPath", fileName);
return _priceListPath;
}
else
{
return _priceListPath;
}
}
} }
public static ResponseOrder StoreResponseOrder public static ResponseOrder StoreResponseOrder
{
get => (ResponseOrder)_RootKey.GetValue("StoreResponseOrder");
}
private static RegistryKey _RootKey
{ {
get get
{ {
return _OpenRootKey() ?? _CreateRootKey(); if (_storeResponseOrder == null)
}
}
private static RegistryKey _OpenRootKey()
{ {
return Registry.CurrentUser _RootKey.SetValue("StoreResponseOrder", (int)ResponseOrder.Default);
.OpenSubKey(@"SOFTWARE\REHAU\SkuAssist"); _storeResponseOrder = (int)ResponseOrder.Default;
return (ResponseOrder)_storeResponseOrder.Value;
} }
private static RegistryKey _CreateRootKey() else
{ {
RegistryKey key = Registry.CurrentUser return (ResponseOrder)_storeResponseOrder.Value;
.CreateSubKey(@"SOFTWARE\REHAU\SkuAssist"); }
}
key.SetValue("PriceListPath", @"D:\Dropbox\Рабочее\Таблица заказов ИС EAE_2021.xlsm");
key.SetValue("StoreResponseOrder", 0);
return key;
} }
} }
} }

View File

@ -1,10 +1,8 @@
using AngleSharp; using AngleSharp;
using AngleSharp.Dom; using AngleSharp.Dom;
using Newtonsoft.Json; using Newtonsoft.Json;
using System;
using System.Linq; using System.Linq;
using System.Threading.Tasks; using System.Threading.Tasks;
using System.Windows.Forms;
namespace RehauSku.Assistant namespace RehauSku.Assistant
{ {
@ -19,8 +17,6 @@ namespace RehauSku.Assistant
} }
public static IProduct GetProduct(IDocument document) public static IProduct GetProduct(IDocument document)
{
try
{ {
string script = document string script = document
.Scripts .Scripts
@ -44,12 +40,5 @@ namespace RehauSku.Assistant
return product; return product;
} }
catch (NullReferenceException e)
{
MessageBox.Show(e.Message, "Ошибка получения данных", MessageBoxButtons.OK, MessageBoxIcon.Error);
return null;
}
}
} }
} }

View File

@ -2,7 +2,7 @@
namespace RehauSku.Assistant namespace RehauSku.Assistant
{ {
static class SkuExtension static class SkuExtensions
{ {
public static bool IsRehauSku(this string line) public static bool IsRehauSku(this string line)
{ {

View File

@ -34,7 +34,7 @@ namespace RehauSku.DataExport
SelectedCells.GetLength(1) == 2; SelectedCells.GetLength(1) == 2;
} }
public void FillSkuAmountDict() private void FillSkuAmountDict()
{ {
SkuAmount = new Dictionary<string, double>(); SkuAmount = new Dictionary<string, double>();
int rowsCount = SelectedCells.GetLength(0); int rowsCount = SelectedCells.GetLength(0);
@ -73,20 +73,22 @@ namespace RehauSku.DataExport
} }
} }
public void FillPriceList() public void FillNewPriceList()
{ {
FillSkuAmountDict();
string exportFile = _GetExportFullPath(); string exportFile = _GetExportFullPath();
File.Copy(RegistryUtil.PriceListPath, exportFile, true); File.Copy(RegistryUtil.PriceListPath, exportFile, true);
Workbook wb = xlApp.Workbooks.Open(exportFile); Workbook wb = xlApp.Workbooks.Open(exportFile);
Worksheet ws = wb.ActiveSheet; Worksheet ws = wb.ActiveSheet;
Range amountCell = ws.Cells.Find("Кол-во"); int amountColumn = ws.Cells.Find("Кол-во").Column;
int skuColumn = ws.Cells.Find("Актуальный материал").Column;
foreach (KeyValuePair<string, double> kvp in SkuAmount) foreach (KeyValuePair<string, double> kvp in SkuAmount)
{ {
Range cell = ws.Cells.Find(kvp.Key); Range cell = ws.Columns[skuColumn].Find(kvp.Key);
ws.Cells[cell.Row, amountCell.Column].Value = kvp.Value; ws.Cells[cell.Row, amountColumn].Value = kvp.Value;
} }
ws.Cells.AutoFilter(7, "<>"); ws.Cells.AutoFilter(7, "<>");

View File

@ -42,16 +42,15 @@ namespace RehauSku.Ribbon
else else
{ {
dw.FillSkuAmountDict(); dw.FillNewPriceList();
dw.FillPriceList();
} }
} }
} }
public void OnSettingsPressed(IRibbonControl control) public void OnSettingsPressed(IRibbonControl control)
{ {
Application.Run(new Settings.SettingsForm()); Form settingsForm = new Settings.SettingsForm();
settingsForm.Show();
} }
} }
} }

View File

@ -15,13 +15,6 @@ namespace RehauSku.Settings
public SettingsForm() public SettingsForm()
{ {
InitializeComponent(); InitializeComponent();
FormClosing += (sender, eventArgs) =>
{
MessageBox.Show("ok");
};
} }
private void button1_Click(object sender, EventArgs e) private void button1_Click(object sender, EventArgs e)