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

Refresh progetti

Browse Source
This commit is contained in:
Samuele E. Locatelli
2018-06-08 09:47:35 +02:00
parent 59e2663e59
commit 87a4091a20
13 changed files with 1484 additions and 95 deletions
Download Patch File Download Diff File Expand all files Collapse all files
MP-Admin/Web.config
+4
View File
@@ -138,6 +138,10 @@
<assemblyIdentity name="AjaxControlToolkit" publicKeyToken="28f01b0e84b6d53e" culture="neutral" />
<!--<bindingRedirect oldVersion="0.0.0.0-4.1.60919.0" newVersion="4.1.60919.0" />-->
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="Newtonsoft.Json" publicKeyToken="30ad4fe6b2a6aeed" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-11.0.0.0" newVersion="11.0.0.0" />
</dependentAssembly>
</assemblyBinding>
</runtime>
<elmah>
MP-IO/Web.config
+39 -41
View File
@@ -1,4 +1,4 @@
<?xml version="1.0"?>
<?xml version="1.0" encoding="utf-8"?>
<!--
For more information on how to configure your ASP.NET application, please visit
http://go.microsoft.com/fwlink/?LinkId=169433
@@ -6,64 +6,62 @@
<configuration>
<appSettings>
<!--Impostazione gestione serializzazione variabili in sessione (es per Redis)-->
<add key="serializeSession" value="true"/>
<add key="maxAgeAppConf_min" value="10"/>
<add key="IOB_RedEnab" value="true"/>
<add key="serializeSession" value="true" />
<add key="maxAgeAppConf_min" value="10" />
<add key="IOB_RedEnab" value="true" />
<!--gestione timeout "esteso" x chiamate SQL critiche, in secondi -->
<add key="sqlLongCommandTimeout" value="600"/>
<add key="sqlLongCommandTimeout" value="600" />
<!--keep alive!-->
<add key="resetConnKA" value="false"/>
<add key="forceResetKeepAlive" value="true"/>
<add key="kaMinUpdSec" value="30"/>
<add key="checkConnStatus" value="true"/>
<add key="disable_verificaIdxMacchina" value="true"/>
<add key="disable_singleton" value="true"/>
<add key="resetConnKA" value="false" />
<add key="forceResetKeepAlive" value="true" />
<add key="kaMinUpdSec" value="30" />
<add key="checkConnStatus" value="true" />
<add key="disable_verificaIdxMacchina" value="true" />
<add key="disable_singleton" value="true" />
<!--conf base-->
<add key="appName" value="MP-IO"/>
<add key="CodModulo" value="MoonPro"/>
<add key="appName" value="MP-IO" />
<add key="CodModulo" value="MoonPro" />
<!-- Logging -->
<add key="_logDir" value="~/logs/"/>
<add key="_logLevel" value="7"/>
<add key="_logMaxMb" value="30"/>
<add key="_logDir" value="~/logs/" />
<add key="_logLevel" value="7" />
<add key="_logMaxMb" value="30" />
<!--stringhe connessione-->
<add key="DbConfConnectionString" value="Data Source=SQL2016DEV;Initial Catalog=MoonPro;Persist Security Info=True;User ID=sa;Password=keyhammer16;"/>
<add key="MoonProConnectionString" value="Data Source=SQL2016DEV;Initial Catalog=MoonPro;Persist Security Info=True;User ID=sa;Password=keyhammer16;"/>
<add key="PermessiConnectionString" value="Data Source=SQL2016DEV;Initial Catalog=MoonPro;Persist Security Info=True;User ID=sa;Password=keyhammer16;"/>
<add key="UtenteCdcConnectionString"
value="Data Source=SQL2016DEV;Initial Catalog=Donati_Anagrafica;Persist Security Info=True;User ID=sa;Password=keyhammer16;"/>
<add key="VocabolarioConnectionString" value="Data Source=SQL2016DEV;Initial Catalog=MoonPro;Persist Security Info=True;User ID=sa;Password=keyhammer16;"/>
<add key="DevicesConnectionString"
value="Data Source=SQL2016DEV;Initial Catalog=Donati_Anagrafica;Persist Security Info=True;User ID=sa;Password=keyhammer16;"/>
<add key="DbConfConnectionString" value="Data Source=SQL2016DEV;Initial Catalog=MoonPro;Persist Security Info=True;User ID=sa;Password=keyhammer16;" />
<add key="MoonProConnectionString" value="Data Source=SQL2016DEV;Initial Catalog=MoonPro;Persist Security Info=True;User ID=sa;Password=keyhammer16;" />
<add key="PermessiConnectionString" value="Data Source=SQL2016DEV;Initial Catalog=MoonPro;Persist Security Info=True;User ID=sa;Password=keyhammer16;" />
<add key="UtenteCdcConnectionString" value="Data Source=SQL2016DEV;Initial Catalog=Donati_Anagrafica;Persist Security Info=True;User ID=sa;Password=keyhammer16;" />
<add key="VocabolarioConnectionString" value="Data Source=SQL2016DEV;Initial Catalog=MoonPro;Persist Security Info=True;User ID=sa;Password=keyhammer16;" />
<add key="DevicesConnectionString" value="Data Source=SQL2016DEV;Initial Catalog=Donati_Anagrafica;Persist Security Info=True;User ID=sa;Password=keyhammer16;" />
<!--gestione charting-->
<add key="ChartImageHandler" value="storage=file;timeout=20;dir=c:\TempImageFiles\;"/>
<add key="ChartImageHandler" value="storage=file;timeout=20;dir=c:\TempImageFiles\;" />
</appSettings>
<connectionStrings>
<add name="MoonProConnectionString"
connectionString="Data Source=SQL2016DEV;Initial Catalog=MoonPro;Persist Security Info=True;User ID=sa;Password=keyhammer16;"
providerName="System.Data.SqlClient"/>
<add name="MapoDb.Properties.Settings.MoonProConnectionString"
connectionString="Data Source=SQL2016DEV;Initial Catalog=MoonPro;Persist Security Info=True;User ID=sa;Password=keyhammer16;"
providerName="System.Data.SqlClient"/>
<add name="MoonProConnectionString" connectionString="Data Source=SQL2016DEV;Initial Catalog=MoonPro;Persist Security Info=True;User ID=sa;Password=keyhammer16;" providerName="System.Data.SqlClient" />
<add name="MapoDb.Properties.Settings.MoonProConnectionString" connectionString="Data Source=SQL2016DEV;Initial Catalog=MoonPro;Persist Security Info=True;User ID=sa;Password=keyhammer16;" providerName="System.Data.SqlClient" />
</connectionStrings>
<system.web>
<customErrors mode="Off"/>
<compilation debug="true" targetFramework="4.6.2"/>
<httpRuntime/>
<pages controlRenderingCompatibilityVersion="4.0"/>
<customErrors mode="Off" />
<compilation debug="true" targetFramework="4.6.2" />
<httpRuntime />
<pages controlRenderingCompatibilityVersion="4.0" />
</system.web>
<runtime>
<assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
<dependentAssembly>
<assemblyIdentity name="System.Web.Helpers" publicKeyToken="31bf3856ad364e35"/>
<bindingRedirect oldVersion="1.0.0.0-3.0.0.0" newVersion="3.0.0.0"/>
<assemblyIdentity name="System.Web.Helpers" publicKeyToken="31bf3856ad364e35" />
<bindingRedirect oldVersion="1.0.0.0-3.0.0.0" newVersion="3.0.0.0" />
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="System.Web.WebPages" publicKeyToken="31bf3856ad364e35"/>
<bindingRedirect oldVersion="1.0.0.0-3.0.0.0" newVersion="3.0.0.0"/>
<assemblyIdentity name="System.Web.WebPages" publicKeyToken="31bf3856ad364e35" />
<bindingRedirect oldVersion="1.0.0.0-3.0.0.0" newVersion="3.0.0.0" />
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="System.Web.Mvc" publicKeyToken="31bf3856ad364e35"/>
<bindingRedirect oldVersion="1.0.0.0-5.2.4.0" newVersion="5.2.4.0"/>
<assemblyIdentity name="System.Web.Mvc" publicKeyToken="31bf3856ad364e35" />
<bindingRedirect oldVersion="1.0.0.0-5.2.4.0" newVersion="5.2.4.0" />
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="Newtonsoft.Json" publicKeyToken="30ad4fe6b2a6aeed" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-11.0.0.0" newVersion="11.0.0.0" />
</dependentAssembly>
</assemblyBinding>
</runtime>
MP-MON/Web.config
+1 -1
View File
@@ -20,7 +20,7 @@
<add key="ClientValidationEnabled" value="true" />
<add key="UnobtrusiveJavaScriptEnabled" value="true" />
<!--definizione campi mostrati-->
<add key="sART" value="Disegno"/>
<add key="sART" value="Disegno" />
<!--modalità operativa e refresh-->
<add key="Environment" value="Dev" />
<add key="dataRefreshMs" value="1500" />
MP-Site/App_Start/BundleConfig.cs
+18 -6
View File
@@ -11,16 +11,28 @@ namespace MoonPro
// For more information on bundling, visit http://go.microsoft.com/fwlink/?LinkId=301862
public static void RegisterBundles(BundleCollection bundles)
{
bundles.Add(new ScriptBundle("~/bundles/bootstrap").Include(
"~/Scripts/bootstrap.js"));
bundles.Add(new ScriptBundle("~/bundles/Global").Include(
"~/Scripts/jquery-{version}.js",
"~/Scripts/jquery-ui.js"));
bundles.Add(new StyleBundle("~/Content/css").Include(
bundles.Add(new ScriptBundle("~/bundles/GlobalHead").Include(
"~/Scripts/modernizr*"));
bundles.Add(new StyleBundle("~/Content/Global").Include(
"~/Content/bootstrap.css",
"~/Content/Style.css"));
bundles.Add(new ScriptBundle("~/bundles/jquery").Include(
"~/Scripts/jquery-{version}.js"));
//bundles.Add(new ScriptBundle("~/bundles/bootstrap").Include(
// "~/Scripts/bootstrap.js"));
//bundles.Add(new StyleBundle("~/Content/css").Include(
// "~/Content/bootstrap.css",
// "~/Content/Style.css"));
//bundles.Add(new ScriptBundle("~/bundles/jquery").Include(
// "~/Scripts/jquery-{version}.js"));
bundles.Add(new ScriptBundle("~/bundles/vis").Include(
"~/vis/vis.js"));
MP-Site/Content/Style.min.css
Vendored
+1 -1
View File
File diff suppressed because one or more lines are too long
MP-Site/MP-Site.csproj
+2 -1
View File
@@ -695,6 +695,7 @@
<Content Include="Content\RobotoCondensed.woff">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</Content>
<Content Include="scripts\modernizr-2.8.3.js" />
<Content Include="WebUserControls\mod_sequencerStatiJS.ascx" />
<Content Include="WS\MPData.asmx" />
<None Include="Properties\PublishProfiles\OVH-Demo.pubxml" />
@@ -988,7 +989,7 @@
<VisualStudio>
<FlavorProperties GUID="{349c5851-65df-11da-9384-00065b846f21}">
<WebProjectProperties>
<UseIIS>False</UseIIS>
<UseIIS>True</UseIIS>
<AutoAssignPort>True</AutoAssignPort>
<DevelopmentServerPort>54806</DevelopmentServerPort>
<DevelopmentServerVPath>/</DevelopmentServerVPath>
MP-Site/MoonPro.Publish.xml
-4
View File
@@ -1,4 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<publishData>
<publishProfile publishUrl="https://10.74.82.218:8172/MsDeploy.axd" deleteExistingFiles="False" ftpAnonymousLogin="False" ftpPassiveMode="True" msdeploySite="Default Web Site/MoonPro" msdeploySiteID="" msdeployRemoteSitePhysicalPath="" msdeployAllowUntrustedCertificate="True" msdeploySkipExtraFilesOnServer="True" msdeployMarkAsApp="True" profileName="218" publishMethod="MSDeploy" replaceMatchingFiles="True" userName="administrator" savePWD="True" userPWD="AQAAANCMnd8BFdERjHoAwE/Cl+sBAAAADfdPkbM5mUeaV6YvQx8NEwAAAAACAAAAAAADZgAAwAAAABAAAAAzvHEpCVw5GzdtkAKyvpbBAAAAAASAAACgAAAAEAAAAFrJr1j6uEqm7UHJk1HFzgwQAAAAaPOu9njiTFEzemXOKD7bkRQAAACfOjGpH6Pp2QL0rQGQisg/ibpv7w==" SelectedForPublish="True" />
</publishData>
MP-Site/MoonPro.csproj.user
-31
View File
@@ -1,31 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="4.0">
<PropertyGroup>
<ProjectView>ShowAllFiles</ProjectView>
<NameOfLastUsedPublishProfile>MoonProDemo-OVH</NameOfLastUsedPublishProfile>
</PropertyGroup>
<ProjectExtensions>
<VisualStudio>
<FlavorProperties GUID="{349c5851-65df-11da-9384-00065b846f21}">
<WebProjectProperties>
<StartPageUrl>MappaStato.aspx</StartPageUrl>
<StartAction>SpecificPage</StartAction>
<AspNetDebugging>True</AspNetDebugging>
<SilverlightDebugging>False</SilverlightDebugging>
<NativeDebugging>False</NativeDebugging>
<SQLDebugging>False</SQLDebugging>
<ExternalProgram>
</ExternalProgram>
<StartExternalURL>
</StartExternalURL>
<StartCmdLineArguments>
</StartCmdLineArguments>
<StartWorkingDirectory>
</StartWorkingDirectory>
<EnableENC>False</EnableENC>
<AlwaysStartWebServerOnDebug>True</AlwaysStartWebServerOnDebug>
</WebProjectProperties>
</FlavorProperties>
</VisualStudio>
</ProjectExtensions>
</Project>
MP-Site/WebMasterPages/MAPO_refresh.master
+5 -2
View File
@@ -13,12 +13,15 @@
<link href="~/vis/vis.css" rel="stylesheet" />
<asp:PlaceHolder runat="server">
<%--<%: Scripts.Render("~/bundle/GlobalHead") %>
<%: Styles.Render("~/Content/Global") %>--%>
<%--<%: Scripts.Render("~/bundles/bootstrap") %>
<%: Scripts.Render("~/bundles/jquery") %>--%>
<%-- <%: Scripts.Render("~/bundles/vis") %>--%>
<%: Scripts.Render("~/bundles/jquery") %>--%>
<%-- <%: Scripts.Render("~/bundles/vis") %>--%>
</asp:PlaceHolder>
</head>
<body class="body">
<%--<%: Scripts.Render("~/bundle/Global") %>--%>
<form id="form1" runat="server">
<asp:ScriptManager ID="sm" runat="server" EnablePartialRendering="true" EnableScriptGlobalization="true" EnableScriptLocalization="true">
<Scripts>
MP-Site/WebMasterPages/MAPO_refresh30.master
+7 -4
View File
@@ -13,13 +13,16 @@
<script type="text/jscript" src="../vis/vis.js"></script>
<link href="../vis/vis.css" rel="stylesheet" />
<asp:PlaceHolder runat="server">
<asp:PlaceHolder runat="server">
<%--<%: Scripts.Render("~/bundle/GlobalHead") %>
<%: Styles.Render("~/Content/Global") %>--%>
<%--<%: Scripts.Render("~/bundles/bootstrap") %>
<%: Scripts.Render("~/bundles/jquery") %>--%>
<%--<%: Scripts.Render("~/bundles/vis") %>--%>
<%: Scripts.Render("~/bundles/jquery") %>--%>
<%-- <%: Scripts.Render("~/bundles/vis") %>--%>
</asp:PlaceHolder>
</head>
<body class="body">
<body class="body">
<%--<%: Scripts.Render("~/bundle/Global") %>--%>
<form id="form1" runat="server">
<asp:ScriptManager ID="sm" runat="server" EnablePartialRendering="true" EnableScriptGlobalization="true" EnableScriptLocalization="true">
</asp:ScriptManager>
MP-Site/packages.config
+1
View File
@@ -15,6 +15,7 @@
<package id="Microsoft.AspNet.Web.Optimization.WebForms" version="1.1.3" targetFramework="net462" />
<package id="Microsoft.Web.Infrastructure" version="1.0.0.0" targetFramework="net462" />
<package id="Microsoft.Web.RedisSessionStateProvider" version="2.2.6" targetFramework="net462" />
<package id="Modernizr" version="2.8.3" targetFramework="net462" />
<package id="Newtonsoft.Json" version="11.0.2" targetFramework="net462" />
<package id="popper.js" version="1.14.3" targetFramework="net462" />
<package id="StackExchange.Redis" version="1.2.6" targetFramework="net462" />
MP-Site/scripts/modernizr-2.8.3.js
Vendored
+1406
View File
File diff suppressed because it is too large Load Diff
MP-TAB/Web.config
-4
View File
@@ -122,10 +122,6 @@
</connectionStrings>
<runtime>
<assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
<!--<dependentAssembly>
<assemblyIdentity name="ICSharpCode.SharpZipLib" publicKeyToken="1b03e6acf1164f73" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-0.86.0.518" newVersion="0.86.0.518" />
</dependentAssembly>-->
<dependentAssembly>
<assemblyIdentity name="WebGrease" publicKeyToken="31bf3856ad364e35" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-1.6.5135.21930" newVersion="1.6.5135.21930" />