Skip to content

RE1-T107 Added checkin timers to calls #312

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 7 commits into from
Mar 29, 2026
Merged

RE1-T107 Added checkin timers to calls #312

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
8b2f6f8
RE1-T107 Added checkin timers to calls
ucswift Mar 28, 2026
f3b7d84
RE1-T108 Adding calendar checkin/checkout and attendance reporting
ucswift Mar 28, 2026
baef959
RE1-T107 RE1-T108 PR#312 fixes
ucswift Mar 28, 2026
424af2e
RE1-T109 GH bug fixes and PR#312 fixes
ucswift Mar 28, 2026
9a0cf31
RE1-T109 PR#312 fixes
ucswift Mar 29, 2026
e7594be
RE1-T109 PR#312 fixes
ucswift Mar 29, 2026
a8fedd2
RE1-T109 PR#312 fixes
ucswift Mar 29, 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
1 change: 1 addition & 0 deletions .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -273,3 +273,4 @@ Web/Resgrid.WebCore/wwwroot/lib/*
/Web/Resgrid.Web/wwwroot/lib
.dual-graph/
.claude/settings.local.json
.claude/settings.local.json
Copy link
Copy Markdown
Contributor

@coderabbitai coderabbitai bot Mar 28, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

⚠️ Potential issue | 🟡 Minor

Remove duplicate .gitignore entry.

The entry .claude/settings.local.json already exists at line 275. This duplicate adds no value and should be removed to keep the configuration clean.

🧹 Proposed fix 
-.claude/settings.local.json
📝 Committable suggestion

‼️ IMPORTANT
Carefully review the code before committing. Ensure that it accurately replaces the highlighted code, contains no missing lines, and has no issues with indentation. Thoroughly test & benchmark the code to ensure it meets the requirements.

Suggested change
.claude/settings.local.json
🤖 Prompt for AI Agents 
Verify each finding against the current code and only fix it if needed.

In @.gitignore at line 276, Remove the duplicate `.claude/settings.local.json`
entry from .gitignore by deleting the redundant line that repeats the same
pattern; look for the string ".claude/settings.local.json" (it appears twice)
and remove the second occurrence so the file contains only a single entry for
that path.

102 changes: 102 additions & 0 deletions Core/Resgrid.Localization/Areas/User/Calendar/Calendar.ar.resx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -300,4 +300,106 @@
<data name="Types" xml:space="preserve">
<value>الأنواع</value>
</data>
<data name="CheckIn" xml:space="preserve">
<value>تسجيل الحضور</value>
</data>
<data name="CheckOut" xml:space="preserve">
<value>تسجيل الانصراف</value>
</data>
<data name="CheckInTime" xml:space="preserve">
<value>وقت الحضور</value>
</data>
<data name="CheckOutTime" xml:space="preserve">
<value>وقت الانصراف</value>
</data>
<data name="Duration" xml:space="preserve">
<value>المدة</value>
</data>
<data name="CheckInSuccessful" xml:space="preserve">
<value>تم تسجيل الحضور بنجاح</value>
</data>
<data name="CheckOutSuccessful" xml:space="preserve">
<value>تم تسجيل الانصراف بنجاح</value>
</data>
<data name="EditCheckInTimes" xml:space="preserve">
<value>تعديل أوقات التسجيل</value>
</data>
<data name="ManualOverride" xml:space="preserve">
<value>تعديل يدوي</value>
</data>
<data name="AdminCheckIn" xml:space="preserve">
<value>تسجيل حضور بواسطة المسؤول</value>
</data>
<data name="CheckInOnBehalf" xml:space="preserve">
<value>تسجيل حضور نيابة عن شخص آخر</value>
</data>
<data name="EventAttendanceReport" xml:space="preserve">
<value>تقرير حضور الفعاليات</value>
</data>
<data name="TotalEventsAttended" xml:space="preserve">
<value>إجمالي الفعاليات المحضورة</value>
</data>
<data name="TotalHours" xml:space="preserve">
<value>إجمالي الساعات</value>
</data>
<data name="NoCheckInRecord" xml:space="preserve">
<value>لم يتم العثور على سجل حضور</value>
</data>
<data name="AlreadyCheckedIn" xml:space="preserve">
<value>تم تسجيل الحضور مسبقاً</value>
</data>
<data name="NotCheckedIn" xml:space="preserve">
<value>لم يتم تسجيل الحضور</value>
</data>
<data name="NotCheckedOut" xml:space="preserve">
<value>Not checked out</value>
</data>
<data name="LateRSVP" xml:space="preserve">
<value>تسجيل متأخر</value>
</data>
<data name="CustomTimes" xml:space="preserve">
<value>أوقات مخصصة</value>
</data>
<data name="Unauthorized" xml:space="preserve">
<value>غير مصرح</value>
</data>
<data name="CheckInDeleted" xml:space="preserve">
<value>تم حذف سجل الحضور</value>
</data>
<data name="CheckInNote" xml:space="preserve">
<value>ملاحظة الحضور</value>
</data>
<data name="CheckOutNote" xml:space="preserve">
<value>ملاحظة الانصراف</value>
</data>
<data name="CheckedInBy" xml:space="preserve">
<value>سُجّل الحضور بواسطة</value>
</data>
<data name="CheckedOutBy" xml:space="preserve">
<value>سُجّل الانصراف بواسطة</value>
</data>
<data name="CheckInDisabled" xml:space="preserve">
<value>معطّل</value>
</data>
<data name="CheckInSelfService" xml:space="preserve">
<value>تسجيل ذاتي للحضور/الانصراف</value>
</data>
<data name="CheckInAdminOnly" xml:space="preserve">
<value>المنشئ والمسؤولون فقط</value>
</data>
<data name="CheckInNotYetAvailable" xml:space="preserve">
<value>يُفتح تسجيل الحضور قبل 15 دقيقة من بدء الفعالية.</value>
</data>
<data name="Attendees" xml:space="preserve">
<value>الحاضرون</value>
</data>
<data name="AttendeesAddedDirectly" xml:space="preserve">
<value>ستتم إضافة المجموعات/الأفراد المحددين كحاضرين وإخطارهم مباشرة.</value>
</data>
<data name="EntitiesToNotifyHelp" xml:space="preserve">
<value>سيتم إخطار المجموعات/الأفراد المحددين بهذه الفعالية.</value>
</data>
<data name="PrintSignupSheet" xml:space="preserve">
<value>طباعة ورقة التسجيل</value>
</data>
</root>
102 changes: 102 additions & 0 deletions Core/Resgrid.Localization/Areas/User/Calendar/Calendar.de.resx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -251,4 +251,106 @@
<data name="Types" xml:space="preserve">
<value>Typen</value>
</data>
<data name="CheckIn" xml:space="preserve">
<value>Einchecken</value>
</data>
<data name="CheckOut" xml:space="preserve">
<value>Auschecken</value>
</data>
<data name="CheckInTime" xml:space="preserve">
<value>Eincheckzeit</value>
</data>
<data name="CheckOutTime" xml:space="preserve">
<value>Auscheckzeit</value>
</data>
<data name="Duration" xml:space="preserve">
<value>Dauer</value>
</data>
<data name="CheckInSuccessful" xml:space="preserve">
<value>Einchecken erfolgreich</value>
</data>
<data name="CheckOutSuccessful" xml:space="preserve">
<value>Auschecken erfolgreich</value>
</data>
<data name="EditCheckInTimes" xml:space="preserve">
<value>Eincheckzeiten bearbeiten</value>
</data>
<data name="ManualOverride" xml:space="preserve">
<value>Manuelle Anpassung</value>
</data>
<data name="AdminCheckIn" xml:space="preserve">
<value>Einchecken durch Administrator</value>
</data>
<data name="CheckInOnBehalf" xml:space="preserve">
<value>Stellvertretend einchecken</value>
</data>
<data name="EventAttendanceReport" xml:space="preserve">
<value>Anwesenheitsbericht für Veranstaltungen</value>
</data>
<data name="TotalEventsAttended" xml:space="preserve">
<value>Gesamtzahl besuchter Veranstaltungen</value>
</data>
<data name="TotalHours" xml:space="preserve">
<value>Gesamtstunden</value>
</data>
<data name="NoCheckInRecord" xml:space="preserve">
<value>Kein Eincheckdatensatz gefunden</value>
</data>
<data name="AlreadyCheckedIn" xml:space="preserve">
<value>Bereits eingecheckt</value>
</data>
<data name="NotCheckedIn" xml:space="preserve">
<value>Nicht eingecheckt</value>
</data>
<data name="NotCheckedOut" xml:space="preserve">
<value>Not checked out</value>
</data>
<data name="LateRSVP" xml:space="preserve">
<value>Verspätete Anmeldung</value>
</data>
<data name="CustomTimes" xml:space="preserve">
<value>Benutzerdefinierte Zeiten</value>
</data>
<data name="Unauthorized" xml:space="preserve">
<value>Nicht autorisiert</value>
</data>
<data name="CheckInDeleted" xml:space="preserve">
<value>Eincheckdatensatz gelöscht</value>
</data>
<data name="CheckInNote" xml:space="preserve">
<value>Eincheck-Notiz</value>
</data>
<data name="CheckOutNote" xml:space="preserve">
<value>Auscheck-Notiz</value>
</data>
<data name="CheckedInBy" xml:space="preserve">
<value>Eingecheckt von</value>
</data>
<data name="CheckedOutBy" xml:space="preserve">
<value>Ausgecheckt von</value>
</data>
<data name="CheckInDisabled" xml:space="preserve">
<value>Deaktiviert</value>
</data>
<data name="CheckInSelfService" xml:space="preserve">
<value>Selbst Ein-/Auschecken</value>
</data>
<data name="CheckInAdminOnly" xml:space="preserve">
<value>Nur Ersteller &amp; Administratoren</value>
</data>
<data name="CheckInNotYetAvailable" xml:space="preserve">
<value>Das Einchecken öffnet 15 Minuten vor Veranstaltungsbeginn.</value>
</data>
<data name="Attendees" xml:space="preserve">
<value>Teilnehmer</value>
</data>
<data name="AttendeesAddedDirectly" xml:space="preserve">
<value>Ausgewählte Gruppen/Mitarbeiter werden als Teilnehmer hinzugefügt und direkt benachrichtigt.</value>
</data>
<data name="EntitiesToNotifyHelp" xml:space="preserve">
<value>Ausgewählte Gruppen/Mitarbeiter werden über diese Veranstaltung benachrichtigt.</value>
</data>
<data name="PrintSignupSheet" xml:space="preserve">
<value>Anmeldeliste drucken</value>
</data>
</root>
111 changes: 111 additions & 0 deletions Core/Resgrid.Localization/Areas/User/Calendar/Calendar.en.resx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -300,4 +300,115 @@
<data name="Types" xml:space="preserve">
<value>Types</value>
</data>
<data name="CheckIn" xml:space="preserve">
<value>Check In</value>
</data>
<data name="CheckOut" xml:space="preserve">
<value>Check Out</value>
</data>
<data name="CheckInTime" xml:space="preserve">
<value>Check-In Time</value>
</data>
<data name="CheckOutTime" xml:space="preserve">
<value>Check-Out Time</value>
</data>
<data name="Duration" xml:space="preserve">
<value>Duration</value>
</data>
<data name="CheckInSuccessful" xml:space="preserve">
<value>Check-in successful</value>
</data>
<data name="CheckOutSuccessful" xml:space="preserve">
<value>Check-out successful</value>
</data>
<data name="EditCheckInTimes" xml:space="preserve">
<value>Edit Check-In Times</value>
</data>
<data name="ManualOverride" xml:space="preserve">
<value>Manual Override</value>
</data>
<data name="AdminCheckIn" xml:space="preserve">
<value>Admin Check-In</value>
</data>
<data name="CheckInOnBehalf" xml:space="preserve">
<value>Check In on Behalf</value>
</data>
<data name="EventAttendanceReport" xml:space="preserve">
<value>Event Attendance Report</value>
</data>
<data name="TotalEventsAttended" xml:space="preserve">
<value>Total Events Attended</value>
</data>
<data name="TotalHours" xml:space="preserve">
<value>Total Hours</value>
</data>
<data name="NoCheckInRecord" xml:space="preserve">
<value>No check-in record found</value>
</data>
<data name="AlreadyCheckedIn" xml:space="preserve">
<value>Already checked in</value>
</data>
<data name="NotCheckedIn" xml:space="preserve">
<value>Not checked in</value>
</data>
<data name="NotCheckedOut" xml:space="preserve">
<value>Not checked out</value>
</data>
<data name="LateRSVP" xml:space="preserve">
<value>Late RSVP</value>
</data>
<data name="CustomTimes" xml:space="preserve">
<value>Custom Times</value>
</data>
<data name="Unauthorized" xml:space="preserve">
<value>Unauthorized</value>
</data>
<data name="CheckInDeleted" xml:space="preserve">
<value>Check-in deleted</value>
</data>
<data name="CheckInNote" xml:space="preserve">
<value>Check-In Note</value>
</data>
<data name="CheckOutNote" xml:space="preserve">
<value>Check-Out Note</value>
</data>
<data name="CheckedInBy" xml:space="preserve">
<value>Checked In By</value>
</data>
<data name="CheckedOutBy" xml:space="preserve">
<value>Checked Out By</value>
</data>
<data name="CheckInDisabled" xml:space="preserve">
<value>Disabled</value>
</data>
<data name="CheckInSelfService" xml:space="preserve">
<value>Self Check-In/Out</value>
</data>
<data name="CheckInAdminOnly" xml:space="preserve">
<value>Creator &amp; Admins Only</value>
</data>
<data name="CheckInNotYetAvailable" xml:space="preserve">
<value>Check-in opens 15 minutes before the event starts.</value>
</data>
<data name="Attendees" xml:space="preserve">
<value>Attendees</value>
</data>
<data name="AttendeesAddedDirectly" xml:space="preserve">
<value>Selected groups/personnel will be added as attendees and notified directly.</value>
</data>
<data name="EntitiesToNotifyHelp" xml:space="preserve">
<value>Selected groups/personnel will be notified about this event.</value>
</data>
<data name="PrintSignupSheet" xml:space="preserve">
<value>Print Signup Sheet</value>
</data>
<data name="CheckInClosed" xml:space="preserve">
<value>Check-in is no longer available for this event.</value>
</data>
<data name="CheckInBy" xml:space="preserve">
<value>Checked in by {0}</value>
</data>
<data name="CheckOutBy" xml:space="preserve">
<value>Checked out by {0}</value>
</data>
</root>
Loading
Loading