From 8bb6445f41a202a41de3ff4d9611ef734c46dc29 Mon Sep 17 00:00:00 2001
From: "Samuele E. Locatelli" <samuele@steamware.net>
Date: Fri, 8 Jun 2018 09:59:08 +0200
Subject: [PATCH] aggiunta js rif

---
 Jenkinsfile                                  | 2 +-
 MP-Site/WebMasterPages/MAPO_refresh.master   | 5 ++++-
 MP-Site/WebMasterPages/MAPO_refresh30.master | 7 +++++--
 3 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/Jenkinsfile b/Jenkinsfile
index ac5905e7..3e45b203 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -17,7 +17,7 @@ pipeline {
 
       /* calcolo numero versione... diverso x branch MASTER/DEVELOP */
       script {
-        withEnv(['NEXT_BUILD_NUMBER=773']) {
+        withEnv(['NEXT_BUILD_NUMBER=774']) {
           // 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'
diff --git a/MP-Site/WebMasterPages/MAPO_refresh.master b/MP-Site/WebMasterPages/MAPO_refresh.master
index fca04b03..69913f24 100644
--- a/MP-Site/WebMasterPages/MAPO_refresh.master
+++ b/MP-Site/WebMasterPages/MAPO_refresh.master
@@ -12,7 +12,10 @@
   <link href="https://fonts.googleapis.com/css?family=Roboto+Condensed" rel="stylesheet" />   
   <link href="~/Content/vis.min.css" rel="stylesheet" />
   <%--<script type="text/jscript" src="../vis/vis.js"></script>--%>
-  <script src="scripts/vis.min.js" type="text/javascript"></script>
+  <script src="scripts/vis.min.js" type="text/javascript"></script>      
+  <script src="scripts/jquery-3.3.1.min.js" type="text/javascript"></script>
+  <script src="scripts/jintervals.js" type="text/javascript"></script>
+  <script src="scripts/jquery.stopwatch.js" type="text/javascript"></script>
 
   <asp:PlaceHolder runat="server">
     <%--<%: Scripts.Render("~/bundle/GlobalHead") %>
diff --git a/MP-Site/WebMasterPages/MAPO_refresh30.master b/MP-Site/WebMasterPages/MAPO_refresh30.master
index 34bdfc1a..4546f8fc 100644
--- a/MP-Site/WebMasterPages/MAPO_refresh30.master
+++ b/MP-Site/WebMasterPages/MAPO_refresh30.master
@@ -11,8 +11,11 @@
   <link href="~/Content/Style.min.css" rel="stylesheet" type="text/css" />
   <link href="https://fonts.googleapis.com/css?family=Roboto+Condensed" rel="stylesheet" />   
   <link href="~/Content/vis.min.css" rel="stylesheet" />
-  <%--<script type="text/jscript" src="../vis/vis.js"></script>--%>
-  <script src="scripts/vis.min.js" type="text/javascript"></script>
+  <%--<script type="text/jscript" src="../vis/vis.js"></script>--%>       
+  <script src="scripts/vis.min.js" type="text/javascript"></script>            
+  <script src="scripts/jquery-3.3.1.min.js" type="text/javascript"></script>
+  <script src="scripts/jintervals.js" type="text/javascript"></script>
+  <script src="scripts/jquery.stopwatch.js" type="text/javascript"></script>
   <%--<script type="text/jscript" src="../vis/vis.js"></script>
   <link href="../vis/vis.css" rel="stylesheet" />--%>