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

update con fix grafico tab riepilogo (x fatture e documenti)

Browse Source
This commit is contained in:
Samuele Locatelli
2013-10-08 18:58:08 +02:00
parent 9532e80ae4
commit 7e28704b56
9 changed files with 46 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
PROJ-ETS/PROJ-ETS/Web.config
+1 -1
View File
@@ -26,7 +26,7 @@
<add key="appName" value="PROJ-ETS" />
<add key="SiteName" value="ETS" />
<add key="mainRev" value="1.0" />
<add key="minRev" value="227" />
<add key="minRev" value="228" />
<add key="stdEmail" value="info@steamware.net" />
<add key="_safePages" value="Default.aspx#unauthorized.aspx#forceUser.aspx#login.aspx#test.aspx#Test.aspx" />
<!--area gestione auth cookie-->
PROJ-ETS/PROJ-ETS/WebUserControls/mod_elencoDoc.ascx
+2 -2
View File
@@ -18,7 +18,7 @@
</div>
<div class="clearDiv">
<div class="divSx">
<asp:Label ID="Label8" runat="server" Text='<%# Eval("Oggetto") %>' />
<asp:Label ID="Label8" runat="server" Text='<%# shorten(Eval("Oggetto"),40) %>' ToolTip='<%# Eval("Oggetto") %>' />
</div>
<%--<div class="divDx">
<asp:Label ID="Label9" runat="server" Text='<%# Eval("Fonte","{0:#,##0.00} €") %>' Font-Bold="true" />
@@ -29,7 +29,7 @@
<asp:Label ID="Label2" runat="server" Text='<%# Eval("InOut") %>' ForeColor="Black" />
</div>
<div class="divDx">
<asp:Label ID="Label5" runat="server" Text='<%# Eval("Fonte") %>' ForeColor="#9a9a9a" />
<asp:Label ID="Label5" runat="server" Text='<%# shorten(Eval("Fonte"),40) %>' ToolTip='<%# Eval("Fonte") %>' ForeColor="#9a9a9a" />
</div>
</div>
</asp:HyperLink>
PROJ-ETS/PROJ-ETS/WebUserControls/mod_elencoDoc.ascx.cs
+16
View File
@@ -55,5 +55,21 @@ namespace PROJ_ETS.WebUserControls
string answ = string.Format(@"{0}/{1}?{2}={3}-{4}", urlEtsDip, urlPage, param, numero,anno);
return answ;
}
/// <summary>
/// accorcia stringa...
/// </summary>
/// <param name="origText"></param>
/// <param name="maxLenght"></param>
/// <returns></returns>
public string shorten(object origText, object maxLenght)
{
string answ = origText.ToString();
int maxLen = Convert.ToInt32(maxLenght);
if (answ.Length > maxLen)
{
answ = answ.Substring(0, maxLen - 3) + "...";
}
return answ;
}
}
}
PROJ-ETS/PROJ-ETS/WebUserControls/mod_fattETS.ascx
+5 -4
View File
@@ -5,7 +5,7 @@
<Columns>
<asp:TemplateField HeaderText="Cronologico" SortExpression="DataFatt">
<ItemTemplate>
<div>
<div style="font-size:8pt;">
<div class="divSx">
<asp:Label ID="Label6" runat="server" Text='<%# Eval("Tipologia") %>' Font-Bold="true" />
</div>
@@ -13,7 +13,7 @@
<asp:Label ID="Label7" runat="server" Text='<%# Eval("NrFatt", "n.{0}") %>' />
</div>
</div>
<div class="clearDiv">
<div class="clearDiv" style="font-size:8pt;">
<div class="divSx">
<asp:Label ID="Label8" runat="server" Text='<%# Eval("DataFatt", "{0:yyyy/MM/dd}") %>' />
</div>
@@ -21,14 +21,15 @@
<asp:Label ID="Label9" runat="server" Text='<%# Eval("Importo","{0:#,##0.00} €") %>' Font-Bold="true" />
</div>
</div>
<div class="clearDiv">
<div class="clearDiv" style="font-size:7pt;">
<div class="divSx">
<asp:Label ID="Label5" runat="server" Text='<%# Eval("Dest") %>' ForeColor="#9a9a9a" />
<asp:Label ID="Label5" runat="server" Text='<%# shorten(Eval("Dest"),35) %>' ForeColor="#9a9a9a" ToolTip='<%# Eval("Dest") %>' />
</div>
<div class="divDx">
<asp:Label ID="Label4" runat="server" Text='<%# Eval("Emitt","({0})") %>' ForeColor="#9a9a9a" />
</div>
</div>
<div class="clearDiv"></div>
</ItemTemplate>
</asp:TemplateField>
</Columns>
PROJ-ETS/PROJ-ETS/WebUserControls/mod_fattETS.ascx.cs
+16
View File
@@ -35,5 +35,21 @@ namespace PROJ_ETS.WebUserControls
AnnoComm.Text = value;
}
}
/// <summary>
/// accorcia stringa...
/// </summary>
/// <param name="origText"></param>
/// <param name="maxLenght"></param>
/// <returns></returns>
public string shorten(object origText, object maxLenght)
{
string answ = origText.ToString();
int maxLen = Convert.ToInt32(maxLenght);
if (answ.Length > maxLen)
{
answ = answ.Substring(0, maxLen-3) + "...";
}
return answ;
}
}
}
PROJ-ETS/PROJ-ETS/WebUserControls/mod_riepilogo.ascx
+6 -5
View File
@@ -1,7 +1,7 @@
<%@ Control Language="C#" AutoEventWireup="true" CodeBehind="mod_riepilogo.ascx.cs" Inherits="PROJ_ETS.WebUserControls.mod_riepilogo" %>
<%@ Register Src="mod_fattETS.ascx" TagName="mod_fattETS" TagPrefix="uc1" %>
<%@ Register Src="~/WebUserControls/mod_elencoDoc.ascx" TagPrefix="uc1" TagName="mod_elencoDoc" %>
<%@ Register Src="mod_elencoDoc.ascx" TagPrefix="uc2" TagName="mod_elencoDoc" %>
<asp:FormView ID="frmView" runat="server" DataSourceID="ods">
@@ -57,7 +57,7 @@
</div>
</div>
</div>
<div class="divSx" style="min-width: 250px; padding: 0px 2px; border-right: 1px solid #CDCDCD; min-height: 250px; height: 100%;">
<div class="divSx" style="width: 350px; padding: 0px 2px; border-right: 1px solid #CDCDCD; min-height: 250px; height: 100%;">
<div class="clearDiv padStd" style="height: 25px;">
<div class="divSx">
<asp:Label ID="lblFatturatoLabel" runat="server" Text="Fatturato" AssociatedControlID="FatturatoLabel" />
@@ -66,18 +66,19 @@
<asp:Label ID="FatturatoLabel" runat="server" Text='<%# Eval("Fatturato","{0:#,##0.00} €") %>' Font-Bold="true" CssClass="fontStd textNero" />
</div>
</div>
<div class="clearDiv padStd" style="height: 225px; border-top: 1px dotted #CDCDCD; font-size: 8pt;">
<div class="clearDiv padStd" style="height: 225px; border-top: 1px dotted #CDCDCD;">
<uc1:mod_fattETS ID="mod_fattETS1" runat="server" NumeroCommessa='<%# Eval("NumeroCommessa") %>' AnnoCommessa='<%# Eval("AnnoCommessa") %>' />
<div class="clearDiv"></div>
</div>
</div>
<div class="divSx" style="min-width: 400px; padding: 0px 2px; border-right: 1px solid #CDCDCD; min-height: 250px; height: 100%;">
<div class="divSx" style="width: 450px; padding: 0px 2px; border-right: 1px solid #CDCDCD; min-height: 250px; height: 100%;">
<div class="clearDiv padStd" style="height: 25px;">
<div class="divDx">
<asp:Label ID="lblDocumenti" runat="server" Text="Documenti" Font-Bold="true" />
</div>
</div>
<div class="clearDiv padStd" style="height: 50px; border-top: 1px dotted #CDCDCD; font-size: 8pt;">
<uc1:mod_elencoDoc runat="server" ID="mod_elencoDoc" NumeroCommessa='<%# Eval("NumeroCommessa") %>' AnnoCommessa='<%# Eval("AnnoCommessa") %>' />
<uc2:mod_elencoDoc runat="server" ID="mod_elencoDoc" NumeroCommessa='<%# Eval("NumeroCommessa") %>' AnnoCommessa='<%# Eval("AnnoCommessa") %>' />
</div>
</div>
<div class="divSx" style="min-width: 250px; padding: 0px 2px; min-height: 250px; height: 100%;">
PROJ-ETS/PROJ-ETS/bin/ETS_Data.dll
BIN
View File
Binary file not shown.
PROJ-ETS/PROJ-ETS/bin/PROJ-ETS.dll
BIN
View File
Binary file not shown.
PROJ-ETS/ReleaseClienti/ETS/PROJ-ETS.zip
BIN
View File
Binary file not shown.