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

refresh version

Browse Source
This commit is contained in:
Samuele E. Locatelli
2021-03-16 16:48:27 +01:00
parent c780a1dfb1
commit 7b153403ec
3 changed files with 15 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files
GPW_Commesse/WebMasterPages/AjaxSimpleFull.Master
+5 -5
View File
@@ -59,7 +59,7 @@
</head>
<body class="body">
<form id="form1" runat="server">
<asp:ScriptManager ID="sm" runat="server" EnablePartialRendering="true" EnableScriptGlobalization="true" EnableScriptLocalization="true" EnableCdn="false">
<asp:ScriptManager ID="sm" runat="server" EnablePartialRendering="true" EnableScriptGlobalization="true" EnableScriptLocalization="true" EnableCdn="false" EnablePageMethods="true">
</asp:ScriptManager>
<div class="container-fluid">
<div class="row">
@@ -71,9 +71,9 @@
<div class="col-12">
<%--<asp:UpdatePanel ID="upMain" runat="server" UpdateMode="Conditional" RenderMode="Block">
<ContentTemplate>--%>
<asp:ContentPlaceHolder ID="cph1" runat="server">
</asp:ContentPlaceHolder>
<%--</ContentTemplate>
<asp:ContentPlaceHolder ID="cph1" runat="server">
</asp:ContentPlaceHolder>
<%--</ContentTemplate>
</asp:UpdatePanel>--%>
</div>
</div>
@@ -85,4 +85,4 @@
</div>
</form>
</body>
</html>
</html>
GPW_Commesse/WebUserControls/cmp_chart.ascx
+9 -8
View File
@@ -150,13 +150,14 @@
function pageLoad() {
//redrawAll();
}
</script>
<asp:HiddenField runat="server" ID="hfIdxDip" />
<asp:HiddenField runat="server" ID="hfData" />
<div class="row">
<div class="col-6 text-right">Periodo</div>
<div class="col-6 text-right">
Periodo
</div>
<div class="col-6">
<asp:DropDownList runat="server" ID="ddlMaxNum" AutoPostBack="true">
<asp:ListItem Text="1 mese" Value="30"></asp:ListItem>
@@ -167,10 +168,10 @@
<asp:ListItem Text="Tutto" Value="0"></asp:ListItem>
</asp:DropDownList>
</div>
<div class="col-12 col-md-6">
<canvas id="myChartTS" width="300" height="120"></canvas>
</div>
<div class="col-12 col-md-6">
<canvas id="myChartHist" width="300" height="120"></canvas>
</div>
</div>
<div class="col-12 col-md-6">
<canvas id="myChartTS" width="300" height="120"></canvas>
</div>
<div class="col-12 col-md-6">
<canvas id="myChartHist" width="300" height="120"></canvas>
</div>
Jenkinsfile
Vendored
+1 -1
View File
@@ -10,7 +10,7 @@ pipeline {
steps {
/* calcolo numero versione... diverso x branch MASTER/DEVELOP */
script {
withEnv(['NEXT_BUILD_NUMBER=4148']) {
withEnv(['NEXT_BUILD_NUMBER=4149']) {
// env.versionNumber = VersionNumber(versionNumberString : '2.7.${BUILD_DATE_FORMATTED, "yyMM"}.${BUILDS_ALL_TIME}', projectStartDate : '2006-01-01', skipFailedBuilds: true)
env.versionNumber = VersionNumber(versionNumberString : '2.7.${BUILD_DATE_FORMATTED, "yyMM"}.${BUILDS_ALL_TIME}', projectStartDate : '2006-01-01', skipFailedBuilds: true, overrideBuildsAllTime: '${NEXT_BUILD_NUMBER}')
env.APP_NAME = 'GPW'