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

completato fix pagina mag fisico 8tolto filtro x magazzino...)

Browse Source
This commit is contained in:
Samuele Locatelli
2014-03-20 17:12:48 +01:00
parent 3f3d6f08a6
commit 370ff071fd
10 changed files with 44 additions and 68 deletions
Download Patch File Download Diff File Expand all files Collapse all files
GMW/Content/Site.css
+1 -2
View File
@@ -5,9 +5,8 @@
}
body {
background-color: #fff;
background-color: #EFEFEF;
border-top: solid 10px #000;
color: #333;
font-size: .85em;
font-family: "Segoe UI", Verdana, Helvetica, Sans-Serif;
margin: 0;
GMW/Content/bootstrap.css
Vendored
+1 -1
View File
@@ -277,7 +277,7 @@ body {
font-size: 14px;
line-height: 1.42857143;
color: #333;
background-color: #fff;
background-color: #EEE;
}
input,
button,
GMW/Content/bootstrap.min.css
Vendored
+1 -7
View File
File diff suppressed because one or more lines are too long
GMW/Style.css
+9 -9
View File
@@ -157,7 +157,7 @@
text-align: center;
font-size: 7pt;
height: 20px;
background-image: url(../images/giallo_20.png);
background-image: url(images/giallo_20.png);
}
.sr {
@@ -444,43 +444,43 @@
width: 200px;
}
. .Calend.TodayDay {
.Calend.TodayDay {
background: #cccccc;
color: Black;
}
. .Calend.Selector {
.Calend.Selector {
background: #cccccc;
}
. .Calend.NextPrev {
.Calend.NextPrev {
vertical-align: bottom;
}
. .Calend.DayHeader {
.Calend.DayHeader {
font-size: 7pt;
font-weight: bold;
background: #cccccc;
}
. .Calend.SelectedDay {
.Calend.SelectedDay {
background: #666666;
font-weight: bold;
color: White;
}
. .Calend.Title {
.Calend.Title {
font-weight: bold;
background: #999999;
border-color: Black;
}
. .Calend.WeekEndDay {
.Calend.WeekEndDay {
background: #FFFFCC;
color: Black;
}
. .Calend.OtherMonthDay {
.Calend.OtherMonthDay {
color: Gray;
}
GMW/WebUserControls/mod_statoMag.ascx
+7 -8
View File
@@ -5,34 +5,34 @@
<webopt:BundleReference ID="BundleReference1" runat="server" Path="~/Content/css" />
<webopt:BundleReference ID="BundleReference2" runat="server" Path="~/Content/themes/base/css" />
<% } %>
<%@ Register Assembly="AjaxControlToolkit" Namespace="AjaxControlToolkit" TagPrefix="asp" %>
<%@ Register Src="mod_filtro.ascx" TagName="mod_filtro" TagPrefix="uc1" %>
<%@ Register Src="mod_barPlot.ascx" TagName="mod_barPlot" TagPrefix="uc2" %>
<div class="container">
<div class="row">
<div class="col-sm-5">
<uc1:mod_filtro ID="mod_filtroMag" runat="server" />
<%--<uc1:mod_filtro ID="mod_filtroMag" runat="server" />
<asp:ObjectDataSource ID="odsFiltroMag" runat="server" OldValuesParameterFormatString="Original_{0}"
SelectMethod="getByConditio" TypeName="GMW_data.DS_UtilityTableAdapters.v_selMagTableAdapter">
<SelectParameters>
<asp:SessionParameter DefaultValue="MM" Name="conditio" SessionField="CodCS" Type="String" />
</SelectParameters>
</asp:ObjectDataSource>
</asp:ObjectDataSource>--%>
</div>
<div class="col-sm-5 col-sm-offset-2">
<asp:Label runat="server" ID="lblCercaPart" />
<asp:TextBox ID="txtCercaPart" runat="server" OnTextChanged="txtCercaPart_TextChanged" Text="*"
Width="200px" />
<asp:AutoCompleteExtender ID="aceParticolare" runat="server" TargetControlID="txtCercaPart"
<%--<asp:AutoCompleteExtender ID="aceParticolare" runat="server" TargetControlID="txtCercaPart"
ServicePath="~/WS/AutoCompletamento.asmx" ServiceMethod="elencoParticolariAnime"
MinimumPrefixLength="2" CompletionInterval="200" />
MinimumPrefixLength="2" CompletionInterval="200" />--%>
<asp:Button ID="btnCercaPart" runat="server" OnClick="btnCercaPart_Click" Text="..." />
</div>
</div>
<div class="row">
<div class="col-sm-12">
<asp:GridView ID="grView" runat="server" AllowPaging="True" AllowSorting="True" AutoGenerateColumns="False"
<asp:GridView ID="grView" runat="server" AllowPaging="False" AllowSorting="True" AutoGenerateColumns="False"
OnSelectedIndexChanged="grView_SelectedIndexChanged" OnDataBound="grView_DataBound"
DataKeyNames="IdxBlocco" DataSourceID="ods" OnPageIndexChanged="grView_PageIndexChanged"
OnSorted="grView_Sorted" Width="100%">
@@ -114,8 +114,7 @@
<asp:ControlParameter ControlID="txtCercaPart" DefaultValue="*" Type="String" Name="particolare" />
</SelectParameters>
</asp:ObjectDataSource>
<asp:Label ID="lblNumRec" runat="server" CssClass="txtMini" />&nbsp;&nbsp;
<asp:Label ID="lblWarning" runat="server" Visible="false" CssClass="erroreMid" />
<asp:Label ID="lblNumRec" runat="server" CssClass="didascalia" />&nbsp;<asp:Label ID="lblWarning" runat="server" Visible="false" CssClass="erroreMid" />
<asp:ObjectDataSource ID="odsBlocco" runat="server" OldValuesParameterFormatString="original_{0}"
SelectMethod="getByConditio" TypeName="GMW_data.DS_UtilityTableAdapters.v_selBloccoTableAdapter">
<SelectParameters>
GMW/WebUserControls/mod_statoMag.ascx.cs
+25 -14
View File
@@ -47,7 +47,10 @@ namespace GMW.WebUserControls
{ }
}
int totRecord = grView.Rows.Count + grView.PageSize * (grView.PageCount - 1);
lblNumRec.Text = string.Format("{0} records of ~ {1}", grView.Rows.Count, totRecord);
lblNumRec.Text = string.Format("{0} records", grView.Rows.Count, totRecord);
#if false
lblNumRec.Text = string.Format("{0} records of ~ {1}", grView.Rows.Count, totRecord);
#endif
}
else
{
@@ -145,7 +148,9 @@ namespace GMW.WebUserControls
{
base.OnInit(e);
_idxGridView = "IdxBlocco";
mod_filtroMag.eh_selValore += new EventHandler(mod_filtroMag_eh_selValore);
#if false
mod_filtroMag.eh_selValore += new EventHandler(mod_filtroMag_eh_selValore);
#endif
}
protected override void Page_Load(object sender, EventArgs e)
@@ -157,6 +162,7 @@ namespace GMW.WebUserControls
{
svuotaVariabili();
}
#if false
mod_filtroMag.ods = odsFiltroMag;
// imposto corretto valore x filtro Mag
if (memLayer.ML.isInSessionObject("CodMag_sel"))
@@ -166,7 +172,8 @@ namespace GMW.WebUserControls
else
{
mod_filtroMag.reset();
}
}
#endif
checkFixOds();
}
}
@@ -185,6 +192,7 @@ namespace GMW.WebUserControls
/// </summary>
private void checkFixOds()
{
#if false
// determino cosa filtrare nella filter expression...
if (mod_filtroMag.valore != "*")
{
@@ -200,18 +208,21 @@ namespace GMW.WebUserControls
}
}
else
{
#endif
ods.FilterExpression = "";
// salvo il valore del numero di celle max x poter scalare correttamente i barplot
try
{
ods.FilterExpression = "";
// salvo il valore del numero di celle max x poter scalare correttamente i barplot
try
{
maxNumCelle = MagClass.magazzino.taMagOverw.getMaxCelle(memLayer.ML.StringSessionObj("CodCS"))[0].TotCelle;
}
catch
{
maxNumCelle = 100;
}
}
maxNumCelle = MagClass.magazzino.taMagOverw.getMaxCelle(memLayer.ML.StringSessionObj("CodCS"))[0].TotCelle;
}
catch
{
maxNumCelle = 100;
}
#if false
}
#endif
grView.DataBind();
}
/// <summary>
GMW/WebUserControls/mod_statoMag.ascx.designer.cs
Generated
-27
View File
@@ -30,24 +30,6 @@ namespace GMW.WebUserControls {
/// </remarks>
protected global::Microsoft.AspNet.Web.Optimization.WebForms.BundleReference BundleReference2;
/// <summary>
/// mod_filtroMag control.
/// </summary>
/// <remarks>
/// Auto-generated field.
/// To modify move field declaration from designer file to code-behind file.
/// </remarks>
protected global::mod_filtro mod_filtroMag;
/// <summary>
/// odsFiltroMag 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 odsFiltroMag;
/// <summary>
/// lblCercaPart control.
/// </summary>
@@ -66,15 +48,6 @@ namespace GMW.WebUserControls {
/// </remarks>
protected global::System.Web.UI.WebControls.TextBox txtCercaPart;
/// <summary>
/// aceParticolare control.
/// </summary>
/// <remarks>
/// Auto-generated field.
/// To modify move field declaration from designer file to code-behind file.
/// </remarks>
protected global::AjaxControlToolkit.AutoCompleteExtender aceParticolare;
/// <summary>
/// btnCercaPart 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/bin/SteamWare.dll
BIN
View File
Binary file not shown.