completato primo stile grafico pagina x coerenza

This commit is contained in:
Samuele Locatelli
2014-02-28 18:20:29 +01:00
parent 0f8f112c6e
commit ac5669c857
9 changed files with 146 additions and 131 deletions
+5 -5
View File
@@ -33,11 +33,6 @@
</asp:ObjectDataSource>
</div>
<div class="col-md-4">
AREA DX
</div>
</div>
<div class="row">
<div class="col-xs-12">
<ul class="nav nav-pills">
<%--<li class='<%: liClass("NT-UDC") %>' style="width: 33%;"><asp:LinkButton runat="server" ID="lbtNTUDC" OnClick="lbtNTUDC_Click">modalità NT / UDC</asp:LinkButton></li>--%>
<li class='<%: liClass("NT") %>' style="width: 49%;">
@@ -46,6 +41,11 @@
<asp:LinkButton runat="server" ID="lbtDT" OnClick="lbtDT_Click">Modalità Datamatrix</asp:LinkButton></li>
</ul>
</div>
</div>
<div class="row">
<div class="col-xs-12">
</div>
<div class="col-xs-12">
<div class="msgBoxBarcode">
<asp:Label runat="server" ID="lblMessaggi" Text="attesa input utente" Font-Size="18pt" />
+7 -18
View File
@@ -32,6 +32,9 @@ namespace GMW
if (!Page.IsPostBack)
{
calcolaPostazione();
// fix css...
Postazione.CssClass = "stileAttesa";
// fix storico
storicoVisibile = false;
fixStorico();
// imposto pos abilitata x cancellazione
@@ -69,6 +72,7 @@ namespace GMW
{
mod_storicoAzioniOperatore1.doUpdate();
lblWarning.Text = Postazione.warningText;
pnlAll.CssClass = Postazione.CssClass;
}
/// <summary>
/// richiesta hide
@@ -378,26 +382,11 @@ namespace GMW
private void calcolaPostazione()
{
Postazione.IP = Request.UserHostName;
Postazione.name = dnsUtils.DetermineCompName(Postazione.IP);
// cerco stampante x postazione
Postazione.printer = "n.d.";
try
{
DS_Applicazione.ElencoPostazioniDataTable tabPost = DataProxy.obj.taElPost.getByCod(Postazione.name);
if (tabPost.Rows.Count > 0)
{
Postazione.printer = tabPost[0].stampante;
}
else
{
tabPost = DataProxy.obj.taElPost.getByCod("default");
Postazione.printer = tabPost[0].stampante;
}
}
catch
{ }
Postazione.setup();
// mostro warning se postazione non configurata...
lblWarning.Visible = (Postazione.printer == "n.d.");
}
}
}
+91 -93
View File
@@ -2,66 +2,65 @@
<%@ Register Src="mod_storicoAzioniOperatore.ascx" TagName="mod_storicoAzioniOperatore" TagPrefix="uc1" %>
<%if (false)
{ %>
<webopt:BundleReference ID="BundleReference1" runat="server" Path="~/Content/css" />
<webopt:BundleReference ID="BundleReference2" runat="server" Path="~/Content/themes/base/css" />
<webopt:bundlereference id="BundleReference1" runat="server" path="~/Content/css" />
<webopt:bundlereference id="BundleReference2" runat="server" path="~/Content/themes/base/css" />
<%} %>
<asp:Panel runat="server" ID="pnlAll" CssClass="stileAttesa">
<div style="height: 100%;">
<div style="float: none; text-align: center; margin: auto;">
<div>
<asp:Label runat="server" ID="lblParticolareAttivo" Font-Size="36pt" Text="- no data -" />
</div>
<div>
<asp:Label runat="server" ID="lblDescrAttivo" Font-Size="28pt" Text="- no data -" ToolTip="particolare" />
&nbsp
<div style="height: 100%;">
<div style="float: none; text-align: center; margin: auto;">
<div>
<asp:Label runat="server" ID="lblParticolareAttivo" Font-Size="36pt" Text="- no data -" />
</div>
<div>
<asp:Label runat="server" ID="lblDescrAttivo" Font-Size="28pt" Text="- no data -" ToolTip="particolare" />
&nbsp
<asp:Label runat="server" ID="lblDisegno" Font-Size="28pt" Text="" ForeColor="#FFFFFF" Font-Bold="true" ToolTip="disegno" />
</div>
<div class="msgBoxBarcode">
<%--<asp:Label runat="server" ID="lblMessaggi" Text="attesa input utente" Font-Size="18pt" />
</div>
<div class="msgBoxBarcode">
<%--<asp:Label runat="server" ID="lblMessaggi" Text="attesa input utente" Font-Size="18pt" />
<br />
<asp:Label runat="server" ID="lblWarning" Visible="false" Text="ATTENZIONE!!! Postazione non configurata!" Font-Size="XX-Large" ForeColor="Red" />
<br />--%>
<asp:DropDownList ID="ddlPart" runat="server" DataSourceID="odsParticolari" DataTextField="label" DataValueField="value"></asp:DropDownList>
<asp:ObjectDataSource ID="odsParticolari" runat="server" OldValuesParameterFormatString="original_{0}" SelectMethod="getByConditio" TypeName="GMW_data.DS_UtilityTableAdapters.v_selParticolariTableAdapter">
<SelectParameters>
<asp:Parameter DefaultValue="P" Name="conditio" Type="String" />
</SelectParameters>
</asp:ObjectDataSource>
<asp:DropDownList ID="ddlPart" runat="server" DataSourceID="odsParticolari" DataTextField="label" DataValueField="value"></asp:DropDownList>
<asp:ObjectDataSource ID="odsParticolari" runat="server" OldValuesParameterFormatString="original_{0}" SelectMethod="getByConditio" TypeName="GMW_data.DS_UtilityTableAdapters.v_selParticolariTableAdapter">
<SelectParameters>
<asp:Parameter DefaultValue="P" Name="conditio" Type="String" />
</SelectParameters>
</asp:ObjectDataSource>
</div>
</div>
<div>
<div style="float: left; padding: 4px; text-align: left; width: 220px; height: 300px;">
<div style="float: left; text-align: center;">
</div>
</div>
<div>
<div style="float: left; padding: 4px; text-align: left; width: 220px; height: 300px;">
<div style="float: left; text-align: center;">
</div>
</div>
<div style="float: right; padding: 4px; text-align: right; width: 220px; height: 300px;">
<div style="float: right; text-align: center;">
<div class="boxRicerca">
<div style="float: left;">
<asp:TextBox ID="txtCerca" runat="server" OnTextChanged="txtCerca_TextChanged" Width="160px" AutoPostBack="True" />
</div>
<div style="float: right;">
<asp:Button ID="btnCerca" runat="server" OnClick="btnCerca_Click" Text='<%# traduci("lblCerca") %>' />
</div>
<div style="float: right; padding: 4px; text-align: right; width: 220px; height: 300px;">
<div style="float: right; text-align: center;">
<div class="boxRicerca">
<div style="float: left;">
<asp:TextBox ID="txtCerca" runat="server" OnTextChanged="txtCerca_TextChanged" Width="160px" AutoPostBack="True" />
</div>
<asp:GridView ID="grView" runat="server" AllowPaging="false" AllowSorting="True" AutoGenerateColumns="False"
OnDataBound="grView_DataBound"
DataKeyNames="UDC" DataSourceID="ods" OnPageIndexChanged="grView_PageIndexChanged"
OnSorted="grView_Sorted">
<RowStyle CssClass="ctrRowStyle" />
<AlternatingRowStyle CssClass="ctrAltRowStyle" />
<EditRowStyle CssClass="ctrEditRowStyle" />
<SelectedRowStyle CssClass="ctrSelRowStyle" />
<FooterStyle CssClass="ctrFooter" />
<PagerStyle CssClass="ctrHeaderPager" ForeColor="White" HorizontalAlign="Center" />
<HeaderStyle CssClass="ctrHeaderPager" ForeColor="White" Font-Bold="True" />
<EmptyDataRowStyle CssClass="ctrRowStyle" />
<EmptyDataTemplate>
<asp:Label runat="server" ID="lblNoRecord" Text='<%# traduci("noRecord") %>' />
</EmptyDataTemplate>
<Columns>
<%--<asp:TemplateField ShowHeader="False" ItemStyle-HorizontalAlign="Center">
<div style="float: right;">
<asp:Button ID="btnCerca" runat="server" OnClick="btnCerca_Click" Text='<%# traduci("lblCerca") %>' />
</div>
</div>
<asp:GridView ID="grView" runat="server" AllowPaging="false" AllowSorting="True" AutoGenerateColumns="False"
OnDataBound="grView_DataBound"
DataKeyNames="UDC" DataSourceID="ods" OnPageIndexChanged="grView_PageIndexChanged"
OnSorted="grView_Sorted">
<RowStyle CssClass="ctrRowStyle" />
<AlternatingRowStyle CssClass="ctrAltRowStyle" />
<EditRowStyle CssClass="ctrEditRowStyle" />
<SelectedRowStyle CssClass="ctrSelRowStyle" />
<FooterStyle CssClass="ctrFooter" />
<PagerStyle CssClass="ctrHeaderPager" ForeColor="White" HorizontalAlign="Center" />
<HeaderStyle CssClass="ctrHeaderPager" ForeColor="White" Font-Bold="True" />
<EmptyDataRowStyle CssClass="ctrRowStyle" />
<EmptyDataTemplate>
<asp:Label runat="server" ID="lblNoRecord" Text='<%# traduci("noRecord") %>' />
</EmptyDataTemplate>
<Columns>
<%--<asp:TemplateField ShowHeader="False" ItemStyle-HorizontalAlign="Center">
<HeaderTemplate>
<asp:Button ID="btnReset" runat="server" Text='<%# traduci("Reset") %>' OnClick="btnReset_Click"
Visible="true" />
@@ -71,49 +70,48 @@
ToolTip='<%# traduci("Select") %>' ImageUrl='<%# imgPath(SteamWare.tipoImg.seleziona, SteamWare.dimImg.small) %>' />
</ItemTemplate>
</asp:TemplateField>--%>
<asp:TemplateField HeaderText="lastMov" SortExpression="lastMov" ItemStyle-Wrap="false">
<ItemTemplate>
<asp:Label ID="lbllastMov" runat="server" Text='<%# Eval("lastMov", "{0:dd/MM HH:mm}") %>' />
</ItemTemplate>
</asp:TemplateField>
<asp:TemplateField HeaderText="UDC" SortExpression="UDC">
<ItemTemplate>
<asp:Label ID="lblUDC" runat="server" Text='<%# Eval("UDC") %>' />
</ItemTemplate>
</asp:TemplateField>
<asp:TemplateField HeaderText="Particolare" SortExpression="Particolare">
<ItemTemplate>
<asp:Label ID="lblParticolare" runat="server" Text='<%# Eval("Particolare") %>' />
</ItemTemplate>
</asp:TemplateField>
<asp:TemplateField HeaderText="Qta" SortExpression="Qta" ItemStyle-HorizontalAlign="Right">
<ItemTemplate>
<asp:Label ID="lblQta" runat="server" Text='<%# Eval("Qta","{0:#}") %>' />
</ItemTemplate>
</asp:TemplateField>
</Columns>
</asp:GridView>
<asp:ObjectDataSource ID="ods" runat="server" OldValuesParameterFormatString="Original_{0}"
SelectMethod="getUdcDetailByIdxCella" TypeName="GMW_data.DS_magazzinoTableAdapters.v_UdcDetailTableAdapter"
OnDataBinding="ods_DataBinding" FilterExpression="UDC LIKE '%{0}%' OR PARTICOLARE LIKE '%{0}%'">
<SelectParameters>
<asp:SessionParameter Name="IdxCella" Type="Int32" SessionField="IdxCellaLineaST_IN" DefaultValue="0" />
</SelectParameters>
<FilterParameters>
<asp:SessionParameter Name="search" Type="String" SessionField="valoreCercatoSTI"
DefaultValue="0" />
</FilterParameters>
</asp:ObjectDataSource>
<asp:Label ID="lblNumRec" runat="server" CssClass="txtMini" />
</div>
<asp:TemplateField HeaderText="lastMov" SortExpression="lastMov" ItemStyle-Wrap="false">
<ItemTemplate>
<asp:Label ID="lbllastMov" runat="server" Text='<%# Eval("lastMov", "{0:dd/MM HH:mm}") %>' />
</ItemTemplate>
</asp:TemplateField>
<asp:TemplateField HeaderText="UDC" SortExpression="UDC">
<ItemTemplate>
<asp:Label ID="lblUDC" runat="server" Text='<%# Eval("UDC") %>' />
</ItemTemplate>
</asp:TemplateField>
<asp:TemplateField HeaderText="Particolare" SortExpression="Particolare">
<ItemTemplate>
<asp:Label ID="lblParticolare" runat="server" Text='<%# Eval("Particolare") %>' />
</ItemTemplate>
</asp:TemplateField>
<asp:TemplateField HeaderText="Qta" SortExpression="Qta" ItemStyle-HorizontalAlign="Right">
<ItemTemplate>
<asp:Label ID="lblQta" runat="server" Text='<%# Eval("Qta","{0:#}") %>' />
</ItemTemplate>
</asp:TemplateField>
</Columns>
</asp:GridView>
<asp:ObjectDataSource ID="ods" runat="server" OldValuesParameterFormatString="Original_{0}"
SelectMethod="getUdcDetailByIdxCella" TypeName="GMW_data.DS_magazzinoTableAdapters.v_UdcDetailTableAdapter"
OnDataBinding="ods_DataBinding" FilterExpression="UDC LIKE '%{0}%' OR PARTICOLARE LIKE '%{0}%'">
<SelectParameters>
<asp:SessionParameter Name="IdxCella" Type="Int32" SessionField="IdxCellaLineaST_IN" DefaultValue="0" />
</SelectParameters>
<FilterParameters>
<asp:SessionParameter Name="search" Type="String" SessionField="valoreCercatoSTI"
DefaultValue="0" />
</FilterParameters>
</asp:ObjectDataSource>
<asp:Label ID="lblNumRec" runat="server" CssClass="txtMini" />
</div>
<div style="float: none; padding: 4px; text-align: center; margin: auto;">
<div>
<asp:Label runat="server" ID="lblBarcode" Text="Barcode" />
<br />
<asp:TextBox runat="server" ID="txtBarcode" Height="56px" Width="400px" Font-Size="32pt" AutoPostBack="True" Style="text-align: center" TabIndex="1" />
</div>
</div>
<div style="float: none; padding: 4px; text-align: center; margin: auto;">
<div>
<asp:Label runat="server" ID="lblBarcode" Text="Barcode" />
<br />
<asp:TextBox runat="server" ID="txtBarcode" Height="56px" Width="400px" Font-Size="32pt" AutoPostBack="True" Style="text-align: center" TabIndex="1" />
</div>
</div>
</div>
</asp:Panel>
</div>
+5 -5
View File
@@ -199,7 +199,7 @@ namespace GMW.WebUserControls
case tipoCodiceBarcode.Comando:
// verifico se il comando sia di tipo "seleziona linea"
string cmdSelLine = memLayer.ML.confReadString("cmdSelLine");
pnlAll.CssClass = "stileComandoOk";
Postazione.CssClass = "stileComandoOk";
#if false
if (barcodeIn.StartsWith(cmdSelLine))
{
@@ -229,7 +229,7 @@ namespace GMW.WebUserControls
if (idxCellaCurr == idxCella)
{
lblMessaggi.Text += " - Attenzione, UDC già caricato!";
pnlAll.CssClass = "stileComandoKo";
Postazione.CssClass = "stileComandoKo";
}
else
{
@@ -257,14 +257,14 @@ namespace GMW.WebUserControls
MagClass.magazzino.spostaUDC(memLayer.ML.StringSessionObj("CodCS"), barcodeIn, idxCella, memLayer.ML.confReadBool("spostaUdcResettaLdp"), Request.UserHostName);
// registro sposstamento UDC
MagClass.magazzino.taSAO.insertQuery(adesso, codSogg, Postazione.name, Postazione.IP, barcodeIn, particolare, "spostaUDC", string.Format("Caricato UDC Fusi su linea {2}, qta: {0} {1} ", qta, noteTrim, currCodLinea));
pnlAll.CssClass = "stileComandoOk";
Postazione.CssClass = "stileComandoOk";
}
}
else
{
// udc NON corretto, mostro errore...
lblMessaggi.Text += " - Attenzione, UDC NON VALIDO!";
pnlAll.CssClass = "stileComandoKo";
Postazione.CssClass = "stileComandoKo";
}
}
#endif
@@ -272,7 +272,7 @@ namespace GMW.WebUserControls
break;
default:
Postazione.warningText += " - codice <b>non riconosciuto</b>!";
pnlAll.CssClass = "stileComandoND";
Postazione.CssClass = "stileComandoND";
break;
}
barcodeIn = "";
-9
View File
@@ -30,15 +30,6 @@ namespace GMW.WebUserControls {
/// </remarks>
protected global::Microsoft.AspNet.Web.Optimization.WebForms.BundleReference BundleReference2;
/// <summary>
/// pnlAll 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.Panel pnlAll;
/// <summary>
/// lblParticolareAttivo control.
/// </summary>
BIN
View File
Binary file not shown.
Binary file not shown.
Binary file not shown.
+38 -1
View File
@@ -68,6 +68,20 @@ namespace GMW_data
}
}
/// <summary>
/// indica calsse css della postazione corrente
/// </summary>
public static string CssClass
{
get
{
return memLayer.ML.StringSessionObj("cssClass");
}
set
{
memLayer.ML.setSessionVal("cssClass", value);
}
}
/// <summary>
/// codice della linea corrente
/// </summary>
public static string currCodLinea
@@ -86,6 +100,29 @@ namespace GMW_data
memLayer.ML.setSessionVal(string.Format("Linea-{0}", Postazione.IP), value);
}
}
/// <summary>
/// effettua calcolo parametri postazioen dato IP
/// </summary>
public static void setup()
{
name = dnsUtils.DetermineCompName(IP);
// cerco stampante x postazione
printer = "n.d.";
try
{
DS_Applicazione.ElencoPostazioniDataTable tabPost = DataProxy.obj.taElPost.getByCod(name);
if (tabPost.Rows.Count > 0)
{
printer = tabPost[0].stampante;
}
else
{
tabPost = DataProxy.obj.taElPost.getByCod("default");
printer = tabPost[0].stampante;
}
}
catch
{ }
}
}
}