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

Merge branch 'develop' into SDK

Browse Source
This commit is contained in:
Samuele E. Locatelli
2020-10-22 17:20:28 +02:00
parent 820c000fea 6c928ac03c
commit 65ae8fc4cd
7 changed files with 58 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Jenkinsfile
Vendored
+2 -2
View File
@@ -11,7 +11,7 @@ pipeline {
steps {
/* calcolo numero versione... diverso x branch MASTER/DEVELOP */
script {
withEnv(['NEXT_BUILD_NUMBER=378']) {
withEnv(['NEXT_BUILD_NUMBER=379']) {
// env.versionNumber = VersionNumber(versionNumberString : '1.2.${BUILD_DATE_FORMATTED, "yyMM"}.${BUILDS_ALL_TIME}', projectStartDate : '2019-07-01', skipFailedBuilds: true)
env.versionNumber = VersionNumber(versionNumberString : '1.2.${BUILD_DATE_FORMATTED, "yyMM"}.${BUILDS_ALL_TIME}', projectStartDate : '2019-07-01', skipFailedBuilds: true, overrideBuildsAllTime: '${NEXT_BUILD_NUMBER}')
env.versionNumberBeta = VersionNumber(versionNumberString : '1.2.${BUILD_DATE_FORMATTED, "yyMM"}-beta.${BUILDS_ALL_TIME}', projectStartDate : '2019-07-01', skipFailedBuilds: true, overrideBuildsAllTime: '${NEXT_BUILD_NUMBER}')
@@ -74,7 +74,7 @@ pipeline {
{
sleep 1
// SITE
bat "\"${tool 'MSBuild-16.0'}\" \"/p:AspnetMergePath=C:\\Program Files (x86)\\Microsoft SDKs\\Windows\\v10.0A\\bin\\NETFX 4.6.2 Tools\" /p:DeployOnBuild=true /p:Targets=Publish /p:PublishProfile=IIS02.pubxml /p:VisualStudioVersion=16.0 /p:RunCodeAnalysis=false /p:Configuration=Release /p:username=jenkins /p:Password=viadante16 /p:AllowUntrustedCertificate=true /p:OutputPath=bin/ NKC_WF/NKC_WF.csproj"
bat "\"${tool 'MSBuild-16.0'}\" \"/p:AspnetMergePath=C:\\Program Files (x86)\\Microsoft SDKs\\Windows\\v10.0A\\bin\\NETFX 4.6.2 Tools\" /p:DeployOnBuild=true /p:Targets=Publish /p:PublishProfile=IIS02.pubxml /p:VisualStudioVersion=16.0 /p:RunCodeAnalysis=false /p:Configuration=IIS02 /p:username=jenkins /p:Password=viadante16 /p:AllowUntrustedCertificate=true /p:OutputPath=bin/ NKC_WF/NKC_WF.csproj"
sleep 3
}
},
NKC_WF.sln
+9
View File
@@ -23,6 +23,7 @@ Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Any CPU = Debug|Any CPU
Debug-LELE|Any CPU = Debug-LELE|Any CPU
IIS02|Any CPU = IIS02|Any CPU
Prod|Any CPU = Prod|Any CPU
Release|Any CPU = Release|Any CPU
EndGlobalSection
@@ -31,6 +32,8 @@ Global
{6CEBB3D9-217D-42E2-8D26-2FB3A5DE2BF5}.Debug|Any CPU.Build.0 = Debug|Any CPU
{6CEBB3D9-217D-42E2-8D26-2FB3A5DE2BF5}.Debug-LELE|Any CPU.ActiveCfg = Debug-LELE|Any CPU
{6CEBB3D9-217D-42E2-8D26-2FB3A5DE2BF5}.Debug-LELE|Any CPU.Build.0 = Debug-LELE|Any CPU
{6CEBB3D9-217D-42E2-8D26-2FB3A5DE2BF5}.IIS02|Any CPU.ActiveCfg = IIS02|Any CPU
{6CEBB3D9-217D-42E2-8D26-2FB3A5DE2BF5}.IIS02|Any CPU.Build.0 = IIS02|Any CPU
{6CEBB3D9-217D-42E2-8D26-2FB3A5DE2BF5}.Prod|Any CPU.ActiveCfg = Prod|Any CPU
{6CEBB3D9-217D-42E2-8D26-2FB3A5DE2BF5}.Prod|Any CPU.Build.0 = Prod|Any CPU
{6CEBB3D9-217D-42E2-8D26-2FB3A5DE2BF5}.Release|Any CPU.ActiveCfg = Release|Any CPU
@@ -39,6 +42,8 @@ Global
{4308EA22-4C18-4A77-84DF-C6BCDD7BD07C}.Debug|Any CPU.Build.0 = Debug|Any CPU
{4308EA22-4C18-4A77-84DF-C6BCDD7BD07C}.Debug-LELE|Any CPU.ActiveCfg = Debug-LELE|Any CPU
{4308EA22-4C18-4A77-84DF-C6BCDD7BD07C}.Debug-LELE|Any CPU.Build.0 = Debug-LELE|Any CPU
{4308EA22-4C18-4A77-84DF-C6BCDD7BD07C}.IIS02|Any CPU.ActiveCfg = Release|Any CPU
{4308EA22-4C18-4A77-84DF-C6BCDD7BD07C}.IIS02|Any CPU.Build.0 = Release|Any CPU
{4308EA22-4C18-4A77-84DF-C6BCDD7BD07C}.Prod|Any CPU.ActiveCfg = Release|Any CPU
{4308EA22-4C18-4A77-84DF-C6BCDD7BD07C}.Prod|Any CPU.Build.0 = Release|Any CPU
{4308EA22-4C18-4A77-84DF-C6BCDD7BD07C}.Release|Any CPU.ActiveCfg = Release|Any CPU
@@ -47,6 +52,8 @@ Global
{175AF851-9AED-4D5F-8571-9CEC8B2D2320}.Debug|Any CPU.Build.0 = Debug|Any CPU
{175AF851-9AED-4D5F-8571-9CEC8B2D2320}.Debug-LELE|Any CPU.ActiveCfg = Debug|Any CPU
{175AF851-9AED-4D5F-8571-9CEC8B2D2320}.Debug-LELE|Any CPU.Build.0 = Debug|Any CPU
{175AF851-9AED-4D5F-8571-9CEC8B2D2320}.IIS02|Any CPU.ActiveCfg = Release|Any CPU
{175AF851-9AED-4D5F-8571-9CEC8B2D2320}.IIS02|Any CPU.Build.0 = Release|Any CPU
{175AF851-9AED-4D5F-8571-9CEC8B2D2320}.Prod|Any CPU.ActiveCfg = Release|Any CPU
{175AF851-9AED-4D5F-8571-9CEC8B2D2320}.Prod|Any CPU.Build.0 = Release|Any CPU
{175AF851-9AED-4D5F-8571-9CEC8B2D2320}.Release|Any CPU.ActiveCfg = Release|Any CPU
@@ -55,6 +62,8 @@ Global
{5A0B6E45-169B-44D4-9E24-13718B8EB7CC}.Debug|Any CPU.Build.0 = Debug|Any CPU
{5A0B6E45-169B-44D4-9E24-13718B8EB7CC}.Debug-LELE|Any CPU.ActiveCfg = Debug|Any CPU
{5A0B6E45-169B-44D4-9E24-13718B8EB7CC}.Debug-LELE|Any CPU.Build.0 = Debug|Any CPU
{5A0B6E45-169B-44D4-9E24-13718B8EB7CC}.IIS02|Any CPU.ActiveCfg = Release|Any CPU
{5A0B6E45-169B-44D4-9E24-13718B8EB7CC}.IIS02|Any CPU.Build.0 = Release|Any CPU
{5A0B6E45-169B-44D4-9E24-13718B8EB7CC}.Prod|Any CPU.ActiveCfg = Release|Any CPU
{5A0B6E45-169B-44D4-9E24-13718B8EB7CC}.Prod|Any CPU.Build.0 = Release|Any CPU
{5A0B6E45-169B-44D4-9E24-13718B8EB7CC}.Release|Any CPU.ActiveCfg = Release|Any CPU
NKC_WF/NKC_WF.csproj
+14
View File
@@ -1698,6 +1698,9 @@
<None Include="Web.Debug.config">
<DependentUpon>Web.config</DependentUpon>
</None>
<None Include="Web.IIS02.config">
<DependentUpon>Web.config</DependentUpon>
</None>
<None Include="Web.Prod.config">
<DependentUpon>Web.config</DependentUpon>
</None>
@@ -1764,6 +1767,17 @@
<ErrorReport>prompt</ErrorReport>
<CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'IIS02|AnyCPU'">
<DebugSymbols>true</DebugSymbols>
<OutputPath>bin\</OutputPath>
<DefineConstants>TRACE</DefineConstants>
<Optimize>true</Optimize>
<DebugType>pdbonly</DebugType>
<PlatformTarget>AnyCPU</PlatformTarget>
<LangVersion>7.3</LangVersion>
<ErrorReport>prompt</ErrorReport>
<CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
</PropertyGroup>
<Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
<Import Project="$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)\TypeScript\Microsoft.TypeScript.targets" Condition="Exists('$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)\TypeScript\Microsoft.TypeScript.targets')" />
<Import Project="$(VSToolsPath)\WebApplications\Microsoft.WebApplication.targets" Condition="'$(VSToolsPath)' != ''" />
NKC_WF/Web.IIS02.config
+21
View File
@@ -0,0 +1,21 @@
<?xml version="1.0" encoding="utf-8"?>
<!-- Per altre informazioni sull'utilizzo della trasformazione web.config, vedere https://go.microsoft.com/fwlink/?LinkId=125889 -->
<configuration xmlns:xdt="http://schemas.microsoft.com/XML-Document-Transform">
<appSettings>
<!--conn string-->
<add key="NKC_WFConnectionString" value="Data Source=SQL2016PROD;Initial Catalog=Sauder_NKC_prod;Persist Security Info=True;User ID=conn_NKC;Password=pwd_NKC;" xdt:Transform="SetAttributes" xdt:Locator="Match(key)" />
<add key="DbConfConnectionString" value="Data Source=SQL2016PROD;Initial Catalog=Sauder_NKC_prod;Persist Security Info=True;User ID=conn_NKC;Password=pwd_NKC;" xdt:Transform="SetAttributes" xdt:Locator="Match(key)" />
<add key="VocabolarioConnectionString" value="Data Source=SQL2016PROD;Initial Catalog=Sauder_NKC_prod;Persist Security Info=True;User ID=conn_NKC;Password=pwd_NKC;" xdt:Transform="SetAttributes" xdt:Locator="Match(key)" />
<add key="UtenteCdcConnectionString" value="Data Source=SQL2016PROD;Initial Catalog=Sauder_NKC_prod;Persist Security Info=True;User ID=conn_NKC;Password=pwd_NKC;" xdt:Transform="SetAttributes" xdt:Locator="Match(key)" />
<add key="PermessiConnectionString" value="Data Source=SQL2016PROD;Initial Catalog=Sauder_NKC_prod;Persist Security Info=True;User ID=conn_NKC;Password=pwd_NKC;" xdt:Transform="SetAttributes" xdt:Locator="Match(key)" />
</appSettings>
<connectionStrings>
<add name="AppData.Properties.Settings.Sauder_NKCConnectionString" connectionString="Data Source=SQL2016PROD;Initial Catalog=Sauder_NKC_prod;Persist Security Info=True;User ID=conn_NKC;Password=pwd_NKC" xdt:Transform="SetAttributes" xdt:Locator="Match(name)" />
<add name="ErrorLog" connectionString="Data Source=SQL2016PROD;Initial Catalog=Elmah;Persist Security Info=True;User ID=conn_NKC;Password=pwd_NKC" xdt:Transform="SetAttributes" xdt:Locator="Match(name)" />
</connectionStrings>
<system.web>
<compilation xdt:Transform="RemoveAttributes(debug)" />
</system.web>
</configuration>
NKC_WF/Web.config
+10 -8
View File
@@ -13,7 +13,7 @@
</sectionGroup>
</configSections>
<system.web>
<compilation targetFramework="4.6.2" debug="true"/>
<compilation targetFramework="4.6.2"/>
<httpRuntime targetFramework="4.6.2"/>
<pages>
<namespaces>
@@ -83,20 +83,22 @@
<add key="mdbConnString" value="mongodb://W2019-MONGODB:27017"/>
<add key="enableMongo" value="true"/>
<!--Configurazioni DB per classi referenziate AppData e Steamware dll-->
<add key="NKC_WFConnectionString" value="Data Source=SQL2016DEV;Initial Catalog=Sauder_NKC;Persist Security Info=True;User ID=sa;Password=keyhammer16;"/>
<add key="DbConfConnectionString" value="Data Source=SQL2016DEV;Initial Catalog=Sauder_NKC;Persist Security Info=True;User ID=sa;Password=keyhammer16;"/>
<add key="NKC_WFConnectionString"
value="Data Source=SQL2016PROD;Initial Catalog=Sauder_NKC_prod;Persist Security Info=True;User ID=conn_NKC;Password=pwd_NKC;"/>
<add key="DbConfConnectionString"
value="Data Source=SQL2016PROD;Initial Catalog=Sauder_NKC_prod;Persist Security Info=True;User ID=conn_NKC;Password=pwd_NKC;"/>
<add key="VocabolarioConnectionString"
value="Data Source=SQL2016DEV;Initial Catalog=Sauder_NKC;Persist Security Info=True;User ID=sa;Password=keyhammer16;"/>
value="Data Source=SQL2016PROD;Initial Catalog=Sauder_NKC_prod;Persist Security Info=True;User ID=conn_NKC;Password=pwd_NKC;"/>
<add key="UtenteCdcConnectionString"
value="Data Source=SQL2016DEV;Initial Catalog=Sauder_NKC;Persist Security Info=True;User ID=sa;Password=keyhammer16;"/>
value="Data Source=SQL2016PROD;Initial Catalog=Sauder_NKC_prod;Persist Security Info=True;User ID=conn_NKC;Password=pwd_NKC;"/>
<add key="PermessiConnectionString"
value="Data Source=SQL2016DEV;Initial Catalog=Sauder_NKC;Persist Security Info=True;User ID=sa;Password=keyhammer16;"/>
value="Data Source=SQL2016PROD;Initial Catalog=Sauder_NKC_prod;Persist Security Info=True;User ID=conn_NKC;Password=pwd_NKC;"/>
</appSettings>
<connectionStrings>
<add name="AppData.Properties.Settings.Sauder_NKCConnectionString"
connectionString="Data Source=SQL2016DEV;Initial Catalog=Sauder_NKC;Persist Security Info=True;User ID=sa;Password=keyhammer16;"
connectionString="Data Source=SQL2016PROD;Initial Catalog=Sauder_NKC_prod;Persist Security Info=True;User ID=conn_NKC;Password=pwd_NKC"
providerName="System.Data.SqlClient"/>
<add name="ErrorLog" connectionString="Data Source=SQL2016DEV;Initial Catalog=Elmah;Persist Security Info=True;User ID=sa;Password=keyhammer16;"
<add name="ErrorLog" connectionString="Data Source=SQL2016PROD;Initial Catalog=Elmah;Persist Security Info=True;User ID=conn_NKC;Password=pwd_NKC"
providerName="System.Data.SqlClient"/>
</connectionStrings>
<runtime>
NKC_WF/WebUserControls/cmp_kittingBin.ascx
+1 -1
View File
@@ -4,7 +4,7 @@
<asp:Repeater runat="server" ID="repBins" DataSourceID="ods">
<ItemTemplate>
<div class="col-2 px-1">
<div runat="server" id="divBlock" class="row small alert border-thick p-0 pb-2 alert-primary border border-primary" role="alert">
<div runat="server" id="divBlock" class="row small alert border-thick mx-1 p-0 pb-2 alert-primary border border-primary" role="alert">
<div class="col-12 bg-primary text-light pt-2">
<h5>
<asp:Label runat="server" ID="lblTitle" Text='<%# $"<b>B{Eval("BinIndex")}</b> | {Eval("BinDtmxProc")}" %>' CssClass="text-uppercase" /></h5>
NKC_WF/WebUserControls/cmp_kittingCart.ascx
+1 -1
View File
@@ -4,7 +4,7 @@
<asp:Repeater runat="server" ID="repCarts" DataSourceID="ods">
<ItemTemplate>
<div class="col-2 px-1">
<div runat="server" id="divBlock" class='<%# "row small alert border-thick p-0 pb-2 border " + getCssByNums(Eval("NumPzWaiting"),Eval("NumPzBinAvail"),Eval("OtherQtyWait"),Eval("OtherQtyCur")) %>' role="alert">
<div runat="server" id="divBlock" class='<%# "row small alert border-thick mx-1 p-0 pb-2 border " + getCssByNums(Eval("NumPzWaiting"),Eval("NumPzBinAvail"),Eval("OtherQtyWait"),Eval("OtherQtyCur")) %>' role="alert">
<div class="col-12 bg-success text-light pt-2">
<h5>
<asp:Label runat="server" ID="lblTitle" Text='<%# $"<b>C{Eval("CartIndex")}</b> | {Eval("CartDtmx")}" %>' CssClass="text-uppercase" /></h5>