Egalware/gpw_next
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'develop' of https://gitlab.steamware.net/steamware/gpw_next into develop

Browse Source
This commit is contained in:
Samuele Locatelli
2023-01-20 12:07:15 +01:00
parent c129b9640c af65a73e27
commit 40e666fa1b
7 changed files with 57 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files
GPW.CORE.Comp/CalendarWeek.razor
+2 -2
View File
@@ -7,10 +7,10 @@ else
<table class="cssTable" style="@HeadStyle">
<thead>
<tr class="">
<th class="text-center" style="width: @lblWidth ;">-</th>
<th class="text-center" style="width: @lblWidth;">-</th>
@foreach (var item in DateList)
{
<th class="text-center" style="width: @dataWidth ;">
<th class="text-center" style="width: @dataWidth;">
<div>
@($"{item:ddd}".Substring(0, 1).ToUpper())
</div>
GPW.CORE.Comp/CalendarWeek.razor.cs
+1 -1
View File
@@ -179,7 +179,7 @@ namespace GPW.CORE.Comp
List<CalendarEvent> answ = new List<CalendarEvent>();
if (EventList != null)
{
answ = EventList.Where(x => x.Inizio.Date == DtReq).ToList();
answ = EventList.Where(x =>DateList.Contains(x.Inizio.Date)).ToList();
}
return answ;
}
GPW.CORE.SMART/Components/TestWeekCal.razor
+1 -1
View File
@@ -1,4 +1,4 @@
<CalendarWeek DateList="@ListDate" WeekChanged="ChangePeriod" EventList="@simEventList"></CalendarWeek>
<CalendarWeek DateList="@ListDate" WeekChanged="ChangePeriod" EventList="@eventListPerWeek"></CalendarWeek>
GPW.CORE.SMART/Components/TestWeekCal.razor.cs
+37 -30
View File
@@ -19,7 +19,10 @@ namespace GPW.CORE.Smart.Components
protected List<DateTime> ListDate = new List<DateTime>();
public List<CalendarEvent> simEventList { get; set; } = new List<CalendarEvent>();
[Parameter]
public List<CalendarEvent> eventList { get; set; } = new List<CalendarEvent>();
protected List<CalendarEvent> eventListPerWeek { get; set; } = new List<CalendarEvent>();
#endregion Protected Fields
@@ -63,35 +66,39 @@ namespace GPW.CORE.Smart.Components
ListDate.Add(DtReq.AddDays(i - nWeek));
}
// aggiongo eventi simulati x ogni giorno
int idxEv = 0;
simEventList = new List<CalendarEvent>();
int hStart = 0;
int minDur = 0;
DateTime dtInizio = DateTime.MinValue;
DateTime dtFine = DateTime.MinValue;
int numEv = 0;
foreach (var giorno in ListDate)
{
// per prima cosa devo decidere quanti eventi...
numEv = rnd.Next(0, 4);
for (int i = 0; i < numEv; i++)
{
hStart = rnd.Next(8, 14);
minDur = rnd.Next(6, 36) * 10;
dtInizio = giorno.AddHours(hStart);
dtFine = dtInizio.AddMinutes(minDur);
simEventList.Add(new CalendarEvent()
{
id = idxEv++,
Inizio = dtInizio,
Fine = dtFine,
CssClass = "text-light",
Title = $"Sim EV {idxEv}",
Description = $"Nuovo evento simulato, {dtInizio:HH:mm} --> {dtFine:HH:mm}"
});
}
}
//// aggiongo eventi simulati x ogni giorno
//int idxEv = 0;
//simEventList = new List<CalendarEvent>();
//int hStart = 0;
//int minDur = 0;
//DateTime dtInizio = DateTime.MinValue;
//DateTime dtFine = DateTime.MinValue;
//int numEv = 0;
//foreach (var giorno in ListDate)
//{
// // per prima cosa devo decidere quanti eventi...
// numEv = rnd.Next(0, 4);
// for (int i = 0; i < numEv; i++)
// {
// hStart = rnd.Next(8, 14);
// minDur = rnd.Next(6, 36) * 10;
// dtInizio = giorno.AddHours(hStart);
// dtFine = dtInizio.AddMinutes(minDur);
// simEventList.Add(new CalendarEvent()
// {
// id = idxEv++,
// Inizio = dtInizio,
// Fine = dtFine,
// CssClass = "text-light",
// Title = $"Sim EV {idxEv}",
// Description = $"Nuovo evento simulato, {dtInizio:HH:mm} --> {dtFine:HH:mm}"
// });
// }
//}
eventListPerWeek = eventList.Where(x => ListDate.Contains(x.Inizio)).ToList();
await Task.Delay(1);
}
GPW.CORE.SMART/Data/CalendarModeEnum.cs
+4 -2
View File
@@ -7,10 +7,12 @@
/// </summary>
public enum modoControllo
{
showCalendar = 0,
nd=0,
showCalendar,
showGauge,
showProj,
showTimbr
showTimbr,
showWeek
}
}
}
GPW.CORE.SMART/Pages/DayOff.razor
+9 -1
View File
@@ -33,8 +33,16 @@
<div class="col-12">
@if (!isLoading)
{
<CalendarMonth DtRif="@dtCurr" MainCss="table table-dark table-borderless" DateSelected="DisplayDate" MonthChanged="ReloadMonth" DateCheckBlock="@DateCFF" EventList=@eventList SingleWeek="@showDetail" SelDayCss="selDate rounded-top p-2" HeadStyle="color: #E67E22"></CalendarMonth>
@if (!showDetail)
{
<CalendarMonth DtRif="@dtCurr" MainCss="table table-dark table-borderless" DateSelected="DisplayDate" MonthChanged="ReloadMonth" DateCheckBlock="@DateCFF" EventList=@eventList SingleWeek="@showDetail" SelDayCss="selDate rounded-top p-2" HeadStyle="color: #E67E22"></CalendarMonth>
}
else
{
<TestWeekCal NumDays="@numDays" DtReq="@DtReq" eventList="@eventList"></TestWeekCal>
}
}
</div>
</div>
</div>
GPW.CORE.SMART/Pages/DayOff.razor.cs
+3
View File
@@ -33,6 +33,9 @@ namespace GPW.CORE.Smart.Pages
protected DateTime dtMin = DateTime.Today;
protected int numMesi = 6;
protected int numDays = 5;
protected DateTime DtReq { get; set; } = DateTime.Today;
#endregion Protected Fields