diff --git a/ETS-WS/ETS-WS/ETS-WS.csproj b/ETS-WS/ETS-WS/ETS-WS.csproj index d8ecefe..bf2b86b 100644 --- a/ETS-WS/ETS-WS/ETS-WS.csproj +++ b/ETS-WS/ETS-WS/ETS-WS.csproj @@ -638,7 +638,6 @@ - @@ -646,6 +645,8 @@ Always + + Designer diff --git a/ETS-WS/ETS-WS/WebUserControls/mod_inputDati.ascx b/ETS-WS/ETS-WS/WebUserControls/mod_inputDati.ascx index 67544e6..afa3bc6 100644 --- a/ETS-WS/ETS-WS/WebUserControls/mod_inputDati.ascx +++ b/ETS-WS/ETS-WS/WebUserControls/mod_inputDati.ascx @@ -56,37 +56,29 @@
  -
-
- -

-   +  

-   +  

- +
- <%-- -
--%> - +
diff --git a/ETS-WS/ETS-WS/WebUserControls/mod_inputDati.ascx.designer.cs b/ETS-WS/ETS-WS/WebUserControls/mod_inputDati.ascx.designer.cs index de5238f..33d35b0 100644 --- a/ETS-WS/ETS-WS/WebUserControls/mod_inputDati.ascx.designer.cs +++ b/ETS-WS/ETS-WS/WebUserControls/mod_inputDati.ascx.designer.cs @@ -129,24 +129,6 @@ namespace ETS_WS.WebUserControls { /// protected global::System.Web.UI.WebControls.TextBox txtOggetto; - /// - /// lblAutore control. - /// - /// - /// Auto-generated field. - /// To modify move field declaration from designer file to code-behind file. - /// - protected global::System.Web.UI.WebControls.Label lblAutore; - - /// - /// tacAutore control. - /// - /// - /// Auto-generated field. - /// To modify move field declaration from designer file to code-behind file. - /// - protected global::ETS_WS.WebUserControls.mod_textAutocomplete tacAutore; - /// /// lblDataDoc control. /// diff --git a/ETS-WS/ETS-WS/WebUserControls/mod_pathAndDocs.ascx b/ETS-WS/ETS-WS/WebUserControls/mod_pathAndDocs.ascx index 0a9b999..195a392 100644 --- a/ETS-WS/ETS-WS/WebUserControls/mod_pathAndDocs.ascx +++ b/ETS-WS/ETS-WS/WebUserControls/mod_pathAndDocs.ascx @@ -1,4 +1,12 @@ <%@ Control Language="C#" AutoEventWireup="true" CodeBehind="mod_pathAndDocs.ascx.cs" Inherits="ETS_WS.WebUserControls.mod_pathAndDocs" %> +<% if (false) + { %> + + + + + +<% } %>

@@ -8,12 +16,17 @@
-
- +
+   - +
-
- generatore::
- Lettera (doc) | FAX (doc) | Email | STACCA protocollo +
+ +   + +   + +   +
diff --git a/ETS-WS/ETS-WS/WebUserControls/mod_pathAndDocs.ascx.cs b/ETS-WS/ETS-WS/WebUserControls/mod_pathAndDocs.ascx.cs index 1f8a71a..7a01905 100644 --- a/ETS-WS/ETS-WS/WebUserControls/mod_pathAndDocs.ascx.cs +++ b/ETS-WS/ETS-WS/WebUserControls/mod_pathAndDocs.ascx.cs @@ -59,5 +59,17 @@ namespace ETS_WS.WebUserControls eh_reqSalva(this, new EventArgs()); } } + /// + /// richiede salvataggio del protocollo, tramite + /// - salvataggio + /// - spostamento "dummy file" + /// - enter in modalità editing + /// + /// + /// + protected void btnStaccaProto_Click(object sender, EventArgs e) + { + + } } } \ No newline at end of file diff --git a/ETS-WS/ETS-WS/WebUserControls/mod_pathAndDocs.ascx.designer.cs b/ETS-WS/ETS-WS/WebUserControls/mod_pathAndDocs.ascx.designer.cs index f429758..ac87103 100644 --- a/ETS-WS/ETS-WS/WebUserControls/mod_pathAndDocs.ascx.designer.cs +++ b/ETS-WS/ETS-WS/WebUserControls/mod_pathAndDocs.ascx.designer.cs @@ -56,5 +56,41 @@ namespace ETS_WS.WebUserControls { /// To modify move field declaration from designer file to code-behind file. /// protected global::System.Web.UI.WebControls.Button btnSubmit; + + /// + /// btnStaccaProto control. + /// + /// + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. + /// + protected global::System.Web.UI.WebControls.Button btnStaccaProto; + + /// + /// btnGenLettera control. + /// + /// + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. + /// + protected global::System.Web.UI.WebControls.Button btnGenLettera; + + /// + /// btnGenFax control. + /// + /// + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. + /// + protected global::System.Web.UI.WebControls.Button btnGenFax; + + /// + /// btnGenMail control. + /// + /// + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. + /// + protected global::System.Web.UI.WebControls.Button btnGenMail; } } diff --git a/ETS-WS/ETS-WS/bin/ETS-WS.dll b/ETS-WS/ETS-WS/bin/ETS-WS.dll index abeebca..34f9ffa 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 bae6be6..b6abb74 100644 Binary files a/ETS-WS/ETS-WS/bin/ETS_Data.dll and b/ETS-WS/ETS-WS/bin/ETS_Data.dll differ diff --git a/ETS-WS/ETS-WS/bin/css/BuildBlocks.css b/ETS-WS/ETS-WS/bin/css/BuildBlocks.css index 6fd00f6..ff60f61 100644 --- a/ETS-WS/ETS-WS/bin/css/BuildBlocks.css +++ b/ETS-WS/ETS-WS/bin/css/BuildBlocks.css @@ -63,6 +63,22 @@ padding: 4px; padding-right: 28px; } +.btnGenProto +{ + width: 160px; +} +.btnGenDoc +{ + width: 160px; +} +.btnGenFax +{ + width: 160px; +} +.btnGenMail +{ + width: 160px; +} /* end buttons! */ /* zona menù top */ diff --git a/ETS-WS/ETS-WS/css/BuildBlocks.css b/ETS-WS/ETS-WS/css/BuildBlocks.css index 6fd00f6..ff60f61 100644 --- a/ETS-WS/ETS-WS/css/BuildBlocks.css +++ b/ETS-WS/ETS-WS/css/BuildBlocks.css @@ -63,6 +63,22 @@ padding: 4px; padding-right: 28px; } +.btnGenProto +{ + width: 160px; +} +.btnGenDoc +{ + width: 160px; +} +.btnGenFax +{ + width: 160px; +} +.btnGenMail +{ + width: 160px; +} /* end buttons! */ /* zona menù top */