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

v 3.2.832

Browse Source 
completata gestione Delibere Logistiche e NC
Fix grafico calendario & co
This commit is contained in:
Samuele E. Locatelli
2015-10-05 16:42:18 +02:00
parent b4c0425346
commit aa7002daef
19 changed files with 140 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files
GMW-RT/bin/GMW-RT.dll
BIN
View File
Binary file not shown.
GMW-RT/bin/GMW_data.dll
BIN
View File
Binary file not shown.
GMW-RT/bin/SteamWare.dll
BIN
View File
Binary file not shown.
GMW-UT/bin/GMW-UT.dll
BIN
View File
Binary file not shown.
GMW-UT/bin/GMW_data.dll
BIN
View File
Binary file not shown.
GMW-UT/bin/SteamWare.dll
BIN
View File
Binary file not shown.
GMW/Bundle.config
+19 -16
View File
@@ -13,21 +13,24 @@
<styleBundle path="~/Content/themes/base/css">
<!--<include path="~/Content/themes/base/jquery.ui.all.css" />-->
<include path="~/Content/themes/base/jquery.ui.css" />
<include path="~/Content/themes/base/jquery.ui.accordion.css" />
<include path="~/Content/themes/base/jquery.ui.autocomplete.css" />
<include path="~/Content/themes/base/jquery.ui.base.css" />
<include path="~/Content/themes/base/jquery.ui.button.css" />
<include path="~/Content/themes/base/jquery.ui.core.css" />
<include path="~/Content/themes/base/jquery.ui.datepicker.css" />
<include path="~/Content/themes/base/jquery.ui.dialog.css" />
<include path="~/Content/themes/base/jquery.ui.menu.css" />
<include path="~/Content/themes/base/jquery.ui.progressbar.css" />
<include path="~/Content/themes/base/jquery.ui.resizable.css" />
<include path="~/Content/themes/base/jquery.ui.selectable.css" />
<include path="~/Content/themes/base/jquery.ui.slider.css" />
<include path="~/Content/themes/base/jquery.ui.spinner.css" />
<include path="~/Content/themes/base/jquery.ui.tabs.css" />
<include path="~/Content/themes/base/jquery.ui.theme.css" />
<include path="~/Content/themes/base/jquery.ui.tooltip.css" />
<include path="~/Content/themes/base/accordion.css" />
<include path="~/Content/themes/base/autocomplete.css" />
<include path="~/Content/themes/base/base.css" />
<include path="~/Content/themes/base/button.css" />
<include path="~/Content/themes/base/core.css" />
<include path="~/Content/themes/base/datepicker.css" />
<include path="~/Content/themes/base/dialog.css" />
<include path="~/Content/themes/base/draggable.css" />
<include path="~/Content/themes/base/menu.css" />
<include path="~/Content/themes/base/progressbar.css" />
<include path="~/Content/themes/base/resizable.css" />
<include path="~/Content/themes/base/selectable.css" />
<include path="~/Content/themes/base/selectmenu.css" />
<include path="~/Content/themes/base/sortable.css" />
<include path="~/Content/themes/base/slider.css" />
<include path="~/Content/themes/base/spinner.css" />
<include path="~/Content/themes/base/tabs.css" />
<include path="~/Content/themes/base/theme.css" />
<include path="~/Content/themes/base/tooltip.css" />
</styleBundle>
</bundles>
GMW/Content/Style.css
+21
View File
@@ -1008,3 +1008,24 @@
-moz-box-shadow: 3px 3px 6px rgba(0, 0, 0, 0.3);
box-shadow: 3px 3px 6px rgba(0, 0, 0, 0.3);
}
.GridPager a,
.GridPager span {
display: block;
height: 1.6em;
width: 2em;
text-align: center;
text-decoration: none;
}
.GridPager a {
background-color: #f5f5f5;
color: #969696;
/*border-top: 1px solid #969696;
border-bottom: 1px solid #969696;*/
}
.GridPager span {
background-color: #A1DCF2;
color: #000;
/*border-top: 1px solid #3AC0F2;
border-bottom: 1px solid #3AC0F2;*/
font-weight: bold;
}
GMW/Content/Style.less
+25
View File
@@ -1209,3 +1209,28 @@
-moz-box-shadow: 3px 3px 6px rgba(0,0,0,.3);
box-shadow: 3px 3px 6px rgba(0,0,0,.3);
}
.GridPager a, .GridPager span
{
display: block;
height: 1.6em;
width: 2em;
text-align: center;
text-decoration: none;
}
.GridPager a
{
background-color: #f5f5f5;
color: #969696;
/*border-top: 1px solid #969696;
border-bottom: 1px solid #969696;*/
}
.GridPager span
{
background-color: #A1DCF2;
color: #000;
/*border-top: 1px solid #3AC0F2;
border-bottom: 1px solid #3AC0F2;*/
font-weight: bold;
}
GMW/Content/Style.min.css
Vendored
+1 -1
View File
File diff suppressed because one or more lines are too long
GMW/WebUserControls/mod_assegnaNC.ascx
+2 -1
View File
@@ -70,7 +70,8 @@
<uc1:mod_righePag runat="server" ID="mod_righePag" />
<asp:GridView runat="server" ID="grView" DataSourceID="ods" AutoGenerateColumns="False" DataKeyNames="UDC" Width="100%" AllowPaging="True" CssClass="table table-striped table-bordered table-condensed" AllowSorting="true">
<HeaderStyle CssClass="default" />
<PagerStyle CssClass="bg-default" />
<PagerStyle CssClass="active GridPager" />
<PagerSettings Mode="NumericFirstLast" />
<SelectedRowStyle CssClass="info" />
<EmptyDataTemplate>
<asp:Label runat="server" ID="lblNoRecord" Text="Nessun record trovato" />
GMW/WebUserControls/mod_delibLogNc.ascx
+15 -6
View File
@@ -4,10 +4,14 @@
<%@ Register Src="~/WebUserControls/mod_elencoUNC.ascx" TagPrefix="uc1" TagName="mod_elencoUNC" %>
<div class="row text-center" style="margin: 5px; min-height: 108px;">
<div class="col-xs-9">
<div class="col-xs-6">
<uc1:mod_selPeriodo runat="server" ID="mod_selPeriodo" mostraSelOra="true" />
</div>
<div class="col-xs-3 text-right" style="font-size: 0.8em;">
<div class="col-xs-4">
<asp:LinkButton runat="server" ID="lbSaveSel" Visible="false" CssClass="btn btn-warning" OnClick="lbSaveSel_Click" Width="45%"><i class="fa fa-check fa-2x"></i> <%: traduci("btnDelibUdc") %></asp:LinkButton>
<asp:LinkButton runat="server" ID="lbCancel" Visible="false" CssClass="btn btn-danger" OnClick="lbCancel_Click" Width="45%"><i class="fa fa-close fa-2x"></i> <%: traduci("btnCancel") %></asp:LinkButton>
</div>
<div class="col-xs-2 text-right" style="font-size: 0.8em;">
<asp:Label runat="server" ID="lblTipoUdc"><%: traduci("lblTipoUdc") %></asp:Label>
<asp:DropDownList runat="server" ID="ddlSelTipo" DataSourceID="odsTipoUdc" DataValueField="CodBilancia" DataTextField="DescrImpianto" AutoPostBack="True" OnSelectedIndexChanged="ddlSelTipo_SelectedIndexChanged" Enabled="false" />
<asp:ObjectDataSource runat="server" ID="odsTipoUdc" OldValuesParameterFormatString="original_{0}" SelectMethod="getBilanceNC" TypeName="GMW_data.DS_ApplicazioneTableAdapters.AnagBilanceTableAdapter"></asp:ObjectDataSource>
@@ -19,7 +23,8 @@
<uc1:mod_righePag runat="server" ID="mod_righePag" />
<asp:GridView runat="server" ID="grView" DataSourceID="ods" AutoGenerateColumns="False" DataKeyNames="UDC" Width="100%" AllowPaging="True" CssClass="table table-striped table-bordered table-condensed" AllowSorting="True">
<HeaderStyle CssClass="default" />
<PagerStyle CssClass="bg-default" />
<PagerStyle CssClass="active GridPager" />
<PagerSettings Mode="NumericFirstLast" />
<SelectedRowStyle CssClass="info" />
<EmptyDataTemplate>
<asp:Label runat="server" ID="lblNoRecord" Text="Nessun record trovato" />
@@ -35,7 +40,11 @@
</HeaderTemplate>
<ItemStyle HorizontalAlign="Center"></ItemStyle>
</asp:TemplateField>
<asp:BoundField DataField="UDC" HeaderText="UDC" SortExpression="UDC" ReadOnly="True" />
<asp:TemplateField HeaderText="UDC" SortExpression="UDC">
<ItemTemplate>
<asp:Label ID="lblUDC" runat="server" Text='<%# Bind("UDC") %>'></asp:Label>
</ItemTemplate>
</asp:TemplateField>
<asp:BoundField DataField="Particolare" HeaderText="Particolare" SortExpression="Particolare" />
<asp:BoundField DataField="DescParticolare" HeaderText="DescParticolare" SortExpression="DescParticolare" />
<asp:BoundField DataField="DataFus" HeaderText="DataFus" SortExpression="DataFus" />
@@ -43,8 +52,8 @@
<asp:BoundField DataField="CodStato" HeaderText="CodStato" SortExpression="CodStato" />
<asp:BoundField DataField="Note" HeaderText="Note" SortExpression="Note" />
<asp:BoundField DataField="DecodPosizione" HeaderText="DecodPosizione" SortExpression="DecodPosizione" />
<asp:BoundField DataField="NC" HeaderText="NC" ReadOnly="True" SortExpression="NC" />
<asp:BoundField DataField="IsSelected" HeaderText="IsSelected" ReadOnly="True" SortExpression="IsSelected" />
<%--<asp:BoundField DataField="NC" HeaderText="NC" ReadOnly="True" SortExpression="NC" />
<asp:BoundField DataField="IsSelected" HeaderText="IsSelected" ReadOnly="True" SortExpression="IsSelected" />--%>
<asp:BoundField DataField="OkDelLog" HeaderText="OkDelLog" ReadOnly="True" SortExpression="OkDelLog" />
<asp:BoundField DataField="OkNC" HeaderText="OkNC" ReadOnly="True" SortExpression="OkNC" />
</Columns>
GMW/WebUserControls/mod_delibLogNc.ascx.cs
+39 -2
View File
@@ -99,9 +99,10 @@ namespace GMW.WebUserControls
/// <param name="doShow"></param>
private void showDelibera(bool doShow)
{
// !!!FARE!!!
lbSaveSel.Visible = doShow;
lbCancel.Visible = doShow;
}
protected void chkSelect_CheckedChanged(object sender, EventArgs e)
{
@@ -109,5 +110,41 @@ namespace GMW.WebUserControls
showDelibera(true);
}
/// <summary>
/// salva elenco selezioni UDC
/// </summary>
/// <param name="sender"></param>
/// <param name="e"></param>
protected void lbSaveSel_Click(object sender, EventArgs e)
{
// ciclo grView e salvo le righe selezionate, e cancello le EVENTUALI deselezionate
DateTime start;
foreach (GridViewRow riga in grView.Rows)
{
if (((CheckBox)riga.FindControl("chkSelect")).Checked)
{
// recupero codice UDC...
string UDC = ((Label)riga.FindControl("lblUDC")).Text;
if (UDC != "")
{
// chiamo toggle selezione...
MagClass.magazzino.taCartellini.setDL_DC(UDC, MagClass.magazzino.CodSoggCurrUser);
}
}
}
grView.DataBind();
showDelibera(false);
}
/// <summary>
/// annulla modifiche selezione
/// </summary>
/// <param name="sender"></param>
/// <param name="e"></param>
protected void lbCancel_Click(object sender, EventArgs e)
{
grView.SelectedIndex = -1;
grView.DataBind();
showDelibera(false);
}
}
}
GMW/WebUserControls/mod_delibLogNc.ascx.designer.cs
Generated
+18
View File
@@ -21,6 +21,24 @@ namespace GMW.WebUserControls {
/// </remarks>
protected global::GMW.WebUserControls.mod_selPeriodo mod_selPeriodo;
/// <summary>
/// lbSaveSel 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.LinkButton lbSaveSel;
/// <summary>
/// lbCancel 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.LinkButton lbCancel;
/// <summary>
/// lblTipoUdc 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.
GMW/bin/VersGen.dll
BIN
View File
Binary file not shown.
GMW_Term/bin/GMW_data.dll
BIN
View File
Binary file not shown.