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

altri update x lingua EN by default

Browse Source 
fix margin report: non scaricabile (x evitare sorprese...)
This commit is contained in:
Samuele E. Locatelli
2014-06-06 19:44:33 +02:00
parent 224fa152a3
commit 2c7f0c13d6
23 changed files with 49 additions and 74 deletions
Download Patch File Download Diff File Expand all files Collapse all files
C2P/C2P.csproj
+1 -1
View File
@@ -280,7 +280,7 @@
<Content Include="RevisionHistory.aspx" />
<Content Include="Scripts\bootstrap.js" />
<Content Include="Scripts\bootstrap.min.js" />
<Content Include="Reports\MarginReport.xlsx" />
<Content Include="Reports\0MarginReport123456789.xlsx" />
<None Include="Scripts\jquery-2.1.1.intellisense.js" />
<Content Include="Scripts\jquery-2.1.1.js" />
<Content Include="Scripts\jquery-2.1.1.min.js" />
C2P/Content/bootstrap-theme.css
Vendored
+2 -2
View File
@@ -300,8 +300,8 @@
box-shadow: 0 1px 2px rgba(0, 0, 0, .05);
}
.panel-default > .panel-heading {
background-image: -webkit-linear-gradient(top, #f5f5f5 0%, #e8e8e8 100%);
background-image: linear-gradient(to bottom, #f5f5f5 0%, #e8e8e8 100%);
background-image: -webkit-linear-gradient(top, #efefef 0%, #dcdcdc 100%);
background-image: linear-gradient(to bottom, #efefef 0%, #dcdcdc 100%);
filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#fff5f5f5', endColorstr='#ffe8e8e8', GradientType=0);
background-repeat: repeat-x;
}
C2P/Content/bootstrap-theme.min.css
Vendored
+1 -7
View File
File diff suppressed because one or more lines are too long
C2P/Content/bootstrap.min.css
Vendored
+1 -5
View File
File diff suppressed because one or more lines are too long
C2P/Reports/MarginReport.xlsx → C2P/Reports/0MarginReport123456789.xlsx
View File
C2P/Simulation.aspx
+7 -4
View File
@@ -6,7 +6,10 @@
</asp:Content>
<asp:Content ID="Content3" ContentPlaceHolderID="MainContent" runat="server">
<div class="row">
<div class="col-xs-4">
<div class="col-xs-12 text-center">
<h1>ADD-ON NOT INSTALLED</h1>
</div>
<%-- <div class="col-xs-4">
<div class="panel panel-default">
<div class="panel-heading">
<h3 class="panel-title">Nuova simulazione (click x dettaglio)</h3>
@@ -36,8 +39,8 @@
</div>
</div>
</div>
</div>
<p>
<div class="col-xs-12">
<img alt="Work In Progress" class="auto-style1" src="Images/WorkInProgress.jpg" />
</p>
</div>--%>
</div>
</asp:Content>
C2P/Simulation.aspx.designer.cs
Generated
-27
View File
@@ -11,32 +11,5 @@ namespace C2P {
public partial class Simulation {
/// <summary>
/// HyperLink1 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.HyperLink HyperLink1;
/// <summary>
/// HyperLink2 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.HyperLink HyperLink2;
/// <summary>
/// HyperLink3 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.HyperLink HyperLink3;
}
}
C2P/WebUserControls/mod_autocomplete.ascx
+1 -1
View File
@@ -56,7 +56,7 @@
<%--controlli "principali"--%>
<div class="input-group input-group-sm">
<span class="input-group-addon text-left" style="text-align:left;">
<asp:Label runat="server" ID="lblField" Text="Cerca:" />
<asp:Label runat="server" ID="lblField"><%: traduci("Search") %></asp:Label>
<asp:Button runat="server" ID="btnPost" OnClick="btnPost_Click" Visible="false" Text="+" />
</span>
<asp:TextBox runat="server" ID="txtSel" CssClass="searchinput form-control" OnTextChanged="txtSel_TextChanged" AutoPostBack="True" TextMode="SingleLine" AutoCompleteType="Search" />
C2P/WebUserControls/mod_marginReport.ascx
+7 -3
View File
@@ -75,9 +75,13 @@
</div>
<div runat="server" id="divAnalisys">
<h3>Step 3</h3>
<div class="shortcuts">
<asp:HyperLink runat="server" ID="HyperLink2" class="shortcut" NavigateUrl="~/Reports/MarginReport.xlsx">
<i class="fa fa-file-excel-o shortcut-icon"></i> <span class="shortcut-label"><%: traduci("MarginReport") %></span>
<div class="col-xs-12 text-center">
<asp:HyperLink runat="server" ID="HyperLink2" class="btn btn-success btn-lg" NavigateUrl="~/Reports/MarginReport.xlsx">
<i class="fa fa-file-excel-o fa-3x"></i>
<div style="margin-top:0.5em;">
<%: traduci("MarginReport") %>
</div>
</asp:HyperLink>
</div>
</div>
C2P/WebUserControls/mod_selPeriodo.ascx
+8 -8
View File
@@ -37,14 +37,14 @@
<div class="input-group input-group-sm">
<div class="input-group-btn">
<asp:DropDownList ID="ddlSelPeriodo" runat="server" AutoPostBack="True" OnSelectedIndexChanged="ddlSelPeriodo_SelectedIndexChanged" CssClass="btn btn-default dropdown-toggle" Font-Size="X-Small">
<asp:ListItem Value="1" Selected="True">selezione</asp:ListItem>
<asp:ListItem Value="2">oggi</asp:ListItem>
<asp:ListItem Value="3">ieri</asp:ListItem>
<asp:ListItem>questa sett.</asp:ListItem>
<asp:ListItem>ultimi 7gg</asp:ListItem>
<asp:ListItem>questo mese</asp:ListItem>
<asp:ListItem>ultimi 30gg</asp:ListItem>
<asp:ListItem>1 anno</asp:ListItem>
<asp:ListItem Value="1" Selected="True">Select</asp:ListItem>
<asp:ListItem Value="2">today</asp:ListItem>
<asp:ListItem Value="3">yesterday</asp:ListItem>
<asp:ListItem Value="4">this week.</asp:ListItem>
<asp:ListItem Value="5">last 7 days</asp:ListItem>
<asp:ListItem Value="6">this month</asp:ListItem>
<asp:ListItem Value="7">last 30 days</asp:ListItem>
<asp:ListItem Value="8">1 year</asp:ListItem>
</asp:DropDownList>
</div>
<asp:TextBox ID="txtInizio" TabIndex="1" runat="server" MaxLength="10" AutoPostBack="True" OnTextChanged="txtInizio_TextChanged" CssClass="datepicker form-control" />
C2P/WebUserControls/mod_selPeriodo.ascx.cs
+8 -8
View File
@@ -82,19 +82,19 @@ namespace C2P.WebUserControls
case "3": // ieri
_intervallo = _datario.giornata(DateTime.Now.AddDays(-1));
break;
case "ultimi 7gg":
_intervallo = _datario.ultimiGiorni(DateTime.Now, 7);
break;
case "questa settimana":
case "4":
_intervallo = _datario.questaSett(DateTime.Now);
break;
case "ultimi 30gg":
_intervallo = _datario.ultimiGiorni(DateTime.Now, 30);
case "5":
_intervallo = _datario.ultimiGiorni(DateTime.Now, 7);
break;
case "questo mese":
case "6":
_intervallo = _datario.questoMese(DateTime.Now);
break;
case "1 anno":
case "7":
_intervallo = _datario.ultimiGiorni(DateTime.Now, 30);
break;
case "8":
_intervallo = _datario.ultimiGiorni(DateTime.Now, 366);
break;
default:
C2P/WebUserControls/mod_testata.ascx
+4 -4
View File
@@ -85,12 +85,12 @@
</a>
<ul class="dropdown-menu">
<li><a href="Settings">Settings</a></li>
<li class="divider"></li>
<%--<li><a href="Settings">Settings</a></li>
<li class="divider"></li>--%>
<li><a href="Vocabolario">Gestione Voc</a></li>
<li><a href="UpdateVoc">Update Voc</a></li>
<li class="divider"></li>
<li><a href="javascript:;">My Profile</a></li>
<%--<li class="divider"></li>
<li><a href="javascript:;">My Profile</a></li>--%>
</ul>
</li>
</ul>
C2P/bin/C2P.dll
BIN
View File
Binary file not shown.
C2P/bin/C2P_Data.dll
BIN
View File
Binary file not shown.
C2P/bin/SteamWare.dll
BIN
View File
Binary file not shown.
C2P_Data/bin/Release/C2P_Data.dll
BIN
View File
Binary file not shown.
C2P_Data/bin/Release/SteamWare.dll
BIN
View File
Binary file not shown.
C2P_Report/bin/C2P_Data.dll
BIN
View File
Binary file not shown.
C2P_Report/bin/C2P_Report.dll
BIN
View File
Binary file not shown.
C2P_Report/bin/SteamWare.dll
BIN
View File
Binary file not shown.
C2P_Report/bin/SteamWare.xml
+5
View File
@@ -3203,6 +3203,11 @@
<param name="lemma"></param>
<returns></returns>
</member>
<member name="P:SteamWare.UserControl.forceUppercase">
<summary>
indica se i caratteri vadano forzati a maiuscoli
</summary>
</member>
<member name="T:SteamWare.user_std">
<summary>
classe gestione utente: auth e permission/ruoli - versione GENERICA
VersGen/C2P.cs
+2 -2
View File
@@ -5,7 +5,7 @@
using System.Reflection;
[assembly: AssemblyVersion("0.8.89.179")]
[assembly: AssemblyFileVersion("0.8.89.179")]
[assembly: AssemblyVersion("0.8.90.187")]
[assembly: AssemblyFileVersion("0.8.90.187")]
[assembly: AssemblyCopyright("Proxima & Steamware © 2013-2014")]
[assembly: AssemblyCompany("Steamware")]
VersGen/C2P.tt
+2 -2
View File
@@ -6,8 +6,8 @@
using System.Reflection;
[assembly: AssemblyVersion("0.8.89.<#= this.RevisionNumber #>")]
[assembly: AssemblyFileVersion("0.8.89.<#= this.RevisionNumber #>")]
[assembly: AssemblyVersion("0.8.90.<#= this.RevisionNumber #>")]
[assembly: AssemblyFileVersion("0.8.90.<#= this.RevisionNumber #>")]
[assembly: AssemblyCopyright("Proxima & Steamware © 2013-<#= DateTime.Now.Year #>")]
[assembly: AssemblyCompany("Steamware")]
<#+