Merge branch 'stable' of github.com:microting/eform-backendconfiguration-plugin into stable

Author: renemadsen

eFormAPI/Plugins/BackendConfiguration.Pn/BackendConfiguration.Pn.Integration.Test/BackendConfigurationTaskTrackerServiceHelperTest.cs

@@ -74,7 +74,8 @@ await BackendConfigurationPropertiesServiceHelper.Create(propertyCreateModel, co
 			LanguageCode = "da",
 			TimeRegistrationEnabled = false,
 			UserFirstName = Guid.NewGuid().ToString(),
-			UserLastName = Guid.NewGuid().ToString()
+			UserLastName = Guid.NewGuid().ToString(),
+			WorkerEmail = Guid.NewGuid().ToString() + "@test.com"
 		};
 		await BackendConfigurationAssignmentWorkerServiceHelper.CreateDeviceUser(deviceUserModel, core, 1,
 			TimePlanningPnDbContext);
@@ -203,7 +204,8 @@ await BackendConfigurationPropertiesServiceHelper.Create(propertyCreateModel, co
 			LanguageCode = "da",
 			TimeRegistrationEnabled = false,
 			UserFirstName = Guid.NewGuid().ToString(),
-			UserLastName = Guid.NewGuid().ToString()
+			UserLastName = Guid.NewGuid().ToString(),
+			WorkerEmail = Guid.NewGuid().ToString() + "@test.com"
 		};
 		await BackendConfigurationAssignmentWorkerServiceHelper.CreateDeviceUser(deviceUserModel, core, 1,
 			TimePlanningPnDbContext);
@@ -332,7 +334,8 @@ await BackendConfigurationPropertiesServiceHelper.Create(propertyCreateModel, co
 			LanguageCode = "da",
 			TimeRegistrationEnabled = false,
 			UserFirstName = Guid.NewGuid().ToString(),
-			UserLastName = Guid.NewGuid().ToString()
+			UserLastName = Guid.NewGuid().ToString(),
+			WorkerEmail = Guid.NewGuid().ToString() + "@test.com"
 		};
 		await BackendConfigurationAssignmentWorkerServiceHelper.CreateDeviceUser(deviceUserModel, core, 1,
 			TimePlanningPnDbContext);
@@ -461,7 +464,8 @@ await BackendConfigurationPropertiesServiceHelper.Create(propertyCreateModel, co
 			LanguageCode = "da",
 			TimeRegistrationEnabled = false,
 			UserFirstName = Guid.NewGuid().ToString(),
-			UserLastName = Guid.NewGuid().ToString()
+			UserLastName = Guid.NewGuid().ToString(),
+			WorkerEmail = Guid.NewGuid().ToString() + "@test.com"
 		};
 		await BackendConfigurationAssignmentWorkerServiceHelper.CreateDeviceUser(deviceUserModel, core, 1,
 			TimePlanningPnDbContext);

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

@@ -302,6 +302,7 @@ public static async Task<OperationResult> UpdateDeviceUser(DeviceUserModel devic
                         if (user != null)
                         {
                             user.Email = deviceUserModel.WorkerEmail;
+                            user.UserName = deviceUserModel.WorkerEmail;
                             user.FirstName = deviceUserModel.UserFirstName;
                             user.LastName = deviceUserModel.UserLastName;
                             user.Locale = language.LanguageCode;

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

@@ -155,7 +155,7 @@ public static async Task<OperationDataResult<List<TaskTrackerModel>>> Index(
 
 				if (areaRulePlanning == null) continue;
 
-				if (deadlineDate> dateTimeNow && !areaRulePlanning.ComplianceEnabled)
+				if (deadlineDate < dateTimeNow && !areaRulePlanning.ComplianceEnabled)
 				{
 					var comp = await backendConfigurationPnDbContext.Compliances.FirstAsync(x => x.Id == compliance.Id);
 					await comp.Delete(backendConfigurationPnDbContext);