Merge branch 'release/UpdatePackListEdilchimica'

This commit is contained in:
Samuele Locatelli
2022-04-15 17:06:27 +02:00
280 changed files with 211 additions and 1379 deletions
+60 -64
View File
@@ -23,7 +23,6 @@ variables:
# helper creazione hash files x IIS
.hashBuild: &hashBuild
# $Target = $env:APP_NAME + "\ReleaseClienti\MAPO_PROD\" + $env:NEW_REL + "\" + $env:APP_NAME + ".zip"
- |
$Target = $env:APP_NAME + "\Release\" + $env:APP_NAME + ".zip"
$MD5 = Get-FileHash $Target -Algorithm MD5
@@ -156,7 +155,6 @@ IO:build:
script:
- '& "$env:MSBUILD_PATH" MP-IO/MP-IO.csproj -target:Build /p:Configuration=Release /p:Platform="Any CPU" /p:OutputPath=bin/ /verbosity:minimal /m'
SITE:build:
stage: build
variables:
@@ -172,20 +170,20 @@ SITE:build:
script:
- '& "$env:MSBUILD_PATH" MP-SITE/MP-SITE.csproj -target:Build /p:Configuration=Release /p:Platform="Any CPU" /p:OutputPath=bin/ /verbosity:minimal /m'
MON:build:
stage: build
variables:
CURR_PRJ: "MP-MON"
tags:
- win
rules:
- if: '$CI_COMMIT_BRANCH != "SDK"'
before_script:
- *nuget-fix
- '& "$env:NUGET_PATH" restore MAPO.sln -verbosity quiet'
- *version-fix
script:
- '& "$env:MSBUILD_PATH" MP-MON/MP-MON.csproj -target:Build /p:Configuration=Release /p:Platform="Any CPU" /p:OutputPath=bin/ /verbosity:minimal /m'
# MON:build:
# stage: build
# variables:
# CURR_PRJ: "MP-MON"
# tags:
# - win
# rules:
# - if: '$CI_COMMIT_BRANCH != "SDK"'
# before_script:
# - *nuget-fix
# - '& "$env:NUGET_PATH" restore MAPO.sln -verbosity quiet'
# - *version-fix
# script:
# - '& "$env:MSBUILD_PATH" MP-MON/MP-MON.csproj -target:Build /p:Configuration=Release /p:Platform="Any CPU" /p:OutputPath=bin/ /verbosity:minimal /m'
TAB:build:
stage: build
@@ -259,19 +257,19 @@ SITE:staging:
- '& "$env:MSBUILD_PATH" /p:m=4 /p:AspnetMergePath=$env:ASPNET_MERGE_PATH /p:DeployOnBuild=true /p:Targets=Publish /p:PublishProfile=IIS01.pubxml /p:RunCodeAnalysis=false /p:Configuration=IIS01 /p:username=jenkins /p:Password=viadante16 /p:AllowUntrustedCertificate=true /p:OutputPath=bin/ /verbosity:minimal MP-SITE/MP-SITE.csproj'
needs: ["SITE:build"]
MON:staging:
stage: staging
tags:
- win
rules:
- if: '$CI_COMMIT_BRANCH == "develop"'
before_script:
- *nuget-fix
- '& "$env:NUGET_PATH" restore MAPO.sln -verbosity quiet'
- *version-fix
script:
- '& "$env:MSBUILD_PATH" /p:m=4 /p:AspnetMergePath=$env:ASPNET_MERGE_PATH /p:DeployOnBuild=true /p:Targets=Publish /p:PublishProfile=IIS01.pubxml /p:RunCodeAnalysis=false /p:Configuration=IIS01 /p:username=jenkins /p:Password=viadante16 /p:AllowUntrustedCertificate=true /p:OutputPath=bin/ /verbosity:minimal MP-MON/MP-MON.csproj'
needs: ["MON:build"]
# MON:staging:
# stage: staging
# tags:
# - win
# rules:
# - if: '$CI_COMMIT_BRANCH == "develop"'
# before_script:
# - *nuget-fix
# - '& "$env:NUGET_PATH" restore MAPO.sln -verbosity quiet'
# - *version-fix
# script:
# - '& "$env:MSBUILD_PATH" /p:m=4 /p:AspnetMergePath=$env:ASPNET_MERGE_PATH /p:DeployOnBuild=true /p:Targets=Publish /p:PublishProfile=IIS01.pubxml /p:RunCodeAnalysis=false /p:Configuration=IIS01 /p:username=jenkins /p:Password=viadante16 /p:AllowUntrustedCertificate=true /p:OutputPath=bin/ /verbosity:minimal MP-MON/MP-MON.csproj'
# needs: ["MON:build"]
TAB:staging:
stage: staging
@@ -343,19 +341,19 @@ SITE:deploy:
- '& "$env:MSBUILD_PATH" /p:m=4 /p:AspnetMergePath=$env:ASPNET_MERGE_PATH /p:DeployOnBuild=true /p:Targets=Publish /p:PublishProfile=IIS02.pubxml /p:RunCodeAnalysis=false /p:Configuration=IIS02 /p:username=jenkins /p:Password=viadante16 /p:AllowUntrustedCertificate=true /p:OutputPath=bin/ /verbosity:minimal MP-SITE/MP-SITE.csproj'
needs: ["SITE:build"]
MON:deploy:
stage: deploy
tags:
- win
rules:
- if: '$CI_COMMIT_BRANCH == "master"'
before_script:
- *nuget-fix
- '& "$env:NUGET_PATH" restore MAPO.sln -verbosity quiet'
- *version-fix
script:
- '& "$env:MSBUILD_PATH" /p:m=4 /p:AspnetMergePath=$env:ASPNET_MERGE_PATH /p:DeployOnBuild=true /p:Targets=Publish /p:PublishProfile=IIS02.pubxml /p:RunCodeAnalysis=false /p:Configuration=IIS02 /p:username=jenkins /p:Password=viadante16 /p:AllowUntrustedCertificate=true /p:OutputPath=bin/ /verbosity:minimal MP-MON/MP-MON.csproj'
needs: ["MON:build"]
# MON:deploy:
# stage: deploy
# tags:
# - win
# rules:
# - if: '$CI_COMMIT_BRANCH == "master"'
# before_script:
# - *nuget-fix
# - '& "$env:NUGET_PATH" restore MAPO.sln -verbosity quiet'
# - *version-fix
# script:
# - '& "$env:MSBUILD_PATH" /p:m=4 /p:AspnetMergePath=$env:ASPNET_MERGE_PATH /p:DeployOnBuild=true /p:Targets=Publish /p:PublishProfile=IIS02.pubxml /p:RunCodeAnalysis=false /p:Configuration=IIS02 /p:username=jenkins /p:Password=viadante16 /p:AllowUntrustedCertificate=true /p:OutputPath=bin/ /verbosity:minimal MP-MON/MP-MON.csproj'
# needs: ["MON:build"]
TAB:deploy:
stage: deploy
@@ -448,27 +446,26 @@ SITE:install:
- *nexusUpload
needs: ["SITE:build"]
MON:install:
stage: installer
tags:
- win
rules:
- if: '$CI_COMMIT_BRANCH == "master"'
when: manual
- if: '$CI_COMMIT_BRANCH == "develop"'
variables:
APP_NAME: MP-MON
NEXUS_PATH: MP-MON
before_script:
- *nuget-fix
- '& "$env:NUGET_PATH" restore MAPO.sln -verbosity quiet'
- *version-fix
script:
- '& "$env:MSBUILD_PATH" /p:m=4 /p:AspnetMergePath=$env:ASPNET_MERGE_PATH /T:Package /P:Configuration=Release /p:PublishProfile=IIS02.pubxml /p:RunCodeAnalysis=false /p:PackageLocation=Release/$env:APP_NAME.zip /p:DeployIisAppPath="Default Web Site/MP/MON" /p:PackageAsSingleFile=True /p:OutputPath=bin/ /verbosity:minimal $env:APP_NAME/$env:APP_NAME.csproj'
- *hashBuild
- *nexusUpload
needs: ["MON:build"]
# MON:install:
# stage: installer
# tags:
# - win
# rules:
# - if: '$CI_COMMIT_BRANCH == "master"'
# when: manual
# - if: '$CI_COMMIT_BRANCH == "develop"'
# variables:
# APP_NAME: MP-MON
# NEXUS_PATH: MP-MON
# before_script:
# - *nuget-fix
# - '& "$env:NUGET_PATH" restore MAPO.sln -verbosity quiet'
# - *version-fix
# script:
# - '& "$env:MSBUILD_PATH" /p:m=4 /p:AspnetMergePath=$env:ASPNET_MERGE_PATH /T:Package /P:Configuration=Release /p:PublishProfile=IIS02.pubxml /p:RunCodeAnalysis=false /p:PackageLocation=Release/$env:APP_NAME.zip /p:DeployIisAppPath="Default Web Site/MP/MON" /p:PackageAsSingleFile=True /p:OutputPath=bin/ /verbosity:minimal $env:APP_NAME/$env:APP_NAME.csproj'
# - *hashBuild
# - *nexusUpload
# needs: ["MON:build"]
TAB:install:
stage: installer
@@ -511,4 +508,3 @@ MAG:install:
- *hashBuild
- *nexusUpload
needs: ["MAG:build"]
-8
View File
@@ -9,8 +9,6 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MapoDb", "MapoDb\MapoDb.csp
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MP-IO", "MP-IO\MP-IO.csproj", "{CE6CADA3-FA0E-41D6-AD43-8C92481DC29E}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MP-MON", "MP-MON\MP-MON.csproj", "{BA8BCBB8-601C-4642-AE65-0EBF9D5FBE15}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MP-TAB", "MP-TAB\MP-TAB.csproj", "{51F720FE-7BED-4275-93B1-CDA9A9B53670}"
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{8688B7C8-87E9-4FCE-B607-9C3F963CD6B7}"
@@ -54,12 +52,6 @@ Global
{CE6CADA3-FA0E-41D6-AD43-8C92481DC29E}.Prod|Any CPU.Build.0 = Prod|Any CPU
{CE6CADA3-FA0E-41D6-AD43-8C92481DC29E}.Release|Any CPU.ActiveCfg = Release|Any CPU
{CE6CADA3-FA0E-41D6-AD43-8C92481DC29E}.Release|Any CPU.Build.0 = Release|Any CPU
{BA8BCBB8-601C-4642-AE65-0EBF9D5FBE15}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{BA8BCBB8-601C-4642-AE65-0EBF9D5FBE15}.Debug|Any CPU.Build.0 = Debug|Any CPU
{BA8BCBB8-601C-4642-AE65-0EBF9D5FBE15}.Prod|Any CPU.ActiveCfg = Prod|Any CPU
{BA8BCBB8-601C-4642-AE65-0EBF9D5FBE15}.Prod|Any CPU.Build.0 = Prod|Any CPU
{BA8BCBB8-601C-4642-AE65-0EBF9D5FBE15}.Release|Any CPU.ActiveCfg = Release|Any CPU
{BA8BCBB8-601C-4642-AE65-0EBF9D5FBE15}.Release|Any CPU.Build.0 = Release|Any CPU
{51F720FE-7BED-4275-93B1-CDA9A9B53670}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{51F720FE-7BED-4275-93B1-CDA9A9B53670}.Debug|Any CPU.Build.0 = Debug|Any CPU
{51F720FE-7BED-4275-93B1-CDA9A9B53670}.Prod|Any CPU.ActiveCfg = Prod|Any CPU
+1 -4
View File
@@ -29,10 +29,7 @@
<ItemTemplate>
<div class="d-flex justify-content-between">
<div class="py-0 px-2 border-right border-light">
<asp:LinkButton runat="server" ID="lbtForceReload" CssClass="btn btn-info" ToolTip="Caricamento dati da ERP" OnClick="lbtForceReload_Click">
<i class="fa fa-refresh"></i>
FORCE RELOAD
</asp:LinkButton>
<asp:LinkButton runat="server" ID="lbtForceReload" CssClass="btn btn-info" ToolTip="Caricamento dati da ERP" OnClick="lbtForceReload_Click"><i class="fa fa-refresh"></i> FORCE RELOAD</asp:LinkButton>
</div>
<div class="py-0 px-2 border-right border-light">
<div class="d-flex justify-content-between">
+50 -50
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,137 +15,137 @@ namespace MP_ADM.WebUserControls
{
/// <summary>
/// Controllo updProgImport.
/// updProgImport 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.UpdateProgress updProgImport;
/// <summary>
/// Controllo frmView.
/// frmView 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.FormView frmView;
/// <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 ddlTipoStat.
/// ddlTipoStat 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 ddlTipoStat;
/// <summary>
/// Controllo lbtToggle.
/// lbtToggle 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 lbtToggle;
/// <summary>
/// Controllo tgIcon.
/// tgIcon 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 tgIcon;
/// <summary>
/// Controllo divDetail.
/// divDetail 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 divDetail;
/// <summary>
/// Controllo cmp_planStats_Fasi.
/// cmp_planStats_Fasi 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::MP_ADM.WebUserControls.cmp_planStats_Fasi cmp_planStats_Fasi;
/// <summary>
/// Controllo cmp_planStats_Mac.
/// cmp_planStats_Mac 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::MP_ADM.WebUserControls.cmp_planStats_Mac cmp_planStats_Mac;
/// <summary>
/// Controllo cmp_planStats_Cli.
/// cmp_planStats_Cli 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::MP_ADM.WebUserControls.cmp_planStats_Cli cmp_planStats_Cli;
/// <summary>
/// Controllo cmp_planStats_Art.
/// cmp_planStats_Art 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::MP_ADM.WebUserControls.cmp_planStats_Art cmp_planStats_Art;
/// <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;
}
+21 -18
View File
@@ -152,10 +152,11 @@ body {
text-align: center;
}
.shortcuts .shortcut {
min-width: 12rem;
color: black;
min-width: 10.5rem;
min-height: 6rem;
display: inline-block;
padding: 3rem/3 0;
padding: 1rem 0;
margin: 0 2px 1em;
vertical-align: top;
text-decoration: none;
@@ -168,13 +169,14 @@ body {
filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffffffff', endColorstr='#ffeeeeee', GradientType=0);
border: 1px solid #ddd;
box-sizing: border-box;
border-radius: 1.5rem/2;
border-radius: 0.75rem;
}
.shortcuts .shortcut-sm {
color: black;
min-width: 6.75rem;
min-height: 4.5rem;
display: inline-block;
padding: 1.5rem/4 0;
padding: 0.375rem 0;
margin: 0 2px 1em;
vertical-align: top;
text-decoration: none;
@@ -187,7 +189,7 @@ body {
filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffffffff', endColorstr='#ffeeeeee', GradientType=0);
border: 1px solid #ddd;
box-sizing: border-box;
border-radius: 1.5rem/2;
border-radius: 0.75rem;
}
.shortcuts .shortcut .shortcut-icon {
width: 100%;
@@ -204,22 +206,24 @@ body {
color: #333;
}
.shortcuts .shortcut:hover {
background: #E8E8E8;
background-image: -webkit-gradient(linear, left 0%, left 100%, from(#fafafa), to(#e1e1e1));
background-image: -webkit-linear-gradient(top, #fafafa, 0%, #e1e1e1, 100%);
background-image: -moz-linear-gradient(top, #fafafa 0%, #e1e1e1 100%);
background-image: linear-gradient(to bottom, #fafafa 0%, #e1e1e1 100%);
color: #FFFFFF;
background: #696969;
background-image: -webkit-gradient(linear, left 0%, left 100%, from(#fafafa), to(#696969));
background-image: -webkit-linear-gradient(top, #fafafa, 0%, #696969, 100%);
background-image: -moz-linear-gradient(top, #fafafa 0%, #696969 100%);
background-image: linear-gradient(to bottom, #fafafa 0%, #696969 100%);
background-repeat: repeat-x;
filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#fffafafa', endColorstr='#ffe1e1e1', GradientType=0);
filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#fffafafa', endColorstr='#ff696969', GradientType=0);
}
.shortcuts .shortcut-sm:hover {
background: #E8E8E8;
background-image: -webkit-gradient(linear, left 0%, left 100%, from(#fafafa), to(#e1e1e1));
background-image: -webkit-linear-gradient(top, #fafafa, 0%, #e1e1e1, 100%);
background-image: -moz-linear-gradient(top, #fafafa 0%, #e1e1e1 100%);
background-image: linear-gradient(to bottom, #fafafa 0%, #e1e1e1 100%);
color: #FFFFFF;
background: #696969;
background-image: -webkit-gradient(linear, left 0%, left 100%, from(#fafafa), to(#696969));
background-image: -webkit-linear-gradient(top, #fafafa, 0%, #696969, 100%);
background-image: -moz-linear-gradient(top, #fafafa 0%, #696969 100%);
background-image: linear-gradient(to bottom, #fafafa 0%, #696969 100%);
background-repeat: repeat-x;
filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#fffafafa', endColorstr='#ffe1e1e1', GradientType=0);
filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#fffafafa', endColorstr='#ff696969', GradientType=0);
}
.shortcuts .shortcut:active {
box-shadow: inset 0 3px 5px rgba(0, 0, 0, 0.125);
@@ -237,5 +241,4 @@ body {
display: block;
margin-top: 0.75em;
font-weight: 400;
color: #666;
}
+26 -23
View File
@@ -190,10 +190,11 @@ body {
}
.shortcuts .shortcut {
min-width: @blSCut * 8;
min-height: @blSCut * 4;
color: black;
min-width: (@blSCut * 7);
min-height: (@blSCut * 4);
display: inline-block;
padding: @blSCut*2/3 0;
padding: (@blSCut * 2 / 3) 0;
margin: 0 2px 1em;
vertical-align: top;
text-decoration: none;
@@ -206,14 +207,15 @@ body {
filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffffffff', endColorstr='#ffeeeeee', GradientType=0);
border: 1px solid #ddd;
box-sizing: border-box;
border-radius: @blSCut/2;
border-radius: (@blSCut / 2);
}
.shortcuts .shortcut-sm {
min-width: @blSCut * 4.5;
min-height: @blSCut * 3;
color: black;
min-width: (@blSCut * 4.5);
min-height: (@blSCut * 3);
display: inline-block;
padding: @blSCut/4 0;
padding: (@blSCut / 4) 0;
margin: 0 2px 1em;
vertical-align: top;
text-decoration: none;
@@ -226,14 +228,14 @@ body {
filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffffffff', endColorstr='#ffeeeeee', GradientType=0);
border: 1px solid #ddd;
box-sizing: border-box;
border-radius: @blSCut/2;
border-radius: (@blSCut/2);
}
.shortcuts .shortcut .shortcut-icon {
width: 100%;
margin-top: 0;
margin-bottom: 0;
font-size: @blSCut*2;
font-size: (@blSCut*2);
color: #333;
}
@@ -241,28 +243,30 @@ body {
width: 100%;
margin-top: 0;
margin-bottom: 0;
font-size: @blSCut*2;
font-size: (@blSCut*2);
color: #333;
}
.shortcuts .shortcut:hover {
background: #E8E8E8;
background-image: -webkit-gradient(linear, left 0%, left 100%, from(#fafafa), to(#e1e1e1));
background-image: -webkit-linear-gradient(top, #fafafa, 0%, #e1e1e1, 100%);
background-image: -moz-linear-gradient(top, #fafafa 0%, #e1e1e1 100%);
background-image: linear-gradient(to bottom, #fafafa 0%, #e1e1e1 100%);
color: #FFFFFF;
background: #696969;
background-image: -webkit-gradient(linear, left 0%, left 100%, from(#fafafa), to(#696969));
background-image: -webkit-linear-gradient(top, #fafafa, 0%, #696969, 100%);
background-image: -moz-linear-gradient(top, #fafafa 0%, #696969 100%);
background-image: linear-gradient(to bottom, #fafafa 0%, #696969 100%);
background-repeat: repeat-x;
filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#fffafafa', endColorstr='#ffe1e1e1', GradientType=0);
filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#fffafafa', endColorstr='#ff696969', GradientType=0);
}
.shortcuts .shortcut-sm:hover {
background: #E8E8E8;
background-image: -webkit-gradient(linear, left 0%, left 100%, from(#fafafa), to(#e1e1e1));
background-image: -webkit-linear-gradient(top, #fafafa, 0%, #e1e1e1, 100%);
background-image: -moz-linear-gradient(top, #fafafa 0%, #e1e1e1 100%);
background-image: linear-gradient(to bottom, #fafafa 0%, #e1e1e1 100%);
color: #FFFFFF;
background: #696969;
background-image: -webkit-gradient(linear, left 0%, left 100%, from(#fafafa), to(#696969));
background-image: -webkit-linear-gradient(top, #fafafa, 0%, #696969, 100%);
background-image: -moz-linear-gradient(top, #fafafa 0%, #696969 100%);
background-image: linear-gradient(to bottom, #fafafa 0%, #696969 100%);
background-repeat: repeat-x;
filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#fffafafa', endColorstr='#ffe1e1e1', GradientType=0);
filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#fffafafa', endColorstr='#ff696969', GradientType=0);
}
.shortcuts .shortcut:active {
@@ -285,5 +289,4 @@ body {
display: block;
margin-top: .75em;
font-weight: 400;
color: #666;
}
+1 -1
View File
@@ -1 +1 @@
body{font-family:'Roboto Condensed',sans-serif;padding-top:50px;padding-bottom:20px;}.textCondens{font-family:'Open Sans Condensed',sans-serif;}.textNormal{font-family:'Roboto',sans-serif;}@media screen and (min-width:768px){.jumbotron{margin-top:20px;}.body-content{padding:0;}body{font-family:'Roboto',sans-serif;}}@media(max-width:992px){.container{width:100%;}}.GridPager a,.GridPager span{display:block;height:1.5em;min-width:1.5em;text-align:center;text-decoration:none;}.GridPager a{background-color:#f5f5f5;color:#969696;}.GridPager span{background-color:#a1dcf2;color:#000;font-weight:bold;}.border-thick{border-width:3px !important;}.flashColor{border:3px solid #00f;-webkit-animation-name:blueFlash;-webkit-animation-duration:.5s;-webkit-animation-timing-function:linear;-webkit-animation-delay:0s;-webkit-animation-iteration-count:infinite;-webkit-animation-direction:alternate;animation-name:blueFlash;animation-duration:.5s;animation-timing-function:linear;animation-delay:0s;animation-iteration-count:infinite;animation-direction:alternate;}@-webkit-keyframes blueFlash{0%{border-color:#c4dbff;}25%{border-color:#9dc4ff;}50%{border-color:#5ca5ff;}75%{border-color:#1b82ff;}100%{border-color:#005ccc;}}.bigText{font-size:1.3em;}.smallText{font-size:.8em;}.dl-horizontal dt{white-space:normal;}.deleted{text-decoration:line-through;}.padZL{padding-left:.2em;}.padZR{padding-right:.2em;}.padZRL{padding-left:.2em;padding-right:.2em;}.colAlt{color:#c93;}.fontBig{font-size:2em;}.tNote{color:#8a8a8a;font-style:italic;}.tNoWrap{white-space:nowrap;}.navbar{min-height:0;color:#696969;}.pagination{margin:5px 0;}.pageSelDD{width:6em;}.zeroWidth{width:0;}.shortcuts{text-align:center;}.shortcuts .shortcut{min-width:12rem;min-height:6rem;display:inline-block;padding:3rem/3 0;margin:0 2px 1em;vertical-align:top;text-decoration:none;background:#f3f3f3;background-image:-webkit-gradient(linear,left 0%,left 100%,from(#fff),to(#eee));background-image:-webkit-linear-gradient(top,#fff,0%,#eee,100%);background-image:-moz-linear-gradient(top,#fff 0%,#eee 100%);background-image:linear-gradient(to bottom,#fff 0%,#eee 100%);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffffffff',endColorstr='#ffeeeeee',GradientType=0);border:1px solid #ddd;box-sizing:border-box;border-radius:1.5rem/2;}.shortcuts .shortcut-sm{min-width:6.75rem;min-height:4.5rem;display:inline-block;padding:1.5rem/4 0;margin:0 2px 1em;vertical-align:top;text-decoration:none;background:#f3f3f3;background-image:-webkit-gradient(linear,left 0%,left 100%,from(#fff),to(#eee));background-image:-webkit-linear-gradient(top,#fff,0%,#eee,100%);background-image:-moz-linear-gradient(top,#fff 0%,#eee 100%);background-image:linear-gradient(to bottom,#fff 0%,#eee 100%);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffffffff',endColorstr='#ffeeeeee',GradientType=0);border:1px solid #ddd;box-sizing:border-box;border-radius:1.5rem/2;}.shortcuts .shortcut .shortcut-icon{width:100%;margin-top:0;margin-bottom:0;font-size:3rem;color:#333;}.shortcuts .shortcut-sm .shortcut-icon{width:100%;margin-top:0;margin-bottom:0;font-size:3rem;color:#333;}.shortcuts .shortcut:hover{background:#e8e8e8;background-image:-webkit-gradient(linear,left 0%,left 100%,from(#fafafa),to(#e1e1e1));background-image:-webkit-linear-gradient(top,#fafafa,0%,#e1e1e1,100%);background-image:-moz-linear-gradient(top,#fafafa 0%,#e1e1e1 100%);background-image:linear-gradient(to bottom,#fafafa 0%,#e1e1e1 100%);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#fffafafa',endColorstr='#ffe1e1e1',GradientType=0);}.shortcuts .shortcut-sm:hover{background:#e8e8e8;background-image:-webkit-gradient(linear,left 0%,left 100%,from(#fafafa),to(#e1e1e1));background-image:-webkit-linear-gradient(top,#fafafa,0%,#e1e1e1,100%);background-image:-moz-linear-gradient(top,#fafafa 0%,#e1e1e1 100%);background-image:linear-gradient(to bottom,#fafafa 0%,#e1e1e1 100%);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#fffafafa',endColorstr='#ffe1e1e1',GradientType=0);}.shortcuts .shortcut:active{box-shadow:inset 0 3px 5px rgba(0,0,0,.125);}.shortcuts .shortcut-sm:active{box-shadow:inset 0 3px 5px rgba(0,0,0,.125);}.shortcuts .shortcut:hover .shortcut-icon{color:#c93;}.shortcuts .shortcut-sm:hover .shortcut-icon{color:#666;}.shortcuts .shortcut-label{display:block;margin-top:.75em;font-weight:400;color:#666;}
body{font-family:'Roboto Condensed',sans-serif;padding-top:50px;padding-bottom:20px;}.textCondens{font-family:'Open Sans Condensed',sans-serif;}.textNormal{font-family:'Roboto',sans-serif;}@media screen and (min-width:768px){.jumbotron{margin-top:20px;}.body-content{padding:0;}body{font-family:'Roboto',sans-serif;}}@media(max-width:992px){.container{width:100%;}}.GridPager a,.GridPager span{display:block;height:1.5em;min-width:1.5em;text-align:center;text-decoration:none;}.GridPager a{background-color:#f5f5f5;color:#969696;}.GridPager span{background-color:#a1dcf2;color:#000;font-weight:bold;}.border-thick{border-width:3px !important;}.flashColor{border:3px solid #00f;-webkit-animation-name:blueFlash;-webkit-animation-duration:.5s;-webkit-animation-timing-function:linear;-webkit-animation-delay:0s;-webkit-animation-iteration-count:infinite;-webkit-animation-direction:alternate;animation-name:blueFlash;animation-duration:.5s;animation-timing-function:linear;animation-delay:0s;animation-iteration-count:infinite;animation-direction:alternate;}@-webkit-keyframes blueFlash{0%{border-color:#c4dbff;}25%{border-color:#9dc4ff;}50%{border-color:#5ca5ff;}75%{border-color:#1b82ff;}100%{border-color:#005ccc;}}.bigText{font-size:1.3em;}.smallText{font-size:.8em;}.dl-horizontal dt{white-space:normal;}.deleted{text-decoration:line-through;}.padZL{padding-left:.2em;}.padZR{padding-right:.2em;}.padZRL{padding-left:.2em;padding-right:.2em;}.colAlt{color:#c93;}.fontBig{font-size:2em;}.tNote{color:#8a8a8a;font-style:italic;}.tNoWrap{white-space:nowrap;}.navbar{min-height:0;color:#696969;}.pagination{margin:5px 0;}.pageSelDD{width:6em;}.zeroWidth{width:0;}.shortcuts{text-align:center;}.shortcuts .shortcut{color:#000;min-width:10.5rem;min-height:6rem;display:inline-block;padding:1rem 0;margin:0 2px 1em;vertical-align:top;text-decoration:none;background:#f3f3f3;background-image:-webkit-gradient(linear,left 0%,left 100%,from(#fff),to(#eee));background-image:-webkit-linear-gradient(top,#fff,0%,#eee,100%);background-image:-moz-linear-gradient(top,#fff 0%,#eee 100%);background-image:linear-gradient(to bottom,#fff 0%,#eee 100%);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffffffff',endColorstr='#ffeeeeee',GradientType=0);border:1px solid #ddd;box-sizing:border-box;border-radius:.75rem;}.shortcuts .shortcut-sm{color:#000;min-width:6.75rem;min-height:4.5rem;display:inline-block;padding:.375rem 0;margin:0 2px 1em;vertical-align:top;text-decoration:none;background:#f3f3f3;background-image:-webkit-gradient(linear,left 0%,left 100%,from(#fff),to(#eee));background-image:-webkit-linear-gradient(top,#fff,0%,#eee,100%);background-image:-moz-linear-gradient(top,#fff 0%,#eee 100%);background-image:linear-gradient(to bottom,#fff 0%,#eee 100%);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffffffff',endColorstr='#ffeeeeee',GradientType=0);border:1px solid #ddd;box-sizing:border-box;border-radius:.75rem;}.shortcuts .shortcut .shortcut-icon{width:100%;margin-top:0;margin-bottom:0;font-size:3rem;color:#333;}.shortcuts .shortcut-sm .shortcut-icon{width:100%;margin-top:0;margin-bottom:0;font-size:3rem;color:#333;}.shortcuts .shortcut:hover{color:#fff;background:#696969;background-image:-webkit-gradient(linear,left 0%,left 100%,from(#fafafa),to(#696969));background-image:-webkit-linear-gradient(top,#fafafa,0%,#696969,100%);background-image:-moz-linear-gradient(top,#fafafa 0%,#696969 100%);background-image:linear-gradient(to bottom,#fafafa 0%,#696969 100%);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#fffafafa',endColorstr='#ff696969',GradientType=0);}.shortcuts .shortcut-sm:hover{color:#fff;background:#696969;background-image:-webkit-gradient(linear,left 0%,left 100%,from(#fafafa),to(#696969));background-image:-webkit-linear-gradient(top,#fafafa,0%,#696969,100%);background-image:-moz-linear-gradient(top,#fafafa 0%,#696969 100%);background-image:linear-gradient(to bottom,#fafafa 0%,#696969 100%);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#fffafafa',endColorstr='#ff696969',GradientType=0);}.shortcuts .shortcut:active{box-shadow:inset 0 3px 5px rgba(0,0,0,.125);}.shortcuts .shortcut-sm:active{box-shadow:inset 0 3px 5px rgba(0,0,0,.125);}.shortcuts .shortcut:hover .shortcut-icon{color:#c93;}.shortcuts .shortcut-sm:hover .shortcut-icon{color:#666;}.shortcuts .shortcut-label{display:block;margin-top:.75em;font-weight:400;}
+6 -2
View File
@@ -2,9 +2,9 @@
<asp:Content ID="Content2" ContentPlaceHolderID="MainContent" runat="server">
<div class="container">
<div class="jumbotron">
<div class="alert alert-secondary p-5">
<h2>Modulo Magazzino</h2>
<i>Gestione Lotti e stampa etichette UDC prodotti</i>
<i>Gestione Lotti, stampa etichette UDC prodotti, Anagrafiche Logistiche</i>
</div>
<div class="shortcuts">
@@ -14,6 +14,10 @@
<i class="fa-2x text-dark fas fa-mobile-alt"></i>
<span class="shortcut-label">SMART START</span>
</a>
<a href="AnagCliFor" class="shortcut">
<i class="fa-2x text-dark fas fa-book"></i>
<span class="shortcut-label">Anag. CLi/Forn</span>
</a>
<a href="elencoLotti" class="shortcut">
<i class="fa-2x text-dark fas fa-list"></i>
<span class="shortcut-label">RICERCA LOTTI</span>
+1 -1
View File
@@ -110,7 +110,7 @@
</asp:TemplateField>
<asp:TemplateField ShowHeader="False">
<HeaderTemplate>
<asp:LinkButton ID="lbtAddNew" runat="server" CssClass="btn btn-sm btn-outline-dark" ToolTip="Add New" OnClick="lbtAddNew_Click" Visible='<%# EnableEdit %>'><i class="fas fa-plus"></i></asp:LinkButton>
<asp:LinkButton ID="lbtAddNew" runat="server" CssClass="btn btn-sm btn-outline-dark" ToolTip="Mostra/Nascondi Add New" OnClick="lbtAddNew_Click" Visible='<%# EnableEdit %>'><i class="fas fa-plus"></i></asp:LinkButton>
</HeaderTemplate>
<ItemTemplate>
<asp:LinkButton ID="lbtDelete" runat="server" CausesValidation="False" CommandName="Delete" CssClass="btn btn-sm btn-danger" OnClientClick='<%# SteamWare.jsUtils.getCBE("ConfirmDelete") %>' Visible='<%# EnableEdit && Eval("NumAL").ToString()=="0" %>'><i class="fa fa-trash" aria-hidden="true"></i></asp:LinkButton>
@@ -20,7 +20,12 @@ namespace MP_MAG.WebUserControls
set
{
hfCodCli.Value = $"{value}";
doUpdate();
#if false
if (PackListID > 0)
{
doUpdate();
}
#endif
}
}
@@ -35,7 +40,10 @@ namespace MP_MAG.WebUserControls
set
{
hfPackListID.Value = $"{value}";
doUpdate();
if (!string.IsNullOrEmpty(CodCliente))
{
doUpdate();
}
}
}
+8 -1
View File
@@ -8,7 +8,14 @@
<div class="card-header text-uppercase py-1">
<div class="row">
<div class="col-12 col-md-3">
<h3>Packing List</h3>
<div class="d-flex justify-content-between">
<div class="px-1">
<h4>Packing List</h4>
</div>
<div class="px-1">
<asp:LinkButton runat="server" ID="lbtForceReload" CssClass="btn btn-sm btn-primary" OnClick="lbtForceReload_Click"><i class="fas fa-sync-alt"></i> Force Reload</asp:LinkButton>
</div>
</div>
</div>
<div class="col-12 col-md-7 small">
<div class="input-group">
@@ -112,5 +112,12 @@ namespace MP_MAG.WebUserControls
}
#endregion Internal Methods
protected void lbtForceReload_Click(object sender, EventArgs e)
{
// forzo rilettura ordine... se abilitato ES3 / Arca
DataLayerObj.taArcaGiac.stp_IMP_All_Import_Process(null, null, null, null);
DataLayerObj.taArcaGiac.stp_IMP_All_Ordini_Process(null, null, null, "OVC", null);
}
}
}
@@ -14,6 +14,15 @@ namespace MP_MAG.WebUserControls
public partial class cmp_packListMgmt
{
/// <summary>
/// lbtForceReload control.
/// </summary>
/// <remarks>
/// Auto-generated field.
/// To modify move field declaration from designer file to code-behind file.
/// </remarks>
protected global::System.Web.UI.WebControls.LinkButton lbtForceReload;
/// <summary>
/// ddlElencoCli control.
/// </summary>
File diff suppressed because it is too large Load Diff
-51
View File
@@ -1,51 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup>
<UseIISExpress>true</UseIISExpress>
<WebStackScaffolding_ViewDialogWidth>600</WebStackScaffolding_ViewDialogWidth>
<WebStackScaffolding_IsLayoutPageSelected>True</WebStackScaffolding_IsLayoutPageSelected>
<WebStackScaffolding_IsPartialViewSelected>False</WebStackScaffolding_IsPartialViewSelected>
<WebStackScaffolding_IsReferencingScriptLibrariesSelected>False</WebStackScaffolding_IsReferencingScriptLibrariesSelected>
<WebStackScaffolding_LayoutPageFile />
<ProjectView>ShowAllFiles</ProjectView>
<NameOfLastUsedPublishProfile>OVH-Demo</NameOfLastUsedPublishProfile>
<WebStackScaffolding_ControllerDialogWidth>1440</WebStackScaffolding_ControllerDialogWidth>
<WebStackScaffolding_IsAsyncSelected>False</WebStackScaffolding_IsAsyncSelected>
<WebStackScaffolding_DbContextTypeFullName>MP_MON.Models.MoonProEntities</WebStackScaffolding_DbContextTypeFullName>
<WebStackScaffolding_IsViewGenerationSelected>True</WebStackScaffolding_IsViewGenerationSelected>
<Use64BitIISExpress />
<IISExpressSSLPort />
<IISExpressAnonymousAuthentication />
<IISExpressWindowsAuthentication />
<IISExpressUseClassicPipelineMode />
<UseGlobalApplicationHostFile />
<LastActiveSolutionConfig>Debug|Any CPU</LastActiveSolutionConfig>
<Controller_SelectedScaffolderID>ApiControllerWithActionsScaffolder</Controller_SelectedScaffolderID>
<Controller_SelectedScaffolderCategoryPath>root/Controller</Controller_SelectedScaffolderCategoryPath>
</PropertyGroup>
<ProjectExtensions>
<VisualStudio>
<FlavorProperties GUID="{349c5851-65df-11da-9384-00065b846f21}">
<WebProjectProperties>
<StartPageUrl>
</StartPageUrl>
<StartAction>CurrentPage</StartAction>
<AspNetDebugging>True</AspNetDebugging>
<SilverlightDebugging>False</SilverlightDebugging>
<NativeDebugging>False</NativeDebugging>
<SQLDebugging>False</SQLDebugging>
<ExternalProgram>
</ExternalProgram>
<StartExternalURL>
</StartExternalURL>
<StartCmdLineArguments>
</StartCmdLineArguments>
<StartWorkingDirectory>
</StartWorkingDirectory>
<EnableENC>True</EnableENC>
<AlwaysStartWebServerOnDebug>True</AlwaysStartWebServerOnDebug>
</WebProjectProperties>
</FlavorProperties>
</VisualStudio>
</ProjectExtensions>
</Project>
@@ -1,41 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<!--
This file is used by the publish/package process of your Web project. You can customize the behavior of this process
by editing this MSBuild file. In order to learn more about this please visit http://go.microsoft.com/fwlink/?LinkID=208121.
-->
<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup>
<WebPublishMethod>MSDeploy</WebPublishMethod>
<ADUsesOwinOrOpenIdConnect>False</ADUsesOwinOrOpenIdConnect>
<LastUsedBuildConfiguration>IIS01</LastUsedBuildConfiguration>
<LastUsedPlatform>Any CPU</LastUsedPlatform>
<SiteUrlToLaunchAfterPublish />
<LaunchSiteAfterPublish>True</LaunchSiteAfterPublish>
<ExcludeApp_Data>True</ExcludeApp_Data>
<MSDeployServiceURL>https://IIS01:8172/MsDeploy.axd</MSDeployServiceURL>
<DeployIisAppPath>Default Web Site/MP/MON</DeployIisAppPath>
<RemoteSitePhysicalPath />
<SkipExtraFilesOnServer>False</SkipExtraFilesOnServer>
<MSDeployPublishMethod>WMSVC</MSDeployPublishMethod>
<EnableMSDeployBackup>True</EnableMSDeployBackup>
<UserName>jenkins</UserName>
<_SavePWD>True</_SavePWD>
<PublishDatabaseSettings>
<Objects xmlns="">
<ObjectGroup Name="MapoMonEntities" Order="1" Enabled="False">
<Destination Path="" />
<Object Type="DbCodeFirst">
<Source Path="DBContext" DbContext="MP_MON.Models.MapoMonEntities, MP-MON" Origin="Configuration" />
</Object>
</ObjectGroup>
</Objects>
</PublishDatabaseSettings>
<PrecompileBeforePublish>True</PrecompileBeforePublish>
<EnableUpdateable>True</EnableUpdateable>
<DebugSymbols>False</DebugSymbols>
<WDPMergeOption>DonotMerge</WDPMergeOption>
</PropertyGroup>
<ItemGroup>
<MSDeployParameterValue Include="$(DeployParameterPrefix)MapoMonEntities-Web.config Connection String" />
</ItemGroup>
</Project>
@@ -1,11 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<!--
This file is used by the publish/package process of your Web project. You can customize the behavior of this process
by editing this MSBuild file. In order to learn more about this please visit http://go.microsoft.com/fwlink/?LinkID=208121.
-->
<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup>
<TimeStampOfAssociatedLegacyPublishXmlFile />
<EncryptedPassword>AQAAANCMnd8BFdERjHoAwE/Cl+sBAAAAH0adXzrANk+QkSQiwkrZoAAAAAACAAAAAAADZgAAwAAAABAAAAAewiJ+nIBbTTspMQrI3mYbAAAAAASAAACgAAAAEAAAAHv/uqF0OeZk5Jd/VDKaqDkYAAAAhda034UKNfpaxG3rzuVFGxxL3vD63IOpFAAAAPdOB9Rh9Dmin8POLOsKm2rkpUWP</EncryptedPassword>
</PropertyGroup>
</Project>
@@ -1,41 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<!--
This file is used by the publish/package process of your Web project. You can customize the behavior of this process
by editing this MSBuild file. In order to learn more about this please visit http://go.microsoft.com/fwlink/?LinkID=208121.
-->
<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup>
<WebPublishMethod>MSDeploy</WebPublishMethod>
<ADUsesOwinOrOpenIdConnect>False</ADUsesOwinOrOpenIdConnect>
<LastUsedBuildConfiguration>IIS02</LastUsedBuildConfiguration>
<LastUsedPlatform>Any CPU</LastUsedPlatform>
<SiteUrlToLaunchAfterPublish />
<LaunchSiteAfterPublish>True</LaunchSiteAfterPublish>
<ExcludeApp_Data>True</ExcludeApp_Data>
<MSDeployServiceURL>https://IIS02:8172/MsDeploy.axd</MSDeployServiceURL>
<DeployIisAppPath>Default Web Site/MP/MON</DeployIisAppPath>
<RemoteSitePhysicalPath />
<SkipExtraFilesOnServer>False</SkipExtraFilesOnServer>
<MSDeployPublishMethod>WMSVC</MSDeployPublishMethod>
<EnableMSDeployBackup>True</EnableMSDeployBackup>
<UserName>jenkins</UserName>
<_SavePWD>True</_SavePWD>
<PrecompileBeforePublish>True</PrecompileBeforePublish>
<EnableUpdateable>True</EnableUpdateable>
<DebugSymbols>False</DebugSymbols>
<WDPMergeOption>DonotMerge</WDPMergeOption>
<PublishDatabaseSettings>
<Objects xmlns="">
<ObjectGroup Name="MapoMonEntities" Order="1" Enabled="False">
<Destination Path="" />
<Object Type="DbCodeFirst">
<Source Path="DBContext" DbContext="MP_MON.Models.MapoMonEntities, MP-MON" Origin="Configuration" />
</Object>
</ObjectGroup>
</Objects>
</PublishDatabaseSettings>
</PropertyGroup>
<ItemGroup>
<MSDeployParameterValue Include="$(DeployParameterPrefix)MapoMonEntities-Web.config Connection String" />
</ItemGroup>
</Project>
@@ -1,11 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<!--
This file is used by the publish/package process of your Web project. You can customize the behavior of this process
by editing this MSBuild file. In order to learn more about this please visit http://go.microsoft.com/fwlink/?LinkID=208121.
-->
<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup>
<TimeStampOfAssociatedLegacyPublishXmlFile />
<EncryptedPassword>AQAAANCMnd8BFdERjHoAwE/Cl+sBAAAAH0adXzrANk+QkSQiwkrZoAAAAAACAAAAAAADZgAAwAAAABAAAACNVkF3Su901/DC3hNZl1gfAAAAAASAAACgAAAAEAAAAEufS9x2sME6BWrVhAqtSZcYAAAAdFUcWCqlDMWfdNjH3u3kaK1d+6g8yZhZFAAAAPq8jPh6qkXvKLqnRGO5Mkj6ESpe</EncryptedPassword>
</PropertyGroup>
</Project>

Before

Width:  |  Height:  |  Size: 31 KiB

After

Width:  |  Height:  |  Size: 31 KiB

Before

Width:  |  Height:  |  Size: 180 B

After

Width:  |  Height:  |  Size: 180 B

Before

Width:  |  Height:  |  Size: 178 B

After

Width:  |  Height:  |  Size: 178 B

Before

Width:  |  Height:  |  Size: 120 B

After

Width:  |  Height:  |  Size: 120 B

Before

Width:  |  Height:  |  Size: 105 B

After

Width:  |  Height:  |  Size: 105 B

Before

Width:  |  Height:  |  Size: 111 B

After

Width:  |  Height:  |  Size: 111 B

Before

Width:  |  Height:  |  Size: 110 B

After

Width:  |  Height:  |  Size: 110 B

Before

Width:  |  Height:  |  Size: 119 B

After

Width:  |  Height:  |  Size: 119 B

Before

Width:  |  Height:  |  Size: 4.3 KiB

After

Width:  |  Height:  |  Size: 4.3 KiB

Before

Width:  |  Height:  |  Size: 4.3 KiB

After

Width:  |  Height:  |  Size: 4.3 KiB

Before

Width:  |  Height:  |  Size: 6.8 KiB

After

Width:  |  Height:  |  Size: 6.8 KiB

Before

Width:  |  Height:  |  Size: 4.3 KiB

After

Width:  |  Height:  |  Size: 4.3 KiB

Before

Width:  |  Height:  |  Size: 6.8 KiB

After

Width:  |  Height:  |  Size: 6.8 KiB

Before

Width:  |  Height:  |  Size: 4.5 KiB

After

Width:  |  Height:  |  Size: 4.5 KiB

Before

Width:  |  Height:  |  Size: 6.8 KiB

After

Width:  |  Height:  |  Size: 6.8 KiB

Before

Width:  |  Height:  |  Size: 4.3 KiB

After

Width:  |  Height:  |  Size: 4.3 KiB

Before

Width:  |  Height:  |  Size: 4.5 KiB

After

Width:  |  Height:  |  Size: 4.5 KiB

Before

Width:  |  Height:  |  Size: 4.3 KiB

After

Width:  |  Height:  |  Size: 4.3 KiB

Before

Width:  |  Height:  |  Size: 6.2 KiB

After

Width:  |  Height:  |  Size: 6.2 KiB

Some files were not shown because too many files have changed in this diff Show More