Merge branch 'master' of github.com:isaacphysics/isaac-react-app into feature/fasttrack-graphics

Author: mlt47

src/app/components/elements/panels/EventAttendance.tsx

@@ -101,7 +101,7 @@ export const EventAttendance = ({user, eventId}: {user: LoggedInUser; eventId: s
                             .filter(filterOnSurname)
                             .map(booking => {
                                 const userBooked = booking.userBooked as UserSummaryWithEmailAddressDTO;
-                                const additionalInformation = booking.additionalInformation as {[index: string]: string};
+                                const additionalInformation = booking.additionalInformation;
                                 const userSchool = booking.userBooked && userIdToSchoolMapping[booking.userBooked.id as number];
 
                                 return <tr key={booking.bookingId}>
@@ -119,17 +119,17 @@ export const EventAttendance = ({user, eventId}: {user: LoggedInUser; eventId: s
                                     </td>
                                     <td className="align-middle text-center">{displayAttendanceAsSymbol(booking.bookingStatus)}</td>
                                     <td className="align-middle">{userBooked.familyName}, {userBooked.givenName}</td>
-                                    <td className="align-middle">{additionalInformation.jobTitle ? additionalInformation.jobTitle : additionalInformation.yearGroup}</td>
+                                    <td className="align-middle">{additionalInformation?.jobTitle || additionalInformation?.yearGroup || ""}</td>
                                     {(userSchool === undefined || !userSchool.urn) && <td className="align-middle">{userSchool ? userSchool.name : ""}</td>}
                                     {userSchool && userSchool.urn && <td className="align-middle">{userSchool.name}</td>} {/* In future can add link to school stats page */}
                                     <td className="align-middle">{userBooked.role}</td>
                                     <td className="align-middle">{userBooked.email}</td>
                                     <td className="align-middle"><DateString>{booking.bookingDate}</DateString></td>
                                     <td className="align-middle"><DateString>{booking.updated}</DateString></td>
-                                    <td className="align-middle">{additionalInformation.accessibilityRequirements}</td>
-                                    <td className="align-middle">{additionalInformation.medicalRequirements}</td>
-                                    <td className="align-middle">{additionalInformation.emergencyName}</td>
-                                    <td className="align-middle">{additionalInformation.emergencyNumber}</td>
+                                    <td className="align-middle">{additionalInformation?.accessibilityRequirements || ""}</td>
+                                    <td className="align-middle">{additionalInformation?.medicalRequirements || ""}</td>
+                                    <td className="align-middle">{additionalInformation?.emergencyName || ""}</td>
+                                    <td className="align-middle">{additionalInformation?.emergencyNumber || ""}</td>
                                 </tr>
                             })
                         }

src/scss/common/header.scss

@@ -93,6 +93,20 @@ a.skip-main:focus, a.skip-main:active {
   z-index:999;
 }
 
+// reverse final element in the navigation bar to keep options on the screen
+ul#main-menu {
+  li.dropdown.nav-item:last-child {
+    div.dropdown-menu {
+      right: 0;
+      left: auto;
+      &::before {
+        right: 1rem;
+        left: auto;
+      }
+    }
+  }
+}
+
 // NOMENSA header.scss
 // !important used to override bootstraps use of !important :(