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

Fix dettaglio commesse

Browse Source
This commit is contained in:
Samuele E. Locatelli
2019-10-10 22:44:15 +02:00
parent 5120eb1b55
commit 6a623c2a99
2 changed files with 5 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
GPW_Smart/WebUserControls/mod_commAttivita.ascx
+4 -8
View File
@@ -1,8 +1,4 @@
<%@ Control Language="C#" AutoEventWireup="true" CodeBehind="mod_commAttivita.ascx.cs" Inherits="GPW.WebUserControls.mod_commAttivita" %>
<% if (false)
{ %>
<link href="~/css/Style.css" rel="stylesheet" type="text/css" />
<% } %>
<div class="row mt-2 small py-2">
<div class="col-4 pr-0">
@@ -25,11 +21,11 @@
<asp:TemplateField>
<ItemTemplate>
<asp:LinkButton runat="server" ID="lnkEdit" OnClick="lnkEdit_Click" CommandArgument='<%# Eval("idxRA") %>'>
<div class="row">
<div class="col-6">
<div class="d-flex">
<div class="p-0">
<asp:Label ID="lblCli" runat="server" Text='<%# cliByIdxFase(Eval("idxFase")) %>' CssClass="text-dark font-weight-bold" />
</div>
<div class="col-6 text-right">
<div class="p-0 flex-grow-1 text-right small">
<asp:Label ID="lblPrj" runat="server" Text='<%# prjByIdxFase(Eval("idxFase")) %>' CssClass="text-dark" />
</div>
</div>
@@ -53,7 +49,7 @@
</asp:TemplateField>
<asp:TemplateField>
<ItemTemplate>
<asp:LinkButton runat="server" ID="lnkClona" OnClick="lnkClona_Click" CommandArgument='<%# Eval("idxRA") %>' CssClass="btn btn-info btn-sm"><i class="fa fa-magic" aria-hidden="true"></i></asp:LinkButton>
<asp:LinkButton runat="server" ID="lnkClona" OnClick="lnkClona_Click" CommandArgument='<%# Eval("idxRA") %>' CssClass="btn btn-warning py-3 px-1"><i class="fa fa-magic" aria-hidden="true"></i></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=4083']) {
withEnv(['NEXT_BUILD_NUMBER=4084']) {
// 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'