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

Merge branch 'release/FixDeployIIS03'

Browse Source
This commit is contained in:
Samuele Locatelli
2022-01-29 12:47:15 +01:00
parent b5876775ce 63953fce65
commit ade404201f
8 changed files with 18 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files
.gitlab-ci.yml
+2 -2
View File
@@ -72,7 +72,7 @@ CORE.Api:deploy:
# IIS 02
- dotnet publish -p:PublishProfile=IIS02.pubxml -p:RunCodeAnalysis=false -p:Configuration=Release -p:username=jenkins -p:Password=viadante16 -p:AllowUntrustedCertificate=true GPW.CORE.Api/GPW.CORE.Api.csproj
# IIS DEV
- dotnet publish -p:PublishProfile=W2019-IIS-DEV.pubxml -p:RunCodeAnalysis=false -p:Configuration=Release -p:username=jenkins -p:Password=viadante16 -p:AllowUntrustedCertificate=true GPW.CORE.Api/GPW.CORE.Api.csproj
- dotnet publish -p:PublishProfile=IIS03.pubxml -p:RunCodeAnalysis=false -p:Configuration=Release -p:username=jenkins -p:Password=viadante16 -p:AllowUntrustedCertificate=true GPW.CORE.Api/GPW.CORE.Api.csproj
CORE.WLOG:deploy:
stage: deploy
@@ -85,7 +85,7 @@ CORE.WLOG:deploy:
# IIS 02
- dotnet publish -p:PublishProfile=IIS02.pubxml -p:RunCodeAnalysis=false -p:Configuration=Release -p:username=jenkins -p:Password=viadante16 -p:AllowUntrustedCertificate=true GPW.CORE.WRKLOG/GPW.CORE.WRKLOG.csproj
# IIS DEV
- dotnet publish -p:PublishProfile=W2019-IIS-DEV.pubxml -p:RunCodeAnalysis=false -p:Configuration=Release -p:username=jenkins -p:Password=viadante16 -p:AllowUntrustedCertificate=true GPW.CORE.WRKLOG/GPW.CORE.WRKLOG.csproj
- dotnet publish -p:PublishProfile=IIS03.pubxml -p:RunCodeAnalysis=false -p:Configuration=Release -p:username=jenkins -p:Password=viadante16 -p:AllowUntrustedCertificate=true GPW.CORE.WRKLOG/GPW.CORE.WRKLOG.csproj
CORE.Api:release:
stage: release
GPW.CORE.WRKLOG/Components/DettAtt.razor
+10 -10
View File
@@ -6,25 +6,25 @@
<div class="py-0 my-1 small flex-fill @blockCss" style="width: @widthPerc">
<div class="d-flex">
<button @onclick="() => Edit()" class="px-1 text-center border border-secondary border-top-0 border-bottom-0 border-left-0 btn btn-primary btn-sm py-1" style="font-size: 1rem; width:4.5em;">
<div>@CurrData.Inizio.ToString("HH:mm")</div>
<div>@CurrData.Fine.ToString("HH:mm")</div>
<button @onclick="() => Edit()" class="px-1 text-center border border-secondary border-top-0 border-bottom-0 border-left-0 btn btn-primary btn-sm py-1" style="font-size: 1.1rem; width:7em;">
<div>@CurrData.Inizio.ToString("HH:mm") - @CurrData.Fine.ToString("HH:mm")</div>
<div class="badge badge-dark p-1 w-100" style="font-size: 1.1rem;">@($"{@CurrData.Durata.Hours}h {@CurrData.Durata.Minutes:00}'")</div>
</button>
<div class="px-1 py-0 text-left textTrim flex-fill">
<div class="px-2 py-0 text-left textTrim flex-fill" style="font-size: 1.1rem;">
<div class="text-dark" title="@CurrData.FasiNav?.ProgettoNav?.ClienteNav?.RagSociale - @CurrData.FasiNav?.ProgettoNav?.NomeProj"><b>@(trimLine($"{CurrData.FasiNav?.ProgettoNav?.ClienteNav?.RagSociale}",100))</b> - @(trimLine($"{CurrData.FasiNav?.ProgettoNav?.NomeProj}",150))</div>
<div class="text-secondary" title="@CurrData.FasiNav?.DescrizioneFase">@(trimLine($"{CurrData.FasiNav?.DescrizioneFase}",250))</div>
<div class="" title="@CurrData.Descrizione">@(trimLine($"{CurrData.Descrizione}",500))</div>
<div class="text-secondary" title="@CurrData.FasiNav?.DescrizioneFase">@(trimLine($"{CurrData.FasiNav?.DescrizioneFase}",150))</div>
<div class="" title="@CurrData.Descrizione">@(trimLine($"{CurrData.Descrizione}",250))</div>
</div>
<button @onclick="() => Edit()" class="px-1 text-center border border-secondary border-top-0 border-bottom-0 border-left-0 btn btn-dark btn-sm py-1" style="font-size: 1.4rem; width:3.4em;">
@*<button @onclick="() => Edit()" class="px-1 text-center border border-secondary border-top-0 border-bottom-0 border-left-0 btn btn-dark btn-sm py-1" style="font-size: 1.4rem; width:3.4em;">
@if (@CurrData.OreTot > 1)
{
<span>@($"{@CurrData.Durata.Hours}h {@CurrData.Durata.Minutes:00}'")</span>
<span>@($"{@CurrData.Durata.Hours}h {@CurrData.Durata.Minutes:00}'")</span>
}
else
{
<span>@($"{CurrData.OreTot*60:N0}'")</span>
<span>@($"{CurrData.OreTot*60:N0}'")</span>
}
</button>
</button>*@
</div>
</div>
GPW.CORE.WRKLOG/GPW.CORE.WRKLOG.csproj
+1 -1
View File
@@ -2,7 +2,7 @@
<PropertyGroup>
<TargetFramework>net6.0</TargetFramework>
<Version>3.0.2201.2820</Version>
<Version>3.0.2201.2912</Version>
<Nullable>enable</Nullable>
<ImplicitUsings>enable</ImplicitUsings>
</PropertyGroup>
GPW.CORE.WRKLOG/Pages/Planner.razor
+1 -1
View File
@@ -25,7 +25,7 @@ else if (showTemp)
else if (showDay)
{
<dialog class="modal fade show" tabindex="-1" style="display:block; background-color: rgba(10,10,10,.6);" aria-modal="true" role="dialog">
<div class="modal-dialog modal-lg">
<div class="modal-dialog modal-xl">
<div class="modal-content">
<DayAgendaDetail DayDTO="@SelDayDTO" CloseReq="ResetDayAgenda" ItemSelected="ReportSelect"></DayAgendaDetail>
</div>
GPW.CORE.WRKLOG/Pages/Planner.razor.cs
+1 -1
View File
@@ -215,7 +215,7 @@ namespace GPW.CORE.WRKLOG.Pages
int maxHour = 14;
if (ListRecords != null)
{
int roundMin = 15;
int roundMin = 30;
// per ogni giornata
foreach (var giornata in ListRecords)
{
Resources/ChangeLog.html
+1 -1
View File
@@ -1,6 +1,6 @@
<body>
<i>GPW - Gestione Presenze Web</i>
<h4>Versione: 3.0.2201.2820</h4>
<h4>Versione: 3.0.2201.2912</h4>
<br /> Note di rilascio:
<ul>
<li>
Resources/VersNum.txt
+1 -1
View File
@@ -1 +1 @@
3.0.2201.2820
3.0.2201.2912
Resources/manifest.xml
+1 -1
View File
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<item>
<version>3.0.2201.2820</version>
<version>3.0.2201.2912</version>
<url>http://nexus.steamware.net/repository/SWS/GWMS/stable/0/GWMS.UI.zip</url>
<changelog>http://nexus.steamware.net/repository/SWS/GWMS/stable/0/ChangeLog.html</changelog>
<mandatory>false</mandatory>