Merge branch 'master' of http://git2.aycode.com/Adam/TourIAm

TIAMSharedUI/Pages/Components/LoginStep1.razor

@@ -1,12 +1,12 @@
 @using TIAMWebApp.Shared.Application.Models.PageModels;
-<EditForm Model="@loginModel" OnValidSubmit="GoToNextStep">
+<EditForm Model="@LoginModel" OnValidSubmit="GoToNextStep">
-            <DataAnnotationsValidator />
+    @* <DataAnnotationsValidator /> *@
 
 
     <div class="form-field d-flex align-items-center">
 
 
-        <DxMaskedInput @bind-Value="@loginModel.Email"
+        <DxMaskedInput @bind-Value="@LoginModel.Email"
                        Id="Email"
                        CssClass="cw-320"
                        Mask="@EmailMask"
@@ -18,7 +18,7 @@
 
 
     </div>
-    <ValidationMessage For="@(() => loginModel.Email)" />
+    <ValidationMessage For="@(() => LoginModel.Email)" />
 
     <button class="btn btn-primary mt-3" type="submit">
         <span class="@spinnerClass"></span>
@@ -31,7 +31,7 @@
 
 @code {
     [Parameter]
-    public LoginModel loginModel { get; set; }
+    public LoginModel LoginModel { get; set; }
 
     //[Parameter]
     //public string Email { get; set; }
@@ -56,7 +56,7 @@
         spinnerClass = "spinner-border spinner-border-sm";
         await Task.Delay(500);
         spinnerClass = "";
-        await LoginModelChanged.InvokeAsync(loginModel);
+        await LoginModelChanged.InvokeAsync(LoginModel);
         await onLoginNext.InvokeAsync();
     }
 

TIAMSharedUI/Pages/Login.razor

@@ -27,15 +27,15 @@
                         </div>
                         <form class="p-3 mt-3">
                             <div>
-                            @switch (currentStep)
+                                @switch (_currentStep)
                                 {
                                     case 1:
-                                    <LoginStep1 @bind-LoginModel="loginModel" onLoginNext="GoToNextStep" />
+                                        <LoginStep1 @bind-LoginModel="_loginModel" onLoginNext="GoToNextStep" />
                                         ;
                                         break;
 
                                     case 2:
-                                    <LoginStep3 @bind-LoginModel="loginModel" onSubmit="SubmitLogin" onPrev="GoToPreviousStep" />
+                                        <LoginStep3 @bind-LoginModel="_loginModel" onSubmit="SubmitLogin" onPrev="GoToPreviousStep" />
                                         ;
                                         break;
                                 }
@@ -43,16 +43,15 @@
 
 
                         </form>
-                    <p>@currentStep</p>
+                        <p>@_currentStep</p>
                         @{
-                        if (!loggedIn)
+                            if (!_loggedIn)
                             {
-
                                 <div>
 
-                                <p>@localizer["LoginEmail"]: @loginModel.Email</p>
+                                    <p>@localizer["LoginEmail"]: @_loginModel.Email</p>
 
-                                <p>@loginModel.Password</p>
+                                    <p>@_loginModel.Password</p>
                                 </div>
                             }
                         }
@@ -76,7 +75,8 @@
 </div>
 
 @code {
-    LoginModel loginModel = new LoginModel("test@tiam.hu", "test1234");
+    //LoginModel _loginModel = new LoginModel("test@tiam.hu", "test1234");
+    LoginModel _loginModel = new LoginModel("", "");
 
 
 }

TIAMSharedUI/Pages/Login.razor.cs

@@ -43,25 +43,25 @@ namespace TIAMSharedUI.Pages
 
         //[Display(Name = "LoginTitleText", ResourceType = typeof(MyResources))]
         public string TitleText { get; set; } = "dda,mnd,amn,a";
-        private int currentStep = 1;
+        private int _currentStep = 1;
-        bool loggedIn = false;
+        bool _loggedIn = false;
 
 
         private void GoToNextStep()
         {
-            currentStep++;
+            _currentStep++;
         }
 
         private void GoToPreviousStep()
         {
-            currentStep--;
+            _currentStep--;
         }
 
         private async void SubmitLogin()
         {
-            currentStep = 1;
+            _currentStep = 1;
-            BrowserConsoleLogWriter.Info("Login started: " + "Email: " + loginModel.Email + ", Password: " + loginModel.Password);
+            BrowserConsoleLogWriter.Info("Login started: " + "Email: " + _loginModel.Email + ", Password: " + _loginModel.Password);
-            var response = await userDataService.AuthenticateUser(loginModel);
+            var response = await userDataService.AuthenticateUser(_loginModel);
             //var response = await UserDataservice.TestUserApi(30);
             BrowserConsoleLogWriter.Info("Login started");
             BrowserConsoleLogWriter.Info(response);

TIAMSharedUI/Pages/User/MyServiceProviders.razor

@@ -41,7 +41,7 @@
                         <CompanyGrid @ref="_gridCompany"
                                      Logger="_logger"
                                      SignalRClient="AdminSignalRClient"
-                                     ContextIds="contextIds.Cast<object>().ToArray()"
+                                     ContextIds="_contextIds.Cast<object>().ToArray()"
                                      GetAllMessageTag="SignalRTags.GetCompaniesByContextId"
                                      PageSize="12"
                                      ValidationEnabled="false"
@@ -81,16 +81,16 @@
 
 
 @code {
-    private LoggerClient<MyServiceProviders> _logger;
+    private LoggerClient<MyServiceProviders> _logger = null!;
 
-    private CompanyGrid _gridCompany;
+    private CompanyGrid _gridCompany = null!;
 
-    public ServiceProviderWizardModel myModel = new ServiceProviderWizardModel();
+    public ServiceProviderWizardModel MyModel = new ServiceProviderWizardModel();
 
     bool EulaAccepted { get; set; }
     bool EulaVisible { get; set; }
 
-    private Guid[] contextIds = new Guid[0];
+    private Guid[] _contextIds = new Guid[0];
 
     void CancelCreateClick()
     {
@@ -103,16 +103,16 @@
     }
     void EulaPopupClosing(PopupClosingEventArgs args)
     {
-        myModel = new ServiceProviderWizardModel();
+        MyModel = new ServiceProviderWizardModel();
     }
 
     //-----------------------------------------------------------------------------------
 
 
-    public async Task SubmitForm(object Result)
+    public async Task SubmitForm(object result)
     {
         //await WizardProcessor.ProcessWizardAsync(Result.GetType(), Result);
-        _logger.Info($"Submitted nested form: {Result.GetType().FullName}");
+        _logger.Info($"Submitted nested form: {result.GetType().FullName}");
     }
 
 
@@ -131,9 +131,9 @@
     {
         _logger = new LoggerClient<MyServiceProviders>(LogWriters.ToArray());
 
-        var myId = SessionService.User.UserId;
+        var myId = SessionService.User!.UserId;
-        contextIds = new Guid[1];
+        _contextIds = new Guid[1];
-        contextIds[0] = myId;
+        _contextIds[0] = myId;
         // ServiceProviderDataService.GetPropertiesByOwnerIdAsync(myId, companyPropertiesByOwner =>
         // {
         //     _logger.DetailConditional($"companyPropertiesByOwner count: {companyPropertiesByOwner?.Count.ToString() ?? "NULL"}");

TIAMSharedUI/Pages/User/SysAdmins/MessageDetailGridComponent.razor

@@ -66,11 +66,11 @@
 
 
     private MessageGrid _messageGrid = null!;
-    private LoggerClient<MessageGridComponent> _logger = null!;
+    private LoggerClient<MessageDetailGridComponent> _logger = null!;
 
     protected override void OnInitialized()
     {
-        _logger = new LoggerClient<MessageGridComponent>(LogWriters.ToArray());
+        _logger = new LoggerClient<MessageDetailGridComponent>(LogWriters.ToArray());
     }
 
     private void CustomizeElement(GridCustomizeElementEventArgs e)