Merge pull request #212 from Resgrid/develop

CU-868dmcr4g Minor bug fixes for inbound text messaging and module names

Author: ucswift

Core/Resgrid.Localization/Areas/User/Department/Department.en.resx

@@ -439,34 +439,34 @@
     <value>Here you can control high level information about every Module in the Resgrid system. New high level module options will be added here. These settings are in the early stages and may not yet propagate to all parts of the Resgrid system. So for example if you Disable the Training module it may appear in a screen deep in another feature. We will be working on in the future to ensure it's consistent.</value>
   </data>
   <data name="DisabledCalendarLabel" xml:space="preserve">
-    <value>Disable Calendar</value>
+    <value>Calendar</value>
   </data>
   <data name="DisabledInventoryLabel" xml:space="preserve">
-    <value>Disable Inventory</value>
+    <value>Inventory</value>
   </data>
   <data name="DisabledLogsLabel" xml:space="preserve">
-    <value>Disable Logs</value>
+    <value>Logs</value>
   </data>
   <data name="DisabledMaintenanceLabel" xml:space="preserve">
-    <value>Disable Maintenance</value>
+    <value>Maintenance</value>
   </data>
   <data name="DisabledNotesLabel" xml:space="preserve">
-    <value>Disable Notes</value>
+    <value>Notes</value>
   </data>
   <data name="DisabledReportsLabel" xml:space="preserve">
-    <value>Disable Reports</value>
+    <value>Reports</value>
   </data>
   <data name="DisabledTrainingLabel" xml:space="preserve">
-    <value>Disable Training</value>
+    <value>Training</value>
   </data>
   <data name="DisableMappingLabel" xml:space="preserve">
-    <value>Disable Mapping</value>
+    <value>Mapping</value>
   </data>
   <data name="DisableMessagingLabel" xml:space="preserve">
-    <value>Disable Messaging</value>
+    <value>Messaging</value>
   </data>
   <data name="DisableShiftsLabel" xml:space="preserve">
-    <value>Disable Shifts</value>
+    <value>Shifts</value>
   </data>
   <data name="DispatchSettingsModuleHeader" xml:space="preserve">
     <value>Department Modules</value>

Web/Resgrid.Web.Services/Controllers/TwilioController.cs

@@ -119,8 +119,8 @@ public async Task<ActionResult> IncomingMessage([FromQuery] TwilioMessage reques
 				if (departmentId.HasValue)
 				{
 					var department = await _departmentsService.GetDepartmentByIdAsync(departmentId.Value);
-					var textToCallEnabled = await _departmentSettingsService.GetDepartmentIsTextCallImportEnabledAsync(departmentId.Value);
-					var textCommandEnabled = await _departmentSettingsService.GetDepartmentIsTextCommandEnabledAsync(departmentId.Value);
+					//var textToCallEnabled = await _departmentSettingsService.GetDepartmentIsTextCallImportEnabledAsync(departmentId.Value);
+					//var textCommandEnabled = await _departmentSettingsService.GetDepartmentIsTextCommandEnabledAsync(departmentId.Value);
 					var dispatchNumbers = await _departmentSettingsService.GetTextToCallSourceNumbersForDepartmentAsync(departmentId.Value);
 					var authroized = await _limitsService.CanDepartmentProvisionNumberAsync(departmentId.Value);
 					var customStates = await _customStateService.GetAllActiveCustomStatesForDepartmentAsync(departmentId.Value);
@@ -134,11 +134,7 @@ public async Task<ActionResult> IncomingMessage([FromQuery] TwilioMessage reques
 						if (!String.IsNullOrWhiteSpace(dispatchNumbers))
 							isDispatchSource = _numbersService.DoesNumberMatchAnyPattern(dispatchNumbers.Split(Char.Parse(",")).ToList(), textMessage.Msisdn);
 
-						// If we don't have dispatchNumbers and Text Command isn't enabled it's a dispatch text
-						if (!isDispatchSource && !textCommandEnabled)
-							isDispatchSource = true;
-
-						if (isDispatchSource && textToCallEnabled)
+						if (isDispatchSource)
 						{
 							var c = new Call();
 							c.Notes = textMessage.Text;
@@ -173,7 +169,7 @@ public async Task<ActionResult> IncomingMessage([FromQuery] TwilioMessage reques
 							messageEvent.Processed = true;
 						}
 
-						if (!isDispatchSource && textCommandEnabled)
+						if (!isDispatchSource)
 						{
 							var profile = await _userProfileService.GetProfileByMobileNumberAsync(textMessage.Msisdn);
 
@@ -383,7 +379,7 @@ public async Task<ActionResult> IncomingMessage([FromQuery] TwilioMessage reques
 						}
 					}
 				}
-				else if (textMessage.To == Config.NumberProviderConfig.TwilioResgridNumber) //"17753765253") // Resgrid master text number
+				else if (textMessage.To == Config.NumberProviderConfig.TwilioResgridNumber) // Resgrid master text number
 				{
 					var profile = await _userProfileService.GetProfileByMobileNumberAsync(textMessage.Msisdn);
 					var payload = _textCommandService.DetermineType(textMessage.Text);
@@ -425,12 +421,6 @@ public async Task<ActionResult> IncomingMessage([FromQuery] TwilioMessage reques
 				await _numbersService.SaveInboundMessageEventAsync(messageEvent);
 			}
 
-			//Ok();
-
-			//var response = new TwilioResponse();
-
-			//return Request.CreateResponse(HttpStatusCode.OK, response.Element, new XmlMediaTypeFormatter());
-			//return Ok(new StringContent(response.ToString(), Encoding.UTF8, "application/xml"));
 			return new ContentResult
 			{
 				Content = response.ToString(),

Web/Resgrid.Web/Areas/User/Controllers/ContactsController.cs

@@ -849,12 +849,20 @@ public async Task<IActionResult> GetCallsJson(string contactId)
 					callJson.CallName = call.Name;
 					callJson.CallNature = call.NatureOfCall;
 					callJson.LoggedOn = call.LoggedOn.FormatForDepartment(department);
+					callJson.Priority = call.Priority;
 
 					var priority = await _callsService.GetCallPrioritiesByIdAsync(call.Priority, DepartmentId);
 
-					callJson.Priority = call.Priority;
-					callJson.PriorityName = priority.Name;
-					callJson.PriorityColor = priority.Color;
+					if (priority != null)
+					{
+						callJson.PriorityName = priority.Name;
+						callJson.PriorityColor = priority.Color;
+					}
+					else
+					{
+						callJson.PriorityName = "Unknown Priority";
+						callJson.PriorityColor = "#000000";
+					}
 
 					callsJson.Add(callJson);
 				}

Web/Resgrid.Web/Areas/User/Controllers/DispatchController.cs

@@ -1771,7 +1771,7 @@ public async Task<IActionResult> CallsTypesInRange(string startDate, string endD
 
 			if (!String.IsNullOrWhiteSpace(startDate) && !String.IsNullOrWhiteSpace(endDate))
 			{
-				var calls = await _callsService.GetAllCallsByDepartmentDateRangeAsync(DepartmentId, DateTime.Parse(System.Net.WebUtility.UrlDecode((startDate))), DateTime.Parse(System.Net.WebUtility.UrlDecode(endDate)));
+				var calls = await _callsService.GetAllCallsByDepartmentDateRangeAsync(DepartmentId, DateTime.Parse(System.Net.WebUtility.UrlDecode((startDate.Replace("&#x202F;", " ")))), DateTime.Parse(System.Net.WebUtility.UrlDecode(endDate.Replace("&#x202F;", " "))));
 
 				var groupedCalls = calls.GroupBy(x => x.Type);
 				foreach (var grouppedCall in groupedCalls)