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

Incorporo modifiche da ramo develop

Browse Source
This commit is contained in:
samuele
2012-09-28 12:01:25 +02:00
parent d8ec0c7ad8 6b8e8c0cd6
commit 48b0b1665b
10 changed files with 91 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files
ETS-WS/ETS-WS/ETS-WS.csproj
+13
View File
@@ -159,6 +159,7 @@
<Content Include="demoUpload.aspx" />
<Content Include="GestioneDocumenti.aspx" />
<Content Include="Help.aspx" />
<Content Include="HelpOnLine\da help online.txt" />
<Content Include="images\AdminArea.png" />
<Content Include="images\AdminAreaTagFasi.png" />
<Content Include="images\ajax-loader.gif" />
@@ -508,6 +509,18 @@
</ItemGroup>
<ItemGroup>
<Folder Include="ArchivioDocs\" />
<Folder Include="HelpOnLine\content_style\images\" />
<Folder Include="HelpOnLine\css\" />
<Folder Include="HelpOnLine\files\" />
<Folder Include="HelpOnLine\images\browser\" />
<Folder Include="HelpOnLine\js\yahoo\" />
<Folder Include="HelpOnLine\mobs\mm_257\" />
<Folder Include="HelpOnLine\mobs\mm_258\" />
<Folder Include="HelpOnLine\mobs\mm_260\" />
<Folder Include="HelpOnLine\mobs\mm_261\" />
<Folder Include="HelpOnLine\mobs\mm_262\" />
<Folder Include="HelpOnLine\style\images\" />
<Folder Include="HelpOnLine\teximg\" />
<Folder Include="logs\" />
<Folder Include="Styles\" />
<Folder Include="TempUploads\empty\" />
ETS-WS/ETS-WS/ETS-WS.csproj.user
+3
View File
@@ -1,5 +1,8 @@
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup>
<ProjectView>ProjectFiles</ProjectView>
</PropertyGroup>
<ProjectExtensions>
<VisualStudio>
<FlavorProperties GUID="{349c5851-65df-11da-9384-00065b846f21}">
ETS-WS/ETS-WS/HelpOnLine/Prova inserimento develop.txt
View File
ETS-WS/ETS-WS/HelpOnLine/da help online.txt
View File
ETS-WS/ETS-WS/MyDocs.aspx
+28 -7
View File
@@ -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" %>
<asp:Content ID="Content1" ContentPlaceHolderID="ContentPlaceHolder1" runat="server">
<div class="clearDiv divSx" style="min-width: 320px; width: 25%; background-color: #DDFFDD;
<div class="clearDiv divSx" style="min-width: 340px; width: 28%; background-color: #DDFFDD;
min-height: 640px; height: 100%;">
<div class="divCenter" style="padding-top:4px; padding-bottom:4px;">
<ajaxToolkit:TabContainer ID="TabContainer1" runat="server"
Height="100%" AutoPostBack="true" OnSelectedIndexChanged="rblMode_SelectedIndexChanged">
<ajaxToolkit:TabPanel runat="server" HeaderText="Prova1" ID="TabPanel1">
<HeaderTemplate>Upload file</HeaderTemplate>
<ContentTemplate>
<uc1:mod_fileUpload ID="mod_fileUpload1" runat="server" />
</ContentTemplate>
</ajaxToolkit:TabPanel>
<ajaxToolkit:TabPanel runat="server" HeaderText="Prova2" ID="TabPanel2" BackColor="Red">
<HeaderTemplate>Gestione file</HeaderTemplate>
<ContentTemplate>
<uc3:mod_inputDati ID="mod_inputDati2" runat="server" />
</ContentTemplate>
</ajaxToolkit:TabPanel>
</ajaxToolkit:TabContainer>
<%-- <div class="divCenter" style="padding-top:4px; padding-bottom:4px;">
<asp:RadioButtonList ID="rblMode" runat="server" AutoPostBack="true" OnSelectedIndexChanged="rblMode_SelectedIndexChanged"
RepeatDirection="Horizontal" RepeatLayout="Flow" CssClass="radioBtn">
<asp:ListItem Value="Upload" Text="Upload File" />
<asp:ListItem Value="Cataloga" Text="Gestione File" />
</asp:RadioButtonList>
</div>
</div>--%>
<asp:Panel ID="pnlFileUpload" runat="server">
<uc1:mod_fileUpload ID="mod_fileUpload1" runat="server" />
</asp:Panel>
<asp:Panel ID="pnlInputDati" runat="server">
<uc3:mod_inputDati ID="mod_inputDati2" runat="server" />
</asp:Panel>
</div>
<div class="divSx" style="min-width: 640px; width: 75%;">
<div class="divSx" style="min-width: 640px; width: 65%;">
<div style="width: 100%" class="fontPiccolo">
<uc2:mod_myTempFile ID="mod_myTempFile1" runat="server" />
<uc2:mod_myTempFile ID="mod_myTempFile1" runat="server" />
</div>
</div>
</asp:Content>
ETS-WS/ETS-WS/MyDocs.aspx.cs
+6 -3
View File
@@ -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);
}
/// <summary>
/// richiesta salvataggio, chiamo metodo sulla gestioen files temp!
/// richiesta salvataggio, chiamo metodo sulla gestione files temp!
/// </summary>
/// <param name="sender"></param>
/// <param name="e"></param>
@@ -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;
}
ETS-WS/ETS-WS/MyDocs.aspx.designer.cs
Generated
+24 -6
View File
@@ -13,22 +13,22 @@ namespace ETS_WS {
public partial class MyDocs {
/// <summary>
/// rblMode control.
/// TabContainer1 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.RadioButtonList rblMode;
protected global::AjaxControlToolkit.TabContainer TabContainer1;
/// <summary>
/// pnlFileUpload control.
/// TabPanel1 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.Panel pnlFileUpload;
protected global::AjaxControlToolkit.TabPanel TabPanel1;
/// <summary>
/// mod_fileUpload1 control.
@@ -40,13 +40,13 @@ namespace ETS_WS {
protected global::ETS_WS.WebUserControls.mod_fileUpload mod_fileUpload1;
/// <summary>
/// pnlInputDati control.
/// TabPanel2 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.Panel pnlInputDati;
protected global::AjaxControlToolkit.TabPanel TabPanel2;
/// <summary>
/// mod_inputDati2 control.
@@ -57,6 +57,24 @@ namespace ETS_WS {
/// </remarks>
protected global::ETS_WS.WebUserControls.mod_inputDati mod_inputDati2;
/// <summary>
/// pnlFileUpload 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.Panel pnlFileUpload;
/// <summary>
/// pnlInputDati 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.Panel pnlInputDati;
/// <summary>
/// mod_myTempFile1 control.
/// </summary>
ETS-WS/ETS-WS/WebUserControls/mod_inputDati.ascx
+17 -15
View File
@@ -43,44 +43,44 @@
<div class="clearDiv">
<asp:Label runat="server" ID="lblCommessa" Text="Commessa (autocomplete)" CssClass="labelInput" /><br />
<uc1:mod_textAutocomplete ID="tacCommesse" runat="server" ServicePath="~/WS/AutoCompletamento.asmx"
ServiceMethod="elencoCommesse" minCharAutocomplete="2" showKey="false" toolTip="Digitare per iniziare ricerca, min 2 char" />
ServiceMethod="elencoCommesse" minCharAutocomplete="2" showKey="false" toolTip="Digitare per iniziare ricerca, min 2 char" tabIndex="1" />
</div>
<div class="clearDiv">
<asp:Label runat="server" ID="lblFase" Text="Fase (autocomplete)" CssClass="labelInput" /><br />
<uc1:mod_textAutocomplete ID="tacFasi" runat="server" ServicePath="~/WS/AutoCompletamento.asmx"
ServiceMethod="elencoFasi" minCharAutocomplete="1" showKey="false" toolTip="Digitare per iniziare ricerca, min 1 char" />
ServiceMethod="elencoFasi" minCharAutocomplete="1" showKey="false" toolTip="Digitare per iniziare ricerca, min 1 char" tabIndex="2"/>
</div>
<div class="clearDiv">
<asp:Label runat="server" ID="lblFonte" Text="Fonte (autocomplete)" CssClass="labelInput"
TabIndex="0" />
<br />
<uc1:mod_textAutocomplete ID="tacFonti" runat="server" ServicePath="~/WS/AutoCompletamento.asmx"
ServiceMethod="elencoFonti" minCharAutocomplete="3" showKey="false" toolTip="Digitare per iniziare ricerca, min 3 char" />
ServiceMethod="elencoFonti" minCharAutocomplete="3" showKey="false" toolTip="Digitare per iniziare ricerca, min 3 char" tabIndex="3" />
</div>
<div class="clearDiv">
<asp:Label runat="server" ID="lblOggetto" Text="Oggetto" CssClass="labelInput" /><br />
&nbsp;<asp:TextBox runat="server" ID="txtOggetto" Width="20em" ToolTip="Campo libero"
OnTextChanged="txtOggetto_TextChanged" />
OnTextChanged="txtOggetto_TextChanged" TabIndex="4"/>
</div>
<div class="clearDiv">
<asp:Label runat="server" ID="lblAutore" Text="Autore (autocomplete)" CssClass="labelInput" /><br />
<uc1:mod_textAutocomplete ID="tacAutore" runat="server" ServicePath="~/WS/AutoCompletamento.asmx"
ServiceMethod="elencoAutori" minCharAutocomplete="1" showKey="false" toolTip="Digitare per iniziare ricerca, min 1 char" />
ServiceMethod="elencoAutori" minCharAutocomplete="1" showKey="false" toolTip="Digitare per iniziare ricerca, min 1 char" tabIndex="5"/>
</div>
<div class="clearDiv">
<asp:Label runat="server" ID="lblRedattore" Text="Redattore (autocomplete)" CssClass="labelInput" /><br />
<uc1:mod_textAutocomplete ID="tacRedattore" runat="server" ServicePath="~/WS/AutoCompletamento.asmx"
ServiceMethod="elencoAutori" minCharAutocomplete="1" showKey="false" toolTip="Digitare per iniziare ricerca, min 1 char" />
ServiceMethod="elencoAutori" minCharAutocomplete="1" showKey="false" toolTip="Digitare per iniziare ricerca, min 1 char" tabIndex="6"/>
</div>
<div class="clearDiv">
<div class="divSx">
<div class="divSxNoWidth">
<asp:Label runat="server" ID="lblDataDoc" Text="Data Documento" CssClass="labelInput" /><br />
&nbsp;<asp:TextBox runat="server" ID="txtDataDoc" Width="8em" ToolTip="Data Documento" />
&nbsp;<asp:TextBox runat="server" ID="txtDataDoc" Width="8em" ToolTip="Data Documento" tabIndex="7" />
<asp:CalendarExtender runat="server" FirstDayOfWeek="Monday" ID="ceDataDoc" TargetControlID="txtDataDoc" />
</div>
<div class="divDx">
<asp:Label runat="server" ID="lblDataRic" Text="Data Ricezione" CssClass="labelInput" /><br />
&nbsp;<asp:TextBox runat="server" ID="txtDataRic" Width="8em" ToolTip="Data Ricezione" />
&nbsp;<asp:TextBox runat="server" ID="txtDataRic" Width="8em" ToolTip="Data Ricezione" tabIndex="8" />
<asp:CalendarExtender runat="server" FirstDayOfWeek="Monday" ID="ceDataRic" TargetControlID="txtDataRic" />
</div>
</div>
@@ -89,7 +89,7 @@
padding: -2px; margin-top: 8px;">
<asp:Label runat="server" ID="Label1" Text="Etichette documento" CssClass="labelInput" /><br />
<asp:CheckBoxList ID="cblTags" runat="server" DataSourceID="odsTags" RepeatDirection="Horizontal"
DataTextField="tag" DataValueField="idxTag" RepeatLayout="Flow">
DataTextField="tag" DataValueField="idxTag" RepeatLayout="Flow" tabIndex="9" >
</asp:CheckBoxList>
<asp:ObjectDataSource ID="odsTags" runat="server" OldValuesParameterFormatString="Original_{0}"
SelectMethod="GetData" TypeName="ETS_Data.DS_WebScipTableAdapters.AnagTagsTableAdapter">
@@ -97,12 +97,14 @@
</div>
</div>
<div class="clearDiv">
<div class="divSx" style="background-color: #FF3C3C; width: 100%; color: White; vertical-align: middle;
padding: -2px;">
<asp:CheckBox runat="server" ID="chkIsRed" Text="Classificato (Red)" />
<div class="divSx" style="width: 100%; color: Red; vertical-align: middle;
padding: -2px;"><%--
<div class="divSx" style="background-color: #FF3C3C; width: 100%; color: White; vertical-align: middle;
padding: -2px;">--%>
<asp:CheckBox runat="server" ID="chkIsRed" Text="Classificato (Red)" tabIndex="10" />
</div>
</div>
<div class="clearDiv" style="background-color: #333; color: White;">
<div class="clearDiv" style="background-color: #333; color: White; margin-top: 40px;">
<asp:Label runat="server" ID="lblPath" Text="Percorso Cartella" CssClass="labelInput" /><br />
<asp:Panel runat="server" ID="pnlPath" ScrollBars="Horizontal">
<div class="divSx" style="width: 100%; padding: 2px; margin-top: 4px; margin-bottom: 4px;
@@ -119,7 +121,7 @@
<asp:Button ID="btnSubmit" runat="server" Text="Archivia" CssClass="submit" OnClick="btnSubmit_Click" />
</div>
<div class="clearDiv">
generatore:<br />
generatore::<br />
Lettera (doc) | FAX (doc) | Email
</div>
</div>
ETS-WS/ETS-WS/bin/ETS-WS.dll
BIN
View File
Binary file not shown.
ETS-WS/ETS-WS/bin/ETS_Data.dll
BIN
View File
Binary file not shown.