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

Merge branch 'develop'

Browse Source
This commit is contained in:
Samuele E. Locatelli
2020-02-08 16:38:22 +01:00
parent 3b41e6c504 78b210e640
commit 97d6ebd6d5
27 changed files with 113 additions and 49 deletions
Download Patch File Download Diff File Expand all files Collapse all files
NKC_WF/NKC_WF.csproj
+8
View File
@@ -400,6 +400,7 @@
<Content Include="WebUserControls\cmp_offlineOrders.ascx" />
<Content Include="WebUserControls\cmp_offOrderDetail.ascx" />
<Content Include="WebUserControls\cmp_OOLI_detail.ascx" />
<Content Include="WebUserControls\cmp_painting.ascx" />
<Content Include="WebUserControls\cmp_scrapList.ascx" />
<Content Include="WebUserControls\cmp_slider.ascx" />
<Content Include="WebUserControls\cmp_stackBuilding.ascx" />
@@ -947,6 +948,13 @@
<Compile Include="WebUserControls\cmp_OOLI_detail.ascx.designer.cs">
<DependentUpon>cmp_OOLI_detail.ascx</DependentUpon>
</Compile>
<Compile Include="WebUserControls\cmp_painting.ascx.cs">
<DependentUpon>cmp_painting.ascx</DependentUpon>
<SubType>ASPXCodeBehind</SubType>
</Compile>
<Compile Include="WebUserControls\cmp_painting.ascx.designer.cs">
<DependentUpon>cmp_painting.ascx</DependentUpon>
</Compile>
<Compile Include="WebUserControls\cmp_scrapList.ascx.cs">
<DependentUpon>cmp_scrapList.ascx</DependentUpon>
<SubType>ASPXCodeBehind</SubType>
NKC_WF/Web.config
+2 -2
View File
@@ -1,4 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
<?xml version="1.0"?>
<!--
Per altre informazioni su come configurare l'applicazione ASP.NET, vedere
https://go.microsoft.com/fwlink/?LinkId=169433
@@ -13,7 +13,7 @@
</sectionGroup>
</configSections>
<system.web>
<compilation targetFramework="4.6.2"/>
<compilation targetFramework="4.6.2" debug="true"/>
<httpRuntime targetFramework="4.6.2"/>
<pages>
<namespaces>
NKC_WF/WebUserControls/cmp_fileUpload.ascx.cs
+1 -1
View File
@@ -138,7 +138,7 @@ namespace NKC_WF.WebUserContols
{
uploadedFilename = Path.GetFileName(FileUpload1.PostedFile.FileName.Replace(" ", "_"));
csvFileName = $"{adesso.ToString("dd-HHmmss")}_{uploadedFilename}";
batchName = uploadedFilename.Replace(".csv", "");
batchName = uploadedFilename.ToLower().Replace(".csv", "").Replace("cnc", "").Replace("kit", "");
savedFilename = Server.MapPath($"{_tempUploadDir}{csvFileName}");
contentType = FileUpload1.PostedFile.ContentType;
// accedo allo stream del file allegato
NKC_WF/WebUserControls/cmp_homeButtons.ascx.cs
+1 -1
View File
@@ -34,7 +34,7 @@ namespace NKC_WF.WebUserControls
}
catch
{
Response.Redirect(user_std.pagCorrente, false);
Response.Redirect("Default", false);
}
}
/// <summary>
NKC_WF/WebUserControls/cmp_kitImpCheck.ascx.cs
+1 -1
View File
@@ -90,7 +90,7 @@ namespace NKC_WF.WebUserControls
private void processValidation()
{
// controllo ed aggiorno...
bool fileOk = fileName != "";
bool fileOk = !string.IsNullOrEmpty(fileName);
bool testOk = checkOk == "YES";
bool importOk = imported == "TRUE";
NKC_WF/WebUserControls/cmp_kitList.ascx
+4
View File
@@ -1 +1,5 @@
<%@ Control Language="C#" AutoEventWireup="true" CodeBehind="cmp_kitList.ascx.cs" Inherits="NKC_WF.WebUserControls.cmp_kitList" %>
<hr />
dati kit list (?!?!?)
NKC_WF/WebUserControls/cmp_kitList.ascx.designer.cs
Generated
+3 -3
View File
@@ -1,10 +1,10 @@
//------------------------------------------------------------------------------
// <auto-generated>
// <generato automaticamente>
// 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>
// il codice viene rigenerato.
// </generato automaticamente>
//------------------------------------------------------------------------------
namespace NKC_WF.WebUserControls
NKC_WF/WebUserControls/cmp_menuTop.ascx.cs
+1 -1
View File
@@ -90,7 +90,7 @@ namespace NKC_WF.WebUserControls
}
catch
{
Response.Redirect(user_std.pagCorrente, false);
Response.Redirect("Default", false);
}
}
/// <summary>
NKC_WF/WebUserControls/cmp_painting.ascx
+3
View File
@@ -0,0 +1,3 @@
<%@ Control Language="C#" AutoEventWireup="true" CodeBehind="cmp_painting.ascx.cs" Inherits="NKC_WF.WebUserControls.cmp_painting" %>
gestione painting
NKC_WF/WebUserControls/cmp_painting.ascx.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 NKC_WF.WebUserControls
{
public partial class cmp_painting : System.Web.UI.UserControl
{
protected void Page_Load(object sender, EventArgs e)
{
}
}
}
NKC_WF/WebUserControls/cmp_painting.ascx.designer.cs
Generated
+17
View File
@@ -0,0 +1,17 @@
//------------------------------------------------------------------------------
// <generato automaticamente>
// Codice generato da uno strumento.
//
// Le modifiche a questo file possono causare un comportamento non corretto e verranno perse se
// il codice viene rigenerato.
// </generato automaticamente>
//------------------------------------------------------------------------------
namespace NKC_WF.WebUserControls
{
public partial class cmp_painting
{
}
}
NKC_WF/site/DevUtils.aspx.cs
+4 -1
View File
@@ -11,7 +11,10 @@ namespace NKC_WF
{
protected void Page_Load(object sender, EventArgs e)
{
if (!Page.IsPostBack)
{
((SiteMaster)this.Master).showSearch = false;
}
}
}
}
NKC_WF/site/GlobalSearch.aspx.cs
+4 -1
View File
@@ -11,7 +11,10 @@ namespace NKC_WF.site
{
protected void Page_Load(object sender, EventArgs e)
{
if (!Page.IsPostBack)
{
((SiteContent)this.Master).showSearch = false;
}
}
}
}
NKC_WF/site/Home.aspx.cs
+4 -1
View File
@@ -11,7 +11,10 @@ namespace NKC_WF
{
protected void Page_Load(object sender, EventArgs e)
{
if (!Page.IsPostBack)
{
((SiteContent)this.Master).showSearch = false;
}
}
}
}
NKC_WF/site/KitRequestImporter.aspx
+1
View File
@@ -14,6 +14,7 @@
<div class="row">
<div class="col-12">
<uc1:cmp_fileUpload runat="server" ID="cmp_fileUpload" isWriteEnabled="true" />
<hr />
</div>
<div class="col-12">
<uc1:cmp_kitImpCheck runat="server" id="cmp_kitImpCheck" />
NKC_WF/site/KitRequestImporter.aspx.cs
+1 -17
View File
@@ -20,6 +20,7 @@ namespace NKC_WF
{
if (!Page.IsPostBack)
{
((SiteContent)this.Master).showSearch = false;
doUpdate();
}
cmp_kitImpCheck.eh_doRefresh += Cmp_kitImpCheck_eh_doRefresh;
@@ -58,23 +59,6 @@ namespace NKC_WF
cmp_kitImpCheck.batchName = e.BatchName;
// chiamo procedure check...
cmp_kitImpCheck.tryImport(true);
#if false
try
{
// chiamo procedura SQL x import BATCH... PER ORA TEST!
int numTicket = 0;
var tabCount = DataLayer.man.taCount.getNextNum("NumTicket");
if (tabCount.Count == 1)
{
numTicket = tabCount[0].LastNum;
}
DataLayer.man.taImpLog.importCsvKit($"{dirImport}", e.FileName, e.BatchName, ";", "\n", "2", numTicket, 0, 0, true);
}
catch (Exception exc)
{
logger.lg.scriviLog($"KitCsvMan: Eccezione in IMPORT file:{Environment.NewLine}{exc}");
}
#endif
doUpdate();
}
NKC_WF/site/Kitting.aspx.cs
+4 -1
View File
@@ -11,7 +11,10 @@ namespace NKC_WF
{
protected void Page_Load(object sender, EventArgs e)
{
if (!Page.IsPostBack)
{
((SiteContent)this.Master).showSearch = false;
}
}
}
}
NKC_WF/site/LabelsPrint.aspx.cs
+4 -1
View File
@@ -11,7 +11,10 @@ namespace NKC_WF.site
{
protected void Page_Load(object sender, EventArgs e)
{
if (!Page.IsPostBack)
{
((SiteContent)this.Master).showSearch = false;
}
}
}
}
NKC_WF/site/MachineLoad.aspx.cs
+4
View File
@@ -6,6 +6,10 @@ namespace NKC_WF
{
protected void Page_Load(object sender, EventArgs e)
{
if (!Page.IsPostBack)
{
((SiteContent)this.Master).showSearch = false;
}
cmp_stackLoading.eh_doRefresh += Cmp_stackLoading_eh_doRefresh;
}
NKC_WF/site/MachineUnload.aspx.cs
+1
View File
@@ -10,6 +10,7 @@ namespace NKC_WF
{
if (!Page.IsPostBack)
{
((SiteMaster)this.Master).showSearch = false;
doUpdate();
}
}
NKC_WF/site/MachineUnloadSmart.aspx.cs
+1
View File
@@ -9,6 +9,7 @@ namespace NKC_WF
{
if (!Page.IsPostBack)
{
((SiteMaster)this.Master).showSearch = false;
doUpdate();
}
}
NKC_WF/site/Painting.aspx
+3 -2
View File
@@ -1,7 +1,8 @@
<%@ Page Title="" Language="C#" MasterPageFile="~/SiteContent.master" AutoEventWireup="true" CodeBehind="Painting.aspx.cs" Inherits="NKC_WF.Painting" %>
<%@ Register Src="~/WebUserControls/tpl_WIP.ascx" TagPrefix="uc1" TagName="tpl_WIP" %>
<%@ Register Src="~/WebUserControls/cmp_painting.ascx" TagPrefix="uc1" TagName="cmp_painting" %>
<asp:Content ID="Content1" ContentPlaceHolderID="MainContent" runat="server">
<uc1:tpl_WIP runat="server" ID="tpl_WIP" />
<uc1:cmp_painting runat="server" id="cmp_painting" />
</asp:Content>
NKC_WF/site/Painting.aspx.cs
+1 -1
View File
@@ -11,7 +11,7 @@ namespace NKC_WF
{
protected void Page_Load(object sender, EventArgs e)
{
((SiteContent)this.Master).showSearch = false;
}
}
}
NKC_WF/site/Painting.aspx.designer.cs
Generated
+16 -14
View File
@@ -7,18 +7,20 @@
// </generato automaticamente>
//------------------------------------------------------------------------------
namespace NKC_WF {
public partial class Painting {
/// <summary>
/// Controllo tpl_WIP.
/// </summary>
/// <remarks>
/// Campo generato automaticamente.
/// Per la modifica, spostare la dichiarazione di campo dal file di progettazione al file code-behind.
/// </remarks>
protected global::NKC_WF.WebUserControls.tpl_WIP tpl_WIP;
}
namespace NKC_WF
{
public partial class Painting
{
/// <summary>
/// Controllo cmp_painting.
/// </summary>
/// <remarks>
/// Campo generato automaticamente.
/// Per la modifica, spostare la dichiarazione di campo dal file di progettazione al file code-behind.
/// </remarks>
protected global::NKC_WF.WebUserControls.cmp_painting cmp_painting;
}
}
NKC_WF/site/SecondScreen.aspx.cs
+4 -1
View File
@@ -11,7 +11,10 @@ namespace NKC_WF
{
protected void Page_Load(object sender, EventArgs e)
{
if (!Page.IsPostBack)
{
((SiteContent)this.Master).showSearch = false;
}
}
}
}
NKC_WF/site/StackManager.aspx.cs
+1
View File
@@ -9,6 +9,7 @@ namespace NKC_WF
{
if (!Page.IsPostBack)
{
((SiteMaster)this.Master).showSearch = false;
checkVisibility();
}
cmp_taktList.eh_doRefresh += Cmp_taktList_eh_doRefresh;
NKC_WF/site/vocabolario.aspx.cs
+2
View File
@@ -8,8 +8,10 @@ namespace NKC_WF
protected override void OnInit(EventArgs e)
{
base.OnInit(e);
if (!Page.IsPostBack)
{
((SiteMaster)this.Master).showSearch = false;
mod_righePag.numRowPag = 10;
mod_vocabolario.pageSize = mod_righePag.numRowPag;
}