Merge branch 'release/UpdaterFix'
This commit is contained in:
@@ -41,3 +41,6 @@ dotnet_diagnostic.CA1716.severity = none
|
||||
|
||||
# CA2227: Le proprietà delle raccolte devono essere di sola lettura
|
||||
dotnet_diagnostic.CA2227.severity = none
|
||||
|
||||
# CA1805: Do not initialize unnecessarily
|
||||
dotnet_diagnostic.CA1805.severity = none
|
||||
|
||||
Vendored
+5
-5
@@ -186,8 +186,8 @@ pipeline {
|
||||
|
||||
// lancio upload con nuget!
|
||||
echo 'Start upload with nuget push'
|
||||
bat "e:\\nuget setapikey fe387daa-d07c-3207-877e-96c8be1be91b -source http://nexus.steamware.net/repository/nuget-hosted"
|
||||
bat "e:\\nuget.exe push NKC_SDK.${env.packVers}.nupkg -Source http://nexus.steamware.net/repository/nuget-hosted"
|
||||
bat "e:\\nuget setapikey fe387daa-d07c-3207-877e-96c8be1be91b -source https://nexus.steamware.net/repository/nuget-hosted"
|
||||
bat "e:\\nuget.exe push NKC_SDK.${env.packVers}.nupkg -Source https://nexus.steamware.net/repository/nuget-hosted"
|
||||
}
|
||||
else
|
||||
{
|
||||
@@ -277,16 +277,16 @@ def sendSlack(status, colorCode) {
|
||||
|
||||
// funzione x fix pacchetti nuget da NOSTRO repo Nexus con proxy
|
||||
def fixNuget(solutionFile) {
|
||||
// bat "e:\\nuget setapikey fe387daa-d07c-3207-877e-96c8be1be91b -source http://nexus.steamware.net/repository/nuget-group"
|
||||
// bat "e:\\nuget setapikey fe387daa-d07c-3207-877e-96c8be1be91b -source https://nexus.steamware.net/repository/nuget-group"
|
||||
// solo la prima volta va aggiunta...
|
||||
hasSource = bat "e:\\nuget sources list | find \"Steamware\" /C"
|
||||
if (hasSource == "0")
|
||||
{
|
||||
bat "e:\\nuget sources Add -Name \"Steamware Nexus\" -Source http://nexus.steamware.net/repository/nuget-group -username \"nugetUser\" -password \"viaDante16\""
|
||||
bat "e:\\nuget sources Add -Name \"Steamware Nexus\" -Source https://nexus.steamware.net/repository/nuget-group -username \"nugetUser\" -password \"viaDante16\""
|
||||
}
|
||||
else
|
||||
{
|
||||
bat "e:\\nuget sources Update -Name \"Steamware Nexus\" -Source http://nexus.steamware.net/repository/nuget-group -username \"nugetUser\" -password \"viaDante16\""
|
||||
bat "e:\\nuget sources Update -Name \"Steamware Nexus\" -Source https://nexus.steamware.net/repository/nuget-group -username \"nugetUser\" -password \"viaDante16\""
|
||||
}
|
||||
bat "e:\\nuget.exe restore ${solutionFile}"
|
||||
}
|
||||
+1
-1
@@ -48,7 +48,7 @@ namespace NKC_WF
|
||||
/// <param name="message"></param>
|
||||
public void lgFatal(string message, Exception exc)
|
||||
{
|
||||
logger.lg.scriviLog(message, tipoLog.FATAL);
|
||||
logger.lg.scriviLog($"{message}{Environment.NewLine}{exc}", tipoLog.FATAL);
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
|
||||
@@ -22,7 +22,7 @@ namespace NKC_WF
|
||||
/// <summary>
|
||||
/// Codice macchina (da v2)
|
||||
/// </summary>
|
||||
public string PlaceCod = "WRK001";
|
||||
public string PlaceCod = "VIRTNE";
|
||||
|
||||
#endregion Public Fields
|
||||
|
||||
@@ -206,7 +206,7 @@ namespace NKC_WF
|
||||
/// <param name="message"></param>
|
||||
public void lgFatal(string message, Exception exc)
|
||||
{
|
||||
logger.lg.scriviLog(message, tipoLog.FATAL);
|
||||
logger.lg.scriviLog($"{message}{Environment.NewLine}{exc}", tipoLog.FATAL);
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
|
||||
+16
-9
@@ -5,6 +5,7 @@ namespace NKC_WF
|
||||
{
|
||||
public static class Compressor
|
||||
{
|
||||
#region Public Methods
|
||||
|
||||
public static byte[] Compress(byte[] data)
|
||||
{
|
||||
@@ -18,22 +19,28 @@ namespace NKC_WF
|
||||
|
||||
public static byte[] Decompress(byte[] data)
|
||||
{
|
||||
byte[] answ = new byte[1];
|
||||
MemoryStream input = new MemoryStream();
|
||||
input.Write(data, 0, data.Length);
|
||||
input.Position = 0;
|
||||
GZipStream gzip = new GZipStream(input,
|
||||
CompressionMode.Decompress, true);
|
||||
MemoryStream output = new MemoryStream();
|
||||
byte[] buff = new byte[64];
|
||||
int read = -1;
|
||||
read = gzip.Read(buff, 0, buff.Length);
|
||||
while (read > 0)
|
||||
using (MemoryStream output = new MemoryStream())
|
||||
{
|
||||
output.Write(buff, 0, read);
|
||||
byte[] buff = new byte[64];
|
||||
int read = -1;
|
||||
read = gzip.Read(buff, 0, buff.Length);
|
||||
while (read > 0)
|
||||
{
|
||||
output.Write(buff, 0, read);
|
||||
read = gzip.Read(buff, 0, buff.Length);
|
||||
}
|
||||
gzip.Close();
|
||||
answ = output.ToArray();
|
||||
}
|
||||
gzip.Close();
|
||||
return output.ToArray();
|
||||
return answ;
|
||||
}
|
||||
|
||||
#endregion Public Methods
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -576,7 +576,7 @@ namespace NKC_WF.Controllers
|
||||
answ = "WRONG DATA (expected baseNestAnsw object)";
|
||||
}
|
||||
}
|
||||
catch (Exception exc)
|
||||
catch
|
||||
{
|
||||
answ = "NO";
|
||||
}
|
||||
|
||||
+13
-13
@@ -30,7 +30,7 @@
|
||||
<UseGlobalApplicationHostFile />
|
||||
<NuGetPackageImportStamp>
|
||||
</NuGetPackageImportStamp>
|
||||
<TypeScriptToolsVersion>3.4</TypeScriptToolsVersion>
|
||||
<TypeScriptToolsVersion>Latest</TypeScriptToolsVersion>
|
||||
</PropertyGroup>
|
||||
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
|
||||
<DebugSymbols>true</DebugSymbols>
|
||||
@@ -100,8 +100,8 @@
|
||||
<Reference Include="MongoDB.Driver.Core, Version=2.13.1.0, Culture=neutral, processorArchitecture=MSIL">
|
||||
<HintPath>..\packages\MongoDB.Driver.Core.2.13.1\lib\net452\MongoDB.Driver.Core.dll</HintPath>
|
||||
</Reference>
|
||||
<Reference Include="MongoDB.Libmongocrypt, Version=1.2.2.0, Culture=neutral, processorArchitecture=MSIL">
|
||||
<HintPath>..\packages\MongoDB.Libmongocrypt.1.2.2\lib\net452\MongoDB.Libmongocrypt.dll</HintPath>
|
||||
<Reference Include="MongoDB.Libmongocrypt, Version=1.2.3.0, Culture=neutral, processorArchitecture=MSIL">
|
||||
<HintPath>..\packages\MongoDB.Libmongocrypt.1.2.3\lib\netstandard2.0\MongoDB.Libmongocrypt.dll</HintPath>
|
||||
</Reference>
|
||||
<Reference Include="Newtonsoft.Json, Version=13.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
|
||||
<HintPath>..\packages\Newtonsoft.Json.13.0.1\lib\net45\Newtonsoft.Json.dll</HintPath>
|
||||
@@ -118,8 +118,8 @@
|
||||
<Reference Include="Pipelines.Sockets.Unofficial, Version=1.0.0.0, Culture=neutral, PublicKeyToken=42ea0a778e13fbe2, processorArchitecture=MSIL">
|
||||
<HintPath>..\packages\Pipelines.Sockets.Unofficial.2.2.0\lib\net461\Pipelines.Sockets.Unofficial.dll</HintPath>
|
||||
</Reference>
|
||||
<Reference Include="SharpCompress, Version=0.28.3.0, Culture=neutral, PublicKeyToken=afb0a02973931d96, processorArchitecture=MSIL">
|
||||
<HintPath>..\packages\SharpCompress.0.28.3\lib\netstandard2.0\SharpCompress.dll</HintPath>
|
||||
<Reference Include="SharpCompress, Version=0.29.0.0, Culture=neutral, PublicKeyToken=afb0a02973931d96, processorArchitecture=MSIL">
|
||||
<HintPath>..\packages\SharpCompress.0.29.0\lib\netstandard2.0\SharpCompress.dll</HintPath>
|
||||
</Reference>
|
||||
<Reference Include="Snappy.NET, Version=1.1.1.8, Culture=neutral, processorArchitecture=MSIL">
|
||||
<HintPath>..\packages\Snappy.NET.1.1.1.8\lib\net45\Snappy.NET.dll</HintPath>
|
||||
@@ -127,11 +127,11 @@
|
||||
<Reference Include="StackExchange.Redis, Version=2.0.0.0, Culture=neutral, PublicKeyToken=c219ff1ca8c2ce46, processorArchitecture=MSIL">
|
||||
<HintPath>..\packages\StackExchange.Redis.2.2.62\lib\net461\StackExchange.Redis.dll</HintPath>
|
||||
</Reference>
|
||||
<Reference Include="SteamWare, Version=5.1.2108.1912, Culture=neutral, processorArchitecture=MSIL">
|
||||
<HintPath>..\packages\SteamWare.5.1.2108.1912\lib\net462\SteamWare.dll</HintPath>
|
||||
<Reference Include="SteamWare, Version=5.1.2109.1713, Culture=neutral, processorArchitecture=MSIL">
|
||||
<HintPath>..\packages\SteamWare.5.1.2109.1713\lib\net462\SteamWare.dll</HintPath>
|
||||
</Reference>
|
||||
<Reference Include="SteamWare.Logger, Version=5.1.2108.1912, Culture=neutral, processorArchitecture=MSIL">
|
||||
<HintPath>..\packages\SteamWare.Logger.5.1.2108.1912\lib\net462\SteamWare.Logger.dll</HintPath>
|
||||
<Reference Include="SteamWare.Logger, Version=5.1.2109.1713, Culture=neutral, processorArchitecture=MSIL">
|
||||
<HintPath>..\packages\SteamWare.Logger.5.1.2109.1713\lib\net462\SteamWare.Logger.dll</HintPath>
|
||||
</Reference>
|
||||
<Reference Include="System.Buffers, Version=4.0.3.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
|
||||
<HintPath>..\packages\System.Buffers.4.5.1\lib\net461\System.Buffers.dll</HintPath>
|
||||
@@ -1894,9 +1894,9 @@
|
||||
<WebProjectProperties>
|
||||
<UseIIS>True</UseIIS>
|
||||
<AutoAssignPort>True</AutoAssignPort>
|
||||
<DevelopmentServerPort>61257</DevelopmentServerPort>
|
||||
<DevelopmentServerPort>44388</DevelopmentServerPort>
|
||||
<DevelopmentServerVPath>/</DevelopmentServerVPath>
|
||||
<IISUrl>https://localhost:44388/</IISUrl>
|
||||
<IISUrl>https://localhost:44393/</IISUrl>
|
||||
<NTLMAuthentication>False</NTLMAuthentication>
|
||||
<UseCustomServer>False</UseCustomServer>
|
||||
<CustomServerUrl>
|
||||
@@ -1922,8 +1922,8 @@
|
||||
<Error Condition="!Exists('..\packages\Microsoft.NetFramework.Analyzers.3.3.2\build\Microsoft.NetFramework.Analyzers.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Microsoft.NetFramework.Analyzers.3.3.2\build\Microsoft.NetFramework.Analyzers.targets'))" />
|
||||
<Error Condition="!Exists('..\packages\Microsoft.CodeAnalysis.FxCopAnalyzers.3.3.2\build\Microsoft.CodeAnalysis.FxCopAnalyzers.props')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Microsoft.CodeAnalysis.FxCopAnalyzers.3.3.2\build\Microsoft.CodeAnalysis.FxCopAnalyzers.props'))" />
|
||||
<Error Condition="!Exists('..\packages\Microsoft.CodeAnalysis.FxCopAnalyzers.3.3.2\build\Microsoft.CodeAnalysis.FxCopAnalyzers.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Microsoft.CodeAnalysis.FxCopAnalyzers.3.3.2\build\Microsoft.CodeAnalysis.FxCopAnalyzers.targets'))" />
|
||||
<Error Condition="!Exists('..\packages\MongoDB.Libmongocrypt.1.2.2\build\MongoDB.Libmongocrypt.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\MongoDB.Libmongocrypt.1.2.2\build\MongoDB.Libmongocrypt.targets'))" />
|
||||
<Error Condition="!Exists('..\packages\MongoDB.Driver.Core.2.13.1\build\MongoDB.Driver.Core.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\MongoDB.Driver.Core.2.13.1\build\MongoDB.Driver.Core.targets'))" />
|
||||
<Error Condition="!Exists('..\packages\MongoDB.Libmongocrypt.1.2.3\build\MongoDB.Libmongocrypt.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\MongoDB.Libmongocrypt.1.2.3\build\MongoDB.Libmongocrypt.targets'))" />
|
||||
</Target>
|
||||
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
|
||||
Other similar extension points exist, see Microsoft.Common.targets.
|
||||
@@ -1951,6 +1951,6 @@
|
||||
<Import Project="..\packages\Microsoft.NetCore.Analyzers.3.3.2\build\Microsoft.NetCore.Analyzers.targets" Condition="Exists('..\packages\Microsoft.NetCore.Analyzers.3.3.2\build\Microsoft.NetCore.Analyzers.targets')" />
|
||||
<Import Project="..\packages\Microsoft.NetFramework.Analyzers.3.3.2\build\Microsoft.NetFramework.Analyzers.targets" Condition="Exists('..\packages\Microsoft.NetFramework.Analyzers.3.3.2\build\Microsoft.NetFramework.Analyzers.targets')" />
|
||||
<Import Project="..\packages\Microsoft.CodeAnalysis.FxCopAnalyzers.3.3.2\build\Microsoft.CodeAnalysis.FxCopAnalyzers.targets" Condition="Exists('..\packages\Microsoft.CodeAnalysis.FxCopAnalyzers.3.3.2\build\Microsoft.CodeAnalysis.FxCopAnalyzers.targets')" />
|
||||
<Import Project="..\packages\MongoDB.Libmongocrypt.1.2.2\build\MongoDB.Libmongocrypt.targets" Condition="Exists('..\packages\MongoDB.Libmongocrypt.1.2.2\build\MongoDB.Libmongocrypt.targets')" />
|
||||
<Import Project="..\packages\MongoDB.Driver.Core.2.13.1\build\MongoDB.Driver.Core.targets" Condition="Exists('..\packages\MongoDB.Driver.Core.2.13.1\build\MongoDB.Driver.Core.targets')" />
|
||||
<Import Project="..\packages\MongoDB.Libmongocrypt.1.2.3\build\MongoDB.Libmongocrypt.targets" Condition="Exists('..\packages\MongoDB.Libmongocrypt.1.2.3\build\MongoDB.Libmongocrypt.targets')" />
|
||||
</Project>
|
||||
@@ -1,7 +1,7 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<item>
|
||||
<version>0.0.0.0</version>
|
||||
<url>http://nexus.steamware.net/repository/SWS/NKC/{{BRANCHNAME}}/LAST/NKC.zip</url>
|
||||
<changelog>http://nexus.steamware.net/repository/SWS/NKC/{{BRANCHNAME}}/LAST/ChangeLog.html</changelog>
|
||||
<url>https://nexus.steamware.net/repository/SWS/NKC/{{BRANCHNAME}}/LAST/NKC.zip</url>
|
||||
<changelog>https://nexus.steamware.net/repository/SWS/NKC/{{BRANCHNAME}}/LAST/ChangeLog.html</changelog>
|
||||
<mandatory>false</mandatory>
|
||||
</item>
|
||||
+2
-1
@@ -78,6 +78,7 @@
|
||||
<!--minima durata x validità in stima PARTS singole -->
|
||||
<add key="minValidEstSec" value="2"/>
|
||||
<!--Configurazioni Redis-->
|
||||
<add key="cacheOnRedis" value="true"/>
|
||||
<add key="RedisConn" value="nkcredis.steamware.net,abortConnect=false,ssl=false,password=nkc.password"/>
|
||||
<add key="RedisConnAdmin" value="nkcredis.steamware.net,abortConnect=false,ssl=false,password=nkc.password,allowAdmin=true"/>
|
||||
<add key="redisDb" value="2"/>
|
||||
@@ -378,7 +379,7 @@
|
||||
</dependentAssembly>
|
||||
<dependentAssembly>
|
||||
<assemblyIdentity name="SharpCompress" publicKeyToken="afb0a02973931d96" culture="neutral"/>
|
||||
<bindingRedirect oldVersion="0.0.0.0-0.28.3.0" newVersion="0.28.3.0"/>
|
||||
<bindingRedirect oldVersion="0.0.0.0-0.29.0.0" newVersion="0.29.0.0"/>
|
||||
</dependentAssembly>
|
||||
<dependentAssembly>
|
||||
<assemblyIdentity name="System.IO.Compression" publicKeyToken="b77a5c561934e089" culture="neutral"/>
|
||||
|
||||
@@ -12,15 +12,6 @@ namespace NKC_WF.WebUserControls
|
||||
{
|
||||
public partial class cmp_batchDetailSplit : BaseUserControl
|
||||
{
|
||||
#region Protected Fields
|
||||
|
||||
/// <summary>
|
||||
/// Master Place (hard-coded)
|
||||
/// </summary>
|
||||
protected string PlaceCod = "VIRTNE";
|
||||
|
||||
#endregion Protected Fields
|
||||
|
||||
#region Protected Properties
|
||||
|
||||
protected bool BatchIsAncestor
|
||||
@@ -59,20 +50,6 @@ namespace NKC_WF.WebUserControls
|
||||
}
|
||||
}
|
||||
|
||||
public bool isSplitted
|
||||
{
|
||||
get
|
||||
{
|
||||
bool answ = false;
|
||||
bool.TryParse(hfIsSplit.Value, out answ);
|
||||
return answ;
|
||||
}
|
||||
set
|
||||
{
|
||||
hfIsSplit.Value = $"{value}";
|
||||
}
|
||||
}
|
||||
|
||||
protected int lastValRatio
|
||||
{
|
||||
get
|
||||
@@ -192,6 +169,20 @@ namespace NKC_WF.WebUserControls
|
||||
}
|
||||
}
|
||||
|
||||
public bool isSplitted
|
||||
{
|
||||
get
|
||||
{
|
||||
bool answ = false;
|
||||
bool.TryParse(hfIsSplit.Value, out answ);
|
||||
return answ;
|
||||
}
|
||||
set
|
||||
{
|
||||
hfIsSplit.Value = $"{value}";
|
||||
}
|
||||
}
|
||||
|
||||
#endregion Public Properties
|
||||
|
||||
#region Private Methods
|
||||
|
||||
@@ -6,14 +6,14 @@ namespace NKC_WF.WebUserControls
|
||||
{
|
||||
public partial class cmp_footer : BaseUserControl
|
||||
{
|
||||
public event EventHandler eh_doRefresh;
|
||||
protected void Page_Load(object sender, EventArgs e)
|
||||
#region Private Methods
|
||||
|
||||
private void setClock()
|
||||
{
|
||||
// sistemo le stringhe...
|
||||
lblApp.Text = string.Format("<b>{0}</b> v.{1}", ConfigurationManager.AppSettings.Get("appName"), System.Reflection.Assembly.GetExecutingAssembly().GetName().Version);
|
||||
setTimer();
|
||||
setClock();
|
||||
lblDateTime.Text = DateTime.Now.ToString("ddd dd.MM.yyyy, HH:mm:ss");
|
||||
lblCodOperatore.Text = $"{user_std.UtSn.CognomeNome} ({Page.User.Identity.Name})";
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// imposta il tempo di scadenza del timer x il refresh della pagina (della parte top) per evitare che la sessione sul server scada
|
||||
/// </summary>
|
||||
@@ -21,20 +21,25 @@ namespace NKC_WF.WebUserControls
|
||||
{
|
||||
Timer1.Interval = SteamWare.memLayer.ML.confReadInt("intUpdatePagina_ms");
|
||||
}
|
||||
|
||||
#endregion Private Methods
|
||||
|
||||
#region Protected Methods
|
||||
|
||||
protected void Page_Load(object sender, EventArgs e)
|
||||
{
|
||||
// sistemo le stringhe...
|
||||
lblApp.Text = string.Format("<b>{0}</b> v.{1}", ConfigurationManager.AppSettings.Get("appName"), System.Reflection.Assembly.GetExecutingAssembly().GetName().Version);
|
||||
setTimer();
|
||||
setClock();
|
||||
}
|
||||
|
||||
protected void Timer1_Tick(object sender, EventArgs e)
|
||||
{
|
||||
setClock();
|
||||
// se qualcuno ascolta sollevo evento nuovo valore...
|
||||
if (eh_doRefresh != null)
|
||||
{
|
||||
eh_doRefresh(this, new EventArgs());
|
||||
}
|
||||
raiseEvent();
|
||||
}
|
||||
|
||||
private void setClock()
|
||||
{
|
||||
lblDateTime.Text = DateTime.Now.ToString("ddd dd.MM.yyyy, HH:mm:ss");
|
||||
lblCodOperatore.Text = $"{user_std.UtSn.CognomeNome} ({Page.User.Identity.Name})";
|
||||
}
|
||||
#endregion Protected Methods
|
||||
}
|
||||
}
|
||||
@@ -7,44 +7,27 @@ namespace NKC_WF.WebUserControls
|
||||
{
|
||||
public partial class cmp_menuTop : BaseUserControl
|
||||
{
|
||||
public event EventHandler eh_doRefresh;
|
||||
protected void Page_Load(object sender, EventArgs e)
|
||||
{
|
||||
if (!Page.IsPostBack)
|
||||
{
|
||||
checkAuth();
|
||||
searchVal = "";
|
||||
doSearch();
|
||||
updateTreeMenu();
|
||||
}
|
||||
}
|
||||
|
||||
private void checkAuth()
|
||||
{
|
||||
// in primis SOLO SE non è permesso login anonymous...
|
||||
if (!enableAnonym)
|
||||
{
|
||||
if (!Page.User.Identity.IsAuthenticated)
|
||||
{
|
||||
Response.Redirect("default");
|
||||
}
|
||||
}
|
||||
}
|
||||
#region Protected Properties
|
||||
|
||||
/// <summary>
|
||||
/// imposta visibilità search globale
|
||||
/// Valore ricerca attivo
|
||||
/// </summary>
|
||||
public bool showSearch
|
||||
protected string searchVal
|
||||
{
|
||||
get
|
||||
{
|
||||
return divSearch.Visible;
|
||||
return txtSearch.Text.Trim();
|
||||
}
|
||||
set
|
||||
{
|
||||
divSearch.Visible = value;
|
||||
txtSearch.Text = value.Trim();
|
||||
}
|
||||
}
|
||||
|
||||
#endregion Protected Properties
|
||||
|
||||
#region Public Properties
|
||||
|
||||
/// <summary>
|
||||
/// Abilitazione esecuzione anonima
|
||||
/// </summary>
|
||||
@@ -62,9 +45,35 @@ namespace NKC_WF.WebUserControls
|
||||
}
|
||||
}
|
||||
|
||||
protected void txtSearch_TextChanged(object sender, EventArgs e)
|
||||
/// <summary>
|
||||
/// imposta visibilità search globale
|
||||
/// </summary>
|
||||
public bool showSearch
|
||||
{
|
||||
doSearch();
|
||||
get
|
||||
{
|
||||
return divSearch.Visible;
|
||||
}
|
||||
set
|
||||
{
|
||||
divSearch.Visible = value;
|
||||
}
|
||||
}
|
||||
|
||||
#endregion Public Properties
|
||||
|
||||
#region Private Methods
|
||||
|
||||
private void checkAuth()
|
||||
{
|
||||
// in primis SOLO SE non è permesso login anonymous...
|
||||
if (!enableAnonym)
|
||||
{
|
||||
if (!Page.User.Identity.IsAuthenticated)
|
||||
{
|
||||
Response.Redirect("default");
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
private void doSearch()
|
||||
@@ -78,27 +87,9 @@ namespace NKC_WF.WebUserControls
|
||||
{
|
||||
memLayer.ML.emptySessionVal("valoreSearch");
|
||||
}
|
||||
// se qualcuno ascolta sollevo evento nuovo valore...
|
||||
if (eh_doRefresh != null)
|
||||
{
|
||||
eh_doRefresh(this, new EventArgs());
|
||||
}
|
||||
raiseEvent();
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// Valore ricerca attivo
|
||||
/// </summary>
|
||||
protected string searchVal
|
||||
{
|
||||
get
|
||||
{
|
||||
return txtSearch.Text.Trim();
|
||||
}
|
||||
set
|
||||
{
|
||||
txtSearch.Text = value.Trim();
|
||||
}
|
||||
}
|
||||
/// <summary>
|
||||
/// aggiornamento del menù
|
||||
/// </summary>
|
||||
@@ -127,6 +118,11 @@ namespace NKC_WF.WebUserControls
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
#endregion Private Methods
|
||||
|
||||
#region Protected Methods
|
||||
|
||||
/// <summary>
|
||||
/// click su pagina corrente, fa update!
|
||||
/// </summary>
|
||||
@@ -140,9 +136,28 @@ namespace NKC_WF.WebUserControls
|
||||
Response.Redirect("default");
|
||||
}
|
||||
}
|
||||
|
||||
protected void lbtSearch_Click(object sender, EventArgs e)
|
||||
{
|
||||
doSearch();
|
||||
}
|
||||
|
||||
protected void Page_Load(object sender, EventArgs e)
|
||||
{
|
||||
if (!Page.IsPostBack)
|
||||
{
|
||||
checkAuth();
|
||||
searchVal = "";
|
||||
doSearch();
|
||||
updateTreeMenu();
|
||||
}
|
||||
}
|
||||
|
||||
protected void txtSearch_TextChanged(object sender, EventArgs e)
|
||||
{
|
||||
doSearch();
|
||||
}
|
||||
|
||||
#endregion Protected Methods
|
||||
}
|
||||
}
|
||||
@@ -4,20 +4,8 @@ namespace NKC_WF.WebUserControls
|
||||
{
|
||||
public partial class cmp_numRow : BaseUserControl
|
||||
{
|
||||
public event EventHandler eh_doRefresh;
|
||||
protected void Page_Load(object sender, EventArgs e)
|
||||
{
|
||||
#region Public Properties
|
||||
|
||||
}
|
||||
|
||||
private void raiseEvent()
|
||||
{
|
||||
// se qualcuno ascolta sollevo evento nuovo valore...
|
||||
if (eh_doRefresh != null)
|
||||
{
|
||||
eh_doRefresh(this, new EventArgs());
|
||||
}
|
||||
}
|
||||
public int numRow
|
||||
{
|
||||
set
|
||||
@@ -32,10 +20,19 @@ namespace NKC_WF.WebUserControls
|
||||
}
|
||||
}
|
||||
|
||||
#endregion Public Properties
|
||||
|
||||
#region Protected Methods
|
||||
|
||||
protected void Page_Load(object sender, EventArgs e)
|
||||
{
|
||||
}
|
||||
|
||||
protected void txtNumRow_TextChanged(object sender, EventArgs e)
|
||||
{
|
||||
|
||||
raiseEvent();
|
||||
}
|
||||
|
||||
#endregion Protected Methods
|
||||
}
|
||||
}
|
||||
@@ -6,80 +6,17 @@ namespace NKC_WF.WebUserControls
|
||||
{
|
||||
public partial class mod_righePag : BaseUserControl
|
||||
{
|
||||
#region Public Events
|
||||
|
||||
/// <summary>
|
||||
/// indicato (nuovo) numero righe x pagina
|
||||
/// </summary>
|
||||
public event EventHandler eh_newNum;
|
||||
/// <summary>
|
||||
/// caricamento pagina
|
||||
/// </summary>
|
||||
/// <param name="sender"></param>
|
||||
/// <param name="e"></param>
|
||||
protected void Page_Load(object sender, EventArgs e)
|
||||
{
|
||||
if (!Page.IsPostBack)
|
||||
{
|
||||
numRowReq = numRowPag;
|
||||
}
|
||||
}
|
||||
/// <summary>
|
||||
/// stringa UID univoca
|
||||
/// </summary>
|
||||
public string uid
|
||||
{
|
||||
get
|
||||
{
|
||||
return this.UniqueID.Replace("$", "_").Replace("-", "_");
|
||||
}
|
||||
}
|
||||
/// <summary>
|
||||
/// effettua traduzione del lemma
|
||||
/// </summary>
|
||||
/// <param name="lemma"></param>
|
||||
/// <returns></returns>
|
||||
public string traduci(string lemma)
|
||||
{
|
||||
return user_std.UtSn.Traduci(lemma);
|
||||
}
|
||||
/// <summary>
|
||||
/// aggiorno controllo paginazione...
|
||||
/// </summary>
|
||||
/// <param name="sender"></param>
|
||||
/// <param name="e"></param>
|
||||
protected void txtNumRighe_TextChanged(object sender, EventArgs e)
|
||||
{
|
||||
// salvo num righe...
|
||||
numRowPag = numRowReq;
|
||||
// sollevo evento nuovo valore...
|
||||
if (eh_newNum != null)
|
||||
{
|
||||
eh_newNum(this, new EventArgs());
|
||||
}
|
||||
}
|
||||
/// <summary>
|
||||
/// numero righe per pagina (in sessione)
|
||||
/// </summary>
|
||||
public int numRowPag
|
||||
{
|
||||
get
|
||||
{
|
||||
int answ = 10;
|
||||
try
|
||||
{
|
||||
answ = memLayer.ML.IntSessionObj(uid + "_numRowPag");
|
||||
}
|
||||
catch
|
||||
{
|
||||
answ = 10;
|
||||
}
|
||||
return answ;
|
||||
}
|
||||
set
|
||||
{
|
||||
memLayer.ML.setSessionVal(uid + "_numRowPag", value);
|
||||
numRowReq = value;
|
||||
}
|
||||
}
|
||||
|
||||
#endregion Public Events
|
||||
|
||||
#region Protected Properties
|
||||
|
||||
/// <summary>
|
||||
/// numero righe gridview da mostrare legato a controllo textbox
|
||||
/// </summary>
|
||||
@@ -106,5 +43,80 @@ namespace NKC_WF.WebUserControls
|
||||
txtNumRighe.Text = value.ToString();
|
||||
}
|
||||
}
|
||||
|
||||
#endregion Protected Properties
|
||||
|
||||
#region Public Properties
|
||||
|
||||
/// <summary>
|
||||
/// numero righe per pagina (in sessione)
|
||||
/// </summary>
|
||||
public int numRowPag
|
||||
{
|
||||
get
|
||||
{
|
||||
int answ = 10;
|
||||
try
|
||||
{
|
||||
answ = memLayer.ML.IntSessionObj(uid + "_numRowPag");
|
||||
}
|
||||
catch
|
||||
{
|
||||
answ = 10;
|
||||
}
|
||||
return answ;
|
||||
}
|
||||
set
|
||||
{
|
||||
memLayer.ML.setSessionVal(uid + "_numRowPag", value);
|
||||
numRowReq = value;
|
||||
}
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// stringa UID univoca
|
||||
/// </summary>
|
||||
public string uid
|
||||
{
|
||||
get
|
||||
{
|
||||
return this.UniqueID.Replace("$", "_").Replace("-", "_");
|
||||
}
|
||||
}
|
||||
|
||||
#endregion Public Properties
|
||||
|
||||
#region Protected Methods
|
||||
|
||||
/// <summary>
|
||||
/// caricamento pagina
|
||||
/// </summary>
|
||||
/// <param name="sender"></param>
|
||||
/// <param name="e"></param>
|
||||
protected void Page_Load(object sender, EventArgs e)
|
||||
{
|
||||
if (!Page.IsPostBack)
|
||||
{
|
||||
numRowReq = numRowPag;
|
||||
}
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// aggiorno controllo paginazione...
|
||||
/// </summary>
|
||||
/// <param name="sender"></param>
|
||||
/// <param name="e"></param>
|
||||
protected void txtNumRighe_TextChanged(object sender, EventArgs e)
|
||||
{
|
||||
// salvo num righe...
|
||||
numRowPag = numRowReq;
|
||||
// sollevo evento nuovo valore...
|
||||
if (eh_newNum != null)
|
||||
{
|
||||
eh_newNum(this, new EventArgs());
|
||||
}
|
||||
}
|
||||
|
||||
#endregion Protected Methods
|
||||
}
|
||||
}
|
||||
@@ -39,7 +39,7 @@
|
||||
<package id="Microsoft.CodeDom.Providers.DotNetCompilerPlatform" version="3.6.0" targetFramework="net462" />
|
||||
<package id="Microsoft.CodeQuality.Analyzers" version="3.3.2" targetFramework="net462" developmentDependency="true" />
|
||||
<package id="Microsoft.NetCore.Analyzers" version="3.3.2" targetFramework="net462" developmentDependency="true" />
|
||||
<package id="Microsoft.NETCore.Platforms" version="5.0.2" targetFramework="net462" />
|
||||
<package id="Microsoft.NETCore.Platforms" version="5.0.3" targetFramework="net462" />
|
||||
<package id="Microsoft.NetFramework.Analyzers" version="3.3.2" targetFramework="net462" developmentDependency="true" />
|
||||
<package id="Microsoft.Web.Infrastructure" version="1.0.0.0" targetFramework="net462" />
|
||||
<package id="Microsoft.Web.RedisSessionStateProvider" version="4.0.1" targetFramework="net462" />
|
||||
@@ -48,19 +48,19 @@
|
||||
<package id="MongoDB.Bson" version="2.13.1" targetFramework="net462" />
|
||||
<package id="MongoDB.Driver" version="2.13.1" targetFramework="net462" />
|
||||
<package id="MongoDB.Driver.Core" version="2.13.1" targetFramework="net462" />
|
||||
<package id="MongoDB.Libmongocrypt" version="1.2.2" targetFramework="net462" />
|
||||
<package id="MongoDB.Libmongocrypt" version="1.2.3" targetFramework="net462" />
|
||||
<package id="NETStandard.Library" version="2.0.3" targetFramework="net462" />
|
||||
<package id="Newtonsoft.Json" version="13.0.1" targetFramework="net462" />
|
||||
<package id="NLog" version="4.7.11" targetFramework="net462" />
|
||||
<package id="PDFsharp" version="1.50.5147" targetFramework="net462" />
|
||||
<package id="Pipelines.Sockets.Unofficial" version="2.2.0" targetFramework="net462" />
|
||||
<package id="popper.js" version="1.16.1" targetFramework="net462" />
|
||||
<package id="SharpCompress" version="0.28.3" targetFramework="net462" />
|
||||
<package id="SharpCompress" version="0.29.0" targetFramework="net462" />
|
||||
<package id="SharpZipLib" version="1.3.2" targetFramework="net462" />
|
||||
<package id="Snappy.NET" version="1.1.1.8" targetFramework="net462" />
|
||||
<package id="StackExchange.Redis" version="2.2.62" targetFramework="net462" />
|
||||
<package id="SteamWare" version="5.1.2108.1912" targetFramework="net462" />
|
||||
<package id="SteamWare.Logger" version="5.1.2108.1912" targetFramework="net462" />
|
||||
<package id="SteamWare" version="5.1.2109.1713" targetFramework="net462" />
|
||||
<package id="SteamWare.Logger" version="5.1.2109.1713" targetFramework="net462" />
|
||||
<package id="System.Buffers" version="4.5.1" targetFramework="net462" />
|
||||
<package id="System.Diagnostics.PerformanceCounter" version="5.0.1" targetFramework="net462" />
|
||||
<package id="System.IO.Compression" version="4.3.0" targetFramework="net462" />
|
||||
|
||||
@@ -191,7 +191,7 @@ namespace NKC_WF.site
|
||||
}
|
||||
else
|
||||
{
|
||||
answ = string.Format("http://nexus.steamware.net/repository/SWS/{0}/{1}/LAST/manifest.xml", package, memLayer.ML.CRS("appVers"));
|
||||
answ = string.Format("https://nexus.steamware.net/repository/SWS/{0}/{1}/LAST/manifest.xml", package, memLayer.ML.CRS("appVers"));
|
||||
}
|
||||
return answ;
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user