+
-
diff --git a/NKC_WF/WebUserControls/cmp_MU_svgViewer.ascx b/NKC_WF/WebUserControls/cmp_MU_svgViewer.ascx
index 77db5ca..f2bca66 100644
--- a/NKC_WF/WebUserControls/cmp_MU_svgViewer.ascx
+++ b/NKC_WF/WebUserControls/cmp_MU_svgViewer.ascx
@@ -22,5 +22,5 @@
-
-
\ No newline at end of file
+
+
\ No newline at end of file
diff --git a/NKC_WF/WebUserControls/cmp_MU_svgViewer.ascx.cs b/NKC_WF/WebUserControls/cmp_MU_svgViewer.ascx.cs
index 2b34712..4f24d08 100644
--- a/NKC_WF/WebUserControls/cmp_MU_svgViewer.ascx.cs
+++ b/NKC_WF/WebUserControls/cmp_MU_svgViewer.ascx.cs
@@ -12,23 +12,6 @@ namespace NKC_WF.WebUserControls
{
public partial class cmp_MU_svgViewer : System.Web.UI.UserControl
{
- ///
- /// Batch corrente...
- ///
- public int BatchId
- {
- set
- {
- hfBatchID.Value = value.ToString();
- doUpdate();
- }
- get
- {
- int answ = 0;
- int.TryParse(hfBatchID.Value, out answ);
- return answ;
- }
- }
///
/// Foglio corrente...
///
@@ -37,6 +20,7 @@ namespace NKC_WF.WebUserControls
set
{
hfSheetId.Value = value.ToString();
+ doUpdate();
}
get
{
@@ -45,24 +29,36 @@ namespace NKC_WF.WebUserControls
return answ;
}
}
+ ///
+ /// Percorso file calcolato
+ ///
+ public string filename
+ {
+ get
+ {
+ return hfFilename.Value;
+ }
+ set
+ {
+ hfFilename.Value = value;
+ }
+ }
public void doUpdate()
{
// recupero ID del foglio corrente
string answ = "";
- string filename = "";
+ string baseOrig = memLayer.ML.CRS("drawBaseBath").ToLower();
+ string baseCurr = memLayer.ML.CRS("srvDrawBaseBath").ToLower();
try
{
- // FORSE 5/5?!?
- var sheetList = DataLayer.man.taSHL.getByMLStatus(BatchId, 3, 5);
- if (sheetList.Count > 0)
+ var tabSheets = DataLayer.man.taSHL.getBySheetId(SheetId);
+ if (tabSheets.Count > 0)
{
- SheetId = sheetList[0].SheetID;
- // lo leggo da file
- string baseOrig = memLayer.ML.CRS("drawBaseBath").ToLower();
- string baseCurr = memLayer.ML.CRS("srvDrawBaseBath").ToLower();
- filename = sheetList[0].DrawFilePath.ToLower().Replace(baseOrig, baseCurr);
- // NON DOVREBEB SERVIRE MAP se è già share di rete... anche se è su MEDESIMA macchina
- //filename = Server.MapPath(filename);
+ filename = tabSheets[0].DrawFilePath.ToLower().Replace(baseOrig, baseCurr);
+ if(memLayer.ML.CRB("userVirtDir"))
+ {
+ filename = Server.MapPath(filename);
+ }
answ = File.ReadAllText(filename);
}
}
@@ -70,6 +66,8 @@ namespace NKC_WF.WebUserControls
{ }
if (answ == "")
{
+ // loggo...
+ logger.lg.scriviLog($"SVG not found | filename: {filename} | baseOrig: {baseOrig} | baseCurr: {baseCurr} | used default SVG");
// leggo SVG DI DEFAULT che indica NON PRESENTE...
filename = Server.MapPath("~/Images/NoData.svg");
answ = File.ReadAllText(filename);
diff --git a/NKC_WF/WebUserControls/cmp_MU_svgViewer.ascx.designer.cs b/NKC_WF/WebUserControls/cmp_MU_svgViewer.ascx.designer.cs
index 6322cc7..52b6bbd 100644
--- a/NKC_WF/WebUserControls/cmp_MU_svgViewer.ascx.designer.cs
+++ b/NKC_WF/WebUserControls/cmp_MU_svgViewer.ascx.designer.cs
@@ -23,15 +23,6 @@ namespace NKC_WF.WebUserControls
///
protected global::System.Web.UI.HtmlControls.HtmlGenericControl svgTable;
- ///
- /// Controllo hfBatchID.
- ///
- ///
- /// Campo generato automaticamente.
- /// Per la modifica, spostare la dichiarazione di campo dal file di progettazione al file code-behind.
- ///
- protected global::System.Web.UI.WebControls.HiddenField hfBatchID;
-
///
/// Controllo hfSheetId.
///
@@ -40,5 +31,14 @@ namespace NKC_WF.WebUserControls
/// Per la modifica, spostare la dichiarazione di campo dal file di progettazione al file code-behind.
///
protected global::System.Web.UI.WebControls.HiddenField hfSheetId;
+
+ ///
+ /// Controllo hfFilename.
+ ///
+ ///
+ /// Campo generato automaticamente.
+ /// Per la modifica, spostare la dichiarazione di campo dal file di progettazione al file code-behind.
+ ///
+ protected global::System.Web.UI.WebControls.HiddenField hfFilename;
}
}
diff --git a/NKC_WF/WebUserControls/cmp_batchList.ascx b/NKC_WF/WebUserControls/cmp_batchList.ascx
index e9f9b64..d11cb97 100644
--- a/NKC_WF/WebUserControls/cmp_batchList.ascx
+++ b/NKC_WF/WebUserControls/cmp_batchList.ascx
@@ -60,6 +60,7 @@
+
<%# BStatus(Eval("Status")) %>
@@ -102,3 +103,4 @@