diff --git a/MP.Data/Controllers/MpStatsController.cs b/MP.Data/Controllers/MpStatsController.cs
index 2ebc43fa..603e9a0c 100644
--- a/MP.Data/Controllers/MpStatsController.cs
+++ b/MP.Data/Controllers/MpStatsController.cs
@@ -1,6 +1,7 @@
 using Microsoft.Data.SqlClient;
 using Microsoft.EntityFrameworkCore;
 using Microsoft.Extensions.Configuration;
+using MP.Data.DatabaseModels;
 using NLog;
 using System;
 using System.Collections.Generic;
@@ -28,9 +29,9 @@ namespace MP.Data.Controllers
         /// Elenco Azioni (decodifica)
         /// </summary>
         /// <returns></returns>
-        public List<DatabaseModels.AzioniUL> ActionsGetAll()
+        public List<AzioniUL> ActionsGetAll()
         {
-            List<DatabaseModels.AzioniUL> dbResult = new List<DatabaseModels.AzioniUL>();
+            List<AzioniUL> dbResult = new List<AzioniUL>();
             using (var dbCtx = new MoonPro_STATSContext(_configuration))
             {
                 dbResult = dbCtx
@@ -46,9 +47,9 @@ namespace MP.Data.Controllers
         /// <param name="numRecord"></param>
         /// <param name="searchVal"></param>
         /// <returns></returns>
-        public List<DatabaseModels.StatsAnagArticoli> ArticoliGetSearch(int numRecord, string searchVal = "")
+        public List<StatsAnagArticoli> ArticoliGetSearch(int numRecord, string searchVal = "")
         {
-            List<DatabaseModels.StatsAnagArticoli> dbResult = new List<DatabaseModels.StatsAnagArticoli>();
+            List<StatsAnagArticoli> dbResult = new List<StatsAnagArticoli>();
             using (var dbCtx = new MoonPro_STATSContext(_configuration))
             {
                 dbResult = dbCtx
@@ -67,9 +68,9 @@ namespace MP.Data.Controllers
         /// <param name="numRecord"></param>
         /// <param name="searchVal"></param>
         /// <returns></returns>
-        public List<DatabaseModels.StatsODL> CommesseGetSearch(int numRecord, string searchVal = "")
+        public List<StatsODL> CommesseGetSearch(int numRecord, string searchVal = "")
         {
-            List<DatabaseModels.StatsODL> dbResult = new List<DatabaseModels.StatsODL>();
+            List<StatsODL> dbResult = new List<StatsODL>();
             using (var dbCtx = new MoonPro_STATSContext(_configuration))
             {
                 dbResult = dbCtx
@@ -90,9 +91,9 @@ namespace MP.Data.Controllers
         /// Elenco da tabella Macchine
         /// </summary>
         /// <returns></returns>
-        public List<DatabaseModels.Macchine> MacchineGetAll()
+        public List<Macchine> MacchineGetAll()
         {
-            List<DatabaseModels.Macchine> dbResult = new List<DatabaseModels.Macchine>();
+            List<Macchine> dbResult = new List<Macchine>();
             using (var dbCtx = new MoonPro_STATSContext(_configuration))
             {
                 dbResult = dbCtx
@@ -134,9 +135,9 @@ namespace MP.Data.Controllers
         /// <param name="numRecord"></param>
         /// <param name="searchVal"></param>
         /// <returns></returns>
-        public List<DatabaseModels.ResControlli> StatControlliGetAll(DateTime DataStart, DateTime DataEnd, string IdxMacchina, int IdxODL, string KeyRichiesta, string CodArticolo)
+        public List<ResControlli> StatControlliGetAll(DateTime DataStart, DateTime DataEnd, string IdxMacchina, int IdxODL, string KeyRichiesta, string CodArticolo)
         {
-            List<DatabaseModels.ResControlli> dbResult = new List<DatabaseModels.ResControlli>();
+            List<ResControlli> dbResult = new List<ResControlli>();
             using (var dbCtx = new MoonPro_STATSContext(_configuration))
             {
                 var dataFrom = new SqlParameter("@dataFrom", DataStart);
@@ -166,9 +167,9 @@ namespace MP.Data.Controllers
         /// <param name="FirstRecord"></param>
         /// <param name="NumRecord"></param>
         /// <returns></returns>
-        public List<DatabaseModels.DdbTurni> StatDdbGetAll(DateTime DataStart, DateTime DataEnd, string IdxMacchina, int IdxODL, string KeyRichiesta, string CodArticolo, int FirstRecord, int NumRecord)
+        public List<DdbTurni> StatDdbGetAll(DateTime DataStart, DateTime DataEnd, string IdxMacchina, int IdxODL, string KeyRichiesta, string CodArticolo, int FirstRecord, int NumRecord)
         {
-            List<DatabaseModels.DdbTurni> dbResult = new List<DatabaseModels.DdbTurni>();
+            List<DdbTurni> dbResult = new List<DdbTurni>();
             using (var dbCtx = new MoonPro_STATSContext(_configuration))
             {
                 var dataFrom = new SqlParameter("@dataFrom", DataStart);
@@ -221,9 +222,9 @@ namespace MP.Data.Controllers
         /// <param name="KeyRichiesta">Key Richiesta, se "*" = tutti</param>
         /// <param name="CodArticolo">Cod Articolo, se "*" = tutti</param>
         /// <returns></returns>
-        public List<DatabaseModels.OdlEnergyModel> StatOdlEnergyGetFilt(string IdxMacchina, DateTime DtStart, DateTime DtEnd, int IdxODL, string KeyRichiesta, string CodArticolo)
+        public List<OdlEnergyModel> StatOdlEnergyGetFilt(string IdxMacchina, DateTime DtStart, DateTime DtEnd, int IdxODL, string KeyRichiesta, string CodArticolo)
         {
-            List<DatabaseModels.OdlEnergyModel> dbResult = new List<DatabaseModels.OdlEnergyModel>();
+            List<OdlEnergyModel> dbResult = new List<OdlEnergyModel>();
             using (var dbCtx = new MoonPro_STATSContext(_configuration))
             {
                 var dataFrom = new SqlParameter("@dataFrom", DtStart);
@@ -241,57 +242,15 @@ namespace MP.Data.Controllers
             return dbResult;
         }
 
-        /// <summary>
-        /// Ricerca task dato tipo e 
-        /// </summary>
-        /// <param name="TType"></param>
-        /// <returns></returns>
-        public List<DatabaseModels.TaskListModel> TaskListGetAll(Task2ExeType TType)
-        {
-            List<DatabaseModels.TaskListModel> dbResult = new List<DatabaseModels.TaskListModel>();
-            using (var dbCtx = new MoonPro_STATSContext(_configuration))
-            {
-
-                dbResult = dbCtx
-                    .DbSetTaskList
-                    .Where(x => (TType == Task2ExeType.ND || x.TType == TType))
-                    .ToList();
-            }
-            return dbResult;
-        }
-
-
-        /// <summary>
-        /// Ricerca task dato tipo + num max (desc)
-        /// </summary>
-        /// <param name="TaskId">TaskId da cui deriva</param>
-        /// <returns></returns>
-        public List<DatabaseModels.TaskExecModel> TaskExeGetFilt(int TaskId, int maxRec)
-        {
-            List<DatabaseModels.TaskExecModel> dbResult = new List<DatabaseModels.TaskExecModel>();
-            using (var dbCtx = new MoonPro_STATSContext(_configuration))
-            {
-
-                dbResult = dbCtx
-                    .DbSetTaskExe
-                    .Include(x => x.TaskListNav)
-                    .Where(x => (x.TaskId == TaskId))
-                    .OrderByDescending(x => x.DtStart)
-                    .Take(maxRec)
-                    .ToList();
-            }
-            return dbResult;
-        }
-
         /// <summary>
         /// Elenco tabella ODL da filtro
         /// </summary>
         /// <param name="numRecord"></param>
         /// <param name="searchVal"></param>
         /// <returns></returns>
-        public List<DatabaseModels.StatsODL> StatOdlGetAll(DateTime DataStart, DateTime DataEnd, string IdxMacchina, int IdxODL, string KeyRichiesta, string CodArticolo)
+        public List<StatsODL> StatOdlGetAll(DateTime DataStart, DateTime DataEnd, string IdxMacchina, int IdxODL, string KeyRichiesta, string CodArticolo)
         {
-            List<DatabaseModels.StatsODL> dbResult = new List<DatabaseModels.StatsODL>();
+            List<StatsODL> dbResult = new List<StatsODL>();
             using (var dbCtx = new MoonPro_STATSContext(_configuration))
             {
                 var dataFrom = new SqlParameter("@dataFrom", DataStart);
@@ -317,9 +276,9 @@ namespace MP.Data.Controllers
         /// <param name="IdxMacchina"></param>
         /// <param name="DataEnd"></param>
         /// <returns></returns>
-        public List<DatabaseModels.ResScarti> StatScartiGetAll(DateTime DataStart, DateTime DataEnd, string IdxMacchina, int IdxODL, string KeyRichiesta, string CodArticolo)
+        public List<ResScarti> StatScartiGetAll(DateTime DataStart, DateTime DataEnd, string IdxMacchina, int IdxODL, string KeyRichiesta, string CodArticolo)
         {
-            List<DatabaseModels.ResScarti> dbResult = new List<DatabaseModels.ResScarti>();
+            List<ResScarti> dbResult = new List<ResScarti>();
             using (var dbCtx = new MoonPro_STATSContext(_configuration))
             {
                 var dataFrom = new SqlParameter("@dataFrom", DataStart);
@@ -345,9 +304,9 @@ namespace MP.Data.Controllers
         /// <param name="IdxMacchina"></param>
         /// <param name="DataEnd"></param>
         /// <returns></returns>
-        public List<DatabaseModels.TurniOee> StatTurniOeeGetAll(DateTime DataStart, DateTime DataEnd, string IdxMacchina, int IdxODL, string KeyRichiesta, string CodArticolo)
+        public List<TurniOee> StatTurniOeeGetAll(DateTime DataStart, DateTime DataEnd, string IdxMacchina, int IdxODL, string KeyRichiesta, string CodArticolo)
         {
-            List<DatabaseModels.TurniOee> dbResult = new List<DatabaseModels.TurniOee>();
+            List<TurniOee> dbResult = new List<TurniOee>();
             using (var dbCtx = new MoonPro_STATSContext(_configuration))
             {
                 var dataFrom = new SqlParameter("@dataFrom", DataStart);
@@ -371,9 +330,9 @@ namespace MP.Data.Controllers
         /// <param name="numRecord"></param>
         /// <param name="searchVal"></param>
         /// <returns></returns>
-        public List<DatabaseModels.UserActionLog> StatUserLogGetAll(DateTime DataStart, DateTime DataEnd, string IdxMacchina, int IdxODL, string KeyRichiesta, string CodArticolo)
+        public List<UserActionLog> StatUserLogGetAll(DateTime DataStart, DateTime DataEnd, string IdxMacchina, int IdxODL, string KeyRichiesta, string CodArticolo)
         {
-            List<DatabaseModels.UserActionLog> dbResult = new List<DatabaseModels.UserActionLog>();
+            List<UserActionLog> dbResult = new List<UserActionLog>();
             using (var dbCtx = new MoonPro_STATSContext(_configuration))
             {
                 var dataFrom = new SqlParameter("@dataFrom", DataStart);
@@ -391,6 +350,134 @@ namespace MP.Data.Controllers
             return dbResult;
         }
 
+        /// <summary>
+        /// Ricerca task dato tipo + num max (desc)
+        /// </summary>
+        /// <param name="TaskId">TaskId da cui deriva</param>
+        /// <returns></returns>
+        public List<TaskExecModel> TaskExecGetFilt(int TaskId, int maxRec)
+        {
+            List<TaskExecModel> dbResult = new List<TaskExecModel>();
+            using (var dbCtx = new MoonPro_STATSContext(_configuration))
+            {
+                dbResult = dbCtx
+                    .DbSetTaskExe
+                    .Include(x => x.TaskListNav)
+                    .Where(x => (x.TaskId == TaskId))
+                    .OrderByDescending(x => x.DtStart)
+                    .Take(maxRec)
+                    .ToList();
+            }
+            return dbResult;
+        }
+
+        /// <summary>
+        /// Upsert record TaskExec
+        /// </summary>
+        /// <param name="rec2upd">Record da aggiornare/inserire</param>
+        /// <returns></returns>
+        public bool TaskExecUpsert(TaskExecModel rec2upd)
+        {
+            bool done = false;
+            using (var dbCtx = new MoonPro_STATSContext(_configuration))
+            {
+                try
+                {
+                    var currData = dbCtx
+                        .DbSetTaskExe
+                        .Where(x => x.TaskExecId == rec2upd.TaskExecId)
+                        .FirstOrDefault();
+                    if (currData != null)
+                    {
+                        currData.TaskId = rec2upd.TaskId;
+                        currData.DtStart = rec2upd.DtStart;
+                        currData.DtEnd = rec2upd.DtEnd;
+                        currData.IsError = rec2upd.IsError;
+                        currData.Result = rec2upd.Result;
+                        dbCtx.Entry(currData).State = EntityState.Modified;
+                    }
+                    else
+                    {
+                        dbCtx
+                            .DbSetTaskExe
+                            .Add(rec2upd);
+                    }
+                    dbCtx.SaveChanges();
+                    done = true;
+                }
+                catch (Exception exc)
+                {
+                    Log.Error($"Eccezione in TaskExecUpsert{Environment.NewLine}{exc}");
+                }
+            }
+            return done;
+        }
+
+        /// <summary>
+        /// Ricerca task dato tipo e
+        /// </summary>
+        /// <param name="TType"></param>
+        /// <returns></returns>
+        public List<TaskListModel> TaskListGetAll(Task2ExeType TType)
+        {
+            List<TaskListModel> dbResult = new List<TaskListModel>();
+            using (var dbCtx = new MoonPro_STATSContext(_configuration))
+            {
+                dbResult = dbCtx
+                    .DbSetTaskList
+                    .Where(x => (TType == Task2ExeType.ND || x.TType == TType))
+                    .ToList();
+            }
+            return dbResult;
+        }
+
+        /// <summary>
+        /// Upsert record TaskList
+        /// </summary>
+        /// <param name="rec2upd">Record da aggiornare/inserire</param>
+        /// <returns></returns>
+        public bool TaskListUpsert(TaskListModel rec2upd)
+        {
+            bool done = false;
+            using (var dbCtx = new MoonPro_STATSContext(_configuration))
+            {
+                try
+                {
+                    var currData = dbCtx
+                        .DbSetTaskList
+                        .Where(x => x.TaskId == rec2upd.TaskId)
+                        .FirstOrDefault();
+                    if (currData != null)
+                    {
+                        currData.Name = rec2upd.Name;
+                        currData.Descript = rec2upd.Descript;
+                        currData.Command = rec2upd.Command;
+                        currData.Args = rec2upd.Args;
+                        currData.Freq = rec2upd.Freq;
+                        currData.Cad = rec2upd.Cad;
+                        currData.DtLastExec = rec2upd.DtLastExec;
+                        currData.DtNextExec = rec2upd.DtNextExec;
+                        currData.LastDuration = rec2upd.LastDuration;
+                        currData.LastResult = rec2upd.LastResult;
+                        dbCtx.Entry(currData).State = EntityState.Modified;
+                    }
+                    else
+                    {
+                        dbCtx
+                            .DbSetTaskList
+                            .Add(rec2upd);
+                    }
+                    dbCtx.SaveChanges();
+                    done = true;
+                }
+                catch (Exception exc)
+                {
+                    Log.Error($"Eccezione in TaskListUpsert{Environment.NewLine}{exc}");
+                }
+            }
+            return done;
+        }
+
         #endregion Public Methods
 
         #region Private Fields
diff --git a/MP.Stats/Components/TaskEdit.razor b/MP.Stats/Components/TaskEdit.razor
index 245773d9..2504bed7 100644
--- a/MP.Stats/Components/TaskEdit.razor
+++ b/MP.Stats/Components/TaskEdit.razor
@@ -1,25 +1,27 @@
 @if (CurrRecord != null)
 {
-    <div class="d-flex justify-content-between">
-        <div class="px-2">
-            <h2>Edit Rec</h2>
-        </div>
-        <div class="px-2">
-            <button class="btn btn-sm btn-success" @onclick="()=>doSave()" title="Save"><i class="far fa-save"></i></button>
-            <button class="btn btn-sm btn-secondary" @onclick="()=>doCancel()" title="Cancel"><i class="fas fa-undo"></i></button>
-        </div>
-    </div>
-
-
-
+    <hr />
     <div class="row g-1">
-        <div class="col-md-3">
+        <div class="col-md-2">
             <div class="form-floating">
                 <input type="text" class="form-control" @bind="@CurrRecord.Name">
                 <label class="small">Nome Task</label>
             </div>
         </div>
-        <div class="col-md-6">
+        <div class="col-md-2">
+            <div class="form-floating">
+                <select class="form-select" @bind="@CurrRecord.TType">
+                    @foreach (var option in Enum.GetValues(typeof(MP.Data.Objects.Enums.Task2ExeType)))
+                    {
+                        <option value="@option">
+                            @option
+                        </option>
+                    }
+                </select>
+                <label class="small">Tipo Task</label>
+            </div>
+        </div>
+        <div class="col-md-5">
             <div class="form-floating">
                 <input type="text" class="form-control" @bind="@CurrRecord.Descript">
                 <label class="small">Descrizione Task</label>
@@ -27,7 +29,14 @@
         </div>
         <div class="col-md-2">
             <div class="form-floating">
-                <input type="text" class="form-control" @bind="@CurrRecord.Freq">
+                <select class="form-select" @bind="@CurrRecord.Freq">
+                    @foreach (var option in Enum.GetValues(typeof(MP.Data.Objects.Enums.TaskFreqType)))
+                    {
+                        <option value="@option">
+                            @option
+                        </option>
+                    }
+                </select>
                 <label class="small">Frequenza</label>
             </div>
         </div>
@@ -39,20 +48,20 @@
         </div>
     </div>
     <div class="row g-1">
-        <div class="col-md-4">
+        <div class="col-md-3">
             <div class="form-floating">
                 <input type="text" class="form-control" @bind="@CurrRecord.Command">
                 <label class="small">Comando</label>
             </div>
         </div>
-        <div class="col-md-4">
+        <div class="col-md-6">
             <div class="form-floating">
                 <input type="text" class="form-control" @bind="@CurrRecord.Args">
                 <label class="small">Parametri</label>
             </div>
         </div>
-        <div class="col-md-4 pt-2">
-            <button class="btn btn-success w-100" @onclick="() => doSave()"><i class="fa-solid fa-floppy-disk"></i> Save</button>
+        <div class="col-md-3 pt-2">
+            <button class="btn btn-lg w-100 btn-success" @onclick="()=>doSave()" title="Save"><i class="far fa-save"></i> Save</button>
         </div>
     </div>
 }
diff --git a/MP.Stats/Components/TaskEdit.razor.cs b/MP.Stats/Components/TaskEdit.razor.cs
index f7363d49..a4b79dc6 100644
--- a/MP.Stats/Components/TaskEdit.razor.cs
+++ b/MP.Stats/Components/TaskEdit.razor.cs
@@ -1,12 +1,14 @@
 using DnsClient.Protocol;
 using Microsoft.AspNetCore.Components;
 using MP.Data.DatabaseModels;
+using MP.Stats.Data;
 using System.Threading.Tasks;
 
 namespace MP.Stats.Components
 {
     public partial class TaskEdit
     {
+        #region Public Properties
 
         [Parameter]
         public TaskListModel? CurrRecord { get; set; } = null;
@@ -14,21 +16,64 @@ namespace MP.Stats.Components
         [Parameter]
         public EventCallback<bool> EC_update { get; set; }
 
+        #endregion Public Properties
+
+        #region Protected Properties
+
+        [Inject]
+        protected MpStatsService StatService { get; set; }
+
+        #endregion Protected Properties
+
+        #region Protected Methods
+
         protected async Task doCancel()
         {
             await EC_update.InvokeAsync(false);
         }
+
         protected async Task doSave()
         {
             bool fatto = false;
-#if false
             await Task.Delay(1);
             if (CurrRecord != null)
             {
-                fatto = await MTService.CustomerUpdate(CurrRecord);
-            } 
-#endif
+                // calcolo next exec da tipo...
+                switch (CurrRecord.Freq)
+                {
+                    case MP.Data.Objects.Enums.TaskFreqType.ND:
+                        CurrRecord.DtNextExec = CurrRecord.DtLastExec.AddDays(CurrRecord.Cad);
+                        break;
+                    case MP.Data.Objects.Enums.TaskFreqType.Sec:
+                        CurrRecord.DtNextExec = CurrRecord.DtLastExec.AddSeconds(CurrRecord.Cad);
+                        break;
+                    case MP.Data.Objects.Enums.TaskFreqType.Min:
+                        CurrRecord.DtNextExec = CurrRecord.DtLastExec.AddMinutes(CurrRecord.Cad);
+                        break;
+                    case MP.Data.Objects.Enums.TaskFreqType.Hour:
+                        CurrRecord.DtNextExec = CurrRecord.DtLastExec.AddHours(CurrRecord.Cad);
+                        break;
+                    case MP.Data.Objects.Enums.TaskFreqType.Day:
+                        CurrRecord.DtNextExec = CurrRecord.DtLastExec.AddDays( CurrRecord.Cad);
+                        break;
+                    case MP.Data.Objects.Enums.TaskFreqType.Week:
+                        CurrRecord.DtNextExec = CurrRecord.DtLastExec.AddDays(7*CurrRecord.Cad);
+                        break;
+                    case MP.Data.Objects.Enums.TaskFreqType.Month:
+                        CurrRecord.DtNextExec = CurrRecord.DtLastExec.AddMonths(CurrRecord.Cad);
+                        break;
+                    case MP.Data.Objects.Enums.TaskFreqType.Year:
+                        CurrRecord.DtNextExec = CurrRecord.DtLastExec.AddYears(CurrRecord.Cad);
+                        break;
+                    default:
+                        CurrRecord.DtNextExec = CurrRecord.DtLastExec.AddDays(CurrRecord.Cad);
+                        break;
+                }
+                fatto = await StatService.TaskListUpsert(CurrRecord);
+            }
             await EC_update.InvokeAsync(fatto);
         }
+
+        #endregion Protected Methods
     }
 }
\ No newline at end of file
diff --git a/MP.Stats/Data/MpStatsService.cs b/MP.Stats/Data/MpStatsService.cs
index f20533ec..674ad6f4 100644
--- a/MP.Stats/Data/MpStatsService.cs
+++ b/MP.Stats/Data/MpStatsService.cs
@@ -2,9 +2,11 @@
 using Microsoft.Extensions.Caching.Memory;
 using Microsoft.Extensions.Configuration;
 using Microsoft.Extensions.Logging;
+using MP.Data.DatabaseModels;
 using Newtonsoft.Json;
 using System;
 using System.Collections.Generic;
+using System.Data;
 using System.Diagnostics;
 using System.Linq;
 using System.Text;
@@ -21,7 +23,7 @@ namespace MP.Stats.Data
 
         private static ILogger<MpStatsService> _logger;
 
-        private static List<MP.Data.DatabaseModels.AzioniUL> ActionsList = new List<MP.Data.DatabaseModels.AzioniUL>();
+        private static List<AzioniUL> ActionsList = new List<AzioniUL>();
 
         private readonly IDistributedCache distributedCache;
 
@@ -118,17 +120,17 @@ namespace MP.Stats.Data
 
         #region Public Methods
 
-        public async Task<List<MP.Data.DatabaseModels.AzioniUL>> ActionsGetAll()
+        public async Task<List<AzioniUL>> ActionsGetAll()
         {
             //return Task.FromResult(dbController.ActionsGetAll());
-            List<MP.Data.DatabaseModels.AzioniUL> dbResult = new List<MP.Data.DatabaseModels.AzioniUL>();
+            List<AzioniUL> dbResult = new List<AzioniUL>();
             string cacheKey = "MP:STATS:AZIONI_ALL";
             string rawData;
             var redisDataList = await distributedCache.GetAsync(cacheKey);
             if (redisDataList != null)
             {
                 rawData = Encoding.UTF8.GetString(redisDataList);
-                dbResult = JsonConvert.DeserializeObject<List<MP.Data.DatabaseModels.AzioniUL>>(rawData);
+                dbResult = JsonConvert.DeserializeObject<List<AzioniUL>>(rawData);
             }
             else
             {
@@ -190,7 +192,7 @@ namespace MP.Stats.Data
             dbController.Dispose();
         }
 
-        public Task<List<MP.Data.DatabaseModels.Macchine>> MacchineGetAll()
+        public Task<List<Macchine>> MacchineGetAll()
         {
             return Task.FromResult(dbController.MacchineGetAll().ToList());
         }
@@ -215,17 +217,17 @@ namespace MP.Stats.Data
             dbController.RollBackEntity(item);
         }
 
-        public async Task<List<MP.Data.DatabaseModels.ResControlli>> StatControlliGetAll(SelectData CurrFilter, string searchVal = "")
+        public async Task<List<ResControlli>> StatControlliGetAll(SelectData CurrFilter, string searchVal = "")
         {
             //return Task.FromResult(dbController.StatControlliGetAll(DataStart, DataEnd, IdxMacchina, IdxODL, KeyRichiesta, CodArticolo).ToArray());
-            List<MP.Data.DatabaseModels.ResControlli> dbResult = new List<MP.Data.DatabaseModels.ResControlli>();
+            List<ResControlli> dbResult = new List<ResControlli>();
             string cacheKey = getCacheKey("MP:STATS:CONTROLLI", CurrFilter);
             string rawData;
             var redisDataList = await distributedCache.GetAsync(cacheKey);
             if (redisDataList != null)
             {
                 rawData = Encoding.UTF8.GetString(redisDataList);
-                dbResult = JsonConvert.DeserializeObject<List<MP.Data.DatabaseModels.ResControlli>>(rawData);
+                dbResult = JsonConvert.DeserializeObject<List<ResControlli>>(rawData);
             }
             else
             {
@@ -242,17 +244,17 @@ namespace MP.Stats.Data
             return await Task.FromResult(dbResult);
         }
 
-        public async Task<List<MP.Data.DatabaseModels.DdbTurni>> StatDdbGetAll(SelectData CurrFilter, string searchVal = "")
+        public async Task<List<DdbTurni>> StatDdbGetAll(SelectData CurrFilter, string searchVal = "")
         {
             //return Task.FromResult(dbController.StatDdbGetAll(numRecord, searchVal).ToArray());
-            List<MP.Data.DatabaseModels.DdbTurni> dbResult = new List<MP.Data.DatabaseModels.DdbTurni>();
+            List<DdbTurni> dbResult = new List<DdbTurni>();
             string cacheKey = getCacheKeyPaged("MP:STATS:DDBT", CurrFilter);
             string rawData;
             var redisDataList = await distributedCache.GetAsync(cacheKey);
             if (redisDataList != null)
             {
                 rawData = Encoding.UTF8.GetString(redisDataList);
-                dbResult = JsonConvert.DeserializeObject<List<MP.Data.DatabaseModels.DdbTurni>>(rawData);
+                dbResult = JsonConvert.DeserializeObject<List<DdbTurni>>(rawData);
             }
             else
             {
@@ -275,10 +277,10 @@ namespace MP.Stats.Data
         /// <param name="CurrFilter"></param>
         /// <param name="searchVal"></param>
         /// <returns></returns>
-        public async Task<List<MP.Data.DatabaseModels.DdbTurni>> StatDdbGetAllExport(SelectData CurrFilter, string searchVal = "")
+        public async Task<List<DdbTurni>> StatDdbGetAllExport(SelectData CurrFilter, string searchVal = "")
         {
             //return Task.FromResult(dbController.StatDdbGetAll(numRecord, searchVal).ToArray());
-            List<MP.Data.DatabaseModels.DdbTurni> dbResult = new List<MP.Data.DatabaseModels.DdbTurni>();
+            List<DdbTurni> dbResult = new List<DdbTurni>();
             Stopwatch stopWatch = new Stopwatch();
             stopWatch.Start();
             dbResult = dbController.StatDdbGetAll(CurrFilter.DateStart, CurrFilter.DateEnd, CurrFilter.IdxMacchina, CurrFilter.IdxOdl, CurrFilter.KeyRichiesta, CurrFilter.CodArticolo, 1, 0);
@@ -319,16 +321,16 @@ namespace MP.Stats.Data
         /// <param name="CurrFilter"></param>
         /// <param name="searchVal"></param>
         /// <returns></returns>
-        public async Task<List<MP.Data.DatabaseModels.OdlEnergyModel>> StatOdlEnergyGetAll(SelectData CurrFilter, string searchVal = "")
+        public async Task<List<OdlEnergyModel>> StatOdlEnergyGetAll(SelectData CurrFilter, string searchVal = "")
         {
-            List<MP.Data.DatabaseModels.OdlEnergyModel> dbResult = new List<MP.Data.DatabaseModels.OdlEnergyModel>();
+            List<OdlEnergyModel> dbResult = new List<OdlEnergyModel>();
             string cacheKey = getCacheKey("MP:STATS:ODL_ENERGY", CurrFilter);
             string rawData;
             var redisDataList = await distributedCache.GetAsync(cacheKey);
             if (redisDataList != null)
             {
                 rawData = Encoding.UTF8.GetString(redisDataList);
-                dbResult = JsonConvert.DeserializeObject<List<MP.Data.DatabaseModels.OdlEnergyModel>>(rawData);
+                dbResult = JsonConvert.DeserializeObject<List<OdlEnergyModel>>(rawData);
             }
             else
             {
@@ -351,16 +353,16 @@ namespace MP.Stats.Data
         /// <param name="CurrFilter"></param>
         /// <param name="searchVal"></param>
         /// <returns></returns>
-        public async Task<List<MP.Data.DatabaseModels.StatsODL>> StatOdlGetAll(SelectData CurrFilter, string searchVal = "")
+        public async Task<List<StatsODL>> StatOdlGetAll(SelectData CurrFilter, string searchVal = "")
         {
-            List<MP.Data.DatabaseModels.StatsODL> dbResult = new List<MP.Data.DatabaseModels.StatsODL>();
+            List<StatsODL> dbResult = new List<StatsODL>();
             string cacheKey = getCacheKey("MP:STATS:ODL", CurrFilter);
             string rawData;
             var redisDataList = await distributedCache.GetAsync(cacheKey);
             if (redisDataList != null)
             {
                 rawData = Encoding.UTF8.GetString(redisDataList);
-                dbResult = JsonConvert.DeserializeObject<List<MP.Data.DatabaseModels.StatsODL>>(rawData);
+                dbResult = JsonConvert.DeserializeObject<List<StatsODL>>(rawData);
             }
             else
             {
@@ -384,16 +386,16 @@ namespace MP.Stats.Data
         /// <param name="CurrFilter"></param>
         /// <param name="searchVal"></param>
         /// <returns></returns>
-        public async Task<List<MP.Data.DatabaseModels.TaskListModel>> TaskListAll(Task2ExeType TType, string searchVal = "")
+        public async Task<List<TaskListModel>> TaskListAll(Task2ExeType TType, string searchVal = "")
         {
-            List<MP.Data.DatabaseModels.TaskListModel> dbResult = new List<MP.Data.DatabaseModels.TaskListModel>();
+            List<TaskListModel> dbResult = new List<TaskListModel>();
             string cacheKey = $"MP:STATS:TaskList:{TType}";
             string rawData;
             var redisDataList = await distributedCache.GetAsync(cacheKey);
             if (redisDataList != null)
             {
                 rawData = Encoding.UTF8.GetString(redisDataList);
-                dbResult = JsonConvert.DeserializeObject<List<MP.Data.DatabaseModels.TaskListModel>>(rawData);
+                dbResult = JsonConvert.DeserializeObject<List<TaskListModel>>(rawData);
             }
             else
             {
@@ -417,18 +419,33 @@ namespace MP.Stats.Data
             }
             return await Task.FromResult(dbResult);
         }
+        /// <summary>
+        /// Update/Insert record TaskList
+        /// </summary>
+        /// <param name="rec2upd"></param>
+        /// <returns></returns>
+        public async Task<bool> TaskListUpsert(TaskListModel rec2upd)
+        {
+            bool dbResult = dbController.TaskListUpsert(rec2upd);
+            // svuoto cache!
+            string cacheKey = $"MP:STATS:TaskList:{rec2upd.TType}";
+            await distributedCache.RemoveAsync(cacheKey);
+            cacheKey = $"MP:STATS:TaskList:ND";
+            await distributedCache.RemoveAsync(cacheKey);
+            return await Task.FromResult(dbResult);
+        }
 
-        public async Task<List<MP.Data.DatabaseModels.ResScarti>> StatScartiGetAll(SelectData CurrFilter, string searchVal = "")
+        public async Task<List<ResScarti>> StatScartiGetAll(SelectData CurrFilter, string searchVal = "")
         {
             //return Task.FromResult(dbController.StatScartiGetAll(DataStart, DataEnd, IdxMacchina, IdxODL, KeyRichiesta, CodArticolo).ToArray());
-            List<MP.Data.DatabaseModels.ResScarti> dbResult = new List<MP.Data.DatabaseModels.ResScarti>();
+            List<ResScarti> dbResult = new List<ResScarti>();
             string cacheKey = getCacheKey("MP:STATS:SCARTI:RAW", CurrFilter);
             string rawData;
             var redisDataList = await distributedCache.GetAsync(cacheKey);
             if (redisDataList != null)
             {
                 rawData = Encoding.UTF8.GetString(redisDataList);
-                dbResult = JsonConvert.DeserializeObject<List<MP.Data.DatabaseModels.ResScarti>>(rawData);
+                dbResult = JsonConvert.DeserializeObject<List<ResScarti>>(rawData);
             }
             else
             {
@@ -445,21 +462,21 @@ namespace MP.Stats.Data
             return await Task.FromResult(dbResult);
         }
 
-        public async Task<List<MP.Data.DatabaseModels.TurniOee>> StatTurniOeeGetAllAsync(DateTime DataStart, DateTime DataEnd, string IdxMacchina, int IdxODL, string KeyRichiesta, string CodArticolo, string searchVal = "")
+        public async Task<List<TurniOee>> StatTurniOeeGetAllAsync(DateTime DataStart, DateTime DataEnd, string IdxMacchina, int IdxODL, string KeyRichiesta, string CodArticolo, string searchVal = "")
         {
             return await Task.FromResult(dbController.StatTurniOeeGetAll(DataStart, DataEnd, IdxMacchina, IdxODL, KeyRichiesta, CodArticolo));
         }
 
-        public async Task<List<MP.Data.DatabaseModels.TurniOee>> StatTurniOeeGetAllCached(SelectData CurrFilter, string searchVal = "")
+        public async Task<List<TurniOee>> StatTurniOeeGetAllCached(SelectData CurrFilter, string searchVal = "")
         {
-            List<MP.Data.DatabaseModels.TurniOee> dbResult = new List<MP.Data.DatabaseModels.TurniOee>();
+            List<TurniOee> dbResult = new List<TurniOee>();
             string cacheKey = getCacheKey("MP:STATS:OEE", CurrFilter);
             string rawData;
             var redisDataList = await distributedCache.GetAsync(cacheKey);
             if (redisDataList != null)
             {
                 rawData = Encoding.UTF8.GetString(redisDataList);
-                dbResult = JsonConvert.DeserializeObject<List<MP.Data.DatabaseModels.TurniOee>>(rawData);
+                dbResult = JsonConvert.DeserializeObject<List<TurniOee>>(rawData);
             }
             else
             {
@@ -476,17 +493,17 @@ namespace MP.Stats.Data
             return await Task.FromResult(dbResult);
         }
 
-        public async Task<List<MP.Data.DatabaseModels.UserActionLog>> StatUserLogGetAll(SelectData CurrFilter, string searchVal = "")
+        public async Task<List<UserActionLog>> StatUserLogGetAll(SelectData CurrFilter, string searchVal = "")
         {
             //return Task.FromResult(dbController.StatUserLogGetAll(DataStart, DataEnd, IdxMacchina, IdxODL, KeyRichiesta, CodArticolo).ToArray());
-            List<MP.Data.DatabaseModels.UserActionLog> dbResult = new List<MP.Data.DatabaseModels.UserActionLog>();
+            List<UserActionLog> dbResult = new List<UserActionLog>();
             string cacheKey = getCacheKey("MP:STATS:USRACTLOG", CurrFilter);
             string rawData;
             var redisDataList = await distributedCache.GetAsync(cacheKey);
             if (redisDataList != null)
             {
                 rawData = Encoding.UTF8.GetString(redisDataList);
-                dbResult = JsonConvert.DeserializeObject<List<MP.Data.DatabaseModels.UserActionLog>>(rawData);
+                dbResult = JsonConvert.DeserializeObject<List<UserActionLog>>(rawData);
             }
             else
             {
diff --git a/MP.Stats/MP.Stats.csproj b/MP.Stats/MP.Stats.csproj
index 553d3c20..9690072f 100644
--- a/MP.Stats/MP.Stats.csproj
+++ b/MP.Stats/MP.Stats.csproj
@@ -4,8 +4,8 @@
         <TargetFramework>net6.0</TargetFramework>
         <RootNamespace>MP.Stats</RootNamespace>
         <UserSecretsId>826e877c-ba70-4253-84cb-d0b1cafd4440</UserSecretsId>
-        <Version>6.16.2403.2817</Version>
-        <Version>6.16.2403.2817</Version>
+        <Version>6.16.2403.2819</Version>
+        <Version>6.16.2403.2819</Version>
     </PropertyGroup>
 
     <ItemGroup>
diff --git a/MP.Stats/Pages/TaskScheduler.razor b/MP.Stats/Pages/TaskScheduler.razor
index 5e29d7d6..84a68d64 100644
--- a/MP.Stats/Pages/TaskScheduler.razor
+++ b/MP.Stats/Pages/TaskScheduler.razor
@@ -4,20 +4,30 @@
     <div class="card-header table-primary p-1">
         <div class="d-flex justify-content-between">
             <div class="px-2">
-                <b>TaskList</b>
+                <b class="fs-4">TaskList</b>
             </div>
             <div class="px-2">
-                <select class="form-select" @bind="@TypeSel">
-                    @foreach (var option in Enum.GetValues(typeof(MP.Data.Objects.Enums.Task2ExeType)))
+                <div class="input-group">
+                    @if (currRecord == null)
                     {
-                        <option value="@option">
-                            @option
-                        </option>
+                        <button class="btn btn-success" @onclick="addNew" title="Add New"><i class="fas fa-plus"></i> Add New</button>
                     }
-                </select>
+                    else
+                    {
+                        <button class="btn btn-secondary" @onclick="doCancel" title="Cancel"><i class="fas fa-undo"></i> Cancel</button>
+                    }
+                    <select class="form-select" @bind="@TypeSel">
+                        @foreach (var option in Enum.GetValues(typeof(MP.Data.Objects.Enums.Task2ExeType)))
+                        {
+                            <option value="@option">
+                                @option
+                            </option>
+                        }
+                    </select>
+                </div>
             </div>
         </div>
-       <MP.Stats.Components.TaskEdit CurrRecord="@currRecord" EC_update="forceUpdate"></MP.Stats.Components.TaskEdit>
+        <MP.Stats.Components.TaskEdit CurrRecord="@currRecord" EC_update="forceUpdate"></MP.Stats.Components.TaskEdit>
     </div>
     <div class="card-body py-0 px-1">
         @if (ListRecords == null)
diff --git a/MP.Stats/Pages/TaskScheduler.razor.cs b/MP.Stats/Pages/TaskScheduler.razor.cs
index 6a78436f..b0f9807d 100644
--- a/MP.Stats/Pages/TaskScheduler.razor.cs
+++ b/MP.Stats/Pages/TaskScheduler.razor.cs
@@ -80,10 +80,46 @@ namespace MP.Stats.Pages
             }
         }
 
+        protected Task2ExeType TypeSel
+        {
+            get => typeSel;
+            set
+            {
+                if (typeSel != value)
+                {
+                    typeSel = value;
+                    var pUpd = Task.Run(async () =>
+                    {
+                        await ReloadData();
+                        //await InvokeAsync(StateHasChanged);
+                    });
+                    pUpd.Wait();
+                }
+            }
+        }
+
         #endregion Protected Properties
 
         #region Protected Methods
 
+        protected async Task addNew()
+        {
+            currRecord = new TaskListModel() { Name = "Nuovo Task", Descript = "Descrizione", DtLastExec = DateTime.Today, DtNextExec = DateTime.Today.AddDays(1) };
+            await ReloadData();
+        }
+
+        protected async Task doCancel()
+        {
+            currRecord = null;
+            await ReloadData();
+        }
+
+        protected async Task doEdit(TaskListModel selRec)
+        {
+            currRecord = selRec;
+            await ReloadData();
+        }
+
         protected async Task DoFilter(SelectData newFilter)
         {
             clearFile();
@@ -93,6 +129,36 @@ namespace MP.Stats.Pages
             await ReloadData();
         }
 
+        protected async Task doReset()
+        {
+            currRecord = null;
+            await ReloadData();
+        }
+
+        protected async Task doSave()
+        {
+            if (currRecord != null)
+            {
+#if false
+                bool done = false;
+                // salvo verificando status...
+                if (currOrder.OrderStatus == 10 || currOrder.OrderStatus == 10000)
+                {
+                    done = await WDService.OrderUpdateDescript(currOrder.OrderId, currOrder.OrderExtCode, currOrder.OrderDescript);
+                }
+                else
+                {
+                    done = await WDService.OrderUpdatePromDate(currOrder.OrderId, currOrder.DateProm);
+                }
+                // resetto info
+                currOrder = null;
+                isEdit = false;
+                await WDService.OrdersFlushCache();
+#endif
+                await ReloadData();
+            }
+        }
+
         protected async Task ForceReload(int newNum)
         {
             numRecord = newNum;
@@ -105,6 +171,12 @@ namespace MP.Stats.Pages
             await ReloadData();
         }
 
+        protected async Task forceUpdate(bool doForce)
+        {
+            currRecord = null;
+            await ReloadData();
+        }
+
         protected override async Task OnInitializedAsync()
         {
             clearFile();
@@ -190,6 +262,8 @@ namespace MP.Stats.Pages
         private bool isLoading { get; set; } = false;
         private int numRecord { get; set; } = 10;
 
+        private Task2ExeType typeSel { get; set; } = Task2ExeType.ND;
+
         #endregion Private Properties
 
         #region Private Methods
@@ -199,50 +273,6 @@ namespace MP.Stats.Pages
             await Task.Run(() => File.Delete(fullPath));
         }
 
-        protected async Task doSave()
-        {
-            if (currRecord != null)
-            {
-#if false
-                bool done = false;
-                // salvo verificando status...
-                if (currOrder.OrderStatus == 10 || currOrder.OrderStatus == 10000)
-                {
-                    done = await WDService.OrderUpdateDescript(currOrder.OrderId, currOrder.OrderExtCode, currOrder.OrderDescript);
-                }
-                else
-                {
-                    done = await WDService.OrderUpdatePromDate(currOrder.OrderId, currOrder.DateProm);
-                }
-                // resetto info
-                currOrder = null;
-                isEdit = false;
-                await WDService.OrdersFlushCache(); 
-#endif
-                await ReloadData();
-            }
-        }
-        protected async Task doCancel()
-        {
-            currRecord = null;
-            await ReloadData();
-        }
-        protected async Task doReset()
-        {
-            currRecord = null;
-            await ReloadData();
-        }
-
-        protected async Task forceUpdate(bool doForce)
-        {
-            currRecord = null;
-            await ReloadData();
-        }
-        protected async Task doEdit(TaskListModel selRec)
-        {
-            currRecord = selRec;
-            await ReloadData();
-        }
         private async Task ExportCsv()
         {
             isLoading = true;
@@ -257,25 +287,6 @@ namespace MP.Stats.Pages
             ListRecords = SearchRecords.Skip(numRecord * (currPage - 1)).Take(numRecord).ToList();
         }
 
-        protected Task2ExeType TypeSel
-        {
-            get => typeSel;
-            set
-            {
-                if (typeSel != value)
-                {
-                    typeSel = value;
-                    var pUpd = Task.Run(async () =>
-                    {
-                        await ReloadData();
-                        //await InvokeAsync(StateHasChanged);
-                    });
-                    pUpd.Wait();
-                }
-            }
-        }
-        private Task2ExeType typeSel { get; set; } = Task2ExeType.ND;
-
         #endregion Private Methods
     }
 }
\ No newline at end of file
diff --git a/MP.Stats/Resources/ChangeLog.html b/MP.Stats/Resources/ChangeLog.html
index 0ec2bd1d..1da11f4c 100644
--- a/MP.Stats/Resources/ChangeLog.html
+++ b/MP.Stats/Resources/ChangeLog.html
@@ -1,6 +1,6 @@
 <body>
     <i>Modulo statistiche MAPO</i>
-    <h4>Versione: 6.16.2403.2817</h4>
+    <h4>Versione: 6.16.2403.2819</h4>
     <br />
     Note di rilascio:
     <ul>
diff --git a/MP.Stats/Resources/VersNum.txt b/MP.Stats/Resources/VersNum.txt
index d0283c44..9f442f9f 100644
--- a/MP.Stats/Resources/VersNum.txt
+++ b/MP.Stats/Resources/VersNum.txt
@@ -1 +1 @@
-6.16.2403.2817
+6.16.2403.2819
diff --git a/MP.Stats/Resources/manifest.xml b/MP.Stats/Resources/manifest.xml
index 8d897ea2..92ddb2d6 100644
--- a/MP.Stats/Resources/manifest.xml
+++ b/MP.Stats/Resources/manifest.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <item>
-  <version>6.16.2403.2817</version>
+  <version>6.16.2403.2819</version>
   <url>https://nexus.steamware.net/repository/SWS/MP-STATS/stable/LAST/MP.Stats.zip</url>
   <changelog>https://nexus.steamware.net/repository/SWS/MP-STATS/stable/LAST/ChangeLog.html</changelog>
   <mandatory>false</mandatory>