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

Merge branch 'develop' into master

Browse Source
This commit is contained in:
Samuele E. Locatelli
2020-09-02 21:52:00 +02:00
parent 9f71f88c3c 66a48f70ae
commit e34cf853ca
11 changed files with 111 additions and 148 deletions
Download Patch File Download Diff File Expand all files Collapse all files
GPW_Smart/WebUserControls/cmq_params.ascx.cs → GPW_Smart/BaseUserControl.cs
+30 -45
View File
@@ -1,26 +1,14 @@
using SteamWare;
using GPW_data;
using GPW_Smart;
using SteamWare;
using System;
using System.Web.UI;
using System.Web.UI.WebControls;
namespace GPW_Smart.WebUserControls
namespace GPW_Smart
{
public partial class cmq_params : System.Web.UI.UserControl
public class BaseUserControl : System.Web.UI.UserControl
{
protected void Page_Load(object sender, EventArgs e)
{
if (!Page.IsPostBack)
{
try
{
ddlNumCol.SelectedValue = numColEU.ToString();
ddlNumRow.SelectedValue = numRowTimb.ToString();
chkAbilitaAll.Checked = abilitaAll;
ddlTextSize.SelectedValue = textSize.ToString();
}
catch
{ }
}
}
public string hashEmail
{
get
@@ -96,39 +84,36 @@ namespace GPW_Smart.WebUserControls
{
get
{
return memLayer.ML.StringSessionObj("textSize");
string answ=memLayer.ML.StringSessionObj("textSize");
if (string.IsNullOrEmpty(answ))
answ = "1.2em";
return answ;
}
set
{
memLayer.ML.setSessionVal("textSize", value);
}
}
protected void ddlNumRow_SelectedIndexChanged(object sender, EventArgs e)
/// <summary>
/// idx dipendente loggato
/// </summary>
protected int IdxDipendente
{
lbtSalva.Visible = true;
}
protected void ddlNumCol_SelectedIndexChanged(object sender, EventArgs e)
{
lbtSalva.Visible = true;
}
protected void chkAbilitaAll_CheckedChanged(object sender, EventArgs e)
{
lbtSalva.Visible = true;
}
protected void lbtSalva_Click(object sender, EventArgs e)
{
numRowTimb = Convert.ToInt32(ddlNumRow.SelectedValue);
numColEU = Convert.ToInt32(ddlNumCol.SelectedValue);
abilitaAll = chkAbilitaAll.Checked;
textSize = ddlTextSize.SelectedValue;
Response.Redirect("Timbrature");
}
protected void ddlTextSize_SelectedIndexChanged(object sender, EventArgs e)
{
lbtSalva.Visible = true;
get
{
int idx = 0;
try
{
idx = memLayer.ML.IntSessionObj("IdxDipendente");
}
catch
{ }
return idx;
}
set
{
memLayer.ML.setSessionVal("IdxDipendente", value.ToString());
}
}
}
}
GPW_Smart/GPW_Smart.csproj
+8 -5
View File
@@ -627,7 +627,7 @@
<Content Include="WebUserControls\cmp_info.ascx" />
<Content Include="WebUserControls\cmp_menuTop.ascx" />
<Content Include="WebUserControls\cmp_rilTemp.ascx" />
<Content Include="WebUserControls\cmq_params.ascx" />
<Content Include="WebUserControls\cmp_params.ascx" />
<Content Include="WebUserControls\mod_attivitaIns.ascx" />
<Content Include="WebUserControls\mod_commAttivita.ascx" />
<Content Include="WebUserControls\mod_dateTime.ascx" />
@@ -728,6 +728,9 @@
<Compile Include="attivitaIns.aspx.designer.cs">
<DependentUpon>attivitaIns.aspx</DependentUpon>
</Compile>
<Compile Include="BaseUserControl.cs">
<SubType>ASPXCodeBehind</SubType>
</Compile>
<Compile Include="Default.aspx.cs">
<DependentUpon>Default.aspx</DependentUpon>
<SubType>ASPXCodeBehind</SubType>
@@ -844,12 +847,12 @@
<Compile Include="WebUserControls\cmp_rilTemp.ascx.designer.cs">
<DependentUpon>cmp_rilTemp.ascx</DependentUpon>
</Compile>
<Compile Include="WebUserControls\cmq_params.ascx.cs">
<DependentUpon>cmq_params.ascx</DependentUpon>
<Compile Include="WebUserControls\cmp_params.ascx.cs">
<DependentUpon>cmp_params.ascx</DependentUpon>
<SubType>ASPXCodeBehind</SubType>
</Compile>
<Compile Include="WebUserControls\cmq_params.ascx.designer.cs">
<DependentUpon>cmq_params.ascx</DependentUpon>
<Compile Include="WebUserControls\cmp_params.ascx.designer.cs">
<DependentUpon>cmp_params.ascx</DependentUpon>
</Compile>
<Compile Include="WebUserControls\mod_attivitaIns.ascx.cs">
<DependentUpon>mod_attivitaIns.ascx</DependentUpon>
GPW_Smart/Parametri.aspx
+2 -2
View File
@@ -1,7 +1,7 @@
<%@ Page Title="" Language="C#" MasterPageFile="~/Site.Master" AutoEventWireup="true" CodeBehind="Parametri.aspx.cs" Inherits="GPW_Smart.Parametri" %>
<%@ Register Src="~/WebUserControls/cmq_params.ascx" TagPrefix="uc1" TagName="cmq_params" %>
<%@ Register Src="~/WebUserControls/cmp_params.ascx" TagPrefix="uc1" TagName="cmp_params" %>
<asp:Content ID="Content1" ContentPlaceHolderID="MainContent" runat="server">
<uc1:cmq_params runat="server" id="cmq_params" />
<uc1:cmp_params runat="server" id="cmp_params" />
</asp:Content>
GPW_Smart/Parametri.aspx.designer.cs
Generated
+2 -2
View File
@@ -13,12 +13,12 @@ namespace GPW_Smart {
public partial class Parametri {
/// <summary>
/// Controllo cmq_params.
/// Controllo cmp_params.
/// </summary>
/// <remarks>
/// Campo generato automaticamente.
/// Per la modifica, spostare la dichiarazione di campo dal file di progettazione al file code-behind.
/// </remarks>
protected global::GPW_Smart.WebUserControls.cmq_params cmq_params;
protected global::GPW_Smart.WebUserControls.cmp_params cmp_params;
}
}
GPW_Smart/Site.Master
+1 -1
View File
@@ -49,7 +49,7 @@
</asp:ScriptManager>
<uc1:cmp_menuTop runat="server" ID="cmp_menuTop" />
<div class="container-flow body-content">
<div class="container-flow body-content mb-5">
<asp:UpdatePanel ID="updPanelPagina" runat="server" UpdateMode="Conditional" RenderMode="Inline">
<ContentTemplate>
<asp:ContentPlaceHolder ID="MainContent" runat="server">
GPW_Smart/Timbrature.aspx
-1
View File
@@ -2,7 +2,6 @@
<%@ Register Src="~/WebUserControls/mod_timbrature.ascx" TagPrefix="uc1" TagName="mod_timbrature" %>
<asp:Content ID="Content1" ContentPlaceHolderID="MainContent" runat="server">
<asp:UpdatePanel runat="server" ID="pnlTimbrature">
<ContentTemplate>
GPW_Smart/WebUserControls/cmq_params.ascx → GPW_Smart/WebUserControls/cmp_params.ascx
+1 -4
View File
@@ -1,7 +1,4 @@
<%@ Control Language="C#" AutoEventWireup="true" CodeBehind="cmq_params.ascx.cs" Inherits="GPW_Smart.WebUserControls.cmq_params" %>
<%@ Control Language="C#" AutoEventWireup="true" CodeBehind="cmp_params.ascx.cs" Inherits="GPW_Smart.WebUserControls.cmp_params" %>
<div class="row bg-abstract py-3">
<div class="col-1 text-light">
GPW_Smart/WebUserControls/cmp_params.ascx.cs
+51
View File
@@ -0,0 +1,51 @@
using SteamWare;
using System;
namespace GPW_Smart.WebUserControls
{
public partial class cmp_params : BaseUserControl
{
protected void Page_Load(object sender, EventArgs e)
{
if (!Page.IsPostBack)
{
try
{
ddlNumCol.SelectedValue = numColEU.ToString();
ddlNumRow.SelectedValue = numRowTimb.ToString();
chkAbilitaAll.Checked = abilitaAll;
ddlTextSize.SelectedValue = textSize.ToString();
}
catch
{ }
}
}
protected void ddlNumRow_SelectedIndexChanged(object sender, EventArgs e)
{
lbtSalva.Visible = true;
}
protected void ddlNumCol_SelectedIndexChanged(object sender, EventArgs e)
{
lbtSalva.Visible = true;
}
protected void chkAbilitaAll_CheckedChanged(object sender, EventArgs e)
{
lbtSalva.Visible = true;
}
protected void lbtSalva_Click(object sender, EventArgs e)
{
numRowTimb = Convert.ToInt32(ddlNumRow.SelectedValue);
numColEU = Convert.ToInt32(ddlNumCol.SelectedValue);
abilitaAll = chkAbilitaAll.Checked;
textSize = ddlTextSize.SelectedValue;
Response.Redirect("Timbrature");
}
protected void ddlTextSize_SelectedIndexChanged(object sender, EventArgs e)
{
lbtSalva.Visible = true;
}
}
}
GPW_Smart/WebUserControls/cmq_params.ascx.designer.cs → GPW_Smart/WebUserControls/cmp_params.ascx.designer.cs
Generated
+1 -1
View File
@@ -11,7 +11,7 @@ namespace GPW_Smart.WebUserControls
{
public partial class cmq_params
public partial class cmp_params
{
/// <summary>
GPW_Smart/WebUserControls/mod_timbrature.ascx.cs
+14 -86
View File
@@ -1,4 +1,5 @@
using GPW_data;
using GPW_Smart;
using SteamWare;
using System;
using System.Web.UI;
@@ -6,7 +7,7 @@ using System.Web.UI.WebControls;
namespace GPW.WebUserControls
{
public partial class mod_timbrature : System.Web.UI.UserControl
public partial class mod_timbrature : BaseUserControl
{
protected bool forceButtons
{
@@ -19,26 +20,6 @@ namespace GPW.WebUserControls
abilitaAll = !(value);
}
}
public bool abilitaAll
{
get
{
bool answ = false;
try
{
string rawData = memLayer.ML.getRSV("abilitaAll");
bool.TryParse(rawData, out answ);
}
catch
{ }
return answ;
}
set
{
int ttlSec = value ? memLayer.ML.CRI("ttlAbilitaAll") : 0;
memLayer.ML.setRSV("abilitaAll", value.ToString(), ttlSec);
}
}
protected void Page_Load(object sender, EventArgs e)
{
if (!Page.IsPostBack)
@@ -58,53 +39,6 @@ namespace GPW.WebUserControls
divTable.Style.Add("font-size", textSize);
}
public int numColEU
{
get
{
int answ = 2;
try
{
answ = memLayer.ML.IntSessionObj("numColEU");
}
catch
{ }
if (answ <= 0) answ = 2;
return answ;
}
set
{
memLayer.ML.setSessionVal("numColEU", value);
}
}
public int numRowTimb
{
get
{
return memLayer.ML.IntSessionObj("numRowTimb");
}
set
{
memLayer.ML.setSessionVal("numRowTimb", value);
}
}
public string textSize
{
get
{
string answ = memLayer.ML.StringSessionObj("textSize");
if (string.IsNullOrEmpty(answ))
answ = "1em";
return answ;
}
set
{
memLayer.ML.setSessionVal("textSize", value);
}
}
/// <summary>
/// fix buttons button
/// </summary>
@@ -206,6 +140,16 @@ namespace GPW.WebUserControls
timbratrice.registraTimbratura(IdxDipendente, DateTime.Now, isEntrata, IPv4, "Web", approvata);
lblWarning.Visible = false;
abilitaAll = false;
// se manca temperatura x il giorno --> rimando a pagina!
DateTime dataRif = DateTime.Today;
var tabRT = DataProxy.DP.taRT.getByKey(IdxDipendente, dataRif);
if (tabRT.Rows.Count == 0)
{
// salvo in sessione...
memLayer.ML.setSessionVal("dataRif", dataRif);
// reinvio
Response.Redirect($"TempRil?dataRif={dataRif:yyyy-MM-dd}");
}
//aggiorno timbrature visualizzate
setButtons();
updateTimbrature();
@@ -218,27 +162,11 @@ namespace GPW.WebUserControls
}
return IdxDipendente;
}
/// <summary>
/// idx dipendente loggato
/// </summary>
protected int IdxDipendente
{
get
{
int idx = 0;
try
{
idx = memLayer.ML.IntSessionObj("IdxDipendente");
}
catch
{ }
return idx;
}
}
/// <summary>
/// inverte valore booleano
/// </summary>
/// <param name="isEnt"></param>
/// <param name="valore"></param>
/// <returns></returns>
public bool invBool(object valore)
{
Jenkinsfile
Vendored
+1 -1
View File
@@ -10,7 +10,7 @@ pipeline {
steps {
/* calcolo numero versione... diverso x branch MASTER/DEVELOP */
script {
withEnv(['NEXT_BUILD_NUMBER=4116']) {
withEnv(['NEXT_BUILD_NUMBER=4117']) {
// env.versionNumber = VersionNumber(versionNumberString : '2.6.${BUILD_DATE_FORMATTED, "yyMM"}.${BUILDS_ALL_TIME}', projectStartDate : '2006-01-01', skipFailedBuilds: true)
env.versionNumber = VersionNumber(versionNumberString : '2.6.${BUILD_DATE_FORMATTED, "yyMM"}.${BUILDS_ALL_TIME}', projectStartDate : '2006-01-01', skipFailedBuilds: true, overrideBuildsAllTime: '${NEXT_BUILD_NUMBER}')
env.APP_NAME = 'GPW'