aggiunta sel condomini x int IN CORSO

This commit is contained in:
Samuele E. Locatelli
2018-08-08 18:42:27 +02:00
parent f07d607a6e
commit 8fca00806b
5 changed files with 14 additions and 51 deletions
Vendored
+1 -1
View File
@@ -17,7 +17,7 @@ pipeline {
/* calcolo numero versione... diverso x branch MASTER/DEVELOP */
script {
withEnv(['NEXT_BUILD_NUMBER=113']) {
withEnv(['NEXT_BUILD_NUMBER=114']) {
// env.versionNumber = VersionNumber(versionNumberString : '0.9.${BUILD_DATE_FORMATTED, "yyMM"}.${BUILDS_ALL_TIME}', projectStartDate : '2006-01-01', skipFailedBuilds: true)
env.versionNumber = VersionNumber(versionNumberString : '0.9.${BUILD_DATE_FORMATTED, "yyMM"}.${BUILDS_ALL_TIME}', projectStartDate : '2006-01-01', skipFailedBuilds: true, overrideBuildsAllTime: '${NEXT_BUILD_NUMBER}')
env.APP_NAME = 'SOSCONDOMINI'
+3 -13
View File
@@ -1,23 +1,13 @@
<%@ Control Language="C#" AutoEventWireup="true" CodeBehind="mod_ER_inCorso.ascx.cs" Inherits="PUB.WebUserContols.mod_ER_inCorso" %>
<%@ Register Src="~/WebUserContols/mod_ER_grid.ascx" TagPrefix="uc1" TagName="mod_ER_grid" %>
<%@ Register Src="~/WebUserContols/mod_ER_selCondominio.ascx" TagPrefix="uc1" TagName="mod_ER_selCondominio" %>
<div class="card">
<div class="card-header alert alert-warning text-uppercase align-middle p-2">
<h5>Interventi</h5>
<div class="input-group mb-3">
<div class="input-group-prepend">
<asp:LinkButton runat="server" ID="lbtResetCond" class="btn btn-outline-secondary" type="button" OnClick="lbtResetCond_Click"><i class="fas fa-ban"></i></asp:LinkButton>
</div>
<asp:DropDownList runat="server" ID="ddlCondominio" DataSourceID="odsCondomini" DataTextField="nome" DataValueField="idxCond" AppendDataBoundItems="true" AutoPostBack="true" OnSelectedIndexChanged="ddlCondominio_SelectedIndexChanged" CssClass="form-control">
<asp:ListItem Text="-- Selezionare Condominio --" Value="0"></asp:ListItem>
</asp:DropDownList>
<asp:ObjectDataSource runat="server" ID="odsCondomini" SelectMethod="getByAmm" TypeName="Data.DS_appTableAdapters.AnagCondominiTableAdapter">
<SelectParameters>
<asp:SessionParameter DefaultValue="1" Name="idxAmm" SessionField="idxAmm" Type="Int32" />
</SelectParameters>
</asp:ObjectDataSource>
</div>
<uc1:mod_ER_selCondominio runat="server" ID="mod_ER_selCondominio" />
</div>
<div class="card-body">
<h5 class="card-title">Elenco degli interventi in corso</h5>
+8 -4
View File
@@ -17,6 +17,11 @@ namespace PUB.WebUserContols
saveSelections();
}
mod_ER_grid.eh_selCond += Mod_ER_grid_eh_selCond;
mod_ER_selCondominio.eh_selected += Mod_ER_selCondominio_eh_selected;
}
private void Mod_ER_selCondominio_eh_selected(object sender, EventArgs e)
{
saveSelections();
}
private void Mod_ER_grid_eh_selCond(object sender, EventArgs e)
{
@@ -25,7 +30,7 @@ namespace PUB.WebUserContols
// imposto!
try
{
ddlCondominio.SelectedValue = ce.idxCond.ToString();
mod_ER_selCondominio.condSelected = ce.idxCond.ToString();
}
catch
{ }
@@ -34,7 +39,7 @@ namespace PUB.WebUserContols
private void saveSelections()
{
mod_ER_grid.idxCond = ddlCondominio.SelectedValue;
mod_ER_grid.idxCond = mod_ER_selCondominio.condSelected;
}
protected void ddlCondominio_SelectedIndexChanged(object sender, EventArgs e)
@@ -43,8 +48,7 @@ namespace PUB.WebUserContols
}
protected void lbtResetCond_Click(object sender, EventArgs e)
{
ddlCondominio.SelectedIndex = 0;
ddlCondominio.DataBind();
mod_ER_selCondominio.condSelected = "0";
saveSelections();
}
}
+2 -20
View File
@@ -13,31 +13,13 @@ namespace PUB.WebUserContols {
public partial class mod_ER_inCorso {
/// <summary>
/// Controllo lbtResetCond.
/// Controllo mod_ER_selCondominio.
/// </summary>
/// <remarks>
/// Campo generato automaticamente.
/// Per la modifica, spostare la dichiarazione di campo dal file di progettazione al file code-behind.
/// </remarks>
protected global::System.Web.UI.WebControls.LinkButton lbtResetCond;
/// <summary>
/// Controllo ddlCondominio.
/// </summary>
/// <remarks>
/// Campo generato automaticamente.
/// Per la modifica, spostare la dichiarazione di campo dal file di progettazione al file code-behind.
/// </remarks>
protected global::System.Web.UI.WebControls.DropDownList ddlCondominio;
/// <summary>
/// Controllo odsCondomini.
/// </summary>
/// <remarks>
/// Campo generato automaticamente.
/// Per la modifica, spostare la dichiarazione di campo dal file di progettazione al file code-behind.
/// </remarks>
protected global::System.Web.UI.WebControls.ObjectDataSource odsCondomini;
protected global::PUB.WebUserContols.mod_ER_selCondominio mod_ER_selCondominio;
/// <summary>
/// Controllo mod_ER_grid.
-13
View File
@@ -6,19 +6,6 @@
<div class="card">
<div class="card-header alert alert-danger text-uppercase align-middle p-2">
<h5>Richieste</h5>
<%--<div class="input-group mb-3">
<div class="input-group-prepend">
<asp:LinkButton runat="server" ID="lbtResetCond" class="btn btn-outline-secondary" type="button" OnClick="lbtResetCond_Click"><i class="fas fa-ban"></i></asp:LinkButton>
</div>
<asp:DropDownList runat="server" ID="ddlCondominio" DataSourceID="odsCondomini" DataTextField="nome" DataValueField="idxCond" AppendDataBoundItems="true" AutoPostBack="true" OnSelectedIndexChanged="ddlCondominio_SelectedIndexChanged" CssClass="form-control">
<asp:ListItem Text="-- Selezionare Condominio --" Value="0"></asp:ListItem>
</asp:DropDownList>
<asp:ObjectDataSource runat="server" ID="odsCondomini" SelectMethod="getByAmm" TypeName="Data.DS_appTableAdapters.AnagCondominiTableAdapter">
<SelectParameters>
<asp:SessionParameter DefaultValue="1" Name="idxAmm" SessionField="idxAmm" Type="Int32" />
</SelectParameters>
</asp:ObjectDataSource>
</div>--%>
<uc1:mod_ER_selCondominio runat="server" ID="mod_ER_selCondominio" />
</div>
<div class="col-3 text-right">