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

Fix buttons approvazione

Browse Source
This commit is contained in:
Samuele E. Locatelli
2019-10-09 22:23:09 +02:00
parent 5c71b5bc0d
commit 7a6c49924a
2 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
GPW_Smart/WebUserControls/mod_mancTimb.ascx
+8 -8
View File
@@ -33,9 +33,14 @@
<label for="grView">
Richieste in corso:
</label>
<asp:GridView ID="grView" nome="grView" runat="server" AllowPaging="True" DataSourceID="ods" AutoGenerateColumns="False" DataKeyNames="dataOra,idxDipendente" CssClass="table table-striped table-sm table-condensed w-100 small" GridLines="None" OnSelectedIndexChanged="grView_SelectedIndexChanged" OnRowUpdated="grView_RowUpdated" OnRowDeleted="grView_RowDeleted">
<asp:GridView ID="grView" nome="grView" runat="server" AllowPaging="True" DataSourceID="ods" AutoGenerateColumns="False" DataKeyNames="dataOra,idxDipendente" CssClass="table table-striped table-sm table-condensed w-100 small" GridLines="None" OnSelectedIndexChanged="grView_SelectedIndexChanged" OnRowUpdated="grView_RowUpdated" OnRowDeleted="grView_RowDeleted" PageSize="5">
<Columns>
<asp:TemplateField ItemStyle-HorizontalAlign="Left">
<asp:TemplateField>
<ItemTemplate>
<asp:LinkButton runat="server" ID="lbApprova" Visible='<%# userCanApprove %>' Text="Approva" CssClass="btn btn-block btn-sm p-1 btn-success" CommandArgument="approva" CommandName="Select"><i class="fa fa-thumbs-o-up" aria-hidden="true"></i> OK</asp:LinkButton>
</ItemTemplate>
</asp:TemplateField>
<asp:TemplateField ItemStyle-HorizontalAlign="center">
<ItemTemplate>
<asp:Label ID="lblDip" runat="server" Text='<%# cognomeNome(Eval("idxDipendente")) %>' Visible='<%# userCanApprove %>' />
</ItemTemplate>
@@ -57,12 +62,7 @@
</asp:TemplateField>
<asp:TemplateField>
<ItemTemplate>
<asp:LinkButton runat="server" ID="lbDelete" Text="Elimina" CssClass="btn btn-block btn-sm p-1 btn-danger" CommandArgument="Elimina" CommandName="Delete"><i class="fa fa-ban" aria-hidden="true"></i></asp:LinkButton>
</ItemTemplate>
</asp:TemplateField>
<asp:TemplateField>
<ItemTemplate>
<asp:LinkButton runat="server" ID="lbApprova" Visible='<%# userCanApprove %>' Text="Approva" CssClass="btn btn-block btn-sm p-1 btn-success" CommandArgument="approva" CommandName="Select"><i class="fa fa-check-circle-o" aria-hidden="true"></i></asp:LinkButton>
<asp:LinkButton runat="server" ID="lbDelete" Text="Elimina" CssClass="btn btn-block btn-sm p-1 btn-danger" CommandArgument="Elimina" CommandName="Delete"><i class="fa fa-thumbs-o-down" aria-hidden="true"></i> NO</asp:LinkButton>
</ItemTemplate>
</asp:TemplateField>
</Columns>
Jenkinsfile
Vendored
+1 -1
View File
@@ -14,7 +14,7 @@ pipeline {
/* calcolo numero versione... diverso x branch MASTER/DEVELOP */
script {
withEnv(['NEXT_BUILD_NUMBER=4081']) {
withEnv(['NEXT_BUILD_NUMBER=4083']) {
// env.versionNumber = VersionNumber(versionNumberString : '2.5.${BUILD_DATE_FORMATTED, "yyMM"}.${BUILDS_ALL_TIME}', projectStartDate : '2006-01-01', skipFailedBuilds: true)
env.versionNumber = VersionNumber(versionNumberString : '2.5.${BUILD_DATE_FORMATTED, "yyMM"}.${BUILDS_ALL_TIME}', projectStartDate : '2006-01-01', skipFailedBuilds: true, overrideBuildsAllTime: '${NEXT_BUILD_NUMBER}')
env.APP_NAME = 'GPW'