Egalware/LPA
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Iniziato update x gestire nuovo formato

Browse Source
This commit is contained in:
Samuele E. Locatelli
2020-02-17 09:55:04 +01:00
parent 270f08cce6
commit cff36e43e6
4 changed files with 27 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files
LPA/LPA.csproj
+10 -11
View File
@@ -67,14 +67,14 @@
<Reference Include="Microsoft.ReportViewer.WinForms, Version=12.0.0.0, Culture=neutral, PublicKeyToken=89845dcd8080cc91, processorArchitecture=MSIL">
<HintPath>..\packages\Microsoft.ReportViewer.Runtime.WinForms.12.0.2402.15\lib\Microsoft.ReportViewer.WinForms.dll</HintPath>
</Reference>
<Reference Include="MongoDB.Bson, Version=2.10.1.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\MongoDB.Bson.2.10.1\lib\net452\MongoDB.Bson.dll</HintPath>
<Reference Include="MongoDB.Bson, Version=2.10.2.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\MongoDB.Bson.2.10.2\lib\net452\MongoDB.Bson.dll</HintPath>
</Reference>
<Reference Include="MongoDB.Driver, Version=2.10.1.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\MongoDB.Driver.2.10.1\lib\net452\MongoDB.Driver.dll</HintPath>
<Reference Include="MongoDB.Driver, Version=2.10.2.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\MongoDB.Driver.2.10.2\lib\net452\MongoDB.Driver.dll</HintPath>
</Reference>
<Reference Include="MongoDB.Driver.Core, Version=2.10.1.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\MongoDB.Driver.Core.2.10.1\lib\net452\MongoDB.Driver.Core.dll</HintPath>
<Reference Include="MongoDB.Driver.Core, Version=2.10.2.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\MongoDB.Driver.Core.2.10.2\lib\net452\MongoDB.Driver.Core.dll</HintPath>
</Reference>
<Reference Include="MongoDB.Libmongocrypt, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\MongoDB.Libmongocrypt.1.0.0\lib\net452\MongoDB.Libmongocrypt.dll</HintPath>
@@ -106,8 +106,8 @@
<Reference Include="StackExchange.Redis, Version=2.0.0.0, Culture=neutral, PublicKeyToken=c219ff1ca8c2ce46, processorArchitecture=MSIL">
<HintPath>..\packages\StackExchange.Redis.2.0.601\lib\net461\StackExchange.Redis.dll</HintPath>
</Reference>
<Reference Include="SteamWare, Version=3.5.2002.719, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\SteamWare.3.5.2002.719\lib\net462\SteamWare.dll</HintPath>
<Reference Include="SteamWare, Version=3.5.2002.720, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\SteamWare.3.5.2002.720\lib\net462\SteamWare.dll</HintPath>
</Reference>
<Reference Include="System" />
<Reference Include="System.Buffers, Version=4.0.3.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
@@ -188,6 +188,8 @@
<AutoGen>True</AutoGen>
<DependentUpon>Resources.resx</DependentUpon>
</Compile>
<None Include="App_Readme\SteamWare_demo\example-app.config" />
<None Include="App_Readme\SteamWare_demo\example-NLog.config" />
<None Include="conf\.placeholder">
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
</None>
@@ -197,8 +199,6 @@
<None Include="conf\queueSetup.json">
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
</None>
<None Include="App_Readme\SteamWare_demo\example-app.config" />
<None Include="App_Readme\SteamWare_demo\example-NLog.config" />
<None Include="demo\DemoLetter.json">
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
</None>
@@ -254,7 +254,6 @@
<Content Include="App_Readme\SteamWare_demo\example-favicon.ico" />
<Content Include="mongocrypt.dll" />
</ItemGroup>
<ItemGroup />
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
<Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
<PropertyGroup>
LPA/MainForm.cs
+2 -2
View File
@@ -504,7 +504,7 @@ namespace LPA
queueConf confCoda = listQueue.Find(conf => conf.name == coda.Key);
if (confCoda != null)
{
fatto = rPrint.printReport(confCoda.template, confCoda.rdsName, localReportPath, coda.Value.Printer, item.rdsTable, confCoda.deviceInfoParam, true);
fatto = rPrint.printReport(confCoda.template, localReportPath, coda.Value.Printer, item.rdsData, confCoda.deviceInfoParam, true);
if(fatto)
{
coda.Value.NumWaiting--;
@@ -674,7 +674,7 @@ namespace LPA
queueConf confCoda = listQueue.Find(conf => conf.name == coda.Key);
if (confCoda != null)
{
fatto = rPrint.printReport(confCoda.template, confCoda.rdsName, localReportPath, coda.Value.Printer, item.rdsTable, confCoda.deviceInfoParam, true);
fatto = rPrint.printReport(confCoda.template, localReportPath, coda.Value.Printer, item.rdsData, confCoda.deviceInfoParam, true);
}
// fatta stampa aggiorno server con indicazione ceh ho stampato
if (fatto)
LPA/packages.config
+4 -4
View File
@@ -12,9 +12,9 @@
<package id="Microsoft.NetFramework.Analyzers" version="2.9.8" targetFramework="net462" developmentDependency="true" />
<package id="Microsoft.ReportViewer.Runtime.Common" version="12.0.2402.15" targetFramework="net462" />
<package id="Microsoft.ReportViewer.Runtime.WinForms" version="12.0.2402.15" targetFramework="net462" />
<package id="MongoDB.Bson" version="2.10.1" targetFramework="net462" />
<package id="MongoDB.Driver" version="2.10.1" targetFramework="net462" />
<package id="MongoDB.Driver.Core" version="2.10.1" targetFramework="net462" />
<package id="MongoDB.Bson" version="2.10.2" targetFramework="net462" />
<package id="MongoDB.Driver" version="2.10.2" targetFramework="net462" />
<package id="MongoDB.Driver.Core" version="2.10.2" targetFramework="net462" />
<package id="MongoDB.Libmongocrypt" version="1.0.0" targetFramework="net462" />
<package id="NETStandard.Library" version="2.0.3" targetFramework="net462" />
<package id="Newtonsoft.Json" version="12.0.3" targetFramework="net462" />
@@ -27,7 +27,7 @@
<package id="SharpZipLib" version="1.2.0" targetFramework="net462" />
<package id="Snappy.NET" version="1.1.1.8" targetFramework="net462" />
<package id="StackExchange.Redis" version="2.0.601" targetFramework="net462" />
<package id="SteamWare" version="3.5.2002.719" targetFramework="net462" />
<package id="SteamWare" version="3.5.2002.720" targetFramework="net462" />
<package id="System.Buffers" version="4.5.0" targetFramework="net462" />
<package id="System.Diagnostics.PerformanceCounter" version="4.7.0" targetFramework="net462" />
<package id="System.IO.Pipelines" version="4.7.0" targetFramework="net462" />
LPA/reportPrinter.cs
+11 -4
View File
@@ -45,13 +45,12 @@ namespace LPA
/// Crea un report locale da file rdlc, carica i dati, esporta report come EMF file e quindi lo invia alla stampante + eventuale backup pdf
/// </summary>
/// <param name="reportTemplate">Nome report (file)</param>
/// <param name="rdsName">Nome report</param>
/// <param name="localReportPath">Cartella locale dei report</param>
/// <param name="printerName">nome completo stampante (rispetto al server)</param>
/// <param name="tabDati">tabella dati da caricare nel report</param>
/// <param name="rdsData">tabella dati da caricare nel report</param>
/// <param name="deviceInfoParam">parametri "device input"</param>
/// <param name="doPdfCopy">effettua ANCHE copia pdf</param>
public bool printReport(string reportTemplate, string rdsName, string localReportPath, string printerName, DataTable tabDati, devInfoParam deviceInfoParam, bool doPdfCopy)
public bool printReport(string reportTemplate, string localReportPath, string printerName, Dictionary<string, DataTable> rdsData, devInfoParam deviceInfoParam, bool doPdfCopy)
{
bool answ = false;
if (deviceInfoParam != null)
@@ -61,7 +60,15 @@ namespace LPA
//LocalReport report = new LocalReport();
report.EnableExternalImages = true;
report.ReportPath = $"{localReportPath}\\{reportTemplate}";
report.DataSources.Add(new ReportDataSource(rdsName, tabDati));
// per ogni oggetto rds nome/tabela aggiungo la sorgente dati...
string rdsName = "";
DataTable tabDati = null;
foreach (var item in rdsData)
{
rdsName = item.Key;
tabDati = item.Value;
report.DataSources.Add(new ReportDataSource(rdsName, tabDati));
}
// stampa da EMF
doEmfPrint(printerName, report, deviceInfoParam.xmlParam);