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

update 116 e 117:

Browse Source 
- fix gestione num comessa a zero
- fix errore num max caratteri
This commit is contained in:
samuele
2013-01-07 17:02:29 +01:00
parent 24e0a050e5
commit b53e48e896
34 changed files with 47 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files
ETS-WS/ETS-WS/ETS-WS.csproj
+3
View File
@@ -206,6 +206,9 @@
</Content>
<Content Include="Default.aspx" />
<Content Include="demoUpload.aspx" />
<Content Include="images\link-break_l.png" />
<Content Include="images\link-break_m.png" />
<Content Include="images\link-break_s.png" />
<Content Include="TempUploads\empty\PlaceHolder.file" />
<Content Include="ArchivioDocsRed\PlaceHolder.file" />
<Content Include="ArchivioDocs\PlaceHolder.file" />
ETS-WS/ETS-WS/Web.config
+3 -3
View File
@@ -30,7 +30,7 @@
<add key="appName" value="ETS-WS" />
<add key="SiteName" value="ETS" />
<add key="mainRev" value="1.0" />
<add key="minRev" value="115" />
<add key="minRev" value="117" />
<add key="copyRight" value="SteamWare, ETS © 2012-2013" />
<add key="tempUplDir" value="~/TempUploads" />
<add key="archiveDir" value="~/ArchivioDocs" />
@@ -48,11 +48,11 @@
<!--gestione modalità update richiesta-->
<add key="instantUpdate" value="true" />
<!--area conf dataset classi esterne-->
<add key="ETS_WSConnectionString" value="Data Source=10.74.82.217\SQL2008R2;Initial Catalog=ETS_WS;Persist Security Info=True;User ID=sa;Password=keyhammer" />
<add key="ETS_WSConnectionString" value="Data Source=10.74.82.217\SQL2008R2;Initial Catalog=ETS_WS_prod;Persist Security Info=True;User ID=sa;Password=keyhammer" />
<add key="ETS_AnagraficaConnectionString" value="Data Source=10.74.82.217\SQL2008R2;Initial Catalog=ETS_Anagrafica;Persist Security Info=True;User ID=sa;Password=keyhammer" />
</appSettings>
<connectionStrings>
<add name="ETS_Data.Properties.Settings.ETS_WSConnectionString" connectionString="Data Source=10.74.82.217\SQL2008R2;Initial Catalog=ETS_WS;Persist Security Info=True;User ID=sa;Password=keyhammer" providerName="System.Data.SqlClient" />
<add name="ETS_Data.Properties.Settings.ETS_WSConnectionString" connectionString="Data Source=10.74.82.217\SQL2008R2;Initial Catalog=ETS_WS_prod;Persist Security Info=True;User ID=sa;Password=keyhammer" providerName="System.Data.SqlClient" />
<add name="ETS_Data.Properties.Settings.ETS_AnagraficaConnectionString" connectionString="Data Source=10.74.82.217\SQL2008R2;Initial Catalog=ETS_Anagrafica;Persist Security Info=True;User ID=sa;Password=keyhammer" providerName="System.Data.SqlClient" />
</connectionStrings>
<runtime>
ETS-WS/ETS-WS/WebUserControls/mod_archivioDocumenti.ascx.cs
+1 -1
View File
@@ -169,7 +169,7 @@ namespace ETS_WS.WebUserControls
int lastChar = Convert.ToInt32(_lastChar);
if (answ.Length > maxChar)
{
answ = answ.Substring(0, 30) + "[...]" + answ.Substring(answ.Length - lastChar);
answ = answ.Substring(0, maxChar) + "[...]" + answ.Substring(answ.Length - lastChar);
}
return answ;
}
ETS-WS/ETS-WS/WebUserControls/mod_inputDati.ascx
+12 -5
View File
@@ -31,15 +31,15 @@
<asp:Label runat="server" ID="Label3" Text="Carica Modello" CssClass="labelInput" />
</div>
<div class="divDx">
<asp:ImageButton ID="imgDeleteTemplate" runat="server" ImageUrl="~/images/delete_m.png" ImageAlign="AbsMiddle" ToolTip="ELIMINA template metadati" onclick="imgDeleteTemplate_Click" />
<asp:DropDownList ID="dlElencoTemplate" runat="server" DataSourceID="odsTMD" DataTextField="label" DataValueField="value">
<asp:ImageButton ID="imgDeleteTemplate" runat="server" ImageUrl="~/images/delete_m.png" ImageAlign="AbsMiddle" ToolTip="ELIMINA template metadati" OnClick="imgDeleteTemplate_Click" />
<asp:DropDownList ID="dlElencoTemplate" runat="server" DataSourceID="odsTMD" DataTextField="label" DataValueField="value">
</asp:DropDownList>
<asp:ObjectDataSource ID="odsTMD" runat="server" OldValuesParameterFormatString="Original_{0}" SelectMethod="getByConditio" TypeName="ETS_Data.DS_utilsTableAdapters.v_selTMDTableAdapter">
<SelectParameters>
<asp:SessionParameter DefaultValue="" Name="conditio" SessionField="currUserId" Type="String" />
</SelectParameters>
</asp:ObjectDataSource>
<asp:ImageButton ID="imgLoad" runat="server" ImageUrl="~/images/load_m.png" ImageAlign="AbsMiddle" ToolTip="Carica template metadati" onclick="imgLoad_Click" />
<asp:ImageButton ID="imgLoad" runat="server" ImageUrl="~/images/load_m.png" ImageAlign="AbsMiddle" ToolTip="Carica template metadati" OnClick="imgLoad_Click" />
</div>
</div>
</asp:Panel>
@@ -70,7 +70,14 @@
</asp:RadioButtonList>
</div>
<div class="clearDiv">
<asp:Label runat="server" ID="lblCommessa" Text="Commessa" CssClass="labelInput" /><br />
<div>
<div class="divSx">
<asp:Label runat="server" ID="lblCommessa" Text="Commessa" CssClass="labelInput" />
</div>
<div class="divDx">
<asp:ImageButton ID="imgNoLink" runat="server" ImageUrl="~/images/link-break_m.png" ImageAlign="AbsMiddle" ToolTip="Senza commessa" onclick="imgNoLink_Click" />
</div>
</div>
<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" TabIndex="3" />
</div>
<div class="clearDiv">
@@ -94,7 +101,7 @@
</div>
<div class="divDx half">
<asp:Label runat="server" ID="lblDataRic" Text="Data Ricezione" CssClass="labelInput" /><br />
&nbsp;<asp:TextBox runat="server" ID="txtDataRic" Width="6em" ToolTip="Data Ricezione" TabIndex="8" ontextchanged="txtDataRic_TextChanged" />
&nbsp;<asp:TextBox runat="server" ID="txtDataRic" Width="6em" ToolTip="Data Ricezione" TabIndex="8" OnTextChanged="txtDataRic_TextChanged" />
<asp:CalendarExtender runat="server" FirstDayOfWeek="Monday" ID="ceDataRic" TargetControlID="txtDataRic" />
</div>
</div>
ETS-WS/ETS-WS/WebUserControls/mod_inputDati.ascx.cs
+10
View File
@@ -359,5 +359,15 @@ namespace ETS_WS.WebUserControls
cblTags.Focus();
}
protected void imgNoLink_Click(object sender, ImageClickEventArgs e)
{
// inserisco commessa "empty" dell'anno
string commessa = string.Format("0000-{0}", DateTime.Now.Year);
tacCommesse.valore = commessa;
tacCommesse.label = commessa;
// aggiorno visualizzazione!
updateVisual();
}
}
}
ETS-WS/ETS-WS/WebUserControls/mod_inputDati.ascx.designer.cs
Generated
+9
View File
@@ -165,6 +165,15 @@ namespace ETS_WS.WebUserControls {
/// </remarks>
protected global::System.Web.UI.WebControls.Label lblCommessa;
/// <summary>
/// imgNoLink 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.ImageButton imgNoLink;
/// <summary>
/// tacCommesse control.
/// </summary>
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.
ETS-WS/ETS-WS/images/Logo_ETS.png
BIN
View File
Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 16 KiB

ETS-WS/ETS-WS/images/arrow_d.png
BIN
View File
Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 1.2 KiB

ETS-WS/ETS-WS/images/arrow_d_h.png
BIN
View File
Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 1.2 KiB

ETS-WS/ETS-WS/images/arrow_r.png
BIN
View File
Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 1.2 KiB

ETS-WS/ETS-WS/images/arrow_r_h.png
BIN
View File
Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 1.2 KiB

ETS-WS/ETS-WS/images/link-break_l.png
BIN
View File
Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 1.7 KiB

ETS-WS/ETS-WS/images/link-break_m.png
BIN
View File
Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 1.5 KiB

ETS-WS/ETS-WS/images/link-break_s.png
BIN
View File
Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 804 B

ETS-WS/ETS-WS/obj/ETS/CSAutoParameterize/original/Web.config
+1 -1
View File
@@ -30,7 +30,7 @@
<add key="appName" value="ETS-WS" />
<add key="SiteName" value="ETS" />
<add key="mainRev" value="1.0" />
<add key="minRev" value="115" />
<add key="minRev" value="117" />
<add key="copyRight" value="SteamWare, ETS © 2012-2013" />
<add key="tempUplDir" value="~/TempUploads" />
<add key="archiveDir" value="~/ArchivioDocs" />
ETS-WS/ETS-WS/obj/ETS/CSAutoParameterize/transformed/Web.config
+1 -1
View File
@@ -30,7 +30,7 @@
<add key="appName" value="ETS-WS" />
<add key="SiteName" value="ETS" />
<add key="mainRev" value="1.0" />
<add key="minRev" value="115" />
<add key="minRev" value="117" />
<add key="copyRight" value="SteamWare, ETS © 2012-2013" />
<add key="tempUplDir" value="~/TempUploads" />
<add key="archiveDir" value="~/ArchivioDocs" />
ETS-WS/ETS-WS/obj/ETS/DesignTimeResolveAssemblyReferencesInput.cache
BIN
View File
Binary file not shown.
ETS-WS/ETS-WS/obj/ETS/ETS-WS.csprojResolveAssemblyReference.cache
BIN
View File
Binary file not shown.
ETS-WS/ETS-WS/obj/ETS/ETS-WS.dll
BIN
View File
Binary file not shown.
ETS-WS/ETS-WS/obj/ETS/Package/ETS-WS.zip
BIN
View File
Binary file not shown.
ETS-WS/ETS-WS/obj/ETS/TransformWebConfig/original/Web.config
+3 -3
View File
@@ -30,7 +30,7 @@
<add key="appName" value="ETS-WS" />
<add key="SiteName" value="ETS" />
<add key="mainRev" value="1.0" />
<add key="minRev" value="115" />
<add key="minRev" value="117" />
<add key="copyRight" value="SteamWare, ETS © 2012-2013" />
<add key="tempUplDir" value="~/TempUploads" />
<add key="archiveDir" value="~/ArchivioDocs" />
@@ -48,11 +48,11 @@
<!--gestione modalità update richiesta-->
<add key="instantUpdate" value="true" />
<!--area conf dataset classi esterne-->
<add key="ETS_WSConnectionString" value="Data Source=10.74.82.217\SQL2008R2;Initial Catalog=ETS_WS;Persist Security Info=True;User ID=sa;Password=keyhammer" />
<add key="ETS_WSConnectionString" value="Data Source=10.74.82.217\SQL2008R2;Initial Catalog=ETS_WS_prod;Persist Security Info=True;User ID=sa;Password=keyhammer" />
<add key="ETS_AnagraficaConnectionString" value="Data Source=10.74.82.217\SQL2008R2;Initial Catalog=ETS_Anagrafica;Persist Security Info=True;User ID=sa;Password=keyhammer" />
</appSettings>
<connectionStrings>
<add name="ETS_Data.Properties.Settings.ETS_WSConnectionString" connectionString="Data Source=10.74.82.217\SQL2008R2;Initial Catalog=ETS_WS;Persist Security Info=True;User ID=sa;Password=keyhammer" providerName="System.Data.SqlClient" />
<add name="ETS_Data.Properties.Settings.ETS_WSConnectionString" connectionString="Data Source=10.74.82.217\SQL2008R2;Initial Catalog=ETS_WS_prod;Persist Security Info=True;User ID=sa;Password=keyhammer" providerName="System.Data.SqlClient" />
<add name="ETS_Data.Properties.Settings.ETS_AnagraficaConnectionString" connectionString="Data Source=10.74.82.217\SQL2008R2;Initial Catalog=ETS_Anagrafica;Persist Security Info=True;User ID=sa;Password=keyhammer" providerName="System.Data.SqlClient" />
</connectionStrings>
<runtime>
ETS-WS/ETS-WS/obj/ETS/TransformWebConfig/transformed/Web.config
+1 -1
View File
@@ -30,7 +30,7 @@
<add key="appName" value="ETS-WS" />
<add key="SiteName" value="ETS" />
<add key="mainRev" value="1.0" />
<add key="minRev" value="115" />
<add key="minRev" value="117" />
<add key="copyRight" value="SteamWare, ETS © 2012-2013" />
<add key="tempUplDir" value="~/TempUploads" />
<add key="archiveDir" value="~/ArchivioDocs" />
ETS_Data/Properties/Settings.Designer.cs
Generated
+3 -3
View File
@@ -1,7 +1,7 @@
//------------------------------------------------------------------------------
// <auto-generated>
// This code was generated by a tool.
// Runtime Version:4.0.30319.17626
// Runtime Version:4.0.30319.17929
//
// Changes to this file may cause incorrect behavior and will be lost if
// the code is regenerated.
@@ -26,8 +26,8 @@ namespace ETS_Data.Properties {
[global::System.Configuration.ApplicationScopedSettingAttribute()]
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
[global::System.Configuration.SpecialSettingAttribute(global::System.Configuration.SpecialSetting.ConnectionString)]
[global::System.Configuration.DefaultSettingValueAttribute("Data Source=10.74.82.217\\SQL2008R2;Initial Catalog=ETS_WS;Persist Security Info=T" +
"rue;User ID=sa;Password=keyhammer")]
[global::System.Configuration.DefaultSettingValueAttribute("Data Source=10.74.82.217\\SQL2008R2;Initial Catalog=ETS_WS-prod;Persist Security I" +
"nfo=True;User ID=sa;Password=keyhammer")]
public string ETS_WSConnectionString {
get {
return ((string)(this["ETS_WSConnectionString"]));
ETS_Data/bin/ETS/ETS_Data.dll
BIN
View File
Binary file not shown.
ETS_Data/obj/Debug/ETS_Data.dll
BIN
View File
Binary file not shown.
ETS_Data/obj/Debug/TempPE/DS_Anagrafica.Designer.cs.dll
BIN
View File
Binary file not shown.
ETS_Data/obj/Debug/TempPE/DS_WebScip.Designer.cs.dll
BIN
View File
Binary file not shown.
ETS_Data/obj/Debug/TempPE/DS_utils.Designer.cs.dll
BIN
View File
Binary file not shown.
ETS_Data/obj/ETS/ETS_Data.dll
BIN
View File
Binary file not shown.
ETS_Data/obj/ETS/TempPE/DS_Anagrafica.Designer.cs.dll
BIN
View File
Binary file not shown.
ETS_Data/obj/ETS/TempPE/DS_WebScip.Designer.cs.dll
BIN
View File
Binary file not shown.
ETS_Data/obj/ETS/TempPE/DS_utils.Designer.cs.dll
BIN
View File
Binary file not shown.