diff --git a/Resources/ChangeLog.html b/Resources/ChangeLog.html
index fc0496c..2b721c3 100644
--- a/Resources/ChangeLog.html
+++ b/Resources/ChangeLog.html
@@ -1,6 +1,6 @@
WebDoorCreator - Egalware
- Version: 0.9.2403.0411
+ Version: 0.9.2403.0819
Release note:
-
diff --git a/Resources/VersNum.txt b/Resources/VersNum.txt
index d70aaa2..5dd980f 100644
--- a/Resources/VersNum.txt
+++ b/Resources/VersNum.txt
@@ -1 +1 @@
-0.9.2403.0411
+0.9.2403.0819
diff --git a/Resources/manifest.xml b/Resources/manifest.xml
index 7fd56c7..77b7353 100644
--- a/Resources/manifest.xml
+++ b/Resources/manifest.xml
@@ -1,6 +1,6 @@
-
- 0.9.2403.0411
+ 0.9.2403.0819
http://nexus.steamware.net/repository/SWS/WDC/stable/WDC.UI.zip
http://nexus.steamware.net/repository/SWS/WDC/stable/ChangeLog.html
false
diff --git a/WebDoorCreator.UI/Components/Gen/NavMenuHorizontal.razor b/WebDoorCreator.UI/Components/Gen/NavMenuHorizontal.razor
index a8f0658..3d3374f 100644
--- a/WebDoorCreator.UI/Components/Gen/NavMenuHorizontal.razor
+++ b/WebDoorCreator.UI/Components/Gen/NavMenuHorizontal.razor
@@ -128,7 +128,7 @@
-
-
diff --git a/WebDoorCreator.UI/Components/Gen/NavMenuHorizontal.razor.cs b/WebDoorCreator.UI/Components/Gen/NavMenuHorizontal.razor.cs
index ac14dde..5d120be 100644
--- a/WebDoorCreator.UI/Components/Gen/NavMenuHorizontal.razor.cs
+++ b/WebDoorCreator.UI/Components/Gen/NavMenuHorizontal.razor.cs
@@ -237,26 +237,11 @@ namespace WebDoorCreator.UI.Components.Gen
return answ;
}
- protected string actionUrl
+ protected string logoutUrl
{
get
{
-#if false
- string baseUrl = Url.Content("~/");
-#endif
- string answ = $"{baseUrl}/Identity/Account/LogOut";
-#if false
- string answ = "";
- if (NavManager.Uri.Contains("/WDC/UI"))
- {
- answ = $"{baseUrl}/Identity/Account/LogOut";
- }
- else
- {
- answ = "/Identity/Account/LogOut";
- }
-#endif
- return answ;
+ return $"{baseUrl}/Identity/Account/LogOut";
}
}
diff --git a/WebDoorCreator.UI/Controllers/DoorImageController.cs b/WebDoorCreator.UI/Controllers/DoorImageController.cs
index 9798cae..5004f40 100644
--- a/WebDoorCreator.UI/Controllers/DoorImageController.cs
+++ b/WebDoorCreator.UI/Controllers/DoorImageController.cs
@@ -13,6 +13,8 @@ namespace WebDoorCreator.UI.Controllers
{
#region Public Constructors
+ private static List DoorIdProc = new List();
+
public DoorImageController(IConfiguration configuration, QueueDataService cQDService, WebDoorCreatorService cWDCService)
{
Log.Info("Starting DoorImageController");
@@ -41,8 +43,16 @@ namespace WebDoorCreator.UI.Controllers
// se fosse vuoto...
if (string.IsNullOrEmpty(svgContent))
{
- // richiede ricalcolo img
- svgContent = await SendRecalcReq(DoorId);
+ if (DoorIdProc.Contains(DoorId))
+ {
+ DoorIdProc.Remove(DoorId);
+ }
+ else
+ {
+ DoorIdProc.Add(DoorId);
+ // richiede ricalcolo img
+ svgContent = await SendRecalcReq(DoorId);
+ }
}
// se fosse vuoto...
if (string.IsNullOrEmpty(svgContent))
@@ -50,6 +60,10 @@ namespace WebDoorCreator.UI.Controllers
// legge img vuota
svgContent = QDService.DoorGetMissingSvg();
}
+ else
+ {
+ DoorIdProc.Remove(DoorId);
+ }
var result = System.Text.Encoding.UTF8.GetBytes(svgContent);
return File(result, "image/svg+xml");
}
@@ -86,6 +100,7 @@ namespace WebDoorCreator.UI.Controllers
List doorIdList = new List() { $"{DoorId}" };
// chiamo reset richieste
var list2Proc = await QDService.ResetQueueByDoorList(doorIdList);
+ await Task.Delay(WaitReloadSvg);
// recupero DDF ed invio x processing
if (DoorId > 0)
@@ -93,6 +108,7 @@ namespace WebDoorCreator.UI.Controllers
string currDDF = await WDService.DoorOpGetDDF(DoorId);
// versione corrente del DDF generato
int currVers = await QDService.SendCalcReq(DoorId, currDDF);
+ await Task.Delay(WaitReloadSvg);
}
// attende ...
diff --git a/WebDoorCreator.UI/WebDoorCreator.UI.csproj b/WebDoorCreator.UI/WebDoorCreator.UI.csproj
index 3d619b6..bac46f1 100644
--- a/WebDoorCreator.UI/WebDoorCreator.UI.csproj
+++ b/WebDoorCreator.UI/WebDoorCreator.UI.csproj
@@ -3,7 +3,7 @@
net6.0
enable
- 0.9.2403.0411
+ 0.9.2403.0819
enable
aspnet-WebDoorCreator.UI-dfe95fed-1398-4144-bd43-8b3a765d6608
diff --git a/WebDoorCreator.UI/appsettings.Production.json b/WebDoorCreator.UI/appsettings.Production.json
index 4947734..6d5ef22 100644
--- a/WebDoorCreator.UI/appsettings.Production.json
+++ b/WebDoorCreator.UI/appsettings.Production.json
@@ -6,15 +6,15 @@
"Microsoft.AspNetCore": "Warning"
}
},
- "RuntimeOpt": {
- "MaxDayCalcCache": 7,
- "BaseUrl": "/UI"
- },
"ConnectionStrings": {
"Redis": "wdc-u-redis-01.ovh:6379, DefaultDatabase=12, connectTimeout=5000, syncTimeout=5000, asyncTimeout=5000, abortConnect=false, ssl=false, password=BtN9Py1wtLfLRvmzWnOPJ7RytDM+CLiVsJ/16zduNTlV8IOPGNrtzJSXPUnImA5PqmUMhKaUqo9NdHIG",
"Identity.DB": "Server=WDC-W-SQL-01\\SQLEXPRESS;Database=DCA_WebDoorCreator; User ID=steamware;Password=viadante16; integrated security=False; MultipleActiveResultSets=True; App=WebDoorCreator.UI;",
"WDC.DB": "Server=WDC-W-SQL-01\\SQLEXPRESS;Database=DCA_WebDoorCreator; User ID=steamware;Password=viadante16; integrated security=False; MultipleActiveResultSets=True; App=WebDoorCreator.UI;"
},
+ "RuntimeOpt": {
+ "MaxDayCalcCache": 28,
+ "BaseUrl": "/UI"
+ },
"CompoBaseDirs": {
"CurrCompoDir": "U:\\WebDoorSync\\CurrentComp\\Compo",
"NewCompoDir": "U:\\WebDoorSync\\NewComp\\Compo"
diff --git a/WebDoorCreator.UI/appsettings.Staging.json b/WebDoorCreator.UI/appsettings.Staging.json
index dcfedf3..1012e14 100644
--- a/WebDoorCreator.UI/appsettings.Staging.json
+++ b/WebDoorCreator.UI/appsettings.Staging.json
@@ -6,6 +6,12 @@
"Microsoft.AspNetCore": "Warning"
}
},
+ "ConnectionStrings": {
+ "Redis": "nkcredis.steamware.net:6379, DefaultDatabase=11, connectTimeout=5000, syncTimeout=5000, asyncTimeout=5000, abortConnect=false, ssl=false, password=BtN9Py1wtLfLRvmzWnOPJ7RytDM+CLiVsJ/16zduNTlV8IOPGNrtzJSXPUnImA5PqmUMhKaUqo9NdHIG"
+ //"Redis": "nkcredis.steamware.net:6379, DefaultDatabase=12, connectTimeout=5000, syncTimeout=5000, asyncTimeout=5000, abortConnect=false, ssl=false, password=BtN9Py1wtLfLRvmzWnOPJ7RytDM+CLiVsJ/16zduNTlV8IOPGNrtzJSXPUnImA5PqmUMhKaUqo9NdHIG"
+ //"Identity.DB": "Server=SQL2016PROD;Database=DCA_WebDoorCreator; User ID=sa;Password=keyhammer16; integrated security=False; MultipleActiveResultSets=True; App=WebDoorCreator.UI;",
+ //"WDC.DB": "Server=SQL2016PROD;Database=DCA_WebDoorCreator; User ID=sa;Password=keyhammer16; integrated security=False; MultipleActiveResultSets=True; App=WebDoorCreator.UI;"
+ },
"RuntimeOpt": {
"MaxDayCalcCache": 7,
"BaseUrl": "/WDC/UI"
diff --git a/WebDoorCreator.UI/appsettings.json b/WebDoorCreator.UI/appsettings.json
index dda1594..24b1d50 100644
--- a/WebDoorCreator.UI/appsettings.json
+++ b/WebDoorCreator.UI/appsettings.json
@@ -10,9 +10,6 @@
"Redis": "nkcredis.steamware.net:6379, DefaultDatabase=11, connectTimeout=5000, syncTimeout=5000, asyncTimeout=5000, abortConnect=false, ssl=false, password=BtN9Py1wtLfLRvmzWnOPJ7RytDM+CLiVsJ/16zduNTlV8IOPGNrtzJSXPUnImA5PqmUMhKaUqo9NdHIG",
"Identity.DB": "Server=SQL2016DEV;Database=WebDoorCreator; User ID=sa;Password=keyhammer16; integrated security=False; MultipleActiveResultSets=True; App=WebDoorCreator.UI;",
"WDC.DB": "Server=SQL2016DEV;Database=WebDoorCreator; User ID=sa;Password=keyhammer16; integrated security=False; MultipleActiveResultSets=True; App=WebDoorCreator.UI;"
- //"Redis": "nkcredis.steamware.net:6379, DefaultDatabase=12, connectTimeout=5000, syncTimeout=5000, asyncTimeout=5000, abortConnect=false, ssl=false, password=BtN9Py1wtLfLRvmzWnOPJ7RytDM+CLiVsJ/16zduNTlV8IOPGNrtzJSXPUnImA5PqmUMhKaUqo9NdHIG",
- //"Identity.DB": "Server=SQL2016PROD;Database=DCA_WebDoorCreator; User ID=sa;Password=keyhammer16; integrated security=False; MultipleActiveResultSets=True; App=WebDoorCreator.UI;",
- //"WDC.DB": "Server=SQL2016PROD;Database=DCA_WebDoorCreator; User ID=sa;Password=keyhammer16; integrated security=False; MultipleActiveResultSets=True; App=WebDoorCreator.UI;"
},
"ExternalProviders": {
"MailKit": {
@@ -32,7 +29,7 @@
"DisableWDCMigrate": true
},
"RuntimeOpt": {
- "WaitReloadSvg": 200,
+ "WaitReloadSvg": 100,
"VetoRemoveProcessing": 5,
"MaxDayCalcCache": 7,
"BaseUrl": "/WDC/UI",