-
+
+
+ height="13px" />
+
@@ -41,7 +41,8 @@
+ width="13px" height="13px" />
+
+ height="13px" />
+
-
+ TargetControlID="imgDelete">
-
+ SelectMethod="GetData" TypeName="XPS_data.DS_utilityTableAdapters.v_selTipoObjTableAdapter">
diff --git a/XPS/WebUserControls/mod_completate.ascx b/XPS/WebUserControls/mod_completate.ascx
index 5d3dca6..5725990 100644
--- a/XPS/WebUserControls/mod_completate.ascx
+++ b/XPS/WebUserControls/mod_completate.ascx
@@ -11,7 +11,8 @@
-
+
+
diff --git a/XPS/WebUserControls/mod_completate.ascx.designer.cs b/XPS/WebUserControls/mod_completate.ascx.designer.cs
index 8a37ac7..016215f 100644
--- a/XPS/WebUserControls/mod_completate.ascx.designer.cs
+++ b/XPS/WebUserControls/mod_completate.ascx.designer.cs
@@ -1,10 +1,9 @@
//------------------------------------------------------------------------------
//
// This code was generated by a tool.
-// Runtime Version:2.0.50727.4963
//
// Changes to this file may cause incorrect behavior and will be lost if
-// the code is regenerated.
+// the code is regenerated.
//
//------------------------------------------------------------------------------
diff --git a/XPS/WebUserControls/mod_dettComm.ascx b/XPS/WebUserControls/mod_dettComm.ascx
index 9f89bdd..78c770f 100644
--- a/XPS/WebUserControls/mod_dettComm.ascx
+++ b/XPS/WebUserControls/mod_dettComm.ascx
@@ -19,7 +19,8 @@
-
+
+
@@ -30,9 +31,7 @@
-
-
+ width="13px" height="13px" />
- -->
-
+ -->
@@ -86,9 +84,7 @@
-
-
+ TextMode="MultiLine" Rows="5">
diff --git a/XPS/WebUserControls/mod_dettComm.ascx.designer.cs b/XPS/WebUserControls/mod_dettComm.ascx.designer.cs
index 757116f..0809369 100644
--- a/XPS/WebUserControls/mod_dettComm.ascx.designer.cs
+++ b/XPS/WebUserControls/mod_dettComm.ascx.designer.cs
@@ -1,10 +1,9 @@
//------------------------------------------------------------------------------
//
// This code was generated by a tool.
-// Runtime Version:2.0.50727.4963
//
// Changes to this file may cause incorrect behavior and will be lost if
-// the code is regenerated.
+// the code is regenerated.
//
//------------------------------------------------------------------------------
diff --git a/XPS/WebUserControls/mod_dettaglioGiornaliero.ascx b/XPS/WebUserControls/mod_dettaglioGiornaliero.ascx
index fca2ce7..95f0ffe 100644
--- a/XPS/WebUserControls/mod_dettaglioGiornaliero.ascx
+++ b/XPS/WebUserControls/mod_dettaglioGiornaliero.ascx
@@ -11,7 +11,8 @@
-
+
+
diff --git a/XPS/WebUserControls/mod_dettaglioGiornaliero.ascx.designer.cs b/XPS/WebUserControls/mod_dettaglioGiornaliero.ascx.designer.cs
index 2680008..1e9a5dd 100644
--- a/XPS/WebUserControls/mod_dettaglioGiornaliero.ascx.designer.cs
+++ b/XPS/WebUserControls/mod_dettaglioGiornaliero.ascx.designer.cs
@@ -1,10 +1,9 @@
//------------------------------------------------------------------------------
//
// This code was generated by a tool.
-// Runtime Version:2.0.50727.4963
//
// Changes to this file may cause incorrect behavior and will be lost if
-// the code is regenerated.
+// the code is regenerated.
//
//------------------------------------------------------------------------------
diff --git a/XPS/WebUserControls/mod_elencoComm.ascx b/XPS/WebUserControls/mod_elencoComm.ascx
index 402b483..0cb7ffb 100644
--- a/XPS/WebUserControls/mod_elencoComm.ascx
+++ b/XPS/WebUserControls/mod_elencoComm.ascx
@@ -2,8 +2,9 @@
<%@ Register Src="mod_filtro.ascx" TagName="mod_filtro" TagPrefix="uc1" %>
<%@ Register Assembly="AjaxControlToolkit" Namespace="AjaxControlToolkit" TagPrefix="asp" %>
<%@ Register Src="mod_logStati.ascx" TagName="mod_logStati" TagPrefix="uc2" %>
-
diff --git a/XPS/WebUserControls/mod_elencoComm.ascx.cs b/XPS/WebUserControls/mod_elencoComm.ascx.cs
index 66a4cd4..b967aad 100644
--- a/XPS/WebUserControls/mod_elencoComm.ascx.cs
+++ b/XPS/WebUserControls/mod_elencoComm.ascx.cs
@@ -115,6 +115,22 @@ namespace XPS.WebUserControls
#region area codice variabile
+ protected void Page_Load(object sender, EventArgs e)
+ {
+ if (!Page.IsPostBack)
+ {
+ traduciObj();
+ SetUpByUserRight();
+ }
+ aggiornaControlliDataGL();
+ _idxGridView = "CodDDT";
+ mf_clienti.eh_selValore += new EventHandler(mf_clienti_eh_selValore);
+ mf_tipoFiltro.eh_selValore += new EventHandler(mf_tipoFiltro_eh_selValore);
+ mod_logStati1.eh_reset += new EventHandler(mod_logStati1_eh_reset);
+ setStatiRewindAmmessi();
+ }
+
+
///
/// elenco colonne del datagrid
///
@@ -137,17 +153,6 @@ namespace XPS.WebUserControls
protected override void OnInit(EventArgs e)
{
base.OnInit(e);
- if(!Page.IsPostBack)
- {
- traduciObj();
- }
- SetUpByUserRight();
- aggiornaControlliDataGL();
- _idxGridView = "CodDDT";
- mf_clienti.eh_selValore += new EventHandler(mf_clienti_eh_selValore);
- mf_tipoFiltro.eh_selValore += new EventHandler(mf_tipoFiltro_eh_selValore);
- mod_logStati1.eh_reset += new EventHandler(mod_logStati1_eh_reset);
- setStatiRewindAmmessi();
}
///
/// imposta gli stati ammessi x cambio da tipo di schermata magazzino
@@ -216,14 +221,14 @@ namespace XPS.WebUserControls
///
protected void SetUpByUserRight()
{
- if (!Page.IsPostBack)
- {
- // imposto la pag corrente nel controllo di filtraggio...
- lblPag.Text = devicesAuthProxy.pagCorrente;
- mf_tipoFiltro.ods = odsTipoFiltro;
- mf_clienti.ods = odsFiltroClienti;
- fixControlliDaModoCorrente();
- }
+ //if (!Page.IsPostBack)
+ //{
+ // imposto la pag corrente nel controllo di filtraggio...
+ lblPag.Text = devicesAuthProxy.pagCorrente;
+ mf_tipoFiltro.ods = odsTipoFiltro;
+ mf_clienti.ods = odsFiltroClienti;
+ fixControlliDaModoCorrente();
+ //}
}
///
/// imposta i controlli secondo il modo corrente...
@@ -587,7 +592,15 @@ namespace XPS.WebUserControls
{
SteamWare.memLayer.ML.setSessionVal("nextObjCommand", "mostraLog");
}
-
+ ///
+ /// salvo next cmd --> mostrare log stato!
+ ///
+ ///
+ ///
+ protected void lbMostraLogStati_Click(object sender, EventArgs e)
+ {
+ SteamWare.memLayer.ML.setSessionVal("nextObjCommand", "mostraLog");
+ }
///
/// salvo in session che il prox comando è inserire scheduling x tutti... x non fare select...
///
@@ -727,8 +740,8 @@ namespace XPS.WebUserControls
checkFixOds();
}
- #endregion
+ #endregion
}
}
\ No newline at end of file
diff --git a/XPS/WebUserControls/mod_elencoRichResetUtenti.ascx b/XPS/WebUserControls/mod_elencoRichResetUtenti.ascx
index 6859f52..f843018 100644
--- a/XPS/WebUserControls/mod_elencoRichResetUtenti.ascx
+++ b/XPS/WebUserControls/mod_elencoRichResetUtenti.ascx
@@ -3,7 +3,8 @@
-
+
+
diff --git a/XPS/WebUserControls/mod_ev2stati.ascx b/XPS/WebUserControls/mod_ev2stati.ascx
index 813eb8f..385c4b8 100644
--- a/XPS/WebUserControls/mod_ev2stati.ascx
+++ b/XPS/WebUserControls/mod_ev2stati.ascx
@@ -11,7 +11,8 @@
-
+
+
diff --git a/XPS/WebUserControls/mod_ev2stati.ascx.designer.cs b/XPS/WebUserControls/mod_ev2stati.ascx.designer.cs
index acc6d24..7624850 100644
--- a/XPS/WebUserControls/mod_ev2stati.ascx.designer.cs
+++ b/XPS/WebUserControls/mod_ev2stati.ascx.designer.cs
@@ -1,10 +1,9 @@
//------------------------------------------------------------------------------
//
// This code was generated by a tool.
-// Runtime Version:2.0.50727.4963
//
// Changes to this file may cause incorrect behavior and will be lost if
-// the code is regenerated.
+// the code is regenerated.
//
//------------------------------------------------------------------------------
diff --git a/XPS/WebUserControls/mod_lemmiVocab.ascx b/XPS/WebUserControls/mod_lemmiVocab.ascx
index 2b82ba7..b7233a3 100644
--- a/XPS/WebUserControls/mod_lemmiVocab.ascx
+++ b/XPS/WebUserControls/mod_lemmiVocab.ascx
@@ -1,17 +1,18 @@
<%@ Control Language="C#" AutoEventWireup="true"
- Inherits="XPS.WebUserControls.mod_lemmiVocab" Codebehind="mod_lemmiVocab.ascx.cs" %>
+ Inherits="XPS.WebUserControls.mod_lemmiVocab" CodeBehind="mod_lemmiVocab.ascx.cs" %>
+ DataKeyNames="Lingua,Lemma" DataSourceID="ods" OnDataBound="grView_DataBound">
-
+
+
@@ -41,7 +42,7 @@
-
+
diff --git a/XPS/WebUserControls/mod_lemmiVocab.ascx.designer.cs b/XPS/WebUserControls/mod_lemmiVocab.ascx.designer.cs
index d4828bd..d1f1541 100644
--- a/XPS/WebUserControls/mod_lemmiVocab.ascx.designer.cs
+++ b/XPS/WebUserControls/mod_lemmiVocab.ascx.designer.cs
@@ -1,10 +1,9 @@
//------------------------------------------------------------------------------
//
// This code was generated by a tool.
-// Runtime Version:2.0.50727.4963
//
// Changes to this file may cause incorrect behavior and will be lost if
-// the code is regenerated.
+// the code is regenerated.
//
//------------------------------------------------------------------------------
diff --git a/XPS/WebUserControls/mod_logStati.ascx b/XPS/WebUserControls/mod_logStati.ascx
index 9b710a4..f3b7585 100644
--- a/XPS/WebUserControls/mod_logStati.ascx
+++ b/XPS/WebUserControls/mod_logStati.ascx
@@ -8,7 +8,8 @@
-
+
+
@@ -27,5 +28,6 @@
+ width="13px" height="13px" />
+
diff --git a/XPS/WebUserControls/mod_logStati.ascx.designer.cs b/XPS/WebUserControls/mod_logStati.ascx.designer.cs
index a458320..e499ba1 100644
--- a/XPS/WebUserControls/mod_logStati.ascx.designer.cs
+++ b/XPS/WebUserControls/mod_logStati.ascx.designer.cs
@@ -1,10 +1,9 @@
//------------------------------------------------------------------------------
//
// This code was generated by a tool.
-// Runtime Version:2.0.50727.4963
//
// Changes to this file may cause incorrect behavior and will be lost if
-// the code is regenerated.
+// the code is regenerated.
//
//------------------------------------------------------------------------------
diff --git a/XPS/WebUserControls/mod_scadute.ascx b/XPS/WebUserControls/mod_scadute.ascx
index a66187d..ac81ee3 100644
--- a/XPS/WebUserControls/mod_scadute.ascx
+++ b/XPS/WebUserControls/mod_scadute.ascx
@@ -11,7 +11,8 @@
-
+
+
diff --git a/XPS/WebUserControls/mod_scadute.ascx.designer.cs b/XPS/WebUserControls/mod_scadute.ascx.designer.cs
index 1117ab2..4cd4520 100644
--- a/XPS/WebUserControls/mod_scadute.ascx.designer.cs
+++ b/XPS/WebUserControls/mod_scadute.ascx.designer.cs
@@ -1,10 +1,9 @@
//------------------------------------------------------------------------------
//
// This code was generated by a tool.
-// Runtime Version:2.0.50727.4963
//
// Changes to this file may cause incorrect behavior and will be lost if
-// the code is regenerated.
+// the code is regenerated.
//
//------------------------------------------------------------------------------
diff --git a/XPS/WebUserControls/mod_selettore_ajax.ascx b/XPS/WebUserControls/mod_selettore_ajax.ascx
index 0dee255..94823e8 100644
--- a/XPS/WebUserControls/mod_selettore_ajax.ascx
+++ b/XPS/WebUserControls/mod_selettore_ajax.ascx
@@ -1,5 +1,5 @@
<%@ Control Language="C#" AutoEventWireup="true"
- Inherits="XPS.WebUserControls.mod_selettore_ajax" Codebehind="mod_selettore_ajax.ascx.cs" %>
+ Inherits="XPS.WebUserControls.mod_selettore_ajax" CodeBehind="mod_selettore_ajax.ascx.cs" %>
<%@ Register Assembly="AjaxControlToolkit" Namespace="AjaxControlToolkit" TagPrefix="ajaxToolkit" %>
@@ -8,7 +8,7 @@
-
+
@@ -45,7 +45,8 @@
-
+
+
diff --git a/XPS/WebUserControls/mod_selettore_ajax.ascx.designer.cs b/XPS/WebUserControls/mod_selettore_ajax.ascx.designer.cs
index e5a12b1..fd129e0 100644
--- a/XPS/WebUserControls/mod_selettore_ajax.ascx.designer.cs
+++ b/XPS/WebUserControls/mod_selettore_ajax.ascx.designer.cs
@@ -1,10 +1,9 @@
//------------------------------------------------------------------------------
//
// This code was generated by a tool.
-// Runtime Version:2.0.50727.4963
//
// Changes to this file may cause incorrect behavior and will be lost if
-// the code is regenerated.
+// the code is regenerated.
//
//------------------------------------------------------------------------------
diff --git a/XPS/WebUserControls/mod_vocabolario.ascx b/XPS/WebUserControls/mod_vocabolario.ascx
index 4f7fe9f..61c8c0b 100644
--- a/XPS/WebUserControls/mod_vocabolario.ascx
+++ b/XPS/WebUserControls/mod_vocabolario.ascx
@@ -20,7 +20,8 @@
+ width="13px" height="13px" />
+
-
+ TargetControlID="imgDelete">
-
-
+
+
@@ -101,11 +101,11 @@