diff --git a/Client/Components/UserComponent.razor b/Client/Components/UserComponent.razor new file mode 100644 index 0000000..7386d11 --- /dev/null +++ b/Client/Components/UserComponent.razor @@ -0,0 +1,6 @@ +

@user.DisplayName

+ +@code { + [Parameter] + public User user { get; set; } +} \ No newline at end of file diff --git a/Client/Modules/SZUAbsolventenverein.Module.EventRegistration/Details.razor b/Client/Modules/SZUAbsolventenverein.Module.EventRegistration/Details.razor index 6fdccf0..e2cc824 100644 --- a/Client/Modules/SZUAbsolventenverein.Module.EventRegistration/Details.razor +++ b/Client/Modules/SZUAbsolventenverein.Module.EventRegistration/Details.razor @@ -4,6 +4,7 @@ @using SZUAbsolventenverein.Module.EventRegistration.Services @using SZUAbsolventenverein.Module.EventRegistration.Models @using System.Text.RegularExpressions +@using SZUAbsolventenverein.Module.EventRegistration.Client.Components @namespace SZUAbsolventenverein.Module.EventRegistration @inherits ModuleBase @@ -31,19 +32,23 @@ @if (Status == true) { @Localizer["Zugesagt"]
-

+

} else { @Localizer["Abgesagt"]
-

+

}

} else {
- - + +
} + @foreach (User u in _users) + { + + } } else {

Um dich für dieses Event zu registrieren, muss man sich zuerst anmelden.

@@ -65,9 +70,6 @@ new Resource { ResourceType = ResourceType.Stylesheet, Url = ModulePath() + "Module.css" } }; - // private ElementReference form; - // private bool validated = false; - private int _id; private string _name; private string _description; @@ -79,6 +81,8 @@ private List _profiles = new List(); private Dictionary _settings; + + private List _users = new List(); private async Task SendResponse(bool response) { @@ -107,12 +111,12 @@ } } - private async void Zusage() + private async void Accept() { await SendResponse(true); } - private async void Absage() + private async void Reject() { await SendResponse(false); } @@ -121,6 +125,8 @@ { try { + _id = Int32.Parse(PageState.QueryString["id"]); + if(PageState.User != null) { _profiles = await ProfileService.GetProfilesAsync(PageState.Site.SiteId); var user = await UserService.GetUserAsync(PageState.User.UserId, PageState.Site.SiteId); @@ -128,10 +134,10 @@ { _settings = user.Settings; } + _users = await EventRegistrationService.GetRecommendedResponses(_id, ModuleState.ModuleId); + _users.ForEach(u => Console.WriteLine(u.UserId)); } - - _id = Int32.Parse(PageState.QueryString["id"]); - + Event currentEvent; Response rsvp; (currentEvent, rsvp) = await EventRegistrationService.GetEventDetails(_id, ModuleState.ModuleId); diff --git a/Client/Services/EventRegistrationService.cs b/Client/Services/EventRegistrationService.cs index 6e45618..3462820 100644 --- a/Client/Services/EventRegistrationService.cs +++ b/Client/Services/EventRegistrationService.cs @@ -3,6 +3,7 @@ using System.Linq; using System.Net.Http; using System.Threading.Tasks; using Microsoft.Extensions.Logging; +using Oqtane.Models; using Oqtane.Services; using Oqtane.Shared; using SZUAbsolventenverein.Module.EventRegistration.Models; @@ -15,27 +16,6 @@ namespace SZUAbsolventenverein.Module.EventRegistration.Services private string Apiurl => CreateApiUrl("EventRegistration"); - /*public async Task> GetEventRegistrationsAsync(int ModuleId) - { - List EventRegistrations = await GetJsonAsync>(CreateAuthorizationPolicyUrl($"{Apiurl}?moduleid={ModuleId}", EntityNames.Module, ModuleId), Enumerable.Empty().ToList()); - return EventRegistrations.OrderBy(item => item.Name).ToList(); - } - - public async Task GetEventRegistrationAsync(int EventRegistrationId, int ModuleId) - { - return await GetJsonAsync(CreateAuthorizationPolicyUrl($"{Apiurl}/{EventRegistrationId}/{ModuleId}", EntityNames.Module, ModuleId)); - } - - public async Task AddEventRegistrationAsync(Models.Event EventRegistration) - { - return await PostJsonAsync(CreateAuthorizationPolicyUrl($"{Apiurl}", EntityNames.Module, EventRegistration.ModuleId), EventRegistration); - } - - public async Task UpdateEventRegistrationAsync(Models.Event EventRegistration) - { - return await PutJsonAsync(CreateAuthorizationPolicyUrl($"{Apiurl}/{EventRegistration.EventRegistrationId}", EntityNames.Module, EventRegistration.ModuleId), EventRegistration); - }*/ - public async Task> GetEventsAsync(int ModuleId) { List EventRegistrations = await GetJsonAsync(CreateAuthorizationPolicyUrl($"{Apiurl}?moduleid={ModuleId}", EntityNames.Module, ModuleId), Enumerable.Empty().ToList()); @@ -80,5 +60,10 @@ namespace SZUAbsolventenverein.Module.EventRegistration.Services { throw new System.NotImplementedException(); } + + public Task> GetRecommendedResponses(int EventId, int ModuleId) + { + throw new System.NotImplementedException(); + } } } diff --git a/Package/debug.sh b/Package/debug.sh index c4d069f..01a9758 100644 --- a/Package/debug.sh +++ b/Package/debug.sh @@ -3,10 +3,10 @@ TargetFramework=$1 ProjectName=$2 -cp -f "../Client/bin/Debug/$TargetFramework/$ProjectName$.Client.Oqtane.dll" "../../oqtane.framework/Oqtane.Server/bin/Debug/$TargetFramework/" -cp -f "../Client/bin/Debug/$TargetFramework/$ProjectName$.Client.Oqtane.pdb" "../../oqtane.framework/Oqtane.Server/bin/Debug/$TargetFramework/" -cp -f "../Server/bin/Debug/$TargetFramework/$ProjectName$.Server.Oqtane.dll" "../../oqtane.framework/Oqtane.Server/bin/Debug/$TargetFramework/" -cp -f "../Server/bin/Debug/$TargetFramework/$ProjectName$.Server.Oqtane.pdb" "../../oqtane.framework/Oqtane.Server/bin/Debug/$TargetFramework/" -cp -f "../Shared/bin/Debug/$TargetFramework/$ProjectName$.Shared.Oqtane.dll" "../../oqtane.framework/Oqtane.Server/bin/Debug/$TargetFramework/" -cp -f "../Shared/bin/Debug/$TargetFramework/$ProjectName$.Shared.Oqtane.pdb" "../../oqtane.framework/Oqtane.Server/bin/Debug/$TargetFramework/" +cp -f "../Client/bin/Debug/$TargetFramework/$ProjectName.Client.Oqtane.dll" "../../oqtane.framework/Oqtane.Server/bin/Debug/$TargetFramework/" +cp -f "../Client/bin/Debug/$TargetFramework/$ProjectName.Client.Oqtane.pdb" "../../oqtane.framework/Oqtane.Server/bin/Debug/$TargetFramework/" +cp -f "../Server/bin/Debug/$TargetFramework/$ProjectName.Server.Oqtane.dll" "../../oqtane.framework/Oqtane.Server/bin/Debug/$TargetFramework/" +cp -f "../Server/bin/Debug/$TargetFramework/$ProjectName.Server.Oqtane.pdb" "../../oqtane.framework/Oqtane.Server/bin/Debug/$TargetFramework/" +cp -f "../Shared/bin/Debug/$TargetFramework/$ProjectName.Shared.Oqtane.dll" "../../oqtane.framework/Oqtane.Server/bin/Debug/$TargetFramework/" +cp -f "../Shared/bin/Debug/$TargetFramework/$ProjectName.Shared.Oqtane.pdb" "../../oqtane.framework/Oqtane.Server/bin/Debug/$TargetFramework/" cp -rf "../Server/wwwroot/"* "../../oqtane.framework/Oqtane.Server/wwwroot/" \ No newline at end of file diff --git a/Server/Services/EventRegistrationService.cs b/Server/Services/EventRegistrationService.cs index 2a6f537..ca5b73d 100644 --- a/Server/Services/EventRegistrationService.cs +++ b/Server/Services/EventRegistrationService.cs @@ -1,5 +1,7 @@ +using System; using System.Collections.Generic; using System.Linq; +using System.Numerics; using System.Threading.Tasks; using Microsoft.AspNetCore.Http; using Oqtane.Enums; @@ -23,9 +25,10 @@ namespace SZUAbsolventenverein.Module.EventRegistration.Services private readonly IUserPermissions _userPermissions; private readonly ILogManager _logger; private readonly IHttpContextAccessor _accessor; + private readonly ISettingRepository _settingRepository; private readonly Alias _alias; - public ServerEventRegistrationService(IEventRepository EventRepository, IResponseRepository ResponseRepository, INotificationRepository NotificationRepository, IUserRepository UserRepository, IUserPermissions userPermissions, ITenantManager tenantManager, ILogManager logger, IHttpContextAccessor accessor) + public ServerEventRegistrationService(IEventRepository EventRepository, IResponseRepository ResponseRepository, INotificationRepository NotificationRepository, IUserRepository UserRepository, IUserPermissions userPermissions, ITenantManager tenantManager, ILogManager logger, IHttpContextAccessor accessor, ISettingRepository settingRepository) { _EventRepository = EventRepository; _ResponseRepository = ResponseRepository; @@ -34,6 +37,7 @@ namespace SZUAbsolventenverein.Module.EventRegistration.Services _userPermissions = userPermissions; _logger = logger; _accessor = accessor; + _settingRepository = settingRepository; _alias = tenantManager.GetAlias(); } @@ -148,7 +152,32 @@ namespace SZUAbsolventenverein.Module.EventRegistration.Services _logger.Log(LogLevel.Error, this, LogFunction.Security, "Unauthorized Event Response Get Attempt {ModuleId}", ModuleId); return null; } - throw new System.NotImplementedException(); + } + + public async Task> GetRecommendedResponses(int EventId, int ModuleId) + { + if (_userPermissions.IsAuthorized(_accessor.HttpContext.User, _alias.SiteId, EntityNames.Module, ModuleId, PermissionNames.View)) + { + IEnumerable responses = _ResponseRepository.GetResponses(EventId, ModuleId).DistinctBy(r => r.OwnerId).Where(r => r.OwnerId != _accessor.HttpContext.User.UserId() && r.ResponseType); + IEnumerable users = _UserRepository.GetUsers(); + + List userSettings = _settingRepository.GetSettings("User").ToList(); + + List requestorSettings = userSettings.FindAll(s => s.EntityId == _accessor.HttpContext.User.UserId()); + string targetFachrichtung = requestorSettings.FirstOrDefault(s => s.SettingName == "Fachrichtung")?.SettingValue; + int targetStartjahr = int.Parse(requestorSettings.FirstOrDefault(s => s.SettingName == "Jahrgang")?.SettingValue ?? "0"); + + + IEnumerable gu = responses.Join(users, r => r.OwnerId, u => u.UserId, + (response, user) => (response, user)).GroupJoin(userSettings, ru => ru.user.UserId, + s => s.EntityId, (ru, s) => new GroupingUser(ru.user, ru.response, s, targetStartjahr, targetFachrichtung)).OrderBy(gu => gu.Score()); + return gu.Select(gu => gu.User).Take(10).ToList(); + } + else + { + _logger.Log(LogLevel.Error, this, LogFunction.Security, "Unauthorized Event Response Get Attempt {ModuleId}", ModuleId); + return null; + } } public Task> GetEventsAsync(int ModuleId) @@ -179,55 +208,6 @@ namespace SZUAbsolventenverein.Module.EventRegistration.Services return Task.FromResult(NewEvent); } - // TODO: Implement the methods for EventResponses - - /* - - public Task GetEventRegistrationAsync(int EventRegistrationId, int ModuleId) - { - if (_userPermissions.IsAuthorized(_accessor.HttpContext.User, _alias.SiteId, EntityNames.Module, ModuleId, PermissionNames.View)) - { - return Task.FromResult(_EventRegistrationRepository.GetEventRegistration(EventRegistrationId)); - } - else - { - _logger.Log(LogLevel.Error, this, LogFunction.Security, "Unauthorized EventRegistration Get Attempt {EventRegistrationId} {ModuleId}", EventRegistrationId, ModuleId); - return null; - } - } - - public Task AddEventRegistrationAsync(Models.Event EventRegistration) - { - if (_userPermissions.IsAuthorized(_accessor.HttpContext.User, _alias.SiteId, EntityNames.Module, EventRegistration.ModuleId, PermissionNames.Edit)) - { - EventRegistration = _EventRegistrationRepository.AddEventRegistration(EventRegistration); - _logger.Log(LogLevel.Information, this, LogFunction.Create, "EventRegistration Added {EventRegistration}", EventRegistration); - } - else - { - _logger.Log(LogLevel.Error, this, LogFunction.Security, "Unauthorized EventRegistration Add Attempt {EventRegistration}", EventRegistration); - EventRegistration = null; - } - return Task.FromResult(EventRegistration); - } - - public Task UpdateEventRegistrationAsync(Models.Event EventRegistration) - { - if (_userPermissions.IsAuthorized(_accessor.HttpContext.User, _alias.SiteId, EntityNames.Module, EventRegistration.ModuleId, PermissionNames.Edit)) - { - EventRegistration = _EventRegistrationRepository.UpdateEventRegistration(EventRegistration); - _logger.Log(LogLevel.Information, this, LogFunction.Update, "EventRegistration Updated {EventRegistration}", EventRegistration); - } - else - { - _logger.Log(LogLevel.Error, this, LogFunction.Security, "Unauthorized EventRegistration Update Attempt {EventRegistration}", EventRegistration); - EventRegistration = null; - } - return Task.FromResult(EventRegistration); - } - - }*/ - private void SendEventResponseNotification(string subject, string body) { User user = _UserRepository.GetUser(_accessor.HttpContext.User.UserId()); @@ -235,4 +215,76 @@ namespace SZUAbsolventenverein.Module.EventRegistration.Services _NotificationRepository.AddNotification(notification); } } + + public class GroupingUser + { + private User _user; + private Response _response; + + private string _fachrichtung; + private int _startjahr; + + private int _targetyear; + private string _targetfachrichtung; + public User User { get { return _user; } } + + public IEnumerable Settings + { + set + { + if (value == null) + { + _fachrichtung = "-"; + _startjahr = 0; + return; + } + _fachrichtung = value.FirstOrDefault(v => v.SettingName == "Fachrichtung", new Setting(){SettingValue = "-"}).SettingValue; + _startjahr = int.Parse(value.FirstOrDefault(v => v.SettingName == "Jahrgang", new Setting(){SettingValue = "0"}).SettingValue); + } + } + + public string TargetFachrichtung + { + set { _targetfachrichtung = value; } + } + public int TargetJahr + { + set { _targetyear = value; } + } + + public GroupingUser(User user, Response response, IEnumerable settings, int targetyear, string targetfachrichtung) + { + _user = user; + _response = response; + Settings = settings; + TargetJahr = targetyear; + TargetFachrichtung = targetfachrichtung; + } + + public int Score() + { + int total = 0; + total += ScoreYear() * 5; + total += ScoreFachrichtung() * 3; + + return total; + } + + private int ScoreYear() + { + return Math.Abs(_targetyear - _startjahr); + } + + private int ScoreFachrichtung() + { + if (_fachrichtung == _targetfachrichtung) + { + return 1; + } + else + { + return 0; + } + } + } } diff --git a/Shared/Interfaces/IEventRegistrationService.cs b/Shared/Interfaces/IEventRegistrationService.cs index 864b30f..d621bae 100644 --- a/Shared/Interfaces/IEventRegistrationService.cs +++ b/Shared/Interfaces/IEventRegistrationService.cs @@ -1,6 +1,7 @@ using System; using System.Collections.Generic; using System.Threading.Tasks; +using Oqtane.Models; using SZUAbsolventenverein.Module.EventRegistration.Models; namespace SZUAbsolventenverein.Module.EventRegistration.Services @@ -26,5 +27,6 @@ namespace SZUAbsolventenverein.Module.EventRegistration.Services Task<(Event, Response)> GetEventDetails(int EventId, int ModuleId); Task> GetEventResponses(int EventId, int ModuleId); + Task> GetRecommendedResponses(int EventId, int ModuleId); } }