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

update x bugs segnalati da flaminio ieri ed oggi

Browse Source 
git-svn-id: https://keyhammer.ath.cx/svn/GMW/trunk@226 365432ac-a1b5-4ffd-bb28-6d3099d32164
This commit is contained in:
samuele
2010-09-10 13:14:34 +00:00
parent db2e47f3c5
commit 37e9e4fa3e
41 changed files with 3211 additions and 3209 deletions
Download Patch File Download Diff File Expand all files Collapse all files
GMW/GMW/GMW.csproj
+1 -7
View File
@@ -873,12 +873,6 @@
<Content Include="images\lista_03-TerWip_l.png" />
<Content Include="images\lista_03-TerWip_m.png" />
<Content Include="images\lista_03-TerWip_s.png" />
<Content Include="images\lista_04-PreCli_l.png" />
<Content Include="images\lista_04-PreCli_m.png" />
<Content Include="images\lista_04-PreCli_s.png" />
<Content Include="images\lista_preFus_l.png" />
<Content Include="images\lista_PreFus_m.png" />
<Content Include="images\lista_PreFus_s.png" />
<Content Include="images\recycle_green_l.png" />
<Content Include="images\recycle_green_m.png" />
<Content Include="images\recycle_green_s.png" />
@@ -936,7 +930,7 @@
<WebProjectProperties>
<UseIIS>False</UseIIS>
<AutoAssignPort>True</AutoAssignPort>
<DevelopmentServerPort>53622</DevelopmentServerPort>
<DevelopmentServerPort>61365</DevelopmentServerPort>
<DevelopmentServerVPath>/</DevelopmentServerVPath>
<IISUrl>http://localhost/GMW</IISUrl>
<OverrideIISAppRootUrl>True</OverrideIISAppRootUrl>
GMW/GMW/Style.css
+5 -1
View File
@@ -152,12 +152,16 @@
.cellaInattiva
{
text-align: center;
font-size: 8pt;
font-size:8pt;
height: 40px;
background-image: url(images/grigio_80.png);
color: White;
border: solid 1px #777777;
}
.cellaInattiva a
{
color: White;
}
.cellaSelezAll
{
text-align: center;
GMW/GMW/Web.config
+4 -3
View File
@@ -89,6 +89,7 @@
<add key="NumX" value="10" />
<add key="NumY" value="5" />
<add key="NumZ" value="1" />
<add key="showSizeCellaInDettMag" value="false"/>
<!--Setup periodo controlli date-->
<add key="defDayFrom" value="-60"/>
@@ -115,8 +116,8 @@
<add key="_adminEmail" value="samuele@steamware.net" />
<add key="_logDir" value="~/logs/" />
<add key="_smtpCli" value="keyhammer.ath.cx" />
<add key="GMWConnectionString" value="Data Source=10.74.82.217\sql2008r2;Initial Catalog=GMW;Persist Security Info=True;User ID=sa;Password=keyhammer" />
<add key="PermessiConnectionString" value="Data Source=10.74.82.217\sql2008r2;Initial Catalog=GMW;Persist Security Info=True;User ID=sa;Password=keyhammer" />
<add key="GMWConnectionString" value="Data Source=10.74.82.217\sql2008;Initial Catalog=GMW_prod;Persist Security Info=True;User ID=sa;Password=keyhammer" />
<add key="PermessiConnectionString" value="Data Source=10.74.82.217\sql2008;Initial Catalog=GMW_prod;Persist Security Info=True;User ID=sa;Password=keyhammer" />
<add key="UtenteCdcConnectionString" value="Data Source=10.74.82.217\sql2008r2;Initial Catalog=SteamWare_Anagrafica;Persist Security Info=True;User ID=sa;Password=keyhammer" />
<add key="VocabolarioConnectionString" value="Data Source=10.74.82.217\sql2008r2;Initial Catalog=SteamWare_Vocabolario;Persist Security Info=True;User ID=sa;Password=keyhammer" />
<!--<add key="GMWConnectionString" value="Data Source=t110-win2008r2\sql2008r2;Initial Catalog=GMW;Persist Security Info=True;User ID=sa;Password=keyhammer" />
@@ -125,7 +126,7 @@
<add key="VocabolarioConnectionString" value="Data Source=t110-win2008r2\sql2008r2;Initial Catalog=SteamWare_Vocabolario;Persist Security Info=True;User ID=sa;Password=keyhammer" />-->
</appSettings>
<connectionStrings>
<add name="GMW_data.Properties.Settings.GMWConnectionString" connectionString="Data Source=t110-win2008r2\sql2008r2;Initial Catalog=GMW;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\sql2008;Initial Catalog=GMW_prod;Persist Security Info=True;User ID=sa;Password=keyhammer" providerName="System.Data.SqlClient"/>
</connectionStrings>
<system.webServer>
<validation validateIntegratedModeConfiguration="false" />
GMW/GMW/WebUserControls/mod_dettCelleBlocco.ascx.cs
+16 -4
View File
@@ -93,6 +93,8 @@ namespace GMW.WebUserControls
string EsponenteSel = memLayer.ML.StringSessionObj("Esponente_sel");
// ottengo elenco dettaglio UDC che occupano il blocco...
DS_magazzino.v_UdcDetailDataTable tabUdc = MagClass.magazzino.taDettUDC.getUdcDetailByIdxBlocco(IdxBlocco);
// controllo se sia un magazzino mono o multicella...
bool multicella = MagClass.magazzino.taCelle.getByIdxBlocco(IdxBlocco).Rows.Count > 1;
// SE ci sono righe aggiorno il blocco...
if (tabUdc.Rows.Count > 0)
{
@@ -102,7 +104,7 @@ namespace GMW.WebUserControls
// salvo che ho 1 UDC in + nella cella...
BloccoCelle[riga.X - 1, riga.Y - 1].NumUdc++;
// controllo se nella cella ci sia il particolare selezionato...
if (ParticolareSel == riga.Particolare)
if (ParticolareSel == riga.Particolare && multicella)
{
// controllo se sia anche lo specifico esponente/stato
if (DescStatoSel == riga.DescStato && EsponenteSel == riga.Esponente)
@@ -135,18 +137,28 @@ namespace GMW.WebUserControls
/// </summary>
private void creaLabelTooltipCelle()
{
// ...in base al setup mostro anche il disponibile o meno...
string formato = "";
if (memLayer.ML.confReadBool("showSizeCellaInDettMag"))
{
formato = "<b>{0}</b><br/>{1}";
}
else
{
formato = "<b>{0}</b>";
}
// faccio ciclo x ogni oggetto blocco..
for (int pos_y = 0; pos_y < numY; pos_y++)
{
for (int pos_x = 0; pos_x < numX; pos_x++)
{
// calcolo la capacità della cella...
BloccoCelle[pos_x, pos_y].Label = string.Format("{0}/{1}", BloccoCelle[pos_x, pos_y].NumUdc, BloccoCelle[pos_x, pos_y].Capacita);
// calcolo la capacità della cella... e mostro secondo formato definito prima
BloccoCelle[pos_x, pos_y].Label = string.Format(formato, BloccoCelle[pos_x, pos_y].NumUdc, BloccoCelle[pos_x, pos_y].Capacita);
// se è attiva = 0 aggiorno label
if (!BloccoCelle[pos_x, pos_y].Attiva)
{
BloccoCelle[pos_x, pos_y].Css = "cellaInattiva";
BloccoCelle[pos_x, pos_y].Label = string.Format("[{0}]", BloccoCelle[pos_x, pos_y].Label);
//BloccoCelle[pos_x, pos_y].Label = string.Format("[{0}]", BloccoCelle[pos_x, pos_y].Label);
// ... e tooltip
BloccoCelle[pos_x, pos_y].ToolTip = string.Format("{0}{1}{2}", traduci("CellaInattiva"), Environment.NewLine, BloccoCelle[pos_x, pos_y].ToolTip);
}
GMW/GMW/WebUserControls/mod_dettaglioBlocco.ascx.cs
+9 -1
View File
@@ -193,12 +193,20 @@ namespace GMW.WebUserControls
// chiamo procedura che aggiorna ods principale
updateControlli();
}
/// <summary>
/// ritorno ad elenco amgazzini
/// </summary>
/// <param name="sender"></param>
/// <param name="e"></param>
protected void lnkReturn_Click(object sender, EventArgs e)
{
// svuoto dati in memoria...
memLayer.ML.emptySessionVal("CodMag_sel");
memLayer.ML.emptySessionVal("IdxBlocco_sel");
memLayer.ML.emptySessionVal("IdxCellaMag");
memLayer.ML.emptySessionVal("Particolare_sel");
memLayer.ML.emptySessionVal("DescStato_sel");
memLayer.ML.emptySessionVal("Esponente_sel");
Response.Redirect("~/StatoMag.aspx");
}
GMW/GMW/WebUserControls/mod_elencoListePrelievo.ascx.cs
+7 -1
View File
@@ -312,7 +312,7 @@ namespace GMW.WebUserControls
mod_nuovaListaPrelievo1.eh_nuovoValore += new EventHandler(mod_nuovaListaPrelievo1_eh_nuovoValore);
}
/// <summary>
/// <summary>
/// mostra oggetti x creare una nuova lista di prelievo
/// </summary>
/// <param name="sender"></param>
@@ -322,6 +322,8 @@ namespace GMW.WebUserControls
btnNewLista.Visible = true;
// nascondo crea nuovo
mod_nuovaListaPrelievo1.Visible = false;
// nascondo eventuali dettagli
grView.SelectedIndex = -1;
// aggiorno controllo corrente!
updateOds();
// ridisegno controllo child!
@@ -562,6 +564,7 @@ namespace GMW.WebUserControls
{
eh_nuovoValore(this, new EventArgs());
}
mod_viewRigheListaPrelievo1.Visible = false;
// blocco update!
e.Cancel = true;
break;
@@ -575,6 +578,7 @@ namespace GMW.WebUserControls
{
eh_nuovoValore(this, new EventArgs());
}
mod_viewRigheListaPrelievo1.Visible = false;
// blocco update!
e.Cancel = true;
break;
@@ -588,6 +592,7 @@ namespace GMW.WebUserControls
{
eh_nuovoValore(this, new EventArgs());
}
mod_viewRigheListaPrelievo1.Visible = false;
// blocco update!
e.Cancel = true;
break;
@@ -601,6 +606,7 @@ namespace GMW.WebUserControls
{
eh_nuovoValore(this, new EventArgs());
}
mod_viewRigheListaPrelievo1.Visible = false;
// blocco update!
e.Cancel = true;
break;
GMW/GMW/WebUserControls/mod_main_help.ascx
+1 -1
View File
@@ -38,7 +38,7 @@
HotSpotMode="Navigate" Left="0" Right="105" Top="373" Bottom="439" AlternateText="Delibera Fusi" />
<asp:RectangleHotSpot NavigateUrl="~/ElencoListePrelievo.aspx" HotSpotMode="Navigate"
Left="218" Right="329" Top="11" Bottom="53" AlternateText="Liste prelievo spedizione terzisti" />
<asp:RectangleHotSpot NavigateUrl="~/jumper.aspx?nextPage=GestDelibere.aspx&CodTipoDelib_sel=DelibWipPre"
<asp:RectangleHotSpot NavigateUrl="~/jumper.aspx?nextPage=GestDelibere.aspx&CodTipoDelib_sel=DelibWipPost"
HotSpotMode="Navigate" Left="135" Right="226" Top="73" Bottom="129" AlternateText="Delibera Spedizione Terzista" />
<asp:RectangleHotSpot NavigateUrl="~/jumper.aspx?nextPage=GestDelibere.aspx&CodTipoDelib_sel=DelibWipPre"
HotSpotMode="Navigate" Left="229" Right="318" Top="158" Bottom="215" AlternateText="Delibera Spedizione Terzista" />
GMW/GMW/WebUserControls/mod_viewRigheListaPrelievo.ascx
+1 -1
View File
@@ -54,7 +54,7 @@
<asp:TemplateField ShowHeader="False" ItemStyle-HorizontalAlign="Center">
<HeaderTemplate>
<asp:Button ID="btnNew" runat="server" OnClick="btnNew_Click" Text='<%# traduci("New") %>'
Visible="true" />
Visible='<%# nuovoEnabled() %>' />
</HeaderTemplate>
<ItemTemplate>
<asp:ImageButton ID="imgDelete" runat="server" CausesValidation="False" CommandName="Delete"
GMW/GMW/WebUserControls/mod_viewRigheListaPrelievo.ascx.cs
+9
View File
@@ -335,6 +335,15 @@ namespace GMW.WebUserControls
return answ;
}
/// <summary>
/// verifica se sia annullabile il prelievo
/// </summary>
/// <returns></returns>
public bool nuovoEnabled()
{
bool answ = editRigheEnabled;
return answ;
}
/// <summary>
/// salvo in session che il prox comando è confermare prelievo...
/// </summary>
/// <param name="sender"></param>
GMW/GMW/bin/GMW.dll
BIN
View File
Binary file not shown.
GMW/GMW/bin/GMW_data.dll
BIN
View File
Binary file not shown.
GMW/GMW/bin/SteamWare.XML
+3156
View File
File diff suppressed because it is too large Load Diff
GMW/GMW/bin/SteamWare.dll
BIN
View File
Binary file not shown.
GMW/GMW/images/logo_sw.png
BIN
View File
Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 33 KiB

After

Width:  |  Height:  |  Size: 14 KiB

GMW/GMW/mazzAppSettings.config
+1
View File
@@ -34,6 +34,7 @@
<add key="NumX" value="10"/>
<add key="NumY" value="5"/>
<add key="NumZ" value="1"/>
<add key="showSizeCellaInDettMag" value="false"/>
<!--Setup periodo controlli date-->
<add key="defDayFrom" value="-60"/>
GMW/GMW/obj/Debug/GMW.csproj.FileListAbsolute.txt
-33
View File
@@ -31,36 +31,3 @@ c:\Users\samuele.STEAMWAREWIN\Documents\Visual Studio 2008\Projects\GMW\GMW\obj\
c:\Users\samuele.STEAMWAREWIN\Documents\Visual Studio 2008\Projects\GMW\GMW\obj\Debug\RdlCompile.compiled
c:\Users\samuele.STEAMWAREWIN\Documents\Visual Studio 2008\Projects\GMW\GMW\obj\Debug\GMW.dll
c:\Users\samuele.STEAMWAREWIN\Documents\Visual Studio 2008\Projects\GMW\GMW\obj\Debug\GMW.pdb
C:\Users\ermanno.STEAMWAREWIN\Documents\Visual Studio 2008\Projects\GMW\GMW\bin\GMW.dll
C:\Users\ermanno.STEAMWAREWIN\Documents\Visual Studio 2008\Projects\GMW\GMW\bin\GMW.pdb
C:\Users\ermanno.STEAMWAREWIN\Documents\Visual Studio 2008\Projects\GMW\GMW\bin\AjaxControlToolkit.dll
C:\Users\ermanno.STEAMWAREWIN\Documents\Visual Studio 2008\Projects\GMW\GMW\bin\GMW_data.dll
C:\Users\ermanno.STEAMWAREWIN\Documents\Visual Studio 2008\Projects\GMW\GMW\bin\SteamWare.dll
C:\Users\ermanno.STEAMWAREWIN\Documents\Visual Studio 2008\Projects\GMW\GMW\bin\System.Web.Ajax.dll
C:\Users\ermanno.STEAMWAREWIN\Documents\Visual Studio 2008\Projects\GMW\GMW\bin\ICSharpCode.SharpZipLib.dll
C:\Users\ermanno.STEAMWAREWIN\Documents\Visual Studio 2008\Projects\GMW\GMW\bin\System.Web.Ajax.pdb
C:\Users\ermanno.STEAMWAREWIN\Documents\Visual Studio 2008\Projects\GMW\GMW\bin\AjaxControlToolkit.pdb
C:\Users\ermanno.STEAMWAREWIN\Documents\Visual Studio 2008\Projects\GMW\GMW\bin\GMW_data.pdb
C:\Users\ermanno.STEAMWAREWIN\Documents\Visual Studio 2008\Projects\GMW\GMW\bin\SteamWare.pdb
C:\Users\ermanno.STEAMWAREWIN\Documents\Visual Studio 2008\Projects\GMW\GMW\bin\SteamWare.xml
C:\Users\ermanno.STEAMWAREWIN\Documents\Visual Studio 2008\Projects\GMW\GMW\bin\ar\AjaxControlToolkit.resources.dll
C:\Users\ermanno.STEAMWAREWIN\Documents\Visual Studio 2008\Projects\GMW\GMW\bin\cs\AjaxControlToolkit.resources.dll
C:\Users\ermanno.STEAMWAREWIN\Documents\Visual Studio 2008\Projects\GMW\GMW\bin\de\AjaxControlToolkit.resources.dll
C:\Users\ermanno.STEAMWAREWIN\Documents\Visual Studio 2008\Projects\GMW\GMW\bin\es\AjaxControlToolkit.resources.dll
C:\Users\ermanno.STEAMWAREWIN\Documents\Visual Studio 2008\Projects\GMW\GMW\bin\fr\AjaxControlToolkit.resources.dll
C:\Users\ermanno.STEAMWAREWIN\Documents\Visual Studio 2008\Projects\GMW\GMW\bin\he\AjaxControlToolkit.resources.dll
C:\Users\ermanno.STEAMWAREWIN\Documents\Visual Studio 2008\Projects\GMW\GMW\bin\hi\AjaxControlToolkit.resources.dll
C:\Users\ermanno.STEAMWAREWIN\Documents\Visual Studio 2008\Projects\GMW\GMW\bin\it\AjaxControlToolkit.resources.dll
C:\Users\ermanno.STEAMWAREWIN\Documents\Visual Studio 2008\Projects\GMW\GMW\bin\ja\AjaxControlToolkit.resources.dll
C:\Users\ermanno.STEAMWAREWIN\Documents\Visual Studio 2008\Projects\GMW\GMW\bin\ko\AjaxControlToolkit.resources.dll
C:\Users\ermanno.STEAMWAREWIN\Documents\Visual Studio 2008\Projects\GMW\GMW\bin\nl\AjaxControlToolkit.resources.dll
C:\Users\ermanno.STEAMWAREWIN\Documents\Visual Studio 2008\Projects\GMW\GMW\bin\pt\AjaxControlToolkit.resources.dll
C:\Users\ermanno.STEAMWAREWIN\Documents\Visual Studio 2008\Projects\GMW\GMW\bin\ru\AjaxControlToolkit.resources.dll
C:\Users\ermanno.STEAMWAREWIN\Documents\Visual Studio 2008\Projects\GMW\GMW\bin\tr-TR\AjaxControlToolkit.resources.dll
C:\Users\ermanno.STEAMWAREWIN\Documents\Visual Studio 2008\Projects\GMW\GMW\bin\zh-CHS\AjaxControlToolkit.resources.dll
C:\Users\ermanno.STEAMWAREWIN\Documents\Visual Studio 2008\Projects\GMW\GMW\bin\zh-CHT\AjaxControlToolkit.resources.dll
C:\Users\ermanno.STEAMWAREWIN\Documents\Visual Studio 2008\Projects\GMW\GMW\obj\Debug\ResolveAssemblyReference.cache
C:\Users\ermanno.STEAMWAREWIN\Documents\Visual Studio 2008\Projects\GMW\GMW\obj\Debug\RdlCompile.cache
C:\Users\ermanno.STEAMWAREWIN\Documents\Visual Studio 2008\Projects\GMW\GMW\obj\Debug\RdlCompile.compiled
C:\Users\ermanno.STEAMWAREWIN\Documents\Visual Studio 2008\Projects\GMW\GMW\obj\Debug\GMW.dll
C:\Users\ermanno.STEAMWAREWIN\Documents\Visual Studio 2008\Projects\GMW\GMW\obj\Debug\GMW.pdb
GMW/GMW/obj/Debug/GMW.dll
BIN
View File
Binary file not shown.
GMW/GMW/obj/Debug/ResolveAssemblyReference.cache
BIN
View File
Binary file not shown.
GMW/GMW/obj/Release/GMW.dll
BIN
View File
Binary file not shown.
GMW/GMW/obj/Release/ResolveAssemblyReference.cache
BIN
View File
Binary file not shown.
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.XML
-3156
View File
File diff suppressed because it is too large Load Diff
GMW/GMW_Term/bin/SteamWare.dll
BIN
View File
Binary file not shown.
GMW/GMW_Term/obj/Debug/GMW_Term.dll
BIN
View File
Binary file not shown.
GMW/GMW_Term/obj/Debug/ResolveAssemblyReference.cache
BIN
View File
Binary file not shown.
GMW/GMW_WS/bin/GMW.dll
BIN
View File
Binary file not shown.
GMW/GMW_WS/bin/GMW_WS.dll
BIN
View File
Binary file not shown.
GMW/GMW_WS/bin/GMW_data.dll
BIN
View File
Binary file not shown.
GMW/GMW_WS/obj/Release/GMW_WS.dll
BIN
View File
Binary file not shown.
GMW/GMW_WS/obj/Release/ResolveAssemblyReference.cache
BIN
View File
Binary file not shown.
GMW/GMW_WS_installer/GMW_WS_installer.vdproj
+1 -1
View File
@@ -345,7 +345,7 @@
"Name" = "8:Microsoft Visual Studio"
"ProductName" = "8:GMW_WS"
"ProductCode" = "8:{1B76A1EC-296F-4995-B2B3-A5312FB2BCB3}"
"PackageCode" = "8:{CC3C0458-E07B-4B48-8005-AC22237166DF}"
"PackageCode" = "8:{23AFAB8C-0469-4792-85BA-393FC59B193F}"
"UpgradeCode" = "8:{BA470335-3D4B-4C20-8152-90A5F0F14FE0}"
"RestartWWWService" = "11:TRUE"
"RemovePreviousVersions" = "11:TRUE"
GMW/GMW_WS_installer/Release/GMW_WS_installer.msi
BIN
View File
Binary file not shown.
GMW/GMW_data/bin/Debug/GMW_data.dll
BIN
View File
Binary file not shown.
GMW/GMW_data/bin/Debug/SteamWare.dll
BIN
View File
Binary file not shown.
GMW/GMW_data/bin/Release/GMW_data.dll
BIN
View File
Binary file not shown.
GMW/GMW_data/obj/Debug/GMW_data.dll
BIN
View File
Binary file not shown.
GMW/GMW_data/obj/Debug/ResolveAssemblyReference.cache
BIN
View File
Binary file not shown.
GMW/GMW_data/obj/Debug/TempPE/DS_magazzino.Designer.cs.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_installer/Release/GMW_installer.msi
BIN
View File
Binary file not shown.