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

Fix veto x proj in FastRec

Browse Source
This commit is contained in:
Samuele Locatelli
2022-01-25 11:49:52 +01:00
parent fc35d40bca
commit a8be73f4e5
8 changed files with 47 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
GPW.CORE.Api/Data/ApiDataService.cs
+3 -3
View File
@@ -23,7 +23,7 @@ namespace GPW.CORE.Api.Data
/// <summary>
/// Classe Accesso metodi DB
/// </summary>
public static LiMan.DB.Controllers.DbController dbController;
public static CORE.Data.Controllers.GPWController dbController;
/// <summary>
/// Init classe
@@ -42,14 +42,14 @@ namespace GPW.CORE.Api.Data
//this.distributedCache = distributedCache;
// conf DB
string connStrDB = _configuration.GetConnectionString("LiMan.DB");
string connStrDB = _configuration.GetConnectionString("GPW.DB");
if (string.IsNullOrEmpty(connStrDB))
{
_logger.LogError("ConnString empty!");
}
else
{
dbController = new GPW.CORE.Data.Controllers.DbController(configuration);
dbController = new CORE.Data.Controllers.GPWController(configuration);
_logger.LogInformation("DbController OK");
}
}
GPW.CORE.Api/GPW.CORE.Api.csproj
+4
View File
@@ -16,4 +16,8 @@
<PackageReference Include="Swashbuckle.AspNetCore" Version="6.2.3" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\GPW.CORE.Data\GPW.CORE.Data.csproj" />
</ItemGroup>
</Project>
GPW.CORE.Api/appsettings.json
+21 -1
View File
@@ -5,5 +5,25 @@
"Microsoft.AspNetCore": "Warning"
}
},
"AllowedHosts": "*"
"AllowedHosts": "*",
"ConnectionStrings": {
"GPW.DB": "Server=SQLSTEAM;Database=GPW;User ID=sa;Password=keyhammer;integrated security=False;MultipleActiveResultSets=True;App=LiMan.API;",
"Redis": "localhost:6379,DefaultDatabase=15"
},
"ExternalProviders": {
"MailKit": {
"SMTP": {
"Address": "smtp.gmail.com",
"Port": "465",
"Account": "steamwarebot@gmail.com",
"Password": "drmfsls16",
"SenderEmail": "steamwarebot@gmail.com",
"SenderName": "Steamware Email BOT"
}
}
},
"MailDest": {
"Admin": "samuele@steamware.net",
"ProcOp": "ceo@steamware.net"
}
}
GPW.CORE.UI/Components/RecFaseStart.razor
+15 -1
View File
@@ -164,7 +164,7 @@ else
{
get
{
bool answ = true;
bool answ = !VetoProj;
if (CalcOreFasi != null)
{
if (!(bool)CalcOreFasi.Attivo)
@@ -187,6 +187,20 @@ else
{
get => GDataServ.VetoInsert;
}
private bool VetoProj
{
get
{
bool answ = false;
if (currProj != null)
{
var projAttivo = true;
_ = bool.TryParse($"{currProj.Attivo}", out projAttivo);
answ = !projAttivo;
}
return answ;
}
}
private async Task StartRecord()
{
GPW.CORE.UI/GPW.CORE.UI.csproj
+1 -1
View File
@@ -2,7 +2,7 @@
<PropertyGroup>
<TargetFramework>net6.0</TargetFramework>
<Version>3.0.2201.2510</Version>
<Version>3.0.2201.2511</Version>
<Nullable>enable</Nullable>
<ImplicitUsings>enable</ImplicitUsings>
</PropertyGroup>
Resources/ChangeLog.html
+1 -1
View File
@@ -1,6 +1,6 @@
<body>
<i>GPW - Gestione Presenze Web</i>
<h4>Versione: 3.0.2201.2510</h4>
<h4>Versione: 3.0.2201.2511</h4>
<br /> Note di rilascio:
<ul>
<li>
Resources/VersNum.txt
+1 -1
View File
@@ -1 +1 @@
3.0.2201.2510
3.0.2201.2511
Resources/manifest.xml
+1 -1
View File
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<item>
<version>3.0.2201.2510</version>
<version>3.0.2201.2511</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>