diff --git a/MP-IO/Controllers/IOBController.cs b/MP-IO/Controllers/IOBController.cs
index 7398b2ff..c5489b54 100644
--- a/MP-IO/Controllers/IOBController.cs
+++ b/MP-IO/Controllers/IOBController.cs
@@ -110,14 +110,25 @@ namespace MP_IO.Controllers
public bool askCloseODL(string id, int idxOdl)
{
bool answ = false;
-
// init obj DataLayer
DataLayer DataLayerObj = new DataLayer();
try
{
- // !!! FixME TODO inviare su channel redis richiesta chiusura immediata ODL all'utente
- //DataLayerObj.taODL.forceClose(idxOdl, id);
- answ = true;
+ // preparo una richiesta di chiusura...
+ DisplayAction CurrAction = new DisplayAction()
+ {
+ Topic = "Chiusura ODL",
+ Message = "Rilevato possibile fine operazioni, Vuoi chiudere la commessa?",
+ ShowCancel = true,
+ ShowClose = true,
+ ShowConfirm = true,
+ CancelAction = "DisableAction",
+ ConfirmAction = "CloseODL",
+ DtReq = DateTime.Now,
+ IsActive = true,
+ Parameter = $"{idxOdl}"
+ };
+ answ = DataLayerObj.ActionSetReq(CurrAction);
}
catch
{ }
diff --git a/MP-IO/Web.config b/MP-IO/Web.config
index 695bcb77..41376d9d 100644
--- a/MP-IO/Web.config
+++ b/MP-IO/Web.config
@@ -17,6 +17,8 @@
+
+
diff --git a/MapoDb/DataLayer.cs b/MapoDb/DataLayer.cs
index 3da1f821..27550302 100644
--- a/MapoDb/DataLayer.cs
+++ b/MapoDb/DataLayer.cs
@@ -176,12 +176,15 @@ namespace MapoDb
///
private Lazy lazyConnection = new Lazy(() =>
{
- string RedisConn = memLayer.ML.confReadString("RedisConn");
+ string RedisConn = memLayer.ML.confReadString("RedisConnSPEC");
+ if (string.IsNullOrEmpty(RedisConn))
+ {
+ RedisConn = memLayer.ML.confReadString("RedisConn");
+ }
if (string.IsNullOrEmpty(RedisConn))
{
RedisConn = "localhost,abortConnect=false,ssl=false";
}
-
return ConnectionMultiplexer.Connect(RedisConn);
});
@@ -190,12 +193,15 @@ namespace MapoDb
///
private Lazy lazyConnectionAdmin = new Lazy(() =>
{
- string RedisConnAdmin = memLayer.ML.confReadString("RedisConnAdmin");
+ string RedisConnAdmin = memLayer.ML.confReadString("RedisConnSPECAdmin");
+ if (string.IsNullOrEmpty(RedisConnAdmin))
+ {
+ RedisConnAdmin = memLayer.ML.confReadString("RedisConnAdmin");
+ }
if (string.IsNullOrEmpty(RedisConnAdmin))
{
RedisConnAdmin = "localhost,abortConnect=false,ssl=false,allowAdmin=true";
}
-
return ConnectionMultiplexer.Connect(RedisConnAdmin);
});
@@ -224,6 +230,7 @@ namespace MapoDb
string rawData = JsonConvert.SerializeObject(act2save);
// invio broadcast + salvo in redis
BroadastMsgPipe.saveAndSendMessage(Constants.redisActionReq, rawData);
+ fatto = true;
//await redisDb.StringSetAsync(redisActionReq, rawData);
stopWatch.Stop();
TimeSpan ts = stopWatch.Elapsed;