IlyaSobolev/DocSpace-client
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Calendar: post-merge fixes

Browse Source
This commit is contained in:
Nikolay Rechkin 2021-07-27 16:09:30 +03:00
parent f1668a3b43
commit 6fbdaf0d31
6 changed files with 11 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
common/services/ASC.Radicale/ASC.Radicale.csproj
View File

@ -11,6 +11,10 @@
<DebugSymbols>false</DebugSymbols>
</PropertyGroup>
<ItemGroup>
<PackageReference Include="Autofac.Extensions.DependencyInjection" Version="7.1.0" />
</ItemGroup>
<ItemGroup>
<Folder Include="Properties\" />
</ItemGroup>

1
common/services/ASC.Radicale/Program.cs
View File

@ -92,7 +92,6 @@ namespace ASC.Radicale
diHelper.TryAdd(typeof(ICacheNotify<>), typeof(KafkaCache<>));
diHelper.RegisterProducts(hostContext.Configuration, hostContext.HostingEnvironment.ContentRootPath);
LogNLogExtension.ConfigureLog(diHelper, "ASC.Radicale");
services.AddHostedService<RadicaleServiceLauncher>();
diHelper.TryAdd<RadicaleServiceLauncher>();
})

5
products/ASC.CRM/Server/Classes/CRMCalendar.cs
View File

@ -78,7 +78,10 @@ namespace ASC.CRM.Api
SharingOptions = new SharingOptions();
// SharingOptions.PublicItems.Add(new SharingOptions.PublicItem { Id = userId, IsGroup = false });
}
public override List<ITodo> LoadTodos(Guid userId, DateTime utcStartDate, DateTime utcEndDate)
{
return new List<ITodo>();
}
public override List<IEvent> LoadEvents(Guid userId, DateTime startDate, DateTime endDate)
{
var events = new List<IEvent>();

2
products/ASC.Calendar/Server/BusinessObjects/DataProvider.cs
View File

@ -1644,7 +1644,7 @@ namespace ASC.Calendar.BusinessObjects
var offset = timeZone.GetOffset();
var localFromDate = DateTime.UtcNow.Add(offset);
var localStartDate = isAllDayLong ? utcStartDate : utcStartDate.Add(offset);
var dates = rrule.GetDates(localStartDate, localFromDate, 3);
var dates = rrule.GetDates(localStartDate, timeZone, isAllDayLong, localFromDate, 3);
for (var i = 0; i < dates.Count; i++)
{
dates[i] = dates[i].Subtract(offset);

2
products/ASC.Calendar/Server/Controllers/CalendarController.cs
View File

@ -2561,7 +2561,7 @@ namespace ASC.Calendar.Controllers
{
var lastEventDate = evt.AllDayLong ? utcDate.Date : utcDate;
var dates = evt.RecurrenceRule
.GetDates(evt.UtcStartDate, evt.UtcStartDate, evt.UtcStartDate.AddMonths(_monthCount), int.MaxValue, false)
.GetDates(evt.UtcStartDate, evt.TimeZone, evt.AllDayLong, evt.UtcStartDate, evt.UtcStartDate.AddMonths(_monthCount), int.MaxValue, false)
.Where(x => x < lastEventDate)
.ToList();

2
products/ASC.Calendar/Server/Models/EventWrapper.cs
View File

@ -286,7 +286,7 @@ namespace ASC.Calendar.Models
}
else
{
recurenceDates = _baseEvent.RecurrenceRule.GetDates(_baseEvent.UtcStartDate, utcStartDate, utcEndDate);
recurenceDates = _baseEvent.RecurrenceRule.GetDates(_baseEvent.UtcStartDate, _baseEvent.TimeZone, _baseEvent.AllDayLong, utcStartDate, utcEndDate);
}
foreach (var d in recurenceDates)