Egalware/b2bcondomini.it
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

update versione e gestione pagamento fatture

Browse Source
This commit is contained in:
Samuele E. Locatelli
2018-09-18 11:48:57 +02:00
parent d64eb0fe79
commit 2dd6c12eee
10 changed files with 76 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Jenkinsfile
Vendored
+1 -1
View File
@@ -17,7 +17,7 @@ pipeline {
/* calcolo numero versione... diverso x branch MASTER/DEVELOP */
script {
withEnv(['NEXT_BUILD_NUMBER=300']) {
withEnv(['NEXT_BUILD_NUMBER=301']) {
// env.versionNumber = VersionNumber(versionNumberString : '1.2.${BUILD_DATE_FORMATTED, "yyMM"}.${BUILDS_ALL_TIME}', projectStartDate : '2006-01-01', skipFailedBuilds: true)
env.versionNumber = VersionNumber(versionNumberString : '1.2.${BUILD_DATE_FORMATTED, "yyMM"}.${BUILDS_ALL_TIME}', projectStartDate : '2006-01-01', skipFailedBuilds: true, overrideBuildsAllTime: '${NEXT_BUILD_NUMBER}')
env.APP_NAME = 'B2BCONDOMINI'
PUB/PAM/Fatture.aspx
+11
View File
@@ -0,0 +1,11 @@
<%@ Page Title="" Language="C#" MasterPageFile="~/SitePAM.master" AutoEventWireup="true" CodeBehind="Fatture.aspx.cs" Inherits="PUB.PAM.Fatture" %>
<%@ Register Src="~/WebUserContols/mod_dettFattER.ascx" TagPrefix="uc1" TagName="mod_dettFattER" %>
<asp:Content ID="Content1" ContentPlaceHolderID="NoAjaxContent" runat="server">
</asp:Content>
<asp:Content ID="Content2" ContentPlaceHolderID="MainContent" runat="server">
<div class="container-fluid my-1 bg-light px-1">
<uc1:mod_dettFattER runat="server" id="mod_dettFattER" />
</div>
</asp:Content>
PUB/PAM/Fatture.aspx.cs
+17
View File
@@ -0,0 +1,17 @@
using System;
using System.Collections.Generic;
using System.Linq;
using System.Web;
using System.Web.UI;
using System.Web.UI.WebControls;
namespace PUB.PAM
{
public partial class Fatture : System.Web.UI.Page
{
protected void Page_Load(object sender, EventArgs e)
{
}
}
}
PUB/PAM/Fatture.aspx.designer.cs
Generated
+24
View File
@@ -0,0 +1,24 @@
//------------------------------------------------------------------------------
// <generato automaticamente>
// Codice generato da uno strumento.
//
// Le modifiche a questo file possono causare un comportamento non corretto e verranno perse se
// il codice viene rigenerato.
// </generato automaticamente>
//------------------------------------------------------------------------------
namespace PUB.PAM {
public partial class Fatture {
/// <summary>
/// Controllo mod_dettFattER.
/// </summary>
/// <remarks>
/// Campo generato automaticamente.
/// Per la modifica, spostare la dichiarazione di campo dal file di progettazione al file code-behind.
/// </remarks>
protected global::PUB.WebUserContols.mod_dettFattER mod_dettFattER;
}
}
PUB/PUB.csproj
+8
View File
@@ -186,6 +186,7 @@
<Content Include="PAM\DettaglioIntervento.aspx" />
<Content Include="PAM\ER_Fatture.aspx" />
<Content Include="PAM\Fatturati.aspx" />
<Content Include="PAM\Fatture.aspx" />
<Content Include="PAM\Fornitori.aspx" />
<Content Include="PAM\Interventi.aspx" />
<Content Include="PAM\Login.aspx" />
@@ -499,6 +500,13 @@
<Compile Include="PAM\Fatturati.aspx.designer.cs">
<DependentUpon>Fatturati.aspx</DependentUpon>
</Compile>
<Compile Include="PAM\Fatture.aspx.cs">
<DependentUpon>Fatture.aspx</DependentUpon>
<SubType>ASPXCodeBehind</SubType>
</Compile>
<Compile Include="PAM\Fatture.aspx.designer.cs">
<DependentUpon>Fatture.aspx</DependentUpon>
</Compile>
<Compile Include="PAM\Fornitori.aspx.cs">
<DependentUpon>Fornitori.aspx</DependentUpon>
<SubType>ASPXCodeBehind</SubType>
PUB/WebUserContols/mod_ER_grid.ascx
+6 -3
View File
@@ -23,7 +23,10 @@
<div class="text-uppercase">
<asp:Label ID="Label1" CssClass="text-truncate" runat="server" Text='<%# Eval("stato") %>'></asp:Label>
</div>
<asp:Label CssClass='<%# getCssScad(Eval("dataScad")) %>' ID="Label2" runat="server" ToolTip='<%# Eval("dataScad","Risposta entro {0:dd.MM.yyyy HH:mm}") %>'>Urg: <b><%# Eval("idxPriorita") %></b></asp:Label>
<div>
<span class="small"><%# Eval("idxRichiesta") %></span> | <asp:Label CssClass='<%# getCssScad(Eval("dataScad")) %>' ID="Label2" runat="server" ToolTip='<%# Eval("dataScad","Risposta entro {0:dd.MM.yyyy HH:mm}") %>'>Urg: <b><%# Eval("idxPriorita") %></b></asp:Label>
</div>
</asp:LinkButton>
</div>
</ItemTemplate>
@@ -76,12 +79,12 @@
</asp:GridView>
<asp:ObjectDataSource runat="server" ID="odsElRich" OldValuesParameterFormatString="Original_{0}" SelectMethod="getByCondStato" TypeName="Data.DS_appTableAdapters.ElencolRichTableAdapter" UpdateMethod="UpdateText" FilterExpression="collaboratore LIKE '%{0}%' OR cod_fornitore LIKE '%{0}%' OR nom_cond LIKE '%{0}%' OR note LIKE '%{0}%' OR messaggio LIKE '%{0}%' OR genContatto LIKE '%{0}%'">
<SelectParameters>
<asp:SessionParameter DefaultValue="0" Name="idxAmm" SessionField="idxAmm" Type="Int32" />
<asp:SessionParameter DefaultValue="0" Name="idxAmm" SessionField="idxAmm" Type="Int32" />
<asp:SessionParameter DefaultValue="0" Name="idxFornitore" SessionField="idxFornitore" Type="Int32" />
<asp:SessionParameter DefaultValue="0" Name="isPBO" SessionField="isPBO" Type="Int32" />
<asp:SessionParameter DefaultValue="" Name="gruppo" SessionField="currGroup" Type="String" />
<asp:ControlParameter ControlID="hfCondominio" DefaultValue="0" Name="idxCond" PropertyName="Value" Type="Int32" />
<asp:ControlParameter ControlID="hfStatoMin" DefaultValue="0" Name="minStato" PropertyName="Value" Type="Int32" />
<asp:ControlParameter ControlID="hfStatoMin" DefaultValue="0" Name="minStato" PropertyName="Value" Type="Int32" />
<asp:ControlParameter ControlID="hfStatoMax" DefaultValue="200" Name="maxStato" PropertyName="Value" Type="Int32" />
<asp:ControlParameter ControlID="hfFreezed" DefaultValue="-1" Name="freezed" PropertyName="Value" Type="Int32" />
</SelectParameters>
PUB/WebUserContols/mod_ER_listFatture.ascx
+2 -2
View File
@@ -77,7 +77,7 @@
<div class="col-12 col-sm-4 text-right">
<div id="divEdit" runat="server" visible='<%# isWriteEnabled && (userIsForn || userIsAmm) &&(Eval("dataPag").ToString() == "") %>' class="text-nowrap row">
<div class="col">
<asp:LinkButton ID="lnkEditAmm" runat="server" Visible='<%# isWriteEnabled && userIsAmm %>' CausesValidation="False" OnClick="lnkEditAmm_Click" CommandArgument='<%# Eval("idxDoc") %>' CssClass="btn btn-success btn-sm btn-block" ToolTip="Modifica Amministratore" OnClientClick="return confirm('Sei sicuro di voler confermare il pagamento?')"><i class="fas fa-thumbs-up" aria-hidden="true"></i></asp:LinkButton>
<asp:LinkButton ID="lnkEditAmm" runat="server" Visible='<%# isWriteEnabled && userIsAmm %>' CausesValidation="False" OnClick="lnkEditAmm_Click" CommandArgument='<%# Eval("idxDoc") %>' CssClass="btn btn-success btn-sm btn-block" ToolTip="Conferma PAGAMENTO Amministratore" OnClientClick="return confirm('Sei sicuro di voler confermare il pagamento?')"><i class="fas fa-thumbs-up" aria-hidden="true"></i></asp:LinkButton>
</div>
<div class="col">
<asp:LinkButton ID="lnkEditForn" runat="server" Visible='<%# userIsForn %>' CausesValidation="False" CommandName="Select" CommandArgument="EditForn" Text="Select" CssClass="btn btn-success btn-sm btn-block" ToolTip="Modifica Fornitore"><i class="fa fa-edit" aria-hidden="true"></i></asp:LinkButton>
@@ -92,7 +92,7 @@
</asp:TemplateField>
</Columns>
</asp:GridView>
<asp:ObjectDataSource ID="odsFatt" runat="server" DeleteMethod="deleteQuery" InsertMethod="insertQuery" OldValuesParameterFormatString="Original_{0}" SelectMethod="getByIdxRich" TypeName="Data.DS_appTableAdapters.FattureTableAdapter">
<asp:ObjectDataSource ID="odsFatt" runat="server" DeleteMethod="deleteQuery" InsertMethod="insertQuery" OldValuesParameterFormatString="Original_{0}" SelectMethod="getByIdxRich" TypeName="Data.DS_appTableAdapters.FattureTableAdapter" OnUpdated="odsFatt_Updated">
<DeleteParameters>
<asp:Parameter Name="Original_idxDoc" Type="Int32" />
</DeleteParameters>
PUB/WebUserContols/mod_ER_listFatture.ascx.cs
+6
View File
@@ -222,5 +222,11 @@ namespace PUB.WebUserContols
Response.Redirect(Request.RawUrl);
}
}
protected void odsFatt_Updated(object sender, ObjectDataSourceStatusEventArgs e)
{
// ricarico...
Response.Redirect(Request.RawUrl);
}
}
}
PUB/WebUserContols/mod_dettFattER.ascx.cs
-6
View File
@@ -1,9 +1,4 @@
using System;
using System.Collections.Generic;
using System.Linq;
using System.Web;
using System.Web.UI;
using System.Web.UI.WebControls;
namespace PUB.WebUserContols
{
@@ -11,7 +6,6 @@ namespace PUB.WebUserContols
{
protected void Page_Load(object sender, EventArgs e)
{
}
}
}
PUB/WebUserContols/mod_statusRowPAM.ascx.cs
+1 -1
View File
@@ -21,7 +21,7 @@ namespace PUB.WebUserContols
divFiles.Visible = (idxRichiesta != 0 && titolo != "MyDashboard" && titolo != "Allegati");
divFatture.Visible = (idxRichiesta != 0 && titolo != "MyDashboard" && titolo != "Fatture");
hlDetail.NavigateUrl = string.Format("~/PAM/DettaglioIntervento?idxRichiesta={0}", idxRichiesta);
hlFatture.NavigateUrl = string.Format("~/PAM/ER_Fatture?idxRichiesta={0}", idxRichiesta);
hlFatture.NavigateUrl = string.Format("~/PAM/Fatture?idxRichiesta={0}", idxRichiesta);
hlFiles.NavigateUrl = string.Format("~/PAM/Allegati?idxRichiesta={0}", idxRichiesta);
}