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

continuo dettaglio DTX, ok gestione flusso dtx primo-ultimo (da verificare KO però...)

Browse Source
This commit is contained in:
Samuele E. Locatelli
2017-02-21 11:03:07 +01:00
parent b9e0aaf653
commit 308fbb57d5
9 changed files with 141 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files
GMW/Content/Style.css
-4
View File
@@ -23,10 +23,6 @@
.pad_1e {
padding: 1em;
}
.smallText {
font-size: 0.75em;
color: #696969;
}
.divNumKeyb {
float: right;
/*margin: 2px;*/
GMW/Content/Style.less
-6
View File
@@ -32,11 +32,6 @@
padding: 1em;
}
.smallText{
font-size: 0.75em;
color: #696969;
}
.divNumKeyb {
float: right;
/*margin: 2px;*/
@@ -66,7 +61,6 @@
}
/*------------------------------------------------------------------
Gestione messaggi postazione
-------------------------------------------------------------------*/
GMW/Content/Style.min.css
Vendored
+1 -1
View File
File diff suppressed because one or more lines are too long
GMW/WebUserControls/mod_postRX_DT_LIST.ascx
+63 -9
View File
@@ -27,8 +27,11 @@
</EmptyDataTemplate>
<Columns>
<asp:TemplateField ShowHeader="False">
<HeaderTemplate>
<asp:LinkButton ID="btnReset" runat="server" OnClick="btnReset_Click" CssClass="btn btn-default btn-xs"><i class="glyphicon glyphicon-refresh"></i> <%: traduci("Reset") %></asp:LinkButton>
</HeaderTemplate>
<ItemTemplate>
<asp:LinkButton ID="lbSelect" runat="server" CausesValidation="False" CommandName="Select" CssClass="text-success" Visible='<%# (Eval("DTX_END").ToString() != "") %>'><i class="glyphicon glyphicon-zoom-in btn-lg"></i></asp:LinkButton>
<asp:LinkButton ID="lbSelect" runat="server" CausesValidation="False" CommandName="Select" CssClass="text-success"><i class="glyphicon glyphicon-zoom-in btn-lg"></i></asp:LinkButton>
</ItemTemplate>
</asp:TemplateField>
<asp:TemplateField HeaderText="Particolare" SortExpression="Particolare">
@@ -41,10 +44,10 @@
</asp:TemplateField>
<asp:TemplateField HeaderText="Marcature" SortExpression="DataOra_INI">
<ItemTemplate>
<div class="smallText">
<div class="didascalia">
<asp:Label ID="lblPM" runat="server" Text='<%# Eval("DataOra_INI", "PM: {0:dd/MM/yy HH:mm}") %>' ToolTip='<%# traduci("PrimoMarcato") %>' />
</div>
<div class="smallText">
<div class="didascalia">
<asp:Label ID="lblUM" runat="server" Text='<%# Eval("DataOra_END", "UM: {0:dd/MM/yy HH:mm}") %>' ToolTip='<%# traduci("UltimoMarcato") %>' Visible='<%# (Eval("DTX_END").ToString() != "") %>' />
</div>
</ItemTemplate>
@@ -78,15 +81,55 @@
<asp:Label ID="lblNumRec" runat="server" CssClass="didascalia" />
</div>
</div>
<div class="panel panel-default panel-sm">
<div runat="server" id="divDetDtx" class="panel panel-info panel-sm">
<div class="panel-heading">
<b><%: traduci("DataFusione") %></b>
<b><%: traduci("DettaglioDtx") %></b>
</div>
<div class="panel-body">
<asp:Label runat="server" ID="lblDTFus" />
<br />
<b>
<asp:Label runat="server" ID="lblLinFus" /></b>
<asp:FormView ID="frmView" runat="server" DataKeyNames="CodLinea,Particolare" DataSourceID="odsDet">
<ItemTemplate>
<table class="table table-condensed table-hover">
<thead>
<tr>
<th>#</th>
<th>Matrix / Operatore</th>
</tr>
</thead>
<tbody>
<tr>
<td>PM</td>
<td>
<div class="text-left">
<small>
<asp:Label ID="DTX_INILabel" runat="server" Text='<%# Eval("DTX_INI") %>' /></small>
</div>
<div class="text-left">
<asp:Label ID="CodSoggetto_INILabel" runat="server" Text='<%# GMW_data.MagClass.magazzino.cognomeNomeFromCodSogg(Eval("CodSoggetto_INI")) %>' />
</div>
</td>
</tr>
<tr>
<td>UL</td>
<td>
<div class="text-left">
<small>
<asp:Label ID="DTX_ENDLabel" runat="server" Text='<%# Eval("DTX_END") %>' />
</div>
<div class="text-left">
<asp:Label ID="CodSoggetto_ENDLabel" runat="server" Text='<%# GMW_data.MagClass.magazzino.cognomeNomeFromCodSogg(Eval("CodSoggetto_END")) %>' />
</div>
</td>
</tr>
</tbody>
</table>
</ItemTemplate>
</asp:FormView>
<asp:ObjectDataSource ID="odsDet" runat="server" OldValuesParameterFormatString="original_{0}" SelectMethod="getByLineaPart" TypeName="GMW_data.DS_DataMatrixTableAdapters.Linea2Dtx_IETableAdapter" OnDeleted="ods_Deleted">
<SelectParameters>
<asp:ControlParameter ControlID="hfCodLinea" DefaultValue="W" Name="CodLinea" PropertyName="Value" Type="String" />
<asp:ControlParameter ControlID="grView" DefaultValue="P" Name="Particolare" PropertyName="SelectedValue" Type="String" />
</SelectParameters>
</asp:ObjectDataSource>
</div>
</div>
</div>
@@ -155,6 +198,17 @@
<asp:LinkButton runat="server" ID="lbtAddUdc" Font-Size="18pt" CssClass="btn btn-success" Width="200px" OnClick="lbtAddUdc_Click" Visible="false"><i aria-hidden='true' class='glyphicon glyphicon-pencil'></i> <%: traduci("addUDC") %></asp:LinkButton>
</div>
</div>
<div class="panel panel-default panel-sm">
<div class="panel-heading">
<b><%: traduci("DataFusione") %></b>
</div>
<div class="panel-body">
<asp:Label runat="server" ID="lblDTFus" />
<br />
<b>
<asp:Label runat="server" ID="lblLinFus" /></b>
</div>
</div>
<div class="panel panel-default panel-sm">
<div class="panel-heading">
<b><%: traduci("lblCesta") %></b>
GMW/WebUserControls/mod_postRX_DT_LIST.ascx.cs
+24 -1
View File
@@ -53,6 +53,7 @@ namespace GMW.WebUserControls
fixTipoInput();
fixCella();
traduciObj();
divDetDtx.Visible = false;
}
doChecks();
}
@@ -488,6 +489,7 @@ namespace GMW.WebUserControls
{
DataMatrix.mgr.taL2D.updateEnd(Postazione.currCodLinea, currParticolare, barcodeIn, MagClass.magazzino.CodSoggCurrUser, dataMarc);
}
#if false
checkCreaUDC();
// verifico se devo fare gestione con intervallo dtx... da tab config DB)
@@ -504,7 +506,7 @@ namespace GMW.WebUserControls
*/
DataMatrix.mgr.taDtx2UDC.RxSetDtx2Udc(barcodeIn, MagClass.magazzino.CodSoggCurrUser, statoUDC, memLayer.ML.confReadInt("IdxPosizioneRxTemp"), Postazione.currIdxCella);
#endif
// 2017.07.22 svuoto barcodeIn..
barcodeIn = "";
}
@@ -662,6 +664,9 @@ namespace GMW.WebUserControls
{
fixCella();
grView.DataBind();
// se selezionato qualcosa mostro dettaglio
divDetDtx.Visible = (grView.SelectedIndex >= 0);
frmView.DataBind();
// fix dataFus
lblDTFus.Text = string.Format("{0:ddd dd/MM/yyyy, HH:mm}", dataFus);
lblLinFus.Text = lineaFus;
@@ -678,6 +683,23 @@ namespace GMW.WebUserControls
txtBarcode.Focus();
}
/// <summary>
/// reset della selezione
/// </summary>
/// <param name="sender"></param>
/// <param name="e"></param>
protected void btnReset_Click(object sender, EventArgs e)
{
resetSelezione();
}
/// <summary>
/// resetta la selezione dei valori in caso di modifiche su altri controlli
/// </summary>
public void resetSelezione()
{
grView.SelectedIndex = -1;
doUpdate();
}
/// <summary>
/// effettua reset dati
/// </summary>
private void doResetData()
@@ -1027,5 +1049,6 @@ namespace GMW.WebUserControls
// aggiorno le qta!
qta = pezziUdc;
}
}
}
GMW/WebUserControls/mod_postRX_DT_LIST.ascx.designer.cs
Generated
+31 -4
View File
@@ -67,22 +67,31 @@ namespace GMW.WebUserControls {
protected global::System.Web.UI.WebControls.Label lblNumRec;
/// <summary>
/// lblDTFus control.
/// divDetDtx control.
/// </summary>
/// <remarks>
/// Auto-generated field.
/// To modify move field declaration from designer file to code-behind file.
/// </remarks>
protected global::System.Web.UI.WebControls.Label lblDTFus;
protected global::System.Web.UI.HtmlControls.HtmlGenericControl divDetDtx;
/// <summary>
/// lblLinFus control.
/// frmView control.
/// </summary>
/// <remarks>
/// Auto-generated field.
/// To modify move field declaration from designer file to code-behind file.
/// </remarks>
protected global::System.Web.UI.WebControls.Label lblLinFus;
protected global::System.Web.UI.WebControls.FormView frmView;
/// <summary>
/// odsDet control.
/// </summary>
/// <remarks>
/// Auto-generated field.
/// To modify move field declaration from designer file to code-behind file.
/// </remarks>
protected global::System.Web.UI.WebControls.ObjectDataSource odsDet;
/// <summary>
/// lblParticolareAttivo control.
@@ -255,6 +264,24 @@ namespace GMW.WebUserControls {
/// </remarks>
protected global::System.Web.UI.WebControls.LinkButton lbtAddUdc;
/// <summary>
/// lblDTFus control.
/// </summary>
/// <remarks>
/// Auto-generated field.
/// To modify move field declaration from designer file to code-behind file.
/// </remarks>
protected global::System.Web.UI.WebControls.Label lblDTFus;
/// <summary>
/// lblLinFus control.
/// </summary>
/// <remarks>
/// Auto-generated field.
/// To modify move field declaration from designer file to code-behind file.
/// </remarks>
protected global::System.Web.UI.WebControls.Label lblLinFus;
/// <summary>
/// txtCesta control.
/// </summary>
GMW/bin/GMW.dll
BIN
View File
Binary file not shown.
GMW/bin/GMW_data.dll
BIN
View File
Binary file not shown.
GMW_data/MagClass.cs
+22
View File
@@ -3231,6 +3231,28 @@ namespace GMW_data
#endregion
#region area utenti
/// <summary>
/// recupera CognomeNome da CodSogg
/// </summary>
/// <param name="CodSogg"></param>
/// <returns></returns>
public string cognomeNomeFromCodSogg(object CodSogg)
{
string answ = "";
try
{
DS_Applicazione.AnagOperatoriRow riga = DataProxy.obj.taAnagOperatore.getByCodSoggetto(CodSogg.ToString())[0];
answ = string.Format("{0} {1}", riga.Cognome, riga.Nome);
}
catch
{ }
return answ;
}
#endregion
#endregion
}