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

Fix gestione preview OfflineOrder

Browse Source
This commit is contained in:
Samuele E. Locatelli
2020-08-11 11:41:12 +02:00
parent 19bd8346cf
commit 5962233299
10 changed files with 99 additions and 95 deletions
Download Patch File Download Diff File Expand all files Collapse all files
NKC_WF/Controllers/BatchProcController.cs
+4 -1
View File
@@ -293,8 +293,11 @@ namespace NKC_WF.Controllers
}
else
{
string nestBasePath = memLayer.ML.CRS("nestBasePath").ToLower();
string servBasePath = memLayer.ML.CRS("servBasePath").ToLower();
string fixPath = rispNest.DrawingPath.ToLower().Replace(nestBasePath, servBasePath);
// segno offline order come processato registrando il disegno e segno ogni PART come lavorata da OffOrd2Item (status 992)
DataLayer.man.taOffOL.updateDrawing(Math.Abs(rispNest.BatchID), rispNest.DrawingPath);
DataLayer.man.taOffOL.updateDrawing(Math.Abs(rispNest.BatchID), fixPath);
}
}
}
NKC_WF/WebUserControls/cmp_OOIL_drawings.ascx
+2 -3
View File
@@ -8,11 +8,10 @@
<asp:Repeater ID="repDraw" runat="server">
<ItemTemplate>
<div class="col-3">
<asp:HyperLink runat="server" ID="hlQrSvg" CssClass="btn btn-sm btn-outline-primary btn-block" Target="_blank" NavigateUrl='<%# $"SvgFull?ImgPath={Eval("DrawPath")}" %>'>
<asp:HyperLink runat="server" ID="hlQrSvg" CssClass="btn btn-sm btn-outline-primary btn-block" Target="_blank" NavigateUrl='<%# $"~/site/SvgFull?ImgPath={Eval("DrawPath")}" %>'>
<i class="fa fa-object-group" aria-hidden="true"></i> <%# Eval("imgName") %>
</asp:HyperLink>
</div>
</ItemTemplate>
</asp:Repeater>
</div>
<%--traduci("SheetPreview")--%>
</div>
NKC_WF/WebUserControls/cmp_OOIL_drawings.ascx.cs
+8 -3
View File
@@ -1,4 +1,5 @@
using System;
using SteamWare;
using System;
using System.Collections.Generic;
using System.IO;
using System.Linq;
@@ -22,7 +23,10 @@ namespace NKC_WF.WebUserControls
}
set
{
hfDrawingPath.Value = value;
string nestBasePath = memLayer.ML.CRS("nestBasePath").ToLower();
string servBasePath = memLayer.ML.CRS("servBasePath").ToLower();
string fixPath = value.Replace(nestBasePath, servBasePath);
hfDrawingPath.Value = fixPath;
fixDataBind();
}
}
@@ -30,6 +34,7 @@ namespace NKC_WF.WebUserControls
private void fixDataBind()
{
string currPath = DrawingPath;
// in primis: fix directory
// visibile SOLO SE valore != null...
if (string.IsNullOrEmpty(currPath))
{
@@ -51,7 +56,7 @@ namespace NKC_WF.WebUserControls
{
foreach (var item in elencoFiles)
{
elencoDisegni.Add(new imgData { imgName = Path.GetFileName(item), DrawPath = item });
elencoDisegni.Add(new imgData { imgName = Path.GetFileName(item), DrawPath = item.Replace(@"/",@"\") });
}
}
// sistemo repeater
NKC_WF/WebUserControls/cmp_offOrderDetail.ascx.cs
-18
View File
@@ -37,24 +37,6 @@ namespace NKC_WF.WebUserControls
protected void frmView_DataBound(object sender, EventArgs e)
{
#if false
try
{
Label filePath = (Label)frmView.FindControl("DrawFilePathLabel");
// se ho una stringa valida mostro svg, altrimenti NOT PROCESSED...
if (!string.IsNullOrEmpty(filePath.Text))
{
string filename = Server.MapPath(filePath.Text);
string svgRawData = File.ReadAllText(filename);
HtmlGenericControl svgControl = (HtmlGenericControl)frmView.FindControl("svgTable");
svgControl.InnerHtml = svgRawData;
}
}
catch (Exception exc)
{
logger.lg.scriviLog($"Eccezione in tentativo display file svg da ordine offline{Environment.NewLine}{exc}");
}
#endif
}
protected void lbtMakeCnc_Click(object sender, EventArgs e)
NKC_WF/WebUserControls/cmp_offlineOrders.ascx.cs
+2 -1
View File
@@ -4,7 +4,7 @@ using System.Web.UI;
namespace NKC_WF.WebUserControls
{
public partial class cmp_offlineOrders : System.Web.UI.UserControl
public partial class cmp_offlineOrders : BaseUserControl
{
protected void Page_Load(object sender, EventArgs e)
{
@@ -47,6 +47,7 @@ namespace NKC_WF.WebUserControls
grView.SelectedIndex = -1;
grView.DataBind();
cmp_offOrderDetail.Visible = false;
raiseReset();
}
protected int selOrdId
NKC_WF/WebUserControls/cmp_scrapList.ascx
+43 -55
View File
@@ -3,59 +3,47 @@
<div class="card">
<div class="card-header text-center bg-warning">
<h4>Scrap List (Items to process)</h4>
</div>
<div class="card-body">
<asp:GridView ID="grView" runat="server" AutoGenerateColumns="False" DataKeyNames="ItemID" DataSourceID="ods" AllowPaging="True" CssClass="table table-sm table-condensed table-striped" AllowSorting="true">
<Columns>
<%--<asp:BoundField DataField="ItemID" HeaderText="ItemID" InsertVisible="False" ReadOnly="True" SortExpression="ItemID" />
<asp:BoundField DataField="StatusID" HeaderText="StatusID" SortExpression="StatusID" />
<asp:BoundField DataField="OrdID" HeaderText="OrdID" SortExpression="OrdID" />
<asp:BoundField DataField="ItemDtmx" HeaderText="ItemDtmx" SortExpression="ItemDtmx" />--%>
<asp:TemplateField>
<HeaderTemplate>
<asp:CheckBox runat="server" ID="chkToggle" AutoPostBack="True" OnCheckedChanged="chkToggle_CheckedChanged" />
</HeaderTemplate>
<ItemTemplate>
<asp:CheckBox runat="server" ID="chkSelected" Visible='<%# Eval("StatusID").ToString()=="990" %>' />
<asp:HiddenField runat="server" ID="hfItemID" Value='<%# Eval("ItemID") %>' />
</ItemTemplate>
</asp:TemplateField>
<asp:TemplateField HeaderText="Mat" SortExpression="MatID">
<ItemTemplate>
<asp:Label runat="server" ID="lblMatId" Text='<%# matByKey(Eval("MatID")) %>' CssClass='<%# cssByStatus(Eval("StatusID")) %>' />
</ItemTemplate>
</asp:TemplateField>
<%--<asp:BoundField DataField="ItemNote" HeaderText="ItemNote" SortExpression="ItemNote" />
<asp:BoundField DataField="ItemQty" HeaderText="ItemQty" SortExpression="ItemQty" />--%>
<%--<asp:CheckBoxField DataField="MachiningReq" HeaderText="MachiningReq" SortExpression="MachiningReq" />
<asp:BoundField DataField="PostProcList" HeaderText="PostProcList" SortExpression="PostProcList" />
<asp:BoundField DataField="ProcessesReq" HeaderText="ProcessesReq" SortExpression="ProcessesReq" />
<asp:BoundField DataField="CadFilePath" HeaderText="CadFilePath" SortExpression="CadFilePath" />--%>
<asp:TemplateField HeaderText="Code" SortExpression="ItemExtCode">
<ItemTemplate>
<asp:Label ID="Label2" runat="server" Text='<%# Eval("ItemExtCode") %>' CssClass='<%# cssByStatus(Eval("StatusID")) %>' />
</ItemTemplate>
</asp:TemplateField>
<asp:TemplateField HeaderText="Desc" SortExpression="ItemDesc">
<ItemTemplate>
<asp:Label ID="Label1" runat="server" Text='<%# Eval("ItemDesc") %>' CssClass='<%# cssByStatus(Eval("StatusID")) %>' />
</ItemTemplate>
</asp:TemplateField>
</Columns>
</asp:GridView>
<asp:ObjectDataSource ID="ods" runat="server" OldValuesParameterFormatString="original_{0}" SelectMethod="getByStatus" TypeName="AppData.DS_AppTableAdapters.ItemListTableAdapter">
<SelectParameters>
<asp:Parameter DefaultValue="990" Name="minStatus" Type="Int32" />
<asp:Parameter DefaultValue="999" Name="maxStatus" Type="Int32" />
</SelectParameters>
</asp:ObjectDataSource>
<%--<asp:DropDownList runat="server" ID="ddlMat" DataSourceID="odsMat" DataTextField="MatDesc" DataValueField="MatID"></asp:DropDownList>--%>
<%--<asp:ObjectDataSource runat="server" ID="odsMat" OldValuesParameterFormatString="original_{0}" SelectMethod="GetData" TypeName="AppData.DS_AppTableAdapters.MaterialsTableAdapter"></asp:ObjectDataSource>--%>
<asp:LinkButton runat="server" ID="lbtCreateOffOrd" CssClass="btn btn-outline-success btn-block" OnClick="lbtCreateOffOrd_Click" OnClientClick='return confirm("Confirm create order fo selected items?")'>Create Order <i class="fa fa-arrow-circle-right" aria-hidden="true"></i></asp:LinkButton>
</div>
</div>
<div class="card-footer">
<uc1:mod_righePag runat="server" ID="mod_righePag" />
<div class="card-header text-center bg-warning">
<h4>Scrap List (Items to process)</h4>
</div>
<div class="card-body">
<asp:GridView ID="grView" runat="server" AutoGenerateColumns="False" DataKeyNames="ItemID" DataSourceID="ods" AllowPaging="True" CssClass="table table-sm table-condensed table-striped" AllowSorting="true">
<Columns>
<asp:TemplateField>
<HeaderTemplate>
<asp:CheckBox runat="server" ID="chkToggle" AutoPostBack="True" OnCheckedChanged="chkToggle_CheckedChanged" />
</HeaderTemplate>
<ItemTemplate>
<asp:CheckBox runat="server" ID="chkSelected" Visible='<%# Eval("StatusID").ToString()=="990" %>' />
<asp:HiddenField runat="server" ID="hfItemID" Value='<%# Eval("ItemID") %>' />
</ItemTemplate>
</asp:TemplateField>
<asp:TemplateField HeaderText="Mat" SortExpression="MatID">
<ItemTemplate>
<asp:Label runat="server" ID="lblMatId" Text='<%# matByKey(Eval("MatID")) %>' CssClass='<%# cssByStatus(Eval("StatusID")) %>' />
</ItemTemplate>
</asp:TemplateField>
<asp:TemplateField HeaderText="Code" SortExpression="ItemExtCode">
<ItemTemplate>
<asp:Label ID="Label2" runat="server" Text='<%# Eval("ItemExtCode") %>' CssClass='<%# cssByStatus(Eval("StatusID")) %>' />
</ItemTemplate>
</asp:TemplateField>
<asp:TemplateField HeaderText="Desc" SortExpression="ItemDesc">
<ItemTemplate>
<asp:Label ID="Label1" runat="server" Text='<%# Eval("ItemDesc") %>' CssClass='<%# cssByStatus(Eval("StatusID")) %>' />
</ItemTemplate>
</asp:TemplateField>
</Columns>
</asp:GridView>
<asp:ObjectDataSource ID="ods" runat="server" OldValuesParameterFormatString="original_{0}" SelectMethod="getByStatus" TypeName="AppData.DS_AppTableAdapters.ItemListTableAdapter">
<SelectParameters>
<asp:Parameter DefaultValue="990" Name="minStatus" Type="Int32" />
<asp:Parameter DefaultValue="999" Name="maxStatus" Type="Int32" />
</SelectParameters>
</asp:ObjectDataSource>
<asp:LinkButton runat="server" ID="lbtCreateOffOrd" CssClass="btn btn-outline-success btn-block" OnClick="lbtCreateOffOrd_Click" OnClientClick='return confirm("Confirm create order fo selected items?")'>Create Order <i class="fa fa-arrow-circle-right" aria-hidden="true"></i></asp:LinkButton>
</div>
<div class="card-footer">
<uc1:mod_righePag runat="server" ID="mod_righePag" />
</div>
</div>
NKC_WF/WebUserControls/cmp_svgFull.ascx.cs
+19 -9
View File
@@ -59,18 +59,28 @@ namespace NKC_WF.WebUserControls
string baseCurr = memLayer.ML.CRS("servBasePath").ToLower();
try
{
var tabSheets = DataLayer.man.taSHL.getBySheetId(SheetId);
if (tabSheets.Count > 0)
if (SheetId > 0)
{
filename = tabSheets[0].DrawFilePath.ToLower().Replace(baseOrig, baseCurr);
// la versioen da usare è la "_qr.svg", x cui faccio replace... tolgo ultimi 4 char e sostituisco...
int repPos = filename.LastIndexOf(".svg");
filename = filename.Remove(repPos) + "_qr.svg";
if (memLayer.ML.CRB("userVirtDir"))
var tabSheets = DataLayer.man.taSHL.getBySheetId(SheetId);
if (tabSheets.Count > 0)
{
filename = Server.MapPath(filename);
filename = tabSheets[0].DrawFilePath.ToLower().Replace(baseOrig, baseCurr);
// la versioen da usare è la "_qr.svg", x cui faccio replace... tolgo ultimi 4 char e sostituisco...
int repPos = filename.LastIndexOf(".svg");
filename = filename.Remove(repPos) + "_qr.svg";
if (memLayer.ML.CRB("userVirtDir"))
{
filename = Server.MapPath(filename);
}
answ = File.ReadAllText(filename);
}
}
else
{
if (File.Exists(filename))
{
answ = File.ReadAllText(filename);
}
answ = File.ReadAllText(filename);
}
}
catch
NKC_WF/site/MachineOffline.aspx
+2 -2
View File
@@ -8,10 +8,10 @@
<ContentTemplate>
<asp:Timer ID="timerScrap" runat="server" Interval="5000" OnTick="timerScrap_Tick"></asp:Timer>
<div class="row m-2">
<div class="col">
<div class="col-12 col-md-6">
<uc1:cmp_scrapList runat="server" ID="cmp_scrapList" />
</div>
<div class="col">
<div class="col-12 col-md-6">
<uc1:cmp_offlineOrders runat="server" ID="cmp_offlineOrders" />
</div>
</div>
NKC_WF/site/MachineOffline.aspx.cs
+8 -1
View File
@@ -1,4 +1,5 @@
using System;
using NKC_WF.WebUserControls;
using System;
namespace NKC_WF
{
@@ -7,6 +8,12 @@ namespace NKC_WF
protected void Page_Load(object sender, EventArgs e)
{
cmp_scrapList.eh_doRefresh += Cmp_scrapList_eh_doRefresh;
cmp_offlineOrders.eh_doReset += cmp_offlineOrders_eh_doReset;
}
private void cmp_offlineOrders_eh_doReset(object sender, EventArgs e)
{
cmp_scrapList.doUpdate();
}
private void Cmp_scrapList_eh_doRefresh(object sender, EventArgs e)
NKC_WF/site/SvgFull.aspx.cs
+11 -2
View File
@@ -13,12 +13,21 @@ namespace NKC_WF.site
{
protected void Page_Load(object sender, EventArgs e)
{
if(!Page.IsPostBack)
if (!Page.IsPostBack)
{
((SiteMaster)this.Master).showSearch = false;
// recupero valore URL ed imposto...
int sheetId = memLayer.ML.QSI("sheetId");
cmp_svgFull.SheetId = sheetId;
string ImgPath = memLayer.ML.QSS("ImgPath");
if (sheetId > 0)
{
cmp_svgFull.SheetId = sheetId;
}
else if(!string.IsNullOrEmpty(ImgPath))
{
cmp_svgFull.filename = ImgPath;
cmp_svgFull.updateSvg();
}
}
}
}