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

Update elenco azioni

Browse Source
This commit is contained in:
Samuele E. Locatelli
2018-08-09 13:03:53 +02:00
parent 19954007af
commit 173f45e4ad
3 changed files with 15 additions and 16 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=128']) {
withEnv(['NEXT_BUILD_NUMBER=129']) {
// 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_acts.ascx
+14 -14
View File
@@ -2,24 +2,24 @@
<asp:HiddenField runat="server" ID="hfIdxRichiesta" />
<asp:GridView runat="server" ID="grView" AutoGenerateColumns="False" DataKeyNames="idxAzione" AllowSorting="true" DataSourceID="ods" ClientIDMode="Predictable" ClientIDRowSuffix="IdxAzione" CssClass="table table-striped table-condensed">
<asp:GridView runat="server" ID="grView" AutoGenerateColumns="False" DataKeyNames="idxAzione" AllowSorting="true" DataSourceID="ods" ClientIDMode="Predictable" ClientIDRowSuffix="IdxAzione" CssClass="table table-condensed" CellPadding="0" CellSpacing="0">
<Columns>
<asp:TemplateField HeaderText="Data" SortExpression="dataRif">
<asp:TemplateField HeaderText="Registro Attivita" SortExpression="dataRif">
<ItemTemplate>
<div class="row mw-100">
<div class="col-4 text-left strong">
<asp:LinkButton runat="server" ID="lbtShowDet" CssClass='<%# "btn btn-sm " + Eval("cssButton") %>' data-toggle="collapse" data-target='<%# Eval("idxAzione", "#MainContent_MainContent_mod_ER_detail_frmView_mod_ER_acts_grView_lblMessage_{0}") %>'>
<i class="fas fa-angle-double-down"></i> | <b><i class='<%# Eval("cssIcon") %>'></i>&nbsp;<%# Eval("classe") %></b>&nbsp;|&nbsp;<%# Eval("descrAzione") %>
<div class="row">
<div class="col-12 text-left">
<asp:LinkButton runat="server" ID="lbtShowDet" CssClass='<%# "p-0 btn btn-sm btn-block " + Eval("cssButton") %>' data-toggle="collapse" data-target='<%# Eval("idxAzione", "#MainContent_MainContent_mod_ER_detail_frmView_mod_ER_acts_grView_divMess_{0}") %>'>
<i class="fas fa-angle-double-down"></i> | <b><i class='<%# Eval("cssIcon") %>'></i>&nbsp;<%# Eval("classe") %>| <%# Eval("descrAzione") %></b>
<div class="small text-truncate text-secondary">
<div class="font-weight-bold"><%# Eval("dataRif","{0:ddd dd.MM.yyyy, HH:mm:ss}") %> - <span class="small"><%# Eval("attore") %></span></div>
</div>
</asp:LinkButton>
</div>
<div class="col-4 text-center">
<%# Eval("attore") %>
</div>
<div class="col-4 text-right">
<%# Eval("dataRif","{0:ddd dd.MM.yyyy, HH:mm:ss}") %>
</div>
<div class="col-12 text-left mt-3">
<asp:Label runat="server" ID="lblMessage" class="collapse" ClientIDMode="Predictable"><%# Eval("messaggio") %></asp:Label>
<div class="col-12 text-left mt-3 collapse" runat="server" id="divMess" clientidmode="Predictable">
<asp:Label runat="server" ID="lblMessage"><%# Eval("messaggio") %></asp:Label>
</div>
</div>
</ItemTemplate>
PUB/WebUserContols/mod_ER_detail.ascx
-1
View File
@@ -104,7 +104,6 @@
<div class="col-12 col-sm-6">
<div class="row">
<div class="col-12 small my-3 text-right">
<h5>Registro attività</h5>
<uc1:mod_ER_acts runat="server" ID="mod_ER_acts" IdxRichiesta='<%# Eval("IdxRichiesta") %>' />
</div>
</div>