Skip to content

RIC-T39 Bug fixes #436

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 3 commits into from
Jul 23, 2026
Merged

RIC-T39 Bug fixes #436

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
0da913b
RIC-T39 Bug fixes
ucswift Jul 23, 2026
35cd43d
RIC-T39 PR#436 fixes
ucswift Jul 23, 2026
c8538fd
RIC-T40 PR#436 fixes
ucswift Jul 23, 2026
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
4 changes: 3 additions & 1 deletion Core/Resgrid.Localization/Areas/User/Home/EditProfile.ar.resx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -68,6 +68,8 @@
<data name="NormalUserLabel" xml:space="preserve"><value>مستخدم عادي</value></data>
<data name="NotificationEmailLabel" xml:space="preserve"><value>البريد الإلكتروني</value></data>
<data name="NotificationHeader" xml:space="preserve"><value>خيارات الإشعارات</value></data>
<data name="ModernApplicationSoundsLabel" xml:space="preserve"><value>تمكين أصوات التطبيق الحديثة</value></data>
<data name="ModernApplicationSoundsHelp" xml:space="preserve"><value>استخدم أصوات الإشعارات الحديثة بدلاً من الأصوات القديمة. إذا قام قسمك بتمكين الأصوات الحديثة، فسيتم استخدامها بغض النظر عن هذا الإعداد.</value></data>
<data name="NotificationOtherHeader" xml:space="preserve"><value>خيارات الإشعارات الأخرى</value></data>
<data name="NotificationPushLabel" xml:space="preserve"><value>إشعار فوري</value></data>
<data name="PhysicalAddressHeader" xml:space="preserve"><value>العنوان الفعلي</value></data>
Expand Down Expand Up @@ -125,4 +127,4 @@
<data name="SecurityPinPlaceholder" xml:space="preserve">
<value>رمز PIN من 4 أرقام</value>
</data>
</root>
</root>
8 changes: 7 additions & 1 deletion Core/Resgrid.Localization/Areas/User/Home/EditProfile.de.resx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -254,6 +254,12 @@
<data name="NotificationHeader" xml:space="preserve">
<value>Notification Options</value>
</data>
<data name="ModernApplicationSoundsLabel" xml:space="preserve">
<value>Enable Modern Application Sounds</value>
</data>
<data name="ModernApplicationSoundsHelp" xml:space="preserve">
<value>Use modern notification sounds instead of the legacy sounds. If your department enables modern sounds, they are used regardless of this setting.</value>
</data>
<data name="NotificationOtherHeader" xml:space="preserve">
<value>Other Notification Options</value>
</data>
Expand Down Expand Up @@ -383,4 +389,4 @@
<data name="SecurityPinPlaceholder" xml:space="preserve">
<value>4-stellige PIN</value>
</data>
</root>
</root>
8 changes: 7 additions & 1 deletion Core/Resgrid.Localization/Areas/User/Home/EditProfile.en.resx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -306,6 +306,12 @@
<data name="NotificationHeader" xml:space="preserve">
<value>Notification Options</value>
</data>
<data name="ModernApplicationSoundsLabel" xml:space="preserve">
<value>Enable Modern Application Sounds</value>
</data>
<data name="ModernApplicationSoundsHelp" xml:space="preserve">
<value>Use modern notification sounds instead of the legacy sounds. If your department enables modern sounds, they are used regardless of this setting.</value>
</data>
<data name="NotificationOtherHeader" xml:space="preserve">
<value>Other Notification Options</value>
</data>
Expand Down Expand Up @@ -438,4 +444,4 @@
<data name="SecurityPinPlaceholder" xml:space="preserve">
<value>4-digit PIN</value>
</data>
</root>
</root>
8 changes: 7 additions & 1 deletion Core/Resgrid.Localization/Areas/User/Home/EditProfile.es.resx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -300,6 +300,12 @@
<data name="NotificationHeader" xml:space="preserve">
<value>Opciones de notificación</value>
</data>
<data name="ModernApplicationSoundsLabel" xml:space="preserve">
<value>Activar sonidos modernos de la aplicación</value>
</data>
<data name="ModernApplicationSoundsHelp" xml:space="preserve">
<value>Usa sonidos de notificación modernos en lugar de los sonidos clásicos. Si tu departamento activa los sonidos modernos, se utilizarán independientemente de esta opción.</value>
</data>
<data name="NotificationOtherHeader" xml:space="preserve">
<value>Otras opciones de notificación</value>
</data>
Expand Down Expand Up @@ -429,4 +435,4 @@
<data name="SecurityPinPlaceholder" xml:space="preserve">
<value>PIN de 4 dígitos</value>
</data>
</root>
</root>
8 changes: 7 additions & 1 deletion Core/Resgrid.Localization/Areas/User/Home/EditProfile.fr.resx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -254,6 +254,12 @@
<data name="NotificationHeader" xml:space="preserve">
<value>Notification Options</value>
</data>
<data name="ModernApplicationSoundsLabel" xml:space="preserve">
<value>Enable Modern Application Sounds</value>
</data>
<data name="ModernApplicationSoundsHelp" xml:space="preserve">
<value>Use modern notification sounds instead of the legacy sounds. If your department enables modern sounds, they are used regardless of this setting.</value>
</data>
<data name="NotificationOtherHeader" xml:space="preserve">
<value>Other Notification Options</value>
</data>
Expand Down Expand Up @@ -383,4 +389,4 @@
<data name="SecurityPinPlaceholder" xml:space="preserve">
<value>PIN à 4 chiffres</value>
</data>
</root>
</root>
8 changes: 7 additions & 1 deletion Core/Resgrid.Localization/Areas/User/Home/EditProfile.it.resx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -254,6 +254,12 @@
<data name="NotificationHeader" xml:space="preserve">
<value>Notification Options</value>
</data>
<data name="ModernApplicationSoundsLabel" xml:space="preserve">
<value>Enable Modern Application Sounds</value>
</data>
<data name="ModernApplicationSoundsHelp" xml:space="preserve">
<value>Use modern notification sounds instead of the legacy sounds. If your department enables modern sounds, they are used regardless of this setting.</value>
</data>
<data name="NotificationOtherHeader" xml:space="preserve">
<value>Other Notification Options</value>
</data>
Expand Down Expand Up @@ -383,4 +389,4 @@
<data name="SecurityPinPlaceholder" xml:space="preserve">
<value>PIN a 4 cifre</value>
</data>
</root>
</root>
8 changes: 7 additions & 1 deletion Core/Resgrid.Localization/Areas/User/Home/EditProfile.pl.resx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -254,6 +254,12 @@
<data name="NotificationHeader" xml:space="preserve">
<value>Notification Options</value>
</data>
<data name="ModernApplicationSoundsLabel" xml:space="preserve">
<value>Enable Modern Application Sounds</value>
</data>
<data name="ModernApplicationSoundsHelp" xml:space="preserve">
<value>Use modern notification sounds instead of the legacy sounds. If your department enables modern sounds, they are used regardless of this setting.</value>
</data>
<data name="NotificationOtherHeader" xml:space="preserve">
<value>Other Notification Options</value>
</data>
Expand Down Expand Up @@ -383,4 +389,4 @@
<data name="SecurityPinPlaceholder" xml:space="preserve">
<value>4-cyfrowy PIN</value>
</data>
</root>
</root>
8 changes: 7 additions & 1 deletion Core/Resgrid.Localization/Areas/User/Home/EditProfile.sv.resx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -254,6 +254,12 @@
<data name="NotificationHeader" xml:space="preserve">
<value>Notification Options</value>
</data>
<data name="ModernApplicationSoundsLabel" xml:space="preserve">
<value>Enable Modern Application Sounds</value>
</data>
<data name="ModernApplicationSoundsHelp" xml:space="preserve">
<value>Use modern notification sounds instead of the legacy sounds. If your department enables modern sounds, they are used regardless of this setting.</value>
</data>
<data name="NotificationOtherHeader" xml:space="preserve">
<value>Other Notification Options</value>
</data>
Expand Down Expand Up @@ -383,4 +389,4 @@
<data name="SecurityPinPlaceholder" xml:space="preserve">
<value>4-siffrig PIN</value>
</data>
</root>
</root>
8 changes: 7 additions & 1 deletion Core/Resgrid.Localization/Areas/User/Home/EditProfile.uk.resx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -254,6 +254,12 @@
<data name="NotificationHeader" xml:space="preserve">
<value>Notification Options</value>
</data>
<data name="ModernApplicationSoundsLabel" xml:space="preserve">
<value>Enable Modern Application Sounds</value>
</data>
<data name="ModernApplicationSoundsHelp" xml:space="preserve">
<value>Use modern notification sounds instead of the legacy sounds. If your department enables modern sounds, they are used regardless of this setting.</value>
</data>
<data name="NotificationOtherHeader" xml:space="preserve">
<value>Other Notification Options</value>
</data>
Expand Down Expand Up @@ -383,4 +389,4 @@
<data name="SecurityPinPlaceholder" xml:space="preserve">
<value>4-значний PIN</value>
</data>
</root>
</root>
9 changes: 9 additions & 0 deletions Core/Resgrid.Localization/Areas/User/Messages/Messages.ar.resx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -228,4 +228,13 @@
<data name="ViewMessageHeader" xml:space="preserve">
<value>عرض الرسالة</value>
</data>
<data name="CalendarRsvp" xml:space="preserve">
<value>الرد على دعوة التقويم</value>
</data>
<data name="Attending" xml:space="preserve">
<value>سأحضر</value>
</data>
<data name="NotAttending" xml:space="preserve">
<value>لن أحضر</value>
</data>
</root>
9 changes: 9 additions & 0 deletions Core/Resgrid.Localization/Areas/User/Messages/Messages.de.resx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -179,4 +179,13 @@
<data name="ViewMessageHeader" xml:space="preserve">
<value>View Message</value>
</data>
<data name="CalendarRsvp" xml:space="preserve">
<value>Kalender-RSVP</value>
</data>
<data name="Attending" xml:space="preserve">
<value>Ich nehme teil</value>
</data>
<data name="NotAttending" xml:space="preserve">
<value>Ich nehme nicht teil</value>
</data>
</root>
11 changes: 10 additions & 1 deletion Core/Resgrid.Localization/Areas/User/Messages/Messages.en.resx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -228,4 +228,13 @@
<data name="ViewMessageHeader" xml:space="preserve">
<value>View Message</value>
</data>
</root>
<data name="CalendarRsvp" xml:space="preserve">
<value>Calendar RSVP</value>
</data>
<data name="Attending" xml:space="preserve">
<value>Attending</value>
</data>
<data name="NotAttending" xml:space="preserve">
<value>Not attending</value>
</data>
</root>
11 changes: 10 additions & 1 deletion Core/Resgrid.Localization/Areas/User/Messages/Messages.es.resx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -228,4 +228,13 @@
<data name="ViewMessageHeader" xml:space="preserve">
<value>Ver mensaje</value>
</data>
</root>
<data name="CalendarRsvp" xml:space="preserve">
<value>Confirmación del calendario</value>
</data>
<data name="Attending" xml:space="preserve">
<value>Asistiré</value>
</data>
<data name="NotAttending" xml:space="preserve">
<value>No asistiré</value>
</data>
</root>
9 changes: 9 additions & 0 deletions Core/Resgrid.Localization/Areas/User/Messages/Messages.fr.resx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -179,4 +179,13 @@
<data name="ViewMessageHeader" xml:space="preserve">
<value>View Message</value>
</data>
<data name="CalendarRsvp" xml:space="preserve">
<value>Réponse au calendrier</value>
</data>
<data name="Attending" xml:space="preserve">
<value>Présent</value>
</data>
<data name="NotAttending" xml:space="preserve">
<value>Absent</value>
</data>
</root>
9 changes: 9 additions & 0 deletions Core/Resgrid.Localization/Areas/User/Messages/Messages.it.resx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -179,4 +179,13 @@
<data name="ViewMessageHeader" xml:space="preserve">
<value>View Message</value>
</data>
<data name="CalendarRsvp" xml:space="preserve">
<value>RSVP calendario</value>
</data>
<data name="Attending" xml:space="preserve">
<value>Parteciperò</value>
</data>
<data name="NotAttending" xml:space="preserve">
<value>Non parteciperò</value>
</data>
</root>
9 changes: 9 additions & 0 deletions Core/Resgrid.Localization/Areas/User/Messages/Messages.pl.resx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -179,4 +179,13 @@
<data name="ViewMessageHeader" xml:space="preserve">
<value>View Message</value>
</data>
<data name="CalendarRsvp" xml:space="preserve">
<value>Potwierdzenie kalendarza</value>
</data>
<data name="Attending" xml:space="preserve">
<value>Będę uczestniczyć</value>
</data>
<data name="NotAttending" xml:space="preserve">
<value>Nie będę uczestniczyć</value>
</data>
</root>
9 changes: 9 additions & 0 deletions Core/Resgrid.Localization/Areas/User/Messages/Messages.sv.resx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -179,4 +179,13 @@
<data name="ViewMessageHeader" xml:space="preserve">
<value>View Message</value>
</data>
<data name="CalendarRsvp" xml:space="preserve">
<value>Kalender-O.S.A.</value>
</data>
<data name="Attending" xml:space="preserve">
<value>Deltar</value>
</data>
<data name="NotAttending" xml:space="preserve">
<value>Deltar inte</value>
</data>
</root>
9 changes: 9 additions & 0 deletions Core/Resgrid.Localization/Areas/User/Messages/Messages.uk.resx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -179,4 +179,13 @@
<data name="ViewMessageHeader" xml:space="preserve">
<value>View Message</value>
</data>
<data name="CalendarRsvp" xml:space="preserve">
<value>Відповідь на подію</value>
</data>
<data name="Attending" xml:space="preserve">
<value>Відвідаю</value>
</data>
<data name="NotAttending" xml:space="preserve">
<value>Не відвідаю</value>
</data>
</root>
14 changes: 14 additions & 0 deletions Core/Resgrid.Model/ModernApplicationSoundSettings.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
namespace Resgrid.Model
{
/// <summary>
/// Resolves the effective modern application sound setting shared by notification delivery
/// and API clients.
/// </summary>
public static class ModernApplicationSoundSettings
{
public static bool IsEnabled(bool departmentEnabled, bool userEnabled)
{
return departmentEnabled || userEnabled;
}
}
}
4 changes: 4 additions & 0 deletions Core/Resgrid.Model/Services/ICalendarService.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,6 +64,10 @@ Task<bool> DeleteCalendarItemAndRecurrences(int calendarItemId,
Task<CalendarItemAttendee> SignupForEvent(int calendarEventItemId, string userId, string note, int attendeeType,
CancellationToken cancellationToken = default(CancellationToken));

Task<CalendarItemAttendee> SignupForEventAndUpdateMessageRecipientAsync(int calendarEventItemId, string userId,
string response, int attendeeType, MessageRecipient messageRecipient,
CancellationToken cancellationToken = default(CancellationToken));

Task<CalendarItemAttendee> GetCalendarItemAttendeeByUserAsync(int calendarEventItemId, string userId);

Task<List<CalendarItem>> GetCalendarItemsToNotifyAsync(DateTime timestamp);
Expand Down
7 changes: 7 additions & 0 deletions Core/Resgrid.Model/UserProfile.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -198,6 +198,13 @@ public class UserProfile: IEntity
[ProtoMember(52)]
public bool SecurityPinEnabled { get; set; }

/// <summary>
/// The user opted in to modern application notification sounds. The department-level
/// EnableModernNotifications setting overrides this to on for every user.
/// </summary>
[ProtoMember(53)]
public bool EnableModernApplicationSounds { get; set; }

[NotMapped]
[JsonIgnore]
public object IdValue
Expand Down
Loading
Loading