Merge pull request #209 from Resgrid/develop

CU-868d85dv8 Fixed Email address error and time error.

Author: ucswift

Core/Resgrid.Services/EmailService.cs

@@ -184,7 +184,7 @@ public async Task<bool> SendCallAsync(Call call, CallDispatch dispatch, UserProf
 
 			string subject = string.Empty;
 			string priority = string.Empty;
-			string address = string.Empty;
+			string address = "No Address Supplied";
 
 			if (call.IsCritical)
 			{
@@ -199,9 +199,12 @@ public async Task<bool> SendCallAsync(Call call, CallDispatch dispatch, UserProf
 
 			string coordinates = "No Coordinates Supplied";
 			if (!string.IsNullOrEmpty(call.GeoLocationData) && call.GeoLocationData.Length > 1)
-			{
 				coordinates = call.GeoLocationData;
 
+			if (!string.IsNullOrEmpty(call.Address))
+				address = call.Address;
+			else if (!string.IsNullOrEmpty(call.GeoLocationData) && call.GeoLocationData.Length > 1)
+			{
 				string[] points = call.GeoLocationData.Split(char.Parse(","));
 
 				if (points != null && points.Length == 2)
@@ -216,15 +219,10 @@ public async Task<bool> SendCallAsync(Call call, CallDispatch dispatch, UserProf
 				}
 			}
 
-			if (!string.IsNullOrEmpty(call.Address) && string.IsNullOrWhiteSpace(address))
-				address = call.Address;
-			else
-				address = "No Address Supplied";
-
 			string dispatchedOn = String.Empty;
 
 			if (call.Department != null)
-				dispatchedOn = call.LoggedOn.FormatForDepartment(call.Department);
+				dispatchedOn = call.LoggedOn.TimeConverterToString(call.Department);
 			else
 				dispatchedOn = call.LoggedOn.ToString("G") + " UTC";
 

Workers/Resgrid.Workers.Framework/Logic/CallBroadcast.cs

@@ -64,6 +64,12 @@ public static async Task<bool> ProcessCallQueueItem(CallQueueItem cqi)
 
 				var dispatchedUsers = new HashSet<string>();
 
+				if (_departmentsService == null)
+					_departmentsService = Bootstrapper.GetKernel().Resolve<IDepartmentsService>();
+
+				var department = await _departmentsService.GetDepartmentByIdAsync(cqi.Call.DepartmentId);
+				cqi.Call.Department = department;
+
 				// Dispatch Personnel
 				if (cqi.Call.Dispatches != null && cqi.Call.Dispatches.Any())
 				{
@@ -90,12 +96,6 @@ public static async Task<bool> ProcessCallQueueItem(CallQueueItem cqi)
 				if (_departmentGroupsService == null)
 					_departmentGroupsService = Bootstrapper.GetKernel().Resolve<IDepartmentGroupsService>();
 
-				if (_departmentsService == null)
-					_departmentsService = Bootstrapper.GetKernel().Resolve<IDepartmentsService>();
-
-				var department = await _departmentsService.GetDepartmentByIdAsync(cqi.Call.DepartmentId);
-				cqi.Call.Department = department;
-
 				// Dispatch Groups
 				if (cqi.Call.GroupDispatches != null && cqi.Call.GroupDispatches.Any())
 				{