diff --git a/AppData/ComLib.cs b/AppData/ComLib.cs index 01700d6..bf28a2d 100644 --- a/AppData/ComLib.cs +++ b/AppData/ComLib.cs @@ -2157,7 +2157,7 @@ namespace AppData { int answ = 0; Random rnd = new Random(); - answ = rnd.Next(10000); + answ = rnd.Next(1000000); return answ; } diff --git a/NKC_WF/Images/999999999.svg b/NKC_WF/Images/999999999.svg new file mode 100644 index 0000000..6d101fc --- /dev/null +++ b/NKC_WF/Images/999999999.svg @@ -0,0 +1,235 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + B3 + + + + + B3 + + + + B3 + + + + B3 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/NKC_WF/Images/MT0006110.jpg b/NKC_WF/Images/MT0006110.jpg deleted file mode 100644 index 94d3da8..0000000 Binary files a/NKC_WF/Images/MT0006110.jpg and /dev/null differ diff --git a/NKC_WF/Images/test_1.svg b/NKC_WF/Images/test_1.svg deleted file mode 100644 index 6fb70de..0000000 --- a/NKC_WF/Images/test_1.svg +++ /dev/null @@ -1,15 +0,0 @@ - - - - - - - - - - - - - - - diff --git a/NKC_WF/Images/test_a.svg b/NKC_WF/Images/test_a.svg deleted file mode 100644 index 1f44c04..0000000 --- a/NKC_WF/Images/test_a.svg +++ /dev/null @@ -1,25 +0,0 @@ - - - - - IT000001 - - - - - - IT000002 - - - IT000003 - - - - - - - - - - - \ No newline at end of file diff --git a/NKC_WF/NKC_WF.csproj b/NKC_WF/NKC_WF.csproj index cbd4e98..e47ad53 100644 --- a/NKC_WF/NKC_WF.csproj +++ b/NKC_WF/NKC_WF.csproj @@ -257,8 +257,8 @@ + - Always @@ -365,9 +365,7 @@ - - @@ -385,6 +383,7 @@ + @@ -398,6 +397,7 @@ + @@ -448,6 +448,7 @@ + @@ -795,6 +796,13 @@ SiteContent.master + + SvgFull.aspx + ASPXCodeBehind + + + SvgFull.aspx + TestAuth.aspx ASPXCodeBehind @@ -913,6 +921,13 @@ cmp_homeButtons.ascx + + cmp_ItemDet.ascx + ASPXCodeBehind + + + cmp_ItemDet.ascx + cmp_kitImpCheck.ascx ASPXCodeBehind @@ -1270,6 +1285,13 @@ cmp_MU_svgViewer.ascx + + cmp_svgFull.ascx + ASPXCodeBehind + + + cmp_svgFull.ascx + cmp_taktList.ascx ASPXCodeBehind @@ -1352,7 +1374,7 @@ Always - + Web.config diff --git a/NKC_WF/WebUserControls/cmp_ItemDet.ascx b/NKC_WF/WebUserControls/cmp_ItemDet.ascx new file mode 100644 index 0000000..a736e0a --- /dev/null +++ b/NKC_WF/WebUserControls/cmp_ItemDet.ascx @@ -0,0 +1,24 @@ +<%@ Control Language="C#" AutoEventWireup="true" CodeBehind="cmp_ItemDet.ascx.cs" Inherits="NKC_WF.WebUserControls.cmp_ItemDet" %> + + + + + +
+
+ +
+
+ +
+
+ +
+
+ + + + + + + diff --git a/NKC_WF/WebUserControls/cmp_ItemDet.ascx.cs b/NKC_WF/WebUserControls/cmp_ItemDet.ascx.cs new file mode 100644 index 0000000..d44611f --- /dev/null +++ b/NKC_WF/WebUserControls/cmp_ItemDet.ascx.cs @@ -0,0 +1,31 @@ +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_ItemDet : BaseUserControl + { + protected void Page_Load(object sender, EventArgs e) + { + + } + public int ItemId + { + get + { + int answ = 0; + int.TryParse(hfItemId.Value, out answ); + return answ; + } + set + { + hfItemId.Value = value.ToString(); + frmView.DataBind(); + } + } + } +} \ No newline at end of file diff --git a/NKC_WF/WebUserControls/cmp_ItemDet.ascx.designer.cs b/NKC_WF/WebUserControls/cmp_ItemDet.ascx.designer.cs new file mode 100644 index 0000000..6abacaa --- /dev/null +++ b/NKC_WF/WebUserControls/cmp_ItemDet.ascx.designer.cs @@ -0,0 +1,44 @@ +//------------------------------------------------------------------------------ +// +// Codice generato da uno strumento. +// +// Le modifiche a questo file possono causare un comportamento non corretto e verranno perse se +// il codice viene rigenerato. +// +//------------------------------------------------------------------------------ + +namespace NKC_WF.WebUserControls +{ + + + public partial class cmp_ItemDet + { + + /// + /// Controllo hfItemId. + /// + /// + /// 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 hfItemId; + + /// + /// Controllo frmView. + /// + /// + /// 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.FormView frmView; + + /// + /// Controllo ods. + /// + /// + /// 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.ObjectDataSource ods; + } +} diff --git a/NKC_WF/WebUserControls/cmp_secScreen.ascx b/NKC_WF/WebUserControls/cmp_secScreen.ascx index 1cfd959..3626cb0 100644 --- a/NKC_WF/WebUserControls/cmp_secScreen.ascx +++ b/NKC_WF/WebUserControls/cmp_secScreen.ascx @@ -1,33 +1,43 @@ <%@ Control Language="C#" AutoEventWireup="true" CodeBehind="cmp_secScreen.ascx.cs" Inherits="NKC_WF.WebUserControls.cmp_secScreen" %> +<%@ Register Src="~/WebUserControls/cmp_ItemDet.ascx" TagPrefix="uc1" TagName="cmp_ItemDet" %> +
- + + + + + + +
- Scambia - OPEN PDF + <%--Scambia--%> +
<%: traduci("ShowCurrSheet") %>
-

<%: traduci("SecScreen") %> - - <%: hfNum.Value %>

- +

<%: traduci("SecScreen") %> + (<%: hfNum.Value %>)

+ <%: traduci("NoItemSel") %> +
- + +
<%: traduci("ShowPDF") %>
- +
-
- <%-- + <%--
+ --%> + -
+
--%>
diff --git a/NKC_WF/WebUserControls/cmp_secScreen.ascx.cs b/NKC_WF/WebUserControls/cmp_secScreen.ascx.cs index a1236e9..1a5244d 100644 --- a/NKC_WF/WebUserControls/cmp_secScreen.ascx.cs +++ b/NKC_WF/WebUserControls/cmp_secScreen.ascx.cs @@ -4,6 +4,7 @@ using NKC_WF.Controllers; using SteamWare; using System; using System.Collections.Generic; +using System.IO; using System.Linq; using System.Web; using System.Web.UI; @@ -13,18 +14,44 @@ namespace NKC_WF.WebUserControls { public partial class cmp_secScreen : BaseUserControl { + + protected void timerRefresh_Tick(object sender, EventArgs e) + { + countDown--; + if (countDown < 0) + { + refreshCodPost(); + // count-down successivi: 5 minuti + countDown = 60 * 5; + } + doUpdate(); + } protected void Page_Load(object sender, EventArgs e) { if (!Page.IsPostBack) { - showMode = true; - // recupero numero - currNum = ComLib.getSecScreenCode(); + refreshCodPost(); doUpdate(); - pdfPath = "../temp/119752.pdf"; + // primo: 1 minuto + countDown = 60; + SheetId = 999999999; + itemDtmx = "IT00014788"; } } + public int countDown + { + get + { + int answ = 0; + int.TryParse(hfCountDown.Value, out answ); + return answ; + } + set + { + hfCountDown.Value = value.ToString(); + } + } public int currNum { get @@ -38,33 +65,111 @@ namespace NKC_WF.WebUserControls hfNum.Value = $"{value:000000}"; } } - public bool showMode + public int SheetId { get { - bool answ = false; - bool.TryParse(hfShowMode.Value, out answ); + int answ = 0; + int.TryParse(hfSheetId.Value, out answ); return answ; } set { - hfShowMode.Value = value.ToString(); + hfSheetId.Value = $"{value}"; + hlShowCurrSheet.NavigateUrl = $"~/site/SvgFull?sheetId={value}"; + } + } + public string itemDtmx + { + get + { + return hfItemDtmx.Value; + } + set + { + if (!string.IsNullOrEmpty(value)) + { + cmp_ItemDet.Visible = true; + lblMessage.Visible = false; + hlPdfOpener.Enabled = true; + hlPdfOpener.CssClass = "btn btn-success btn-block"; + hfItemDtmx.Value = value; + // cerco e salvo! + var tabItem = DataLayer.man.taIL.getBySearch(0, value, 0, 9999); + if (tabItem != null && tabItem.Count > 0) + { + int ItemId = tabItem[0].ItemID; + cmp_ItemDet.ItemId = ItemId; + itemCode = tabItem[0].ItemExtCode; + pdfPath = tabItem[0].PdfFilePath; + } + } + else + { + cmp_ItemDet.Visible = false; + lblMessage.Visible = true; + hlPdfOpener.Enabled = false; + hlPdfOpener.CssClass = "btn btn-outline-light text-light btn-block"; + hfItemDtmx.Value = ""; + } + } + } + public string itemCode + { + get + { + return hfItemCode.Value; + } + set + { + hfItemCode.Value = value; + } + } + public string newDtmx + { + get + { + string answ = ComLib.getSecScreenRequest(codSSC); + answ = string.IsNullOrEmpty(answ) ? "" : answ; + return answ; } } public string pdfPath { get { - return lblPdf.Text; + return hfItemPdf.Value; } set { - // FIXME TODO necessario copiare in locale il pdf? - - lblPdf.Text = value.Trim(); - hlPdfOpener.NavigateUrl = value.Trim(); + // poiché è necessario copiare in locale il pdf... + string nameOnly = $"~/temp/{itemCode}.pdf"; + hfItemPdf.Value = nameOnly; + // svuoto files vecchi... + removeOldTemp(); + // copio in locale file... + File.Copy(value.Trim(), Server.MapPath(nameOnly)); + // update... + hlPdfOpener.NavigateUrl = nameOnly; } } + + private void removeOldTemp() + { + var fileList = fileMover.obj.elencoFilesDir(Server.MapPath("~/temp")); + foreach (var item in fileList) + { + // solo se NON sono placeholder o none... + if (!item.Nome.Contains("none.pdf") && !item.Nome.Contains("PlaceHolder.file")) + { + if (item.dataMod < DateTime.Now.AddHours(-1)) + { + fileMover.deleteFile(Server.MapPath($"~/temp/{item.Nome}")); + } + } + } + } + protected string codSSC { get @@ -89,29 +194,27 @@ namespace NKC_WF.WebUserControls /// public void doUpdate() { - // genero nuovo QR - string qrUrl = getImageUrl(); - divImg.Visible = showMode; - canvasPdf.Visible = !showMode; - imgQrSmall.Visible = !showMode; - // fix img! - if (showMode) + // valutato ma non usato pdf.js: + // https://mozilla.github.io/pdf.js/examples/index.html#interactive-examples + + // se è variato da current... + if (newDtmx != itemDtmx) { - imgQrMain.ImageUrl = qrUrl; - } - else - { - imgQrSmall.ImageUrl = qrUrl; + itemDtmx = newDtmx; } } - protected void lbtScambia_Click(object sender, EventArgs e) + public void refreshCodPost() { - pdfPath = ComLib.getSecScreenRequest(codSSC); - showMode = !showMode; - doUpdate(); - // valutato ma non usato pdf.js: - // https://mozilla.github.io/pdf.js/examples/index.html#interactive-examples + // se NON HO PIU' un codice valido nella richiesta redis + if (string.IsNullOrEmpty(newDtmx)) + { + currNum = ComLib.getSecScreenCode(); + } + // genero nuovo QR + string qrUrl = getImageUrl(); + imgQrMain.ImageUrl = qrUrl; } + } } \ No newline at end of file diff --git a/NKC_WF/WebUserControls/cmp_secScreen.ascx.designer.cs b/NKC_WF/WebUserControls/cmp_secScreen.ascx.designer.cs index 12247f1..f968c52 100644 --- a/NKC_WF/WebUserControls/cmp_secScreen.ascx.designer.cs +++ b/NKC_WF/WebUserControls/cmp_secScreen.ascx.designer.cs @@ -24,31 +24,76 @@ namespace NKC_WF.WebUserControls protected global::System.Web.UI.WebControls.HiddenField hfNum; /// - /// Controllo hfShowMode. + /// Controllo hfCountDown. /// /// /// 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 hfShowMode; + protected global::System.Web.UI.WebControls.HiddenField hfCountDown; /// - /// Controllo lbtScambia. + /// 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.LinkButton lbtScambia; + protected global::System.Web.UI.WebControls.HiddenField hfBatchId; /// - /// Controllo hlPdfOpener. + /// Controllo hfSheetId. /// /// /// 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.HyperLink hlPdfOpener; + protected global::System.Web.UI.WebControls.HiddenField hfSheetId; + + /// + /// Controllo hfItemPdf. + /// + /// + /// 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 hfItemPdf; + + /// + /// Controllo hfItemDtmx. + /// + /// + /// 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 hfItemDtmx; + + /// + /// Controllo hfItemCode. + /// + /// + /// 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 hfItemCode; + + /// + /// Controllo timerRefresh. + /// + /// + /// Campo generato automaticamente. + /// Per la modifica, spostare la dichiarazione di campo dal file di progettazione al file code-behind. + /// + protected global::System.Web.UI.Timer timerRefresh; + + /// + /// Controllo hlShowCurrSheet. + /// + /// + /// 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.HyperLink hlShowCurrSheet; /// /// Controllo lblNum. @@ -60,22 +105,31 @@ namespace NKC_WF.WebUserControls protected global::System.Web.UI.WebControls.Label lblNum; /// - /// Controllo lblPdf. + /// Controllo lblMessage. /// /// /// 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.Label lblPdf; + protected global::System.Web.UI.WebControls.Label lblMessage; /// - /// Controllo imgQrSmall. + /// Controllo cmp_ItemDet. /// /// /// 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.Image imgQrSmall; + protected global::NKC_WF.WebUserControls.cmp_ItemDet cmp_ItemDet; + + /// + /// Controllo hlPdfOpener. + /// + /// + /// 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.HyperLink hlPdfOpener; /// /// Controllo divImg. @@ -94,14 +148,5 @@ 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.Image imgQrMain; - - /// - /// Controllo canvasPdf. - /// - /// - /// Campo generato automaticamente. - /// Per la modifica, spostare la dichiarazione di campo dal file di progettazione al file code-behind. - /// - protected global::System.Web.UI.HtmlControls.HtmlGenericControl canvasPdf; } } diff --git a/NKC_WF/WebUserControls/cmp_svgFull.ascx b/NKC_WF/WebUserControls/cmp_svgFull.ascx new file mode 100644 index 0000000..3bffc39 --- /dev/null +++ b/NKC_WF/WebUserControls/cmp_svgFull.ascx @@ -0,0 +1,7 @@ +<%@ Control Language="C#" AutoEventWireup="true" CodeBehind="cmp_svgFull.ascx.cs" Inherits="NKC_WF.WebUserControls.cmp_svgFull" %> + + + +
+ +
diff --git a/NKC_WF/WebUserControls/cmp_svgFull.ascx.cs b/NKC_WF/WebUserControls/cmp_svgFull.ascx.cs new file mode 100644 index 0000000..7bc7d83 --- /dev/null +++ b/NKC_WF/WebUserControls/cmp_svgFull.ascx.cs @@ -0,0 +1,88 @@ +using AppData; +using SteamWare; +using System; +using System.Collections.Generic; +using System.IO; +using System.Linq; +using System.Web; +using System.Web.UI; +using System.Web.UI.WebControls; + +namespace NKC_WF.WebUserControls +{ + public partial class cmp_svgFull : BaseUserControl + { + protected void Page_Load(object sender, EventArgs e) + { + if(!Page.IsPostBack) + { + filename = "../images/test.svg"; + } + } + + /// + /// Foglio corrente... + /// + public int SheetId + { + set + { + hfSheetId.Value = value.ToString(); + updateSvg(); + } + get + { + int answ = 0; + int.TryParse(hfSheetId.Value, out answ); + return answ; + } + } + /// + /// Percorso file calcolato + /// + public string filename + { + get + { + return hfFilename.Value; + } + set + { + hfFilename.Value = value; + } + } + public void updateSvg() + { + // recupero ID del foglio corrente + string answ = ""; + string baseOrig = memLayer.ML.CRS("nestBasePath").ToLower(); + string baseCurr = memLayer.ML.CRS("servBasePath").ToLower(); + try + { + var tabSheets = DataLayer.man.taSHL.getBySheetId(SheetId); + if (tabSheets.Count > 0) + { + filename = tabSheets[0].DrawFilePath.ToLower().Replace(baseOrig, baseCurr); + if (memLayer.ML.CRB("userVirtDir")) + { + filename = Server.MapPath(filename); + } + answ = File.ReadAllText(filename); + } + } + catch + { } + if (string.IsNullOrEmpty(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/999999999.svg"); + //filename = Server.MapPath("~/Images/NoData.svg"); + answ = File.ReadAllText(filename); + } + // update componente svg! + svgTable.InnerHtml = answ; + } + } +} \ No newline at end of file diff --git a/NKC_WF/WebUserControls/cmp_svgFull.ascx.designer.cs b/NKC_WF/WebUserControls/cmp_svgFull.ascx.designer.cs new file mode 100644 index 0000000..b1f6844 --- /dev/null +++ b/NKC_WF/WebUserControls/cmp_svgFull.ascx.designer.cs @@ -0,0 +1,53 @@ +//------------------------------------------------------------------------------ +// +// Codice generato da uno strumento. +// +// Le modifiche a questo file possono causare un comportamento non corretto e verranno perse se +// il codice viene rigenerato. +// +//------------------------------------------------------------------------------ + +namespace NKC_WF.WebUserControls +{ + + + public partial class cmp_svgFull + { + + /// + /// Controllo hfSheetId. + /// + /// + /// 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 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; + + /// + /// Controllo divCurrSheet. + /// + /// + /// Campo generato automaticamente. + /// Per la modifica, spostare la dichiarazione di campo dal file di progettazione al file code-behind. + /// + protected global::System.Web.UI.HtmlControls.HtmlGenericControl divCurrSheet; + + /// + /// Controllo svgTable. + /// + /// + /// Campo generato automaticamente. + /// Per la modifica, spostare la dichiarazione di campo dal file di progettazione al file code-behind. + /// + protected global::System.Web.UI.HtmlControls.HtmlGenericControl svgTable; + } +} diff --git a/NKC_WF/WebUserControls/cmp_unloadSmart.ascx.cs b/NKC_WF/WebUserControls/cmp_unloadSmart.ascx.cs index a262191..3fd5e53 100644 --- a/NKC_WF/WebUserControls/cmp_unloadSmart.ascx.cs +++ b/NKC_WF/WebUserControls/cmp_unloadSmart.ascx.cs @@ -1,5 +1,6 @@ using AppData; using NKC_SDK; +using SteamWare; using System; namespace NKC_WF.WebUserControls @@ -367,10 +368,9 @@ namespace NKC_WF.WebUserControls // se item già letto if (divItemDet.Visible) { - // FARE!!! recuperare VERO path... - string filePath = $"../temp/{lblItemCode.Text}.pdf"; - ComLib.setSecScreenRequest(rawData, filePath, 60 * 10); - displMessage($"ITEM Sent to second screen | {lblItemCode.Text}.pdf", true); + int defaultSecScreenShowTimeout = memLayer.ML.CRI("defaultSecScreenShowTimeout"); + ComLib.setSecScreenRequest(rawData, lblItemDtmx.Text, 60 * defaultSecScreenShowTimeout); + displMessage($"ITEM Sent to second screen | {lblItemDtmx.Text} for {defaultSecScreenShowTimeout} min", true); } else { diff --git a/NKC_WF/site/OrderScheduler.aspx b/NKC_WF/site/OrderScheduler.aspx index b8f6cfe..63b30fa 100644 --- a/NKC_WF/site/OrderScheduler.aspx +++ b/NKC_WF/site/OrderScheduler.aspx @@ -4,9 +4,6 @@ <%@ Register Src="~/WebUserControls/cmp_orderRunning.ascx" TagPrefix="uc1" TagName="cmp_orderRunning" %> <%@ Register Src="~/WebUserControls/cmp_orderPrint.ascx" TagPrefix="uc1" TagName="cmp_orderPrint" %> - - -
diff --git a/NKC_WF/site/SecondScreen.aspx b/NKC_WF/site/SecondScreen.aspx index 3daaab0..14c4fc4 100644 --- a/NKC_WF/site/SecondScreen.aspx +++ b/NKC_WF/site/SecondScreen.aspx @@ -4,8 +4,7 @@ - - + diff --git a/NKC_WF/site/SecondScreen.aspx.cs b/NKC_WF/site/SecondScreen.aspx.cs index ffb25f7..c560fda 100644 --- a/NKC_WF/site/SecondScreen.aspx.cs +++ b/NKC_WF/site/SecondScreen.aspx.cs @@ -13,10 +13,5 @@ namespace NKC_WF } } - protected void timerSecScreen_Tick(object sender, EventArgs e) - { - cmp_secScreen.showMode = !cmp_secScreen.showMode; - cmp_secScreen.doUpdate(); - } } } \ No newline at end of file diff --git a/NKC_WF/site/SecondScreen.aspx.designer.cs b/NKC_WF/site/SecondScreen.aspx.designer.cs index e828744..4cd015d 100644 --- a/NKC_WF/site/SecondScreen.aspx.designer.cs +++ b/NKC_WF/site/SecondScreen.aspx.designer.cs @@ -15,22 +15,13 @@ namespace NKC_WF { /// - /// Controllo timerSecScreen. + /// Controllo updPanelSecScreen. /// /// /// Campo generato automaticamente. /// Per la modifica, spostare la dichiarazione di campo dal file di progettazione al file code-behind. /// - protected global::System.Web.UI.Timer timerSecScreen; - - /// - /// Controllo UpdatePanel2. - /// - /// - /// Campo generato automaticamente. - /// Per la modifica, spostare la dichiarazione di campo dal file di progettazione al file code-behind. - /// - protected global::System.Web.UI.UpdatePanel UpdatePanel2; + protected global::System.Web.UI.UpdatePanel updPanelSecScreen; /// /// Controllo cmp_secScreen. diff --git a/NKC_WF/site/SvgFull.aspx b/NKC_WF/site/SvgFull.aspx new file mode 100644 index 0000000..ab676f8 --- /dev/null +++ b/NKC_WF/site/SvgFull.aspx @@ -0,0 +1,7 @@ +<%@ Page Title="" Language="C#" MasterPageFile="~/Site.Master" AutoEventWireup="true" CodeBehind="SvgFull.aspx.cs" Inherits="NKC_WF.site.SvgFull" %> + +<%@ Register Src="~/WebUserControls/cmp_svgFull.ascx" TagPrefix="uc1" TagName="cmp_svgFull" %> + + + + diff --git a/NKC_WF/site/SvgFull.aspx.cs b/NKC_WF/site/SvgFull.aspx.cs new file mode 100644 index 0000000..58c8e6f --- /dev/null +++ b/NKC_WF/site/SvgFull.aspx.cs @@ -0,0 +1,25 @@ +using Microsoft.Ajax.Utilities; +using SteamWare; +using System; +using System.Collections.Generic; +using System.Linq; +using System.Web; +using System.Web.UI; +using System.Web.UI.WebControls; + +namespace NKC_WF.site +{ + public partial class SvgFull : System.Web.UI.Page + { + protected void Page_Load(object sender, EventArgs e) + { + if(!Page.IsPostBack) + { + ((SiteMaster)this.Master).showSearch = false; + // recupero valore URL ed imposto... + int sheetId = memLayer.ML.QSI("sheetId"); + cmp_svgFull.SheetId = sheetId; + } + } + } +} \ No newline at end of file diff --git a/NKC_WF/site/SvgFull.aspx.designer.cs b/NKC_WF/site/SvgFull.aspx.designer.cs new file mode 100644 index 0000000..7990990 --- /dev/null +++ b/NKC_WF/site/SvgFull.aspx.designer.cs @@ -0,0 +1,26 @@ +//------------------------------------------------------------------------------ +// +// Codice generato da uno strumento. +// +// Le modifiche a questo file possono causare un comportamento non corretto e verranno perse se +// il codice viene rigenerato. +// +//------------------------------------------------------------------------------ + +namespace NKC_WF.site +{ + + + public partial class SvgFull + { + + /// + /// Controllo cmp_svgFull. + /// + /// + /// Campo generato automaticamente. + /// Per la modifica, spostare la dichiarazione di campo dal file di progettazione al file code-behind. + /// + protected global::NKC_WF.WebUserControls.cmp_svgFull cmp_svgFull; + } +} diff --git a/NKC_WF/temp/119748.pdf b/NKC_WF/temp/119748.pdf new file mode 100644 index 0000000..5ee27c6 Binary files /dev/null and b/NKC_WF/temp/119748.pdf differ diff --git a/NKC_WF/temp/119752.pdf b/NKC_WF/temp/none.pdf similarity index 100% rename from NKC_WF/temp/119752.pdf rename to NKC_WF/temp/none.pdf