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

refresh senza js locali

Browse Source
This commit is contained in:
Samuele E. Locatelli
2018-06-08 10:05:44 +02:00
parent 84fe3e22fd
commit 0304a50467
3 changed files with 3 additions and 12 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=774']) {
withEnv(['NEXT_BUILD_NUMBER=775']) {
// env.versionNumber = VersionNumber(versionNumberString : '5.3.${BUILD_DATE_FORMATTED, "yyMM"}.${BUILDS_ALL_TIME}', projectStartDate : '2006-01-01', skipFailedBuilds: true)
env.versionNumber = VersionNumber(versionNumberString : '5.3.${BUILD_DATE_FORMATTED, "yyMM"}.${BUILDS_ALL_TIME}', projectStartDate : '2006-01-01', skipFailedBuilds: true, overrideBuildsAllTime: '${NEXT_BUILD_NUMBER}')
env.APP_NAME = 'MAPO'
MP-Site/MappaStatoSeq.aspx
+2 -2
View File
@@ -3,7 +3,7 @@
<%@ Register Src="~/WebUserControls/mod_sequencerStati.ascx" TagPrefix="uc1" TagName="mod_sequencerStati" %>
<%@ Register Src="~/WebUserControls/mod_sequencerStatiJS.ascx" TagPrefix="uc1" TagName="mod_sequencerStatiJS" %>
<%@ Register Src="~/WebUserControls/mod_mainMap.ascx" TagPrefix="uc1" TagName="mod_mainMap" %>
<%@ Register Src="~/WebUserControls/mod_realtimeClock.ascx" TagPrefix="uc1" TagName="mod_realtimeClock" %>
<%--<%@ Register Src="~/WebUserControls/mod_realtimeClock.ascx" TagPrefix="uc1" TagName="mod_realtimeClock" %>--%>
<asp:Content ID="Content1" ContentPlaceHolderID="ContentPlaceHolder1" runat="server">
@@ -21,7 +21,7 @@
</div>
<uc1:mod_mainMap runat="server" ID="mod_mainMap" />
</div>
<uc1:mod_realtimeClock runat="server" ID="mod_realtimeClock" />
<%--<uc1:mod_realtimeClock runat="server" ID="mod_realtimeClock" />--%>
<uc1:mod_sequencerStatiJS runat="server" ID="mod_sequencerStatiJS2" numGG='<%# Convert.ToInt32(ddlNumgg.SelectedValue) %>' idxMacchina="0" numSplit="1000" />
<%--<uc1:mod_sequencerStatiJS runat="server" ID="mod_sequencerStatiJS1" periodo='<%# intervalloAnalisi %>' idxMacchina="0" numSplit="1000" />--%>
MP-Site/MappaStatoSeq.aspx.designer.cs
Generated
-9
View File
@@ -48,15 +48,6 @@ namespace MoonPro {
/// </remarks>
protected global::MoonPro.WebUserControls.mod_mainMap mod_mainMap;
/// <summary>
/// Controllo mod_realtimeClock.
/// </summary>
/// <remarks>
/// Campo generato automaticamente.
/// Per la modifica, spostare la dichiarazione di campo dal file di progettazione al file code-behind.
/// </remarks>
protected global::MoonPro.WebUserControls.mod_realtimeClock mod_realtimeClock;
/// <summary>
/// Controllo mod_sequencerStatiJS2.
/// </summary>