Merge pull request #247 from Resgrid/develop

CU-868fnz2a8 Fixed Voice bug, updated Countly and changed Calendar to…

Author: ucswift

Core/Resgrid.Services/CalendarService.cs

@@ -70,7 +70,7 @@ public async Task<List<CalendarItemType>> GetAllCalendarItemTypesForDepartmentAs
 
 		public async Task<List<CalendarItem>> GetUpcomingCalendarItemsAsync(int departmentId, DateTime start)
 		{
-			return await GetAllCalendarItemsForDepartmentInRangeAsync(departmentId, start, start.AddDays(7));
+			return await GetAllCalendarItemsForDepartmentInRangeAsync(departmentId, start, start.AddDays(14));
 		}
 
 		public async Task<CalendarItem> SaveCalendarItemAsync(CalendarItem calendarItem, CancellationToken cancellationToken = default(CancellationToken))

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

@@ -317,7 +317,7 @@ public async Task<ActionResult> IncomingMessage([FromQuery] TwilioMessage reques
 
 										foreach (var activeCall in activeCalls)
 										{
-											activeCallText.Append($"CallId: {activeCall.CallId} Name: {activeCall.Name} Nature:{activeCall.NatureOfCall}" + Environment.NewLine);
+											activeCallText.Append($"CallId: {activeCall.CallId} Name: {activeCall.Name} Nature:{StringHelpers.StripHtmlTagsCharArray(activeCall.NatureOfCall)}" + Environment.NewLine);
 										}
 
 										response.Message(activeCallText.ToString().Truncate(1200));
@@ -520,7 +520,7 @@ public async Task<ActionResult> VoiceCall(string userId, int callId)
 			StringBuilder sb = new StringBuilder();
 
 			if (!String.IsNullOrWhiteSpace(address))
-				sb.Append(string.Format("{0}, Priority {1} Address {2} Nature {3}", call.Name, call.GetPriorityText(), call.Address, call.NatureOfCall));
+				sb.Append(string.Format("{0}, Priority {1} Address {2} Nature {3}", call.Name, call.GetPriorityText(), call.Address, StringHelpers.StripHtmlTagsCharArray(call.NatureOfCall)));
 			else
 				sb.Append(string.Format("{0}, Priority {1} Nature {2}", call.Name, call.GetPriorityText(), call.NatureOfCall));
 
@@ -710,7 +710,7 @@ public async Task<ActionResult> InboundVoiceAction(string userId, [FromQuery] Vo
 
 					foreach (var call in calls)
 					{
-						sb.Append($"{call.Name}, Priority {call.GetPriorityText()} Address {call.Address} Nature {call.NatureOfCall}.");
+						sb.Append($"{call.Name}, Priority {call.GetPriorityText()} Address {call.Address} Nature {StringHelpers.StripHtmlTagsCharArray(call.NatureOfCall)}.");
 					}
 				}
 				else

Web/Resgrid.Web/Areas/User/Views/Shared/_UserLayout.cshtml

@@ -65,8 +65,18 @@
         <script type='text/javascript'>
             if (Countly && window["Countly"]) {
                 Countly.init({
-                  app_key: "@Resgrid.Config.TelemetryConfig.CountlyWebKey",
-                  url: "@Resgrid.Config.TelemetryConfig.CountlyUrl"
+                    app_key: "@Resgrid.Config.TelemetryConfig.CountlyWebKey",
+                    url: "@Resgrid.Config.TelemetryConfig.CountlyUrl",
+                    debug: false,
+                    ignore_referrers: [],
+                    track_sessions: true,
+                    track_pageview: true,
+                    track_links: true,
+                    track_forms: true,
+                    track_errors: true,
+                    require_consent: false,
+                    force_post: true,
+                    ignore_bots: true
                 });
             }
         </script>