Adding worker email to the table.

Author: renemadsen

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

@@ -104,6 +104,8 @@ public class DeviceUserModel
 
     public string EmployeeNo { get; set; }
 
+    public string WorkerEmail { get; set; }
+
     public static implicit operator DeviceUserModel(Microting.EformAngularFrontendBase.Infrastructure.Data.Models.DeviceUserModel model)
     {
         return new DeviceUserModel

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

@@ -361,7 +361,8 @@ join worker in sdkDbContext.Workers on siteWorker.WorkerId equals worker.Id
                     WorkerUid = worker.MicrotingUid,
                     UserFirstName = worker.FirstName,
                     UserLastName = worker.LastName,
-                    site.WorkflowState
+                    site.WorkflowState,
+                    WorkerEmail = worker.Email
 
                 };
             sitesQuery = sitesQuery.Where(x => x.WorkflowState != Constants.WorkflowStates.Removed);
@@ -377,6 +378,7 @@ join worker in sdkDbContext.Workers on siteWorker.WorkerId equals worker.Id
                     SiteId = x.Id,
                     SiteUid = x.MicrotingUid,
                     SiteName = x.Name,
+                    WorkerEmail = x.WorkerEmail,
                     Language = sdkDbContext.Languages.Where(y => y.Id == x.LanguageId).Select(y => y.Name).SingleOrDefault() ?? "Danish",
                     LanguageCode = sdkDbContext.Languages.Where(y => y.Id == x.LanguageId).Select(y => y.LanguageCode).SingleOrDefault() ?? "da",
                     IsLocked = x.IsLocked

eform-client/src/app/plugins/modules/backend-configuration-pn/models/device-users/device-user.model.ts

@@ -47,4 +47,5 @@ export class DeviceUserModel {
   startSunday: number;
   endSunday: number;
   breakSunday: number;
+  workerEmail: string;
 }

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

@@ -4,6 +4,7 @@
   [cellTemplate]="{
     siteId: deviceUserIdTpl,
     siteName: fullNameTpl,
+    workerEmail: workerEmailTpl,
     language: languageTpl,
     customerOtp: customerOtpTpl,
     manufacturer: manufacturerTpl,
@@ -52,6 +53,10 @@
   <div class="deviceUserFullName" id="deviceUserFullName-{{i}}">{{row.siteName}}</div>
 </ng-template>
 
+<ng-template #workerEmailTpl let-row let-i="index">
+  <div class="workerEmail" id="workerEmail-{{i}}">{{row.workerEmail}}</div>
+</ng-template>
+
 <ng-template #languageTpl let-row let-i="index">
   <div class="deviceUserLanguage" id="deviceUserLanguage-{{i}}">{{row.language | translate}}</div>
 </ng-template>

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

@@ -97,6 +97,13 @@ export class PropertyWorkerTableComponent implements OnInit, OnDestroy {
       sortable: true,
       formatter: (rowData: DeviceUserModel) => rowData.siteName ? `${rowData.siteName}` : `N/A`,
     },
+    {
+      header: this.translateService.stream('Email'),
+      sortProp: {id: 'workerEmail'},
+      field: 'workerEmail',
+      sortable: true,
+      formatter: (rowData: DeviceUserModel) => rowData.workerEmail ? `${rowData.workerEmail}` : `N/A`,
+    },
     {
       header: this.translateService.stream('Task management'),
       sortProp: {id: 'TaskManagementEnabled'},