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

Merge branch 'develop'

Browse Source
This commit is contained in:
Samuele E. Locatelli
2020-04-03 09:53:27 +02:00
parent 09e4ba0c0e 8648ffc132
commit c2b8de551e
19 changed files with 904 additions and 753 deletions
Download Patch File Download Diff File Expand all files Collapse all files
GPW_Admin/Content/BuildBlocks.css
+1 -1
View File
@@ -1038,7 +1038,7 @@
/* Tag Cloud */
#tagCloud {
border: solid 1px #ccc;
padding: 0.4rem;
/*padding: 0.4rem;*/
margin-bottom: 1rem;
text-align: justify;
line-height: 1.2rem;
GPW_Admin/WebUserControls/mod_commAttivitaDesk.ascx.cs
+606 -617
View File
File diff suppressed because it is too large Load Diff
GPW_Commesse/Content/BuildBlocks.css
+2 -4
View File
@@ -626,8 +626,6 @@
background-color: #FFFFFF;
font-size: 9pt;
border: solid 1px gray;
margin: 0;
padding: 0.3em;
vertical-align: text-top;
text-align: left;
}
@@ -808,8 +806,8 @@
/* end gestione barcode full page */
/* Tag Cloud */
#tagCloud {
border: solid 1px #ccc;
padding: 0.2rem;
/*border: solid 1px #ccc;*/
/*padding: 0.2rem;*/
margin-bottom: 0.4rem;
text-align: justify;
line-height: 1.1rem;
GPW_Commesse/Content/BuildBlocks.less
+2 -4
View File
@@ -746,8 +746,6 @@
background-color: #FFFFFF;
font-size: 9pt;
border: solid 1px gray;
margin: 0;
padding: 0.3em;
vertical-align: text-top;
text-align: left;
}
@@ -969,8 +967,8 @@
/* Tag Cloud */
#tagCloud {
border: solid 1px #ccc;
padding: 0.2rem;
/*border: solid 1px #ccc;*/
/*padding: 0.2rem;*/
margin-bottom: 0.4rem;
text-align: justify;
line-height: 1.1rem;
GPW_Commesse/Content/BuildBlocks.min.css
Vendored
+1 -1
View File
File diff suppressed because one or more lines are too long
GPW_Commesse/GPW_Commesse.csproj
+8
View File
@@ -441,6 +441,7 @@
<Content Include="Scripts\umd\popper.js" />
<Content Include="Scripts\umd\popper.min.js" />
<Content Include="WebMasterPages\AjaxSimpleFull.Master" />
<Content Include="WebUserControls\cmp_toggle.ascx" />
<Content Include="WebUserControls\mod_autocomplete.ascx" />
<Content Include="WebUserControls\mod_commAttivitaDesk.ascx" />
<Content Include="WebUserControls\mod_commUtLog.ascx" />
@@ -606,6 +607,13 @@
<Compile Include="WebMasterPages\AjaxSimpleFull.Master.designer.cs">
<DependentUpon>AjaxSimpleFull.Master</DependentUpon>
</Compile>
<Compile Include="WebUserControls\cmp_toggle.ascx.cs">
<DependentUpon>cmp_toggle.ascx</DependentUpon>
<SubType>ASPXCodeBehind</SubType>
</Compile>
<Compile Include="WebUserControls\cmp_toggle.ascx.designer.cs">
<DependentUpon>cmp_toggle.ascx</DependentUpon>
</Compile>
<Compile Include="WebUserControls\mod_autocomplete.ascx.cs">
<DependentUpon>mod_autocomplete.ascx</DependentUpon>
<SubType>ASPXCodeBehind</SubType>
GPW_Commesse/WebUserControls/cmp_toggle.ascx
+5
View File
@@ -0,0 +1,5 @@
<%@ Control Language="C#" AutoEventWireup="true" CodeBehind="cmp_toggle.ascx.cs" Inherits="GPW_Commesse.WebUserControls.cmp_toggle" %>
<asp:HiddenField runat="server" ID="hfValue" />
<asp:LinkButton runat="server" ID="lbtToggleOn" OnClick="lbtToggleOn_Click" ToolTip="Nascondi TagCloud"><i class="fa fa-2x fa-toggle-on" aria-hidden="true"></i></asp:LinkButton>
<asp:LinkButton runat="server" ID="lbtToggleOff" OnClick="lbtToggleOff_Click" ToolTip="Mostra TagCloud"><i class="fa fa-2x fa-toggle-off" aria-hidden="true"></i></asp:LinkButton>
GPW_Commesse/WebUserControls/cmp_toggle.ascx.cs
+130
View File
@@ -0,0 +1,130 @@
using System;
using System.Collections.Generic;
using System.Linq;
using System.Web;
using System.Web.UI;
using System.Web.UI.WebControls;
namespace GPW_Commesse.WebUserControls
{
public partial class cmp_toggle : System.Web.UI.UserControl
{
/// <summary>
/// Evento toggle
/// </summary>
public event EventHandler ehToggle;
/// <summary>
/// Tooltip x toggle ON
/// </summary>
public string tooltipOn
{
get
{
return lbtToggleOn.ToolTip;
}
set
{
lbtToggleOn.ToolTip = value;
}
}
/// <summary>
/// Tooltip x toggle OFF
/// </summary>
public string tooltipOff
{
get
{
return lbtToggleOff.ToolTip;
}
set
{
lbtToggleOff.ToolTip = value;
}
}
/// <summary>
/// Classe x toggle ON
/// </summary>
public string classOn
{
get
{
return lbtToggleOn.CssClass;
}
set
{
lbtToggleOn.CssClass = value;
}
}
/// <summary>
/// Classe x toggle OFF
/// </summary>
public string classOff
{
get
{
return lbtToggleOff.CssClass;
}
set
{
lbtToggleOff.CssClass = value;
}
}
/// <summary>
/// caricamento apgina
/// </summary>
/// <param name="sender"></param>
/// <param name="e"></param>
protected void Page_Load(object sender, EventArgs e)
{
if (!Page.IsPostBack)
{
fixDisplay();
}
}
/// <summary>
/// valore toggle
/// </summary>
public bool toggleValue
{
get
{
bool answ = false;
bool.TryParse(hfValue.Value, out answ);
return answ;
}
set
{
hfValue.Value = value.ToString();
fixDisplay();
if (ehToggle != null)
{
ehToggle(this, new EventArgs());
}
}
}
/// <summary>
/// sistema visualizzazione
/// </summary>
private void fixDisplay()
{
// sistemo buttons & display...
bool doShow = toggleValue;
lbtToggleOn.Visible = doShow;
lbtToggleOff.Visible = !doShow;
}
protected void lbtToggleOn_Click(object sender, EventArgs e)
{
toggleValue = !toggleValue;
}
protected void lbtToggleOff_Click(object sender, EventArgs e)
{
toggleValue = !toggleValue;
}
}
}
GPW_Commesse/WebUserControls/cmp_toggle.ascx.designer.cs
Generated
+44
View File
@@ -0,0 +1,44 @@
//------------------------------------------------------------------------------
// <generato automaticamente>
// Codice generato da uno strumento.
//
// Le modifiche a questo file possono causare un comportamento non corretto e verranno perse se
// il codice viene rigenerato.
// </generato automaticamente>
//------------------------------------------------------------------------------
namespace GPW_Commesse.WebUserControls
{
public partial class cmp_toggle
{
/// <summary>
/// Controllo hfValue.
/// </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 hfValue;
/// <summary>
/// Controllo lbtToggleOn.
/// </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.LinkButton lbtToggleOn;
/// <summary>
/// Controllo lbtToggleOff.
/// </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.LinkButton lbtToggleOff;
}
}
GPW_Commesse/WebUserControls/mod_TagCloudProgetti.ascx
+37 -31
View File
@@ -1,6 +1,9 @@
<%@ Control Language="C#" AutoEventWireup="true" CodeBehind="mod_TagCloudProgetti.ascx.cs" Inherits="GPW_Commesse.WebUserControls.mod_TagCloudProgetti" %>
<%@ Register Src="~/WebUserControls/cmp_toggle.ascx" TagPrefix="uc1" TagName="cmp_toggle" %>
<div style="text-align: center; margin: auto; font-size: 9pt;">
<div class="row">
<div class="col-12 text-center">
<asp:RadioButtonList ID="rblOre" runat="server" CssClass="radioBtn" RepeatLayout="Flow" RepeatDirection="Horizontal"
RepeatColumns="8" AutoPostBack="true" OnSelectedIndexChanged="rblOre_SelectedIndexChanged">
<asp:ListItem Text="ult." Value="0"></asp:ListItem>
@@ -12,8 +15,11 @@
<asp:ListItem Text="4 h" Value="240"></asp:ListItem>
<asp:ListItem Text="8 h" Value="480"></asp:ListItem>
</asp:RadioButtonList>
<uc1:cmp_toggle runat="server" ID="cmp_toggle" tooltipOn="Nascondi TagCloud" tooltipOff="Mostra TagCloud" classOn="text-primary" classOff="text-primary" />
</div>
<div id="tagCloud">
</div>
<div class="row" runat="server" id="tagBlock">
<div class="col-12" id="tagCloud">
<asp:Repeater ID="repTagCloud" runat="server" DataSourceID="ods">
<ItemTemplate>
<%--Modo standard: tag cloud--%>
@@ -43,33 +49,33 @@
</ItemTemplate>
</asp:Repeater>
</div>
<div>
<div class="divSx" style="font-size: 0.7em;">
<asp:DropDownList runat="server" ID="ddlModoTag" AutoPostBack="true" OnSelectedIndexChanged="ddlModoTag_SelectedIndexChanged">
<asp:ListItem Selected="True">elenco</asp:ListItem>
<asp:ListItem>elencoCPF</asp:ListItem>
<asp:ListItem>piramide</asp:ListItem>
<asp:ListItem>standard</asp:ListItem>
</asp:DropDownList>
</div>
<div class="divDx" style="font-size: 0.7em;">
<asp:DropDownList runat="server" ID="ddlPageSize" AutoPostBack="true" OnSelectedIndexChanged="ddlPageSize_SelectedIndexChanged">
<asp:ListItem>5</asp:ListItem>
<asp:ListItem Selected="True">10</asp:ListItem>
<asp:ListItem>15</asp:ListItem>
<asp:ListItem>20</asp:ListItem>
<asp:ListItem>25</asp:ListItem>
<asp:ListItem>30</asp:ListItem>
</asp:DropDownList>
</div>
</div>
<div class="row">
<div class="col-6 text-left small">
<asp:DropDownList runat="server" ID="ddlModoTag" AutoPostBack="true" OnSelectedIndexChanged="ddlModoTag_SelectedIndexChanged">
<asp:ListItem Selected="True">elenco</asp:ListItem>
<asp:ListItem>elencoCPF</asp:ListItem>
<asp:ListItem>piramide</asp:ListItem>
<asp:ListItem>standard</asp:ListItem>
</asp:DropDownList>
</div>
<div class="clearDiv"></div>
<asp:ObjectDataSource ID="ods" runat="server" OldValuesParameterFormatString="original_{0}" SelectMethod="GetData" TypeName="GPW_data.DS_UtilityTableAdapters.freqProgettiTableAdapter">
<SelectParameters>
<asp:SessionParameter Name="idxDipendente" SessionField="idxDipCurr" Type="Int32" />
<asp:SessionParameter DefaultValue="" Name="inizio" SessionField="_inizio" Type="DateTime" />
<asp:SessionParameter Name="fine" SessionField="_fine" Type="DateTime" />
<%--<asp:Parameter DefaultValue="20" Name="maxRes" Type="Int32" />--%>
<asp:ControlParameter ControlID="ddlPageSize" PropertyName="SelectedValue" Name="maxRes" Type="Int32" />
</SelectParameters>
</asp:ObjectDataSource>
<div class="col-6 text-right small">
<asp:DropDownList runat="server" ID="ddlPageSize" AutoPostBack="true" OnSelectedIndexChanged="ddlPageSize_SelectedIndexChanged">
<asp:ListItem>5</asp:ListItem>
<asp:ListItem Selected="True">10</asp:ListItem>
<asp:ListItem>15</asp:ListItem>
<asp:ListItem>20</asp:ListItem>
<asp:ListItem>25</asp:ListItem>
<asp:ListItem>30</asp:ListItem>
</asp:DropDownList>
</div>
</div>
<asp:ObjectDataSource ID="ods" runat="server" OldValuesParameterFormatString="original_{0}" SelectMethod="GetData" TypeName="GPW_data.DS_UtilityTableAdapters.freqProgettiTableAdapter">
<SelectParameters>
<asp:SessionParameter Name="idxDipendente" SessionField="idxDipCurr" Type="Int32" />
<asp:SessionParameter DefaultValue="" Name="inizio" SessionField="_inizio" Type="DateTime" />
<asp:SessionParameter Name="fine" SessionField="_fine" Type="DateTime" />
<%--<asp:Parameter DefaultValue="20" Name="maxRes" Type="Int32" />--%>
<asp:ControlParameter ControlID="ddlPageSize" PropertyName="SelectedValue" Name="maxRes" Type="Int32" />
</SelectParameters>
</asp:ObjectDataSource>
GPW_Commesse/WebUserControls/mod_TagCloudProgetti.ascx.cs
+45
View File
@@ -34,6 +34,29 @@ namespace GPW_Commesse.WebUserControls
}
}
/// <summary>
/// valore in sessione dello show add new
/// </summary>
public bool showAdd
{
get
{
bool answ = memLayer.ML.BoolSessionObj("showAddNewRec");
return answ;
}
set
{
memLayer.ML.setSessionVal("showAddNewRec", value);
setShowAdd();
}
}
/// <summary>
/// sistema visualizzazione
/// </summary>
protected void setShowAdd()
{
tagBlock.Visible = showAdd;
}
/// <summary>
/// load pagina
/// </summary>
/// <param name="sender"></param>
@@ -47,7 +70,19 @@ namespace GPW_Commesse.WebUserControls
{
modo = TagCloudMode.standard;
}
cmp_toggle.toggleValue = showAdd;
setShowAdd();
}
cmp_toggle.ehToggle += Cmp_toggle_ehToggle;
}
/// <summary>
/// Gestione evento toggle
/// </summary>
/// <param name="sender"></param>
/// <param name="e"></param>
private void Cmp_toggle_ehToggle(object sender, EventArgs e)
{
showAdd = cmp_toggle.toggleValue;
}
/// <summary>
@@ -259,6 +294,16 @@ namespace GPW_Commesse.WebUserControls
eh_refresh(this, new EventArgs());
}
}
protected void lbtToggleOn_Click(object sender, EventArgs e)
{
showAdd = !showAdd;
}
protected void lbtToggleOff_Click(object sender, EventArgs e)
{
showAdd = !showAdd;
}
}
public enum TagCloudMode
GPW_Commesse/WebUserControls/mod_TagCloudProgetti.ascx.designer.cs
Generated
+18
View File
@@ -23,6 +23,24 @@ namespace GPW_Commesse.WebUserControls
/// </remarks>
protected global::System.Web.UI.WebControls.RadioButtonList rblOre;
/// <summary>
/// Controllo cmp_toggle.
/// </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_Commesse.WebUserControls.cmp_toggle cmp_toggle;
/// <summary>
/// Controllo tagBlock.
/// </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.HtmlControls.HtmlGenericControl tagBlock;
/// <summary>
/// Controllo repTagCloud.
/// </summary>
GPW_Commesse/WebUserControls/mod_commAttivitaDesk.ascx
+3 -3
View File
@@ -3,10 +3,10 @@
<%@ Register Src="mod_dateTime.ascx" TagName="mod_dateTime" TagPrefix="uc1" %>
<%@ Register Src="mod_autocomplete.ascx" TagPrefix="uc2" TagName="mod_autocomplete" %>
<asp:Panel runat="server" ID="pnlHeader" class="dataBlockHeader bg-success text-light" Style="height: 2.5em; text-align: center; margin: auto; font-size: 12pt;">
<asp:Label runat="server" ID="lblTitle" Font-Size="1.5em" />
<asp:Panel runat="server" ID="pnlHeader" class="bg-success text-light text-center py-1 px-2" Style="font-size: 1.8em;">
<asp:Label runat="server" ID="lblTitle" />
<div class="divDx" style="display: block;">
<asp:LinkButton runat="server" ID="lnkNew" CausesValidation="False" ToolTip='<%# traduci("AddNew") %>' OnClick="lnkNew_Click" CssClass="btn btn-sm btn-warning"><i class="fa fa-plus" aria-hidden="true"></i></asp:LinkButton>
<asp:LinkButton runat="server" ID="lnkNew" CausesValidation="False" ToolTip='<%# traduci("AddNew") %>' OnClick="lnkNew_Click" CssClass="text-warning"><i class="fa fa-plus-square" aria-hidden="true"></i></asp:LinkButton>
</div>
</asp:Panel>
<div class="dataBlockReset">
GPW_Commesse/WebUserControls/mod_commUtLog.ascx
+1 -1
View File
@@ -121,7 +121,7 @@
<asp:Button runat="server" ID="btnCloseRA" Text="Chiudi" Font-Bold="true" OnClick="btnClose_Click" CssClass="btnRosso ui-corner-all shadowBox fontMedio btnChiudi" />
</div>
<div class="blockSpac table-secondary">
<div class="dataBlock">
<div class="dataBlock p-1">
<uc6:mod_TagCloudProgetti ID="mod_TagCloudProgetti1" runat="server" />
<uc3:mod_commAttivitaDesk ID="mod_commAttivitaDesk1" runat="server" Visible="false" enableFull="true" />
</div>
GPW_Data/utils.cs
-36
View File
@@ -14,43 +14,7 @@ namespace GPW_data
/// </summary>
protected utils()
{
#if false
setupElencoClienti();
#endif
}
#if false
/// <summary>
/// setup delle tabella elencoClienti
/// </summary>
protected void setupElencoClienti()
{
string redKey = memLayer.ML.redHash("elencoClienti");
try
{
string rawData = memLayer.ML.getRSV(redKey);
if (string.IsNullOrEmpty(rawData))
{
}
else
{
elencoClienti = ricaricaElencoClienti();
}
if (memLayer.ML.isInCacheObject("elencoClienti"))
{
elencoClienti = (Dictionary<string, string>)memLayer.ML.objCacheObj("elencoClienti");
}
else
{
elencoClienti = ricaricaElencoClienti();
memLayer.ML.setCacheVal("elencoClienti", elencoClienti, false);
}
}
catch
{ }
}
#endif
/// <summary>
/// restituisce elenco clienti trasformato in dictionary
/// </summary>
GPW_Smart/Site.Master.cs
-24
View File
@@ -42,29 +42,5 @@ namespace GPW_Smart
cmp_menuTop.disableCheckCookie = value;
}
}
#if false
public bool showSettings { get; set; }
public bool showLeftPnl { get; set; }
public string hideSettings
{
get
{
string answ = "";
if (!showSettings) answ = "hidden";
return answ;
}
}
public string hideLeftPnl
{
get
{
string answ = "";
if (!showLeftPnl) answ = "hidden";
return answ;
}
}
#endif
}
}
GPW_Smart/WebUserControls/cmp_menuTop.ascx.cs
-21
View File
@@ -232,26 +232,5 @@ namespace GPW_Smart.WebUserControls
}
return answ;
}
#if false
/// <summary>
/// salva in variabile pagina il nome della pagina corrente
/// </summary>
protected string PagCorrente()
{
string answ = "";
try
{
Uri MyUrl = Request.Url;
string delimStr = "/";
char[] delimiter = delimStr.ToCharArray();
string[] finalUrl = MyUrl.LocalPath.ToString().Split(delimiter);
int n = finalUrl.Length;
answ = finalUrl[n - 1].ToString();
}
catch
{ }
return answ;
}
#endif
}
}
GPW_Smart/WebUserControls/mod_timbrature.ascx.cs
-9
View File
@@ -145,15 +145,6 @@ namespace GPW.WebUserControls
bool isEntrata = false;
registraTimbratura(isEntrata);
}
#if false
/// <summary>
/// Abilita tutti i buttons
/// </summary>
public void abilitaAll()
{
forceButtons = false;
}
#endif
/// <summary>
/// Aggiorno visualizzazione
/// </summary>
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=4104']) {
withEnv(['NEXT_BUILD_NUMBER=4105']) {
// 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'