diff --git a/GPW.CORE.SMART/Components/Compo/RegRichieste.razor.cs b/GPW.CORE.SMART/Components/Compo/RegRichieste.razor.cs index f4763ce..0a7888c 100644 --- a/GPW.CORE.SMART/Components/Compo/RegRichieste.razor.cs +++ b/GPW.CORE.SMART/Components/Compo/RegRichieste.razor.cs @@ -89,18 +89,29 @@ namespace GPW.CORE.Smart.Components.Compo get => currRecord.CodGiust; set { - currRecord.CodGiust = value; - // imposto dataOra min/max da tipo cod Giust - if (value == "FER") + if (currRecord.CodGiust != value) { - dtStart = minDate(value); - dtEnd = minDate(value); - } - else - { - int ora = DateTime.Now.Hour; - dtStart = minDate(value).AddHours(ora); - dtEnd = minDate(value).AddHours(ora + 4); + currRecord.CodGiust = value; + // calcolo limite date + DateTime mDtStart = minDate(value); + DateTime mDtEnd = maxDate(value); + // imposto dataOra min/max da tipo cod Giust + if (value != "FER") + { + int ora = DateTime.Now.Hour; + mDtStart = minDate(value).AddHours(ora); + mDtEnd = minDate(value).AddHours(ora + 4); + } + // modifico SE fossero extra periodo + if (mDtStart > dtStart) + { + dtStart = mDtStart; + } + if (mDtEnd < dtEnd) + { + dtStart = mDtStart; + dtEnd = mDtEnd; + } } } } diff --git a/GPW.CORE.SMART/GPW.CORE.SMART.csproj b/GPW.CORE.SMART/GPW.CORE.SMART.csproj index 76772d6..0516577 100644 --- a/GPW.CORE.SMART/GPW.CORE.SMART.csproj +++ b/GPW.CORE.SMART/GPW.CORE.SMART.csproj @@ -4,7 +4,7 @@ net8.0 enable enable - 4.1.2409.1610 + 4.1.2409.1612 diff --git a/GPW.CORE.WRKLOG/Properties/PublishProfiles/IIS-PROD.pubxml.user b/GPW.CORE.WRKLOG/Properties/PublishProfiles/IIS-PROD.pubxml.user index 5a599cc..83280ab 100644 --- a/GPW.CORE.WRKLOG/Properties/PublishProfiles/IIS-PROD.pubxml.user +++ b/GPW.CORE.WRKLOG/Properties/PublishProfiles/IIS-PROD.pubxml.user @@ -7,7 +7,7 @@ by editing this MSBuild file. In order to learn more about this please visit htt AQAAANCMnd8BFdERjHoAwE/Cl+sBAAAAw3dMMgC4FUywyOTV2xvCRgAAAAACAAAAAAADZgAAwAAAABAAAADrbAogtj/xpZqylbgs9Hb3AAAAAASAAACgAAAAEAAAAFm1lcdH7oj+NFy4QgZ7q18YAAAAROPsyRR12dhPTKfMEQ5yNCAZJ5K7C4pvFAAAAEFBVTwItjyYP2BlOTsuK1g9myQ8 - True|2024-09-07T08:37:21.9427027Z||;True|2024-09-06T19:01:32.2132061+02:00||;True|2024-09-06T18:20:28.3994458+02:00||;True|2024-09-05T10:43:51.3246848+02:00||;True|2024-09-05T10:26:17.6114175+02:00||;True|2024-09-05T09:25:03.5122942+02:00||;True|2024-09-04T18:21:49.9717603+02:00||;True|2023-04-11T10:12:15.0154900+02:00||;False|2023-04-11T10:11:47.1977827+02:00||;True|2023-04-11T09:18:55.4555319+02:00||;True|2023-04-11T09:16:05.8827677+02:00||;True|2022-06-06T12:56:03.5790550+02:00||;False|2022-06-06T12:54:19.4739620+02:00||;False|2022-06-06T12:53:46.4246554+02:00||; + True|2024-09-16T10:11:20.8437662Z||;True|2024-09-07T10:37:21.9427027+02:00||;True|2024-09-06T19:01:32.2132061+02:00||;True|2024-09-06T18:20:28.3994458+02:00||;True|2024-09-05T10:43:51.3246848+02:00||;True|2024-09-05T10:26:17.6114175+02:00||;True|2024-09-05T09:25:03.5122942+02:00||;True|2024-09-04T18:21:49.9717603+02:00||;True|2023-04-11T10:12:15.0154900+02:00||;False|2023-04-11T10:11:47.1977827+02:00||;True|2023-04-11T09:18:55.4555319+02:00||;True|2023-04-11T09:16:05.8827677+02:00||;True|2022-06-06T12:56:03.5790550+02:00||;False|2022-06-06T12:54:19.4739620+02:00||;False|2022-06-06T12:53:46.4246554+02:00||; \ No newline at end of file