Drift Meddelelse (SMS)
@@ -55,11 +53,70 @@
-
- Status Kode: @SmsResponse.Code
-
-
- Meddelelse: @SmsResponse.Message
+
+
+
+
+ Status Kode |
+ @SmsResponse.Code |
+
+
+ Id |
+ @ClxMsg.Id |
+
+
+ Til |
+
+
+ @if (ClxMsg.To.Any())
+ {
+ @foreach (var to in ClxMsg.To)
+ {
+ @($"{to},")
+ }
+ }
+
+ |
+
+
+ Fra |
+ @ClxMsg.From |
+
+
+ Annulleret |
+ @ClxMsg.Cancelled |
+
+
+ Meddelelse |
+ @ClxMsg.Body |
+
+
+ Type |
+ @ClxMsg.Type |
+
+
+ Oprettet |
+ @ClxMsg.CreatedAt |
+
+
+ Ændret |
+ @ClxMsg.ModifiedAt |
+
+
+ Rapport |
+ @ClxMsg.DeliveryReport |
+
+
+ Udløber |
+ @ClxMsg.ExpireAt |
+
+
+ Flash |
+ @ClxMsg.FlashMessage |
+
+
+
+
\ No newline at end of file
diff --git a/Wonky.Client/Pages/SystemMaintenanceMessage.razor.cs b/Wonky.Client/Pages/SystemMaintenanceMessagePage.razor.cs
similarity index 81%
rename from Wonky.Client/Pages/SystemMaintenanceMessage.razor.cs
rename to Wonky.Client/Pages/SystemMaintenanceMessagePage.razor.cs
index 4075407f..e5925ad9 100644
--- a/Wonky.Client/Pages/SystemMaintenanceMessage.razor.cs
+++ b/Wonky.Client/Pages/SystemMaintenanceMessagePage.razor.cs
@@ -8,19 +8,20 @@ using Wonky.Entity.DTO;
using Wonky.Entity.Views;
namespace Wonky.Client.Pages;
-
-public partial class SystemMaintenanceMessage
+#pragma warning disable CS8618
+public partial class SystemMaintenanceMessagePage : IDisposable
{
[Inject] public HttpInterceptorService Interceptor { get; set; }
[Inject] public ISystemUserRepository UserRepo { get; set; }
[Inject] public ISystemSendSmsService SmsService { get; set; }
- [Inject] public ILogger
Logger { get; set; }
+ [Inject] public ILogger Logger { get; set; }
[Inject] public IToastService Toaster { get; set; }
-
- private List Users { get; set; }
+
+ private List Users { get; set; } = new();
private ShortMessage Message { get; set; } = new();
private List Recipients { get; set; } = new();
private ApiResponseView SmsResponse { get; set; } = new();
+ private ClxMessage? ClxMsg { get; set; } = new();
private bool Working { get; set; } = true;
private bool MsgSent { get; set; }
@@ -70,16 +71,21 @@ public partial class SystemMaintenanceMessage
SmsResponse = await SmsService.SendSms(Message);
if (SmsResponse.Code == 201)
{
+ ClxMsg = JsonSerializer.Deserialize(SmsResponse.Message);
MsgSent = true;
}
Working = false;
-
- }
+ }
+
+ public void Dispose()
+ {
+ Interceptor.DisposeEvent();
+ }
}
internal sealed class Recipient
{
public bool Enabled { get; set; }
- public string Name { get; set; }
- public string Mobile { get; set; }
+ public string Name { get; init; } = "";
+ public string Mobile { get; init; } = "";
}
\ No newline at end of file
diff --git a/Wonky.Client/Pages/SystemUserCreatePage.razor b/Wonky.Client/Pages/SystemUserCreatePage.razor
index c9e8d0c4..e3b26e12 100644
--- a/Wonky.Client/Pages/SystemUserCreatePage.razor
+++ b/Wonky.Client/Pages/SystemUserCreatePage.razor
@@ -114,7 +114,7 @@
Password politik
-
Mindst 10 tegn bestående af store og små bogstaver samt tal. Du kan teste pasword og danne stærke password på pw.nix.dk
+
Mindst 10 tegn bestående af store og små bogstaver samt tal. Password generator pw.nix.dk
diff --git a/Wonky.Client/Pages/SystemUserListPage.razor b/Wonky.Client/Pages/SystemUserListPage.razor
index 35ba7996..d6585efc 100644
--- a/Wonky.Client/Pages/SystemUserListPage.razor
+++ b/Wonky.Client/Pages/SystemUserListPage.razor
@@ -25,7 +25,11 @@
-
@@ -57,15 +65,16 @@
@user.CountryCode @user.SalesRep
-
+
@user.FullName
-
+
@user.Email
@user.PhoneNumber
+
}
diff --git a/Wonky.Client/Pages/SystemUserListPage.razor.cs b/Wonky.Client/Pages/SystemUserListPage.razor.cs
index 0c01ae29..98b076be 100644
--- a/Wonky.Client/Pages/SystemUserListPage.razor.cs
+++ b/Wonky.Client/Pages/SystemUserListPage.razor.cs
@@ -28,12 +28,14 @@ public partial class SystemUserListPage : IDisposable
private List
UserList { get; set; } = new();
+ private bool Working { get; set; } = true;
protected override async Task OnInitializedAsync()
{
Interceptor.RegisterEvent();
Interceptor.RegisterBeforeSendEvent();
UserList = await UserRepo.GetUsers();
+ Working = false;
}
public void Dispose()
diff --git a/Wonky.Client/Services/AuthenticationService.cs b/Wonky.Client/Services/AuthenticationService.cs
index 20284248..ebfddf78 100644
--- a/Wonky.Client/Services/AuthenticationService.cs
+++ b/Wonky.Client/Services/AuthenticationService.cs
@@ -77,7 +77,9 @@ public class AuthenticationService : IAuthenticationService
// process response content
var data = JsonSerializer.Deserialize(resContent, _options);
-
+
+ _logger.LogDebug("Login => {}", JsonSerializer.Serialize(data, _options));
+
await _infoService.SetAccessToken(data.AccessToken);
await _infoService.SetRefreshToken(data.RefreshToken);
await _infoService.SetExpiration((int)DateTime.UtcNow.Subtract(new DateTime(1970, 1, 1)).TotalSeconds + data.ExpiresIn - 60);
diff --git a/Wonky.Client/wwwroot/appsettings.json b/Wonky.Client/wwwroot/appsettings.json
index 167c1817..52811655 100644
--- a/Wonky.Client/wwwroot/appsettings.json
+++ b/Wonky.Client/wwwroot/appsettings.json
@@ -1,15 +1,15 @@
{
"appInfo": {
"name": "Wonky Online",
- "version": "0.120.0",
+ "version": "0.120.4",
"rc": true,
"sandBox": false,
"image": "grumpy-coder.png"
},
"Logging": {
"LogLevel": {
- "Default": "Debug",
- "System": "Debug",
+ "Default": "Information",
+ "System": "Information",
"Microsoft": "Information"
},
"Debug": {
@@ -19,7 +19,7 @@
}
},
"apiConfig": {
- "baseUrl": "https://dev.innotec.dk",
+ "baseUrl": "https://zeta.innotec.dk",
"catalog": "api/v2/catalog/country",
"crmCustomers": "api/v2/crm/companies",
"crmInventoryExt": "history/inventory",
diff --git a/Wonky.Entity/DTO/UserManagerEditView.cs b/Wonky.Entity/DTO/UserManagerEditView.cs
index 39a20acf..13de6ea8 100644
--- a/Wonky.Entity/DTO/UserManagerEditView.cs
+++ b/Wonky.Entity/DTO/UserManagerEditView.cs
@@ -34,5 +34,5 @@ public class UserManagerEditView
[MaxLength(20, ErrorMessage = "Der er afsat 20 tegn til Sælger No.")] public string SalesRep { get; set; } = "";
public string UserId { get; set; } = "";
public List AssignedRoles { get; set; } = new();
- public List AssignedSubjects { get; set; } = new();
+ public List Subjects { get; set; } = new();
}
\ No newline at end of file
diff --git a/Wonky.Entity/Views/ClxMessage.cs b/Wonky.Entity/Views/ClxMessage.cs
new file mode 100644
index 00000000..a093334c
--- /dev/null
+++ b/Wonky.Entity/Views/ClxMessage.cs
@@ -0,0 +1,30 @@
+using System.Text.Json.Serialization;
+
+namespace Wonky.Entity.Views;
+
+public class ClxMessage
+{
+ [JsonPropertyName("id")]
+ public string Id { get; set; } = "";
+ [JsonPropertyName("to")]
+ public List To { get; set; } = new();
+ [JsonPropertyName("from")]
+ public string From { get; set; } = "";
+ [JsonPropertyName("cancelled")]
+ public bool Cancelled { get; set; }
+ [JsonPropertyName("body")]
+ public string Body { get; set; } = "";
+ [JsonPropertyName("type")]
+ public string Type { get; set; } = "";
+ [JsonPropertyName("created_at")]
+ public string CreatedAt { get; set; } = "";
+ [JsonPropertyName("modified_at")]
+ public string ModifiedAt { get; set; } = "";
+ [JsonPropertyName("delivery_report")]
+ public string DeliveryReport { get; set; } = "";
+ [JsonPropertyName("expire_at")]
+ public string ExpireAt { get; set; } = "";
+ [JsonPropertyName("flash_message")]
+ public bool FlashMessage { get; set; }
+
+}
\ No newline at end of file