Compare commits
No commits in common. "3996b2175a8b49a4e65a5d1c7608c35c1b8f177b" and "f448cccbebaf9c6cc92f5576cb89e8918b1beec9" have entirely different histories.
3996b2175a
...
f448cccbeb
@ -55,9 +55,15 @@ public sealed class RhSolutionsAddIn : IExcelAddIn
|
|||||||
|
|
||||||
EventsUtil.Initialize();
|
EventsUtil.Initialize();
|
||||||
|
|
||||||
if (Environment.GetEnvironmentVariable("ISTESTING") == "false")
|
bool isTesting = Environment.GetEnvironmentVariable("ISTESTING") switch
|
||||||
{
|
{
|
||||||
IntelliSenseServer.Install();
|
"true" => true,
|
||||||
|
"false" => false,
|
||||||
|
_ => false
|
||||||
|
};
|
||||||
|
if (!isTesting)
|
||||||
|
{
|
||||||
|
//IntelliSenseServer.Install();
|
||||||
}
|
}
|
||||||
|
|
||||||
ServicePointManager.SecurityProtocol =
|
ServicePointManager.SecurityProtocol =
|
||||||
@ -68,9 +74,15 @@ public sealed class RhSolutionsAddIn : IExcelAddIn
|
|||||||
{
|
{
|
||||||
EventsUtil.Uninitialize();
|
EventsUtil.Uninitialize();
|
||||||
|
|
||||||
if (Environment.GetEnvironmentVariable("ISTESTING") == "false")
|
bool isTesting = Environment.GetEnvironmentVariable("ISTESTING") switch
|
||||||
{
|
{
|
||||||
IntelliSenseServer.Uninstall();
|
"true" => true,
|
||||||
|
"false" => false,
|
||||||
|
_ => false
|
||||||
|
};
|
||||||
|
if (!isTesting)
|
||||||
|
{
|
||||||
|
//IntelliSenseServer.Uninstall();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -20,21 +20,21 @@ public class RibbonController : ExcelRibbon
|
|||||||
public override string GetCustomUI(string RibbonID)
|
public override string GetCustomUI(string RibbonID)
|
||||||
{
|
{
|
||||||
return @"
|
return @"
|
||||||
<customUI onLoad='RibbonLoad' xmlns='http://schemas.microsoft.com/office/2006/01/customui' loadImage='LoadImage'>
|
<customUI onLoad='RibbonLoad' xmlns='http://schemas.microsoft.com/office/2006/01/customui'>
|
||||||
<ribbon>
|
<ribbon>
|
||||||
<tabs>
|
<tabs>
|
||||||
<tab id='rau' label='RhSolutions'>
|
<tab id='rau' label='RhSolutions'>
|
||||||
<group id='priceList' label='Прайс-лист'>
|
<group id='priceList' label='Прайс-лист'>
|
||||||
<button id='export' getEnabled='GetExportEnabled' label='Экспорт в новый файл' size='normal' image='RhSolutions' onAction='OnToolPressed'/>
|
<button id='export' getEnabled='GetExportEnabled' label='Экспорт в новый файл' size='normal' imageMso='PivotExportToExcel' onAction='OnToolPressed'/>
|
||||||
<button id='convert' getEnabled='GetConvertEnabled' label='Актуализировать' size='normal' imageMso='FileUpdate' onAction='OnToolPressed'/>
|
<button id='convert' getEnabled='GetConvertEnabled' label='Актуализировать' size='normal' imageMso='FileUpdate' onAction='OnToolPressed'/>
|
||||||
<button id='merge' label='Объединить' size='normal' imageMso='Copy' onAction='OnToolPressed'/>
|
<button id='merge' label='Объединить' size='normal' imageMso='Copy' onAction='OnToolPressed'/>
|
||||||
<button id='guess' getEnabled='GetGuessEnabled' label='Найти и экспортировать' size='normal' imageMso='ControlWizards' onAction='OnToolPressed'/>
|
<button id='guess' getEnabled='GetGuessEnabled' label='Найти и экспортировать' size='normal' imageMso='ControlWizards' onAction='OnToolPressed'/>
|
||||||
<button id='fillsleeves' getEnabled='GetFittingsCalcEnabled' label='Подобрать гильзы' size='normal' imageMso='CreateQueryFromWizard' onAction='OnToolPressed'/>
|
<button id='fillsleeves' getEnabled='GetFittingsCalcEnabled' label='Подобрать гильзы' size='normal' imageMso='CreateQueryFromWizard' onAction='OnToolPressed'/>
|
||||||
<button id='fillcouplings' getEnabled='GetFittingsCalcEnabled' label='Подобрать муфты' size='normal' imageMso='CreateQueryFromWizard' onAction='OnToolPressed'/>
|
<button id='fillcouplings' getEnabled='GetFittingsCalcEnabled' label='Подобрать муфты' size='normal' imageMso='CreateQueryFromWizard' onAction='OnToolPressed'/>
|
||||||
<button id='dxfexport' getEnabled='GetDxfEnabled' label='Экспортировать в DXF' size='normal' image='DXF' onAction='OnToolPressed'/>
|
<button id='dxfexport' getEnabled='GetDxfEnabled' label='Экспортировать в DXF' size='normal' imageMso='ExportExcel' onAction='OnToolPressed'/>
|
||||||
</group>
|
</group>
|
||||||
<group id='rausettings' getLabel='GetVersionLabel'>
|
<group id='rausettings' getLabel='GetVersionLabel'>
|
||||||
<button id='setPriceList' getLabel='GetPriceListPathLabel' size='large' image='RhSolutions' onAction='OnSetPricePressed'/>
|
<button id='setPriceList' getLabel='GetPriceListPathLabel' size='large' imageMso='TableExcelSpreadsheetInsert' onAction='OnSetPricePressed'/>
|
||||||
</group>
|
</group>
|
||||||
</tab>
|
</tab>
|
||||||
</tabs>
|
</tabs>
|
||||||
|
Binary file not shown.
Before Width: | Height: | Size: 13 KiB |
Binary file not shown.
Before Width: | Height: | Size: 1.2 KiB |
@ -23,6 +23,4 @@
|
|||||||
<Reference Path="System.Runtime.CompilerServices.Unsafe.dll" Pack="true" />
|
<Reference Path="System.Runtime.CompilerServices.Unsafe.dll" Pack="true" />
|
||||||
<Reference Path="System.Threading.Tasks.Extensions.dll" Pack="true" />
|
<Reference Path="System.Threading.Tasks.Extensions.dll" Pack="true" />
|
||||||
<Reference Path="System.ValueTuple.dll" Pack="true" />
|
<Reference Path="System.ValueTuple.dll" Pack="true" />
|
||||||
<Image Name='RhSolutions' Path='Images\RhSolutions.png' Pack='true' />
|
|
||||||
<Image Name='DXF' Path='Images\DXF.png' Pack='true' />
|
|
||||||
</DnaLibrary>
|
</DnaLibrary>
|
||||||
|
@ -45,12 +45,4 @@
|
|||||||
<ItemGroup>
|
<ItemGroup>
|
||||||
<ProjectReference Include="..\RhSolutions.ProductSku\RhSolutions.ProductSku.csproj" />
|
<ProjectReference Include="..\RhSolutions.ProductSku\RhSolutions.ProductSku.csproj" />
|
||||||
</ItemGroup>
|
</ItemGroup>
|
||||||
<ItemGroup>
|
|
||||||
<None Update="Images\DXF.png">
|
|
||||||
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
|
|
||||||
</None>
|
|
||||||
<None Update="Images\RhSolutions.png">
|
|
||||||
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
|
|
||||||
</None>
|
|
||||||
</ItemGroup>
|
|
||||||
</Project>
|
</Project>
|
8
RhSolutions.Tests/.runsettings
Normal file
8
RhSolutions.Tests/.runsettings
Normal file
@ -0,0 +1,8 @@
|
|||||||
|
<?xml version="1.0" encoding="utf-8" ?>
|
||||||
|
<RunSettings>
|
||||||
|
<RunConfiguration>
|
||||||
|
<EnvironmentVariables>
|
||||||
|
<ISTESTING>true</ISTESTING>
|
||||||
|
</EnvironmentVariables>
|
||||||
|
</RunConfiguration>
|
||||||
|
</RunSettings>
|
@ -13,7 +13,6 @@ public class CanDoGuess : IDisposable
|
|||||||
|
|
||||||
public CanDoGuess()
|
public CanDoGuess()
|
||||||
{
|
{
|
||||||
Environment.SetEnvironmentVariable("ISTESTING", "true");
|
|
||||||
_addIn = new();
|
_addIn = new();
|
||||||
_addIn.AutoOpen();
|
_addIn.AutoOpen();
|
||||||
_guessReader = new GuessReader(Util.Application);
|
_guessReader = new GuessReader(Util.Application);
|
||||||
|
@ -13,7 +13,6 @@ public class CanFillCouplings : IDisposable
|
|||||||
|
|
||||||
public CanFillCouplings()
|
public CanFillCouplings()
|
||||||
{
|
{
|
||||||
Environment.SetEnvironmentVariable("ISTESTING", "true");
|
|
||||||
_addIn = new();
|
_addIn = new();
|
||||||
_addIn.AutoOpen();
|
_addIn.AutoOpen();
|
||||||
_calculator = new CouplingsCalculator();
|
_calculator = new CouplingsCalculator();
|
||||||
|
@ -13,7 +13,6 @@ public class CanFillSleeves : IDisposable
|
|||||||
|
|
||||||
public CanFillSleeves()
|
public CanFillSleeves()
|
||||||
{
|
{
|
||||||
Environment.SetEnvironmentVariable("ISTESTING", "true");
|
|
||||||
_addIn = new();
|
_addIn = new();
|
||||||
_addIn.AutoOpen();
|
_addIn.AutoOpen();
|
||||||
_calculator = new SleevesCalculator();
|
_calculator = new SleevesCalculator();
|
||||||
|
@ -12,7 +12,6 @@ public class CanReadProducts : IDisposable
|
|||||||
|
|
||||||
public CanReadProducts()
|
public CanReadProducts()
|
||||||
{
|
{
|
||||||
Environment.SetEnvironmentVariable("ISTESTING", "true");
|
|
||||||
_addIn = new();
|
_addIn = new();
|
||||||
_testWorkbook = Util.Application.Workbooks.Add();
|
_testWorkbook = Util.Application.Workbooks.Add();
|
||||||
_addIn.AutoOpen();
|
_addIn.AutoOpen();
|
||||||
|
@ -12,7 +12,6 @@ public class CanWriteProducts : IDisposable
|
|||||||
|
|
||||||
public CanWriteProducts()
|
public CanWriteProducts()
|
||||||
{
|
{
|
||||||
Environment.SetEnvironmentVariable("ISTESTING", "true");
|
|
||||||
_addIn = new();
|
_addIn = new();
|
||||||
_addIn.AutoOpen();
|
_addIn.AutoOpen();
|
||||||
_reader = new ExcelReader(Util.Application, RhSolutionsAddIn.Configuration);
|
_reader = new ExcelReader(Util.Application, RhSolutionsAddIn.Configuration);
|
||||||
|
@ -12,7 +12,6 @@ public class RealPricelistTest : IDisposable
|
|||||||
|
|
||||||
public RealPricelistTest()
|
public RealPricelistTest()
|
||||||
{
|
{
|
||||||
Environment.SetEnvironmentVariable("ISTESTING", "true");
|
|
||||||
_addIn = new();
|
_addIn = new();
|
||||||
_addIn.AutoOpen();
|
_addIn.AutoOpen();
|
||||||
_reader = new ExcelReader(Util.Application, RhSolutionsAddIn.Configuration);
|
_reader = new ExcelReader(Util.Application, RhSolutionsAddIn.Configuration);
|
||||||
|
@ -10,7 +10,6 @@ public class WorkbookValidationTests : IDisposable
|
|||||||
|
|
||||||
public WorkbookValidationTests()
|
public WorkbookValidationTests()
|
||||||
{
|
{
|
||||||
Environment.SetEnvironmentVariable("ISTESTING", "true");
|
|
||||||
_addIn = new RhSolutionsAddIn();
|
_addIn = new RhSolutionsAddIn();
|
||||||
_addIn.AutoOpen();
|
_addIn.AutoOpen();
|
||||||
Util.Application.Workbooks.Add();
|
Util.Application.Workbooks.Add();
|
||||||
|
Loading…
Reference in New Issue
Block a user