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

Fix teim in min:sec x preview + fix dimensioni

Browse Source
This commit is contained in:
Samuele E. Locatelli
2020-01-27 11:10:56 +01:00
parent a12dbcef7d
commit fe8cd2153e
7 changed files with 42 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files
NKC_WF/NKC_WF.csproj
-3
View File
@@ -1053,9 +1053,6 @@
<Content Include="Scripts\popper.js.map" />
<Content Include="Scripts\popper-utils.min.js.map" />
<Content Include="Scripts\popper-utils.js.map" />
<Content Include="SHARE_NEST\.PlaceHolder.file">
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
</Content>
<Content Include="SHARE_SQL\.PlaceHolder.file">
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
</Content>
NKC_WF/SHARE_NEST/.PlaceHolder.file
-1
View File
@@ -1 +0,0 @@

NKC_WF/WebUserControls/cmp_BP_bunkList.ascx
+6 -5
View File
@@ -21,15 +21,16 @@
</asp:TemplateField>
<asp:TemplateField HeaderText="Bunk #" SortExpression="StackIndex">
<ItemTemplate>
<asp:Label ID="lblStackIndex" runat="server" Text='<%# Eval("StackIndex") %>' CssClass="font-weight-bold" /></br>
<asp:Label ID="lblStackID" runat="server" Text='<%# Eval("StackID") %>' CssClass="small" />
<asp:Label ID="lblStackIndex" runat="server" Text='<%# Eval("StackIndex") %>' CssClass="font-weight-bold" />
<br/>
<asp:Label ID="lblStackID" runat="server" Text='<%# Eval("StackID","{0}") %>' CssClass="small" />
</ItemTemplate>
</asp:TemplateField>
<asp:TemplateField HeaderText="Sheets (Prepared / Total)" SortExpression="NumSheets">
<asp:TemplateField HeaderText="Sheets /Parts" SortExpression="NumSheets">
<ItemTemplate>
<div runat="server" id="divMain" class="row mx-1 ">
<div class="col-9 pl-1 text-left">Sheets: <b><%# Eval("NumSheetsPrepared") %></b> / <%# Eval("NumSheets") %></div>
<div class="col-3 pr-1">items: <b><%# Eval("NumItems") %></b></div>
<div class="col-12 px-0 text-left">S: <b><%# Eval("NumSheets") %></b></div>
<div class="col-12 px-0 text-left">P: <b><%# Eval("NumItems") %></b></div>
</div>
</ItemTemplate>
<ItemStyle CssClass="text-right" />
NKC_WF/WebUserControls/cmp_BP_sheetList.ascx
+17 -4
View File
@@ -18,14 +18,27 @@
<asp:LinkButton ID="lbSelect" runat="server" CausesValidation="False" CommandName="Select" CommandArgument='<%# Eval("StackIndex") %>' CssClass="btn btn-sm btn-primary"><i class="fa fa-search" aria-hidden="true"></i></asp:LinkButton>
</ItemTemplate>
</asp:TemplateField>
<asp:BoundField DataField="SheetID" HeaderText="#" ReadOnly="True" SortExpression="SheetID" />
<asp:BoundField DataField="StackIndex" HeaderText="#" ReadOnly="True" SortExpression="StackIndex" />
<asp:TemplateField HeaderText="Material" SortExpression="MatExtCode">
<ItemTemplate>
<asp:Label ID="Label1" runat="server" Text='<%# Eval("MatExtCode") %>' CssClass="font-weight-bold"></asp:Label><br />
<asp:Label ID="Label2" runat="server" Text='<%# Eval("MatDesc") %>' CssClass="small"></asp:Label>
<div class="row">
<div class="col-8 text-left">
<asp:Label ID="lblMatExtCode" runat="server" Text='<%# Eval("MatExtCode") %>' CssClass="font-weight-bold"></asp:Label>
</div>
<div class="col-4">
<asp:Label ID="lblSheetID" runat="server" Text='<%# Eval("SheetID") %>' CssClass="small text-right"></asp:Label>
</div>
<div class="col-12 text-left">
<asp:Label ID="lblMatDesc" runat="server" Text='<%# Eval("MatDesc") %>' CssClass="small"></asp:Label>
</div>
</div>
</ItemTemplate>
</asp:TemplateField>
<asp:TemplateField HeaderText="Estim" SortExpression="WrkTimeEst">
<ItemTemplate>
<asp:Label ID="lblWrkTimeEst" runat="server" Text='<%# formatMinSec(Eval("WrkTimeEst", "{0:N0}")) %>'></asp:Label>
</ItemTemplate>
</asp:TemplateField>
<asp:BoundField DataField="WrkTimeEst" HeaderText="Estim" SortExpression="WrkTimeEst" DataFormatString="{0:N1}" />
</Columns>
</asp:GridView>
<asp:ObjectDataSource ID="ods" runat="server" OldValuesParameterFormatString="original_{0}" SelectMethod="getByStack" TypeName="AppData.DS_AppTableAdapters.SheetListTableAdapter">
NKC_WF/WebUserControls/cmp_BP_sheetList.ascx.cs
+15
View File
@@ -82,5 +82,20 @@ namespace NKC_WF.WebUserControls
{
raiseEvent();
}
/// <summary>
/// Formatta in min/sec il tempo in sec decimale
/// </summary>
/// <param name="_timeSec"></param>
/// <returns></returns>
public string formatMinSec(object _timeSec)
{
int totSec = 0;
string answ = "";
int.TryParse(_timeSec.ToString(), out totSec);
int numMin = totSec / 60;
int numSec = totSec - (60 * numMin);
answ = $"{numMin:00}:{numSec:00}";
return answ;
}
}
}
NKC_WF/WebUserControls/cmp_MU_svgViewer.ascx
+2 -2
View File
@@ -5,7 +5,7 @@
</div>
<script type="text/javascript">
lastVal = 0;
setInterval("my_function();", 900);
setInterval("my_function();", 300);
function my_function() {
SheetId = document.getElementById('<%=hfSheetId.ClientID%>').value;
document.getElementById("dynCss").href = "../api/getMUCss/" + SheetId;
@@ -20,7 +20,7 @@
});
}
</script>
<svg width="1200" height="600" xmlns='http://www.w3.org/2000/svg' runat="server" id="svgTable">
<svg width="1000" height="500" xmlns='http://www.w3.org/2000/svg' runat="server" id="svgTable">
</svg>
<asp:HiddenField ID="hfSheetId" runat="server" Value="0" />
<asp:HiddenField ID="hfFilename" runat="server" Value="" />
NKC_WF/site/BatchPreview.aspx
+2 -2
View File
@@ -7,10 +7,10 @@
<asp:Content ID="Content1" ContentPlaceHolderID="MainContent" runat="server">
<asp:HiddenField ID="hfBatchID" runat="server" />
<div class="row text-center small">
<div class="col-2 pr-0 small">
<div class="col-1 pr-0 small">
<uc1:cmp_BP_bunkList runat="server" id="cmp_BP_bunkList" />
</div>
<div class="col-8 px-0">
<div class="col-9 px-0">
<h3>Batch preview - start | pause | stop</h3>
<uc1:cmp_MU_svgViewer runat="server" id="cmp_MU_svgViewer" />
</div>