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

Update dell'installer

Browse Source 
gestione nuovo oggetto deviceinfo x costruire parametro stampa report (exporter/printer)

git-svn-id: https://keyhammer.ath.cx/svn/WebGIM/trunk@176 3e04ef4b-3b25-4b6c-be27-bb5389ca777b
This commit is contained in:
samuele
2010-05-11 10:15:44 +00:00
parent b807c9e6fd
commit 280ac659e9
20 changed files with 6329 additions and 90 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Projects/WebGIM/GIM_data/bin/GIM_data.dll
BIN
View File
Binary file not shown.
Projects/WebGIM/GIM_data/bin/SteamWare.XML
+3148
View File
File diff suppressed because it is too large Load Diff
Projects/WebGIM/GIM_data/bin/SteamWare.dll
BIN
View File
Binary file not shown.
Projects/WebGIM/GIM_data/reportExporter.cs
+10 -42
View File
@@ -123,26 +123,18 @@ public class reportExporter
public void popolaPdfStream(reportRichiesto tipoReport)
{
LocalReport report = new LocalReport();
string deviceInfo = "";
devInfoParam deviceInfo = new devInfoParam("PDF", "21cm", "29.7cm", "0.2cm", "0.2cm", "0.2cm", "0.2cm");
switch (tipoReport)
{
case reportRichiesto.ElencoMacchine:
report.ReportPath = @".\Reports\MacchineReparti.rdlc";
report.DataSources.Add(new ReportDataSource("WebGim", caricaDati(tipoReport)));
deviceInfo = "<DeviceInfo>" +
" <OutputFormat>PDF</OutputFormat>" +
" <PageWidth>29.7cm</PageWidth>" +
" <PageHeight>21cm</PageHeight>" +
" <MarginTop>0.2cm</MarginTop>" +
" <MarginLeft>0.2cm</MarginLeft>" +
" <MarginRight>0.2cm</MarginRight>" +
" <MarginBottom>0.2cm</MarginBottom>" +
"</DeviceInfo>";
deviceInfo = new devInfoParam("PDF", "21cm", "29.7cm", "0.2cm", "0.2cm", "0.2cm", "0.2cm");
break;
default:
break;
}
createPdfStream(report, deviceInfo);
createPdfStream(report, deviceInfo.xmlParam);
}
/// <summary>
/// renderizza il report in pdf
@@ -153,26 +145,18 @@ public class reportExporter
public void popolaPdfStream(reportRichiesto tipoReport, string parametro)
{
LocalReport report = new LocalReport();
string deviceInfo = "";
devInfoParam deviceInfo = new devInfoParam("PDF", "21cm", "29.7cm", "0.2cm", "0.2cm", "0.2cm", "0.2cm");
switch (tipoReport)
{
case reportRichiesto.RichiestaIntervento:
report.ReportPath = @".\Reports\RichiestaIntervento.rdlc";
report.DataSources.Add(new ReportDataSource("WebGim", caricaDati(tipoReport, parametro))); // OCCHIO!!! va messa sorgente dati CORRETTA
deviceInfo = "<DeviceInfo>" +
" <OutputFormat>PDF</OutputFormat>" +
" <PageWidth>21cm</PageWidth>" +
" <PageHeight>29.7cm</PageHeight>" +
" <MarginTop>0.2cm</MarginTop>" +
" <MarginLeft>0.2cm</MarginLeft>" +
" <MarginRight>0.2cm</MarginRight>" +
" <MarginBottom>0.2cm</MarginBottom>" +
"</DeviceInfo>";
deviceInfo = new devInfoParam("PDF", "29.7cm", "21cm", "0.2cm", "0.2cm", "0.2cm", "0.2cm");
break;
default:
break;
}
createPdfStream(report, deviceInfo);
createPdfStream(report, deviceInfo.xmlParam);
}
/// <summary>
/// renderizza il report in pdf
@@ -185,34 +169,18 @@ public class reportExporter
public void popolaPdfStream(reportRichiesto tipoReport, intervalloDate periodoAnalizzato, string username, bool soloMacchinaFerma, bool includiMtzPrev)
{
LocalReport report = new LocalReport();
string deviceInfo = "";
devInfoParam deviceInfo = new devInfoParam("PDF", "21cm", "29.7cm", "0.2cm", "0.2cm", "0.2cm", "0.2cm");
switch (tipoReport)
{
case reportRichiesto.ElencoInterventi:
report.ReportPath = @".\Reports\ReportInterventi.rdlc";
report.DataSources.Add(new ReportDataSource("WebGim", caricaDati(tipoReport, periodoAnalizzato, username, soloMacchinaFerma, includiMtzPrev)));
deviceInfo = "<DeviceInfo>" +
" <OutputFormat>PDF</OutputFormat>" +
" <PageWidth>21cm</PageWidth>" +
" <PageHeight>29.7cm</PageHeight>" +
" <MarginTop>0.2cm</MarginTop>" +
" <MarginLeft>0.2cm</MarginLeft>" +
" <MarginRight>0.2cm</MarginRight>" +
" <MarginBottom>0.2cm</MarginBottom>" +
"</DeviceInfo>";
deviceInfo = new devInfoParam("PDF", "29.7cm", "21cm", "0.2cm", "0.2cm", "0.2cm", "0.2cm");
break;
case reportRichiesto.MTBF_MTTR:
report.ReportPath = @".\Reports\Report_MTBF_MTTR.rdlc";
report.DataSources.Add(new ReportDataSource("WebGim", caricaDati(tipoReport, periodoAnalizzato, username, soloMacchinaFerma, includiMtzPrev)));
deviceInfo = "<DeviceInfo>" +
" <OutputFormat>PDF</OutputFormat>" +
" <PageWidth>21cm</PageWidth>" +
" <PageHeight>29.7cm</PageHeight>" +
" <MarginTop>0.2cm</MarginTop>" +
" <MarginLeft>0.2cm</MarginLeft>" +
" <MarginRight>0.2cm</MarginRight>" +
" <MarginBottom>0.2cm</MarginBottom>" +
"</DeviceInfo>";
deviceInfo = new devInfoParam("PDF", "29.7cm", "21cm", "0.2cm", "0.2cm", "0.2cm", "0.2cm");
// calcolo le ore totali equivalenti...
ReportParameter[] OreTotali = { new ReportParameter("OreTotali", WebGimUtils.obj.oreEquivalenti(periodoAnalizzato).ToString()) };
report.SetParameters(OreTotali);
@@ -220,7 +188,7 @@ public class reportExporter
default:
break;
}
createPdfStream(report, deviceInfo);
createPdfStream(report, deviceInfo.xmlParam);
}
/// <summary>
/// crea il vero e proprio stream pdf
Projects/WebGIM/GIM_data/reportPrinter.cs
+8 -40
View File
@@ -145,39 +145,23 @@ public class reportPrinter
public void printReport(reportRichiesto tipoReport, string printerName, string parametro)
{
LocalReport report = new LocalReport();
string deviceInfo = "";
devInfoParam deviceInfo = new devInfoParam("EMF", "21cm", "29.7cm", "0.2cm", "0.2cm", "0.2cm", "0.2cm");
switch (tipoReport)
{
case reportRichiesto.ElencoMacchine:
report.ReportPath = @".\Reports\MacchineReparti.rdlc";
report.DataSources.Add(new ReportDataSource("WebGim", caricaDati(tipoReport, parametro)));
deviceInfo = "<DeviceInfo>" +
" <OutputFormat>EMF</OutputFormat>" +
" <PageWidth>29.7cm</PageWidth>" +
" <PageHeight>21cm</PageHeight>" +
" <MarginTop>0.2cm</MarginTop>" +
" <MarginLeft>0.2cm</MarginLeft>" +
" <MarginRight>0.2cm</MarginRight>" +
" <MarginBottom>0.2cm</MarginBottom>" +
"</DeviceInfo>";
deviceInfo = new devInfoParam("EMF", "21cm", "29.7cm", "0.2cm", "0.2cm", "0.2cm", "0.2cm");
break;
case reportRichiesto.RichiestaIntervento:
report.ReportPath = @".\Reports\RichiestaIntervento.rdlc";
report.DataSources.Add(new ReportDataSource("WebGim", caricaDati(tipoReport, parametro)));
deviceInfo = "<DeviceInfo>" +
" <OutputFormat>EMF</OutputFormat>" +
" <PageWidth>21cm</PageWidth>" +
" <PageHeight>29.7cm</PageHeight>" +
" <MarginTop>0.2cm</MarginTop>" +
" <MarginLeft>0.2cm</MarginLeft>" +
" <MarginRight>0.2cm</MarginRight>" +
" <MarginBottom>0.2cm</MarginBottom>" +
"</DeviceInfo>";
deviceInfo = new devInfoParam("EMF", "29.7cm", "21cm", "0.2cm", "0.2cm", "0.2cm", "0.2cm");
break;
default:
break;
}
doEmfPrint(printerName, report, deviceInfo);
doEmfPrint(printerName, report, deviceInfo.xmlParam);
}
/// <summary>
/// Crea un report locale da file rdlc, carica i dati, esporta report come EMF file e quindi lo invia alla stampante
@@ -188,34 +172,18 @@ public class reportPrinter
public void printReport(reportRichiesto tipoReport, string printerName, intervalloDate periodoAnalizzato, string username)
{
LocalReport report = new LocalReport();
string deviceInfo = "";
devInfoParam deviceInfo = new devInfoParam("EMF", "21cm", "29.7cm", "0.2cm", "0.2cm", "0.2cm", "0.2cm");
switch (tipoReport)
{
case reportRichiesto.ElencoInterventi:
report.ReportPath = @".\Reports\ReportInterventi.rdlc";
report.DataSources.Add(new ReportDataSource("WebGim", caricaDati(tipoReport, periodoAnalizzato, username)));
deviceInfo = "<DeviceInfo>" +
" <OutputFormat>EMF</OutputFormat>" +
" <PageWidth>21cm</PageWidth>" +
" <PageHeight>29.7cm</PageHeight>" +
" <MarginTop>0.2cm</MarginTop>" +
" <MarginLeft>0.2cm</MarginLeft>" +
" <MarginRight>0.2cm</MarginRight>" +
" <MarginBottom>0.2cm</MarginBottom>" +
"</DeviceInfo>";
deviceInfo = new devInfoParam("EMF", "29.7cm", "21cm", "0.2cm", "0.2cm", "0.2cm", "0.2cm");
break;
case reportRichiesto.MTBF_MTTR:
report.ReportPath = @".\Reports\Report_MTBF_MTTR.rdlc";
report.DataSources.Add(new ReportDataSource("WebGim", caricaDati(tipoReport, periodoAnalizzato, username)));
deviceInfo = "<DeviceInfo>" +
" <OutputFormat>EMF</OutputFormat>" +
" <PageWidth>21cm</PageWidth>" +
" <PageHeight>29.7cm</PageHeight>" +
" <MarginTop>0.2cm</MarginTop>" +
" <MarginLeft>0.2cm</MarginLeft>" +
" <MarginRight>0.2cm</MarginRight>" +
" <MarginBottom>0.2cm</MarginBottom>" +
"</DeviceInfo>";
deviceInfo = new devInfoParam("EMF", "29.7cm", "21cm", "0.2cm", "0.2cm", "0.2cm", "0.2cm");
// calcolo le ore totali equivalenti...
ReportParameter[] OreTotali = { new ReportParameter("OreTotali", WebGimUtils.obj.oreEquivalenti(periodoAnalizzato).ToString()) };
report.SetParameters(OreTotali);
@@ -223,7 +191,7 @@ public class reportPrinter
default:
break;
}
doEmfPrint(printerName, report, deviceInfo);
doEmfPrint(printerName, report, deviceInfo.xmlParam);
}
/// <summary>
/// esegue print vero e proprio
Projects/WebGIM/GIM_site/GIM_site.csproj
+1
View File
@@ -1017,6 +1017,7 @@
<None Include="sql\GIM_0005.sql" />
<None Include="sql\GIM_0006.sql" />
<None Include="sql\GIM_0007.sql" />
<None Include="sql\GIM_0008.sql" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\..\SteamWare\SteamWare.csproj">
Projects/WebGIM/GIM_site/Web.config
+4 -1
View File
@@ -102,12 +102,15 @@
<add key="welcomeApp" value="GIM_welcomeApp"/>
<add key="appName" value="GIM"/>
<add key="mainRev" value="1.1"/>
<add key="minRev" value="172"/>
<add key="minRev" value="175"/>
<add key="copyRight" value="SteamWare © 2006-2010"/>
<add key="defaultApp" value="GIM_Appl"/>
<add key="defaultTitle" value="GIM_ShortWelcome"/>
<add key="defaultBody" value="GIM_LongWelcome"/>
<add key="_adminEmail" value="info@steamware.net"/>
<add key="exportFormat1" value="./ExportPdf.aspx?tipo={0}"/>
<add key="exportFormat2" value="~/ExportPdf.aspx?tipo={0}&amp;idx={1}"/>
<add key="exportFormat3" value="~/ExportPdf.aspx?tipo={0}&amp;inizio={1}&amp;fine={2}&amp;username={3}"/>
<add key="_logDir" value="./logs/"/>
<add key="_smtpCli" value="localhost"/>
<add key="PermessiConnectionString" value="Data Source=localhost\sql2005;Initial Catalog=GIM;Persist Security Info=True;User id=sa;Password=keyhammer"/>
Projects/WebGIM/GIM_site/WebConfigSomaschini_AppSettings.config
+4 -1
View File
@@ -18,12 +18,15 @@
<add key="welcomeApp" value="GIM_welcomeApp"/>
<add key="appName" value="GIM"/>
<add key="mainRev" value="1.1"/>
<add key="minRev" value="172"/>
<add key="minRev" value="175"/>
<add key="copyRight" value="SteamWare © 2006-2010"/>
<add key="defaultApp" value="GIM_Appl"/>
<add key="defaultTitle" value="GIM_ShortWelcome"/>
<add key="defaultBody" value="GIM_LongWelcome"/>
<add key="_adminEmail" value="info@steamware.net"/>
<add key="exportFormat1" value="~/ExportPdf.aspx?tipo={0}"/>
<add key="exportFormat2" value="~/ExportPdf.aspx?tipo={0}&amp;idx={1}"/>
<add key="exportFormat3" value="~/ExportPdf.aspx?tipo={0}&amp;inizio={1}&amp;fine={2}&amp;username={3}"/>
<add key="_logDir" value="./logs/"/>
<add key="_smtpCli" value="localhost"/>
<add key="PermessiConnectionString" value="Data Source=localhost;Initial Catalog=GIM;Persist Security Info=True;User id=steamware;Password=viadante16"/>
Projects/WebGIM/GIM_site/WebUserControls/mod_elencoRichieste.ascx.cs
+1 -1
View File
@@ -274,7 +274,7 @@ public partial class mod_elencoRichieste : ApplicationUserControl
/// <returns></returns>
public string formattaUrl(object idx)
{
return String.Format("~/ExportPdf.aspx?tipo={0}&idx={1}", Convert.ToInt32(reportRichiesto.RichiestaIntervento), idx);
return String.Format(memLayer.ML.confReadString("exportFormat2"), Convert.ToInt32(reportRichiesto.RichiestaIntervento), idx);
}
/// <summary>
/// prende in carico e stampa la scheda selezionata
Projects/WebGIM/GIM_site/WebUserControls/mod_reportInterventi.ascx.cs
+1 -1
View File
@@ -65,7 +65,7 @@ public partial class mod_reportInterventi : System.Web.UI.UserControl
/// <returns></returns>
private string formattaUrl(reportRichiesto tipo, intervalloDate periodo)
{
string answ = String.Format("~/ExportPdf.aspx?tipo={0}&inizio={1}&fine={2}&username={3}", Convert.ToInt32(tipo), periodo.inizio, periodo.fine, user_std.UtSn.userNameAD);
string answ = String.Format(memLayer.ML.confReadString("exportFormat3"), Convert.ToInt32(tipo), periodo.inizio, periodo.fine, user_std.UtSn.userNameAD);
// effettuo controlli valori checkBox
if (chkShowMtzPrev.Checked)
{
Projects/WebGIM/GIM_site/bin/GIM_data.dll
BIN
View File
Binary file not shown.
Projects/WebGIM/GIM_site/bin/GIM_site.dll
BIN
View File
Binary file not shown.
Projects/WebGIM/GIM_site/bin/SteamWare.XML
+3148
View File
File diff suppressed because it is too large Load Diff
Projects/WebGIM/GIM_site/bin/SteamWare.dll
BIN
View File
Binary file not shown.
Projects/WebGIM/GIM_site/obj/Debug/GIM_site.dll
BIN
View File
Binary file not shown.
Projects/WebGIM/GIM_site/obj/Debug/RdlCompile.cache
BIN
View File
Binary file not shown.
Projects/WebGIM/GIM_site/obj/Debug/ResolveAssemblyReference.cache
BIN
View File
Binary file not shown.
Projects/WebGIM/GIM_site/report_impianti.aspx.cs
+1 -1
View File
@@ -33,7 +33,7 @@ public partial class report_impianti : System.Web.UI.Page
private string formattaUrl()
{
return String.Format("~/ExportPdf.aspx?tipo={0}", Convert.ToInt32(reportRichiesto.ElencoMacchine));
return String.Format(memLayer.ML.confReadString("exportFormat1"), Convert.ToInt32(reportRichiesto.ElencoMacchine));
}
protected void btnPrint_Click(object sender, EventArgs e)
Projects/WebGIM/WebGIM/Release/WebGIM.msi
BIN
View File
Binary file not shown.
Projects/WebGIM/WebGIM/WebGIM.vdproj
+3 -3
View File
@@ -351,14 +351,14 @@
{
"Name" = "8:Microsoft Visual Studio"
"ProductName" = "8:WebGIM"
"ProductCode" = "8:{CB2847F0-36E9-48A3-AFC6-F4D7CB8D2997}"
"PackageCode" = "8:{082A7FCC-0E80-4FAD-9F6E-444D7666A83D}"
"ProductCode" = "8:{2146FADE-03AC-4816-84A9-DE703BE27309}"
"PackageCode" = "8:{C95818D3-E514-41D6-8B74-B24AB8AB5DBE}"
"UpgradeCode" = "8:{7739196B-46A3-4BC7-AC29-DB8493976F04}"
"RestartWWWService" = "11:TRUE"
"RemovePreviousVersions" = "11:TRUE"
"DetectNewerInstalledVersion" = "11:TRUE"
"InstallAllUsers" = "11:FALSE"
"ProductVersion" = "8:1.1.172"
"ProductVersion" = "8:1.1.175"
"Manufacturer" = "8:SteamWare s.r.l."
"ARPHELPTELEPHONE" = "8:035-460560"
"ARPHELPLINK" = "8:http://www.steamware.net"