Adding changes to show CreatedAt/UpdatedAt for admin.

Adding changes to fix user email/first and last name.

Author: renemadsen

eFormAPI/Plugins/BackendConfiguration.Pn/BackendConfiguration.Pn/Infrastructure/Helpers/BackendConfigurationAssignmentWorkerServiceHelper.cs

@@ -9,6 +9,7 @@
 using BackendConfiguration.Pn.Services.BackendConfigurationLocalizationService;
 using eFormCore;
 using JetBrains.Annotations;
+using Microsoft.AspNetCore.Identity;
 using Microsoft.EntityFrameworkCore;
 using Microting.eForm.Infrastructure;
 using Microting.eForm.Infrastructure.Constants;
@@ -23,6 +24,7 @@
 using Microting.TimePlanningBase.Infrastructure.Data.Entities;
 using Rebus.Bus;
 using Microsoft.Extensions.Logging;
+using Microting.eFormApi.BasePn.Infrastructure.Database.Entities;
 
 namespace BackendConfiguration.Pn.Infrastructure.Helpers;
 
@@ -253,6 +255,8 @@ await WorkOrderHelper.WorkorderFlowDeployEform(propertyWorkers, core, userServic
 
         public static async Task<OperationResult> UpdateDeviceUser(DeviceUserModel deviceUserModel, Core core,
             int userId,
+            IUserService userService,
+            UserManager<EformUser> userManager,
             BackendConfigurationPnDbContext backendConfigurationPnDbContext,
             TimePlanningPnDbContext timePlanningDbContext,
             ILogger logger,
@@ -276,6 +280,7 @@ public static async Task<OperationResult> UpdateDeviceUser(DeviceUserModel devic
                     var worker = await sdkDbContext.Workers.SingleOrDefaultAsync(x => x.MicrotingUid == siteDto.WorkerUid).ConfigureAwait(false);
                     if (worker == null) return new OperationResult(false, "DeviceUserCouldNotBeObtained");
                     {
+                        var oldEmail = worker.Email;
                         if (sdkDbContext.Workers.Any(x => x.Email == deviceUserModel.WorkerEmail && x.MicrotingUid != siteDto.WorkerUid))
                         {
                             // this email is already in use
@@ -293,6 +298,16 @@ public static async Task<OperationResult> UpdateDeviceUser(DeviceUserModel devic
                         worker.PhoneNumber = deviceUserModel.PhoneNumber;
                         await worker.Update(sdkDbContext).ConfigureAwait(false);
 
+                        var user = await userService.GetByUsernameAsync(oldEmail).ConfigureAwait(false);
+                        if (user != null)
+                        {
+                            user.Email = deviceUserModel.WorkerEmail;
+                            user.FirstName = deviceUserModel.UserFirstName;
+                            user.LastName = deviceUserModel.UserLastName;
+                            user.Locale = language.LanguageCode;
+                            var result = await userManager.UpdateAsync(user);
+                        }
+
                         if (isUpdated)
                         {
                             if (deviceUserModel.TaskManagementEnabled == true)

eFormAPI/Plugins/BackendConfiguration.Pn/BackendConfiguration.Pn/Infrastructure/Models/DeviceUserModel.cs

@@ -23,6 +23,7 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 */
 
 #nullable enable
+using System;
 using System.Collections.Generic;
 
 namespace BackendConfiguration.Pn.Infrastructure.Models;
@@ -92,9 +93,7 @@ public class DeviceUserModel
     public bool IsLocked { get; set; }
     public bool IsBackendUser { get; set; }
     public bool HasWorkOrdersAssigned { get; set; }
-
     public string Manufacturer { get; set; }
-
     public string Model { get; set; }
     public string Os { get; set; }
     public string OsVersion { get; set; }
@@ -107,6 +106,8 @@ public class DeviceUserModel
 
     public string? WorkerEmail { get; set; }
     public string? PhoneNumber { get; set; }
+    public DateTime? CreatedAt { get; set; }
+    public DateTime? UpdatedAt { get; set; }
 
     public static implicit operator DeviceUserModel(Microting.EformAngularFrontendBase.Infrastructure.Data.Models.DeviceUserModel model)
     {

eFormAPI/Plugins/BackendConfiguration.Pn/BackendConfiguration.Pn/Services/BackendConfigurationAssignmentWorkerService/BackendConfigurationAssignmentWorkerService.cs

@@ -25,7 +25,9 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 using BackendConfiguration.Pn.Infrastructure.Helpers;
 using BackendConfiguration.Pn.Infrastructure.Models;
 using BackendConfiguration.Pn.Services.RebusService;
+using Microsoft.AspNetCore.Identity;
 using Microsoft.Extensions.Logging;
+using Microting.eFormApi.BasePn.Infrastructure.Database.Entities;
 using Microting.EformBackendConfigurationBase.Infrastructure.Enum;
 using Microting.eFormCaseTemplateBase.Infrastructure.Data;
 using Microting.ItemsPlanningBase.Infrastructure.Data;
@@ -51,6 +53,7 @@ namespace BackendConfiguration.Pn.Services.BackendConfigurationAssignmentWorkerS
 
 public class BackendConfigurationAssignmentWorkerService(
     IEFormCoreService coreHelper,
+    UserManager<EformUser> userManager,
     IUserService userService,
     BackendConfigurationPnDbContext backendConfigurationPnDbContext,
     IBackendConfigurationLocalizationService backendConfigurationLocalizationService,
@@ -364,13 +367,17 @@ join worker in sdkDbContext.Workers on siteWorker.WorkerId equals worker.Id
                     site.WorkflowState,
                     WorkerEmail = worker.Email,
                     worker.PhoneNumber,
+                    site.CreatedAt,
+                    site.UpdatedAt
 
                 };
             sitesQuery = sitesQuery.Where(x => x.WorkflowState != Constants.WorkflowStates.Removed);
 
             var deviceUsers = await sitesQuery
                 .Select(x => new DeviceUserModel
                 {
+                    CreatedAt = x.CreatedAt,
+                    UpdatedAt = x.UpdatedAt,
                     UserFirstName = x.UserFirstName,
                     UserLastName = x.UserLastName,
                     EmployeeNo = x.EmployeeNo,
@@ -490,13 +497,6 @@ join worker in sdkDbContext.Workers on siteWorker.WorkerId equals worker.Id
             // Convert deviceUsers to IQueryable
             var deviceUsersQuery = deviceUsers.AsQueryable();
 
-            var tempList = deviceUsersQuery.ToList();
-
-            foreach (var deviceUserModel in tempList)
-            {
-                Console.WriteLine("Device user: " + deviceUserModel.SiteName + " with workerEmail: " + deviceUserModel.WorkerEmail + " and phone number: " + deviceUserModel.PhoneNumber);
-            }
-
             try
             {
                 deviceUsersQuery = QueryHelper.AddFilterAndSortToQuery(deviceUsersQuery, requestModel, new List<string> { "SiteName", "WorkerEmail", "PhoneNumber", "EmployeeNo" });
@@ -526,7 +526,7 @@ public async Task<OperationResult> UpdateDeviceUser(DeviceUserModel deviceUserMo
     {
         var core = await coreHelper.GetCore().ConfigureAwait(false);
         var result = await BackendConfigurationAssignmentWorkerServiceHelper.UpdateDeviceUser(deviceUserModel, core,
-            userService.UserId, backendConfigurationPnDbContext,
+            userService.UserId, userService, userManager, backendConfigurationPnDbContext,
             timePlanningDbContext, logger, itemsPlanningPnDbContext);
 
         return new OperationResult(result.Success, backendConfigurationLocalizationService.GetString(result.Message));

eform-client/src/app/plugins/modules/backend-configuration-pn/modules/property-workers/components/property-worker-table/property-worker-table.component.html

@@ -46,8 +46,18 @@
   </div>
 </ng-template>
 
+<!--<ng-template #deviceUserIdTpl let-row let-i="index">-->
+<!--  <div class="deviceUserId" id="deviceUserId-{{i}}">{{row.siteId}}</div>-->
+<!--</ng-template>-->
+
 <ng-template #deviceUserIdTpl let-row let-i="index">
-  <div class="deviceUserId" id="deviceUserId-{{i}}">{{row.siteId}}</div>
+  <div class="deviceUserId" id="deviceUserId-{{i}}">
+    <ng-container *ngIf="selectAuthIsAdmin$ | async;">
+      <span>{{row.siteId}}<small class="microting-uid"> ({{getFormattedDate(row.createdAt)}} / {{getFormattedDate(row.updatedAt)}})</small></span>
+    </ng-container>
+    <ng-container *ngIf="(selectAuthIsAdmin$ | async) !== true;">
+      {{row.siteId}}
+    </ng-container></div>
 </ng-template>
 
 <ng-template #fullNameTpl let-row let-i="index">

eform-client/src/app/plugins/modules/backend-configuration-pn/modules/property-workers/components/property-worker-table/property-worker-table.component.ts

@@ -18,12 +18,18 @@ import {
 } from '../';
 import {dialogConfigHelper} from 'src/app/common/helpers';
 import {Store} from '@ngrx/store';
-import {selectCurrentUserClaimsDeviceUsersDelete, selectCurrentUserClaimsDeviceUsersUpdate} from 'src/app/state';
+import {
+  selectAuthIsAdmin,
+  selectCurrentUserClaimsDeviceUsersDelete,
+  selectCurrentUserClaimsDeviceUsersUpdate
+} from 'src/app/state';
 import {
   selectPropertyWorkersNameFilters,
   selectPropertyWorkersPaginationIsSortDsc,
   selectPropertyWorkersPaginationSort
 } from '../../../../state';
+import {format} from "date-fns";
+import {AuthStateService} from "src/app/common/store";
 
 @AutoUnsubscribe()
 @Component({
@@ -49,6 +55,7 @@ export class PropertyWorkerTableComponent implements OnInit, OnDestroy {
   public selectPropertyWorkersPaginationSort$ = this.store.select(selectPropertyWorkersPaginationSort);
   public selectPropertyWorkersPaginationIsSortDsc$ = this.store.select(selectPropertyWorkersPaginationIsSortDsc);
   public selectPropertyWorkersNameFilters$ = this.store.select(selectPropertyWorkersNameFilters);
+  public selectAuthIsAdmin$ = this.store.select(selectAuthIsAdmin);
 
   get TaskWizardStatusesEnum() {
     return TaskWizardStatusesEnum;
@@ -57,6 +64,7 @@ export class PropertyWorkerTableComponent implements OnInit, OnDestroy {
   constructor(
     private store: Store,
     private translateService: TranslateService,
+    private authStateService: AuthStateService,
     public propertyWorkersStateService: PropertyWorkersStateService,
     private dialog: MatDialog,
     private overlay: Overlay,) {
@@ -299,4 +307,8 @@ export class PropertyWorkerTableComponent implements OnInit, OnDestroy {
 
   ngOnDestroy(): void {
   }
+
+  getFormattedDate(date: Date) {
+    return format(date, 'P', {locale: this.authStateService.dateFnsLocale});
+  }
 }