TEST
This commit is contained in:
@@ -2,7 +2,7 @@
|
||||
@using SZUAbsolventenverein.Module.AdminModules.Services
|
||||
@using SZUAbsolventenverein.Module.AdminModules.Models
|
||||
|
||||
@namespace SZUAbsolventenverein.Module.AdminModules
|
||||
@namespace SZUAbsolventenverein.Module.AdminMassMailing
|
||||
@inherits ModuleBase
|
||||
@inject IAdminModulesService AdminModulesService
|
||||
@inject NavigationManager NavigationManager
|
||||
@@ -1,7 +1,7 @@
|
||||
@using SZUAbsolventenverein.Module.AdminModules.Services
|
||||
@using SZUAbsolventenverein.Module.AdminModules.Models
|
||||
|
||||
@namespace SZUAbsolventenverein.Module.AdminModules
|
||||
@namespace SZUAbsolventenverein.Module.AdminMassMailing
|
||||
@inherits ModuleBase
|
||||
@inject IAdminModulesService AdminModulesService
|
||||
@inject NavigationManager NavigationManager
|
||||
@@ -0,0 +1,19 @@
|
||||
using Oqtane.Models;
|
||||
using Oqtane.Modules;
|
||||
|
||||
namespace SZUAbsolventenverein.Module.AdminMassMailing
|
||||
{
|
||||
public class ModuleInfo : IModule
|
||||
{
|
||||
public ModuleDefinition ModuleDefinition => new ModuleDefinition
|
||||
{
|
||||
Name = "AdminMassMailing",
|
||||
Description = "Mass Mailing Tool",
|
||||
Version = "1.0.7",
|
||||
ServerManagerType = "SZUAbsolventenverein.Module.AdminModules.Manager.AdminModulesManager, SZUAbsolventenverein.Module.AdminModules.Server.Oqtane",
|
||||
ReleaseVersions = "1.0.0,1.0.1,1.0.2,1.0.3,1.0.4,1.0.5,1.0.6,1.0.7",
|
||||
Dependencies = "SZUAbsolventenverein.Module.AdminModules.Shared.Oqtane",
|
||||
PackageName = "SZUAbsolventenverein.Module.AdminMassMailing"
|
||||
};
|
||||
}
|
||||
}
|
||||
@@ -3,7 +3,7 @@
|
||||
@using SZUAbsolventenverein.Module.AdminModules.Models
|
||||
@using Microsoft.AspNetCore.Components.Forms;
|
||||
|
||||
@namespace SZUAbsolventenverein.Module.AdminModules
|
||||
@namespace SZUAbsolventenverein.Module.AdminMassMailing
|
||||
@inherits ModuleBase
|
||||
@inject IAdminModulesService AdminModulesService
|
||||
@inject NavigationManager NavigationManager
|
||||
@@ -11,12 +11,6 @@
|
||||
|
||||
<form @ref="form" class="@(validated ? " was-validated" : "needs-validation" )" novalidate>
|
||||
<div class="container">
|
||||
<div class="row mb-1 align-items-center">
|
||||
<Label Class="col-sm-3" For="name" HelpText="Enter a name" ResourceKey="Name">Name: </Label>
|
||||
<div class="col-sm-9">
|
||||
<input id="name" class="form-control" @bind="@_name" required />
|
||||
</div>
|
||||
</div>
|
||||
<div class="row mb-1 align-items-center">
|
||||
<Label Class="col-sm-3" For="role" HelpText="Select a role" ResourceKey="Role">Role: </Label>
|
||||
<div class="col-sm-9">
|
||||
@@ -40,10 +34,17 @@
|
||||
}
|
||||
</div>
|
||||
<p></p>
|
||||
<button type="button" class="btn btn-success" @onclick="Save">@Localizer["Save"]</button>
|
||||
@if(userCount != null)
|
||||
{
|
||||
<ActionDialog Header="@(userCount != null ? userCount + " Nachrichten versenden" : "-")"
|
||||
Message="Are You Sure You Wish To Send this Mass Notification?"
|
||||
Action="SendConfirm"
|
||||
Security="SecurityAccessLevel.Edit"
|
||||
Class="btn btn-success"
|
||||
OnClick="@(async () => await Save())"
|
||||
ResourceKey="SendConfirm" />
|
||||
}
|
||||
<NavLink class="btn btn-secondary" href="@NavigateUrl()">@Localizer["Cancel"]</NavLink>
|
||||
<br /><br />
|
||||
<AuditInfo CreatedBy="@_createdby" CreatedOn="@_createdon" ModifiedBy="@_modifiedby" ModifiedOn="@_modifiedon"></AuditInfo>
|
||||
</form>
|
||||
|
||||
@code {
|
||||
@@ -77,13 +78,7 @@
|
||||
private bool validated = false;
|
||||
|
||||
private int _id;
|
||||
private string _name;
|
||||
private string _richText;
|
||||
private string _createdby;
|
||||
private DateTime _createdon;
|
||||
private string _modifiedby;
|
||||
private DateTime _modifiedon;
|
||||
|
||||
|
||||
private async void RefetchUserCount()
|
||||
{
|
||||
EmailFields ef = new EmailFields();
|
||||
@@ -103,16 +98,6 @@
|
||||
if (PageState.Action == "Send")
|
||||
{
|
||||
_id = Int32.Parse(PageState.QueryString["id"]);
|
||||
AdminModules AdminModules = await AdminModulesService.GetAdminModulesAsync(_id, ModuleState.ModuleId);
|
||||
if (AdminModules != null)
|
||||
{
|
||||
_name = AdminModules.Name;
|
||||
_richText = AdminModules.Content;
|
||||
_createdby = AdminModules.CreatedBy;
|
||||
_createdon = AdminModules.CreatedOn;
|
||||
_modifiedby = AdminModules.ModifiedBy;
|
||||
_modifiedon = AdminModules.ModifiedOn;
|
||||
}
|
||||
roles = await AdminModulesService.GetRoles(ModuleState.ModuleId);
|
||||
}
|
||||
}
|
||||
@@ -1,4 +1,4 @@
|
||||
@namespace SZUAbsolventenverein.Module.AdminModules
|
||||
@namespace SZUAbsolventenverein.Module.AdminMassMailing
|
||||
@inherits ModuleBase
|
||||
@inject ISettingService SettingService
|
||||
@inject IStringLocalizer<Settings> Localizer
|
||||
@@ -0,0 +1,56 @@
|
||||
@using SZUAbsolventenverein.Module.AdminSettings.Services
|
||||
@using SZUAbsolventenverein.Module.AdminModules.Models
|
||||
|
||||
@namespace SZUAbsolventenverein.Module.AdminSettings
|
||||
@inherits ModuleBase
|
||||
@inject IAdminSettingsService AdminSettingsService
|
||||
@inject NavigationManager NavigationManager
|
||||
@inject IStringLocalizer<Index> Localizer
|
||||
|
||||
@if (_AdminSetting == null)
|
||||
{
|
||||
<p><em>Loading...</em></p>
|
||||
}
|
||||
else
|
||||
{
|
||||
<Microsoft.AspNetCore.Components.Forms.InputNumber @bind-Value="_AdminSetting.TokenLifeTimeInDays" />
|
||||
<button class="btn btn-primary" onclick="Save">Save</button>
|
||||
}
|
||||
|
||||
@code {
|
||||
public override string RenderMode => RenderModes.Static;
|
||||
|
||||
public override List<Resource> Resources => new List<Resource>()
|
||||
{
|
||||
new Stylesheet("_content/SZUAbsolventenverein.Module.AdminModules/Module.css"),
|
||||
new Script("_content/SZUAbsolventenverein.Module.AdminModules/Module.js")
|
||||
};
|
||||
|
||||
private AdminSetting _AdminSetting;
|
||||
|
||||
protected override async Task OnInitializedAsync()
|
||||
{
|
||||
try
|
||||
{
|
||||
_AdminSetting = await AdminSettingsService.GetAdminSettingsAsync(ModuleState.ModuleId);
|
||||
}
|
||||
catch (Exception ex)
|
||||
{
|
||||
await logger.LogError(ex, "Error Loading AdminSettings {Error}", ex.Message);
|
||||
AddModuleMessage(Localizer["Message.LoadError"], MessageType.Error);
|
||||
}
|
||||
}
|
||||
|
||||
protected async Task Save()
|
||||
{
|
||||
try
|
||||
{
|
||||
await AdminSettingsService.SetAdminSettingsAsync(_AdminSetting);
|
||||
}
|
||||
catch (Exception ex)
|
||||
{
|
||||
await logger.LogError(ex, "Error Saving AdminSettings {Error}", ex.Message);
|
||||
AddModuleMessage(Localizer["Message.LoadError"], MessageType.Error);
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -1,19 +1,19 @@
|
||||
using Oqtane.Models;
|
||||
using Oqtane.Modules;
|
||||
|
||||
namespace SZUAbsolventenverein.Module.AdminModules
|
||||
namespace SZUAbsolventenverein.Module.AdminSettings
|
||||
{
|
||||
public class ModuleInfo : IModule
|
||||
{
|
||||
public ModuleDefinition ModuleDefinition => new ModuleDefinition
|
||||
{
|
||||
Name = "AdminModules",
|
||||
Description = "Admin Tools",
|
||||
Version = "1.0.2",
|
||||
Name = "Admin - Settings",
|
||||
Description = "Einstellungen in Oqtane",
|
||||
Version = "1.0.0",
|
||||
ServerManagerType = "SZUAbsolventenverein.Module.AdminModules.Manager.AdminModulesManager, SZUAbsolventenverein.Module.AdminModules.Server.Oqtane",
|
||||
ReleaseVersions = "1.0.0,1.0.1,1.0.2",
|
||||
ReleaseVersions = "1.0.0",
|
||||
Dependencies = "SZUAbsolventenverein.Module.AdminModules.Shared.Oqtane",
|
||||
PackageName = "SZUAbsolventenverein.Module.AdminModules"
|
||||
PackageName = "SZUAbsolventenverein.Module.AdminSettings"
|
||||
};
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,47 @@
|
||||
@namespace SZUAbsolventenverein.Module.AdminSettings
|
||||
@inherits ModuleBase
|
||||
@inject ISettingService SettingService
|
||||
@inject IStringLocalizer<Settings> Localizer
|
||||
|
||||
<div class="container">
|
||||
<div class="row mb-1 align-items-center">
|
||||
<Label Class="col-sm-3" For="value" HelpText="Enter a value" ResourceKey="SettingName" ResourceType="@resourceType">Name: </Label>
|
||||
<div class="col-sm-9">
|
||||
<input id="value" type="text" class="form-control" @bind="@_value" />
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
@code {
|
||||
private string resourceType = "SZUAbsolventenverein.Module.AdminSettings.Settings, SZUAbsolventenverein.Module.AdminSettings.Client.Oqtane"; // for localization
|
||||
public override string Title => "Admin - Settings Settings";
|
||||
|
||||
string _value;
|
||||
|
||||
protected override async Task OnInitializedAsync()
|
||||
{
|
||||
try
|
||||
{
|
||||
Dictionary<string, string> settings = await SettingService.GetModuleSettingsAsync(ModuleState.ModuleId);
|
||||
_value = SettingService.GetSetting(settings, "SettingName", "");
|
||||
}
|
||||
catch (Exception ex)
|
||||
{
|
||||
AddModuleMessage(ex.Message, MessageType.Error);
|
||||
}
|
||||
}
|
||||
|
||||
public async Task UpdateSettings()
|
||||
{
|
||||
try
|
||||
{
|
||||
Dictionary<string, string> settings = await SettingService.GetModuleSettingsAsync(ModuleState.ModuleId);
|
||||
SettingService.SetSetting(settings, "SettingName", _value);
|
||||
await SettingService.UpdateModuleSettingsAsync(settings, ModuleState.ModuleId);
|
||||
}
|
||||
catch (Exception ex)
|
||||
{
|
||||
AddModuleMessage(ex.Message, MessageType.Error);
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -13,11 +13,11 @@
|
||||
</PropertyGroup>
|
||||
|
||||
<ItemGroup>
|
||||
<PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly" Version="9.0.8" />
|
||||
<PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly.Authentication" Version="9.0.8" />
|
||||
<PackageReference Include="Microsoft.Extensions.Localization" Version="9.0.8" />
|
||||
<PackageReference Include="Microsoft.Extensions.Http" Version="9.0.8" />
|
||||
<PackageReference Include="System.Net.Http.Json" Version="9.0.8" />
|
||||
<PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly" Version="9.0.9" />
|
||||
<PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly.Authentication" Version="9.0.9" />
|
||||
<PackageReference Include="Microsoft.Extensions.Localization" Version="9.0.9" />
|
||||
<PackageReference Include="Microsoft.Extensions.Http" Version="9.0.9" />
|
||||
<PackageReference Include="System.Net.Http.Json" Version="9.0.9" />
|
||||
</ItemGroup>
|
||||
|
||||
<ItemGroup>
|
||||
|
||||
37
Client/Services/AdminSettingsService.cs
Normal file
37
Client/Services/AdminSettingsService.cs
Normal file
@@ -0,0 +1,37 @@
|
||||
using Oqtane.Models;
|
||||
using Oqtane.Services;
|
||||
using Oqtane.Shared;
|
||||
using System;
|
||||
using System.Collections.Generic;
|
||||
using System.Linq;
|
||||
using System.Net.Http;
|
||||
using System.Reflection;
|
||||
using System.Threading.Tasks;
|
||||
using SZUAbsolventenverein.Module.AdminModules.Models;
|
||||
|
||||
namespace SZUAbsolventenverein.Module.AdminSettings.Services
|
||||
{
|
||||
public interface IAdminSettingsService
|
||||
{
|
||||
Task<AdminSetting> GetAdminSettingsAsync(int ModuleId);
|
||||
|
||||
Task<AdminSetting> SetAdminSettingsAsync(AdminSetting AdminSettings);
|
||||
}
|
||||
|
||||
public class AdminSettingsService : ServiceBase, IAdminSettingsService
|
||||
{
|
||||
public AdminSettingsService(HttpClient http, SiteState siteState) : base(http, siteState) { }
|
||||
|
||||
private string Apiurl => CreateApiUrl("AdminSettings");
|
||||
|
||||
public async Task<AdminSetting> GetAdminSettingsAsync(int ModuleId)
|
||||
{
|
||||
return await GetJsonAsync<AdminSetting>(CreateAuthorizationPolicyUrl($"{Apiurl}?moduleid={ModuleId}", EntityNames.Module, ModuleId), null);
|
||||
}
|
||||
|
||||
public async Task<AdminSetting> SetAdminSettingsAsync(AdminSetting AdminSettings)
|
||||
{
|
||||
return await PostJsonAsync<AdminSetting>(CreateAuthorizationPolicyUrl($"{Apiurl}", EntityNames.Module, AdminSettings.ModuleId), AdminSettings);
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -2,6 +2,7 @@ using Microsoft.Extensions.DependencyInjection;
|
||||
using System.Linq;
|
||||
using Oqtane.Services;
|
||||
using SZUAbsolventenverein.Module.AdminModules.Services;
|
||||
using SZUAbsolventenverein.Module.AdminSettings.Services;
|
||||
|
||||
namespace SZUAbsolventenverein.Module.AdminModules.Startup
|
||||
{
|
||||
@@ -13,6 +14,10 @@ namespace SZUAbsolventenverein.Module.AdminModules.Startup
|
||||
{
|
||||
services.AddScoped<IAdminModulesService, AdminModulesService>();
|
||||
}
|
||||
if (!services.Any(s => s.ServiceType == typeof(IAdminSettingsService)))
|
||||
{
|
||||
services.AddScoped<IAdminSettingsService, AdminSettingsService>();
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user