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

update x bugfix giancarlo da test pomeridiani

Browse Source 
git-svn-id: https://keyhammer.ath.cx/svn/GMW/trunk@444 365432ac-a1b5-4ffd-bb28-6d3099d32164
This commit is contained in:
samuele
2012-03-21 18:33:41 +00:00
parent a817e80f74
commit 53bacc5dcb
29 changed files with 146 additions and 106 deletions
Download Patch File Download Diff File Expand all files Collapse all files
GMW/GMW_Term/GMW_Term.Publish.xml
+55 -55
View File
@@ -1,128 +1,128 @@
<publishData>
<publishTarget publishUrl="http://localhost/GMWT/">
<file relUrl="bin/GMW_Term.pdb" publishTime="03/21/2012 18:33:27" />
<file relUrl="menuLDP.aspx" publishTime="03/06/2012 14:00:54" />
<file relUrl="images/ui-bg_glass_100_fdf5ce_1x400.png" publishTime="12/28/2011 17:09:18" />
<file relUrl="mazzConnectionStringsTK_test.config" publishTime="02/29/2012 16:08:38" />
<file relUrl="bin/GMW_data.dll" publishTime="03/06/2012 18:07:50" />
<file relUrl="Home.aspx" publishTime="06/05/2011 15:42:04" />
<file relUrl="bin/GMW_data.dll" publishTime="03/21/2012 18:09:14" />
<file relUrl="mazzConnectionStringsTK_test.config" publishTime="03/09/2012 16:29:14" />
<file relUrl="WebUserControls/mod_execParticolare.ascx" publishTime="09/14/2010 12:18:41" />
<file relUrl="images/apply_l.png" publishTime="08/25/2010 10:55:03" />
<file relUrl="images/ui-icons_222222_256x240.png" publishTime="12/28/2011 17:09:18" />
<file relUrl="bin/pt/AjaxControlToolkit.resources.dll" publishTime="07/09/2008 16:12:44" />
<file relUrl="mazzConnectionStringsSP.config" publishTime="02/29/2012 16:13:42" />
<file relUrl="bin/es/AjaxControlToolkit.resources.dll" publishTime="07/09/2008 16:12:45" />
<file relUrl="SmartList.aspx" publishTime="12/28/2011 10:49:35" />
<file relUrl="ActiveTask.aspx" publishTime="06/06/2011 07:19:07" />
<file relUrl="mazzConnectionStrings.config" publishTime="08/31/2010 18:50:36" />
<file relUrl="mazzConnectionStrings.config" publishTime="03/21/2012 12:13:51" />
<file relUrl="images/ui-bg_diagonals-thick_18_b81900_40x40.png" publishTime="12/28/2011 17:09:18" />
<file relUrl="images/lista_03-TerWip_s.jpg" publishTime="09/30/2010 16:34:04" />
<file relUrl="images/squareDis_s_4.jpg" publishTime="09/30/2010 16:07:09" />
<file relUrl="mazzAppSettingsTK.config" publishTime="02/29/2012 16:13:17" />
<file relUrl="bin/ja/AjaxControlToolkit.resources.dll" publishTime="07/09/2008 16:12:44" />
<file relUrl="WebUserControls/mod_smartList.ascx" publishTime="03/21/2012 12:13:08" />
<file relUrl="mazzAppSettingsTK.config" publishTime="03/21/2012 17:24:53" />
<file relUrl="Search.aspx" publishTime="08/03/2010 10:40:32" />
<file relUrl="WebUserControls/mod_barcode.ascx" publishTime="06/05/2011 15:59:07" />
<file relUrl="bin/GMW_data.pdb" publishTime="03/06/2012 18:07:50" />
<file relUrl="bin/GMW_data.pdb" publishTime="03/21/2012 18:09:14" />
<file relUrl="bin/zh-CHS/AjaxControlToolkit.resources.dll" publishTime="07/09/2008 16:12:44" />
<file relUrl="Web.config" publishTime="03/08/2012 08:20:52" />
<file relUrl="Web.config" publishTime="03/21/2012 18:34:48" />
<file relUrl="Barcode.aspx" publishTime="03/08/2012 08:23:00" />
<file relUrl="images/WIP.png" publishTime="09/13/2010 15:18:59" />
<file relUrl="WebUserControls/mod_menuMov.ascx" publishTime="03/08/2012 08:11:54" />
<file relUrl="images/ArrowUpGreen_m.png" publishTime="08/27/2010 16:51:01" />
<file relUrl="images/squareDis_s_1.jpg" publishTime="09/30/2010 16:06:31" />
<file relUrl="WebUserControls/mod_menuTop.ascx" publishTime="09/30/2010 17:41:21" />
<file relUrl="images/ui-icons_228ef1_256x240.png" publishTime="12/28/2011 17:09:18" />
<file relUrl="WebUserControls/mod_periodoAnalisi.ascx" publishTime="06/06/2011 06:52:29" />
<file relUrl="bin/SteamWare.pdb" publishTime="02/24/2012 15:15:50" />
<file relUrl="bin/SteamWare.pdb" publishTime="03/14/2012 11:57:35" />
<file relUrl="images/squareDis_s_2.jpg" publishTime="09/30/2010 16:06:46" />
<file relUrl="images/ui-bg_flat_10_000000_40x100.png" publishTime="12/28/2011 17:09:18" />
<file relUrl="images/new_m.png" publishTime="12/28/2011 17:02:00" />
<file relUrl="bin/de/AjaxControlToolkit.resources.dll" publishTime="07/09/2008 16:12:44" />
<file relUrl="images/Part.jpg" publishTime="10/01/2010 13:20:53" />
<file relUrl="ListePrelievo.aspx" publishTime="06/06/2011 07:47:28" />
<file relUrl="WebUserControls/mod_btnUdc.ascx" publishTime="11/05/2010 10:58:30" />
<file relUrl="images/ui-bg_gloss-wave_35_f6a828_500x100.png" publishTime="12/28/2011 17:09:18" />
<file relUrl="bin/tr-TR/AjaxControlToolkit.resources.dll" publishTime="07/09/2008 16:12:45" />
<file relUrl="images/ArrowUpGreen_s.png" publishTime="08/27/2010 16:51:01" />
<file relUrl="WebUserControls/mod_execUdc.ascx" publishTime="11/17/2010 17:05:07" />
<file relUrl="WebUserControls/mod_execCella.ascx" publishTime="09/14/2010 12:18:31" />
<file relUrl="WebUserControls/mod_execParticolare.ascx" publishTime="09/14/2010 12:18:41" />
<file relUrl="WS/AutoCompletamento.asmx" publishTime="07/21/2010 18:09:05" />
<file relUrl="WebUserControls/mod_makeMov.ascx" publishTime="03/06/2012 14:24:48" />
<file relUrl="WebUserControls/mod_makeMov.ascx" publishTime="03/21/2012 18:51:28" />
<file relUrl="images/lista_02-TerFus_s.jpg" publishTime="09/30/2010 16:33:11" />
<file relUrl="images/view_s.png" publishTime="08/25/2010 10:55:29" />
<file relUrl="images/ArrowDownRed_m.png" publishTime="08/27/2010 16:51:01" />
<file relUrl="images/ArrowUpGreen_s.png" publishTime="08/27/2010 16:51:01" />
<file relUrl="mazzConnectionStringsSP.config" publishTime="02/29/2012 16:13:42" />
<file relUrl="Cella.aspx" publishTime="09/13/2010 15:29:14" />
<file relUrl="bin/SteamWare.dll" publishTime="02/24/2012 15:15:50" />
<file relUrl="bin/SteamWare.dll" publishTime="03/21/2012 18:09:12" />
<file relUrl="bin/he/AjaxControlToolkit.resources.dll" publishTime="07/09/2008 16:12:44" />
<file relUrl="bin/GMW_Term.pdb" publishTime="03/08/2012 08:47:21" />
<file relUrl="WebUserControls/mod_execUdc.ascx" publishTime="11/17/2010 17:05:07" />
<file relUrl="bin/tr-TR/AjaxControlToolkit.resources.dll" publishTime="07/09/2008 16:12:45" />
<file relUrl="bin/AjaxControlToolkit.dll" publishTime="07/09/2008 16:12:45" />
<file relUrl="mazzConnectionStringsTK.config" publishTime="11/03/2011 16:07:34" />
<file relUrl="images/new_s.png" publishTime="12/28/2011 17:02:00" />
<file relUrl="WebUserControls/mod_menuMov.ascx" publishTime="03/08/2012 08:11:54" />
<file relUrl="bin/hi/AjaxControlToolkit.resources.dll" publishTime="07/09/2008 16:12:44" />
<file relUrl="WebUserControls/mod_activeTask.ascx" publishTime="10/04/2010 17:12:32" />
<file relUrl="images/square_s_0.jpg" publishTime="10/01/2010 16:06:18" />
<file relUrl="mazzAppSettings.config" publishTime="03/01/2012 09:10:08" />
<file relUrl="WebUserControls/mod_search.ascx" publishTime="10/11/2010 08:58:47" />
<file relUrl="mazzAppSettings.config" publishTime="03/21/2012 17:24:53" />
<file relUrl="images/ArrowUpGreen_l.png" publishTime="08/27/2010 16:51:01" />
<file relUrl="Default.aspx" publishTime="07/29/2010 11:17:19" />
<file relUrl="WebUserControls/mod_smartList.ascx" publishTime="01/20/2012 11:05:37" />
<file relUrl="images/logo_sw.jpg" publishTime="09/30/2010 15:20:18" />
<file relUrl="bin/Flesk.ViewState.dll" publishTime="07/26/2011 14:52:31" />
<file relUrl="images/square_s_3.jpg" publishTime="10/01/2010 16:07:21" />
<file relUrl="images/new_m.png" publishTime="12/28/2011 17:02:00" />
<file relUrl="bin/ko/AjaxControlToolkit.resources.dll" publishTime="07/09/2008 16:12:45" />
<file relUrl="bin/GMW_Term.dll" publishTime="03/08/2012 08:47:21" />
<file relUrl="bin/GMW_Term.dll" publishTime="03/21/2012 18:33:27" />
<file relUrl="images/ArrowDownRed_l.png" publishTime="08/27/2010 16:51:01" />
<file relUrl="mazzAppSettingsSP.config" publishTime="02/29/2012 16:13:42" />
<file relUrl="images/ui-icons_ffd27a_256x240.png" publishTime="12/28/2011 17:09:18" />
<file relUrl="images/lista_01-PreFus_s.jpg" publishTime="09/30/2010 16:27:01" />
<file relUrl="images/Cella.jpg" publishTime="10/01/2010 13:21:39" />
<file relUrl="images/squareDis_s_0.jpg" publishTime="09/30/2010 16:07:52" />
<file relUrl="bin/ja/AjaxControlToolkit.resources.dll" publishTime="07/09/2008 16:12:44" />
<file relUrl="images/cancel_m.png" publishTime="08/25/2010 10:55:03" />
<file relUrl="images/ui-icons_ffffff_256x240.png" publishTime="12/28/2011 17:09:18" />
<file relUrl="menuMov.aspx" publishTime="03/06/2012 14:01:03" />
<file relUrl="mazzAppSettingsTK_test.config" publishTime="03/01/2012 09:08:00" />
<file relUrl="WebUserControls/mod_home.ascx" publishTime="03/08/2012 08:02:14" />
<file relUrl="images/new_s.png" publishTime="12/28/2011 17:02:00" />
<file relUrl="mazzAppSettingsTK_test.config" publishTime="03/21/2012 17:24:53" />
<file relUrl="images/apply_m.png" publishTime="08/25/2010 10:55:03" />
<file relUrl="WebUserControls/mod_home.ascx" publishTime="03/19/2012 08:54:57" />
<file relUrl="images/square_s_4.jpg" publishTime="10/01/2010 16:07:39" />
<file relUrl="WebUserControls/mod_menuLDP.ascx" publishTime="03/08/2012 08:15:42" />
<file relUrl="WebUserControls/mod_menuLDP.ascx" publishTime="03/19/2012 08:38:03" />
<file relUrl="bin/ru/AjaxControlToolkit.resources.dll" publishTime="07/09/2008 16:12:44" />
<file relUrl="images/ui-bg_highlight-soft_75_ffe45c_1x100.png" publishTime="12/28/2011 17:09:18" />
<file relUrl="images/cancel_l.png" publishTime="08/25/2010 10:55:03" />
<file relUrl="WebUserControls/mod_listePrelievo.ascx" publishTime="06/06/2011 08:15:29" />
<file relUrl="bin/ar/AjaxControlToolkit.resources.dll" publishTime="07/09/2008 16:12:44" />
<file relUrl="WebUserControls/mod_listePrelievo.ascx" publishTime="03/21/2012 17:33:42" />
<file relUrl="images/square_s_2.jpg" publishTime="10/01/2010 16:07:02" />
<file relUrl="bin/AjaxControlToolkit.pdb" publishTime="07/09/2008 16:12:45" />
<file relUrl="images/ArrowDownRed_s.png" publishTime="08/27/2010 16:51:01" />
<file relUrl="images/squareDis_s_3.jpg" publishTime="09/30/2010 16:06:59" />
<file relUrl="images/view_l.png" publishTime="08/25/2010 10:55:03" />
<file relUrl="images/square_s_1.jpg" publishTime="10/01/2010 16:06:43" />
<file relUrl="images/ArrowUpGreen_m.png" publishTime="08/27/2010 16:51:01" />
<file relUrl="mazzAppSettingsSP.config" publishTime="03/21/2012 17:24:53" />
<file relUrl="WebUserControls/mod_menuTop.ascx" publishTime="09/30/2010 17:41:21" />
<file relUrl="images/new_l.png" publishTime="12/28/2011 17:02:00" />
<file relUrl="WebMasterPages/Compact.Master" publishTime="03/06/2012 13:55:38" />
<file relUrl="WebUserControls/mod_interrMov.ascx" publishTime="03/08/2012 09:40:53" />
<file relUrl="UDC.aspx" publishTime="06/06/2011 07:46:04" />
<file relUrl="WebMasterPages/CompactBCode.Master" publishTime="03/06/2012 13:55:43" />
<file relUrl="bin/ICSharpCode.SharpZipLib.dll" publishTime="09/30/2009 12:25:00" />
<file relUrl="interrMov.aspx" publishTime="03/06/2012 18:25:12" />
<file relUrl="Particolare.aspx" publishTime="09/13/2010 15:29:28" />
<file relUrl="bin/ar/AjaxControlToolkit.resources.dll" publishTime="07/09/2008 16:12:44" />
<file relUrl="images/squareDis_s_3.jpg" publishTime="09/30/2010 16:06:59" />
<file relUrl="bin/it/AjaxControlToolkit.resources.dll" publishTime="07/09/2008 16:12:45" />
<file relUrl="images/ui-bg_gloss-wave_35_f6a828_500x100.png" publishTime="12/28/2011 17:09:18" />
<file relUrl="images/Udc.jpg" publishTime="10/01/2010 13:17:31" />
<file relUrl="images/square_s_1.jpg" publishTime="10/01/2010 16:06:43" />
<file relUrl="images/ui-icons_ef8c08_256x240.png" publishTime="12/28/2011 17:09:18" />
<file relUrl="images/apply_s.png" publishTime="08/25/2010 10:55:03" />
<file relUrl="images/lista_02-PreCli_s.jpg" publishTime="09/30/2010 16:31:46" />
<file relUrl="bin/cs/AjaxControlToolkit.resources.dll" publishTime="07/09/2008 16:12:45" />
<file relUrl="images/logo_sw.jpg" publishTime="09/30/2010 15:20:18" />
<file relUrl="images/squareDis_s_0.jpg" publishTime="09/30/2010 16:07:52" />
<file relUrl="images/view_m.png" publishTime="08/25/2010 10:55:03" />
<file relUrl="bin/fr/AjaxControlToolkit.resources.dll" publishTime="07/09/2008 16:12:45" />
<file relUrl="WebUserControls/mod_processPackList.ascx" publishTime="06/06/2011 08:19:28" />
<file relUrl="WebUserControls/mod_processPackList.ascx" publishTime="03/21/2012 11:11:39" />
<file relUrl="images/cancel_s.png" publishTime="08/25/2010 10:55:03" />
<file relUrl="WebUserControls/mod_searchResults.ascx" publishTime="09/30/2010 17:34:52" />
<file relUrl="bin/zh-CHT/AjaxControlToolkit.resources.dll" publishTime="07/09/2008 16:12:44" />
<file relUrl="WebUserControls/mod_search.ascx" publishTime="10/11/2010 08:58:47" />
<file relUrl="UDC.aspx" publishTime="06/06/2011 07:46:04" />
<file relUrl="images/view_l.png" publishTime="08/25/2010 10:55:03" />
<file relUrl="Home.aspx" publishTime="06/05/2011 15:42:04" />
<file relUrl="bin/cs/AjaxControlToolkit.resources.dll" publishTime="07/09/2008 16:12:45" />
<file relUrl="images/ui-bg_highlight-soft_100_eeeeee_1x100.png" publishTime="12/28/2011 17:09:18" />
<file relUrl="interrMov.aspx" publishTime="03/06/2012 18:25:12" />
<file relUrl="images/apply_m.png" publishTime="08/25/2010 10:55:03" />
<file relUrl="WebUserControls/mod_periodoAnalisi.ascx" publishTime="06/06/2011 06:52:29" />
<file relUrl="WebUserControls/mod_interrMov.ascx" publishTime="03/21/2012 12:13:05" />
<file relUrl="bin/nl/AjaxControlToolkit.resources.dll" publishTime="07/09/2008 16:12:45" />
<file relUrl="ListePrelievo.aspx" publishTime="06/06/2011 07:47:28" />
<file relUrl="Style.css" publishTime="03/08/2012 08:07:55" />
<file relUrl="bin/AjaxControlToolkit.dll" publishTime="07/09/2008 16:12:45" />
<file relUrl="bin/zh-CHT/AjaxControlToolkit.resources.dll" publishTime="07/09/2008 16:12:44" />
<file relUrl="Style.css" publishTime="03/21/2012 18:03:16" />
<file relUrl="images/ui-bg_diagonals-thick_20_666666_40x40.png" publishTime="12/28/2011 17:09:18" />
<file relUrl="images/ui-bg_glass_100_fdf5ce_1x400.png" publishTime="12/28/2011 17:09:18" />
<file relUrl="WebUserControls/mod_currentTask.ascx" publishTime="06/05/2011 16:03:45" />
<file relUrl="images/square_s_2.jpg" publishTime="10/01/2010 16:07:02" />
<file relUrl="images/squareDis_s_4.jpg" publishTime="09/30/2010 16:07:09" />
<file relUrl="makeMov.aspx" publishTime="03/06/2012 15:55:43" />
<file relUrl="images/ui-bg_glass_65_ffffff_1x400.png" publishTime="12/28/2011 17:09:18" />
<file relUrl="bin/SteamWare.XML" publishTime="03/08/2012 08:34:24" />
<file relUrl="bin/SteamWare.XML" publishTime="03/21/2012 16:16:51" />
<file relUrl="images/ui-bg_glass_100_f6f6f6_1x400.png" publishTime="12/28/2011 17:09:18" />
<file relUrl="bin/es/AjaxControlToolkit.resources.dll" publishTime="07/09/2008 16:12:45" />
<file relUrl="images/square_s_3.jpg" publishTime="10/01/2010 16:07:21" />
</publishTarget>
</publishData>
GMW/GMW_Term/Style.css
+15
View File
@@ -554,6 +554,15 @@
white-space: pre;
font-size: 9pt;
}
.btnBarcodeLarge
{
width: 120px;
height: 40px;
border: solid 2px blue;
background-color: #AAFFFF;
white-space: pre;
font-size: 9pt;
}
.btnPrendiInCarico
{
@@ -567,9 +576,15 @@
.errore
{
font-size: small;
color: Red;
font-weight: bold;
}
.erroreMid
{
font-size: small;
color: Red;
}
.clearAll
{
clear: both;
GMW/GMW_Term/Web.config
+2 -2
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="429" />
<add key="minRev" value="430" />
<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" />
@@ -118,7 +118,7 @@
<!--Permette prelievo/deposito da terminalino senza sparare barcode (con img frecce) -->
<add key="PrelDepoTermEnabled" value="true" />
<!--codice per barcode chiusura lista prelievo-->
<add key="closeCodeLdp" value="CLZ" />
<add key="closeCodeLdp" value="CLOSE" />
<!--setup LDP Smart-->
<add key ="LdpSmartTipoLDP" value="00-Smart" />
<add key ="LdpSmartDest" value="C001" />
GMW/GMW_Term/WebUserControls/mod_barcode.ascx.cs
+17 -3
View File
@@ -203,9 +203,23 @@ namespace GMW_Term.WebUserControls
if (isUserList)
{
// chiudo!
GMW_data.MagClass.magazzino.completaListaPrelievo(memLayer.ML.StringSessionObj("CodCS"), codLista, MagClass.magazzino.CodSoggCurrUser);
// indico che la lista indicata è stata chiusa
lblData.Text = string.Format("{0}: {1}", traduci("ListClosed"), codLista);
esitoOperazione esitoCompleta = GMW_data.MagClass.magazzino.completaListaPrelievo(memLayer.ML.StringSessionObj("CodCS"), codLista, MagClass.magazzino.CodSoggCurrUser);
if (esitoCompleta == esitoOperazione.ok)
{
// indico che la lista indicata è stata chiusa
lblData.Text = string.Format("{0}: {1}", traduci("ListClosed"), codLista);
}
else if (esitoCompleta == esitoOperazione.errore_noUdc)
{
GMW_data.MagClass.magazzino.attivaListaPrelievo(memLayer.ML.StringSessionObj("CodCS"), codLista, MagClass.magazzino.CodSoggCurrUser);
logger.lg.scriviLog(string.Format("Lista di prelievo {0} rilasciata poiché senza UDC prelevati da parte dell'opertore {1}", codLista, MagClass.magazzino.CodSoggCurrUser), tipoLog.INFO);
// tolgo dalla session la lista prelievo attuale...
memLayer.ML.emptySessionVal("CodLista_sel");
memLayer.ML.emptySessionVal("CodListaAttiva");
memLayer.ML.emptySessionVal("activeTask");
// indico che la lista indicata è stata rimessa in stato "attiva"
lblData.Text = string.Format("{0}: {1}", traduci("ListReActivated"), codLista);
}
// svuoto cache!
memLayer.ML.emptySessionVal("UDC_sel");
}
GMW/GMW_Term/WebUserControls/mod_listePrelievo.ascx
+4 -6
View File
@@ -29,15 +29,13 @@
<asp:Label runat="server" ID="lblNoRecord" Text='<%# traduci("noRecord") %>' />
</EmptyDataTemplate>
<Columns>
<asp:TemplateField HeaderText="Dest/Data" SortExpression="Destinatario">
<asp:TemplateField HeaderText="CodLista/Data" SortExpression="CodLista">
<ItemTemplate>
<asp:LinkButton ID="lnkDest" runat="server" CommandName="Update" CommandArgument="ShowDetail"
CausesValidation="False" OnClick="lnk_Click">
<div>
<div style="float: left; white-space: nowrap;">
<b>
<asp:Label ID="lblDestinatario" runat="server" Text='<%# trimma(Eval("Destinatario").ToString(), 10) %>' />
</b>
<div style="float: left; white-space: nowrap; font-size: small;">
<asp:Label ID="lblCodLista" runat="server" Text='<%# Eval("CodLista").ToString() %>' />
</div>
</div>
<br />
@@ -101,7 +99,6 @@
</asp:Panel>
<asp:Panel runat="server" ID="pnlDetail" Visible="false">
<div style="background-color: #ACACAC;">
<asp:Button ID="btnBarcode" runat="server" OnClick="btnBarcode_Click" CssClass="btnBarcodeSmall" />
<asp:Button ID="btnCloseDet" runat="server" OnClick="btnCloseDet_Click" CssClass="btnHome"
Visible="false" />
<asp:Button ID="btnPrendiInCarico" runat="server" OnClick="btnPrendiInCarico_Click"
@@ -109,6 +106,7 @@
<%--<cc1:ConfirmButtonExtender ID="cbeCambiaStato" runat="server" ConfirmText='<%# traduci(cmdArgStato(Eval("CodStatoLista")))%>'
TargetControlID="btnPrendiInCarico" />--%>
<asp:Button runat="server" ID="btnShowPeriodo" OnClick="btnShowPeriodo_Click" CssClass="btnShowPeriodo" />
<asp:Button ID="btnBarcode" runat="server" OnClick="btnBarcode_Click" CssClass="btnBarcodeLarge" />
</div>
<div id="smallGridDetail">
<asp:GridView ID="grViewDetail" runat="server" AllowPaging="True" AllowSorting="True"
GMW/GMW_Term/WebUserControls/mod_listePrelievo.ascx.cs
+10
View File
@@ -334,6 +334,16 @@ namespace GMW_Term.WebUserControls
memLayer.ML.emptySessionVal("showDetListaPre");
showListDetails(memLayer.ML.StringSessionObj("CodListaAttiva"));
}
// controllo se sia abilitato pulsante x prendere in carico una LDP (ovvero NON HO altre LDP in carico...)
bool ListaSelOk = (memLayer.ML.StringSessionObj("CodListaAttiva") == memLayer.ML.StringSessionObj("CodLista_sel"));
if (ListaSelOk)
{
btnPrendiInCarico.Visible = false;
}
else
{
btnPrendiInCarico.Visible = true;
}
}
/// <summary>
GMW/GMW_Term/WebUserControls/mod_listePrelievo.ascx.designer.cs
Generated
+9 -9
View File
@@ -85,15 +85,6 @@ namespace GMW_Term.WebUserControls {
/// </remarks>
protected global::System.Web.UI.WebControls.Panel pnlDetail;
/// <summary>
/// btnBarcode control.
/// </summary>
/// <remarks>
/// Auto-generated field.
/// To modify move field declaration from designer file to code-behind file.
/// </remarks>
protected global::System.Web.UI.WebControls.Button btnBarcode;
/// <summary>
/// btnCloseDet control.
/// </summary>
@@ -121,6 +112,15 @@ namespace GMW_Term.WebUserControls {
/// </remarks>
protected global::System.Web.UI.WebControls.Button btnShowPeriodo;
/// <summary>
/// btnBarcode control.
/// </summary>
/// <remarks>
/// Auto-generated field.
/// To modify move field declaration from designer file to code-behind file.
/// </remarks>
protected global::System.Web.UI.WebControls.Button btnBarcode;
/// <summary>
/// grViewDetail control.
/// </summary>
GMW/GMW_Term/WebUserControls/mod_makeMov.ascx
+3 -7
View File
@@ -1,6 +1,6 @@
<%@ Control Language="C#" AutoEventWireup="true" CodeBehind="mod_makeMov.ascx.cs" Inherits="GMW_Term.WebUserControls.mod_makeMov" %>
<div style="font-size: normal">
<div>
<div class="clearAll">
<div style="float: left;">
<asp:Label runat="server" ID="lblCella" />
<br />
@@ -16,9 +16,7 @@
</b>
</div>
</div>
<div id="cl1" class="clearAll">
</div>
<div>
<div class="clearAll">
<div class="errore" style="color: Red;">
<asp:Label runat="server" ID="lblErrore" />
</div>
@@ -28,9 +26,7 @@
<asp:Label runat="server" ID="lblEsito" />
</div>
</div>
<div id="Div3" class="clearAll">
</div>
<div>
<div class="clearAll">
<div style="float: left;">
<asp:LinkButton ID="btnConferma" runat="server" OnClick="btnConferma_Click"
CssClass="styleBtnComposito" Height="30">
GMW/GMW_Term/WebUserControls/mod_menuMov.ascx.cs
+14 -2
View File
@@ -33,18 +33,30 @@ namespace GMW_Term.WebUserControls
protected void btn1_Click(object sender, EventArgs e)
{
memLayer.ML.emptySessionVal("codCella4det_sel");
memLayer.ML.emptySessionVal("UDC4det_sel");
resetAllData();
Response.Redirect("interrMov.aspx");
}
/// <summary>
/// resetta dati barcode
/// </summary>
private static void resetAllData()
{
memLayer.ML.emptySessionVal("IdxCella_sel");
memLayer.ML.emptySessionVal("codCella_sel");
memLayer.ML.emptySessionVal("codCella4det_sel");
memLayer.ML.emptySessionVal("UDC4det_sel");
memLayer.ML.emptySessionVal("UDC_sel");
}
protected void btn2_Click(object sender, EventArgs e)
{
resetAllData();
Response.Redirect("Home.aspx");
}
protected void btn3_Click(object sender, EventArgs e)
{
resetAllData();
Response.Redirect("makeMov.aspx");
}
}
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/interrMov.aspx.cs
+1 -6
View File
@@ -46,10 +46,8 @@ namespace GMW_Term
/// <param name="e"></param>
void mod_barcode1_eh_scannedUdc(object sender, EventArgs e)
{
memLayer.ML.emptySessionVal("IdxCella_sel");
memLayer.ML.emptySessionVal("codCella_sel");
//Response.Redirect("~/interrMov.aspx");
//mod_barcode1.showHeaderText = false;
//mod_barcode1.showNoteText = false;
mod_barcode1.Visible = false;
mod_interrMov1.showUdcDetail(mod_barcode1.valoreScan);
}
@@ -61,9 +59,6 @@ namespace GMW_Term
void mod_barcode1_eh_scannedCella(object sender, EventArgs e)
{
memLayer.ML.emptySessionVal("UDC_sel");
//Response.Redirect("~/interrMov.aspx");
//mod_barcode1.showHeaderText = false;
//mod_barcode1.showNoteText = false;
mod_barcode1.Visible = false;
mod_interrMov1.showCellaDetail(mod_barcode1.valoreScan);
}
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="425" />
<add key="minRev" value="430" />
<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="425" />
<add key="minRev" value="430" />
<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="425" />
<add key="minRev" value="430" />
<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="425" />
<add key="minRev" value="430" />
<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/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_Term_installer/GMW_Term_installer.vdproj
+3 -3
View File
@@ -344,14 +344,14 @@
{
"Name" = "8:Microsoft Visual Studio"
"ProductName" = "8:GMWT"
"ProductCode" = "8:{CFD2CC0D-5168-49AD-94BD-C9E6BE392983}"
"PackageCode" = "8:{1D4F0A02-7163-4363-AED0-DEE90899086E}"
"ProductCode" = "8:{C860CE0C-0113-4035-B96D-9DB18A75A179}"
"PackageCode" = "8:{C9D6FFE9-4074-473E-B403-ACF54DF6B4E2}"
"UpgradeCode" = "8:{B348C50D-8DAD-4430-AEF0-60800C94CB78}"
"RestartWWWService" = "11:TRUE"
"RemovePreviousVersions" = "11:TRUE"
"DetectNewerInstalledVersion" = "11:TRUE"
"InstallAllUsers" = "11:FALSE"
"ProductVersion" = "8:1.1.429"
"ProductVersion" = "8:1.1.430"
"Manufacturer" = "8:SteamWare s.r.l."
"ARPHELPTELEPHONE" = "8:+39-035460560"
"ARPHELPLINK" = "8:http://www.steamware.net"
GMW/GMW_Term_installer/Release/GMW_Term_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/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/Debug/GMW_data.dll
BIN
View File
Binary file not shown.
GMW/GMW_data/obj/Release/GMW_data.csproj.FileListAbsolute.txt
+9 -9
View File
@@ -7,12 +7,12 @@ c:\Users\samuele\Documents\Visual Studio 2008\Projects\GMW\GMW_data\bin\Release\
c:\Users\samuele\Documents\Visual Studio 2008\Projects\GMW\GMW_data\obj\Release\ResolveAssemblyReference.cache
c:\Users\samuele\Documents\Visual Studio 2008\Projects\GMW\GMW_data\obj\Release\GMW_data.dll
c:\Users\samuele\Documents\Visual Studio 2008\Projects\GMW\GMW_data\obj\Release\GMW_data.pdb
C:\Users\samuele.STEAMWAREWIN\Documents\Visual Studio 2008\Projects\GMW\GMW_data\bin\Release\GMW_data.dll.config
C:\Users\samuele.STEAMWAREWIN\Documents\Visual Studio 2008\Projects\GMW\GMW_data\bin\Release\GMW_data.dll
C:\Users\samuele.STEAMWAREWIN\Documents\Visual Studio 2008\Projects\GMW\GMW_data\bin\Release\GMW_data.pdb
C:\Users\samuele.STEAMWAREWIN\Documents\Visual Studio 2008\Projects\GMW\GMW_data\bin\Release\SteamWare.dll
C:\Users\samuele.STEAMWAREWIN\Documents\Visual Studio 2008\Projects\GMW\GMW_data\bin\Release\Flesk.ViewState.dll
C:\Users\samuele.STEAMWAREWIN\Documents\Visual Studio 2008\Projects\GMW\GMW_data\bin\Release\ICSharpCode.SharpZipLib.dll
C:\Users\samuele.STEAMWAREWIN\Documents\Visual Studio 2008\Projects\GMW\GMW_data\obj\Release\ResolveAssemblyReference.cache
C:\Users\samuele.STEAMWAREWIN\Documents\Visual Studio 2008\Projects\GMW\GMW_data\obj\Release\GMW_data.dll
C:\Users\samuele.STEAMWAREWIN\Documents\Visual Studio 2008\Projects\GMW\GMW_data\obj\Release\GMW_data.pdb
c:\Users\samuele.STEAMWAREWIN\Documents\Visual Studio 2008\Projects\GMW\GMW_data\bin\Release\GMW_data.dll.config
c:\Users\samuele.STEAMWAREWIN\Documents\Visual Studio 2008\Projects\GMW\GMW_data\bin\Release\GMW_data.dll
c:\Users\samuele.STEAMWAREWIN\Documents\Visual Studio 2008\Projects\GMW\GMW_data\bin\Release\GMW_data.pdb
c:\Users\samuele.STEAMWAREWIN\Documents\Visual Studio 2008\Projects\GMW\GMW_data\bin\Release\SteamWare.dll
c:\Users\samuele.STEAMWAREWIN\Documents\Visual Studio 2008\Projects\GMW\GMW_data\bin\Release\Flesk.ViewState.dll
c:\Users\samuele.STEAMWAREWIN\Documents\Visual Studio 2008\Projects\GMW\GMW_data\bin\Release\ICSharpCode.SharpZipLib.dll
c:\Users\samuele.STEAMWAREWIN\Documents\Visual Studio 2008\Projects\GMW\GMW_data\obj\Release\ResolveAssemblyReference.cache
c:\Users\samuele.STEAMWAREWIN\Documents\Visual Studio 2008\Projects\GMW\GMW_data\obj\Release\GMW_data.dll
c:\Users\samuele.STEAMWAREWIN\Documents\Visual Studio 2008\Projects\GMW\GMW_data\obj\Release\GMW_data.pdb
GMW/GMW_data/obj/Release/GMW_data.dll
BIN
View File
Binary file not shown.
GMW/GMW_data/obj/Release/Refactor/GMW_data.dll
BIN
View File
Binary file not shown.
GMW/GMW_data/obj/Release/ResolveAssemblyReference.cache
BIN
View File
Binary file not shown.