Skip to content

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

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
ucswift merged 1 commit into from
Sep 22, 2025
Merged

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

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion Core/Resgrid.Services/CalendarService.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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))
Expand Down
6 changes: 3 additions & 3 deletions Web/Resgrid.Web.Services/Controllers/TwilioController.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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));
Expand Down Expand Up @@ -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));

Expand Down Expand Up @@ -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
Expand Down
14 changes: 12 additions & 2 deletions Web/Resgrid.Web/Areas/User/Views/Shared/_UserLayout.cshtml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
Loading