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

Inizio aggiunta btn barcode

Browse Source
This commit is contained in:
Samuele E. Locatelli
2018-09-25 12:59:39 +02:00
parent badbe80279
commit 61eefa2ade
9 changed files with 77 additions and 15 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=813']) {
withEnv(['NEXT_BUILD_NUMBER=814']) {
// env.versionNumber = VersionNumber(versionNumberString : '6.0.${BUILD_DATE_FORMATTED, "yyMM"}.${BUILDS_ALL_TIME}', projectStartDate : '2006-01-01', skipFailedBuilds: true)
env.versionNumber = VersionNumber(versionNumberString : '6.0.${BUILD_DATE_FORMATTED, "yyMM"}.${BUILDS_ALL_TIME}', projectStartDate : '2006-01-01', skipFailedBuilds: true, overrideBuildsAllTime: '${NEXT_BUILD_NUMBER}')
env.APP_NAME = 'MAPO'
MP-Admin/BCode.aspx
+3
View File
@@ -0,0 +1,3 @@
<%@ Page Title="" Language="C#" MasterPageFile="~/WebMasterPages/MoonPro.master" AutoEventWireup="true" CodeBehind="BCode.aspx.cs" Inherits="MoonProAdmin.BCode" %>
<asp:Content ID="Content1" ContentPlaceHolderID="ContentPlaceHolder1" runat="server">
</asp:Content>
MP-Admin/BCode.aspx.cs
+17
View File
@@ -0,0 +1,17 @@
using System;
using System.Collections.Generic;
using System.Linq;
using System.Web;
using System.Web.UI;
using System.Web.UI.WebControls;
namespace MoonProAdmin
{
public partial class BCode : System.Web.UI.Page
{
protected void Page_Load(object sender, EventArgs e)
{
}
}
}
MP-Admin/BCode.aspx.designer.cs
Generated
+17
View File
@@ -0,0 +1,17 @@
//------------------------------------------------------------------------------
// <auto-generated>
// Codice generato da uno strumento.
//
// Le modifiche a questo file possono causare un comportamento non corretto e verranno perse se
// il codice viene rigenerato.
// </auto-generated>
//------------------------------------------------------------------------------
namespace MoonProAdmin
{
public partial class BCode
{
}
}
MP-Admin/MP-Admin.csproj
+8
View File
@@ -151,6 +151,7 @@
<Content Include="approvazioneODL.aspx" />
<Content Include="approvazioneProd.aspx" />
<Content Include="App_Readme\Elmah.txt" />
<Content Include="BCode.aspx" />
<Content Include="caricaUpdateOperatori.aspx" />
<Content Include="Content\bootstrap-grid.css" />
<Content Include="Content\bootstrap-grid.min.css" />
@@ -270,6 +271,13 @@
<Compile Include="approvazioneProd.aspx.designer.cs">
<DependentUpon>approvazioneProd.aspx</DependentUpon>
</Compile>
<Compile Include="BCode.aspx.cs">
<DependentUpon>BCode.aspx</DependentUpon>
<SubType>ASPXCodeBehind</SubType>
</Compile>
<Compile Include="BCode.aspx.designer.cs">
<DependentUpon>BCode.aspx</DependentUpon>
</Compile>
<Compile Include="calendChiusura.aspx.cs">
<DependentUpon>calendChiusura.aspx</DependentUpon>
<SubType>ASPXCodeBehind</SubType>
MP-Admin/WebUserControls/mod_main_help.ascx
+16 -13
View File
@@ -1,19 +1,22 @@
<%@ Control Language="C#" AutoEventWireup="true" Inherits="mod_main_help" CodeBehind="mod_main_help.ascx.cs" %>
<div id="Div1" class="quadro1">
<asp:Button runat="server" ID="btnAnagArticoli" CssClass="btnMain" OnClick="btnAnagArticoli_Click" />
<div class="quadro1">
<asp:Button runat="server" ID="btnAnagArticoli" CssClass="btnMain" OnClick="btnAnagArticoli_Click" />
</div>
<div id="Div2" class="quadro1">
<asp:Button runat="server" ID="btnGestPromesseOdl" CssClass="btnMain" OnClick="btnGestPromesseOdl_Click" />
</div>
<div id="Div3" class="quadro1">
<asp:Button runat="server" ID="btnGestOdl" CssClass="btnMain" OnClick="btnGestOdl_Click" />
<div class="quadro1">
<asp:Button runat="server" ID="btnGestPromesseOdl" CssClass="btnMain" OnClick="btnGestPromesseOdl_Click" />
</div>
<div id="Div4" class="quadro1">
<asp:Button runat="server" ID="btnGestDatiMacchina" CssClass="btnMain" OnClick="btnGestDatiMacchina_Click" />
<div class="quadro1">
<asp:Button runat="server" ID="btnGestOdl" CssClass="btnMain" OnClick="btnGestOdl_Click" />
</div>
<div id="Div5" class="quadro1">
<asp:Button runat="server" ID="btnApprovaTC" CssClass="btnMain" OnClick="btnApprovaTC_Click" />
<div class="quadro1">
<asp:Button runat="server" ID="btnGestDatiMacchina" CssClass="btnMain" OnClick="btnGestDatiMacchina_Click" />
</div>
<div id="Div6" class="quadro1">
<asp:Button runat="server" ID="btnApprovaProd" CssClass="btnMain" OnClick="btnApprovaProd_Click" />
<div class="quadro1">
<asp:Button runat="server" ID="btnApprovaTC" CssClass="btnMain" OnClick="btnApprovaTC_Click" />
</div>
<div class="quadro1">
<asp:Button runat="server" ID="btnApprovaProd" CssClass="btnMain" OnClick="btnApprovaProd_Click" />
</div>
<div class="quadro1">
<asp:Button runat="server" ID="btnBCode" CssClass="btnMain" OnClick="btnBCode_Click" />
</div>
MP-Admin/WebUserControls/mod_main_help.ascx.cs
+5
View File
@@ -13,6 +13,7 @@ public partial class mod_main_help : ApplicationUserControl
btnGestDatiMacchina.Text = traduci("btnGestDatiMacchina");
btnApprovaTC.Text = traduci("btnApprovaTC");
btnApprovaProd.Text = traduci("btnApprovaProd");
btnBCode.Text = traduci("btnBCode");
}
protected void btnGestPromesseOdl_Click(object sender, EventArgs e)
@@ -43,4 +44,8 @@ public partial class mod_main_help : ApplicationUserControl
Response.Redirect("~/approvazioneProd.aspx");
}
protected void btnBCode_Click(object sender, EventArgs e)
{
Response.Redirect("~/BCode.aspx");
}
}
MP-Admin/WebUserControls/mod_main_help.ascx.designer.cs
Generated
+9
View File
@@ -64,4 +64,13 @@ public partial class mod_main_help {
/// Per la modifica, spostare la dichiarazione di campo dal file di progettazione al file code-behind.
/// </remarks>
protected global::System.Web.UI.WebControls.Button btnApprovaProd;
/// <summary>
/// Controllo btnBCode.
/// </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.Button btnBCode;
}
MP-Admin/WebUserControls/mod_menuBottom.ascx
+1 -1
View File
@@ -21,7 +21,7 @@
<div id="progress_back">
</div>
<div id="progress_top">
<i class="fa fa-cog fa-spin fa-2x"></i>&nbsp;<i class="fa fa-cog fa-spin fa-2x"></i>&nbsp;<i class="fa fa-cog fa-spin fa-2x"></i>&nbsp;
<i class="fa fa-cog fa-spin fa"></i>&nbsp;<i class="fa fa-cog fa-spin fa"></i>&nbsp;<i class="fa fa-cog fa-spin fa"></i>&nbsp;
</div>
</ProgressTemplate>
</asp:UpdateProgress>