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

fix selezione filtro di 2 pag affiancate in MAP/MyDashboard

Browse Source
This commit is contained in:
Samuele E. Locatelli
2018-07-16 18:47:29 +02:00
parent af9d62d467
commit c5c8599e1d
2 changed files with 23 additions and 9 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=95']) {
withEnv(['NEXT_BUILD_NUMBER=97']) {
// 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'
PUB/WebUserContols/mod_ER_grid.ascx
+22 -8
View File
@@ -36,10 +36,12 @@
<ItemTemplate>
<div class="d-flex text-info">
<div class="p-2 flex-grow-1 text-info">
<asp:LinkButton runat="server" ID="lbtSelCond" OnClick="lbtSelCond_Click" CausesValidation="False" CommandArgument='<%# Eval("idxCond") %>'>
<asp:LinkButton runat="server" ID="lbtSelCond" OnClick="lbtSelCond_Click" CausesValidation="False" CommandArgument='<%# Eval("idxCond") %>'>
<i class="far fa-building"></i>
<asp:Label ID="Label5" runat="server" Text='<%# Eval("nom_cond") %>' />
</asp:LinkButton></div><div class="p-2 text-warning">
</asp:LinkButton>
<asp:Label ID="Label5" runat="server" Text='<%# Eval("nom_cond") %>' />
</div>
<div class="p-2 text-warning">
<asp:Label ID="Label6" runat="server" Text='<%# Eval("cod_fornitore") %>' />
<i class="fas fa-industry"></i>
</div>
@@ -48,7 +50,9 @@
<div class="p-2 flex-grow-1 text-secondary">
<i class="fas fa-phone"></i>
<asp:Label ID="Label9" runat="server" Text='<%# Eval("telContatto") %>' />
(<asp:Label ID="Label7" runat="server" Text='<%# Eval("genContatto") %>' />) </div><div class="p-2 text-secondary">
(<asp:Label ID="Label7" runat="server" Text='<%# Eval("genContatto") %>' />)
</div>
<div class="p-2 text-secondary">
<asp:Label ID="Label8" runat="server" Text='<%# Eval("collaboratore") %>' />
<i class="far fa-user"></i>
</div>
@@ -79,15 +83,19 @@
<div class="col-6 text-secondary small">
<i class="fas fa-phone"></i>
<asp:Label ID="Label9" runat="server" Text='<%# Eval("telContatto") %>' />
(<asp:Label ID="Label7" runat="server" Text='<%# Eval("genContatto") %>' />) </div><div class="col-6 text-secondary text-right small">
(<asp:Label ID="Label7" runat="server" Text='<%# Eval("genContatto") %>' />)
</div>
<div class="col-6 text-secondary text-right small">
<asp:Label ID="Label8" runat="server" Text='<%# Eval("collaboratore") %>' />
<i class="far fa-user"></i>
</div>
<div class="col-12 small">
<i class="far fa-bell"></i>Messaggio <asp:TextBox ID="txtMessaggio" runat="server" CssClass="form-control" Width="100%" Text='<%# Bind("messaggio") %>' Height="10em" TextMode="MultiLine" />
<i class="far fa-bell"></i>Messaggio
<asp:TextBox ID="txtMessaggio" runat="server" CssClass="form-control" Width="100%" Text='<%# Bind("messaggio") %>' Height="10em" TextMode="MultiLine" />
</div>
<div class="col-12 text-warning small">
<i class="far fa-comment"></i>Note <asp:TextBox ID="lblNote" runat="server" CssClass="form-control" Text='<%# Bind("note") %>' Height="5em" TextMode="MultiLine" />
<i class="far fa-comment"></i>Note
<asp:TextBox ID="lblNote" runat="server" CssClass="form-control" Text='<%# Bind("note") %>' Height="5em" TextMode="MultiLine" />
</div>
</div>
</EditItemTemplate>
@@ -97,7 +105,13 @@
<div class="text-center">
<i class='<%# Eval("cssStato") %>'></i>
<br />
<asp:Label ID="Label1" runat="server" Text='<%# Eval("stato") %>'></asp:Label></div></ItemTemplate></asp:TemplateField></Columns></asp:GridView><asp:ObjectDataSource runat="server" ID="odsElRich" OldValuesParameterFormatString="Original_{0}" SelectMethod="getByCondStato" TypeName="Data.DS_appTableAdapters.ElencolRichTableAdapter" UpdateMethod="UpdateText">
<asp:Label ID="Label1" runat="server" Text='<%# Eval("stato") %>'></asp:Label>
</div>
</ItemTemplate>
</asp:TemplateField>
</Columns>
</asp:GridView>
<asp:ObjectDataSource runat="server" ID="odsElRich" OldValuesParameterFormatString="Original_{0}" SelectMethod="getByCondStato" TypeName="Data.DS_appTableAdapters.ElencolRichTableAdapter" UpdateMethod="UpdateText">
<SelectParameters>
<asp:SessionParameter DefaultValue="1" Name="idxAmm" SessionField="idxAmm" Type="Int32" />
<asp:ControlParameter ControlID="hfCondominio" DefaultValue="0" Name="idxCond" PropertyName="Value" Type="Int32" />