diff --git a/TIAMSharedUI/Pages/Components/EditComponents/DynamicEditForm.razor b/TIAMSharedUI/Pages/Components/EditComponents/DynamicEditForm.razor new file mode 100644 index 00000000..115f70a4 --- /dev/null +++ b/TIAMSharedUI/Pages/Components/EditComponents/DynamicEditForm.razor @@ -0,0 +1,360 @@ +@using AyCode.Core.Consts +@using System.Linq.Expressions +@using System.ComponentModel.DataAnnotations +@using AyCode.Services.Loggers +@using System.Reflection +@using TIAM.Entities.Transfers +@using TIAMSharedUI.Shared +@using TIAMWebApp.Shared.Application.Utility +@inject IEnumerable LogWriters + +

Edit Form

+ +@if (isEditing) +{ + + +
+
+

Edit Your Details

+
+
+ @CreateEditFormFields() +
+
+ +} +else +{ +
+
+

Details

+ Edit +
+
+ @CreateCardView() +
+
+} +

+ @FormSubmitResult +

+ +@code { + [Parameter] public object? Data { get; set; } + [Parameter] public List IgnoreReflection { get; set; } + [Parameter] public EventCallback OnSubmit { get; set; } + [Parameter] public bool isEditing { get; set; } = false; + + string _formSubmitResult = ""; + private string _spinnerClass = ""; + + string FormSubmitResult = ""; + private LoggerClient _logger; + string PhoneMask { get; set; } = AcRegExpression.PhoneNumberMask; + string EmailMask { get; set; } = AcRegExpression.EmailMask; + + protected override void OnInitialized() + { + _logger = new LoggerClient(LogWriters.ToArray()); + base.OnInitialized(); + } + + // void HandleValidSubmit() + // { + // FormSubmitResult = "You have been registered successfully."; + // isEditing = false; // Stop editing after successful submission + // } + + async Task HandleValidSubmit() + { + //_spinnerClass = "spinner-border spinner-border-sm"; + //await Task.Delay(500); + + var debugString = "Success: "; + + var myType = Data.GetType(); + IList props = new List(myType.GetProperties()); + + foreach (var prop in props) + { + var propValue = prop.GetValue(Data, null); + + // Do something with propValue + debugString += $"{prop.Name} = {propValue}\n"; + } + + _formSubmitResult = debugString; + _spinnerClass = ""; + + await OnSubmit.InvokeAsync(Data); + + isEditing = false; + + } + + void HandleInvalidSubmit() + { + FormSubmitResult = "Please correct all errors"; + } + + void StartEditing() + { + isEditing = true; + } + + public RenderFragment CreateCardView() => cardViewBuilder => + { + var mytype = Data.GetType(); + var propertyList = mytype.GetProperties(); + + foreach (var property in propertyList) + { + if (IgnoreReflection.Contains(property.Name)) + { + continue; + } + + var displayLabel = (DisplayAttribute)property.GetCustomAttributes(typeof(DisplayAttribute), false).FirstOrDefault(); + + cardViewBuilder.OpenElement(0, "p"); + cardViewBuilder.AddContent(1, $"{displayLabel?.Name ?? property.Name}: {property.GetValue(Data)}"); + cardViewBuilder.CloseElement(); + } + }; + + public RenderFragment CreateEditFormFields() => formLayoutBuilder => + { + _logger.Debug($"Data type: {Data.GetType().FullName}"); + var mytype = Data.GetType(); + var propertyList = mytype.GetProperties(); + _logger.Debug($"Data property list count: {propertyList.Length}"); + formLayoutBuilder.OpenComponent(0); + formLayoutBuilder.AddAttribute(1, "ChildContent", (RenderFragment)((layoutItemBuilder) => + { + int i = 0; + foreach (var property in propertyList) + { + if (IgnoreReflection.Contains(property.Name)) + { + continue; + } + + var attrList = (DataTypeAttribute)property.GetCustomAttributes(typeof(DataTypeAttribute), false).FirstOrDefault(); + var displayLabel = (DisplayAttribute)property.GetCustomAttributes(typeof(DisplayAttribute), false).FirstOrDefault(); + layoutItemBuilder.OpenComponent(i++); + layoutItemBuilder.AddAttribute(i++, "Caption", displayLabel?.Name ?? property.Name); + layoutItemBuilder.AddAttribute(i++, "ColSpanMd", 12); + var access = Expression.Property(Expression.Constant(Data), property.Name); + var lambda = Expression.Lambda(typeof(Func<>).MakeGenericType(property.PropertyType), access); + layoutItemBuilder.AddAttribute(i++, "Template", (RenderFragment)((context) => ((editor) => + { + var j = 0; + switch (attrList?.DataType) + { + case DataType.Text: + editor.OpenComponent(j++); + editor.AddAttribute(j++, "Text", property.GetValue(Data)); + editor.AddAttribute(j++, "TextExpression", lambda); + editor.AddAttribute(j++, "CssClass", "form-field"); + editor.AddAttribute(j++, "TextChanged", EventCallback.Factory.Create(this, str => { property.SetValue(Data, str); })); + editor.CloseComponent(); + break; + case DataType.Password: + editor.OpenComponent(j++); + editor.AddAttribute(j++, "Password", true); + editor.AddAttribute(j++, "NullText", "Password"); + editor.AddAttribute(j++, "Text", property.GetValue(Data)); + editor.AddAttribute(j++, "CssClass", "form-field"); + editor.AddAttribute(j++, "TextExpression", lambda); + editor.AddAttribute(j++, "TextChanged", EventCallback.Factory.Create(this, str => { property.SetValue(Data, str); })); + editor.CloseComponent(); + break; + case DataType.PhoneNumber: + editor.OpenComponent>(j++); + editor.AddAttribute(j++, "Value", property.GetValue(Data)); + editor.AddAttribute(j++, "MaskMode", MaskMode.RegEx); + editor.AddAttribute(j++, "Mask", PhoneMask); + editor.AddAttribute(j++, "BindValueMode", BindValueMode.OnInput); + editor.AddAttribute(j++, "NullText", "+11234567890"); + editor.AddAttribute(j++, "MaskAutoCompleteMode", MaskAutoCompleteMode.None); + editor.AddAttribute(j++, "ValueExpression", lambda); + editor.AddAttribute(j++, "CssClass", "form-field"); + editor.AddAttribute(j++, "ValueChanged", EventCallback.Factory.Create(this, str => { property.SetValue(Data, str); })); + editor.CloseComponent(); + break; + case DataType.Date: + editor.OpenComponent>(j); + editor.AddAttribute(j++, "Date", property.GetValue(Data)); + editor.AddAttribute(j++, "DateExpression", lambda); + editor.AddAttribute(j++, "CssClass", "form-field"); + editor.AddAttribute(j++, "DateChanged", EventCallback.Factory.Create(this, str => { property.SetValue(Data, str); })); + editor.CloseComponent(); + break; + case DataType.Custom: + if (property.PropertyType == typeof(double)) + { + + editor.OpenComponent>(j); + + editor.AddAttribute(j++, "Value", property.GetValue(Data)); + + editor.AddAttribute(j++, "Mask", "n6"); + editor.AddAttribute(j++, "BindValueMode", BindValueMode.OnInput); + editor.AddAttribute(j++, "ValueExpression", lambda); + editor.AddAttribute(j++, "CssClass", "form-field"); + editor.AddAttribute(j++, "ValueChanged", EventCallback.Factory.Create(this, str => { property.SetValue(Data, str); })); + editor.CloseComponent(); + break; + } + else if (property.PropertyType == typeof(int)) + { + + editor.OpenComponent>(j); + + editor.AddAttribute(j++, "Value", property.GetValue(Data)); + editor.AddAttribute(j++, "BindValueMode", BindValueMode.OnInput); + editor.AddAttribute(j++, "Mask", NumericMask.WholeNumber); + editor.AddAttribute(j++, "ValueExpression", lambda); + editor.AddAttribute(j++, "CssClass", "form-field"); + editor.AddAttribute(j++, "ValueChanged", EventCallback.Factory.Create(this, str => { property.SetValue(Data, str); })); + editor.CloseComponent(); + break; + } + else if (property.PropertyType == typeof(IEnumerable) && property.Name == "Occupation") + { + + editor.OpenComponent>(j); + editor.AddAttribute(j++, "Data", AdditionalData.Occupations); + editor.AddAttribute(j++, "Value", property.GetValue(Data)); + editor.AddAttribute(j++, "ValueExpression", lambda); + editor.AddAttribute(j++, "ValueChanged", EventCallback.Factory.Create(this, str => { property.SetValue(Data, str); })); + editor.CloseComponent(); + break; + } + + + else if (property.PropertyType == typeof(string) && string.Compare(attrList.CustomDataType, "TransferDestination", true) == 0) + { + + editor.OpenComponent(j); + editor.AddAttribute(j++, "TextValue", property.GetValue(Data)); + editor.AddAttribute(j++, "CssClass", "form-field"); + // editor.AddAttribute(j++, "ValExpression", lambda); + editor.AddAttribute(j++, "OnSliderChanged", EventCallback.Factory.Create(this, result => + { + _logger.Debug($"Slider changed to {result}"); + property.SetValue(Data, result); + _logger.DetailConditional($"bleh: {property.Name} = {property.GetValue(Data)}"); + + })); + + editor.CloseComponent(); + + } + + else if (property.PropertyType == typeof(string) && string.Compare(attrList.CustomDataType, "FullName", true) == 0) + { + + editor.OpenComponent(j); + editor.AddAttribute(j++, "NullText", "Please tell us your name."); + editor.AddAttribute(j++, "FirstNameChanged", EventCallback.Factory.Create(this, result => + { + _logger.DetailConditional($"FirstName changed to {result}"); + + //find property with name FirstName + var firstNameProperty = propertyList.FirstOrDefault(p => p.Name == "FirstName"); + firstNameProperty.SetValue(Data, result); + //find property with name LastName + var lastNameProperty = propertyList.FirstOrDefault(p => p.Name == "LastName"); + //combine the two values, if they are not null + if (firstNameProperty != null && lastNameProperty != null) + { + var firstName = result; + var lastName = (string)lastNameProperty.GetValue(Data); + var fullName = $"{firstName} {lastName}"; + property.SetValue(Data, fullName); + } + })); + + editor.AddAttribute(j++, "LastNameChanged", EventCallback.Factory.Create(this, result => + { + _logger.DetailConditional($"LastName changed to {result}"); + + //find property with name FirstName + var firstNameProperty = propertyList.FirstOrDefault(p => p.Name == "FirstName"); + //find property with name LastName + var lastNameProperty = propertyList.FirstOrDefault(p => p.Name == "LastName"); + lastNameProperty.SetValue(Data, result); + //combine the two values, if they are not null + if (firstNameProperty != null && lastNameProperty != null) + { + var firstName = (string)firstNameProperty.GetValue(Data); + var lastName = result; + var fullName = $"{firstName} {lastName}"; + property.SetValue(Data, fullName); + } + _logger.DetailConditional($"bleh: {property.Name} = {property.GetValue(Data)}"); + StateHasChanged(); // Add this line to refresh the UI + })); + + editor.CloseComponent(); + editor.OpenComponent(j++); + /*editor.AddAttribute(j++, "CssClass", "form-field");*/ + editor.AddAttribute(j++, "NullText", "Please type in the above fields"); + editor.AddAttribute(j++, "Enabled", false); + editor.AddAttribute(j++, "Text", property.GetValue(Data)); + editor.AddAttribute(j++, "TextExpression", lambda); + editor.AddAttribute(j++, "TextChanged", EventCallback.Factory.Create(this, str => + { + property.SetValue(Data, str); + _logger.DetailConditional($"bleh: {property.Name} = {property.GetValue(Data)}"); + })); + editor.CloseComponent(); + + } + + break; + case DataType.MultilineText: + editor.OpenComponent(j); + editor.AddAttribute(j++, "Text", property.GetValue(Data)); + editor.AddAttribute(j++, "TextExpression", lambda); + editor.AddAttribute(j++, "TextChanged", EventCallback.Factory.Create(this, str => { property.SetValue(Data, str); })); + editor.CloseComponent(); + break; + default: + editor.OpenComponent(j++); + editor.AddAttribute(j++, "Text", property.GetValue(Data)); + editor.AddAttribute(j++, "TextExpression", lambda); + editor.AddAttribute(j++, "TextChanged", EventCallback.Factory.Create(this, str => { property.SetValue(Data, str); })); + editor.CloseComponent(); + break; + } + }))); + + layoutItemBuilder.CloseComponent(); + layoutItemBuilder.OpenElement(i++, "div"); + layoutItemBuilder.AddAttribute(i++, "class", "text-danger"); + layoutItemBuilder.OpenComponent(i++, typeof(ValidationMessage<>).MakeGenericType(property.PropertyType)); + layoutItemBuilder.AddAttribute(i++, "For", lambda); + layoutItemBuilder.CloseComponent(); + layoutItemBuilder.CloseElement(); + } + layoutItemBuilder.OpenComponent(i++); + layoutItemBuilder.AddAttribute(i++, "Template", (RenderFragment)((context) => ((editor) => + { + editor.OpenComponent(i++); + editor.AddAttribute(i++, "SubmitFormOnClick", true); + editor.AddAttribute(i++, "Text", "Save"); + editor.CloseComponent(); + }))); + + layoutItemBuilder.CloseComponent(); + })); + formLayoutBuilder.CloseComponent(); + }; + +} diff --git a/TIAMSharedUI/Pages/User/Hotels/CreateAndManageTransfer.razor b/TIAMSharedUI/Pages/User/Hotels/CreateAndManageTransfer.razor index 67b3c183..b344801d 100644 --- a/TIAMSharedUI/Pages/User/Hotels/CreateAndManageTransfer.razor +++ b/TIAMSharedUI/Pages/User/Hotels/CreateAndManageTransfer.razor @@ -1,10 +1,16 @@ @page "/user/createAndManageTransfer" +@using TIAMSharedUI.Pages.Components.EditComponents @using TIAMSharedUI.Shared +@using AyCode.Services.Loggers @using TIAMWebApp.Shared.Application.Interfaces; +@using TIAMWebApp.Shared.Application.Models.ClientSide.UI.WizardModels +@using TIAMWebApp.Shared.Application.Utility @layout AdminLayout @inject IPopulationStructureDataProvider DataProvider -@inject ISupplierService SupplierService +@inject ISessionService SessionService @inject IUserDataService UserDataService +@inject IEnumerable LogWriters + Transfer @@ -14,14 +20,11 @@ - -
-
- +
@@ -30,15 +33,39 @@ @code { - string Id = "2312-32132121-32123"; - bool isUserLoggedIn; - int userType = 0; + private LoggerClient _logger; + private TransferWizardModel Data; + public List TransferIgnorList = new List + { + "Id", + "UserId", + "ProductId", + "PaymentId", + "FirstName", + "LastName", + "UserProductMappingId", + "UserProductToCarId", + "ReferralId", + "Price" + }; + protected override void OnInitialized() { + _logger = new LoggerClient(LogWriters.ToArray()); + Data = new TransferWizardModel(); base.OnInitialized(); } + public async Task SubmitForm(object result) + { + var valami = (TransferWizardModel)result; + //valami.ProductId = SessionService.User.UserId; //TODO ProductID! + // await WizardProcessor.ProcessWizardAsync(result.GetType(), result); + + _logger.Info($"Submitted nested form: {result.GetType().FullName}, {valami.Destination}, {valami.PickupAddress}, {valami.ProductId}"); + } + } diff --git a/TIAMSharedUI/Pages/ChatPage.razor b/TIAMSharedUI/Pages/Utility/ChatPage.razor similarity index 70% rename from TIAMSharedUI/Pages/ChatPage.razor rename to TIAMSharedUI/Pages/Utility/ChatPage.razor index 4fea977b..287eb197 100644 --- a/TIAMSharedUI/Pages/ChatPage.razor +++ b/TIAMSharedUI/Pages/Utility/ChatPage.razor @@ -1,6 +1,10 @@ @page "/chat" @using Microsoft.AspNetCore.Authorization +@using TIAM.Entities.Users +@using TIAMSharedUI.Pages.Components.EditComponents +@using TIAMWebApp.Shared.Application.Models.ClientSide.UI.WizardModels @using TIAMWebApp.Shared.Application.Services +@using TIAMSharedUI.Pages.Components @inject SignalRService SignalRService @attribute [Authorize]

Chat

@@ -31,17 +35,36 @@ - - TicTacToe - + +
    +
  • + + + TicTacToe + +
    • +
  • + + phone validator + +
    • +
  • + + + Create Payment + +
    • +
  • + + + + My trasnfers + +
    • +
  • +
- - Create Payment - - - My trasnfers - @code { private string userName; @@ -49,10 +72,23 @@ private List messages = new List(); //private string hrefString = "mytransfers/" + "108E5A63-AA9E-47BE-ACFA-00306FFC5215"; + private MessageWizardModel Data; + + public List IgnoreList = + [ + nameof(MessageWizardModel.ReceiverEmailAddress), + nameof(MessageWizardModel.ReceiverFullName), + nameof(MessageWizardModel.ReceiverId), + nameof(MessageWizardModel.SenderEmailAddress), + nameof(MessageWizardModel.SenderFullName), + nameof(MessageWizardModel.SenderId), + nameof(MessageWizardModel.ContextId) + ]; + protected override async Task OnInitializedAsync() { userName = Guid.NewGuid().ToString(); - + Data = new MessageWizardModel(); SignalRService.OnMessageReceived += (user, message) => { messages.Add($"{user}: {message}"); diff --git a/TIAMSharedUI/Pages/DbTestComponent.razor b/TIAMSharedUI/Pages/Utility/DbTestComponent.razor similarity index 100% rename from TIAMSharedUI/Pages/DbTestComponent.razor rename to TIAMSharedUI/Pages/Utility/DbTestComponent.razor diff --git a/TIAMSharedUI/Pages/DbTestComponent.razor.cs b/TIAMSharedUI/Pages/Utility/DbTestComponent.razor.cs similarity index 93% rename from TIAMSharedUI/Pages/DbTestComponent.razor.cs rename to TIAMSharedUI/Pages/Utility/DbTestComponent.razor.cs index feb8d243..f39114dc 100644 --- a/TIAMSharedUI/Pages/DbTestComponent.razor.cs +++ b/TIAMSharedUI/Pages/Utility/DbTestComponent.razor.cs @@ -10,9 +10,9 @@ using TIAM.Models.Dtos.Users; using TIAMWebApp.Shared.Application.Interfaces; using TIAMWebApp.Shared.Application.Models; -namespace TIAMSharedUI.Pages +namespace TIAMSharedUI.Pages.Utility { - public partial class DbTestComponent + public partial class DbTestComponent : ComponentBase { [Parameter] public string EmailAddress diff --git a/TIAMSharedUI/Pages/Utility/DynamicForm.razor b/TIAMSharedUI/Pages/Utility/DynamicForm.razor new file mode 100644 index 00000000..e69de29b diff --git a/TIAMSharedUI/Pages/Utility/PhoneNumberValidator.razor b/TIAMSharedUI/Pages/Utility/PhoneNumberValidator.razor new file mode 100644 index 00000000..88d64b51 --- /dev/null +++ b/TIAMSharedUI/Pages/Utility/PhoneNumberValidator.razor @@ -0,0 +1,58 @@ +@page "/phonevalidator" + +@using System.Text.RegularExpressions + + + + + + + + Validate + + +

@result

+ +@if (validationResult.HasValue) +{ + + @if (validationResult.Value) + { + The phone number is valid. + } + else + { + The phone number is invalid. + } + +} + +@code { + private PhoneNumberModel phoneNumberModel = new PhoneNumberModel(); + private bool? validationResult = null; + private string result = ""; + private void HandleValidSubmit() + { + validationResult = IsValidInternationalPhoneNumber(phoneNumberModel.PhoneNumber); + result = $"Validation result for {phoneNumberModel.PhoneNumber}: {validationResult}"; + } + + private bool IsValidInternationalPhoneNumber(string phoneNumber) + { + if (string.IsNullOrEmpty(phoneNumber)) + { + return false; + } + + // string pattern = @"\+(9[976]\d|8[987530]\d|6[987]\d|5[90]\d|42\d|3[875]\d|2[98654321]\d|9[8543210]|8[6421]|6[6543210]|5[87654321]|4[987654310]|3[9643210]|2[70]|7|1)\W*\d\W*\d\W*\d\W*\d\W*\d\W*\d\W*\d\W*\d\W*(\d{1,2})"; + string pattern = @"^\+(9[976]\d|8[987530]\d|6[987]\d|5[90]\d|42\d|3[875]\d|2[98654321]\d|9[8543210]|8[6421]|6[6543210]|5[87654321]|4[987654310]|3[9643210]|2[70]|7|1)\W*\d(\W*\d){1,14}$"; + Regex regex = new Regex(pattern); + + return regex.IsMatch(phoneNumber); + } + + public class PhoneNumberModel + { + public string PhoneNumber { get; set; } + } +} diff --git a/TIAMSharedUI/Shared/ComboboxItemSelector.razor b/TIAMSharedUI/Shared/ComboboxItemSelector.razor new file mode 100644 index 00000000..4695f2ed --- /dev/null +++ b/TIAMSharedUI/Shared/ComboboxItemSelector.razor @@ -0,0 +1,112 @@ +@using System.Linq.Expressions +@using AyCode.Core.Loggers +@using AyCode.Services.Loggers +@using TIAM.Core.Loggers +@using TIAM.Entities.Transfers +@using TIAM.Services +@using TIAMSharedUI.Pages +@using TIAMSharedUI.Pages.User.SysAdmins +@using TIAMWebApp.Shared.Application.Interfaces +@using TIAMWebApp.Shared.Application.Services +@using TIAMWebApp.Shared.Application.Utility +@inject IEnumerable LogWriters +@inject AdminSignalRClient _adminSignalRClient +@inject ITransferDataService TransferDataService + + + + +@*

+ @GetSelectedItemDescription() +

*@ + +@* + *@ + + +@code { + [Parameter] public EventCallback OnSliderChanged { get; set; } + + [Parameter] public string TextValue { get; set; } = ""; + + [Parameter] public string CssClass { get; set; } = ""; + + public List Destinations = new List(); + + public DxTextBox TextField; + + TransferDestination Result; + + ILogger _logger; + + IEnumerable Data { get; set; } + + private TransferDestination _selectedDestination; + public TransferDestination SelectedDestination + { + get => _selectedDestination; + set + { + if (_selectedDestination != value) + { + _selectedDestination = value; + SetNewDestination(value); + } + } + } + + protected override void OnParametersSet() + { + + } + + protected override async Task OnInitializedAsync() + { + _logger = new LoggerClient(LogWriters.ToArray()); + + Data = await _adminSignalRClient.GetAllAsync>(SignalRTags.GetAllTransferDestinations); + _logger.Debug($"List length: {Data.Count().ToString()}"); + SelectedDestination = Data.FirstOrDefault(); + } + // RenderFragment GetSelectedItemDescription() + // { + // if (SelectedDestination != null) + // { + // SetNewDestination(SelectedDestination); + // return @ + // Selected Item: ( + // @GetFieldDescription(nameof(TransferDestination.Name), SelectedDestination.Name), + // @GetFieldDescription(nameof(TransferDestination.AddressString), SelectedDestination.AddressString), + // @GetFieldDescription(nameof(TransferDestination.Description), SelectedDestination.Description) + // ) + // ; + // } + // return @Selected Item: null; + + // } + + public void SetNewDestination(TransferDestination destination) + { + OnSliderChanged.InvokeAsync(destination.Name); + } + + // RenderFragment GetFieldDescription(string fieldName, object value) + // { + // return @@fieldName: @value; + // } + + +} + diff --git a/TIAMSharedUI/Shared/ComboboxItemSelector.razor.css b/TIAMSharedUI/Shared/ComboboxItemSelector.razor.css new file mode 100644 index 00000000..e02abfc9 --- /dev/null +++ b/TIAMSharedUI/Shared/ComboboxItemSelector.razor.css @@ -0,0 +1 @@ + diff --git a/TIAMSharedUI/Shared/Components/Navbar.razor.cs b/TIAMSharedUI/Shared/Components/Navbar.razor.cs index 2bd889a5..884fb0f6 100644 --- a/TIAMSharedUI/Shared/Components/Navbar.razor.cs +++ b/TIAMSharedUI/Shared/Components/Navbar.razor.cs @@ -69,7 +69,8 @@ namespace TIAMSharedUI.Shared.Components { _logger.Debug($"Navbar refresh called! {DateTime.Now} "); - OnInitialized(); + //OnInitialized(); + InitUser(); StateHasChanged(); } @@ -115,8 +116,13 @@ namespace TIAMSharedUI.Shared.Components _logger.Debug($"Navbar OnInit {DateTime.Now} "); + InitUser(); + } + + private void InitUser() + { if (sessionService.User != null) - { + { myUser = true; } else diff --git a/TIAMSharedUI/Shared/Users/AdminNavMenu.razor b/TIAMSharedUI/Shared/Users/AdminNavMenu.razor index a2310dd0..cbcdd6fb 100644 --- a/TIAMSharedUI/Shared/Users/AdminNavMenu.razor +++ b/TIAMSharedUI/Shared/Users/AdminNavMenu.razor @@ -227,13 +227,13 @@ protected override void OnInitialized() { _logger = new LoggerClient(LogWriters.ToArray()); - _logger.Debug($"UserId: {SessionService.User.UserModelDto.Id}"); + //_logger.Debug($"UserId: {SessionService.User.UserModelDto.Id}"); //errorokat dobott IsDevAdmin = SessionService.IsDevAdmin; - _logger.Debug($"UserId: {SessionService.IsDevAdmin}"); + //_logger.Debug($"UserId: {SessionService.IsDevAdmin}"); IsSysAdmin = SessionService.IsSysAdmin; - _logger.Debug($"UserId: {SessionService.IsSysAdmin}"); + //_logger.Debug($"UserId: {SessionService.IsSysAdmin}"); IsDriver = SessionService.IsDriver; - _logger.Debug($"UserId: {SessionService.IsDriver}"); + //_logger.Debug($"UserId: {SessionService.IsDriver}"); base.OnInitialized(); } diff --git a/TIAMSharedUI/TIAMSharedUI.csproj b/TIAMSharedUI/TIAMSharedUI.csproj index 43f15af5..d87f2a8b 100644 --- a/TIAMSharedUI/TIAMSharedUI.csproj +++ b/TIAMSharedUI/TIAMSharedUI.csproj @@ -6,6 +6,10 @@ enable + + + + @@ -82,4 +86,16 @@ + + <_ContentIncludedByDefault Remove="Pages\Utility\DynamicForm.razor" /> + + + + + + + + + + diff --git a/TourIAmProject.sln b/TourIAmProject.sln index d3a70c01..2a52dd37 100644 --- a/TourIAmProject.sln +++ b/TourIAmProject.sln @@ -40,7 +40,6 @@ EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{DD32C7C2-218C-4148-8FD6-1AB3C824A7D5}" ProjectSection(SolutionItems) = preProject DeployReadme.txt = DeployReadme.txt - C:\Users\Fullepi\Desktop\SqlDataCompare_DevRelese_to_Prod.dcmp = C:\Users\Fullepi\Desktop\SqlDataCompare_DevRelese_to_Prod.dcmp SqlSchemaCompare_Dev_to_DevRelease.scmp = SqlSchemaCompare_Dev_to_DevRelease.scmp EndProjectSection EndProject