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

Fix buttons

Browse Source
This commit is contained in:
Samuele E. Locatelli
2018-03-19 19:07:52 +01:00
parent a627e5d7a5
commit 625b6fcbb0
12 changed files with 3195 additions and 116 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Jenkinsfile
Vendored
+1 -1
View File
@@ -9,7 +9,7 @@ pipeline {
steps {
/* calcolo numero versione... diverso x branch MASTER/DEVELOP */
script {
withEnv(['NEXT_BUILD_NUMBER=223']) {
withEnv(['NEXT_BUILD_NUMBER=224']) {
// env.versionNumber = VersionNumber(versionNumberString : '1.7.${BUILD_DATE_FORMATTED, "yyMM"}.${BUILDS_ALL_TIME}', projectStartDate : '2006-01-01', skipFailedBuilds: true)
env.versionNumber = VersionNumber(versionNumberString : '1.7.${BUILD_DATE_FORMATTED, "yyMM"}.${BUILDS_ALL_TIME}', projectStartDate : '2006-01-01', skipFailedBuilds: true, overrideBuildsAllTime: '${NEXT_BUILD_NUMBER}')
env.APP_NAME = 'CMS-SC'
XPST/App_Readme/Elmah.txt
+15
View File
@@ -0,0 +1,15 @@
A new HTTP handler has been configured in your application for consulting the
error log and its feeds. It is reachable at elmah.axd under your application
root. If, for example, your application is deployed at http://www.example.com,
the URL for ELMAH would be http://www.example.com/elmah.axd. You can, of
course, change this path in your application's configuration file.
ELMAH is also set up to be secure such that it can only be accessed locally.
You can enable remote access but then it is paramount that you secure access
to authorized users or/and roles only. This can be done using standard
authorization rules and configuration already built into ASP.NET. For more
information, see http://code.google.com/p/elmah/wiki/SecuringErrorLogPages on
the project site.
Please review the commented out authorization section under
<location path="elmah.axd"> and make the appropriate changes.
XPST/App_Start/BundleConfig.cs
+6 -3
View File
@@ -27,10 +27,13 @@ namespace XPST
// ready for production, use the build tool at http://modernizr.com to pick only the tests you need
//bundles.Add(new ScriptBundle("~/bundles/modernizr").Include("~/Scripts/modernizr-*"));
bundles.Add(new ScriptBundle("~/bundles/jquery").Include("~/Scripts/jquery-{version}.js"));
bundles.Add(new ScriptBundle("~/bundles/jqueryui").Include("~/Scripts/jquery-ui-{version}.js"));
bundles.Add(new ScriptBundle("~/bundles/jquery").Include(
"~/Scripts/jquery-{version}.js"));
bundles.Add(new ScriptBundle("~/bundles/jqueryui").Include(
"~/Scripts/jquery-ui-{version}.js"));
//bundles.Add(new ScriptBundle("~/bundles/BrowserWindowSize").Include("~/Scripts/BrowserWindowSize.js"));
bundles.Add(new ScriptBundle("~/bundles/bootstrap").Include("~/Scripts/bootstrap.bundle.js"));
bundles.Add(new ScriptBundle("~/bundles/bootstrap").Include(
"~/Scripts/bootstrap.bundle.js"));
//bundles.Add(new ScriptBundle("~/bundles/jqueryui-i18n").Include(
// "~/Scripts/jquery-ui-i18n.min.js"));
XPST/Global.asax.cs
+40 -35
View File
@@ -5,45 +5,50 @@ using System.Web;
using System.Web.Security;
using System.Web.SessionState;
using System.Web.Routing;
using System.Web.Optimization;
namespace XPST
{
public class Global : System.Web.HttpApplication
public class Global : System.Web.HttpApplication
{
protected void Application_Start(object sender, EventArgs e)
{
// Code that runs on application startup
BundleConfig.RegisterBundles(BundleTable.Bundles);
// aggiungo friendlyUrls...
RouteConfig.RegisterRoutes(RouteTable.Routes);
}
protected void Session_Start(object sender, EventArgs e)
{
protected void Application_Start(object sender, EventArgs e)
{
RouteConfig.RegisterRoutes(RouteTable.Routes);
}
protected void Session_Start(object sender, EventArgs e)
{
}
protected void Application_BeginRequest(object sender, EventArgs e)
{
}
protected void Application_AuthenticateRequest(object sender, EventArgs e)
{
}
protected void Application_Error(object sender, EventArgs e)
{
}
protected void Session_End(object sender, EventArgs e)
{
}
protected void Application_End(object sender, EventArgs e)
{
}
}
protected void Application_BeginRequest(object sender, EventArgs e)
{
}
protected void Application_AuthenticateRequest(object sender, EventArgs e)
{
}
protected void Application_Error(object sender, EventArgs e)
{
}
protected void Session_End(object sender, EventArgs e)
{
}
protected void Application_End(object sender, EventArgs e)
{
}
}
}
XPST/NLog.config
+41
View File
@@ -0,0 +1,41 @@
<?xml version="1.0" encoding="utf-8" ?>
<nlog xmlns="http://www.nlog-project.org/schemas/NLog.xsd"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://www.nlog-project.org/schemas/NLog.xsd NLog.xsd"
autoReload="true"
throwExceptions="false"
internalLogLevel="Off" internalLogFile="c:\temp\nlog-internal.log">
<!-- optional, add some variables
https://github.com/nlog/NLog/wiki/Configuration-file#variables
-->
<variable name="myvar" value="myvalue"/>
<!--
See https://github.com/nlog/nlog/wiki/Configuration-file
for information on customizing logging rules and outputs.
-->
<targets>
<!--
add your targets here
See https://github.com/nlog/NLog/wiki/Targets for possible targets.
See https://github.com/nlog/NLog/wiki/Layout-Renderers for the possible layout renderers.
-->
<!--
Write events to a file with the date in the filename.
<target xsi:type="File" name="f" fileName="${basedir}/logs/${shortdate}.log"
layout="${longdate} ${uppercase:${level}} ${message}" />
-->
</targets>
<rules>
<!-- add your logging rules here -->
<!--
Write all events with minimal level of Debug (So Debug, Info, Warn, Error and Fatal, but not Trace) to "f"
<logger name="*" minlevel="Debug" writeTo="f" />
-->
</rules>
</nlog>
XPST/NLog.xsd
+3027
View File
File diff suppressed because it is too large Load Diff
XPST/Web.config
+41 -3
View File
@@ -1,5 +1,13 @@
<?xml version="1.0" encoding="utf-8"?>
<configuration>
<configSections>
<sectionGroup name="elmah">
<section name="security" requirePermission="false" type="Elmah.SecuritySectionHandler, Elmah" />
<section name="errorLog" requirePermission="false" type="Elmah.ErrorLogSectionHandler, Elmah" />
<section name="errorMail" requirePermission="false" type="Elmah.ErrorMailSectionHandler, Elmah" />
<section name="errorFilter" requirePermission="false" type="Elmah.ErrorFilterSectionHandler, Elmah" />
</sectionGroup>
</configSections>
<!--
For a description of web.config changes see http://go.microsoft.com/fwlink/?LinkId=235367.
@@ -26,7 +34,7 @@
<add verb="GET,HEAD,POST" path="*.asbx" type="System.Web.Script.Services.ScriptHandlerFactory, System.Web.Extensions, Version=1.0.61025.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35" validate="false" />
</httpHandlers>
<httpModules>
</httpModules>
<add name="ErrorLog" type="Elmah.ErrorLogModule, Elmah" /><add name="ErrorMail" type="Elmah.ErrorMailModule, Elmah" /><add name="ErrorFilter" type="Elmah.ErrorFilterModule, Elmah" /></httpModules>
<customErrors mode="Off" />
<!--<customErrors mode="RemoteOnly" defaultRedirect="unauthorized.aspx"/>-->
<httpRuntime maxRequestLength="102400" />
@@ -137,7 +145,11 @@
<handlers>
<add name="ASBXHandler" verb="GET,HEAD,POST" path="*.asbx" preCondition="integratedMode" type="System.Web.Script.Services.ScriptHandlerFactory, System.Web.Extensions, Version=1.0.61025.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35" />
</handlers>
</system.webServer>
<modules>
<add name="ErrorLog" type="Elmah.ErrorLogModule, Elmah" preCondition="managedHandler" />
<add name="ErrorMail" type="Elmah.ErrorMailModule, Elmah" preCondition="managedHandler" />
<add name="ErrorFilter" type="Elmah.ErrorFilterModule, Elmah" preCondition="managedHandler" />
</modules></system.webServer>
<runtime>
<assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
<dependentAssembly>
@@ -166,4 +178,30 @@
</dependentAssembly>
</assemblyBinding>
</runtime>
</configuration>
<elmah>
<!--
See http://code.google.com/p/elmah/wiki/SecuringErrorLogPages for
more information on remote access and securing ELMAH.
-->
<security allowRemoteAccess="false" />
</elmah><location path="elmah.axd" inheritInChildApplications="false">
<system.web>
<httpHandlers>
<add verb="POST,GET,HEAD" path="elmah.axd" type="Elmah.ErrorLogPageFactory, Elmah" />
</httpHandlers>
<!--
See http://code.google.com/p/elmah/wiki/SecuringErrorLogPages for
more information on using ASP.NET authorization securing ELMAH.
<authorization>
<allow roles="admin" />
<deny users="*" />
</authorization>
-->
</system.web>
<system.webServer>
<handlers>
<add name="ELMAH" verb="POST,GET,HEAD" path="elmah.axd" type="Elmah.ErrorLogPageFactory, Elmah" preCondition="integratedMode" />
</handlers>
</system.webServer>
</location></configuration>
XPST/WebUserControls/mod_btnComandi.ascx
+6 -6
View File
@@ -3,36 +3,36 @@
<div class="row my-2">
<div class="col-6">
<asp:LinkButton ID="lbt1" runat="server" CssClass="btn btn-lg btn-block btn-success" OnClick="lbt1_Click">
<i class="fa fa-plus"></i> <asp:Label runat="server" ID="lbl01" />
<i class="fa fa-plus"></i> <%: comandiAmmessi["04"] %>
</asp:LinkButton>
</div>
<div class="col-6">
<asp:LinkButton ID="lbt2" runat="server" CssClass="btn btn-lg btn-block btn-primary" OnClick="lbt2_Click">
<i class="fa fa-gear"></i> <asp:Label runat="server" ID="lbl02" />
<i class="fa fa-gear"></i> <%: comandiAmmessi["05"] %>
</asp:LinkButton>
</div>
</div>
<div class="row my-2">
<div class="col-6">
<asp:LinkButton ID="lbt3" runat="server" CssClass="btn btn-lg btn-block btn-dark" OnClick="lbt3_Click">
<i class="fa fa-star"></i> <asp:Label runat="server" ID="lbl03" />
<i class="fa fa-star"></i> <%: comandiAmmessi["06"] %>
</asp:LinkButton>
</div>
<div class="col-6">
<asp:LinkButton ID="lbt4" runat="server" CssClass="btn btn-lg btn-block btn-warning" OnClick="lbt4_Click">
<i class="fa fa-info"></i> <asp:Label runat="server" ID="lbl04" />
<i class="fa fa-info"></i> <%: comandiAmmessi["07"] %>
</asp:LinkButton>
</div>
</div>
<div class="row my-2">
<div class="col-6">
<asp:LinkButton ID="lbt5" runat="server" CssClass="btn btn-lg btn-block btn-success" OnClick="lbt5_Click">
<i class="fa fa-check"></i> <asp:Label runat="server" ID="lbl05" />
<i class="fa fa-check"></i> <%: comandiAmmessi["ok"] %>
</asp:LinkButton>
</div>
<div class="col-6">
<asp:LinkButton ID="lbt6" runat="server" CssClass="btn btn-lg btn-block btn-dark" OnClick="lbt6_Click">
<i class="fa fa-ban"></i> <asp:Label runat="server" ID="lbl06" />
<i class="fa fa-ban"></i> <%: comandiAmmessi["ko"] %>
</asp:LinkButton>
</div>
</div>
XPST/WebUserControls/mod_btnComandi.ascx.cs
-14
View File
@@ -19,20 +19,6 @@ namespace XPST.WebUserControls
protected void Page_Load(object sender, EventArgs e)
{
setupComandiBarcode();
disegnaBtn();
}
/// <summary>
/// effettua disegno dei buttons
/// </summary>
private void disegnaBtn()
{
// carico i comandi nei buttons
lbl01.Text = comandiAmmessi["04"];
lbl02.Text = comandiAmmessi["05"];
lbl03.Text = comandiAmmessi["06"];
lbl04.Text = comandiAmmessi["07"];
lbl05.Text = comandiAmmessi["ok"];
lbl06.Text = comandiAmmessi["ko"];
updateBtn();
}
/// <summary>
XPST/WebUserControls/mod_btnComandi.ascx.designer.cs
Generated
-54
View File
@@ -21,15 +21,6 @@ namespace XPST.WebUserControls {
/// </remarks>
protected global::System.Web.UI.WebControls.LinkButton lbt1;
/// <summary>
/// Controllo lbl01.
/// </summary>
/// <remarks>
/// Campo generato automaticamente.
/// Per la modifica, spostare la dichiarazione di campo dal file di progettazione al file code-behind.
/// </remarks>
protected global::System.Web.UI.WebControls.Label lbl01;
/// <summary>
/// Controllo lbt2.
/// </summary>
@@ -39,15 +30,6 @@ namespace XPST.WebUserControls {
/// </remarks>
protected global::System.Web.UI.WebControls.LinkButton lbt2;
/// <summary>
/// Controllo lbl02.
/// </summary>
/// <remarks>
/// Campo generato automaticamente.
/// Per la modifica, spostare la dichiarazione di campo dal file di progettazione al file code-behind.
/// </remarks>
protected global::System.Web.UI.WebControls.Label lbl02;
/// <summary>
/// Controllo lbt3.
/// </summary>
@@ -57,15 +39,6 @@ namespace XPST.WebUserControls {
/// </remarks>
protected global::System.Web.UI.WebControls.LinkButton lbt3;
/// <summary>
/// Controllo lbl03.
/// </summary>
/// <remarks>
/// Campo generato automaticamente.
/// Per la modifica, spostare la dichiarazione di campo dal file di progettazione al file code-behind.
/// </remarks>
protected global::System.Web.UI.WebControls.Label lbl03;
/// <summary>
/// Controllo lbt4.
/// </summary>
@@ -75,15 +48,6 @@ namespace XPST.WebUserControls {
/// </remarks>
protected global::System.Web.UI.WebControls.LinkButton lbt4;
/// <summary>
/// Controllo lbl04.
/// </summary>
/// <remarks>
/// Campo generato automaticamente.
/// Per la modifica, spostare la dichiarazione di campo dal file di progettazione al file code-behind.
/// </remarks>
protected global::System.Web.UI.WebControls.Label lbl04;
/// <summary>
/// Controllo lbt5.
/// </summary>
@@ -93,15 +57,6 @@ namespace XPST.WebUserControls {
/// </remarks>
protected global::System.Web.UI.WebControls.LinkButton lbt5;
/// <summary>
/// Controllo lbl05.
/// </summary>
/// <remarks>
/// Campo generato automaticamente.
/// Per la modifica, spostare la dichiarazione di campo dal file di progettazione al file code-behind.
/// </remarks>
protected global::System.Web.UI.WebControls.Label lbl05;
/// <summary>
/// Controllo lbt6.
/// </summary>
@@ -110,14 +65,5 @@ namespace XPST.WebUserControls {
/// Per la modifica, spostare la dichiarazione di campo dal file di progettazione al file code-behind.
/// </remarks>
protected global::System.Web.UI.WebControls.LinkButton lbt6;
/// <summary>
/// Controllo lbl06.
/// </summary>
/// <remarks>
/// Campo generato automaticamente.
/// Per la modifica, spostare la dichiarazione di campo dal file di progettazione al file code-behind.
/// </remarks>
protected global::System.Web.UI.WebControls.Label lbl06;
}
}
XPST/XPST.csproj
+13
View File
@@ -82,6 +82,9 @@
<Reference Include="AspNet.ScriptManager.jQuery.UI.Combined, Version=1.12.1.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\AspNet.ScriptManager.jQuery.UI.Combined.1.12.1\lib\net45\AspNet.ScriptManager.jQuery.UI.Combined.dll</HintPath>
</Reference>
<Reference Include="Elmah, Version=1.2.14706.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\elmah.corelibrary.1.2.2\lib\Elmah.dll</HintPath>
</Reference>
<Reference Include="Microsoft.AspNet.FriendlyUrls, Version=1.0.2.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
<HintPath>..\packages\Microsoft.AspNet.FriendlyUrls.Core.1.0.2\lib\net45\Microsoft.AspNet.FriendlyUrls.dll</HintPath>
<Private>True</Private>
@@ -105,6 +108,9 @@
<Reference Include="Newtonsoft.Json, Version=11.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
<HintPath>..\packages\Newtonsoft.Json.11.0.1\lib\net45\Newtonsoft.Json.dll</HintPath>
</Reference>
<Reference Include="NLog, Version=4.0.0.0, Culture=neutral, PublicKeyToken=5120e14c03d0593c, processorArchitecture=MSIL">
<HintPath>..\packages\NLog.4.4.13\lib\net45\NLog.dll</HintPath>
</Reference>
<Reference Include="StackExchange.Redis, Version=1.2.6.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\StackExchange.Redis.1.2.6\lib\net46\StackExchange.Redis.dll</HintPath>
</Reference>
@@ -135,6 +141,7 @@
</Reference>
</ItemGroup>
<ItemGroup>
<Content Include="App_Readme\Elmah.txt" />
<Content Include="barcode.aspx" />
<Content Include="Content\bootstrap-grid.css" />
<Content Include="Content\bootstrap-grid.min.css" />
@@ -458,6 +465,12 @@
<Content Include="Scripts\esm\popper-utils.min.js.map" />
<Content Include="Scripts\esm\popper-utils.js.map" />
<Content Include="Bundle.config" />
<Content Include="NLog.config">
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
</Content>
<None Include="NLog.xsd">
<SubType>Designer</SubType>
</None>
<None Include="Scripts\jquery-3.3.1.intellisense.js" />
<Content Include="Scripts\jquery-3.3.1.js" />
<Content Include="Scripts\jquery-3.3.1.min.js" />
XPST/packages.config
+5
View File
@@ -4,6 +4,8 @@
<package id="AspNet.ScriptManager.jQuery" version="3.3.1" targetFramework="net462" />
<package id="AspNet.ScriptManager.jQuery.UI.Combined" version="1.12.1" targetFramework="net462" />
<package id="bootstrap" version="4.0.0" targetFramework="net462" />
<package id="elmah" version="1.2.2" targetFramework="net462" />
<package id="elmah.corelibrary" version="1.2.2" targetFramework="net462" />
<package id="FontAwesome" version="4.7.0" targetFramework="net462" />
<package id="jQuery" version="3.3.1" targetFramework="net462" />
<package id="jquery.mobile" version="1.4.5" targetFramework="net462" />
@@ -17,6 +19,9 @@
<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="Newtonsoft.Json" version="11.0.1" targetFramework="net462" />
<package id="NLog" version="4.4.13" targetFramework="net462" />
<package id="NLog.Config" version="4.4.13" targetFramework="net462" />
<package id="NLog.Schema" version="4.4.13" targetFramework="net462" />
<package id="popper.js" version="1.14.1" targetFramework="net462" />
<package id="StackExchange.Redis" version="1.2.6" targetFramework="net462" />
<package id="StackExchange.Redis.StrongName" version="1.2.6" targetFramework="net462" />