diff --git a/Jenkinsfile b/Jenkinsfile
index 27f71f8..111802f 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -11,7 +11,7 @@ pipeline {
steps {
/* calcolo numero versione... diverso x branch MASTER/DEVELOP */
script {
- withEnv(['NEXT_BUILD_NUMBER=400']) {
+ withEnv(['NEXT_BUILD_NUMBER=401']) {
// env.versionNumber = VersionNumber(versionNumberString : '2.0.${BUILD_DATE_FORMATTED, "yyMM"}.${BUILDS_ALL_TIME}', projectStartDate : '2019-07-01', skipFailedBuilds: true)
env.versionNumber = VersionNumber(versionNumberString : '2.0.${BUILD_DATE_FORMATTED, "yyMM"}.${BUILDS_ALL_TIME}', projectStartDate : '2019-07-01', skipFailedBuilds: true, overrideBuildsAllTime: '${NEXT_BUILD_NUMBER}')
env.versionNumberBeta = VersionNumber(versionNumberString : '1.3.${BUILD_DATE_FORMATTED, "yyMM"}-beta.${BUILDS_ALL_TIME}', projectStartDate : '2019-07-01', skipFailedBuilds: true, overrideBuildsAllTime: '${NEXT_BUILD_NUMBER}')
diff --git a/NKC_WF/Images/LogoEgaltech.png b/NKC_WF/Images/LogoEgaltech.png
deleted file mode 100644
index f94c1f4..0000000
Binary files a/NKC_WF/Images/LogoEgaltech.png and /dev/null differ
diff --git a/NKC_WF/Images/LogoEgalware.png b/NKC_WF/Images/LogoEgalware.png
new file mode 100644
index 0000000..6e5c8bf
Binary files /dev/null and b/NKC_WF/Images/LogoEgalware.png differ
diff --git a/NKC_WF/Images/LogoSteamware.png b/NKC_WF/Images/LogoSteamware.png
deleted file mode 100644
index 012685c..0000000
Binary files a/NKC_WF/Images/LogoSteamware.png and /dev/null differ
diff --git a/NKC_WF/NKC_WF.csproj b/NKC_WF/NKC_WF.csproj
index 2eae9ce..15f7b3c 100644
--- a/NKC_WF/NKC_WF.csproj
+++ b/NKC_WF/NKC_WF.csproj
@@ -305,12 +305,7 @@
-
- Always
-
-
- Always
-
+
Always
@@ -478,6 +473,7 @@
+
@@ -1108,6 +1104,13 @@
cmp_batchDetailData.ascx
+
+ cmp_batchDetailMongo.ascx
+ ASPXCodeBehind
+
+
+ cmp_batchDetailMongo.ascx
+
cmp_batchDetailSplit.ascx
ASPXCodeBehind
diff --git a/NKC_WF/WebUserControls/cmp_batchDetail.ascx b/NKC_WF/WebUserControls/cmp_batchDetail.ascx
index 79984cc..05e225c 100644
--- a/NKC_WF/WebUserControls/cmp_batchDetail.ascx
+++ b/NKC_WF/WebUserControls/cmp_batchDetail.ascx
@@ -1,7 +1,6 @@
<%@ Control Language="C#" AutoEventWireup="true" CodeBehind="cmp_batchDetail.ascx.cs" Inherits="NKC_WF.WebUserControls.cmp_batchDetail" %>
<%@ Register Src="~/WebUserControls/cmp_batchDetailSplit.ascx" TagPrefix="uc1" TagName="cmp_batchDetailSplit" %>
-
-<%--<%@ Register Src="~/WebUserControls/cmp_orderExtList.ascx" TagPrefix="uc1" TagName="cmp_orderExtList" %>--%>
+<%@ Register Src="~/WebUserControls/cmp_batchDetailMongo.ascx" TagPrefix="uc1" TagName="cmp_batchDetailMongo" %>
@@ -82,81 +81,7 @@
-
-
+
-
-<%----%>
\ No newline at end of file
+
\ No newline at end of file
diff --git a/NKC_WF/WebUserControls/cmp_batchDetail.ascx.cs b/NKC_WF/WebUserControls/cmp_batchDetail.ascx.cs
index 1654041..0a7bf68 100644
--- a/NKC_WF/WebUserControls/cmp_batchDetail.ascx.cs
+++ b/NKC_WF/WebUserControls/cmp_batchDetail.ascx.cs
@@ -30,189 +30,8 @@ namespace NKC_WF.WebUserControls
{
hfBatchId.Value = value.ToString();
frmView.DataBind();
- lblMatDet.Text = "";
- lblProdDet.Text = "";
- if (memLayer.ML.CRB("enableMongo"))
- {
- // cerco da lista salvataggi Estim/Nest...
- var estimAnsw = ComLib.man.getEstAnsw(value);
- var nestAnsw = ComLib.man.getNestAnsw(value);
- StringBuilder sbDebug = new StringBuilder();
- sbDebug.AppendLine("Debug Info:");
- // elenchi x ricerca duplicati
- List partListEstim = new List();
- List partListEstimDupl = new List();
- List partListNest = new List();
- List partListNestDupl = new List();
- if (estimAnsw != null)
- {
- try
- {
- foreach (var part in estimAnsw.PartList)
- {
- if (partListEstim.Contains(part.PartId))
- {
- partListEstimDupl.Add(part.PartId);
- }
- else
- {
- partListEstim.Add(part.PartId);
- }
- }
- }
- catch
- { }
- try
- {
- sbDebug.AppendLine($"ESTIM: EnvNum: {estimAnsw.EnvNum} | Worktime: {estimAnsw.EstimatedWorktime / 60:N2} min | Processing Runtime {estimAnsw.ProcessingRuntime / 60:N2} min | Parts #: {estimAnsw.PartList.Count} | Distinct Part # {partListEstim.Count}");
- // se ho duplicati indico:
- if (partListEstimDupl.Count > 0)
- {
- sbDebug.AppendLine("---------------------");
- sbDebug.AppendLine($"ESTIM: FOUND {partListEstimDupl.Count} duplicate:");
- foreach (var partId in partListEstimDupl)
- {
- sbDebug.AppendLine($"{partId}");
- }
- sbDebug.AppendLine("---------------------");
- }
- }
- catch
- { }
- }
- if (nestAnsw != null)
- {
- try
- {
- if (nestAnsw.BunkList != null)
- {
- foreach (var bunk in nestAnsw.BunkList)
- {
- foreach (var sheet in bunk.SheetList)
- {
- foreach (var part in sheet.PartList)
- {
- if (partListNest.Contains(part.PartId))
- {
- partListNestDupl.Add(part.PartId);
- }
- else
- {
- partListNest.Add(part.PartId);
- }
- }
- }
- }
- }
- }
- catch
- { }
- int totKit = 0;
- try
- {
- if (nestAnsw.CartList != null)
- {
- foreach (var cart in nestAnsw.CartList)
- {
- totKit += cart.KitList.Count;
- }
- }
- }
- catch
- { }
- //il tot delle part è in bunk > Sheet > part
- int totPartNum = 0;
- int totSheet = 0;
- List materialsList = new List();
- double num = 0;
- double den = 1;
- double currRatio = 0;
- List workRatio = new List();
- try
- {
- if (nestAnsw.BunkList != null)
- {
- foreach (var bunk in nestAnsw.BunkList)
- {
- totSheet += bunk.SheetList.Count;
- foreach (var sheet in bunk.SheetList)
- {
- totPartNum += sheet.PartList.Count;
- num = sheet.SurfaceWork > 0 ? sheet.SurfaceWork : 0;
- den = sheet.SurfaceTotal > 0 ? sheet.SurfaceTotal : 1;
- currRatio = ratioProt(num, den);
- workRatio.Add(currRatio);
- if (!materialsList.Contains(sheet.MatId))
- {
- materialsList.Add(sheet.MatId);
- }
- }
- }
- }
- }
- catch
- { }
- try
- {
- // ordino le medie
- workRatio.Sort();
- // elimino le + basse quanti materiali ci sono...
- workRatio.RemoveRange(0, materialsList.Count);
- double avgRatio = workRatio.Average();
- double minRatio = workRatio.Min();
- double maxRatio = workRatio.Max();
- sbDebug.AppendLine($"NEST: EnvNum: {nestAnsw.EnvNum} | Worktime: {nestAnsw.EstimatedWorktime / 60:N2} min | Processing Runtime {nestAnsw.ProcessingRuntime / 60:N2} min");
- lblMatDet.Text = $"avg: {avgRatio:P1} ({minRatio:P1} → {maxRatio:P1}) | {materialsList.Count} materials";
- lblProdDet.Text = $"Bunks: {nestAnsw.BunkList.Count} | Sheets: {totSheet} | Carts: {nestAnsw.CartList.Count} | Bins: {nestAnsw.BinList.Count}";
- // se ho duplicati indico:
- if (partListNestDupl.Count > 0)
- {
- sbDebug.AppendLine("---------------------");
- sbDebug.AppendLine($"NEST: FOUND {partListNestDupl.Count} duplicate:");
- foreach (var partId in partListNestDupl)
- {
- sbDebug.AppendLine($"{partId}");
- }
- sbDebug.AppendLine("---------------------");
- }
- // s enon corrispondono
- if (partListEstim.Count != partListNest.Count)
- {
- sbDebug.AppendLine("---------------------");
- if (partListEstim.Count > partListNest.Count)
- {
- sbDebug.AppendLine($"EST OK | NEST missing:");
- foreach (var partId in partListEstim)
- {
- if (!partListNest.Contains(partId))
- {
- sbDebug.AppendLine($"{partId}");
- }
- }
- }
- else
- {
- sbDebug.AppendLine($"EST missing | NEST OK:");
- foreach (var partId in partListNest)
- {
- if (!partListEstim.Contains(partId))
- {
- sbDebug.AppendLine($"{partId}");
- }
- }
- }
- sbDebug.AppendLine("---------------------");
- }
- }
- catch
- { }
- }
- if (memLayer.ML.CRS("environment") == "DEV")
- {
- lblTestJson.Text = "
" + sbDebug.Replace("\r\n", "
").ToString();
- }
- }
cmp_batchDetailSplit.BatchId = value;
+ cmp_batchDetailMongo.BatchId = value;
if (BatchId > 0)
{
fixDisplayDesc();
@@ -245,6 +64,7 @@ namespace NKC_WF.WebUserControls
private void fixDisplayDesc()
{
divSplit.Visible = BatchIsAncestor;
+ cmp_batchDetailMongo.Visible = !BatchIsAncestor;
}
#endregion Private Methods
@@ -270,6 +90,8 @@ namespace NKC_WF.WebUserControls
///
protected void lbtResetNest_Click(object sender, EventArgs e)
{
+ // ri-assegnazione ordini/kit a batch ancestor
+ DLMan.taOLT.setBatchSplit(BatchId, false);
// registro accettazione Nesting
DLMan.taBL.refuseNesting(BatchId, DLMan.CodSoggCurrUser);
raiseEvent();
@@ -353,15 +175,6 @@ namespace NKC_WF.WebUserControls
#endregion Protected Methods
- #region Internal Methods
-
- internal void doUpdate()
- {
- frmView.DataBind();
- }
-
- #endregion Internal Methods
-
#region Public Methods
///
@@ -405,6 +218,16 @@ namespace NKC_WF.WebUserControls
return answ;
}
+ public void doUpdate()
+ {
+ frmView.DataBind();
+ fixDisplayDesc();
+ if (divSplit.Visible)
+ {
+ cmp_batchDetailSplit.doUpdate();
+ }
+ }
+
#endregion Public Methods
}
}
\ No newline at end of file
diff --git a/NKC_WF/WebUserControls/cmp_batchDetail.ascx.designer.cs b/NKC_WF/WebUserControls/cmp_batchDetail.ascx.designer.cs
index e123e67..6b0df7d 100644
--- a/NKC_WF/WebUserControls/cmp_batchDetail.ascx.designer.cs
+++ b/NKC_WF/WebUserControls/cmp_batchDetail.ascx.designer.cs
@@ -42,31 +42,13 @@ namespace NKC_WF.WebUserControls
protected global::System.Web.UI.WebControls.ObjectDataSource ods;
///
- /// lblMatDet control.
+ /// cmp_batchDetailMongo control.
///
///
/// Auto-generated field.
/// To modify move field declaration from designer file to code-behind file.
///
- protected global::System.Web.UI.WebControls.Label lblMatDet;
-
- ///
- /// lblProdDet control.
- ///
- ///
- /// Auto-generated field.
- /// To modify move field declaration from designer file to code-behind file.
- ///
- protected global::System.Web.UI.WebControls.Label lblProdDet;
-
- ///
- /// lblTestJson control.
- ///
- ///
- /// Auto-generated field.
- /// To modify move field declaration from designer file to code-behind file.
- ///
- protected global::System.Web.UI.WebControls.Label lblTestJson;
+ protected global::NKC_WF.WebUserControls.cmp_batchDetailMongo cmp_batchDetailMongo;
///
/// divSplit control.
diff --git a/NKC_WF/WebUserControls/cmp_batchDetailMongo.ascx b/NKC_WF/WebUserControls/cmp_batchDetailMongo.ascx
new file mode 100644
index 0000000..4b27773
--- /dev/null
+++ b/NKC_WF/WebUserControls/cmp_batchDetailMongo.ascx
@@ -0,0 +1,26 @@
+<%@ Control Language="C#" AutoEventWireup="true" CodeBehind="cmp_batchDetailMongo.ascx.cs" Inherits="NKC_WF.WebUserControls.cmp_batchDetailMongo" %>
+
+
+
+
+
\ No newline at end of file
diff --git a/NKC_WF/WebUserControls/cmp_batchDetailMongo.ascx.cs b/NKC_WF/WebUserControls/cmp_batchDetailMongo.ascx.cs
new file mode 100644
index 0000000..04ff5c3
--- /dev/null
+++ b/NKC_WF/WebUserControls/cmp_batchDetailMongo.ascx.cs
@@ -0,0 +1,271 @@
+using AppData;
+using SteamWare;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Web;
+using System.Web.UI;
+using System.Web.UI.WebControls;
+
+namespace NKC_WF.WebUserControls
+{
+ public partial class cmp_batchDetailMongo : BaseUserControl
+ {
+ #region Public Properties
+
+ public int BatchId
+ {
+ set
+ {
+ hfBatchId.Value = value.ToString();
+ if (value > 0)
+ {
+ updateMongoData(value);
+ }
+ }
+ get
+ {
+ int answ = 0;
+ int.TryParse(hfBatchId.Value, out answ);
+ return answ;
+ }
+ }
+
+ public string cssSized
+ {
+ get
+ {
+ string answ = showInline ? "col-6" : "col-12";
+
+ return answ;
+ }
+ }
+
+ public bool showInline
+ {
+ set
+ {
+ hfShowInline.Value = value.ToString();
+ }
+ get
+ {
+ bool answ = false;
+ bool.TryParse(hfShowInline.Value, out answ);
+ return answ;
+ }
+ }
+
+ #endregion Public Properties
+
+ #region Private Methods
+
+ private void updateMongoData(int value)
+ {
+ lblMatDet.Text = "";
+ lblProdDet.Text = "";
+ if (memLayer.ML.CRB("enableMongo"))
+ {
+ // cerco da lista salvataggi Estim/Nest...
+ var estimAnsw = ComLib.man.getEstAnsw(value);
+ var nestAnsw = ComLib.man.getNestAnsw(value);
+ StringBuilder sbDebug = new StringBuilder();
+ sbDebug.AppendLine("Debug Info:");
+ // elenchi x ricerca duplicati
+ List partListEstim = new List();
+ List partListEstimDupl = new List();
+ List partListNest = new List();
+ List partListNestDupl = new List();
+ if (estimAnsw != null)
+ {
+ try
+ {
+ foreach (var part in estimAnsw.PartList)
+ {
+ if (partListEstim.Contains(part.PartId))
+ {
+ partListEstimDupl.Add(part.PartId);
+ }
+ else
+ {
+ partListEstim.Add(part.PartId);
+ }
+ }
+ }
+ catch
+ { }
+ try
+ {
+ sbDebug.AppendLine($"ESTIM: EnvNum: {estimAnsw.EnvNum} | Worktime: {estimAnsw.EstimatedWorktime / 60:N2} min | Processing Runtime {estimAnsw.ProcessingRuntime / 60:N2} min | Parts #: {estimAnsw.PartList.Count} | Distinct Part # {partListEstim.Count}");
+ // se ho duplicati indico:
+ if (partListEstimDupl.Count > 0)
+ {
+ sbDebug.AppendLine("---------------------");
+ sbDebug.AppendLine($"ESTIM: FOUND {partListEstimDupl.Count} duplicate:");
+ foreach (var partId in partListEstimDupl)
+ {
+ sbDebug.AppendLine($"{partId}");
+ }
+ sbDebug.AppendLine("---------------------");
+ }
+ }
+ catch
+ { }
+ }
+ if (nestAnsw != null)
+ {
+ try
+ {
+ if (nestAnsw.BunkList != null)
+ {
+ foreach (var bunk in nestAnsw.BunkList)
+ {
+ foreach (var sheet in bunk.SheetList)
+ {
+ foreach (var part in sheet.PartList)
+ {
+ if (partListNest.Contains(part.PartId))
+ {
+ partListNestDupl.Add(part.PartId);
+ }
+ else
+ {
+ partListNest.Add(part.PartId);
+ }
+ }
+ }
+ }
+ }
+ }
+ catch
+ { }
+ int totKit = 0;
+ try
+ {
+ if (nestAnsw.CartList != null)
+ {
+ foreach (var cart in nestAnsw.CartList)
+ {
+ totKit += cart.KitList.Count;
+ }
+ }
+ }
+ catch
+ { }
+ //il tot delle part è in bunk > Sheet > part
+ int totPartNum = 0;
+ int totSheet = 0;
+ List materialsList = new List();
+ double num = 0;
+ double den = 1;
+ double currRatio = 0;
+ List workRatio = new List();
+ try
+ {
+ if (nestAnsw.BunkList != null)
+ {
+ foreach (var bunk in nestAnsw.BunkList)
+ {
+ totSheet += bunk.SheetList.Count;
+ foreach (var sheet in bunk.SheetList)
+ {
+ totPartNum += sheet.PartList.Count;
+ num = sheet.SurfaceWork > 0 ? sheet.SurfaceWork : 0;
+ den = sheet.SurfaceTotal > 0 ? sheet.SurfaceTotal : 1;
+ currRatio = ratioProt(num, den);
+ workRatio.Add(currRatio);
+ if (!materialsList.Contains(sheet.MatId))
+ {
+ materialsList.Add(sheet.MatId);
+ }
+ }
+ }
+ }
+ }
+ catch
+ { }
+ try
+ {
+ // ordino le medie
+ workRatio.Sort();
+ // elimino le + basse quanti materiali ci sono...
+ workRatio.RemoveRange(0, materialsList.Count);
+ double avgRatio = workRatio.Average();
+ double minRatio = workRatio.Min();
+ double maxRatio = workRatio.Max();
+ sbDebug.AppendLine($"NEST: EnvNum: {nestAnsw.EnvNum} | Worktime: {nestAnsw.EstimatedWorktime / 60:N2} min | Processing Runtime {nestAnsw.ProcessingRuntime / 60:N2} min");
+ lblMatDet.Text = $"avg: {avgRatio:P1} ({minRatio:P1} → {maxRatio:P1}) | {materialsList.Count} materials";
+ lblProdDet.Text = $"Bunks: {nestAnsw.BunkList.Count} | Sheets: {totSheet} | Carts: {nestAnsw.CartList.Count} | Bins: {nestAnsw.BinList.Count}";
+ // se ho duplicati indico:
+ if (partListNestDupl.Count > 0)
+ {
+ sbDebug.AppendLine("---------------------");
+ sbDebug.AppendLine($"NEST: FOUND {partListNestDupl.Count} duplicate:");
+ foreach (var partId in partListNestDupl)
+ {
+ sbDebug.AppendLine($"{partId}");
+ }
+ sbDebug.AppendLine("---------------------");
+ }
+ // s enon corrispondono
+ if (partListEstim.Count != partListNest.Count)
+ {
+ sbDebug.AppendLine("---------------------");
+ if (partListEstim.Count > partListNest.Count)
+ {
+ sbDebug.AppendLine($"EST OK | NEST missing:");
+ foreach (var partId in partListEstim)
+ {
+ if (!partListNest.Contains(partId))
+ {
+ sbDebug.AppendLine($"{partId}");
+ }
+ }
+ }
+ else
+ {
+ sbDebug.AppendLine($"EST missing | NEST OK:");
+ foreach (var partId in partListNest)
+ {
+ if (!partListEstim.Contains(partId))
+ {
+ sbDebug.AppendLine($"{partId}");
+ }
+ }
+ }
+ sbDebug.AppendLine("---------------------");
+ }
+ }
+ catch
+ { }
+ }
+ if (memLayer.ML.CRS("environment") == "DEV")
+ {
+ lblTestJson.Text = "
" + sbDebug.Replace("\r\n", "
").ToString();
+ }
+ }
+ }
+
+ #endregion Private Methods
+
+ #region Protected Methods
+
+ protected void Page_Load(object sender, EventArgs e)
+ {
+ }
+
+ ///
+ /// Effettua divisione evitando zeri a den...
+ ///
+ ///
+ ///
+ ///
+ protected double ratioProt(double num, double den)
+ {
+ den = den == 0 ? 1 : den;
+ return num / den;
+ }
+
+ #endregion Protected Methods
+ }
+}
\ No newline at end of file
diff --git a/NKC_WF/WebUserControls/cmp_batchDetailMongo.ascx.designer.cs b/NKC_WF/WebUserControls/cmp_batchDetailMongo.ascx.designer.cs
new file mode 100644
index 0000000..9240c3c
--- /dev/null
+++ b/NKC_WF/WebUserControls/cmp_batchDetailMongo.ascx.designer.cs
@@ -0,0 +1,62 @@
+//------------------------------------------------------------------------------
+//
+// This code was generated by a tool.
+//
+// Changes to this file may cause incorrect behavior and will be lost if
+// the code is regenerated.
+//
+//------------------------------------------------------------------------------
+
+namespace NKC_WF.WebUserControls
+{
+
+
+ public partial class cmp_batchDetailMongo
+ {
+
+ ///
+ /// lblMatDet control.
+ ///
+ ///
+ /// Auto-generated field.
+ /// To modify move field declaration from designer file to code-behind file.
+ ///
+ protected global::System.Web.UI.WebControls.Label lblMatDet;
+
+ ///
+ /// lblProdDet control.
+ ///
+ ///
+ /// Auto-generated field.
+ /// To modify move field declaration from designer file to code-behind file.
+ ///
+ protected global::System.Web.UI.WebControls.Label lblProdDet;
+
+ ///
+ /// lblTestJson control.
+ ///
+ ///
+ /// Auto-generated field.
+ /// To modify move field declaration from designer file to code-behind file.
+ ///
+ protected global::System.Web.UI.WebControls.Label lblTestJson;
+
+ ///
+ /// hfBatchId control.
+ ///
+ ///
+ /// Auto-generated field.
+ /// To modify move field declaration from designer file to code-behind file.
+ ///
+ protected global::System.Web.UI.WebControls.HiddenField hfBatchId;
+
+ ///
+ /// hfShowInline control.
+ ///
+ ///
+ /// Auto-generated field.
+ /// To modify move field declaration from designer file to code-behind file.
+ ///
+ protected global::System.Web.UI.WebControls.HiddenField hfShowInline;
+ }
+}
diff --git a/NKC_WF/WebUserControls/cmp_batchDetailSplit.ascx.cs b/NKC_WF/WebUserControls/cmp_batchDetailSplit.ascx.cs
index 83df85c..a62512c 100644
--- a/NKC_WF/WebUserControls/cmp_batchDetailSplit.ascx.cs
+++ b/NKC_WF/WebUserControls/cmp_batchDetailSplit.ascx.cs
@@ -143,9 +143,7 @@ namespace NKC_WF.WebUserControls
if (BatchId > 0)
{
checkCreateDescendant();
- showBatchDescendant();
- fixChildBatch();
- checkDisplayMode();
+ doUpdate();
}
fixRatio();
}
@@ -390,5 +388,16 @@ namespace NKC_WF.WebUserControls
}
#endregion Protected Methods
+
+ #region Public Methods
+
+ public void doUpdate()
+ {
+ showBatchDescendant();
+ fixChildBatch();
+ checkDisplayMode();
+ }
+
+ #endregion Public Methods
}
}
\ No newline at end of file
diff --git a/NKC_WF/WebUserControls/cmp_batchDetailSplitInfo.ascx b/NKC_WF/WebUserControls/cmp_batchDetailSplitInfo.ascx
index 20fd80e..1a5cf38 100644
--- a/NKC_WF/WebUserControls/cmp_batchDetailSplitInfo.ascx
+++ b/NKC_WF/WebUserControls/cmp_batchDetailSplitInfo.ascx
@@ -1,4 +1,5 @@
<%@ Control Language="C#" AutoEventWireup="true" CodeBehind="cmp_batchDetailSplitInfo.ascx.cs" Inherits="NKC_WF.WebUserControls.cmp_batchDetailSplitInfo" %>
+<%@ Register Src="~/WebUserControls/cmp_batchDetailMongo.ascx" TagPrefix="uc1" TagName="cmp_batchDetailMongo" %>
@@ -13,6 +14,10 @@
+
+
<%# $"{Eval("Errors")} (tot: {Eval("NumErrPre")} err)" %>
+
<%# $"{Eval("Errors")} (tot: {Eval("NumErr")} err)" %>
+
-
-
<%# $"{Eval("Errors")} (tot: {Eval("NumErrPre")} err)" %>
-
<%# $"{Eval("Errors")} (tot: {Eval("NumErr")} err)" %>
-
+
<%: traduci("CallList") %>
@@ -45,7 +45,7 @@
-
+
diff --git a/NKC_WF/WebUserControls/cmp_batchList.ascx.cs b/NKC_WF/WebUserControls/cmp_batchList.ascx.cs
index bdd936c..7e6c0b2 100644
--- a/NKC_WF/WebUserControls/cmp_batchList.ascx.cs
+++ b/NKC_WF/WebUserControls/cmp_batchList.ascx.cs
@@ -169,7 +169,9 @@ namespace NKC_WF.WebUserControls
divDetail.Visible = currSelRow >= 0;
lastSelRow = currSelRow;
// recupero BatchId selezionato
+ cmp_batchDetail.BatchId = 0;
cmp_batchDetail.BatchId = BatchIdSel;
+ cmp_batchDetail.doUpdate();
updPanelDetail.Update();
}
diff --git a/NKC_WF/WebUserControls/cmp_menuTop.ascx b/NKC_WF/WebUserControls/cmp_menuTop.ascx
index ea29657..9888eb6 100644
--- a/NKC_WF/WebUserControls/cmp_menuTop.ascx
+++ b/NKC_WF/WebUserControls/cmp_menuTop.ascx
@@ -1,52 +1,48 @@
<%@ Control Language="C#" AutoEventWireup="true" CodeBehind="cmp_menuTop.ascx.cs" Inherits="NKC_WF.WebUserControls.cmp_menuTop" %>
-