diff --git a/GWMS.UI/Components/ItemPlanDetail.razor b/GWMS.UI/Components/ItemPlanDetail.razor
index 7ffdf1d..36385f9 100644
--- a/GWMS.UI/Components/ItemPlanDetail.razor
+++ b/GWMS.UI/Components/ItemPlanDetail.razor
@@ -68,6 +68,14 @@
         }
     }
 
+    protected void Edit(WeekPlanModel selRecord)
+    {
+        selRecordChanged.InvokeAsync(selRecord.WeekPlanId);
+    }
+
+    [Parameter]
+    public EventCallback<int> selRecordChanged { get; set; }
+
     private WeekPlanModel _currRecord = null;
 
     private WeekPlanModel currRecord
@@ -82,20 +90,7 @@
             if (doReport)
             {
                 _currRecord = value;
-                reportChange();
             }
         }
     }
-    protected void Edit(WeekPlanModel selRecord)
-    {
-        currRecord = selRecord;
-    }
-
-    private void reportChange()
-    {
-        selRecordChanged.InvokeAsync(_currRecord.WeekPlanId);
-    }
-
-    [Parameter]
-    public EventCallback<int> selRecordChanged { get; set; }
 }
\ No newline at end of file
diff --git a/GWMS.UI/Pages/WeekPlan.razor.cs b/GWMS.UI/Pages/WeekPlan.razor.cs
index 7f21475..415d7c7 100644
--- a/GWMS.UI/Pages/WeekPlan.razor.cs
+++ b/GWMS.UI/Pages/WeekPlan.razor.cs
@@ -15,8 +15,8 @@ namespace GWMS.UI.Pages
     {
         #region Private Fields
 
-        private int _endHour = 21;
-        private int _startHour = 9;
+        private int _endHour = 22;
+        private int _startHour = 8;
         private WeekPlanModel currRecord = null;
         private List<WeekPlanModel> ListRecords;
         private List<PlantDTO> PlantsList;
@@ -115,8 +115,7 @@ namespace GWMS.UI.Pages
                 if (_selSuppId != value)
                 {
                     _selSuppId = value;
-                    var pUpd = Task.Run(async () => await ReloadData());
-                    pUpd.Wait();
+                    checkHourRange();
                 }
             }
         }
@@ -129,8 +128,7 @@ namespace GWMS.UI.Pages
                 if (_selTraspId != value)
                 {
                     _selTraspId = value;
-                    var pUpd = Task.Run(async () => await ReloadData());
-                    pUpd.Wait();
+                    checkHourRange();
                 }
             }
         }
@@ -182,15 +180,20 @@ namespace GWMS.UI.Pages
 
         #region Private Methods
 
+        private void checkHourRange()
+        {
+            int minHour = ListRecords.OrderBy(x => x.DeliveryHour).FirstOrDefault().DeliveryHour;
+            int maxHour = ListRecords.OrderByDescending(x => x.DeliveryHour).FirstOrDefault().DeliveryHour;
+            _startHour = _startHour < minHour ? _startHour : minHour;
+            _endHour = _endHour > maxHour ? _endHour : maxHour;
+        }
+
         private async Task ReloadData()
         {
             isLoading = true;
             ListRecords = await DataService.WeekPlanGet();
             // calcolo min/max...
-            int minHour = ListRecords.OrderBy(x => x.DeliveryHour).FirstOrDefault().DeliveryHour;
-            int maxHour = ListRecords.OrderByDescending(x => x.DeliveryHour).FirstOrDefault().DeliveryHour;
-            startHour = startHour < minHour ? startHour : minHour;
-            endHour = endHour > maxHour ? endHour : maxHour;
+            checkHourRange();
             isLoading = false;
         }