Egalware/MoonPro.net
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'develop' into ADM

Browse Source
This commit is contained in:
Samuele Locatelli
2021-03-17 16:56:47 +01:00
parent 99643ea88a 46dee623c3
commit 86b2a79f2b
22 changed files with 104 additions and 113 deletions
Download Patch File Download Diff File Expand all files Collapse all files
ES3/ES3.csproj
+1 -1
View File
@@ -30,7 +30,7 @@
<UseGlobalApplicationHostFile />
<NuGetPackageImportStamp>
</NuGetPackageImportStamp>
<TypeScriptToolsVersion>3.7</TypeScriptToolsVersion>
<TypeScriptToolsVersion>Latest</TypeScriptToolsVersion>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
<DebugSymbols>true</DebugSymbols>
ES3/mongocrypt.dll
BIN
View File
Binary file not shown.
Jenkinsfile
Vendored
+1 -1
View File
@@ -13,7 +13,7 @@ pipeline {
steps {
/* calcolo numero versione... diverso x branch MASTER/DEVELOP */
script {
withEnv(['NEXT_BUILD_NUMBER=1405']) {
withEnv(['NEXT_BUILD_NUMBER=1407']) {
// env.versionNumber = VersionNumber(versionNumberString : '6.13.${BUILD_DATE_FORMATTED, "yyMM"}.${BUILDS_ALL_TIME}', projectStartDate : '2006-01-01', skipFailedBuilds: true)
env.versionNumber = VersionNumber(versionNumberString : '6.13.${BUILD_DATE_FORMATTED, "yyMM"}.${BUILDS_ALL_TIME}', projectStartDate : '2006-01-01', skipFailedBuilds: true, overrideBuildsAllTime: '${NEXT_BUILD_NUMBER}')
env.APP_NAME = 'MAPO'
MP-ADM/MP-ADM.csproj
+1 -1
View File
@@ -1317,7 +1317,7 @@
<AutoAssignPort>True</AutoAssignPort>
<DevelopmentServerPort>5332</DevelopmentServerPort>
<DevelopmentServerVPath>/</DevelopmentServerVPath>
<IISUrl>http://localhost:5332/</IISUrl>
<IISUrl>http://localhost:5333/</IISUrl>
<NTLMAuthentication>False</NTLMAuthentication>
<UseCustomServer>False</UseCustomServer>
<CustomServerUrl>
MP-ADM/WebUserControls/cmp_PODL_OUT.ascx
+6 -5
View File
@@ -6,10 +6,10 @@
<div class="card-header">
<div class="row">
<div class="col-2">
<div class="col-4">
<h4>PODL attivi</h4>
</div>
<div class="col-2 text-right">
<%--<div class="col-2 text-right">
<div class="input-group">
<div class="input-group-prepend">
<div class="input-group-text">
@@ -18,7 +18,7 @@
</div>
<asp:Label runat="server" ID="lblUnass" CssClass="input-group-text small" Text="Mostra SOLO programmate" />
</div>
</div>
</div>--%>
<div class="col-4 text-right" runat="server" id="divMachine">
<div class="input-group">
<div class="input-group-prepend">
@@ -29,7 +29,7 @@
<asp:DropDownList runat="server" ID="ddlSelMacchina" CssClass="form-control" DataSourceID="odsMac" DataTextField="label" DataValueField="value" AppendDataBoundItems="true">
<asp:ListItem Text="-- Impianto Originale --" Value="" />
</asp:DropDownList>
<asp:ObjectDataSource runat="server" ID="odsMac" OldValuesParameterFormatString="original_{0}" SelectMethod="getAttive" TypeName="MapoDb.DS_UtilityTableAdapters.v_selMacchineTableAdapter"></asp:ObjectDataSource>
<asp:ObjectDataSource runat="server" ID="odsMac" OldValuesParameterFormatString="original_{0}" SelectMethod="getAttive" TypeName="MapoDb.DS_UtilityTableAdapters.v_selMacchineTableAdapter" FilterExpression=" Value NOT LIKE '%#%' "></asp:ObjectDataSource>
<div class="input-group-append">
<asp:LinkButton runat="server" ID="lbtReassignMachine" class="btn btn-info" OnClick="lbtReassignMachine_Click"><i class="fa fa-edit" aria-hidden="true"></i> Riassegna</asp:LinkButton>
</div>
@@ -169,7 +169,8 @@
<asp:ControlParameter ControlID="hfCodArt" DefaultValue="*" Name="CodArticolo" PropertyName="Value" Type="String" />
<asp:ControlParameter ControlID="hfIdxMacc" DefaultValue="*" Name="IdxMacchina" PropertyName="Value" Type="String" />
<asp:ControlParameter ControlID="hfCodCli" DefaultValue="*" Name="CodCliente" PropertyName="Value" Type="String" />
<asp:ControlParameter ControlID="chkUnassigned" Name="onlyFree" PropertyName="Checked" Type="Boolean" />
<asp:Parameter Name="onlyFree" Type="Boolean" DefaultValue="true" />
<%--<asp:ControlParameter ControlID="chkUnassigned" Name="onlyFree" PropertyName="Checked" Type="Boolean" />--%>
</SelectParameters>
</asp:ObjectDataSource>
</div>
MP-ADM/WebUserControls/cmp_PODL_OUT.ascx.cs
+5 -21
View File
@@ -252,26 +252,6 @@ namespace MP_ADM.WebUserControls
setPromAttivabili(true);
}
#if false
/// <summary>
/// elimina commento
/// </summary>
/// <param name="sender"></param>
/// <param name="e"></param>
protected void lbtDel_Click(object sender, EventArgs e)
{
LinkButton imgBtn = (LinkButton)sender;
int IdxProm = 0;
int.TryParse(imgBtn.CommandArgument, out IdxProm);
if (IdxProm > 0)
{
DataLayerObj.taPromOut.deleteQuery(IdxProm);
}
doUpdate();
raiseNewVal();
}
#endif
protected void lbtDisattiva_Click(object sender, EventArgs e)
{
setPromAttivabili(false);
@@ -414,9 +394,12 @@ namespace MP_ADM.WebUserControls
// è ok SE sono ENTRO i 2 limiti
enableChgPrio = ((priorita + delta) >= LPI && (priorita + delta) <= LPS);
bool onlyProgrammed = chkUnassigned.Checked;
bool singleMachine = !string.IsNullOrEmpty(IdxMacchinaFilt) && IdxMacchinaFilt == IdxMacchina;
#if false
bool onlyProgrammed = chkUnassigned.Checked;
return enableChgPrio && onlyProgrammed && singleMachine;
#endif
return enableChgPrio && singleMachine;
}
public string cssByAtt(object currAtt)
@@ -446,6 +429,7 @@ namespace MP_ADM.WebUserControls
public void doUpdate()
{
grView.DataBind();
checkActions();
}
/// <summary>
MP-ADM/WebUserControls/cmp_PODL_OUT.ascx.designer.cs
Generated
+59 -77
View File
@@ -1,10 +1,10 @@
//------------------------------------------------------------------------------
// <generato automaticamente>
// Codice generato da uno strumento.
// <auto-generated>
// This code was generated by a tool.
//
// Le modifiche a questo file possono causare un comportamento non corretto e verranno perse se
// il codice viene rigenerato.
// </generato automaticamente>
// Changes to this file may cause incorrect behavior and will be lost if
// the code is regenerated.
// </auto-generated>
//------------------------------------------------------------------------------
namespace MP_ADM.WebUserControls
@@ -15,182 +15,164 @@ namespace MP_ADM.WebUserControls
{
/// <summary>
/// Controllo chkUnassigned.
/// divMachine control.
/// </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 chkUnassigned;
/// <summary>
/// Controllo lblUnass.
/// </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.Label lblUnass;
/// <summary>
/// Controllo divMachine.
/// </summary>
/// <remarks>
/// Campo generato automaticamente.
/// Per la modifica, spostare la dichiarazione di campo dal file di progettazione al file code-behind.
/// Auto-generated field.
/// To modify move field declaration from designer file to code-behind file.
/// </remarks>
protected global::System.Web.UI.HtmlControls.HtmlGenericControl divMachine;
/// <summary>
/// Controllo chkReassign.
/// chkReassign control.
/// </summary>
/// <remarks>
/// Campo generato automaticamente.
/// Per la modifica, spostare la dichiarazione di campo dal file di progettazione al file code-behind.
/// Auto-generated field.
/// To modify move field declaration from designer file to code-behind file.
/// </remarks>
protected global::System.Web.UI.WebControls.CheckBox chkReassign;
/// <summary>
/// Controllo ddlSelMacchina.
/// ddlSelMacchina control.
/// </summary>
/// <remarks>
/// Campo generato automaticamente.
/// Per la modifica, spostare la dichiarazione di campo dal file di progettazione al file code-behind.
/// Auto-generated field.
/// To modify move field declaration from designer file to code-behind file.
/// </remarks>
protected global::System.Web.UI.WebControls.DropDownList ddlSelMacchina;
/// <summary>
/// Controllo odsMac.
/// odsMac control.
/// </summary>
/// <remarks>
/// Campo generato automaticamente.
/// Per la modifica, spostare la dichiarazione di campo dal file di progettazione al file code-behind.
/// Auto-generated field.
/// To modify move field declaration from designer file to code-behind file.
/// </remarks>
protected global::System.Web.UI.WebControls.ObjectDataSource odsMac;
/// <summary>
/// Controllo lbtReassignMachine.
/// lbtReassignMachine control.
/// </summary>
/// <remarks>
/// Campo generato automaticamente.
/// Per la modifica, spostare la dichiarazione di campo dal file di progettazione al file code-behind.
/// Auto-generated field.
/// To modify move field declaration from designer file to code-behind file.
/// </remarks>
protected global::System.Web.UI.WebControls.LinkButton lbtReassignMachine;
/// <summary>
/// Controllo divActions.
/// divActions control.
/// </summary>
/// <remarks>
/// Campo generato automaticamente.
/// Per la modifica, spostare la dichiarazione di campo dal file di progettazione al file code-behind.
/// Auto-generated field.
/// To modify move field declaration from designer file to code-behind file.
/// </remarks>
protected global::System.Web.UI.HtmlControls.HtmlGenericControl divActions;
/// <summary>
/// Controllo lbtAttiva.
/// lbtAttiva control.
/// </summary>
/// <remarks>
/// Campo generato automaticamente.
/// Per la modifica, spostare la dichiarazione di campo dal file di progettazione al file code-behind.
/// Auto-generated field.
/// To modify move field declaration from designer file to code-behind file.
/// </remarks>
protected global::System.Web.UI.WebControls.LinkButton lbtAttiva;
/// <summary>
/// Controllo lbtDisattiva.
/// lbtDisattiva control.
/// </summary>
/// <remarks>
/// Campo generato automaticamente.
/// Per la modifica, spostare la dichiarazione di campo dal file di progettazione al file code-behind.
/// Auto-generated field.
/// To modify move field declaration from designer file to code-behind file.
/// </remarks>
protected global::System.Web.UI.WebControls.LinkButton lbtDisattiva;
/// <summary>
/// Controllo lbtElimina.
/// lbtElimina control.
/// </summary>
/// <remarks>
/// Campo generato automaticamente.
/// Per la modifica, spostare la dichiarazione di campo dal file di progettazione al file code-behind.
/// Auto-generated field.
/// To modify move field declaration from designer file to code-behind file.
/// </remarks>
protected global::System.Web.UI.WebControls.LinkButton lbtElimina;
/// <summary>
/// Controllo grView.
/// grView control.
/// </summary>
/// <remarks>
/// Campo generato automaticamente.
/// Per la modifica, spostare la dichiarazione di campo dal file di progettazione al file code-behind.
/// Auto-generated field.
/// To modify move field declaration from designer file to code-behind file.
/// </remarks>
protected global::System.Web.UI.WebControls.GridView grView;
/// <summary>
/// Controllo hfIdxMacc.
/// hfIdxMacc control.
/// </summary>
/// <remarks>
/// Campo generato automaticamente.
/// Per la modifica, spostare la dichiarazione di campo dal file di progettazione al file code-behind.
/// Auto-generated field.
/// To modify move field declaration from designer file to code-behind file.
/// </remarks>
protected global::System.Web.UI.WebControls.HiddenField hfIdxMacc;
/// <summary>
/// Controllo hfCodGrp.
/// hfCodGrp control.
/// </summary>
/// <remarks>
/// Campo generato automaticamente.
/// Per la modifica, spostare la dichiarazione di campo dal file di progettazione al file code-behind.
/// Auto-generated field.
/// To modify move field declaration from designer file to code-behind file.
/// </remarks>
protected global::System.Web.UI.WebControls.HiddenField hfCodGrp;
/// <summary>
/// Controllo hfCodArt.
/// hfCodArt control.
/// </summary>
/// <remarks>
/// Campo generato automaticamente.
/// Per la modifica, spostare la dichiarazione di campo dal file di progettazione al file code-behind.
/// Auto-generated field.
/// To modify move field declaration from designer file to code-behind file.
/// </remarks>
protected global::System.Web.UI.WebControls.HiddenField hfCodArt;
/// <summary>
/// Controllo hfCodCli.
/// hfCodCli control.
/// </summary>
/// <remarks>
/// Campo generato automaticamente.
/// Per la modifica, spostare la dichiarazione di campo dal file di progettazione al file code-behind.
/// Auto-generated field.
/// To modify move field declaration from designer file to code-behind file.
/// </remarks>
protected global::System.Web.UI.WebControls.HiddenField hfCodCli;
/// <summary>
/// Controllo ods.
/// ods control.
/// </summary>
/// <remarks>
/// Campo generato automaticamente.
/// Per la modifica, spostare la dichiarazione di campo dal file di progettazione al file code-behind.
/// Auto-generated field.
/// To modify move field declaration from designer file to code-behind file.
/// </remarks>
protected global::System.Web.UI.WebControls.ObjectDataSource ods;
/// <summary>
/// Controllo lblNumRec.
/// lblNumRec control.
/// </summary>
/// <remarks>
/// Campo generato automaticamente.
/// Per la modifica, spostare la dichiarazione di campo dal file di progettazione al file code-behind.
/// Auto-generated field.
/// To modify move field declaration from designer file to code-behind file.
/// </remarks>
protected global::System.Web.UI.WebControls.Label lblNumRec;
/// <summary>
/// Controllo lblWarning.
/// lblWarning control.
/// </summary>
/// <remarks>
/// Campo generato automaticamente.
/// Per la modifica, spostare la dichiarazione di campo dal file di progettazione al file code-behind.
/// Auto-generated field.
/// To modify move field declaration from designer file to code-behind file.
/// </remarks>
protected global::System.Web.UI.WebControls.Label lblWarning;
/// <summary>
/// Controllo txtPageSize.
/// txtPageSize control.
/// </summary>
/// <remarks>
/// Campo generato automaticamente.
/// Per la modifica, spostare la dichiarazione di campo dal file di progettazione al file code-behind.
/// Auto-generated field.
/// To modify move field declaration from designer file to code-behind file.
/// </remarks>
protected global::System.Web.UI.WebControls.TextBox txtPageSize;
}
MP-ADM/WebUserControls/cmp_planApprove.ascx.cs
+1 -1
View File
@@ -174,7 +174,7 @@ namespace MP_ADM.WebUserControls
grView.SelectedIndex = -1;
grView.DataBind();
// segnalo update
raiseSelNew();
raiseNewVal();
}
private void toggleVisibility()
MP-ADM/WebUserControls/cmp_planStats.ascx.cs
+1
View File
@@ -230,6 +230,7 @@ namespace MP_ADM.WebUserControls
public void doUpdate()
{
frmView.DataBind();
cmp_planStats_Mac.doUpdate();
}
public string showData(object valOre, object valNum)
MP-ADM/WebUserControls/cmp_planStats_Art.ascx.cs
+5
View File
@@ -86,6 +86,11 @@ namespace MP_ADM.WebUserControls
grView.DataBind();
}
public void doUpdate()
{
grView.DataBind();
}
#endregion Public Methods
}
}
MP-ADM/WebUserControls/cmp_planStats_Cli.ascx.cs
+5
View File
@@ -86,6 +86,11 @@ namespace MP_ADM.WebUserControls
grView.DataBind();
}
public void doUpdate()
{
grView.DataBind();
}
#endregion Public Methods
}
}
MP-ADM/WebUserControls/cmp_planStats_Fasi.ascx.cs
+5
View File
@@ -74,6 +74,11 @@ namespace MP_ADM.WebUserControls
grView.DataBind();
}
public void doUpdate()
{
grView.DataBind();
}
#endregion Public Methods
}
}
MP-ADM/WebUserControls/cmp_planStats_Mac.ascx.cs
+5
View File
@@ -86,6 +86,11 @@ namespace MP_ADM.WebUserControls
grView.DataBind();
}
public void doUpdate()
{
grView.DataBind();
}
#endregion Public Methods
}
}
MP-ADM/images/Thumbs.db
BIN
View File
Binary file not shown.
MP-MAG/MP-MAG.csproj
+1 -1
View File
@@ -26,7 +26,7 @@
<UseGlobalApplicationHostFile />
<NuGetPackageImportStamp>
</NuGetPackageImportStamp>
<TypeScriptToolsVersion>4.0</TypeScriptToolsVersion>
<TypeScriptToolsVersion>Latest</TypeScriptToolsVersion>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
<DebugSymbols>true</DebugSymbols>
MP-SITE/Resources/Donati/macchine/Thumbs.db
BIN
View File
Binary file not shown.
MP-SITE/images/Thumbs.db
BIN
View File
Binary file not shown.
MagData/Core/Compression/Snappy/lib/win/snappy32.dll
BIN
View File
Binary file not shown.
MagData/Core/Compression/Snappy/lib/win/snappy64.dll
BIN
View File
Binary file not shown.
MagData/Core/Compression/Zstandard/lib/win/libzstd.dll
BIN
View File
Binary file not shown.
VersGen/MoonPro.cs
+3 -3
View File
@@ -1,11 +1,11 @@
//
//
// This code was generated by a tool. Any changes made manually will be lost
// the next time this code is regenerated.
//
//
using System.Reflection;
[assembly: AssemblyVersion("1.0.0.0")]
[assembly: AssemblyFileVersion("1.0.0.0")]
[assembly: AssemblyCopyright("Steamware ©")]
[assembly: AssemblyCompany("Steamware")]
[assembly: AssemblyCompany("Steamware")]
VersGen/VersGen.csproj
+5 -2
View File
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
<PropertyGroup>
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
@@ -9,8 +9,9 @@
<AppDesignerFolder>Properties</AppDesignerFolder>
<RootNamespace>VersGen</RootNamespace>
<AssemblyName>VersGen</AssemblyName>
<TargetFrameworkVersion>v3.5</TargetFrameworkVersion>
<TargetFrameworkVersion>v4.6.1</TargetFrameworkVersion>
<FileAlignment>512</FileAlignment>
<TargetFrameworkProfile />
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
<PlatformTarget>AnyCPU</PlatformTarget>
@@ -21,6 +22,7 @@
<DefineConstants>DEBUG;TRACE</DefineConstants>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
<Prefer32Bit>false</Prefer32Bit>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
<PlatformTarget>AnyCPU</PlatformTarget>
@@ -30,6 +32,7 @@
<DefineConstants>TRACE</DefineConstants>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
<Prefer32Bit>false</Prefer32Bit>
</PropertyGroup>
<PropertyGroup>
<StartupObject />