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

build 439 x terminalino test con fix

Browse Source 
git-svn-id: https://keyhammer.ath.cx/svn/GMW/trunk@463 365432ac-a1b5-4ffd-bb28-6d3099d32164
This commit is contained in:
samuele
2012-05-23 14:48:48 +00:00
parent 7216d286e4
commit 9c57e5604d
32 changed files with 34 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files
GMW/GMW_Term/Web.config
+7 -7
View File
@@ -58,7 +58,7 @@
<add key="appName" value="GMW_Term" />
<add key="SiteName" value="Tekal" />
<add key="mainRev" value="1.2" />
<add key="minRev" value="438" />
<add key="minRev" value="439" />
<add key="copyRight" value="SteamWare © 2010-2012" />
<add key="_allowForceUser" value="true" />
<add key="_safePages" value="jumper.aspx#unauthorized.aspx#allegati.aspx#forceUser.aspx#login.aspx#test.aspx#istruzioni.aspx#Test.aspx" />
@@ -132,14 +132,14 @@
<add key="MinutiFinestraEditUDC" value="10" />
<add key="_adminEmail" value="samuele@steamware.net" />
<add key="_smtpCli" value="keyhammer.ath.cx" />
<add key="GMWConnectionString" value="Data Source=10.74.82.217\sql2008r2;Initial Catalog=SP_GMWTest;Persist Security Info=True;User ID=sa;Password=keyhammer" />
<add key="SP_produzioneConnectionString" value="Data Source=10.74.82.217\sql2008r2;Initial Catalog=SP_Produzione;Persist Security Info=True;User ID=connGMW;Password=steamware" />
<add key="PermessiConnectionString" value="Data Source=10.74.82.217\sql2008r2;Initial Catalog=SP_GMWTest;Persist Security Info=True;User ID=sa;Password=keyhammer" />
<add key="UtenteCdcConnectionString" value="Data Source=10.74.82.217\sql2008r2;Initial Catalog=SP_Anagrafica;Persist Security Info=True;User ID=sa;Password=keyhammer" />
<add key="VocabolarioConnectionString" value="Data Source=10.74.82.217\sql2008r2;Initial Catalog=SP_Vocabolario;Persist Security Info=True;User ID=sa;Password=keyhammer" />
<add key="GMWConnectionString" value="Data Source=10.74.82.217\sql2008r2;Initial Catalog=TK_GMWTest;Persist Security Info=True;User ID=sa;Password=keyhammer" />
<add key="TK_produzioneConnectionString" value="Data Source=10.74.82.217\sql2008r2;Initial Catalog=SP_Produzione;Persist Security Info=True;User ID=connGMW;Password=steamware" />
<add key="PermessiConnectionString" value="Data Source=10.74.82.217\sql2008r2;Initial Catalog=TK_GMWTest;Persist Security Info=True;User ID=sa;Password=keyhammer" />
<add key="UtenteCdcConnectionString" value="Data Source=10.74.82.217\sql2008r2;Initial Catalog=TK_Anagrafica;Persist Security Info=True;User ID=sa;Password=keyhammer" />
<add key="VocabolarioConnectionString" value="Data Source=10.74.82.217\sql2008r2;Initial Catalog=TK_Vocabolario;Persist Security Info=True;User ID=sa;Password=keyhammer" />
</appSettings>
<connectionStrings>
<add name="GMW_data.Properties.Settings.GMWConnectionString" connectionString="Data Source=10.74.82.217\sql2008r2;Initial Catalog=SP_GMWTest;Persist Security Info=True;User ID=sa;Password=keyhammer" providerName="System.Data.SqlClient"/>
<add name="GMW_data.Properties.Settings.GMWConnectionString" connectionString="Data Source=10.74.82.217\sql2008r2;Initial Catalog=TK_GMWTest;Persist Security Info=True;User ID=sa;Password=keyhammer" providerName="System.Data.SqlClient"/>
</connectionStrings>
<system.webServer>
<validation validateIntegratedModeConfiguration="false"/>
GMW/GMW_Term/WebUserControls/mod_smartList.ascx.cs
+7 -6
View File
@@ -28,6 +28,8 @@ namespace GMW_Term.WebUserControls
protected void Page_Load(object sender, EventArgs e)
{
updatePackListStatus();
// resetto!
resetAndUpdate();
}
/// <summary>
/// aggiorna lo stato della packing list corrente
@@ -112,9 +114,7 @@ namespace GMW_Term.WebUserControls
lblTotColli.Text = traduci("lblTotColli");
lblNumColli.Text = string.Format("{0} UDC", MagClass.magazzino.taRigheListePrelievo.getOpenByUserTipo(MagClass.magazzino.CodSoggCurrUser, "00-Smart").Rows.Count);
lblParticolari.Text = traduci("lblParticolari");
lblNumPart.Text = string.Format("{0} {1}", MagClass.magazzino.taElencoListePrelievo.getOpenByUserTipo(MagClass.magazzino.CodSoggCurrUser, "00-Smart").Rows.Count, traduci("Particolari"));
// resetto!
resetAndUpdate();
lblNumPart.Text = string.Format("{0} {1}", MagClass.magazzino.taElencoListePrelievo.getOpenByUserTipo(MagClass.magazzino.CodSoggCurrUser, "00-Smart").Rows.Count, traduci("Particolari"));
}
/// <summary>
/// Generazione delle liste di prelievo
@@ -143,8 +143,8 @@ namespace GMW_Term.WebUserControls
{
//memLayer.ML.emptySessionVal("UDC_sel");
GMW_data.TermClass.Ter.resetScanBarcode(true, false, false);
//// aggiorno visualizzazione
//updatePackListStatus();
// aggiorno visualizzazione
updatePackListStatus();
//lblErrore.Visible = false;
}
/// <summary>
@@ -165,7 +165,8 @@ namespace GMW_Term.WebUserControls
MagClass.magazzino.taElencoListePrelievo.DeleteQuery(riga.CodLista);
// elimino task attivo e cod lista attuale
memLayer.ML.emptySessionVal("CodListaAttiva");
memLayer.ML.emptySessionVal("activeTask");
memLayer.ML.emptySessionVal("activeTask");
lblErrore.Visible = false;
}
catch
{ }
GMW/GMW_Term/bin/GMW_Term.dll
BIN
View File
Binary file not shown.
GMW/GMW_Term/bin/GMW_data.dll
BIN
View File
Binary file not shown.
GMW/GMW_Term/bin/SteamWare.dll
BIN
View File
Binary file not shown.
GMW/GMW_Term/mazzAppSettings.config
+1 -1
View File
@@ -7,7 +7,7 @@
<add key="appName" value="GMW_Term" />
<add key="SiteName" value="Tekal" />
<add key="mainRev" value="1.2" />
<add key="minRev" value="438" />
<add key="minRev" value="439" />
<add key="copyRight" value="SteamWare © 2010-2012" />
<add key="_allowForceUser" value="true" />
<add key="_safePages" value="jumper.aspx#unauthorized.aspx#allegati.aspx#forceUser.aspx#login.aspx#test.aspx#istruzioni.aspx#Test.aspx" />
GMW/GMW_Term/mazzAppSettingsSP.config
+1 -1
View File
@@ -7,7 +7,7 @@
<add key="appName" value="GMW_Term" />
<add key="SiteName" value="San Possidonio" />
<add key="mainRev" value="1.2" />
<add key="minRev" value="438" />
<add key="minRev" value="439" />
<add key="copyRight" value="SteamWare © 2010-2012" />
<add key="_allowForceUser" value="true" />
<add key="_safePages" value="jumper.aspx#unauthorized.aspx#allegati.aspx#forceUser.aspx#login.aspx#test.aspx#istruzioni.aspx#Test.aspx" />
GMW/GMW_Term/mazzAppSettingsSP_test.config
+1 -1
View File
@@ -7,7 +7,7 @@
<add key="appName" value="GMW_Term" />
<add key="SiteName" value="San Possidonio" />
<add key="mainRev" value="1.2" />
<add key="minRev" value="438" />
<add key="minRev" value="439" />
<add key="copyRight" value="SteamWare © 2010-2012" />
<add key="_allowForceUser" value="true" />
<add key="_safePages" value="jumper.aspx#unauthorized.aspx#allegati.aspx#forceUser.aspx#login.aspx#test.aspx#istruzioni.aspx#Test.aspx" />
GMW/GMW_Term/mazzAppSettingsTK.config
+1 -1
View File
@@ -7,7 +7,7 @@
<add key="appName" value="GMW_Term" />
<add key="SiteName" value="Tekal" />
<add key="mainRev" value="1.2" />
<add key="minRev" value="438" />
<add key="minRev" value="439" />
<add key="copyRight" value="SteamWare © 2010-2012" />
<add key="_allowForceUser" value="true" />
<add key="_safePages" value="jumper.aspx#unauthorized.aspx#allegati.aspx#forceUser.aspx#login.aspx#test.aspx#istruzioni.aspx#Test.aspx" />
GMW/GMW_Term/mazzAppSettingsTK_test.config
+1 -1
View File
@@ -7,7 +7,7 @@
<add key="appName" value="GMW_Term" />
<add key="SiteName" value="Tekal" />
<add key="mainRev" value="1.2" />
<add key="minRev" value="438" />
<add key="minRev" value="439" />
<add key="copyRight" value="SteamWare © 2010-2012" />
<add key="_allowForceUser" value="true" />
<add key="_safePages" value="jumper.aspx#unauthorized.aspx#allegati.aspx#forceUser.aspx#login.aspx#test.aspx#istruzioni.aspx#Test.aspx" />
GMW/GMW_Term/obj/InstallerSP/ResolveAssemblyReference.cache
BIN
View File
Binary file not shown.
GMW/GMW_Term/obj/InstallerTK/ResolveAssemblyReference.cache
BIN
View File
Binary file not shown.
GMW/GMW_Term_test_installer/GMW_Term_test_installer.vdproj
+3 -3
View File
@@ -375,14 +375,14 @@
{
"Name" = "8:Microsoft Visual Studio"
"ProductName" = "8:GMWT_test"
"ProductCode" = "8:{D9C9C711-118C-4DDE-BBBB-FC0FC5BDA23D}"
"PackageCode" = "8:{56E6F972-17F1-46C2-AF1F-7C809FC4238D}"
"ProductCode" = "8:{F4FA0C27-3DDE-48E8-B9EF-4631F9DF5BDD}"
"PackageCode" = "8:{1A81BDF3-C0FA-4C42-A43C-35155427D357}"
"UpgradeCode" = "8:{9A41FB02-98D0-48FB-9924-75BB2A5649A0}"
"RestartWWWService" = "11:TRUE"
"RemovePreviousVersions" = "11:TRUE"
"DetectNewerInstalledVersion" = "11:TRUE"
"InstallAllUsers" = "11:FALSE"
"ProductVersion" = "8:1.1.438"
"ProductVersion" = "8:1.1.439"
"Manufacturer" = "8:SteamWare s.r.l."
"ARPHELPTELEPHONE" = "8:+39-035460560"
"ARPHELPLINK" = "8:http://www.steamware.net"
GMW/GMW_Term_test_installer/InstallerSP/GMW_Term_test_installer.msi
BIN
View File
Binary file not shown.
GMW/GMW_Term_test_installer/InstallerTK/GMW_Term_test_installer.msi
BIN
View File
Binary file not shown.
GMW/GMW_data/DS_Applicazione.Designer.cs
Generated
+1 -1
View File
@@ -1,7 +1,7 @@
//------------------------------------------------------------------------------
// <auto-generated>
// This code was generated by a tool.
// Runtime Version:2.0.50727.4963
// Runtime Version:2.0.50727.4971
//
// Changes to this file may cause incorrect behavior and will be lost if
// the code is regenerated.
GMW/GMW_data/DS_DataMatrix.Designer.cs
Generated
+2 -2
View File
@@ -1,7 +1,7 @@
//------------------------------------------------------------------------------
// <auto-generated>
// This code was generated by a tool.
// Runtime Version:2.0.50727.4963
// Runtime Version:2.0.50727.4971
//
// Changes to this file may cause incorrect behavior and will be lost if
// the code is regenerated.
@@ -2228,7 +2228,7 @@ SELECT NumDisegno, EsponenteDisegno, Particolare FROM TranscodificaParticolari W
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
private void InitConnection() {
this._connection = new global::System.Data.SqlClient.SqlConnection();
this._connection.ConnectionString = global::GMW_data.Properties.Settings.Default.SP_produzioneConnectionString;
this._connection.ConnectionString = global::GMW_data.Properties.Settings.Default.TK_produzioneConnectionString;
}
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
GMW/GMW_data/DS_Odette.Designer.cs
Generated
+1 -1
View File
@@ -1,7 +1,7 @@
//------------------------------------------------------------------------------
// <auto-generated>
// This code was generated by a tool.
// Runtime Version:2.0.50727.4963
// Runtime Version:2.0.50727.4971
//
// Changes to this file may cause incorrect behavior and will be lost if
// the code is regenerated.
GMW/GMW_data/DS_SM.Designer.cs
Generated
+1 -1
View File
@@ -1,7 +1,7 @@
//------------------------------------------------------------------------------
// <auto-generated>
// This code was generated by a tool.
// Runtime Version:2.0.50727.4963
// Runtime Version:2.0.50727.4971
//
// Changes to this file may cause incorrect behavior and will be lost if
// the code is regenerated.
GMW/GMW_data/DS_Utility.Designer.cs
Generated
+1 -1
View File
@@ -1,7 +1,7 @@
//------------------------------------------------------------------------------
// <auto-generated>
// This code was generated by a tool.
// Runtime Version:2.0.50727.4963
// Runtime Version:2.0.50727.4971
//
// Changes to this file may cause incorrect behavior and will be lost if
// the code is regenerated.
GMW/GMW_data/DS_cartellini.Designer.cs
Generated
+1 -1
View File
@@ -1,7 +1,7 @@
//------------------------------------------------------------------------------
// <auto-generated>
// This code was generated by a tool.
// Runtime Version:2.0.50727.4963
// Runtime Version:2.0.50727.4971
//
// Changes to this file may cause incorrect behavior and will be lost if
// the code is regenerated.
GMW/GMW_data/DS_magazzino.Designer.cs
Generated
+1 -1
View File
@@ -1,7 +1,7 @@
//------------------------------------------------------------------------------
// <auto-generated>
// This code was generated by a tool.
// Runtime Version:2.0.50727.4963
// Runtime Version:2.0.50727.4971
//
// Changes to this file may cause incorrect behavior and will be lost if
// the code is regenerated.
GMW/GMW_data/Properties/Settings.Designer.cs
Generated
+4 -4
View File
@@ -1,7 +1,7 @@
//------------------------------------------------------------------------------
// <auto-generated>
// This code was generated by a tool.
// Runtime Version:2.0.50727.4963
// Runtime Version:2.0.50727.4971
//
// Changes to this file may cause incorrect behavior and will be lost if
// the code is regenerated.
@@ -37,11 +37,11 @@ namespace GMW_data.Properties {
[global::System.Configuration.ApplicationScopedSettingAttribute()]
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
[global::System.Configuration.SpecialSettingAttribute(global::System.Configuration.SpecialSetting.ConnectionString)]
[global::System.Configuration.DefaultSettingValueAttribute("Data Source=10.74.82.217\\SQL2008R2;Initial Catalog=SP_produzione;Persist Security" +
[global::System.Configuration.DefaultSettingValueAttribute("Data Source=10.74.82.217\\SQL2008R2;Initial Catalog=TK_produzione;Persist Security" +
" Info=True;User ID=sa;Password=keyhammer")]
public string SP_produzioneConnectionString {
public string TK_produzioneConnectionString {
get {
return ((string)(this["SP_produzioneConnectionString"]));
return ((string)(this["TK_produzioneConnectionString"]));
}
}
}
GMW/GMW_data/bin/Release/GMW_data.dll
BIN
View File
Binary file not shown.
GMW/GMW_data/bin/Release/SteamWare.dll
BIN
View File
Binary file not shown.
GMW/GMW_data/obj/Release/GMW_data.dll
BIN
View File
Binary file not shown.
GMW/GMW_data/obj/Release/ResolveAssemblyReference.cache
BIN
View File
Binary file not shown.
GMW/GMW_data/obj/Release/TempPE/DS_Applicazione.Designer.cs.dll
BIN
View File
Binary file not shown.
GMW/GMW_data/obj/Release/TempPE/DS_DataMatrix.Designer.cs.dll
BIN
View File
Binary file not shown.
GMW/GMW_data/obj/Release/TempPE/DS_Odette.Designer.cs.dll
BIN
View File
Binary file not shown.
GMW/GMW_data/obj/Release/TempPE/DS_SM.Designer.cs.dll
BIN
View File
Binary file not shown.
GMW/GMW_data/obj/Release/TempPE/DS_cartellini.Designer.cs.dll
BIN
View File
Binary file not shown.