diff --git a/.editorconfig b/.editorconfig index 8f4e7be..46b8b33 100644 --- a/.editorconfig +++ b/.editorconfig @@ -38,3 +38,7 @@ dotnet_diagnostic.CA1030.severity = none # CA1056: Le proprietà Uri non devono essere stringhe dotnet_diagnostic.CA1056.severity = none + +# CA1055: I valori restituiti di Uri non devono essere stringhe +dotnet_diagnostic.CA1055.severity = none + diff --git a/GPW_Admin/GPW_Admin.csproj b/GPW_Admin/GPW_Admin.csproj index 90604f3..d540350 100644 --- a/GPW_Admin/GPW_Admin.csproj +++ b/GPW_Admin/GPW_Admin.csproj @@ -124,8 +124,8 @@ ..\packages\StackExchange.Redis.2.1.58\lib\net461\StackExchange.Redis.dll - - ..\packages\SteamWare.4.1.2008.736\lib\net462\SteamWare.dll + + ..\packages\SteamWare.4.1.2009.737\lib\net462\SteamWare.dll ..\packages\System.Buffers.4.5.1\lib\net461\System.Buffers.dll @@ -387,13 +387,14 @@ + - - .editorconfig + + @@ -525,6 +526,8 @@ + + @@ -917,7 +920,6 @@ mod_filtro.ascx - ASPXCodeBehind mod_filtro.ascx @@ -931,7 +933,6 @@ mod_login.ascx - ASPXCodeBehind mod_login.ascx @@ -952,14 +953,12 @@ mod_menuSx.ascx - ASPXCodeBehind mod_menuSx.ascx mod_menuTop.ascx - ASPXCodeBehind mod_menuTop.ascx @@ -973,7 +972,6 @@ mod_pageTitleAndSearch.ascx - ASPXCodeBehind mod_pageTitleAndSearch.ascx @@ -1001,7 +999,6 @@ mod_ricercaGenerica.ascx - ASPXCodeBehind mod_ricercaGenerica.ascx diff --git a/GPW_Admin/WebUserControls/mod_reviewTimbrature.ascx.cs b/GPW_Admin/WebUserControls/mod_reviewTimbrature.ascx.cs index cf1d1c6..e29da7a 100644 --- a/GPW_Admin/WebUserControls/mod_reviewTimbrature.ascx.cs +++ b/GPW_Admin/WebUserControls/mod_reviewTimbrature.ascx.cs @@ -12,499 +12,502 @@ using System.Drawing; namespace GPW_Admin.WebUserControls { - public partial class mod_reviewTimbrature : BaseUserControl - { + public partial class mod_reviewTimbrature : BaseUserControl + { - /// - /// caricamento pagina - /// - /// - /// - protected void Page_Load(object sender, EventArgs e) - { - grViewExpl.PageSize = utils.pageSize; - if (!Page.IsPostBack) - { - // imposto intervallo date...1 mese... - intervalloDate date = new intervalloDate(); - date.fine = DateTime.Now.Date.AddDays(1); - date.inizio = date.fine.AddMonths(-1); - mod_periodoAnalisi1.intervalloAnalisi = date; - // altri fix - filtroDip.ods = odsDip; - memLayer.ML.emptySessionVal("idxDip_sel"); - memLayer.ML.setSessionVal("maxErrMin", memLayer.ML.confReadInt("maxErrMin")); - memLayer.ML.setSessionVal("maxErrPlus", memLayer.ML.confReadInt("maxErrPlus")); - filtroDip.reselFirst(); - setDetailVisib(false); - // determino visibilità link export... - hlExport.Visible = memLayer.ML.cdvb("ExportORE_SPS"); - hlExportComm.Visible = memLayer.ML.cdvb("ExportCommesse"); - } - filtroDip.eh_selValore += new EventHandler(filtroDip_eh_selValore); - mod_elencoTimbr1.eh_nuovoValore += new EventHandler(mod_elencoTimbr1_eh_nuovoValore); - } - /// - /// valore selezionato x dettaglio giornaliero utente - /// - protected DateTime dataRif - { - get - { - DateTime answ = DateTime.Now; - try + /// + /// caricamento pagina + /// + /// + /// + protected void Page_Load(object sender, EventArgs e) { - answ = Convert.ToDateTime(memLayer.ML.objSessionObj("dataRif")); + grViewExpl.PageSize = utils.pageSize; + if (!Page.IsPostBack) + { + // imposto intervallo date...1 mese... + intervalloDate date = new intervalloDate(); + date.fine = DateTime.Now.Date.AddDays(1); + date.inizio = date.fine.AddMonths(-1); + mod_periodoAnalisi1.intervalloAnalisi = date; + // altri fix + filtroDip.ods = odsDip; + memLayer.ML.emptySessionVal("idxDip_sel"); + memLayer.ML.setSessionVal("maxErrMin", memLayer.ML.confReadInt("maxErrMin")); + memLayer.ML.setSessionVal("maxErrPlus", memLayer.ML.confReadInt("maxErrPlus")); + filtroDip.reselFirst(); + setDetailVisib(false); + // determino visibilità link export... + hlExport.Visible = memLayer.ML.cdvb("ExportORE_SPS"); + hlExportComm.Visible = memLayer.ML.cdvb("ExportCommesse"); + } + filtroDip.eh_selValore += new EventHandler(filtroDip_eh_selValore); + mod_elencoTimbr1.eh_nuovoValore += new EventHandler(mod_elencoTimbr1_eh_nuovoValore); } - catch - { } - return answ; - } - set - { - memLayer.ML.setSessionVal("dataRif", value); - } - } - - void mod_elencoTimbr1_eh_nuovoValore(object sender, EventArgs e) - { - checkFixOds(); - } - /// - /// seleziono - /// - /// - /// - void filtroDip_eh_selValore(object sender, EventArgs e) - { - // imposto ods - grViewExpl.SelectedIndex = -1; - setDetailVisib(false); - checkFixOds(); - } - /// - /// imposto ODS - /// - private void checkFixOds() - { - memLayer.ML.setSessionVal("idxDip_sel", filtroDip.valoreInt); - grViewExpl.DataBind(); - mod_elencoTimbr1.doUpdate(); - } - /// - /// calcola cognome-nome da idx - /// - /// - /// - public string cognomeNome(object idxDip) - { - string answ = ""; - try - { - DS_Applicazione.DipendentiRow rigaDip = DataProxy.DP.taDipendenti.getByIdx(Convert.ToInt32(idxDip))[0]; - answ = string.Format("{0} {1}", rigaDip.Cognome, rigaDip.Nome); - } - catch - { } - return answ; - } - /// - /// verifica se l'utente possa approvare la modifica oraria - /// - public bool userCanApprove - { - get - { - bool answ = false; - try + /// + /// valore selezionato x dettaglio giornaliero utente + /// + protected DateTime dataRif { - answ = user_std.UtSn.userHasRight("GPW_admin"); + get + { + DateTime answ = DateTime.Now; + try + { + answ = Convert.ToDateTime(memLayer.ML.objSessionObj("dataRif")); + } + catch + { } + return answ; + } + set + { + memLayer.ML.setSessionVal("dataRif", value); + } } - catch - { } - return answ; - } - } - /// - /// idx dipendente loggato - /// - protected int IdxDipendente - { - get - { - int idx = 0; - try + + void mod_elencoTimbr1_eh_nuovoValore(object sender, EventArgs e) { - idx = memLayer.ML.IntSessionObj("IdxDipendente"); + checkFixOds(); } - catch - { } - return idx; - } - } - /// - /// inverte valore booleano - /// - /// - /// - public bool invBool(object valore) - { - bool answ = true; - try - { - answ = !Convert.ToBoolean(valore); - } - catch - { } - return answ; - } - /// - /// converte valore in booleano - /// - /// - /// - public bool toBool(object valore) - { - bool answ = true; - try - { - answ = Convert.ToBoolean(valore); - } - catch - { } - return answ; - } - /// - /// mostro visualizzazione dati di dettaglio! - /// - /// - /// - protected void grViewExpl_SelectedIndexChanged(object sender, EventArgs e) - { - dataRif = Convert.ToDateTime(grViewExpl.SelectedDataKey["dataLav"]).Date; - setDetailVisib(true); - - // mostra timbrature - memLayer.ML.setSessionVal("inizioDet", dataRif); - memLayer.ML.setSessionVal("fineDet", dataRif.AddDays(1)); - memLayer.ML.setSessionVal("idxDip_det", grViewExpl.SelectedDataKey["idxDipendente"]); - mod_elencoTimbr1.doUpdate(); - - // mostra commesse - memLayer.ML.setSessionVal("idxDipendente", grViewExpl.SelectedDataKey["idxDipendente"]); - CultureInfo ita = new CultureInfo("it-IT"); - mod_commAttivitaDesk1.idxDipCurr = Convert.ToInt32(grViewExpl.SelectedDataKey["idxDipendente"]); - mod_commAttivitaDesk1.valoreDateTime = Convert.ToDateTime(dataRif, ita); - mod_commAttivitaDesk1.doUpdate(); - - grViewExpl.DataBind(); - } - /// - /// set visibilità grView dettagli - /// - /// - private void setDetailVisib(bool value) - { - pnlDettagli.Visible = value; - //mod_elencoTimbr1.Visible = value; - grViewGiust.Visible = value; - } - /// - /// reset della selezione - /// - /// - /// - protected void btnReset_Click(object sender, EventArgs e) - { - resetSelezione(); - } - /// - /// resetta la selezione dei valori in caso di modifiche su altri controlli - /// - public void resetSelezione() - { - grViewExpl.SelectedIndex = -1; - grViewExpl.DataBind(); - setDetailVisib(false); - } - /// - /// evento update righe - /// - /// - /// - protected void grView_RowUpdated(object sender, GridViewUpdatedEventArgs e) - { - grViewExpl.DataBind(); - } - /// - /// evento cancellazione riga - /// - /// - /// - protected void grView_RowDeleted(object sender, GridViewDeletedEventArgs e) - { - grViewExpl.DataBind(); - } - /// - /// - /// - /// - /// - public string classByNL(object minutiNonLav) - { - string answ = ""; - try - { - if (Convert.ToDouble(minutiNonLav) > 0) + /// + /// seleziono + /// + /// + /// + void filtroDip_eh_selValore(object sender, EventArgs e) { - answ = "lblWarning"; + // imposto ods + grViewExpl.SelectedIndex = -1; + setDetailVisib(false); + checkFixOds(); } - } - catch - { } - return answ; - } - /// - /// prepara tooltip permessi/straordinarie - /// - /// - /// - /// - /// - public string tooltipPermStra(object minStra, object minPerm, object minMpp) - { - string answ = ""; - try - { - answ = string.Format("Straordinarie: {0:0.##} min, Permessi: {1:0.##} min", minStra, minPerm); - if (Convert.ToInt32(minMpp) > 0) + /// + /// imposto ODS + /// + private void checkFixOds() { - answ += string.Format(", Pranzo: {0:0.##} min", minMpp); + memLayer.ML.setSessionVal("idxDip_sel", filtroDip.valoreInt); + grViewExpl.DataBind(); + mod_elencoTimbr1.doUpdate(); } - } - catch - { } - return answ; - } - - #region editing giustificativi - - - /// - /// resetta la selezione dei valori in caso di modifiche su altri controlli - /// - public void resetSelezioneGiust() - { - grViewGiust.SelectedIndex = -1; - grViewGiust.DataBind(); - } - /// - /// reset della selezione - /// - /// - /// - protected void btnResetGiust_Click(object sender, EventArgs e) - { - resetSelezioneGiust(); - } - /// - /// gestione evento richiesta nuovo valore (mostra footer, ...) - /// - /// - /// - protected void btnNew_Click(object sender, EventArgs e) - { - // reset selezione... - resetSelezioneGiust(); - - int idxDip = memLayer.ML.IntSessionObj("idxDip_det"); - // calcola ed inserisce giustificativi - DataProxy.DP.taGiust.giustInsByDate(idxDip, dataRif, "PERM"); - updateVisual(); - } - /// - /// inserisce nuovo valore da footer - /// - /// - /// - protected void lblIns_click(object sender, EventArgs e) - { - // click su inserimento, chiamo il metodo insert dell'ObjectDataSource - odsGiust.Insert(); - } - /// - /// annulla inserimento nuovo valore da footer - /// - /// - /// - protected void lblCanc_click(object sender, EventArgs e) - { - // annullo inserimento: nascondo footer, bind controlli... - grViewGiust.FooterRow.Visible = false; - } - /// - /// inserisce un giust nuovo x dipendente/data - /// - /// - /// - protected void btNewGiust_Click(object sender, EventArgs e) - { - int idxDip = memLayer.ML.IntSessionObj("idxDip_det"); - // calcola ed inserisce giustificativi - DataProxy.DP.taGiust.giustInsByDate(idxDip, dataRif, "PERM"); - updateVisual(); - } - /// - /// aggiorna i 3 datagrid - /// - private void updateVisual() - { - // aggiorno visualizzazioni - grViewExpl.DataBind(); - mod_elencoTimbr1.doUpdate(); - grViewGiust.DataBind(); - } - /// - /// aggiornamento x update - /// - /// - /// - protected void odsGiust_Updated(object sender, ObjectDataSourceStatusEventArgs e) - { - updateVisual(); - } - /// - /// aggiornamento x delete - /// - /// - /// - protected void odsGiust_Deleted(object sender, ObjectDataSourceStatusEventArgs e) - { - updateVisual(); - } - /// - /// calcola se sia visibile con criterio GREATER THAN ZERO - /// - /// - /// - public bool isGTZ(object valore) - { - bool answ = false; - try - { - if (Convert.ToDouble(valore) > 0) + /// + /// calcola cognome-nome da idx + /// + /// + /// + public string cognomeNome(object idxDip) { - answ = true; + string answ = ""; + try + { + DS_Applicazione.DipendentiRow rigaDip = DataProxy.DP.taDipendenti.getByIdx(Convert.ToInt32(idxDip))[0]; + answ = string.Format("{0} {1}", rigaDip.Cognome, rigaDip.Nome); + } + catch + { } + return answ; } - } - catch - { } - return answ; - } - - #endregion - - /// - /// cambia stato visibilità week-end... - /// - /// - /// - protected void chkWE_CheckedChanged(object sender, EventArgs e) - { - // imposto ods - checkFixOds(); - } - /// - /// ricalcola giornate periodo visualizzato per i dipendenti selezionati - /// - /// - /// - protected void btnRicalcPeriodo_Click(object sender, EventArgs e) - { - // eseguo la stored di update dato condizione di filtro x periodo e dipendente... - DataProxy.DP.taTimbExpl.stp_ricalcolaTimbExpl_byPeriodoUser(memLayer.ML.IntSessionObj("idxDip_sel"), Convert.ToDateTime(memLayer.ML.objSessionObj("_inizio")), Convert.ToDateTime(memLayer.ML.objSessionObj("_fine"))); - DataProxy.DP.taRA.stp_ricalcolaRegAttivitaExpl_byPeriodoUser(memLayer.ML.IntSessionObj("idxDip_sel"), Convert.ToDateTime(memLayer.ML.objSessionObj("_inizio")), Convert.ToDateTime(memLayer.ML.objSessionObj("_fine"))); - // aggiorno - checkFixOds(); - } - /// - /// restituisce il colore data valore ok commessa - /// - /// - /// - public Color coloreComm(object okLavCom) - { - Color answ = Color.Orange; - try - { - if (toBool(okLavCom)) + /// + /// verifica se l'utente possa approvare la modifica oraria + /// + public bool userCanApprove { - answ = Color.Black; + get + { + bool answ = false; + try + { + answ = user_std.UtSn.userHasRight("GPW_admin"); + } + catch + { } + return answ; + } } - } - catch - { } - return answ; - } - /// - /// restituisce il colore dato minMpp (se > 0 è verde, altrimenti marrone) - /// - /// - /// - public Color coloreMPP(object minMpp) - { - Color answ = Color.FromName("#995511"); - try - { - if (minMpp.ToString() != "0") + /// + /// idx dipendente loggato + /// + protected int IdxDipendente { - answ = Color.FromName("#66AA22"); + get + { + int idx = 0; + try + { + idx = memLayer.ML.IntSessionObj("IdxDipendente"); + } + catch + { } + return idx; + } } - } - catch - { } - return answ; - } - /// - /// determina se si debba mostrare cognome nome (altrimenti IDX anonimo) - /// - public bool showCognomeNome - { - get - { - return memLayer.ML.confReadBool("reviewShowCN"); - } - } - /// - /// formatta la durata in ore secondo web.config (centesimale/ore:min) - /// - /// - /// - public string formatDurata(object oreCent) - { - decimal ore = 0; - try - { - ore = Convert.ToDecimal(oreCent); - } - catch - { } - string answ = ""; - if (memLayer.ML.confReadBool("reviewShowOreMin")) - { - //answ = string.Format("{0}:{1:00}", Math.Floor(ore), Math.Round((ore - Math.Floor(ore)) * 60)); - answ = utils.formOreMin(ore); - } - else - { - answ = ore.ToString("0.00"); - } - return answ; - } + /// + /// inverte valore booleano + /// + /// + /// + public bool invBool(object valore) + { + bool answ = true; + try + { + answ = !Convert.ToBoolean(valore); + } + catch + { } + return answ; + } + /// + /// converte valore in booleano + /// + /// + /// + public bool toBool(object valore) + { + bool answ = true; + try + { + answ = Convert.ToBoolean(valore); + } + catch + { } + return answ; + } + /// + /// mostro visualizzazione dati di dettaglio! + /// + /// + /// + protected void grViewExpl_SelectedIndexChanged(object sender, EventArgs e) + { + dataRif = Convert.ToDateTime(grViewExpl.SelectedDataKey["dataLav"]).Date; + setDetailVisib(true); - protected void odsGiust_Inserting(object sender, ObjectDataSourceMethodEventArgs e) - { + // mostra timbrature + memLayer.ML.setSessionVal("inizioDet", dataRif); + memLayer.ML.setSessionVal("fineDet", dataRif.AddDays(1)); + memLayer.ML.setSessionVal("idxDip_det", grViewExpl.SelectedDataKey["idxDipendente"]); + mod_elencoTimbr1.doUpdate(); + // mostra commesse + memLayer.ML.setSessionVal("idxDipendente", grViewExpl.SelectedDataKey["idxDipendente"]); + CultureInfo ita = new CultureInfo("it-IT"); + mod_commAttivitaDesk1.idxDipCurr = Convert.ToInt32(grViewExpl.SelectedDataKey["idxDipendente"]); + mod_commAttivitaDesk1.valoreDateTime = Convert.ToDateTime(dataRif, ita); + mod_commAttivitaDesk1.doUpdate(); + + grViewExpl.DataBind(); + } + /// + /// set visibilità grView dettagli + /// + /// + private void setDetailVisib(bool value) + { + pnlDettagli.Visible = value; + //mod_elencoTimbr1.Visible = value; + grViewGiust.Visible = value; + } + /// + /// reset della selezione + /// + /// + /// + protected void btnReset_Click(object sender, EventArgs e) + { + resetSelezione(); + } + /// + /// resetta la selezione dei valori in caso di modifiche su altri controlli + /// + public void resetSelezione() + { + grViewExpl.SelectedIndex = -1; + grViewExpl.DataBind(); + setDetailVisib(false); + } + /// + /// evento update righe + /// + /// + /// + protected void grView_RowUpdated(object sender, GridViewUpdatedEventArgs e) + { + grViewExpl.DataBind(); + } + /// + /// evento cancellazione riga + /// + /// + /// + protected void grView_RowDeleted(object sender, GridViewDeletedEventArgs e) + { + grViewExpl.DataBind(); + } + /// + /// + /// + /// + /// + public string classByNL(object minutiNonLav) + { + string answ = ""; + try + { + if (Convert.ToDouble(minutiNonLav) > 0) + { + answ = "lblWarning"; + } + } + catch + { } + return answ; + } + /// + /// prepara tooltip permessi/straordinarie + /// + /// + /// + /// + /// + public string tooltipPermStra(object minStra, object minPerm, object minMpp) + { + string answ = ""; + try + { + answ = string.Format("Straordinarie: {0:0.##} min, Permessi: {1:0.##} min", minStra, minPerm); + if (Convert.ToInt32(minMpp) > 0) + { + answ += string.Format(", Pranzo: {0:0.##} min", minMpp); + } + } + catch + { } + return answ; + } + + #region editing giustificativi + + + /// + /// resetta la selezione dei valori in caso di modifiche su altri controlli + /// + public void resetSelezioneGiust() + { + grViewGiust.SelectedIndex = -1; + grViewGiust.DataBind(); + } + /// + /// reset della selezione + /// + /// + /// + protected void btnResetGiust_Click(object sender, EventArgs e) + { + resetSelezioneGiust(); + } + /// + /// gestione evento richiesta nuovo valore (mostra footer, ...) + /// + /// + /// + protected void btnNew_Click(object sender, EventArgs e) + { + // reset selezione... + resetSelezioneGiust(); + + int idxDip = memLayer.ML.IntSessionObj("idxDip_det"); + // calcola ed inserisce giustificativi + DataProxy.DP.taGiust.giustInsByDate(idxDip, dataRif, "PERM"); + updateVisual(); + } + /// + /// inserisce nuovo valore da footer + /// + /// + /// + protected void lblIns_click(object sender, EventArgs e) + { + // click su inserimento, chiamo il metodo insert dell'ObjectDataSource + odsGiust.Insert(); + } + /// + /// annulla inserimento nuovo valore da footer + /// + /// + /// + protected void lblCanc_click(object sender, EventArgs e) + { + // annullo inserimento: nascondo footer, bind controlli... + grViewGiust.FooterRow.Visible = false; + } + /// + /// inserisce un giust nuovo x dipendente/data + /// + /// + /// + protected void btNewGiust_Click(object sender, EventArgs e) + { + int idxDip = memLayer.ML.IntSessionObj("idxDip_det"); + // calcola ed inserisce giustificativi + DataProxy.DP.taGiust.giustInsByDate(idxDip, dataRif, "PERM"); + updateVisual(); + } + /// + /// aggiorna i 3 datagrid + /// + private void updateVisual() + { + // aggiorno visualizzazioni + grViewExpl.DataBind(); + mod_elencoTimbr1.doUpdate(); + grViewGiust.DataBind(); + } + /// + /// aggiornamento x update + /// + /// + /// + protected void odsGiust_Updated(object sender, ObjectDataSourceStatusEventArgs e) + { + updateVisual(); + } + /// + /// aggiornamento x delete + /// + /// + /// + protected void odsGiust_Deleted(object sender, ObjectDataSourceStatusEventArgs e) + { + updateVisual(); + } + /// + /// calcola se sia visibile con criterio GREATER THAN ZERO + /// + /// + /// + public bool isGTZ(object valore) + { + bool answ = false; + try + { + if (Convert.ToDouble(valore) > 0) + { + answ = true; + } + } + catch + { } + return answ; + } + + #endregion + + /// + /// cambia stato visibilità week-end... + /// + /// + /// + protected void chkWE_CheckedChanged(object sender, EventArgs e) + { + // imposto ods + checkFixOds(); + } + /// + /// ricalcola giornate periodo visualizzato per i dipendenti selezionati + /// + /// + /// + protected void btnRicalcPeriodo_Click(object sender, EventArgs e) + { + // eseguo la stored di update dato condizione di filtro x periodo e dipendente... + DataProxy.DP.taTimbExpl.stp_ricalcolaTimbExpl_byPeriodoUser(memLayer.ML.IntSessionObj("idxDip_sel"), Convert.ToDateTime(memLayer.ML.objSessionObj("_inizio")), Convert.ToDateTime(memLayer.ML.objSessionObj("_fine"))); + DataProxy.DP.taRA.stp_ricalcolaRegAttivitaExpl_byPeriodoUser(memLayer.ML.IntSessionObj("idxDip_sel"), Convert.ToDateTime(memLayer.ML.objSessionObj("_inizio")), Convert.ToDateTime(memLayer.ML.objSessionObj("_fine"))); + // aggiorno + checkFixOds(); + } + /// + /// restituisce il colore data valore ok commessa + /// + /// + /// + public Color coloreComm(object okLavCom) + { + Color answ = Color.Orange; + try + { + if (toBool(okLavCom)) + { + answ = Color.Black; + } + } + catch + { } + return answ; + } + /// + /// restituisce il colore dato minMpp (se > 0 è verde, altrimenti marrone) + /// + /// + /// + public Color coloreMPP(object minMpp) + { + Color answ = Color.FromName("#995511"); + if (minMpp != null) + { + try + { + if (minMpp.ToString() != "0") + { + answ = Color.FromName("#66AA22"); + } + } + catch + { } + } + return answ; + } + /// + /// determina se si debba mostrare cognome nome (altrimenti IDX anonimo) + /// + public bool showCognomeNome + { + get + { + return memLayer.ML.confReadBool("reviewShowCN"); + } + } + /// + /// formatta la durata in ore secondo web.config (centesimale/ore:min) + /// + /// + /// + public string formatDurata(object oreCent) + { + decimal ore = 0; + try + { + ore = Convert.ToDecimal(oreCent); + } + catch + { } + string answ = ""; + if (memLayer.ML.confReadBool("reviewShowOreMin")) + { + //answ = string.Format("{0}:{1:00}", Math.Floor(ore), Math.Round((ore - Math.Floor(ore)) * 60)); + answ = utils.formOreMin(ore); + } + else + { + answ = ore.ToString("0.00"); + } + return answ; + } + + protected void odsGiust_Inserting(object sender, ObjectDataSourceMethodEventArgs e) + { + + } } - } } \ No newline at end of file diff --git a/GPW_Admin/WebUserControls/mod_spostaOre.ascx.cs b/GPW_Admin/WebUserControls/mod_spostaOre.ascx.cs index 98a00c0..5bde8bd 100644 --- a/GPW_Admin/WebUserControls/mod_spostaOre.ascx.cs +++ b/GPW_Admin/WebUserControls/mod_spostaOre.ascx.cs @@ -132,7 +132,6 @@ namespace GPW_Admin.WebUserControls filtroFase.ods = odsFasi; filtroDip.reselFirst(); - setDetailVisib(false); // filtro x spostamento filtroCliDest.ods = odsClienti; @@ -176,8 +175,6 @@ namespace GPW_Admin.WebUserControls void filtroDip_eh_selValore(object sender, EventArgs e) { // imposto ods - //grViewExpl.SelectedIndex = -1; - setDetailVisib(false); checkFixOds(); } /// @@ -262,15 +259,6 @@ namespace GPW_Admin.WebUserControls { } } /// - /// set visibilità grView dettagli - /// - /// - private void setDetailVisib(bool value) - { - //pnlDettagli.Visible = value; - //grViewGiust.Visible = value; - } - /// /// imposto ODS /// private void checkFixOds() @@ -459,28 +447,31 @@ namespace GPW_Admin.WebUserControls /// protected void ddlFaseDest_DataBound(object sender, EventArgs e) { - // cerco eventuali controlli tipo "ancestor" e li disattivo! - DropDownList ddlFase_int = (DropDownList)sender; - ListItem li = new ListItem(); - while (li != null) + if (sender != null) { - li = ddlFase_int.Items.FindByValue("0"); + // cerco eventuali controlli tipo "ancestor" e li disattivo! + DropDownList ddlFase_int = (DropDownList)sender; + ListItem li = new ListItem(); + while (li != null) + { + li = ddlFase_int.Items.FindByValue("0"); + try + { + li.Attributes.Add("style", "color:gray;"); + li.Attributes.Add("disabled", "true"); + li.Value = "-1"; + li.Text = string.Format("[ {0} ]", li.Text); + } + catch + { } + } try { - li.Attributes.Add("style", "color:gray;"); - li.Attributes.Add("disabled", "true"); - li.Value = "-1"; - li.Text = string.Format("[ {0} ]", li.Text); + ddlFase_int.SelectedIndex = 1; } catch { } } - try - { - ddlFase_int.SelectedIndex = 1; - } - catch - { } } /// /// sistemo eventuali "headers" diff --git a/GPW_Admin/WebUserControls/mod_timbrMensili.ascx.cs b/GPW_Admin/WebUserControls/mod_timbrMensili.ascx.cs index 2b398c2..26d5074 100644 --- a/GPW_Admin/WebUserControls/mod_timbrMensili.ascx.cs +++ b/GPW_Admin/WebUserControls/mod_timbrMensili.ascx.cs @@ -105,42 +105,45 @@ namespace GPW_Admin.WebUserControls /// protected void recuperaFooter(object sender, ObjectDataSourceMethodEventArgs e) { - //recupero la riga footer... - DataColumnCollection colonne = colonneObj(); - string nomeCol; - string tipoColonna = ""; - foreach (DataColumn colonna in colonne) + if (e != null) { - nomeCol = colonna.ColumnName; - // cerco un textbox o quello che sia... - if (grView.FooterRow.FindControl(string.Format("txt{0}", nomeCol)) != null) + //recupero la riga footer... + DataColumnCollection colonne = colonneObj(); + string nomeCol; + string tipoColonna = ""; + foreach (DataColumn colonna in colonne) { - tipoColonna = "textBox"; + nomeCol = colonna.ColumnName; + // cerco un textbox o quello che sia... + if (grView.FooterRow.FindControl(string.Format("txt{0}", nomeCol)) != null) + { + tipoColonna = "textBox"; + } + else if (grView.FooterRow.FindControl(string.Format("dl{0}", nomeCol)) != null) + { + tipoColonna = "dropDownList"; + } + else if (grView.FooterRow.FindControl(string.Format("chk{0}", nomeCol)) != null) + { + tipoColonna = "checkBox"; + } + // in base al tipo salvo negli inputparameters dell'ODS + switch (tipoColonna) + { + case "textBox": + e.InputParameters[nomeCol] = ((TextBox)grView.FooterRow.FindControl(string.Format("txt{0}", nomeCol))).Text; + break; + case "dropDownList": + e.InputParameters[nomeCol] = ((DropDownList)grView.FooterRow.FindControl(string.Format("dl{0}", nomeCol))).SelectedValue; + break; + case "checkBox": + e.InputParameters[nomeCol] = ((CheckBox)grView.FooterRow.FindControl(string.Format("chk{0}", nomeCol))).Checked; + break; + default: + break; + } + tipoColonna = ""; } - else if (grView.FooterRow.FindControl(string.Format("dl{0}", nomeCol)) != null) - { - tipoColonna = "dropDownList"; - } - else if (grView.FooterRow.FindControl(string.Format("chk{0}", nomeCol)) != null) - { - tipoColonna = "checkBox"; - } - // in base al tipo salvo negli inputparameters dell'ODS - switch (tipoColonna) - { - case "textBox": - e.InputParameters[nomeCol] = ((TextBox)grView.FooterRow.FindControl(string.Format("txt{0}", nomeCol))).Text; - break; - case "dropDownList": - e.InputParameters[nomeCol] = ((DropDownList)grView.FooterRow.FindControl(string.Format("dl{0}", nomeCol))).SelectedValue; - break; - case "checkBox": - e.InputParameters[nomeCol] = ((CheckBox)grView.FooterRow.FindControl(string.Format("chk{0}", nomeCol))).Checked; - break; - default: - break; - } - tipoColonna = ""; } } diff --git a/GPW_Admin/packages.config b/GPW_Admin/packages.config index 12f0967..9f606a2 100644 --- a/GPW_Admin/packages.config +++ b/GPW_Admin/packages.config @@ -48,7 +48,7 @@ - + diff --git a/GPW_Barcode/GPW_Barcode.csproj b/GPW_Barcode/GPW_Barcode.csproj index 59fcf19..0472e62 100644 --- a/GPW_Barcode/GPW_Barcode.csproj +++ b/GPW_Barcode/GPW_Barcode.csproj @@ -113,8 +113,8 @@ ..\packages\StackExchange.Redis.2.1.58\lib\net461\StackExchange.Redis.dll - - ..\packages\SteamWare.4.1.2008.736\lib\net462\SteamWare.dll + + ..\packages\SteamWare.4.1.2009.737\lib\net462\SteamWare.dll ..\packages\System.Buffers.4.5.1\lib\net461\System.Buffers.dll @@ -508,10 +508,9 @@ + - - @@ -521,6 +520,8 @@ .editorconfig + + @@ -627,6 +628,8 @@ + + diff --git a/GPW_Barcode/bin/Antlr3.Runtime.dll b/GPW_Barcode/bin/Antlr3.Runtime.dll deleted file mode 100644 index b963933..0000000 Binary files a/GPW_Barcode/bin/Antlr3.Runtime.dll and /dev/null differ diff --git a/GPW_Barcode/bin/AspNet.ScriptManager.bootstrap.dll b/GPW_Barcode/bin/AspNet.ScriptManager.bootstrap.dll deleted file mode 100644 index f93051e..0000000 Binary files a/GPW_Barcode/bin/AspNet.ScriptManager.bootstrap.dll and /dev/null differ diff --git a/GPW_Barcode/bin/AspNet.ScriptManager.jQuery.dll b/GPW_Barcode/bin/AspNet.ScriptManager.jQuery.dll deleted file mode 100644 index 544444f..0000000 Binary files a/GPW_Barcode/bin/AspNet.ScriptManager.jQuery.dll and /dev/null differ diff --git a/GPW_Barcode/bin/Microsoft.AspNet.FriendlyUrls.dll b/GPW_Barcode/bin/Microsoft.AspNet.FriendlyUrls.dll deleted file mode 100644 index deaf9fc..0000000 Binary files a/GPW_Barcode/bin/Microsoft.AspNet.FriendlyUrls.dll and /dev/null differ diff --git a/GPW_Barcode/bin/Microsoft.AspNet.Web.Optimization.WebForms.dll b/GPW_Barcode/bin/Microsoft.AspNet.Web.Optimization.WebForms.dll deleted file mode 100644 index bc3c130..0000000 Binary files a/GPW_Barcode/bin/Microsoft.AspNet.Web.Optimization.WebForms.dll and /dev/null differ diff --git a/GPW_Barcode/bin/Microsoft.ScriptManager.MSAjax.dll b/GPW_Barcode/bin/Microsoft.ScriptManager.MSAjax.dll deleted file mode 100644 index f92d46a..0000000 Binary files a/GPW_Barcode/bin/Microsoft.ScriptManager.MSAjax.dll and /dev/null differ diff --git a/GPW_Barcode/bin/Microsoft.ScriptManager.WebForms.dll b/GPW_Barcode/bin/Microsoft.ScriptManager.WebForms.dll deleted file mode 100644 index 272d686..0000000 Binary files a/GPW_Barcode/bin/Microsoft.ScriptManager.WebForms.dll and /dev/null differ diff --git a/GPW_Barcode/bin/Microsoft.Web.Infrastructure.dll b/GPW_Barcode/bin/Microsoft.Web.Infrastructure.dll deleted file mode 100644 index 85f1138..0000000 Binary files a/GPW_Barcode/bin/Microsoft.Web.Infrastructure.dll and /dev/null differ diff --git a/GPW_Barcode/bin/Newtonsoft.Json.dll b/GPW_Barcode/bin/Newtonsoft.Json.dll deleted file mode 100644 index e4a6339..0000000 Binary files a/GPW_Barcode/bin/Newtonsoft.Json.dll and /dev/null differ diff --git a/GPW_Barcode/bin/System.Web.Optimization.dll b/GPW_Barcode/bin/System.Web.Optimization.dll deleted file mode 100644 index 393d416..0000000 Binary files a/GPW_Barcode/bin/System.Web.Optimization.dll and /dev/null differ diff --git a/GPW_Barcode/bin/WebGrease.dll b/GPW_Barcode/bin/WebGrease.dll deleted file mode 100644 index a6a80d3..0000000 Binary files a/GPW_Barcode/bin/WebGrease.dll and /dev/null differ diff --git a/GPW_Barcode/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache b/GPW_Barcode/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache index e07a605..dd74d29 100644 Binary files a/GPW_Barcode/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache and b/GPW_Barcode/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache differ diff --git a/GPW_Barcode/packages.config b/GPW_Barcode/packages.config index a7da9d4..ae86c4f 100644 --- a/GPW_Barcode/packages.config +++ b/GPW_Barcode/packages.config @@ -36,7 +36,7 @@ - + diff --git a/GPW_Commesse/GPW_Commesse.csproj b/GPW_Commesse/GPW_Commesse.csproj index 88192ca..7ec11ac 100644 --- a/GPW_Commesse/GPW_Commesse.csproj +++ b/GPW_Commesse/GPW_Commesse.csproj @@ -120,8 +120,8 @@ ..\packages\StackExchange.Redis.2.1.58\lib\net461\StackExchange.Redis.dll - - ..\packages\SteamWare.4.1.2008.736\lib\net462\SteamWare.dll + + ..\packages\SteamWare.4.1.2009.737\lib\net462\SteamWare.dll ..\packages\System.Buffers.4.5.1\lib\net461\System.Buffers.dll @@ -256,11 +256,11 @@ - - .editorconfig + + BuildBlocks.less @@ -371,6 +371,7 @@ + @@ -489,6 +490,8 @@ + + @@ -739,14 +742,12 @@ mod_filtro.ascx - ASPXCodeBehind mod_filtro.ascx mod_login.ascx - ASPXCodeBehind mod_login.ascx @@ -767,14 +768,12 @@ mod_menuSx.ascx - ASPXCodeBehind mod_menuSx.ascx mod_menuTop.ascx - ASPXCodeBehind mod_menuTop.ascx @@ -795,7 +794,6 @@ mod_pageTitleAndSearch.ascx - ASPXCodeBehind mod_pageTitleAndSearch.ascx @@ -816,7 +814,6 @@ mod_ricercaGenerica.ascx - ASPXCodeBehind mod_ricercaGenerica.ascx diff --git a/GPW_Commesse/packages.config b/GPW_Commesse/packages.config index ecc24a9..efe8aae 100644 --- a/GPW_Commesse/packages.config +++ b/GPW_Commesse/packages.config @@ -46,7 +46,7 @@ - + diff --git a/GPW_Data/packages.config b/GPW_Data/packages.config index 2e32726..5d7762f 100644 --- a/GPW_Data/packages.config +++ b/GPW_Data/packages.config @@ -19,7 +19,7 @@ - + diff --git a/GPW_Smart/GPW_Smart.csproj b/GPW_Smart/GPW_Smart.csproj index a338d57..40bbc7c 100644 --- a/GPW_Smart/GPW_Smart.csproj +++ b/GPW_Smart/GPW_Smart.csproj @@ -119,8 +119,8 @@ ..\packages\StackExchange.Redis.2.1.58\lib\net461\StackExchange.Redis.dll - - ..\packages\SteamWare.4.1.2008.736\lib\net462\SteamWare.dll + + ..\packages\SteamWare.4.1.2009.737\lib\net462\SteamWare.dll ..\packages\System.Buffers.4.5.1\lib\net461\System.Buffers.dll @@ -526,6 +526,7 @@ + @@ -547,6 +548,8 @@ .editorconfig + + @@ -556,10 +559,10 @@ + + - - compilerconfig.json diff --git a/GPW_Smart/packages.config b/GPW_Smart/packages.config index 3b331de..148124c 100644 --- a/GPW_Smart/packages.config +++ b/GPW_Smart/packages.config @@ -50,7 +50,7 @@ - + diff --git a/GPW_data/GPW_data.csproj b/GPW_data/GPW_data.csproj index 49ff9d7..a073d9e 100644 --- a/GPW_data/GPW_data.csproj +++ b/GPW_data/GPW_data.csproj @@ -90,8 +90,8 @@ ..\packages\StackExchange.Redis.2.1.58\lib\net461\StackExchange.Redis.dll - - ..\packages\SteamWare.4.1.2008.736\lib\net462\SteamWare.dll + + ..\packages\SteamWare.4.1.2009.737\lib\net462\SteamWare.dll @@ -255,7 +255,10 @@ + + +