Merge remote-tracking branch 'GitlabSteamware/feature/translation' into develop

This commit is contained in:
Samuele E. Locatelli
2020-08-12 15:27:36 +02:00
16 changed files with 32 additions and 33 deletions
+1 -1
View File
@@ -1,7 +1,7 @@
<%@ Control Language="C#" AutoEventWireup="true" CodeBehind="cmp_KS_currBin.ascx.cs" Inherits="NKC_WF.WebUserControls.cmp_KS_currBin" %>
<div class="border border-info">
<h5 class="table-info">BIN</h5>
<h5 class="table-info"># <%: traduci ("Bin") %></h5>
<asp:HiddenField runat="server" ID="hfValue" />
<asp:Label runat="server" ID="lblDtmx" />
</div>
+1 -1
View File
@@ -1,7 +1,7 @@
<%@ Control Language="C#" AutoEventWireup="true" CodeBehind="cmp_KS_currCart.ascx.cs" Inherits="NKC_WF.WebUserControls.cmp_KS_currCart" %>
<div class="border border-success">
<h5 class="table-success">CART</h5>
<h5 class="table-success"># <%: traduci ("Cart") %></h5>
<asp:HiddenField runat="server" ID="hfValue" />
<asp:Label runat="server" ID="lblDtmx" />
</div>
+1 -1
View File
@@ -1,6 +1,6 @@
<%@ Control Language="C#" AutoEventWireup="true" CodeBehind="cmp_KS_currItm.ascx.cs" Inherits="NKC_WF.WebUserControls.cmp_KS_currItm" %>
<div class="border border-secondary">
<h5 class="table-info">PARTS</h5>
<h5 class="table-info"># <%: traduci ("parts") %></h5>
<asp:HiddenField runat="server" ID="hfValue" />
<asp:Label runat="server" ID="lblDtmx" />
</div>
+1 -1
View File
@@ -1,6 +1,6 @@
<%@ Control Language="C#" AutoEventWireup="true" CodeBehind="cmp_KS_currOI.ascx.cs" Inherits="NKC_WF.WebUserControls.cmp_KS_currOI" %>
<div class="border border-secondary">
<h5 class="table-info">OTHER PARTS</h5>
<h5 class="table-info"># <%: traduci ("OtherParts") %></h5>
<asp:HiddenField runat="server" ID="hfValue" />
<asp:Label runat="server" ID="lblDtmx" />
</div>
@@ -9,9 +9,9 @@
<table class="table table-sm mb-0">
<thead>
<tr>
<th scope="col">WAIT</th>
<th scope="col">WIP</th>
<th scope="col">DONE</th>
<th scope="col"># <%: traduci ("Wait") %></th>
<th scope="col"># <%: traduci ("Wip") %></th>
<th scope="col"># <%: traduci ("Done") %></th>
</tr>
</thead>
<tbody>
+1 -1
View File
@@ -45,7 +45,7 @@
<label for="TotalTimeLabel" class="col-sm-4 col-form-label py-0">Estimated Time</label>
<div class="col-sm-8 font-weight-bold">
<asp:Label ID="TotalTimeLabel" runat="server" Text='<%# Eval("TotalTime","{0:N2}") %>' />
min
# <%: traduci ("Min") %>
</div>
</div>
</div>
+5 -5
View File
@@ -2,19 +2,19 @@
<div class="shortcuts">
<div class="row">
<div class="col">
<asp:LinkButton runat="server" ID="lbtResetStackBuild" class="shortcut" OnClick="lbtResetStackBuild_Click" OnClientClick='return confirm("Sicuro di voler resettare tutti i dati di preparazione Stacks?")'> <i class="fa fa-database shortcut-icon"></i><span class="shortcut-label"><b>Reset</b><br /> Stack building</span> </asp:LinkButton>
<asp:LinkButton runat="server" ID="lbtResetStackBuild" class="shortcut" OnClick="lbtResetStackBuild_Click" OnClientClick='return confirm("Sicuro di voler resettare tutti i dati di preparazione Stacks?")'> <i class="fa fa-database shortcut-icon"></i><span class="shortcut-label"><b># <%: traduci ("reset") %></b><br /> Stack building</span> </asp:LinkButton>
</div>
<div class="col">
<asp:LinkButton runat="server" ID="lbtResetNest" class="shortcut" OnClientClick='return confirm("Sicuro di voler resettare tutti i dati di Nesting? I Batch torneranno come appena importati e PRIMA di ogni chiamata al NESTING...")' OnClick="lbtResetNest_Click"> <i class="fa fa-file-image-o shortcut-icon"></i><span class="shortcut-label"><b>Reset</b><br /> Nesting Calls</span> </asp:LinkButton>
<asp:LinkButton runat="server" ID="lbtResetNest" class="shortcut" OnClientClick='return confirm("Sicuro di voler resettare tutti i dati di Nesting? I Batch torneranno come appena importati e PRIMA di ogni chiamata al NESTING...")' OnClick="lbtResetNest_Click"> <i class="fa fa-file-image-o shortcut-icon"></i><span class="shortcut-label"><b># <%: traduci ("reset") %></b><br /> Nesting Calls</span> </asp:LinkButton>
</div>
<div class="col">
<asp:LinkButton runat="server" ID="lbtSaveLastAnsw" class="shortcut" OnClientClick='return confirm("Sicuro di voler salvare ultima risposta NESTING?")' OnClick="lbtSaveLastAnsw_Click" > <i class="fa fa-file-image-o shortcut-icon"></i><span class="shortcut-label"><b>SAVE</b><br /> LAST Call</span> </asp:LinkButton>
<asp:LinkButton runat="server" ID="lbtSaveLastAnsw" class="shortcut" OnClientClick='return confirm("Sicuro di voler salvare ultima risposta NESTING?")' OnClick="lbtSaveLastAnsw_Click" > <i class="fa fa-file-image-o shortcut-icon"></i><span class="shortcut-label"><b># <%: traduci ("Save") %></b><br /> LAST Call</span> </asp:LinkButton>
</div>
<div class="col">
<asp:HyperLink runat="server" ID="hlDbgQrCode" NavigateUrl="../site/DBG_QRCode_Unload" Target="_blank" class="shortcut"><i class="fa fa-qrcode shortcut-icon"></i><span class="shortcut-label"><b>DEBUG</b><br /> QRCode</span></asp:HyperLink>
<asp:HyperLink runat="server" ID="hlDbgQrCode" NavigateUrl="../site/DBG_QRCode_Unload" Target="_blank" class="shortcut"><i class="fa fa-qrcode shortcut-icon"></i><span class="shortcut-label"><b># <%: traduci ("Debug") %></b><br /> QRCode</span></asp:HyperLink>
</div>
<div class="col">
<asp:LinkButton runat="server" ID="lbtResetProd" class="shortcut" OnClientClick='return confirm("Sicuro di voler resettare tutti i dati di PROD? I fogli (batch hard coded) torneranno tutti in stato zero e non ancora stampati...")' OnClick="lbtResetProd_Click" > <i class="fa fa-wrench shortcut-icon"></i><span class="shortcut-label"><b>Reset</b><br /> PROD call</span> </asp:LinkButton>
<asp:LinkButton runat="server" ID="lbtResetProd" class="shortcut" OnClientClick='return confirm("Sicuro di voler resettare tutti i dati di PROD? I fogli (batch hard coded) torneranno tutti in stato zero e non ancora stampati...")' OnClick="lbtResetProd_Click" > <i class="fa fa-wrench shortcut-icon"></i><span class="shortcut-label"><b># <%: traduci ("reset") %></b><br /> PROD call</span> </asp:LinkButton>
</div>
</div>
</div>
+3 -3
View File
@@ -31,13 +31,13 @@
</div>
<div class="col-3">
<div runat="server" id="divStep1" class="alert">
<strong>Step 1</strong> # <%: traduci("FileUploaded") %>
<strong># <%: traduci ("StepOne") %></strong> # <%: traduci("FileUploaded") %>
</div>
<div runat="server" id="divStep2" class="alert">
<strong>Step 2</strong> # <%: traduci("DataValidated") %>
<strong># <%: traduci ("StepTwo") %></strong> # <%: traduci("DataValidated") %>
</div>
<div runat="server" id="divStep3" class="alert">
<strong>Step 3</strong> # <%: traduci("DataImported") %>
<strong># <%: traduci ("StepThree") %></strong> # <%: traduci("DataImported") %>
</div>
</div>
</div>
@@ -26,7 +26,6 @@
</div>
<div class="col-4 text-left">
# <%: traduci("OnKitting") %>
On Kitting:
</div>
<div class="col-8 text-right">
<b>
+1 -1
View File
@@ -1,4 +1,4 @@
<%@ Control Language="C#" AutoEventWireup="true" CodeBehind="cmp_login.ascx.cs" Inherits="NKC_WF.WebUserControls.cmp_login" %>
<h3>Gestione login AD</h3>
<h3># <%: traduci ("GestioneLogin") %></h3>
<asp:Label runat="server" ID="lblMessage" />
+3 -3
View File
@@ -37,15 +37,15 @@
<a class="nav-link text-light" href="ForceReload"><i class="fa fa-retweet shortcut-icon"></i> <%: traduci("ForceReload") %></a>
</li>--%>
<li class="nav-item">
<a class="nav-link" href="About">About</a>
<a class="nav-link" href="About"># <%: traduci ("About") %></a>
</li>
<li class="nav-item">
<a class="nav-link" href="Contact">Contacts</a>
<a class="nav-link" href="Contact"># <%: traduci ("Contacts") %></a>
</li>
</ul>
<div runat="server" id="divSearch" class="form-inline my-2 my-lg-0">
<asp:TextBox runat="server" ID="txtSearch" class="form-control mr-sm-2" type="search" placeholder="Search" aria-label="Search" AutoPostBack="true" OnTextChanged="txtSearch_TextChanged" />
<asp:LinkButton runat="server" ID="lbtSearch" class="btn btn-secondary my-2 my-sm-0" type="submit" OnClick="lbtSearch_Click">Search <i class="fa fa-search" aria-hidden="true"></i></asp:LinkButton>
<asp:LinkButton runat="server" ID="lbtSearch" class="btn btn-secondary my-2 my-sm-0" type="submit" OnClick="lbtSearch_Click"># <%: traduci ("Search") %> <i class="fa fa-search" aria-hidden="true"></i></asp:LinkButton>
</div>
</div>
</nav>
@@ -10,7 +10,7 @@
<ItemTemplate>
<div class="row">
<div class="col-12">
<asp:Label runat="server" ID="lblWarning" CssClass="text-danger lead font-weight-bold" Visible='<%# Eval("DrawFilePath").ToString() == "" %>'><i class="fa fa-exclamation-triangle" aria-hidden="true"></i> NOT YET PROCESSED</asp:Label>
<asp:Label runat="server" ID="lblWarning" CssClass="text-danger lead font-weight-bold" Visible='<%# Eval("DrawFilePath").ToString() == "" %>'><i class="fa fa-exclamation-triangle" aria-hidden="true"></i> # <%: traduci ("NotYetProcessed") %></asp:Label>
<%--<svg width="710" height="305" viewBox='0 0 1420 710' xmlns='http://www.w3.org/2000/svg' runat="server" id="svgTable" Visible='<%# Eval("DrawFilePath").ToString() != "" %>'>
</svg>--%>
</div>
@@ -21,12 +21,12 @@
</div>
<div class="row my-2">
<div class="col">
<asp:LinkButton runat="server" ID="lbtMakeCnc" CssClass="btn btn-success btn-block" Visible='<%# Eval("OrdStatus").ToString()=="0" %>' OnClick="lbtMakeCnc_Click" OnClientClick='return confirm("Send to CAM?")'><i class="fa fa-laptop" aria-hidden="true"></i> MAKE CNC PROG</asp:LinkButton>
<asp:LinkButton runat="server" ID="lbtMakeCnc" CssClass="btn btn-success btn-block" Visible='<%# Eval("OrdStatus").ToString()=="0" %>' OnClick="lbtMakeCnc_Click" OnClientClick='return confirm("Send to CAM?")'><i class="fa fa-laptop" aria-hidden="true"></i># <%: traduci ("MakeCncProg") %></asp:LinkButton>
</div>
<div class="col">
<%--<asp:LinkButton runat="server" ID="lbtPrintLabels" CssClass="btn btn-info btn-block" Visible='<%# Eval("OrdStatus").ToString()!="0" %>' OnClick="lbtPrintLabels_Click"><i class="fa fa-print" aria-hidden="true"></i> PRINT LABELS</asp:LinkButton>--%>
<%--<asp:LinkButton runat="server" ID="lblDone" CssClass="btn btn-success btn-block" Visible='<%# Eval("OrdStatus").ToString()=="2" %>' OnClick="lblDone_Click" OnClientClick='return confirm("Confirm Item production?")'><i class="fa fa-check" aria-hidden="true"></i> ITEM DONE</asp:LinkButton>--%>
<asp:LinkButton runat="server" ID="lblDone" CssClass="btn btn-success btn-block" Visible='<%# (Eval("OrdStatus").ToString()=="1" && Eval("DrawFilePath").ToString()!="") || Eval("OrdStatus").ToString()=="2" %>' OnClick="lblDone_Click" OnClientClick='return confirm("Confirm Item production?")'><i class="fa fa-check" aria-hidden="true"></i> ITEM DONE</asp:LinkButton>
<asp:LinkButton runat="server" ID="lblDone" CssClass="btn btn-success btn-block" Visible='<%# (Eval("OrdStatus").ToString()=="1" && Eval("DrawFilePath").ToString()!="") || Eval("OrdStatus").ToString()=="2" %>' OnClick="lblDone_Click" OnClientClick='return confirm("Confirm Item production?")'><i class="fa fa-check" aria-hidden="true"></i> # <%: traduci ("ItemDone") %></asp:LinkButton>
</div>
</div>
<div class="row">
+1 -1
View File
@@ -41,7 +41,7 @@
<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>
<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?")'>#<%: traduci("CreateOrder") %> <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" />
+1 -1
View File
@@ -9,7 +9,7 @@
<h3># <%: traduci("ProdSimul") %></h3>
</div>
<div class="col">
<asp:LinkButton runat="server" ID="lbtAdvanceProd" class="shortcut" OnClick="lbtAdvanceProd_Click"> <i class="fa fa-wrench shortcut-icon"></i><span class="shortcut-label"><b>ADVANCE</b> prod</span> </asp:LinkButton>
<asp:LinkButton runat="server" ID="lbtAdvanceProd" class="shortcut" OnClick="lbtAdvanceProd_Click"> <i class="fa fa-wrench shortcut-icon"></i><span class="shortcut-label"><b>#<%: traduci("Advance") %></b> #<%: traduci("Prod") %></span> </asp:LinkButton>
</div>
</div>
</div>
+3 -3
View File
@@ -49,13 +49,13 @@
<asp:HiddenField runat="server" ID="hfSecOp" />
<div class="row small">
<div class="col-4 pr-1">
<div runat="server" id="icnCart" class="btn btn-sm btn-block btn-outline-secondary">CART</div>
<div runat="server" id="icnCart" class="btn btn-sm btn-block btn-outline-secondary">#<%: traduci("Cart") %></div>
</div>
<div class="col-4 px-1">
<div runat="server" id="icnBin" class="btn btn-sm btn-block btn-outline-secondary">BIN</div>
<div runat="server" id="icnBin" class="btn btn-sm btn-block btn-outline-secondary">#<%: traduci("Bin") %></div>
</div>
<div class="col-4 pl-1">
<div runat="server" id="icnSecOp" class="btn btn-sm btn-block btn-outline-secondary">SEC OP</div>
<div runat="server" id="icnSecOp" class="btn btn-sm btn-block btn-outline-secondary">#<%: traduci("SecOp") %></div>
</div>
</div>
</div>
@@ -4,14 +4,14 @@
<h4># <%: traduci("ValidationSummary") %></h4>
</div>
<div class="col-3">
<asp:LinkButton runat="server" ID="lbtForceRevali" CssClass="btn btn-sm btn-success btn-block" OnClientClick='return confirm("Are you sure you want to re-evaluate ALL items?")' OnClick="lbtForceRevali_Click"><i class="fa fa-bell" aria-hidden="true"></i> FORCE REVALIDATE </asp:LinkButton>
<asp:LinkButton runat="server" ID="lbtForceRevali" CssClass="btn btn-sm btn-success btn-block" OnClientClick='return confirm("Are you sure you want to re-evaluate ALL items?")' OnClick="lbtForceRevali_Click"><i class="fa fa-bell" aria-hidden="true"></i> # <%: traduci("ForceRevalidate") %> </asp:LinkButton>
</div>
<div class="col-3">
<asp:LinkButton runat="server" ID="lbtRevalidate" CssClass="btn btn-sm btn-danger btn-block" OnClick="lbtRevalidate_Click"><i class="fa fa-bell-o" aria-hidden="true"></i> Re-Validate PARTS (KO)</asp:LinkButton>
<asp:LinkButton runat="server" ID="lbtRevalidate" CssClass="btn btn-sm btn-danger btn-block" OnClick="lbtRevalidate_Click"><i class="fa fa-bell-o" aria-hidden="true"></i> # <%: traduci("RevalidateParts") %></asp:LinkButton>
</div>
<div class="col-3">
<asp:LinkButton runat="server" ID="lbtReValidAll" CssClass="btn btn-sm btn-primary btn-block" OnClick="lbtRevalAll_Click"><i class="fa fa-bell-o" aria-hidden="true"></i> ReValidate reset</asp:LinkButton>
<asp:LinkButton runat="server" ID="lbtValidateMissing" CssClass="btn btn-sm btn-secondary btn-block" OnClick="lbtValidateMissing_Click"><i class="fa fa-bell-o" aria-hidden="true"></i> Validate NEW PARTS</asp:LinkButton>
<asp:LinkButton runat="server" ID="lbtReValidAll" CssClass="btn btn-sm btn-primary btn-block" OnClick="lbtRevalAll_Click"><i class="fa fa-bell-o" aria-hidden="true"></i># <%: traduci("RevalidateReset") %></asp:LinkButton>
<asp:LinkButton runat="server" ID="lbtValidateMissing" CssClass="btn btn-sm btn-secondary btn-block" OnClick="lbtValidateMissing_Click"><i class="fa fa-bell-o" aria-hidden="true"></i> # <%: traduci("ValidateNewParts") %></asp:LinkButton>
</div>
</div>