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

periodo analisi sistemato!

Browse Source
This commit is contained in:
Samuele Locatelli
2013-05-10 12:22:45 +02:00
parent d64090e6b1
commit 2224854ceb
16 changed files with 104 additions and 89 deletions
Download Patch File Download Diff File Expand all files Collapse all files
ETS-WS/ETS-WS/obj/ETS/build.force
View File
ETS_Data/obj/Debug/ETS_Data.dll
BIN
View File
Binary file not shown.
ETS_Data/obj/ETS/DesignTimeResolveAssemblyReferencesInput.cache
BIN
View File
Binary file not shown.
PROJ-ETS/PROJ-ETS/Progetti.aspx
+4 -4
View File
@@ -23,14 +23,14 @@
<li><a href="#tabs-5">Riepilogo Commessa</a></li>
</ul>
<div id="tabs-1">
<asp:UpdatePanel ID="upProgetti" runat="server">
<ContentTemplate>
<%-- <asp:UpdatePanel ID="upProgetti" runat="server">
<ContentTemplate>--%>
<uc1:mod_progetti ID="mod_progetti1" runat="server" />
<br />
<h1>elenco fasi:</h1>
<uc2:mod_commesse ID="mod_commesse1" runat="server" />
</ContentTemplate>
</asp:UpdatePanel>
<%--</ContentTemplate>
</asp:UpdatePanel>--%>
</div>
<div id="tabs-2">
<h1>Dati Commessa:</h1>
PROJ-ETS/PROJ-ETS/Progetti.aspx.designer.cs
Generated
-9
View File
@@ -12,15 +12,6 @@ namespace PROJ_ETS {
public partial class Progetti {
/// <summary>
/// upProgetti control.
/// </summary>
/// <remarks>
/// Auto-generated field.
/// To modify move field declaration from designer file to code-behind file.
/// </remarks>
protected global::System.Web.UI.UpdatePanel upProgetti;
/// <summary>
/// mod_progetti1 control.
/// </summary>
PROJ-ETS/PROJ-ETS/Web.config
+4
View File
@@ -36,6 +36,10 @@
<add key="srcPageSize" value="15" />
<!--update pagina-->
<add key="intUpdatePagina_ms" value="120000" />
<!--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_AnagraficaConnectionString" value="Data Source=10.74.82.217\SQL2008R2;Initial Catalog=ETS_Anagrafica;Persist Security Info=True;User ID=sa;Password=keyhammer" />
<add key="ETS_PROJConnectionString" value="Data Source=10.74.82.217\SQL2008R2;Initial Catalog=ETS-PROJ;Persist Security Info=True;User ID=sa;Password=keyhammer" />
</appSettings>
<system.web>
<compilation debug="true" targetFramework="4.5" />
PROJ-ETS/PROJ-ETS/WebMasterPages/Site.Master
+2 -2
View File
@@ -54,8 +54,8 @@
//selectOtherMonths: true,
showButtonPanel: true,
changeMonth: true,
changeYear: true,
dateFormat: "yy-mm-dd"
changeYear: true//,
//dateFormat: "yy-mm-dd"
});
//$(".datepicker").datepicker("option", "dateFormat", "yy-mm-dd");
//$(".datepicker").datepicker($.datepicker.regional['it']);
PROJ-ETS/PROJ-ETS/WebUserControls/mod_periodoAnalisi.ascx
+12 -16
View File
@@ -3,9 +3,9 @@
<tr>
<td>
<asp:Label ID="lblPeriodo" runat="server"></asp:Label>
<asp:TextBox ID="txtInizio" TabIndex="1" runat="server" Width="5em" MaxLength="10"
AutoPostBack="True" OnTextChanged="txtInizio_TextChanged" CssClass="datepicker" />
<%--<asp:DropDownList ID="ddlOraInizio" TabIndex="2" runat="server" AutoPostBack="True"
<asp:TextBox ID="txtInizio" TabIndex="1" runat="server" Width="8em" MaxLength="10"
AutoPostBack="True" OnTextChanged="txtInizio_TextChanged" CssClass="datepicker" Font-Size="Smaller" />
<asp:DropDownList ID="ddlOraInizio" TabIndex="2" runat="server" AutoPostBack="True"
OnTextChanged="txtInizio_TextChanged" Font-Size="Smaller">
<asp:ListItem>00</asp:ListItem>
<asp:ListItem>01</asp:ListItem>
@@ -31,13 +31,11 @@
<asp:ListItem>21</asp:ListItem>
<asp:ListItem>22</asp:ListItem>
<asp:ListItem>23</asp:ListItem>
</asp:DropDownList>--%>
<%--<asp:CalendarExtender ID="CalendarExtender1" runat="server" TargetControlID="txtInizio"
FirstDayOfWeek="Monday" Format="dd/MM/yyyy">
</asp:CalendarExtender>--%>
</asp:DropDownList>
&#8594;
<asp:TextBox ID="txtFine" TabIndex="3" runat="server" Width="5em" MaxLength="10" AutoPostBack="True" OnTextChanged="txtFine_TextChanged" CssClass="datepicker" />
<%--<asp:DropDownList ID="ddlOraFine" TabIndex="2" runat="server" AutoPostBack="True"
<asp:TextBox ID="txtFine" TabIndex="3" runat="server" Width="8em" MaxLength="10" AutoPostBack="True" OnTextChanged="txtFine_TextChanged" CssClass="datepicker" Font-Size="Smaller" />
<asp:DropDownList ID="ddlOraFine" TabIndex="2" runat="server" AutoPostBack="True"
OnTextChanged="txtFine_TextChanged" Font-Size="Smaller">
<asp:ListItem>00</asp:ListItem>
<asp:ListItem>01</asp:ListItem>
@@ -63,11 +61,9 @@
<asp:ListItem>21</asp:ListItem>
<asp:ListItem>22</asp:ListItem>
<asp:ListItem>23</asp:ListItem>
</asp:DropDownList>--%>
<%--<asp:CalendarExtender ID="CalendarExtender2" runat="server" TargetControlID="txtFine"
FirstDayOfWeek="Monday" Format="dd/MM/yyyy">
</asp:CalendarExtender>--%>
<%--<asp:DropDownList ID="DropDownList1" runat="server" AutoPostBack="True" OnSelectedIndexChanged="DropDownList1_SelectedIndexChanged"
</asp:DropDownList>
<asp:DropDownList ID="ddlPeriodo" runat="server" AutoPostBack="True" OnSelectedIndexChanged="ddlPeriodo_SelectedIndexChanged"
Font-Size="Smaller">
<asp:ListItem Selected="True">selezione</asp:ListItem>
<asp:ListItem>oggi</asp:ListItem>
@@ -79,9 +75,9 @@
<asp:ListItem>ultimi 30gg</asp:ListItem>
<asp:ListItem>questo anno</asp:ListItem>
<asp:ListItem>1 anno</asp:ListItem>
</asp:DropDownList>--%>
</asp:DropDownList>
&nbsp;
<%--<asp:Button ID="btnUpdate" runat="server" Text="update" Visible="false" OnClick="btnUpdate_Click" />--%>
<asp:Button ID="btnUpdate" runat="server" Text="update" Visible="false" OnClick="btnUpdate_Click" />
</td>
<td>
<asp:Label ID="lblDurataMin" runat="server" Visible="false"></asp:Label>
PROJ-ETS/PROJ-ETS/WebUserControls/mod_periodoAnalisi.ascx.cs
+37 -41
View File
@@ -4,12 +4,13 @@ using System.Linq;
using System.Web;
using System.Web.UI;
using System.Web.UI.WebControls;
using ETS_Data;
namespace PROJ_ETS.WebUserControls
{
public partial class mod_periodoAnalisi : System.Web.UI.UserControl
{
#if false
#region area protected
protected intervalloDate _intervallo;
@@ -32,20 +33,20 @@ namespace PROJ_ETS.WebUserControls
get
{
bool answ = false;
if (memLayer.ML.isInSessionObject("mostraSelOra"))
if (utils.obj.isInSessionObject("mostraSelOra"))
{
answ = memLayer.ML.BoolSessionObj("mostraSelOra");
answ = utils.obj.BoolSessionObj("mostraSelOra");
}
else
{
// leggo da sessione e salvo...
try
{
answ = memLayer.ML.confReadBool("mostraSelOra");
answ = utils.obj.confReadBool("mostraSelOra");
}
catch
{ }
memLayer.ML.setSessionVal("mostraSelOra", answ);
utils.obj.setSessionVal("mostraSelOra", answ);
}
return answ;
}
@@ -56,11 +57,11 @@ namespace PROJ_ETS.WebUserControls
/// </summary>
/// <param name="sender"></param>
/// <param name="e"></param>
protected void DropDownList1_SelectedIndexChanged(object sender, EventArgs e)
protected void ddlPeriodo_SelectedIndexChanged(object sender, EventArgs e)
{
// verifico cosa sia cambiato ed imposto date...
datario _datario = new datario();
switch (DropDownList1.SelectedValue)
switch (ddlPeriodo.SelectedValue)
{
case "oggi":
_intervallo = _datario.giornata(DateTime.Now);
@@ -150,7 +151,7 @@ namespace PROJ_ETS.WebUserControls
catch
{
_intervallo = new intervalloDate();
_intervallo.inizio = DateTime.Now.AddDays(memLayer.ML.confReadInt("defDayFrom"));
_intervallo.inizio = DateTime.Now.AddDays(utils.obj.confReadInt("defDayFrom"));
_intervallo.fine = DateTime.Now.AddDays(1);
Session["_intervallo"] = _intervallo;
Session["_inizio"] = _intervallo.inizio;
@@ -223,6 +224,30 @@ namespace PROJ_ETS.WebUserControls
aggiornaDateMostrate(false);
}
/// <summary>
/// evento cambio testo data inizio
/// </summary>
/// <param name="sender"></param>
/// <param name="e"></param>
protected void txtInizio_TextChanged(object sender, EventArgs e)
{
// imposto il selettore a discesa...
setPeriodoFree();
// mostro btn update
btnUpdate.Visible = true;
}
/// <summary>
/// evento cambio testo data fine
/// </summary>
/// <param name="sender"></param>
/// <param name="e"></param>
protected void txtFine_TextChanged(object sender, EventArgs e)
{
// imposto il selettore a discesa...
setPeriodoFree();
// mostro btn update
btnUpdate.Visible = true;
}
/// <summary>
/// in questo caso faccio udpate periodo mostrato
/// </summary>
/// <param name="sender"></param>
@@ -278,7 +303,7 @@ namespace PROJ_ETS.WebUserControls
/// </summary>
public void setPeriodoFree()
{
DropDownList1.SelectedIndex = 0;
ddlPeriodo.SelectedIndex = 0;
}
/// <summary>
/// imposta realtime update (non mostra button am fa subito update)
@@ -287,11 +312,11 @@ namespace PROJ_ETS.WebUserControls
{
get
{
return memLayer.ML.BoolSessionObj("rltUpdatePeriodo");
return utils.obj.BoolSessionObj("rltUpdatePeriodo");
}
set
{
memLayer.ML.setSessionVal("rltUpdatePeriodo", value);
utils.obj.setSessionVal("rltUpdatePeriodo", value);
}
}
@@ -302,35 +327,6 @@ namespace PROJ_ETS.WebUserControls
#endregion
#endregion
#endif
/// <summary>
/// evento cambio testo data inizio
/// </summary>
/// <param name="sender"></param>
/// <param name="e"></param>
protected void txtInizio_TextChanged(object sender, EventArgs e)
{
#if false
// imposto il selettore a discesa...
setPeriodoFree();
// mostro btn update
btnUpdate.Visible = true;
#endif
}
/// <summary>
/// evento cambio testo data fine
/// </summary>
/// <param name="sender"></param>
/// <param name="e"></param>
protected void txtFine_TextChanged(object sender, EventArgs e)
{
#if false
// imposto il selettore a discesa...
setPeriodoFree();
// mostro btn update
btnUpdate.Visible = true;
#endif
}
#endregion
}
}
PROJ-ETS/PROJ-ETS/WebUserControls/mod_periodoAnalisi.ascx.designer.cs
Generated
+36
View File
@@ -30,6 +30,15 @@ namespace PROJ_ETS.WebUserControls {
/// </remarks>
protected global::System.Web.UI.WebControls.TextBox txtInizio;
/// <summary>
/// ddlOraInizio 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.DropDownList ddlOraInizio;
/// <summary>
/// txtFine control.
/// </summary>
@@ -39,6 +48,33 @@ namespace PROJ_ETS.WebUserControls {
/// </remarks>
protected global::System.Web.UI.WebControls.TextBox txtFine;
/// <summary>
/// ddlOraFine 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.DropDownList ddlOraFine;
/// <summary>
/// ddlPeriodo 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.DropDownList ddlPeriodo;
/// <summary>
/// btnUpdate 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.Button btnUpdate;
/// <summary>
/// lblDurataMin control.
/// </summary>
PROJ-ETS/PROJ-ETS/WebUserControls/mod_progetti.ascx
+7 -6
View File
@@ -1,20 +1,21 @@
<%@ Control Language="C#" AutoEventWireup="true" CodeBehind="mod_progetti.ascx.cs" Inherits="PROJ_ETS.WebUserControls.mod_progetti" %>
<%@ Register src="mod_periodoAnalisi.ascx" tagname="mod_periodoAnalisi" tagprefix="uc1" %>
<div class="filtro_1 fontPiccolo" style="white-space: nowrap; height: 30px;">
<div class="divSx">
<uc2:mod_periodoAnalisi ID="mod_periodoAnalisi1" runat="server" realtimeUpdate="true" />
<uc1:mod_periodoanalisi ID="mod_periodoAnalisi1" runat="server" realtimeUpdate="true" />
</div>
<div class="divSx">
<asp:CheckBox ID="chkShowChiusi" runat="server" Text="Mostra Archiviati" OnCheckedChanged="chkShowChiusi_CheckedChanged"
AutoPostBack="True" />
<%--<asp:CheckBox ID="chkShowChiusi" runat="server" Text="Mostra Archiviati" OnCheckedChanged="chkShowChiusi_CheckedChanged"
AutoPostBack="True" />--%>
</div>
<div class="divSx">
<uc1:mod_filtro ID="filtroCli" runat="server" filterChekText="filtroCliente" comboWidth="180" />
<%--<uc1:mod_filtro ID="filtroCli" runat="server" filterChekText="filtroCliente" comboWidth="180" />--%>
</div>
<%--<div class="divSx">
<uc1:mod_filtro ID="filtroDip" runat="server" filterChekText="filtroDipendenti" comboWidth="180" />
</div>--%>
<div class="divSx">
<asp:CheckBox ID="chkShowVuoti" runat="server" Text="Mostra Vuoti" AutoPostBack="True"
oncheckedchanged="chkShowVuoti_CheckedChanged" Checked="true" />
<%--<asp:CheckBox ID="chkShowVuoti" runat="server" Text="Mostra Vuoti" AutoPostBack="True"
oncheckedchanged="chkShowVuoti_CheckedChanged" Checked="true" />--%>
</div>
</div>
PROJ-ETS/PROJ-ETS/WebUserControls/mod_progetti.ascx.designer.cs
Generated
+2 -11
View File
@@ -13,21 +13,12 @@ namespace PROJ_ETS.WebUserControls {
public partial class mod_progetti {
/// <summary>
/// chkShowChiusi control.
/// mod_periodoAnalisi1 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.CheckBox chkShowChiusi;
/// <summary>
/// chkShowVuoti 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.CheckBox chkShowVuoti;
protected global::PROJ_ETS.WebUserControls.mod_periodoAnalisi mod_periodoAnalisi1;
}
}
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/PROJ-ETS/obj/Debug/PROJ-ETS.csprojResolveAssemblyReference.cache
BIN
View File
Binary file not shown.
PROJ-ETS/PROJ-ETS/obj/Debug/PROJ-ETS.dll
BIN
View File
Binary file not shown.