diff --git a/GPW.CORE.Api/Data/ApiDataService.cs b/GPW.CORE.Api/Data/ApiDataService.cs
index ac39d15..858e072 100644
--- a/GPW.CORE.Api/Data/ApiDataService.cs
+++ b/GPW.CORE.Api/Data/ApiDataService.cs
@@ -23,7 +23,7 @@ namespace GPW.CORE.Api.Data
///
/// Classe Accesso metodi DB
///
- public static LiMan.DB.Controllers.DbController dbController;
+ public static CORE.Data.Controllers.GPWController dbController;
///
/// 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");
}
}
diff --git a/GPW.CORE.Api/GPW.CORE.Api.csproj b/GPW.CORE.Api/GPW.CORE.Api.csproj
index 8410a64..42b4be2 100644
--- a/GPW.CORE.Api/GPW.CORE.Api.csproj
+++ b/GPW.CORE.Api/GPW.CORE.Api.csproj
@@ -16,4 +16,8 @@
+
+
+
+
diff --git a/GPW.CORE.Api/appsettings.json b/GPW.CORE.Api/appsettings.json
index 10f68b8..adbeb82 100644
--- a/GPW.CORE.Api/appsettings.json
+++ b/GPW.CORE.Api/appsettings.json
@@ -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"
+ }
}
diff --git a/GPW.CORE.UI/Components/RecFaseStart.razor b/GPW.CORE.UI/Components/RecFaseStart.razor
index 5bfa5be..8ff0257 100644
--- a/GPW.CORE.UI/Components/RecFaseStart.razor
+++ b/GPW.CORE.UI/Components/RecFaseStart.razor
@@ -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()
{
diff --git a/GPW.CORE.UI/GPW.CORE.UI.csproj b/GPW.CORE.UI/GPW.CORE.UI.csproj
index c789119..a383b74 100644
--- a/GPW.CORE.UI/GPW.CORE.UI.csproj
+++ b/GPW.CORE.UI/GPW.CORE.UI.csproj
@@ -2,7 +2,7 @@
net6.0
- 3.0.2201.2510
+ 3.0.2201.2511
enable
enable
diff --git a/Resources/ChangeLog.html b/Resources/ChangeLog.html
index 04bd9b3..57446c7 100644
--- a/Resources/ChangeLog.html
+++ b/Resources/ChangeLog.html
@@ -1,6 +1,6 @@
GPW - Gestione Presenze Web
- Versione: 3.0.2201.2510
+ Versione: 3.0.2201.2511
Note di rilascio:
-
diff --git a/Resources/VersNum.txt b/Resources/VersNum.txt
index b042bfe..0fc1b1e 100644
--- a/Resources/VersNum.txt
+++ b/Resources/VersNum.txt
@@ -1 +1 @@
-3.0.2201.2510
+3.0.2201.2511
diff --git a/Resources/manifest.xml b/Resources/manifest.xml
index 116b359..0cfd2af 100644
--- a/Resources/manifest.xml
+++ b/Resources/manifest.xml
@@ -1,6 +1,6 @@
-
- 3.0.2201.2510
+ 3.0.2201.2511
http://nexus.steamware.net/repository/SWS/GWMS/stable/0/GWMS.UI.zip
http://nexus.steamware.net/repository/SWS/GWMS/stable/0/ChangeLog.html
false