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

fix vari admin (by Mara)

Browse Source
This commit is contained in:
Samuele E. Locatelli
2021-01-11 12:48:36 +01:00
parent d4d8fdb689
commit 769945b669
19 changed files with 202 additions and 94 deletions
Download Patch File Download Diff File Expand all files Collapse all files
GPW_Admin/About.aspx
+6 -2
View File
@@ -2,11 +2,15 @@
<asp:Content ID="Content1" ContentPlaceHolderID="cph1" runat="server">
<div class="container">
<div class="card m-2">
<div class="card">
<div class="card-header">
<b><%: traduci(titolo) %></b>
<h2><%: traduci(titolo) %></h2>
</div>
<div class="card-body">
<p class="lead"><%: traduci("GpwPresentationText") %></p>
<i class="lead"><%: traduci("GpwPresentationTextDetailed") %></i>
<hr />
<p><a href="http://gpw.steamware.net/" class="btn btn-primary btn-lg" target="_blank"><%: traduci("LearnMore") %> &raquo;</a></p>
</div>
</div>
</div>
GPW_Admin/Contact.aspx
+23 -6
View File
@@ -1,12 +1,29 @@
<%@ Page Title="" Language="C#" MasterPageFile="~/WebMasterPages/BMP.Master" AutoEventWireup="true" CodeBehind="Contact.aspx.cs" Inherits="GPW_Admin.Contact" %>
<asp:Content ID="Content1" ContentPlaceHolderID="cph1" runat="server">
<div class="container">
<div class="card m-2">
<div class="card-header">
<b><%: traduci(titolo) %></b>
</div>
<div class="card-body">
<div class="card">
<div class="card-header">
<h2>Contacts</h2>
</div>
<div class="card-body">
<div class="row">
<div class="col-6 text-left">
<asp:Image runat="server" CssClass="img-fluid" Height="192" ImageUrl="~/Images/LogoSteamware.png" />
</div>
<div class="col-6 text-right">
<address>
<b>Steamware srl</b><br />
<hr />
via Nazionale 93<br />
24068 Seriate<br />
Bergamo – Italy<br />
<abbr title="Phone"><i class="fa fa-phone" aria-hidden="true"></i></abbr>
+39 035-460560
</address>
<address>
<i class="fa fa-envelope-o" aria-hidden="true"></i><a href="mailto:info@steamware.net">info@steamware.net</a>
</address>
</div>
</div>
</div>
</div>
GPW_Admin/Content/Site.css
+4
View File
@@ -22,6 +22,10 @@ body {
.textBig {
font-size: 1.5em;
}
.table-sm th,
.table-sm td {
padding: 0.2rem;
}
/*------------------------------------------------------------------
[ Shortcuts / .shortcuts ]
*/
GPW_Admin/Content/Site.less
+4
View File
@@ -27,6 +27,10 @@ body {
font-size: 1.5em;
}
.table-sm th, .table-sm td {
padding: .2rem;
}
/*------------------------------------------------------------------
[ Shortcuts / .shortcuts ]
*/
GPW_Admin/Content/Site.min.css
Vendored
+1 -1
View File
@@ -1 +1 @@
body{font:'Roboto',sans-serif;}.body-content{font:'Roboto',sans-serif;}.textCondens{font-family:'Roboto Condensed',sans-serif;}.textNormal{font-family:'Roboto',sans-serif;}.textBig{font-size:1.5em;}.shortcuts{text-align:center;}.shortcuts .shortcut{min-width:9rem;min-height:5rem;display:inline-block;padding:.66666667rem 0;margin:0 2px 1em;vertical-align:top;text-decoration:none;background:#f3f3f3;background-image:-webkit-gradient(linear,left 0%,left 100%,from(#fff),to(#eee));background-image:-webkit-linear-gradient(top,#fff,0%,#eee,100%);background-image:-moz-linear-gradient(top,#fff 0%,#eee 100%);background-image:linear-gradient(to bottom,#fff 0%,#eee 100%);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffffffff',endColorstr='#ffeeeeee',GradientType=0);border:1px solid #ddd;box-sizing:border-box;border-radius:.5rem;}.shortcuts .shortcut-sm{min-width:4.5rem;min-height:3rem;display:inline-block;padding:.25rem 0;margin:0 2px 1em;vertical-align:top;text-decoration:none;background:#f3f3f3;background-image:-webkit-gradient(linear,left 0%,left 100%,from(#fff),to(#eee));background-image:-webkit-linear-gradient(top,#fff,0%,#eee,100%);background-image:-moz-linear-gradient(top,#fff 0%,#eee 100%);background-image:linear-gradient(to bottom,#fff 0%,#eee 100%);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffffffff',endColorstr='#ffeeeeee',GradientType=0);border:1px solid #ddd;box-sizing:border-box;border-radius:.5rem;}.shortcuts .shortcut .shortcut-icon{width:100%;margin-top:0;margin-bottom:0;font-size:2rem;color:#333;}.shortcuts .shortcut-sm .shortcut-icon{width:100%;margin-top:0;margin-bottom:0;font-size:2rem;color:#333;}.shortcuts .shortcut:hover{background:#e8e8e8;background-image:-webkit-gradient(linear,left 0%,left 100%,from(#fafafa),to(#e1e1e1));background-image:-webkit-linear-gradient(top,#fafafa,0%,#e1e1e1,100%);background-image:-moz-linear-gradient(top,#fafafa 0%,#e1e1e1 100%);background-image:linear-gradient(to bottom,#fafafa 0%,#e1e1e1 100%);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#fffafafa',endColorstr='#ffe1e1e1',GradientType=0);}.shortcuts .shortcut-sm:hover{background:#e8e8e8;background-image:-webkit-gradient(linear,left 0%,left 100%,from(#fafafa),to(#e1e1e1));background-image:-webkit-linear-gradient(top,#fafafa,0%,#e1e1e1,100%);background-image:-moz-linear-gradient(top,#fafafa 0%,#e1e1e1 100%);background-image:linear-gradient(to bottom,#fafafa 0%,#e1e1e1 100%);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#fffafafa',endColorstr='#ffe1e1e1',GradientType=0);}.shortcuts .shortcut:active{box-shadow:inset 0 3px 5px rgba(0,0,0,.125);}.shortcuts .shortcut-sm:active{box-shadow:inset 0 3px 5px rgba(0,0,0,.125);}.shortcuts .shortcut:hover .shortcut-icon{color:#c93;}.shortcuts .shortcut-sm:hover .shortcut-icon{color:#666;}.shortcuts .shortcut-label{display:block;margin-top:.75em;font-weight:400;color:#666;}@media(max-width:992px){.shortcuts .shortcut{min-width:8rem;min-height:4rem;}}@media screen and (min-width:768px){.jumbotron{margin-top:20px;}.body-content{padding:0;}input,select,textarea{max-width:100%;}}.elTimbSmart{padding:.2em;font-size:1.1em;line-height:1.3em;}.ui-input-btn input{opacity:.5;}.GridPager a,.GridPager span{display:block;height:1.5em;min-width:1.1em;text-align:center;text-decoration:none;}.GridPager a{background-color:#f5f5f5;color:#969696;}.GridPager span{background-color:#a1dcf2;color:#000;font-weight:bold;}
body{font:'Roboto',sans-serif;}.body-content{font:'Roboto',sans-serif;}.textCondens{font-family:'Roboto Condensed',sans-serif;}.textNormal{font-family:'Roboto',sans-serif;}.textBig{font-size:1.5em;}.table-sm th,.table-sm td{padding:.2rem;}.shortcuts{text-align:center;}.shortcuts .shortcut{min-width:9rem;min-height:5rem;display:inline-block;padding:.66666667rem 0;margin:0 2px 1em;vertical-align:top;text-decoration:none;background:#f3f3f3;background-image:-webkit-gradient(linear,left 0%,left 100%,from(#fff),to(#eee));background-image:-webkit-linear-gradient(top,#fff,0%,#eee,100%);background-image:-moz-linear-gradient(top,#fff 0%,#eee 100%);background-image:linear-gradient(to bottom,#fff 0%,#eee 100%);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffffffff',endColorstr='#ffeeeeee',GradientType=0);border:1px solid #ddd;box-sizing:border-box;border-radius:.5rem;}.shortcuts .shortcut-sm{min-width:4.5rem;min-height:3rem;display:inline-block;padding:.25rem 0;margin:0 2px 1em;vertical-align:top;text-decoration:none;background:#f3f3f3;background-image:-webkit-gradient(linear,left 0%,left 100%,from(#fff),to(#eee));background-image:-webkit-linear-gradient(top,#fff,0%,#eee,100%);background-image:-moz-linear-gradient(top,#fff 0%,#eee 100%);background-image:linear-gradient(to bottom,#fff 0%,#eee 100%);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffffffff',endColorstr='#ffeeeeee',GradientType=0);border:1px solid #ddd;box-sizing:border-box;border-radius:.5rem;}.shortcuts .shortcut .shortcut-icon{width:100%;margin-top:0;margin-bottom:0;font-size:2rem;color:#333;}.shortcuts .shortcut-sm .shortcut-icon{width:100%;margin-top:0;margin-bottom:0;font-size:2rem;color:#333;}.shortcuts .shortcut:hover{background:#e8e8e8;background-image:-webkit-gradient(linear,left 0%,left 100%,from(#fafafa),to(#e1e1e1));background-image:-webkit-linear-gradient(top,#fafafa,0%,#e1e1e1,100%);background-image:-moz-linear-gradient(top,#fafafa 0%,#e1e1e1 100%);background-image:linear-gradient(to bottom,#fafafa 0%,#e1e1e1 100%);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#fffafafa',endColorstr='#ffe1e1e1',GradientType=0);}.shortcuts .shortcut-sm:hover{background:#e8e8e8;background-image:-webkit-gradient(linear,left 0%,left 100%,from(#fafafa),to(#e1e1e1));background-image:-webkit-linear-gradient(top,#fafafa,0%,#e1e1e1,100%);background-image:-moz-linear-gradient(top,#fafafa 0%,#e1e1e1 100%);background-image:linear-gradient(to bottom,#fafafa 0%,#e1e1e1 100%);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#fffafafa',endColorstr='#ffe1e1e1',GradientType=0);}.shortcuts .shortcut:active{box-shadow:inset 0 3px 5px rgba(0,0,0,.125);}.shortcuts .shortcut-sm:active{box-shadow:inset 0 3px 5px rgba(0,0,0,.125);}.shortcuts .shortcut:hover .shortcut-icon{color:#c93;}.shortcuts .shortcut-sm:hover .shortcut-icon{color:#666;}.shortcuts .shortcut-label{display:block;margin-top:.75em;font-weight:400;color:#666;}@media(max-width:992px){.shortcuts .shortcut{min-width:8rem;min-height:4rem;}}@media screen and (min-width:768px){.jumbotron{margin-top:20px;}.body-content{padding:0;}input,select,textarea{max-width:100%;}}.elTimbSmart{padding:.2em;font-size:1.1em;line-height:1.3em;}.ui-input-btn input{opacity:.5;}.GridPager a,.GridPager span{display:block;height:1.5em;min-width:1.1em;text-align:center;text-decoration:none;}.GridPager a{background-color:#f5f5f5;color:#969696;}.GridPager span{background-color:#a1dcf2;color:#000;font-weight:bold;}
GPW_Admin/WebUserControls/mod_adminClienti.ascx
+1 -1
View File
@@ -9,7 +9,7 @@
<span class="input-group-text">Filtro visualizzazione</span>
</div>
<div class="form-control">
<uc1:cmp_toggle runat="server" ID="cmp_toggle" classOn="text-success" classOff="text-dark" messageOn="Mostra Tutti" messageOff="Mostra Solo Attivi" />
<uc1:cmp_toggle runat="server" ID="cmp_toggle" classOn="text-success" classOff="text-dark" messageOn="Mostra Tutti" messageOff="Mostra Tutti" />
<asp:HiddenField runat="server" ID="hfShowAll" />
</div>
</div>
GPW_Admin/WebUserControls/mod_adminDipendenti.ascx
+4 -1
View File
@@ -235,6 +235,9 @@
<asp:Parameter Name="gruppo" Type="String" />
<asp:Parameter Name="attivo" Type="Boolean" />
</InsertParameters>
<SelectParameters>
<asp:ControlParameter ControlID="chkshowAll" DefaultValue="false" Name="showAll" PropertyName="Checked" Type="Boolean" />
</SelectParameters>
<UpdateParameters>
<asp:Parameter Name="matricola" Type="String"></asp:Parameter>
<asp:Parameter Name="CF" Type="String" />
@@ -248,8 +251,8 @@
<asp:Parameter Name="dominio" Type="String" />
<asp:Parameter Name="utente" Type="String" />
<asp:Parameter Name="codOrario" Type="String" />
<asp:Parameter Name="gruppo" Type="String" />
<asp:Parameter Name="attivo" Type="Boolean" />
<asp:Parameter Name="gruppo" Type="String" />
<asp:Parameter Name="Original_idxDipendente" Type="Int32" />
</UpdateParameters>
</asp:ObjectDataSource>
GPW_Admin/WebUserControls/mod_adminDipendenti.ascx.cs
-7
View File
@@ -70,13 +70,6 @@ namespace GPW_Admin.WebUserControls
protected void chkshowAll_CheckedChanged(object sender, EventArgs e)
{
// in base a selezione cambio metodo ods
string selMethod = "GetData";
if (!chkshowAll.Checked)
{
selMethod = "getAttivi";
}
ods.SelectMethod = selMethod;
grView.DataBind();
}
GPW_Admin/WebUserControls/mod_adminProgetti.ascx
+12 -8
View File
@@ -13,25 +13,28 @@
<div class="col-4">
<uc1:cmp_periodoAnalisi runat="server" ID="cmp_periodoAnalisi" />
</div>
<div class="col-5 input-group input-group-sm small">
<div class="d-flex input-group-text py-0">
<div class="col-8 input-group input-group-sm small">
<div class="d-flex flex-row-reverse input-group-text py-0">
<div class="px-2">
<asp:CheckBox ID="chkShowChiusi" runat="server" Text="Mostra Archiviati" OnCheckedChanged="chkShowChiusi_CheckedChanged" AutoPostBack="True" />
<asp:LinkButton runat="server" ID="lbtResetFilt" ToolTip="Reset Filtro" OnClick="lbtResetFilt_Click" CssClass="btn btn-sm btn-block btn-outline-secondary"><i class="fa fa-refresh" aria-hidden="true"></i> Reset Filt</asp:LinkButton>
</div>
<div class="px-2">
<asp:CheckBox ID="chkShowVuoti" runat="server" Text="Mostra Vuoti" AutoPostBack="True" OnCheckedChanged="chkShowVuoti_CheckedChanged" Checked="true" />
<uc1:mod_filtro ID="filtroCli" runat="server" comboWidth="120" filterCheckText="setFiltroClienti" />
</div>
<div class="px-2">
<uc1:mod_filtro ID="filtroGrp" runat="server" comboWidth="120" filterCheckText="setFiltroGruppo" />
</div>
<div class="px-2">
<asp:CheckBox ID="chkShowOnlyStarred" runat="server" Text="Mostra SOLO Starred" AutoPostBack="True" OnCheckedChanged="chkShowOnlyStarred_CheckedChanged" Checked="false" />
</div>
<div class="px-2">
<asp:LinkButton runat="server" ID="lbtResetFilt" ToolTip="Reset Filtro" OnClick="lbtResetFilt_Click" CssClass="btn btn-sm btn-block btn-outline-secondary"><i class="fa fa-refresh" aria-hidden="true"></i> Reset</asp:LinkButton>
<asp:CheckBox ID="chkShowVuoti" runat="server" Text="Mostra Vuoti" AutoPostBack="True" OnCheckedChanged="chkShowVuoti_CheckedChanged" Checked="true" />
</div>
<div class="px-2">
<asp:CheckBox ID="chkShowChiusi" runat="server" Text="Mostra Archiviati" OnCheckedChanged="chkShowChiusi_CheckedChanged" AutoPostBack="True" />
</div>
</div>
</div>
<div class="col-3">
<uc1:mod_filtro ID="filtroCli" runat="server" filterChekText="filtroCliente" comboWidth="180" />
</div>
</div>
<div class="row table-default small">
<div class="col-12">
@@ -188,6 +191,7 @@
<asp:Parameter DefaultValue="0" Name="idxDipendente" Type="Int32" />
<asp:SessionParameter Name="dataFrom" SessionField="_inizio" Type="DateTime" />
<asp:SessionParameter Name="dataTo" SessionField="_fine" Type="DateTime" />
<asp:SessionParameter DefaultValue="" Name="gruppo" SessionField="gruppo_sel" Type="String" />
<asp:SessionParameter DefaultValue="0" Name="idxCliente" SessionField="idxCli_sel" Type="Int32" />
<asp:SessionParameter DefaultValue="False" Name="showPrjArch" SessionField="showPrjArch" Type="Boolean" />
<asp:SessionParameter DefaultValue="True" Name="showPrjZeroH" SessionField="showPrjZeroH" Type="Boolean" />
GPW_Admin/WebUserControls/mod_adminProgetti.ascx.cs
+34 -1
View File
@@ -19,13 +19,15 @@ namespace GPW_Admin.WebUserControls
/// <summary>
/// Init con valori specifici
/// </summary>
/// <param name="fGrp"></param>
/// <param name="fCli"></param>
/// <param name="interv"></param>
/// <param name="onlStar"></param>
/// <param name="showA"></param>
/// <param name="showE"></param>
public filtroProj(bool fCli, intervalloDate interv, bool onlStar, bool showA, bool showE)
public filtroProj(bool fGrp, bool fCli, intervalloDate interv, bool onlStar, bool showA, bool showE)
{
this.filtGrp = fGrp;
this.filtCli = fCli;
this.intAnalys = interv;
this.onlyStarred = onlStar;
@@ -38,6 +40,7 @@ namespace GPW_Admin.WebUserControls
/// </summary>
public filtroProj()
{
filtGrp = false;
filtCli = false;
// imposto intervallo dal 2000.01.01...
intervalloDate date = new intervalloDate();
@@ -54,6 +57,7 @@ namespace GPW_Admin.WebUserControls
#region Public Properties
public bool filtCli { get; set; }
public bool filtGrp { get; set; }
public intervalloDate intAnalys { get; set; }
public bool onlyStarred { get; set; }
public bool showArch { get; set; }
@@ -211,6 +215,28 @@ namespace GPW_Admin.WebUserControls
grView.DataBind();
}
/// <summary>
/// selezionato valore, filtro!
/// </summary>
/// <param name="sender"></param>
/// <param name="e"></param>
private void filtroGrp_eh_selValore(object sender, EventArgs e)
{
if (filtroGrp.isChecked)
{
memLayer.ML.setSessionVal("gruppo_sel", filtroGrp.valore);
}
else
{
memLayer.ML.setSessionVal("gruppo_sel", "");
}
// salvo!
var tempFilt = currFiltProj;
tempFilt.filtGrp = filtroGrp.isChecked;
currFiltProj = tempFilt;
grView.DataBind();
}
/// <summary>
/// cambiati dati dettaglio (attivo/inattivo)
/// </summary>
@@ -242,12 +268,18 @@ namespace GPW_Admin.WebUserControls
showVuoti = currFilt.showEmpty;
showOnlyStarred = currFilt.onlyStarred;
filtroCli.isChecked = currFilt.filtCli;
filtroGrp.isChecked = currFilt.filtGrp;
// se deselezionato --> svuoto
if (!currFilt.filtGrp)
{
filtroGrp.valore = "";
}
if (!currFilt.filtCli)
{
filtroCli.valore = "";
}
// salvo ulteriori valori
filtroGrp.ods = odsGruppi;
filtroCli.ods = odsClienti;
currFiltProj = currFilt;
grView.DataBind();
@@ -516,6 +548,7 @@ namespace GPW_Admin.WebUserControls
setupFilter(currFiltProj);
mod_dettaglioProgetto1.Visible = false;
}
filtroGrp.eh_selValore += new EventHandler(filtroGrp_eh_selValore);
filtroCli.eh_selValore += new EventHandler(filtroCli_eh_selValore);
mod_dettaglioProgetto1.eh_nuovoValore += new EventHandler(mod_dettaglioProgetto1_eh_nuovoValore);
cmp_periodoAnalisi.eh_doRefresh += Cmp_periodoAnalisi_eh_doRefresh;
GPW_Admin/WebUserControls/mod_adminProgetti.ascx.designer.cs
Generated
+36 -27
View File
@@ -23,33 +23,6 @@ namespace GPW_Admin.WebUserControls
/// </remarks>
protected global::GPW_Admin.WebUserControls.cmp_periodoAnalisi cmp_periodoAnalisi;
/// <summary>
/// Controllo chkShowChiusi.
/// </summary>
/// <remarks>
/// Campo generato automaticamente.
/// Per la modifica, spostare la dichiarazione di campo dal file di progettazione al file code-behind.
/// </remarks>
protected global::System.Web.UI.WebControls.CheckBox chkShowChiusi;
/// <summary>
/// Controllo chkShowVuoti.
/// </summary>
/// <remarks>
/// Campo generato automaticamente.
/// Per la modifica, spostare la dichiarazione di campo dal file di progettazione al file code-behind.
/// </remarks>
protected global::System.Web.UI.WebControls.CheckBox chkShowVuoti;
/// <summary>
/// Controllo chkShowOnlyStarred.
/// </summary>
/// <remarks>
/// Campo generato automaticamente.
/// Per la modifica, spostare la dichiarazione di campo dal file di progettazione al file code-behind.
/// </remarks>
protected global::System.Web.UI.WebControls.CheckBox chkShowOnlyStarred;
/// <summary>
/// Controllo lbtResetFilt.
/// </summary>
@@ -68,6 +41,42 @@ namespace GPW_Admin.WebUserControls
/// </remarks>
protected global::mod_filtro filtroCli;
/// <summary>
/// Controllo filtroGrp.
/// </summary>
/// <remarks>
/// Campo generato automaticamente.
/// Per la modifica, spostare la dichiarazione di campo dal file di progettazione al file code-behind.
/// </remarks>
protected global::mod_filtro filtroGrp;
/// <summary>
/// Controllo chkShowOnlyStarred.
/// </summary>
/// <remarks>
/// Campo generato automaticamente.
/// Per la modifica, spostare la dichiarazione di campo dal file di progettazione al file code-behind.
/// </remarks>
protected global::System.Web.UI.WebControls.CheckBox chkShowOnlyStarred;
/// <summary>
/// Controllo chkShowVuoti.
/// </summary>
/// <remarks>
/// Campo generato automaticamente.
/// Per la modifica, spostare la dichiarazione di campo dal file di progettazione al file code-behind.
/// </remarks>
protected global::System.Web.UI.WebControls.CheckBox chkShowVuoti;
/// <summary>
/// Controllo chkShowChiusi.
/// </summary>
/// <remarks>
/// Campo generato automaticamente.
/// Per la modifica, spostare la dichiarazione di campo dal file di progettazione al file code-behind.
/// </remarks>
protected global::System.Web.UI.WebControls.CheckBox chkShowChiusi;
/// <summary>
/// Controllo grView.
/// </summary>
GPW_Admin/WebUserControls/mod_filtro.ascx
+3 -1
View File
@@ -3,8 +3,10 @@
<div class="input-group input-group-sm">
<div class="input-group-prepend">
<asp:CheckBox ID="chkFilt" runat="server" Checked="false" AutoPostBack="True" CssClass='input-group-text <%# css %>' OnCheckedChanged="chkFilt_CheckedChanged" />
<asp:CheckBox ID="chkFilt" runat="server" Checked="false" AutoPostBack="True" CssClass='input-group-text2 <%# css %>' OnCheckedChanged="chkFilt_CheckedChanged" />
</div>
<asp:ComboBox ID="dlFilt" runat="server" Visible="False" DataTextField="label" DataValueField="value" AutoCompleteMode="SuggestAppend" DropDownStyle="DropDownList" AutoPostBack="True" OnSelectedIndexChanged="dlFilt_SelectedIndexChanged" CssClass="Windows" />
<asp:Label ID="where" runat="server" Visible="false" Text="" />
<asp:HiddenField runat="server" ID="hfShowAll" />
<asp:HiddenField runat="server" ID="hfShowFiltered" />
</div>
GPW_Admin/WebUserControls/mod_filtro.ascx.cs
+5 -5
View File
@@ -42,11 +42,11 @@ public partial class mod_filtro : ApplicationUserControl
{
get
{
return memLayer.ML.StringSessionObj($"_showAll_{this.UniqueID}".Replace("$", "_"));
return hfShowAll.Value; ;
}
set
{
memLayer.ML.setSessionVal($"_showAll_{this.UniqueID}".Replace("$", "_"), value);
hfShowAll.Value = value;
traduciObj();
}
}
@@ -55,11 +55,11 @@ public partial class mod_filtro : ApplicationUserControl
{
get
{
return memLayer.ML.StringSessionObj($"_showFiltered_{this.UniqueID}".Replace("$", "_"));
return hfShowFiltered.Value;
}
set
{
memLayer.ML.setSessionVal($"_showFiltered_{this.UniqueID}".Replace("$", "_"), value);
hfShowFiltered.Value = value;
traduciObj();
}
}
@@ -194,7 +194,7 @@ public partial class mod_filtro : ApplicationUserControl
/// <summary>
/// get/set messaggio di attivazione filtraggio
/// </summary>
public string filterChekText
public string filterCheckText
{
get
{
GPW_Admin/WebUserControls/mod_filtro.ascx.designer.cs
Generated
+18
View File
@@ -38,4 +38,22 @@ public partial class mod_filtro
/// Per la modifica, spostare la dichiarazione di campo dal file di progettazione al file code-behind.
/// </remarks>
protected global::System.Web.UI.WebControls.Label where;
/// <summary>
/// Controllo hfShowAll.
/// </summary>
/// <remarks>
/// Campo generato automaticamente.
/// Per la modifica, spostare la dichiarazione di campo dal file di progettazione al file code-behind.
/// </remarks>
protected global::System.Web.UI.WebControls.HiddenField hfShowAll;
/// <summary>
/// Controllo hfShowFiltered.
/// </summary>
/// <remarks>
/// Campo generato automaticamente.
/// Per la modifica, spostare la dichiarazione di campo dal file di progettazione al file code-behind.
/// </remarks>
protected global::System.Web.UI.WebControls.HiddenField hfShowFiltered;
}
GPW_Admin/WebUserControls/mod_reviewTimbrature.ascx
+23 -15
View File
@@ -6,12 +6,19 @@
<%@ Register Src="~/WebUserControls/cmp_periodoAnalisi.ascx" TagPrefix="uc1" TagName="cmp_periodoAnalisi" %>
<div class="row table-secondary">
<div class="col-2">
<asp:CheckBox runat="server" ID="chkshowAll" Text="Mostra tutti (inattivi)" OnCheckedChanged="chkshowAll_CheckedChanged" AutoPostBack="true" />
</div>
<div class="col-2">
<uc1:mod_filtro ID="filtroDip" runat="server" filterUnchekText="mostraTutti" filterChekText="filtraDip" changeCheckEnabled="false"
changeCheckVisible="false" />
<asp:ObjectDataSource ID="odsDip" runat="server" OldValuesParameterFormatString="Original_{0}" SelectMethod="getAttivi" TypeName="GPW_data.DS_UtilityTableAdapters.v_selDipendentiTableAdapter"></asp:ObjectDataSource>
<asp:ObjectDataSource ID="odsDip" runat="server" OldValuesParameterFormatString="original_{0}" SelectMethod="getByConditio" TypeName="GPW_data.DS_UtilityTableAdapters.v_selDipendentiTableAdapter">
<SelectParameters>
<asp:ControlParameter ControlID="chkshowAll" DefaultValue="false" Name="Conditio" PropertyName="Checked" Type="Boolean" />
</SelectParameters>
</asp:ObjectDataSource>
</div>
<div class="col-6">
<div class="col-4">
<uc1:cmp_periodoAnalisi runat="server" ID="cmp_periodoAnalisi" />
</div>
<div class="col-1">
@@ -47,8 +54,8 @@
</asp:TemplateField>
<asp:TemplateField HeaderText="dip" SortExpression="CognomeNome">
<ItemTemplate>
<asp:Label ID="lblDip" runat="server" Text='<%# Eval("idxDipendente","{0:00}") %>' ToolTip='<%# Eval("CognomeNome") %>' CssClass="text-info" Visible='<%# !showCognomeNome %>' />
<asp:Label ID="Label2" runat="server" Text='<%# Eval("CognomeNome") %>' ToolTip='<%# Eval("idxDipendente","{0:00}") %>' CssClass="text-info" Visible='<%# showCognomeNome %>' />
<asp:Label ID="lblDip" runat="server" Text='<%# Eval("idxDipendente","{0:00}") %>' ToolTip='<%# Eval("CognomeNome") %>' CssClass="text-info" Visible='<%# !showCognomeNome %>' Font-Size="1.4em" />
<asp:Label ID="lblCognNome" runat="server" Text='<%# Eval("CognomeNome") %>' ToolTip='<%# Eval("idxDipendente","{0:00}") %>' CssClass="text-info" Visible='<%# showCognomeNome %>' Font-Size="1.4em" />
</ItemTemplate>
<ItemStyle HorizontalAlign="left" Wrap="False" Width="1.5em"></ItemStyle>
</asp:TemplateField>
@@ -60,49 +67,49 @@
</asp:TemplateField>
<asp:TemplateField HeaderText="Ent" SortExpression="entrata_1">
<ItemTemplate>
<asp:Label ID="lblIn1" runat="server" Text='<%# Eval("entrata_1","{0:HH:mm}") %>' ForeColor="#226622" Font-Size="XX-Small" />
<asp:Label ID="lblIn1" runat="server" Text='<%# Eval("entrata_1","{0:HH:mm}") %>' ForeColor="#226622" />
</ItemTemplate>
<ItemStyle HorizontalAlign="Right" Wrap="False" Width="3em"></ItemStyle>
</asp:TemplateField>
<asp:TemplateField HeaderText="Usc" SortExpression="uscita_1">
<ItemTemplate>
<asp:Label ID="lblOut1" runat="server" Text='<%# Eval("uscita_1","{0:HH:mm}") %>' ForeColor="#222266" Font-Size="XX-Small" />
<asp:Label ID="lblOut1" runat="server" Text='<%# Eval("uscita_1","{0:HH:mm}") %>' ForeColor="#222266" />
</ItemTemplate>
<ItemStyle HorizontalAlign="Right" Wrap="False" Width="3em"></ItemStyle>
</asp:TemplateField>
<asp:TemplateField HeaderText="Ent" SortExpression="entrata_2">
<ItemTemplate>
<asp:Label ID="lblIn2" runat="server" Text='<%# Eval("entrata_2","{0:HH:mm}") %>' ForeColor="#226622" Font-Size="XX-Small" />
<asp:Label ID="lblIn2" runat="server" Text='<%# Eval("entrata_2","{0:HH:mm}") %>' ForeColor="#226622" />
</ItemTemplate>
<ItemStyle HorizontalAlign="Right" Wrap="False" Width="3em"></ItemStyle>
</asp:TemplateField>
<asp:TemplateField HeaderText="Usc" SortExpression="uscita_2">
<ItemTemplate>
<asp:Label ID="lblOut2" runat="server" Text='<%# Eval("uscita_2","{0:HH:mm}") %>' ForeColor="#222266" Font-Size="XX-Small" />
<asp:Label ID="lblOut2" runat="server" Text='<%# Eval("uscita_2","{0:HH:mm}") %>' ForeColor="#222266" />
</ItemTemplate>
<ItemStyle HorizontalAlign="Right" Wrap="False" Width="3em"></ItemStyle>
</asp:TemplateField>
<asp:TemplateField HeaderText="Ent" SortExpression="entrata_3">
<ItemTemplate>
<asp:Label ID="lblIn3" runat="server" Text='<%# Eval("entrata_3","{0:HH:mm}") %>' ForeColor="#226622" Font-Size="XX-Small" />
<asp:Label ID="lblIn3" runat="server" Text='<%# Eval("entrata_3","{0:HH:mm}") %>' ForeColor="#226622" />
</ItemTemplate>
<ItemStyle HorizontalAlign="Right" Wrap="False" Width="3em"></ItemStyle>
</asp:TemplateField>
<asp:TemplateField HeaderText="Usc" SortExpression="uscita_3">
<ItemTemplate>
<asp:Label ID="lblOut3" runat="server" Text='<%# Eval("uscita_3","{0:HH:mm}") %>' ForeColor="#222266" Font-Size="XX-Small" />
<asp:Label ID="lblOut3" runat="server" Text='<%# Eval("uscita_3","{0:HH:mm}") %>' ForeColor="#222266" />
</ItemTemplate>
<ItemStyle HorizontalAlign="Right" Wrap="False" Width="3em"></ItemStyle>
</asp:TemplateField>
<asp:TemplateField HeaderText="Ent" SortExpression="entrata_4">
<ItemTemplate>
<asp:Label ID="lblIn4" runat="server" Text='<%# Eval("entrata_4","{0:HH:mm}") %>' ForeColor="#226622" Font-Size="XX-Small" />
<asp:Label ID="lblIn4" runat="server" Text='<%# Eval("entrata_4","{0:HH:mm}") %>' ForeColor="#226622" />
</ItemTemplate>
<ItemStyle HorizontalAlign="Right" Wrap="False" Width="3em"></ItemStyle>
</asp:TemplateField>
<asp:TemplateField HeaderText="Usc" SortExpression="uscita_4">
<ItemTemplate>
<asp:Label ID="lblOut4" runat="server" Text='<%# Eval("uscita_4","{0:HH:mm}") %>' ForeColor="#222266" Font-Size="XX-Small" />
<asp:Label ID="lblOut4" runat="server" Text='<%# Eval("uscita_4","{0:HH:mm}") %>' ForeColor="#222266" />
</ItemTemplate>
<ItemStyle HorizontalAlign="Right" Wrap="False" Width="3em"></ItemStyle>
</asp:TemplateField>
@@ -110,7 +117,7 @@
<ItemTemplate>
<%--<asp:Label ID="lblHLav" runat="server" Text='<%# Eval("h_lav","<b>{0:0.00}</b>") %>' CssClass='<%# classByNL(Eval("minNonLav")) %>' ToolTip='<%# tooltipPermStra(Eval("minStra"),Eval("minPerm")) %>' />--%>
<asp:Label ID="lblHLav" runat="server" Text='<%# formatDurata(Eval("h_lav")) %>' Font-Bold="true" CssClass='<%# classByNL(Eval("minNonLav")) %>'
ToolTip='<%# tooltipPermStra(Eval("minStra"),Eval("minPerm"),Eval("minMpp")) %>' />
ToolTip='<%# tooltipPermStra(Eval("minStra"),Eval("minPerm"),Eval("minMpp")) %>' Font-Size="1.5em" />
</ItemTemplate>
<ItemStyle HorizontalAlign="Right" Wrap="False" Width="4em"></ItemStyle>
</asp:TemplateField>
@@ -154,7 +161,7 @@
<asp:TemplateField HeaderText="H Com" SortExpression="h_com" HeaderStyle-HorizontalAlign="Right">
<ItemTemplate>
<b>
<asp:Label ID="lblHComm" runat="server" Text='<%# formatDurata(Eval("h_com")) %>' ForeColor='<%# coloreComm(Eval("OkLavCom")) %>' />
<asp:Label ID="lblHComm" runat="server" Text='<%# formatDurata(Eval("h_com")) %>' ForeColor='<%# coloreComm(Eval("OkLavCom")) %>' Font-Size="1.5em" />
</b>
</ItemTemplate>
<ItemStyle HorizontalAlign="Right" Wrap="False" Width="4em"></ItemStyle>
@@ -166,6 +173,7 @@
<asp:SessionParameter SessionField="idxDip_sel" Name="idxDipendente" Type="Int32" DefaultValue="0" />
<asp:SessionParameter SessionField="_inizio" Name="dataFrom" Type="DateTime" />
<asp:SessionParameter SessionField="_fine" Name="dataTo" Type="DateTime" />
<asp:ControlParameter ControlID="chkshowAll" Name="showInattivi" Type="Boolean" />
<asp:ControlParameter ControlID="chkWE" Name="showWE" Type="Boolean" />
<asp:SessionParameter SessionField="maxErrMin" Name="maxErrMin" Type="Int32" DefaultValue="-30" />
<asp:SessionParameter SessionField="maxErrPlus" Name="maxErrPlus" Type="Int32" DefaultValue="30" />
@@ -181,7 +189,7 @@
<uc3:mod_elencoTimbr ID="mod_elencoTimbr1" runat="server" showUserName="false" showLongDateFormat="true" />
<hr />
<asp:GridView ID="grViewGiust" runat="server" DataSourceID="odsGiust" AutoGenerateColumns="False" DataKeyNames="dataLav,idxDipendente,codGiust"
CssClass="table table-sm table-striped" Visible="False">
CssClass="table table-sm table-striped table-warning" Visible="False">
<EditRowStyle CssClass="table-primary" />
<SelectedRowStyle CssClass="table-info" />
<HeaderStyle CssClass="default" />
GPW_Admin/WebUserControls/mod_reviewTimbrature.ascx.cs
+6
View File
@@ -210,6 +210,12 @@ namespace GPW_Admin.WebUserControls
checkFixOds();
}
protected void chkshowAll_CheckedChanged(object sender, EventArgs e)
{
filtroDip.ods = odsDip;
grViewExpl.DataBind();
}
/// <summary>
/// cambia stato visibilità week-end...
/// </summary>
GPW_Admin/WebUserControls/mod_reviewTimbrature.ascx.designer.cs
Generated
+9
View File
@@ -14,6 +14,15 @@ namespace GPW_Admin.WebUserControls
public partial class mod_reviewTimbrature
{
/// <summary>
/// Controllo chkshowAll.
/// </summary>
/// <remarks>
/// Campo generato automaticamente.
/// Per la modifica, spostare la dichiarazione di campo dal file di progettazione al file code-behind.
/// </remarks>
protected global::System.Web.UI.WebControls.CheckBox chkshowAll;
/// <summary>
/// Controllo filtroDip.
/// </summary>
GPW_Admin/WebUserControls/mod_spostaOre.ascx
+13 -12
View File
@@ -11,7 +11,11 @@
<div class="p-2">
<uc1:mod_filtro ID="filtroDip" runat="server" filterUnchekText="mostraTutti" filterChekText="filtraDip" changeCheckEnabled="false"
changeCheckVisible="false" comboWidth="160" />
<asp:ObjectDataSource ID="odsDip" runat="server" OldValuesParameterFormatString="Original_{0}" SelectMethod="getAttivi" TypeName="GPW_data.DS_UtilityTableAdapters.v_selDipendentiTableAdapter"></asp:ObjectDataSource>
<asp:ObjectDataSource ID="odsDip" runat="server" OldValuesParameterFormatString="original_{0}" SelectMethod="getByConditio" TypeName="GPW_data.DS_UtilityTableAdapters.v_selDipendentiTableAdapter">
<SelectParameters>
<asp:ControlParameter ControlID="chkshowAll" DefaultValue="false" Name="Conditio" PropertyName="Checked" Type="Boolean" />
</SelectParameters>
</asp:ObjectDataSource>
</div>
<div class="p-2">
<uc1:cmp_periodoAnalisi runat="server" ID="cmp_periodoAnalisi" />
@@ -25,8 +29,7 @@
<asp:CheckBox runat="server" ID="chkshowAllCli" Text="Mostra tutti Clienti" OnCheckedChanged="chkshowAllCli_CheckedChanged" AutoPostBack="true" />
</div>
<div class="p-2">
<uc1:mod_filtro ID="filtroCli" runat="server" filterChekText="allClienti" comboWidth="160" changeCheckVisible="true" isChecked="false"
filterUnchekText="selClienti" />
<uc1:mod_filtro ID="filtroCli" runat="server" filterChekText="allClienti" comboWidth="160" changeCheckVisible="true" isChecked="false" filterUnchekText="selClienti" filterCheckText="selFiltroClienti" />
<asp:ObjectDataSource ID="odsClienti" runat="server" OldValuesParameterFormatString="original_{0}" SelectMethod="getByConditio"
TypeName="GPW_data.DS_UtilityTableAdapters.v_selClientiTableAdapter">
<SelectParameters>
@@ -35,8 +38,7 @@
</asp:ObjectDataSource>
</div>
<div class="p-2">
<uc1:mod_filtro ID="filtroPrj" runat="server" filterChekText="allProgetti" comboWidth="240" changeCheckVisible="true" changeCheckEnabled="true"
isChecked="false" filterUnchekText="selProgetti" />
<uc1:mod_filtro ID="filtroPrj" runat="server" filterChekText="allProgetti" comboWidth="240" changeCheckVisible="true" changeCheckEnabled="true" filterCheckText="selFiltroProj" isChecked="false" filterUnchekText="selProgetti" />
<asp:ObjectDataSource ID="odsProj" runat="server" OldValuesParameterFormatString="Original_{0}" SelectMethod="getByConditio"
TypeName="GPW_data.DS_UtilityTableAdapters.v_selProgettiTableAdapter">
<SelectParameters>
@@ -46,8 +48,7 @@
</asp:ObjectDataSource>
</div>
<div class="p-2">
<uc1:mod_filtro ID="filtroFase" runat="server" filterChekText="allFasi" comboWidth="200" changeCheckVisible="true" changeCheckEnabled="true"
isChecked="false" filterUnchekText="selFasi" />
<uc1:mod_filtro ID="filtroFase" runat="server" filterChekText="allFasi" comboWidth="200" changeCheckVisible="true" changeCheckEnabled="true" filterCheckText="selFiltroFase" isChecked="false" filterUnchekText="selFasi" />
<asp:ObjectDataSource ID="odsFasi" runat="server" OldValuesParameterFormatString="Original_{0}" SelectMethod="getByConditio"
TypeName="GPW_data.DS_UtilityTableAdapters.v_selFasiOptTableAdapter">
<SelectParameters>
@@ -60,12 +61,12 @@
<asp:CheckBox runat="server" ID="chkSoloAncest" Text="Solo Macrofasi" Checked="false" AutoPostBack="true" />
</div>
</div>
<div class="d-flex table-primary">
<div class="d-flex table-warning">
<div class="p-2">
<asp:Button runat="server" ID="btnEnableSposta" Text="..." OnClick="btnEnableSposta_Click" CssClass="badgeArancio ui-corner-all" />
</div>
<div class="p-2" runat="server" id="pnlFaseDest">
<div class="d-flex table-primary">
<div class="d-flex table-warning">
<div class="p-2">
<uc1:mod_filtro ID="filtroCliDest" runat="server" filterChekText="allClienti" comboWidth="180" changeCheckVisible="false"
isChecked="true" filterUnchekText="selClienti" />
@@ -134,7 +135,7 @@
<b>
<asp:Label ID="lblOre" runat="server" Text='<%# Eval("oreTot","{0:0.##}") %>' /></b> h
</div>
<div class="col-4 text-center small">
<div class="col-4 text-center">
<div class="table-secondary border rounded">
<asp:Label ID="lblDay" runat="server" Text='<%# Eval("inizio","{0:dd/MM/yy}") %>' />
|
@@ -159,12 +160,12 @@
</div>
</div>
</div>
<div class="col-3 small">
<div class="col-3">
<asp:Label ID="lblnomeProj" runat="server" Text='<%# Eval("nomeProj") %>' ForeColor="Blue" />
|
<asp:Label ID="lblnomeFase" runat="server" Text='<%# Eval("nomeFase") %>' ForeColor="Green" />
</div>
<div class="col-6 small">
<div class="col-6">
<asp:Label ID="lbldescrizione" runat="server" Text='<%# Eval("descrizione").ToString().Replace(Environment.NewLine,", ").Replace("\n",", ") %>' />
</div>
</div>
GPW_Admin/WebUserControls/mod_spostaOre.ascx.cs
-7
View File
@@ -351,13 +351,6 @@ namespace GPW_Admin.WebUserControls
protected void chkshowAll_CheckedChanged(object sender, EventArgs e)
{
// in base a selezione cambio metodo ods
string selMethod = "GetData";
if (!chkshowAll.Checked)
{
selMethod = "getAttivi";
}
odsDip.SelectMethod = selMethod;
filtroDip.ods = odsDip;
filtroDip.reselFirst();
}