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

Completato porting WAP, sembra andare tutto (da testare...)

Browse Source 
git-svn-id: https://keyhammer.ath.cx/svn/WebGIM/trunk@160 3e04ef4b-3b25-4b6c-be27-bb5389ca777b
This commit is contained in:
samuele
2010-01-21 18:06:06 +00:00
parent 9676151565
commit 7d02ffc6cb
24 changed files with 1739 additions and 1567 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/reportExporter.cs
+4 -4
View File
@@ -104,7 +104,7 @@ public class reportExporter
switch (tipoReport)
{
case reportRichiesto.ElencoMacchine:
report.ReportPath = @"~\Reports\MacchineReparti.rdlc";
report.ReportPath = @".\Reports\MacchineReparti.rdlc";
report.DataSources.Add(new ReportDataSource("WebGim", caricaDati(tipoReport)));
deviceInfo = "<DeviceInfo>" +
" <OutputFormat>PDF</OutputFormat>" +
@@ -134,7 +134,7 @@ public class reportExporter
switch (tipoReport)
{
case reportRichiesto.RichiestaIntervento:
report.ReportPath = @"~\Reports\RichiestaIntervento.rdlc";
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>" +
@@ -163,7 +163,7 @@ public class reportExporter
switch (tipoReport)
{
case reportRichiesto.ElencoInterventi:
report.ReportPath = @"~\Reports\ReportInterventi.rdlc";
report.ReportPath = @".\Reports\ReportInterventi.rdlc";
report.DataSources.Add(new ReportDataSource("WebGim", caricaDati(tipoReport, periodoAnalizzato, username)));
deviceInfo = "<DeviceInfo>" +
" <OutputFormat>PDF</OutputFormat>" +
@@ -176,7 +176,7 @@ public class reportExporter
"</DeviceInfo>";
break;
case reportRichiesto.MTBF_MTTR:
report.ReportPath = @"~\Reports\Report_MTBF_MTTR.rdlc";
report.ReportPath = @".\Reports\Report_MTBF_MTTR.rdlc";
report.DataSources.Add(new ReportDataSource("WebGim", caricaDati(tipoReport, periodoAnalizzato, username)));
deviceInfo = "<DeviceInfo>" +
" <OutputFormat>PDF</OutputFormat>" +
Projects/WebGIM/GIM_data/reportPrinter.cs
+4 -4
View File
@@ -149,7 +149,7 @@ public class reportPrinter
switch (tipoReport)
{
case reportRichiesto.ElencoMacchine:
report.ReportPath = @"~\Reports\MacchineReparti.rdlc";
report.ReportPath = @".\Reports\MacchineReparti.rdlc";
report.DataSources.Add(new ReportDataSource("WebGim", caricaDati(tipoReport, parametro)));
deviceInfo = "<DeviceInfo>" +
" <OutputFormat>EMF</OutputFormat>" +
@@ -162,7 +162,7 @@ public class reportPrinter
"</DeviceInfo>";
break;
case reportRichiesto.RichiestaIntervento:
report.ReportPath = @"~\Reports\RichiestaIntervento.rdlc";
report.ReportPath = @".\Reports\RichiestaIntervento.rdlc";
report.DataSources.Add(new ReportDataSource("WebGim", caricaDati(tipoReport, parametro)));
deviceInfo = "<DeviceInfo>" +
" <OutputFormat>EMF</OutputFormat>" +
@@ -192,7 +192,7 @@ public class reportPrinter
switch (tipoReport)
{
case reportRichiesto.ElencoInterventi:
report.ReportPath = @"~\Reports\ReportInterventi.rdlc";
report.ReportPath = @".\Reports\ReportInterventi.rdlc";
report.DataSources.Add(new ReportDataSource("WebGim", caricaDati(tipoReport, periodoAnalizzato, username)));
deviceInfo = "<DeviceInfo>" +
" <OutputFormat>EMF</OutputFormat>" +
@@ -205,7 +205,7 @@ public class reportPrinter
"</DeviceInfo>";
break;
case reportRichiesto.MTBF_MTTR:
report.ReportPath = @"~\Reports\Report_MTBF_MTTR.rdlc";
report.ReportPath = @".\Reports\Report_MTBF_MTTR.rdlc";
report.DataSources.Add(new ReportDataSource("WebGim", caricaDati(tipoReport, periodoAnalizzato, username)));
deviceInfo = "<DeviceInfo>" +
" <OutputFormat>EMF</OutputFormat>" +
Projects/WebGIM/GIM_site/GIM_site.csproj
+1 -2
View File
@@ -1041,8 +1041,7 @@
<AutoAssignPort>True</AutoAssignPort>
<DevelopmentServerPort>51110</DevelopmentServerPort>
<DevelopmentServerVPath>/</DevelopmentServerVPath>
<IISUrl>
</IISUrl>
<IISUrl>http://localhost/GIM_site</IISUrl>
<NTLMAuthentication>False</NTLMAuthentication>
<UseCustomServer>False</UseCustomServer>
<CustomServerUrl>
Projects/WebGIM/GIM_site/Reports/MacchineReparti.rdlc
+1 -1
View File
@@ -831,7 +831,7 @@
<ZIndex>3</ZIndex>
<CanGrow>true</CanGrow>
<Left>5.70238cm</Left>
<Value>Somaschini SPA - SteamWare © 2006-2009</Value>
<Value>Somaschini SPA - SteamWare © 2006-2010</Value>
</Textbox>
<Textbox Name="textbox61">
<Top>0.05754cm</Top>
Projects/WebGIM/GIM_site/Reports/ReportInterventi.rdlc
+1 -1
View File
@@ -1306,7 +1306,7 @@
<ZIndex>3</ZIndex>
<CanGrow>true</CanGrow>
<Left>5.25cm</Left>
<Value>Somaschini SPA - SteamWare © 2006-2009</Value>
<Value>Somaschini SPA - SteamWare © 2006-2010</Value>
</Textbox>
<Textbox Name="textbox61">
<Top>0.1369cm</Top>
Projects/WebGIM/GIM_site/Reports/Report_MTBF_MTTR.rdlc
+1 -1
View File
@@ -910,7 +910,7 @@
<CanGrow>true</CanGrow>
<Left>5.03373cm</Left>
<Height>0.4762cm</Height>
<Value>Somaschini SPA - SteamWare © 2006-2009</Value>
<Value>Somaschini SPA - SteamWare © 2006-2010</Value>
</Textbox>
<Textbox Name="textbox61">
<Top>0.1369cm</Top>
Projects/WebGIM/GIM_site/Reports/RichiestaIntervento.rdlc
+1 -1
View File
@@ -1588,7 +1588,7 @@ NnSm5FYXbj0U9rEw82eM2/AEepQw+nBwqUdZYVUfccyIRfdzJgvg7Yd8Bw3nNxCWu9tPWzHeevGbhHPm
<CanGrow>true</CanGrow>
<Left>14cm</Left>
<Height>0.63492cm</Height>
<Value>Copyright SteamWare © 2006-2009</Value>
<Value>Copyright SteamWare © 2006-2010</Value>
</Textbox>
<Textbox Name="textbox61">
<Top>0.05754cm</Top>
Projects/WebGIM/GIM_site/Style.css
+1668 -1547
View File
File diff suppressed because it is too large Load Diff
Projects/WebGIM/GIM_site/Web.config
+1 -1
View File
@@ -103,7 +103,7 @@
<add key="appName" value="GIM"/>
<add key="mainRev" value="1.1"/>
<add key="minRev" value="160"/>
<add key="copyRight" value="SteamWare © 2006-2009"/>
<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"/>
Projects/WebGIM/GIM_site/WebConfigSomaschini_AppSettings.config
+1 -1
View File
@@ -18,7 +18,7 @@
<add key="welcomeApp" value="GIM_welcomeApp"/>
<add key="appName" value="GIM"/>
<add key="mainRev" value="1.0"/>
<add key="copyRight" value="SteamWare © 2006-2009"/>
<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"/>
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("./ExportPdf.aspx?tipo={0}&idx={1}", Convert.ToInt32(reportRichiesto.RichiestaIntervento), idx);
}
/// <summary>
/// prende in carico e stampa la scheda selezionata
Projects/WebGIM/GIM_site/WebUserControls/mod_mtzPrevPending.ascx.cs
-1
View File
@@ -7,7 +7,6 @@ using SteamWare;
public partial class mod_mtzPrevPending : ApplicationUserControl
{
public event EventHandler eh_resetSelezione;
/// <summary>
/// evento dati associati a controllo
/// </summary>
Projects/WebGIM/GIM_site/WebUserControls/mod_reportInterventi.ascx.cs
+1 -1
View File
@@ -55,7 +55,7 @@ public partial class mod_reportInterventi : System.Web.UI.UserControl
}
private string formattaUrl(reportRichiesto tipo, intervalloDate periodo)
{
return String.Format("~/ExportPdf.aspx?tipo={0}&inizio={1}&fine={2}&username={3}", Convert.ToInt32(tipo), periodo.inizio, periodo.fine, user_std.UtSn.userNameAD);
return String.Format("./ExportPdf.aspx?tipo={0}&inizio={1}&fine={2}&username={3}", Convert.ToInt32(tipo), periodo.inizio, periodo.fine, user_std.UtSn.userNameAD);
}
#region gestione selettori valori multipli
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/insertRichiesta.aspx
+1
View File
@@ -1,4 +1,5 @@
<%@ Page Title="" Language="C#" MasterPageFile="~/WebMasterPages/Ajax.master" AutoEventWireup="true" Inherits="insertRichiesta" Codebehind="insertRichiesta.aspx.cs" %>
<%@ MasterType virtualPath="~/WebMasterPages/Ajax.master"%>
<%@ Register Src="~/WebUserControls/mod_insertRichiesta.ascx" tagname="mod_insertRichiesta" tagprefix="uc1" %>
<%@ Register Src="~/WebUserControls/mod_fixCal.ascx" tagname="mod_fixCal" tagprefix="uc2" %>
Projects/WebGIM/GIM_site/insertRichiesta.aspx.designer.cs
Generated
+12
View File
@@ -29,4 +29,16 @@ public partial class insertRichiesta {
/// To modify move field declaration from designer file to code-behind file.
/// </remarks>
protected global::mod_fixCal mod_fixCal1;
/// <summary>
/// Master property.
/// </summary>
/// <remarks>
/// Auto-generated property.
/// </remarks>
public new Ajax Master {
get {
return ((Ajax)(base.Master));
}
}
}
Projects/WebGIM/GIM_site/logs/20100121.txt
+10
View File
@@ -23,3 +23,13 @@
21/01/2010 18:28:46 [INFO] - L'utente Locatelli Samuele (VOSTRO410\samuele) ha effettuato il login correttamente
21/01/2010 18:33:19 [INFO] - L'utente Locatelli Samuele (VOSTRO410\samuele) ha effettuato il login correttamente
21/01/2010 18:39:05 [INFO] - L'utente Locatelli Samuele (VOSTRO410\samuele) ha effettuato il login correttamente
21/01/2010 18:43:27 [INFO] - L'utente Locatelli Samuele (VOSTRO410\samuele) ha effettuato il login correttamente
21/01/2010 18:44:46 [INFO] - L'utente Locatelli Samuele (VOSTRO410\samuele) ha effettuato il login correttamente
21/01/2010 18:45:01 [INFO] - L'utente Locatelli Samuele (VOSTRO410\samuele) ha effettuato il login correttamente
21/01/2010 18:48:20 [INFO] - L'utente Locatelli Samuele (VOSTRO410\samuele) ha effettuato il login correttamente
21/01/2010 18:48:35 [INFO] - L'utente Locatelli Samuele (VOSTRO410\samuele) ha effettuato il login correttamente
21/01/2010 18:53:12 [INFO] - L'utente Locatelli Samuele (VOSTRO410\samuele) ha effettuato il login correttamente
21/01/2010 18:58:09 [INFO] - L'utente Locatelli Samuele (VOSTRO410\samuele) ha effettuato il login correttamente
21/01/2010 19:00:24 [INFO] - L'utente Locatelli Samuele (VOSTRO410\samuele) ha effettuato il login correttamente
21/01/2010 19:02:02 [INFO] - L'utente Locatelli Samuele (VOSTRO410\samuele) ha effettuato il login correttamente
21/01/2010 19:03:48 [INFO] - L'utente Locatelli Samuele (VOSTRO410\samuele) ha effettuato il login correttamente
Projects/WebGIM/GIM_site/obj/Debug/GIM_site.csproj.FileListAbsolute.txt
+30
View File
@@ -1,3 +1,33 @@
c:\Users\samuele\Documents\Visual Studio 2008\Projects\WebGIM\GIM_site\obj\Debug\ResolveAssemblyReference.cache
c:\Users\samuele\Documents\Visual Studio 2008\Projects\WebGIM\GIM_site\obj\Debug\RdlCompile.cache
c:\Users\samuele\Documents\Visual Studio 2008\Projects\WebGIM\GIM_site\obj\Debug\RdlCompile.compiled
c:\Users\samuele\Documents\Visual Studio 2008\Projects\WebGIM\GIM_site\bin\GIM_site.dll
c:\Users\samuele\Documents\Visual Studio 2008\Projects\WebGIM\GIM_site\bin\GIM_site.pdb
c:\Users\samuele\Documents\Visual Studio 2008\Projects\WebGIM\GIM_site\bin\AjaxControlToolkit.dll
c:\Users\samuele\Documents\Visual Studio 2008\Projects\WebGIM\GIM_site\bin\GIM_data.dll
c:\Users\samuele\Documents\Visual Studio 2008\Projects\WebGIM\GIM_site\bin\SteamWare.dll
c:\Users\samuele\Documents\Visual Studio 2008\Projects\WebGIM\GIM_site\bin\ICSharpCode.SharpZipLib.dll
c:\Users\samuele\Documents\Visual Studio 2008\Projects\WebGIM\GIM_site\bin\System.Web.Ajax.dll
c:\Users\samuele\Documents\Visual Studio 2008\Projects\WebGIM\GIM_site\bin\GIM_data.pdb
c:\Users\samuele\Documents\Visual Studio 2008\Projects\WebGIM\GIM_site\bin\AjaxControlToolkit.pdb
c:\Users\samuele\Documents\Visual Studio 2008\Projects\WebGIM\GIM_site\bin\SteamWare.pdb
c:\Users\samuele\Documents\Visual Studio 2008\Projects\WebGIM\GIM_site\bin\SteamWare.xml
c:\Users\samuele\Documents\Visual Studio 2008\Projects\WebGIM\GIM_site\bin\System.Web.Ajax.pdb
c:\Users\samuele\Documents\Visual Studio 2008\Projects\WebGIM\GIM_site\bin\ar\AjaxControlToolkit.resources.dll
c:\Users\samuele\Documents\Visual Studio 2008\Projects\WebGIM\GIM_site\bin\cs\AjaxControlToolkit.resources.dll
c:\Users\samuele\Documents\Visual Studio 2008\Projects\WebGIM\GIM_site\bin\de\AjaxControlToolkit.resources.dll
c:\Users\samuele\Documents\Visual Studio 2008\Projects\WebGIM\GIM_site\bin\es\AjaxControlToolkit.resources.dll
c:\Users\samuele\Documents\Visual Studio 2008\Projects\WebGIM\GIM_site\bin\fr\AjaxControlToolkit.resources.dll
c:\Users\samuele\Documents\Visual Studio 2008\Projects\WebGIM\GIM_site\bin\he\AjaxControlToolkit.resources.dll
c:\Users\samuele\Documents\Visual Studio 2008\Projects\WebGIM\GIM_site\bin\hi\AjaxControlToolkit.resources.dll
c:\Users\samuele\Documents\Visual Studio 2008\Projects\WebGIM\GIM_site\bin\it\AjaxControlToolkit.resources.dll
c:\Users\samuele\Documents\Visual Studio 2008\Projects\WebGIM\GIM_site\bin\ja\AjaxControlToolkit.resources.dll
c:\Users\samuele\Documents\Visual Studio 2008\Projects\WebGIM\GIM_site\bin\ko\AjaxControlToolkit.resources.dll
c:\Users\samuele\Documents\Visual Studio 2008\Projects\WebGIM\GIM_site\bin\nl\AjaxControlToolkit.resources.dll
c:\Users\samuele\Documents\Visual Studio 2008\Projects\WebGIM\GIM_site\bin\pt\AjaxControlToolkit.resources.dll
c:\Users\samuele\Documents\Visual Studio 2008\Projects\WebGIM\GIM_site\bin\ru\AjaxControlToolkit.resources.dll
c:\Users\samuele\Documents\Visual Studio 2008\Projects\WebGIM\GIM_site\bin\tr-TR\AjaxControlToolkit.resources.dll
c:\Users\samuele\Documents\Visual Studio 2008\Projects\WebGIM\GIM_site\bin\zh-CHS\AjaxControlToolkit.resources.dll
c:\Users\samuele\Documents\Visual Studio 2008\Projects\WebGIM\GIM_site\bin\zh-CHT\AjaxControlToolkit.resources.dll
c:\Users\samuele\Documents\Visual Studio 2008\Projects\WebGIM\GIM_site\obj\Debug\GIM_site.dll
c:\Users\samuele\Documents\Visual Studio 2008\Projects\WebGIM\GIM_site\obj\Debug\GIM_site.pdb
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("./ExportPdf.aspx?tipo={0}", Convert.ToInt32(reportRichiesto.ElencoMacchine));
}
protected void btnPrint_Click(object sender, EventArgs e)