diff --git a/XPS/AnagraficaEventi.aspx b/XPS/AnagraficaEventi.aspx
index 6742198..82f4203 100644
--- a/XPS/AnagraficaEventi.aspx
+++ b/XPS/AnagraficaEventi.aspx
@@ -11,22 +11,23 @@
|
|
|
-
+
|
diff --git a/XPS/elencoComm.aspx b/XPS/elencoComm.aspx
new file mode 100644
index 0000000..5afcb09
--- /dev/null
+++ b/XPS/elencoComm.aspx
@@ -0,0 +1,7 @@
+<%@ Page Language="C#" MasterPageFile="~/AjaxSearch.master" AutoEventWireup="true" CodeFile="elencoComm.aspx.cs" Inherits="elencoComm" Title="Untitled Page" %>
+
+<%@ Register Src="mod_elencoComm.ascx" TagName="mod_elencoComm" TagPrefix="uc1" %>
+
+
+
+
diff --git a/XPS/elencoComm.aspx.cs b/XPS/elencoComm.aspx.cs
new file mode 100644
index 0000000..46ddc9a
--- /dev/null
+++ b/XPS/elencoComm.aspx.cs
@@ -0,0 +1,18 @@
+using System;
+using System.Data;
+using System.Configuration;
+using System.Collections;
+using System.Web;
+using System.Web.Security;
+using System.Web.UI;
+using System.Web.UI.WebControls;
+using System.Web.UI.WebControls.WebParts;
+using System.Web.UI.HtmlControls;
+
+public partial class elencoComm : System.Web.UI.Page
+{
+ protected void Page_Load(object sender, EventArgs e)
+ {
+
+ }
+}
diff --git a/XPS/mod_anagTipoObj.ascx b/XPS/mod_anagTipoObj.ascx
index bb435c0..b907adf 100644
--- a/XPS/mod_anagTipoObj.ascx
+++ b/XPS/mod_anagTipoObj.ascx
@@ -67,7 +67,7 @@
-
+
@@ -78,7 +78,7 @@
-
+
@@ -87,6 +87,41 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/XPS/mod_anagTipoObj.ascx.cs b/XPS/mod_anagTipoObj.ascx.cs
index c23b84d..3b03a30 100644
--- a/XPS/mod_anagTipoObj.ascx.cs
+++ b/XPS/mod_anagTipoObj.ascx.cs
@@ -280,7 +280,7 @@ public partial class mod_anagTipoObj : ApplicationUserControl
resetSelezione();
DS_XPSTableAdapters.AnagTipoObjTableAdapter taTipoObj = new DS_XPSTableAdapters.AnagTipoObjTableAdapter();
// creo 1 obj vuoto...
- taTipoObj.Insert("Nuovo Oggetto", 1, false, false);
+ taTipoObj.Insert("Nuovo Oggetto", 1, false, false, true, false, false);
grView.DataBind();
// sollevo evento nuovo valore...
if (eh_nuovoValore != null)
diff --git a/XPS/mod_anagraficaEventi.ascx b/XPS/mod_anagraficaEventi.ascx
index 12447d2..c870d81 100644
--- a/XPS/mod_anagraficaEventi.ascx
+++ b/XPS/mod_anagraficaEventi.ascx
@@ -1,6 +1,7 @@
<%@ Control Language="C#" AutoEventWireup="true" CodeFile="mod_anagraficaEventi.ascx.cs"
Inherits="mod_anagraficaEventi" %>
<%@ Register Assembly="AjaxControlToolkit" Namespace="AjaxControlToolkit" TagPrefix="cc1" %>
+<%@ Register Src="mod_selettore_ajax.ascx" TagName="mod_selettore_ajax" TagPrefix="uc1" %>
diff --git a/XPS/mod_anagraficaObjSet.ascx b/XPS/mod_anagraficaObjSet.ascx
index 0007e4a..1d80939 100644
--- a/XPS/mod_anagraficaObjSet.ascx
+++ b/XPS/mod_anagraficaObjSet.ascx
@@ -90,6 +90,17 @@
+
+
+
+
+
+
+
+
+
+
+
@@ -129,6 +140,7 @@
+
@@ -137,6 +149,7 @@
+
diff --git a/XPS/mod_anagraficaObjSet.ascx.cs b/XPS/mod_anagraficaObjSet.ascx.cs
index e36e415..8ef1e3f 100644
--- a/XPS/mod_anagraficaObjSet.ascx.cs
+++ b/XPS/mod_anagraficaObjSet.ascx.cs
@@ -231,7 +231,7 @@ public partial class mod_anagraficaObjSet : ApplicationUserControl
lblWarning.Text = traduci("errorNoTipoObjFound");
return;
}
- taObjSet.Insert("Nuovo set", IdxTipoObj, 0, 0);
+ taObjSet.Insert("Nuovo set", IdxTipoObj, 0, 0,"A.");
grView.DataBind();
// sollevo evento nuovo valore...
if (eh_nuovoValore != null)
diff --git a/XPS/mod_anagraficaStati.ascx b/XPS/mod_anagraficaStati.ascx
index 6936c74..5521e1f 100644
--- a/XPS/mod_anagraficaStati.ascx
+++ b/XPS/mod_anagraficaStati.ascx
@@ -4,13 +4,6 @@
<%@ Register Src="mod_selettore_ajax.ascx" TagName="mod_selettore_ajax" TagPrefix="uc1" %>
<%@ Register Src="mod_filtro.ascx" TagName="mod_filtro" TagPrefix="uc1" %>
-
@@ -18,6 +11,13 @@
SelectMethod="GetData" TypeName="DS_utilityTableAdapters.v_selTipoObjTableAdapter">
+
@@ -81,6 +81,39 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/XPS/mod_elencoComm.ascx b/XPS/mod_elencoComm.ascx
new file mode 100644
index 0000000..93d4fbc
--- /dev/null
+++ b/XPS/mod_elencoComm.ascx
@@ -0,0 +1,94 @@
+<%@ Control Language="C#" AutoEventWireup="true" CodeFile="mod_elencoComm.ascx.cs"
+ Inherits="mod_elencoComm" %>
+
+<%@ Register Src="mod_filtro.ascx" TagName="mod_filtro" TagPrefix="uc1" %>
+
+
+
+ |
+
+
+
+ |
+
+
+ |
+
+
+
+
+
+
+ |
+
+ |
+
+
+ |
+
+
+ |
+
+ |
+
+
+ |
+
+
+ |
+
+ |
+
+
+ |
+
+
+ |
+
+ |
+
+
+
+ |
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ <%----%>
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ Dettaglio del DDT:
+ - pulsanti aggiunta
+ - elenco
+ - stato / btn statusChange?
diff --git a/XPS/mod_elencoComm.ascx.cs b/XPS/mod_elencoComm.ascx.cs
new file mode 100644
index 0000000..b7c1bab
--- /dev/null
+++ b/XPS/mod_elencoComm.ascx.cs
@@ -0,0 +1,78 @@
+using System;
+using System.Data;
+using System.Configuration;
+using System.Collections;
+using System.Web;
+using System.Web.Security;
+using System.Web.UI;
+using System.Web.UI.WebControls;
+using System.Web.UI.WebControls.WebParts;
+using System.Web.UI.HtmlControls;
+using SteamWare;
+
+public partial class mod_elencoComm : ApplicationUserControl
+{
+
+ ///
+ /// inizializzazione valori di default
+ ///
+ ///
+ protected override void OnInit(EventArgs e)
+ {
+ base.OnInit(e);
+ if (!Page.IsPostBack)
+ {
+ mf_clienti.ods = odsFiltroClienti;
+ }
+ }
+
+ protected override void traduciObj()
+ {
+ base.traduciObj();
+ btnShowNew.Text = traduci("btnShowNew");
+ btnNewComm.Text = traduci("btnNewComm");
+ lblCli.Text = traduci("lblCli");
+ lblNomeComm.Text = traduci("lblNomeComm");
+ lblNumDDT.Text = traduci("lblNumDDT");
+ }
+
+ ///
+ /// mostra/nasconde pannello nuovo
+ ///
+ ///
+ ///
+ protected void btnShowNew_Click(object sender, EventArgs e)
+ {
+ scambiaVisibPnlNew();
+ }
+
+ private void scambiaVisibPnlNew()
+ {
+ // in base alla visibilità indico il testo corretto e seleziono o meno il filtro...
+ if (!pnlNew.Visible)
+ {
+ btnShowNew.Text = traduci("btnHideNew");
+ mf_cliNew.ods = odsFiltroClienti;
+ }
+ else
+ {
+ btnShowNew.Text = traduci("btnShowNew");
+ }
+ pnlNew.Visible = !pnlNew.Visible;
+ }
+ ///
+ /// creazione di un nuovo set...
+ ///
+ ///
+ ///
+ protected void btnNewComm_Click(object sender, EventArgs e)
+ {
+ // creazione di un nuovo set...
+
+
+
+ // nascondo tutto...
+ txtNome.Text = "";
+ scambiaVisibPnlNew();
+ }
+}
\ No newline at end of file
diff --git a/XPS/mod_ev2stati.ascx.cs b/XPS/mod_ev2stati.ascx.cs
index 096c66e..d42239e 100644
--- a/XPS/mod_ev2stati.ascx.cs
+++ b/XPS/mod_ev2stati.ascx.cs
@@ -239,13 +239,23 @@ public partial class mod_ev2stati : ApplicationUserControl
// reset selezione...
resetSelezione();
DS_XPSTableAdapters.v_ev2statiTableAdapter taEv2Stato = new DS_XPSTableAdapters.v_ev2statiTableAdapter();
- // creo 1 obj vuoto...
- taEv2Stato.InsertQuery(memLayer.ML.StringSessionObj("CodMappa_sel"), "0", memLayer.ML.IntSessionObj("IdxTipoObj_sel"), memLayer.ML.StringSessionObj("CodEvento_sel"), "0");
- grView.DataBind();
- // sollevo evento nuovo valore...
- if (eh_nuovoValore != null)
+ try
{
- eh_nuovoValore(this, new EventArgs());
+ // creo 1 obj vuoto...
+ taEv2Stato.InsertQuery(memLayer.ML.StringSessionObj("CodMappa_sel"), "0", memLayer.ML.IntSessionObj("IdxTipoObj_sel"), memLayer.ML.StringSessionObj("CodEvento_sel"), "0");
+ grView.DataBind();
+ lblWarning.Visible = false;
+ // sollevo evento nuovo valore...
+ if (eh_nuovoValore != null)
+ {
+ eh_nuovoValore(this, new EventArgs());
+ }
+ }
+ catch (Exception exc)
+ {
+ lblWarning.Visible = true;
+ lblWarning.Text = traduci("erroreSelEvStatiMappe");
+ SteamWare.logger.lg.scriviLog(string.Format("Errore inserimento novo valore da vuoto: {0}", exc), tipoLog.EXCEPTION);
}
}
@@ -348,7 +358,7 @@ public partial class mod_ev2stati : ApplicationUserControl
// nascondo...
setClonaVisibility();
}
- catch(Exception exc)
+ catch (Exception exc)
{
lblWarning.Visible = true;
lblWarning.Text = traduci("erroreSelDest");
diff --git a/db/SteamWare_XPS.zip b/db/SteamWare_XPS.zip
index 3e16abe..5b4004d 100644
Binary files a/db/SteamWare_XPS.zip and b/db/SteamWare_XPS.zip differ