Egalware/webdoorcreator
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'release/UpdateProdDemo-202230612-16'

Browse Source
This commit is contained in:
Samuele Locatelli
2023-06-12 17:29:13 +02:00
parent 3d0b97b019 7e7030922d
commit fed099d0e1
8 changed files with 49 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Resources/ChangeLog.html
+1 -1
View File
@@ -1,6 +1,6 @@
<body>
<i>WebDoorCreator - Egalware</i>
<h4>Version: 0.9.2306.0915</h4>
<h4>Version: 0.9.2306.1217</h4>
<br /> Release note:
<ul>
<li>
Resources/VersNum.txt
+1 -1
View File
@@ -1 +1 @@
0.9.2306.0915
0.9.2306.1217
Resources/manifest.xml
+1 -1
View File
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<item>
<version>0.9.2306.0915</version>
<version>0.9.2306.1217</version>
<url>http://nexus.steamware.net/repository/SWS/WDC/stable/WDC.UI.zip</url>
<changelog>http://nexus.steamware.net/repository/SWS/WDC/stable/ChangeLog.html</changelog>
<mandatory>false</mandatory>
WebDoorCreator.UI/Pages/UserAdmin.razor
+13 -7
View File
@@ -6,11 +6,18 @@
<div class="modal-dialog modal-lg">
<div class="modal-content">
<div class="modal-header">
<h3 class="modal-title">Edit User</h3>
<!-- Button to close the popup -->
<button type="button" class="btn btn-primary btn-sm" @onclick="ClosePopup">
<i class="fa-solid fa-xmark"></i>
</button>
<div class="d-flex justify-content-between w-100">
<div class="px-1">
<h3 class="modal-title">Edit User</h3>
</div>
<div class="px-1 ">
<button class="btn btn-outline-info" @onclick="() => ToggleCodeDetails()">@btnShowDetails</button>
<!-- Button to close the popup -->
<button type="button" class="btn btn-outline-dark btn-sm" @onclick="ClosePopup">
<i class="fa-solid fa-xmark"></i>
</button>
</div>
</div>
</div>
<!-- Edit form for the current user -->
<div class="modal-body">
@@ -79,8 +86,7 @@
</div>
</div>
<div class="col-6 text-right">
<!-- Only show Id if not a new user -->
@if (objUser.Id != "")
@if (objUser.Id != "" && showCodeDetails)
{
<div class="img-fluid">
<QrCodeDisplay rawCode="@qrCodeVal" Height="400" Width="400"></QrCodeDisplay>
WebDoorCreator.UI/Pages/UserAdmin.razor.cs
+16 -4
View File
@@ -117,6 +117,12 @@ namespace WebDoorCreator.UI.Pages
return answ;
}
public async Task ToggleCodeDetails()
{
showCodeDetails = !showCodeDetails;
await Task.Delay(1);
}
public string userCss(bool isInactive)
{
return isInactive ? "text-secondary text-decoration-line-through" : "text-dark";
@@ -135,8 +141,12 @@ namespace WebDoorCreator.UI.Pages
[Inject]
protected AuthenticationStateProvider AuthenticationStateProvider { get; set; } = null!;
protected List<CompanyModel> CompanyList { get; set; } = new List<CompanyModel>();
protected string btnShowDetails
{
get => showCodeDetails ? "Hide User Code" : "Show User Code";
}
protected List<CompanyModel> CompanyList { get; set; } = new List<CompanyModel>();
protected IdentityUser currUser { get; set; } = new IdentityUser();
[Inject]
@@ -159,6 +169,8 @@ namespace WebDoorCreator.UI.Pages
}
}
protected bool showCodeDetails { get; set; } = false;
protected int totalCount
{
get
@@ -172,15 +184,15 @@ namespace WebDoorCreator.UI.Pages
}
}
[Inject]
protected UserManDataService UMService { get; set; } = null!;
[Inject]
protected WebDoorCreatorService WDCService { get; set; } = null!;
[Inject]
protected WDCUserService WDCUsrServ { get; set; } = null!;
[Inject]
protected UserManDataService UMService { get; set; } = null!;
#endregion Protected Properties
#region Protected Methods
WebDoorCreator.UI/WebDoorCreator.UI.csproj
+1 -1
View File
@@ -3,7 +3,7 @@
<PropertyGroup>
<TargetFramework>net6.0</TargetFramework>
<Nullable>enable</Nullable>
<Version>0.9.2306.0915</Version>
<Version>0.9.2306.1217</Version>
<ImplicitUsings>enable</ImplicitUsings>
<UserSecretsId>aspnet-WebDoorCreator.UI-dfe95fed-1398-4144-bd43-8b3a765d6608</UserSecretsId>
</PropertyGroup>
WebDoorCreator.UI/appsettings.Production.json
+15 -10
View File
@@ -1,13 +1,18 @@
{
"DetailedErrors": true,
"Logging": {
"LogLevel": {
"Default": "Information",
"Microsoft.AspNetCore": "Warning"
}
},
"RuntimeOpt": {
"MaxDayCalcCache": 7,
"BaseUrl": "/WDC/UI"
"DetailedErrors": true,
"Logging": {
"LogLevel": {
"Default": "Information",
"Microsoft.AspNetCore": "Warning"
}
},
"RuntimeOpt": {
"MaxDayCalcCache": 7,
"BaseUrl": "/WDC/UI"
},
"ConnectionStrings": {
"Redis": "nkcredis.steamware.net:6379, DefaultDatabase=12, connectTimeout=5000, syncTimeout=5000, asyncTimeout=5000, abortConnect=false, ssl=false, password=BtN9Py1wtLfLRvmzWnOPJ7RytDM+CLiVsJ/16zduNTlV8IOPGNrtzJSXPUnImA5PqmUMhKaUqo9NdHIG",
"Identity.DB": "Server=SQL2016PROD;Database=DCA_WebDoorCreator; User ID=sa;Password=keyhammer16; integrated security=False; MultipleActiveResultSets=True; App=WebDoorCreator.UI;",
"WDC.DB": "Server=SQL2016PROD;Database=DCA_WebDoorCreator; User ID=sa;Password=keyhammer16; integrated security=False; MultipleActiveResultSets=True; App=WebDoorCreator.UI;"
}
}
WebDoorCreator.UI/appsettings.json
+1 -1
View File
@@ -7,8 +7,8 @@
},
"AllowedHosts": "*",
"ConnectionStrings": {
"Identity.DB": "Server=SQL2016DEV;Database=WebDoorCreator; User ID=sa;Password=keyhammer16; integrated security=False; MultipleActiveResultSets=True; App=WebDoorCreator.UI;",
"Redis": "nkcredis.steamware.net:6379, DefaultDatabase=11, connectTimeout=5000, syncTimeout=5000, asyncTimeout=5000, abortConnect=false, ssl=false, password=BtN9Py1wtLfLRvmzWnOPJ7RytDM+CLiVsJ/16zduNTlV8IOPGNrtzJSXPUnImA5PqmUMhKaUqo9NdHIG",
"Identity.DB": "Server=SQL2016DEV;Database=WebDoorCreator; User ID=sa;Password=keyhammer16; integrated security=False; MultipleActiveResultSets=True; App=WebDoorCreator.UI;",
"WDC.DB": "Server=SQL2016DEV;Database=WebDoorCreator; User ID=sa;Password=keyhammer16; integrated security=False; MultipleActiveResultSets=True; App=WebDoorCreator.UI;"
},
"ExternalProviders": {