diff --git a/ETS-WS/ETS-WS/ETS-WS.csproj b/ETS-WS/ETS-WS/ETS-WS.csproj index 004fc10..c9f0b14 100644 --- a/ETS-WS/ETS-WS/ETS-WS.csproj +++ b/ETS-WS/ETS-WS/ETS-WS.csproj @@ -159,6 +159,7 @@ + @@ -508,6 +509,18 @@ + + + + + + + + + + + + diff --git a/ETS-WS/ETS-WS/ETS-WS.csproj.user b/ETS-WS/ETS-WS/ETS-WS.csproj.user index 9ad7040..c8e87b9 100644 --- a/ETS-WS/ETS-WS/ETS-WS.csproj.user +++ b/ETS-WS/ETS-WS/ETS-WS.csproj.user @@ -1,5 +1,8 @@  + + ProjectFiles + diff --git a/ETS-WS/ETS-WS/HelpOnLine/Prova inserimento develop.txt b/ETS-WS/ETS-WS/HelpOnLine/Prova inserimento develop.txt new file mode 100644 index 0000000..e69de29 diff --git a/ETS-WS/ETS-WS/HelpOnLine/da help online.txt b/ETS-WS/ETS-WS/HelpOnLine/da help online.txt new file mode 100644 index 0000000..e69de29 diff --git a/ETS-WS/ETS-WS/MyDocs.aspx b/ETS-WS/ETS-WS/MyDocs.aspx index a45cf60..c89d6c4 100644 --- a/ETS-WS/ETS-WS/MyDocs.aspx +++ b/ETS-WS/ETS-WS/MyDocs.aspx @@ -6,26 +6,47 @@ <%@ Register Src="WebUserControls/mod_myTempFile.ascx" TagName="mod_myTempFile" TagPrefix="uc2" %> <%@ Register Src="WebUserControls/mod_inputDati.ascx" TagName="mod_inputDati" TagPrefix="uc3" %> -
-
+ + + + + Upload file + + + + + + + + Gestione file + + + + + + +<%--
-
+
--%> - + - +
-
+
- +
+ diff --git a/ETS-WS/ETS-WS/MyDocs.aspx.cs b/ETS-WS/ETS-WS/MyDocs.aspx.cs index e0a0bce..2fc45bf 100644 --- a/ETS-WS/ETS-WS/MyDocs.aspx.cs +++ b/ETS-WS/ETS-WS/MyDocs.aspx.cs @@ -14,14 +14,15 @@ namespace ETS_WS { if (!Page.IsPostBack) { - rblMode.SelectedIndex = 0; + // rblMode.SelectedIndex = 0; + TabContainer1.ActiveTabIndex = 0; setPnlVisibility(); } mod_fileUpload1.eh_fileCaricato += new EventHandler(mod_fileUpload1_eh_fileCaricato); mod_inputDati2.eh_reqSalva += new EventHandler(mod_inputDati2_eh_reqSalva); } /// - /// richiesta salvataggio, chiamo metodo sulla gestioen files temp! + /// richiesta salvataggio, chiamo metodo sulla gestione files temp! /// /// /// @@ -51,7 +52,9 @@ namespace ETS_WS private void setPnlVisibility() { bool fileVisible = false; - if (rblMode.SelectedValue == "Upload") + //if (rblMode.SelectedValue == "Upload" + // FARE!!! verificare se funziona ancora dopo cambio a pannelli + if ( TabContainer1.ActiveTabIndex == 1) { fileVisible = true; } diff --git a/ETS-WS/ETS-WS/MyDocs.aspx.designer.cs b/ETS-WS/ETS-WS/MyDocs.aspx.designer.cs index b4a81e2..18df6d6 100644 --- a/ETS-WS/ETS-WS/MyDocs.aspx.designer.cs +++ b/ETS-WS/ETS-WS/MyDocs.aspx.designer.cs @@ -13,22 +13,22 @@ namespace ETS_WS { public partial class MyDocs { /// - /// rblMode control. + /// TabContainer1 control. /// /// /// Auto-generated field. /// To modify move field declaration from designer file to code-behind file. /// - protected global::System.Web.UI.WebControls.RadioButtonList rblMode; + protected global::AjaxControlToolkit.TabContainer TabContainer1; /// - /// pnlFileUpload control. + /// TabPanel1 control. /// /// /// Auto-generated field. /// To modify move field declaration from designer file to code-behind file. /// - protected global::System.Web.UI.WebControls.Panel pnlFileUpload; + protected global::AjaxControlToolkit.TabPanel TabPanel1; /// /// mod_fileUpload1 control. @@ -40,13 +40,13 @@ namespace ETS_WS { protected global::ETS_WS.WebUserControls.mod_fileUpload mod_fileUpload1; /// - /// pnlInputDati control. + /// TabPanel2 control. /// /// /// Auto-generated field. /// To modify move field declaration from designer file to code-behind file. /// - protected global::System.Web.UI.WebControls.Panel pnlInputDati; + protected global::AjaxControlToolkit.TabPanel TabPanel2; /// /// mod_inputDati2 control. @@ -57,6 +57,24 @@ namespace ETS_WS { /// protected global::ETS_WS.WebUserControls.mod_inputDati mod_inputDati2; + /// + /// pnlFileUpload control. + /// + /// + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. + /// + protected global::System.Web.UI.WebControls.Panel pnlFileUpload; + + /// + /// pnlInputDati control. + /// + /// + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. + /// + protected global::System.Web.UI.WebControls.Panel pnlInputDati; + /// /// mod_myTempFile1 control. /// diff --git a/ETS-WS/ETS-WS/WebUserControls/mod_inputDati.ascx b/ETS-WS/ETS-WS/WebUserControls/mod_inputDati.ascx index 14bcf98..c070a8b 100644 --- a/ETS-WS/ETS-WS/WebUserControls/mod_inputDati.ascx +++ b/ETS-WS/ETS-WS/WebUserControls/mod_inputDati.ascx @@ -43,44 +43,44 @@

+ ServiceMethod="elencoCommesse" minCharAutocomplete="2" showKey="false" toolTip="Digitare per iniziare ricerca, min 2 char" tabIndex="1" />

+ ServiceMethod="elencoFasi" minCharAutocomplete="1" showKey="false" toolTip="Digitare per iniziare ricerca, min 1 char" tabIndex="2"/>

+ ServiceMethod="elencoFonti" minCharAutocomplete="3" showKey="false" toolTip="Digitare per iniziare ricerca, min 3 char" tabIndex="3" />

  + OnTextChanged="txtOggetto_TextChanged" TabIndex="4"/>

+ ServiceMethod="elencoAutori" minCharAutocomplete="1" showKey="false" toolTip="Digitare per iniziare ricerca, min 1 char" tabIndex="5"/>

+ ServiceMethod="elencoAutori" minCharAutocomplete="1" showKey="false" toolTip="Digitare per iniziare ricerca, min 1 char" tabIndex="6"/>
-
+

-   +  

-   +  
@@ -89,7 +89,7 @@ padding: -2px; margin-top: 8px;">
+ DataTextField="tag" DataValueField="idxTag" RepeatLayout="Flow" tabIndex="9" > @@ -97,12 +97,14 @@
-
- +
<%-- +
--%> +
-
+

- generatore:
+ generatore::
Lettera (doc) | FAX (doc) | Email
diff --git a/ETS-WS/ETS-WS/bin/ETS-WS.dll b/ETS-WS/ETS-WS/bin/ETS-WS.dll index 47309a5..374977d 100644 Binary files a/ETS-WS/ETS-WS/bin/ETS-WS.dll and b/ETS-WS/ETS-WS/bin/ETS-WS.dll differ diff --git a/ETS-WS/ETS-WS/bin/ETS_Data.dll b/ETS-WS/ETS-WS/bin/ETS_Data.dll index 60732c8..cdd4630 100644 Binary files a/ETS-WS/ETS-WS/bin/ETS_Data.dll and b/ETS-WS/ETS-WS/bin/ETS_Data.dll differ