Ancora editing pagina planner, completata

GPW.CORE.Data/Controllers/GPWController.cs

@@ -139,6 +139,8 @@ namespace GPW.CORE.Data.Controllers
             List<TimbratureExplModel> rawTimbExp = new List<TimbratureExplModel>();
             List<TimbratureModel> rawTimbr = new List<TimbratureModel>();
             List<RegAttivitaModel> rawRegAtt = new List<RegAttivitaModel>();
+            List<RilievoTempModel> rawRilTemp = new List<RilievoTempModel>();
+            List<CheckVc19Model> rawCheckC19 = new List<CheckVc19Model>();
 
             // cerco su DB recuperando set di dati....
             using (GPWContext localDbCtx = new GPWContext(_configuration))
@@ -160,6 +162,16 @@ namespace GPW.CORE.Data.Controllers
                                 .Include(a => a.FasiNav).ThenInclude(p => p.ProgettoNav).ThenInclude(c => c.ClienteNav)
                                 .ToList();
 
+                rawRilTemp = localDbCtx
+                                .DbSetRilievoTemp
+                                .Where(x => x.IdxDipendente == idxDipendente && dtInizio <= x.DtRilievo && x.DtRilievo <= dtFine)
+                                .ToList();
+
+                rawCheckC19 = localDbCtx
+                                .DbSetCheckVc19
+                                .Where(x => x.IdxDipendente == idxDipendente && dtInizio <= x.DtCheck && x.DtCheck <= dtFine)
+                                .ToList();
+
                 // calcolo intervallo date...
                 int numDays = dtFine.Subtract(dtInizio).Days;
 
@@ -179,7 +191,13 @@ namespace GPW.CORE.Data.Controllers
                                 .ToList(),
                         TimbrExpl = rawTimbExp
                                 .Where(x => thisDay == x.DataLav)
-                                .FirstOrDefault()
+                                .FirstOrDefault(),
+                        ListRilTemp = rawRilTemp
+                                .Where(x => thisDay <= x.DtRilievo && x.DtRilievo <= thisDay.AddDays(1))
+                                .ToList(),
+                        ListCheckC19 = rawCheckC19
+                                .Where(x => thisDay <= x.DtCheck && x.DtCheck <= thisDay.AddDays(1))
+                                .ToList()
                     };
 
                     dbResult.Add(currDayDto);

GPW.CORE.Data/DTO/DailyDataDTO.cs

@@ -19,6 +19,8 @@ namespace GPW.CORE.Data.DTO
         public List<RegAttivitaModel>? ListRA { get; set; }
         public List<TimbratureModel>? ListTimbr { get; set; }
         public TimbratureExplModel? TimbrExpl { get; set; }
+        public List<RilievoTempModel>? ListRilTemp { get; set; }
+        public List<CheckVc19Model>? ListCheckC19 { get; set; }
 
         public DateTime DtInizio
         {

GPW.CORE.UI/Components/DayHoriz.razor

@@ -49,6 +49,7 @@
         {
             <div class="small"><b>@TotLav</b> <i class="far fa-calendar-alt"></i></div>
             <div class="small"><b>@TotComm</b> <i class="far fa-hourglass"></i></div>
+            <div class="small"><i class="fas fa-thermometer-half @cssThermo"></i> <i class="fas fa-certificate @cssCheck"></i></div>
         }
     </div>
 </div>

GPW.CORE.UI/Components/DayHoriz.razor.cs

@@ -93,6 +93,39 @@ namespace GPW.CORE.UI.Components
             }
         }
 
+        private bool OkTemp
+        {
+            get
+            {
+                bool answ = false;
+                if (DayDTO != null && DayDTO.ListRilTemp != null)
+                {
+                    answ = DayDTO.ListRilTemp.Count > 0;
+                }
+                return answ;
+            }
+        }
+        private bool OkVC19
+        {
+            get
+            {
+                bool answ = false;
+                if (DayDTO != null && DayDTO.ListCheckC19 != null)
+                {
+                    answ = DayDTO.ListCheckC19.Count > 0;
+                }
+                return answ;
+            }
+        }
+
+        public string cssThermo
+        {
+            get => OkTemp ? "text-success" : "text-secondary";
+        }
+        public string cssCheck
+        {
+            get => OkVC19 ? "text-success" : "text-secondary";
+        }
 
         private List<CORE.Data.DbModels.RegAttivitaModel> ListRegAtt()
         {
@@ -110,9 +143,9 @@ namespace GPW.CORE.UI.Components
                     {
                         Inizio = currHour,
                         IdxFase = 0,
-                        Descrizione="-",
-                        Fine =item.Inizio,
-                        OreTot=(decimal)item.Inizio.Subtract(currHour).TotalHours
+                        Descrizione = "-",
+                        Fine = item.Inizio,
+                        OreTot = (decimal)item.Inizio.Subtract(currHour).TotalHours
                     };
                     result.Add(newItem);
                 }

GPW.CORE.UI/Pages/Planner.razor

@@ -69,14 +69,6 @@
                 }
             </div>
         }
-        <div class="small mt-5">
-            Pagina principale formato "agenda":
-            <ul>
-                <li> click --> modal compilazione record (selettore gerarchico + ricerca ultimi progetti pareto a dx)</li>
-                <li>click + trascina?!?!? da verificare</li>
-                <li> in testa 2 icone x indicare OK temperatura e OK x check C19</li>
-            </ul>
-        </div>
     </div>
     <div class="card-footer py-1">
         <div class="row small">