Staff: update family page on Staff Profile to exclude personal detail…

…s and addresses
GibbonEdu · Aug 18, 2024 · f78ce0a · f78ce0a
1 parent 03f7c06
commit f78ce0a
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 1 deletion.
diff --git a/CHANGELOG.txt b/CHANGELOG.txt
@@ -37,6 +37,7 @@ v28.0.00
         Messenger: limited the individual message target to a maximum of 50 people
         Reports: added a Progress by Department report for viewing class criteria progress
         Staff: updated Manage Staff to override required custom fields when manually editing a staff member
+        Staff: updated family page on Staff Profile to exclude personal details and addresses
         Students: added a notification event when student notes are edited
         User Admin: added the names of users who made changes to the User Status Log
         User Admin: updated Manage Users to override required custom fields when manually editing a user

diff --git a/modules/Staff/staff_view_details.php b/modules/Staff/staff_view_details.php
@@ -393,6 +393,7 @@
 
                         echo $page->fetchFromTemplate('profile/family.twig.html', [
                             'families' => $families,
+                            'fullDetails' => false,
                         ]);
                     } elseif ($subpage == 'Facilities') {
                         $staffFacilityGateway = $container->get(StaffFacilityGateway::class);

diff --git a/resources/templates/profile/family.twig.html b/resources/templates/profile/family.twig.html
@@ -16,6 +16,7 @@
                 <span style='font-size: 115%; font-weight: bold'>{{ __('Family Name') }}</span><br />
                 {{ family.name }}
             </td>
+            {% if fullDetails %}
             <td style='width: 33%; vertical-align: top'>
                 <span style='font-size: 115%; font-weight: bold'>{{ __('Family Status') }}</span><br />
                 {{ __(family.status) }}
@@ -25,7 +26,10 @@
                 {{ __(family.languageHomePrimary) }} <br />
                 {{ __(family.languageHomeSecondary) }}<br />
             </td>
+            {% endif %}
         </tr>
+
+        {% if fullDetails %}
         <tr>
             <td style='width: 33%; padding-top: 15px; vertical-align: top'>
                 <span style='font-size: 115%; font-weight: bold'>{{ __('Address Name') }}</span><br />
@@ -36,6 +40,7 @@
             <td style='width: 33%; padding-top: 15px; vertical-align: top'>
             </td>
         </tr>
+
 
         <tr>
             <td style='width: 33%; padding-top: 15px; vertical-align: top'>
@@ -51,6 +56,7 @@
                 {{ __(family.homeAddressCountry) }}
             </td>
         </tr>
+        {% endif %}
     </table>
 
     {% for person in family.adults %}
@@ -89,6 +95,7 @@ <h4>
                 {{ person.contactPriority }}
             </td>
         </tr>
+        {% if fullDetails %}
         <tr>
             <td class="{{ class }}" style='width: 33%; padding-top: 15px; vertical-align: top'>
                 <span style='font-size: 115%; font-weight: bold'>{{ __('First Language') }}</span><br />
@@ -178,6 +185,8 @@ <h4>
             </td>
         </tr>
         {% endif %}
+
+        {% endif %}
     </table>
     {% endfor %}
 

diff --git a/src/Domain/User/FamilyGateway.php b/src/Domain/User/FamilyGateway.php
@@ -135,7 +135,7 @@ public function selectAdultsByFamily($gibbonFamilyIDList, $allFields = false)
             ->innerJoin('gibbonPerson', 'gibbonFamilyAdult.gibbonPersonID=gibbonPerson.gibbonPersonID')
             ->where('FIND_IN_SET(gibbonFamilyAdult.gibbonFamilyID, :gibbonFamilyIDList)')
             ->bindValue('gibbonFamilyIDList', $gibbonFamilyIDList)
-            ->orderBy(['gibbonPerson.surname', 'gibbonPerson.preferredName']);
+            ->orderBy(['gibbonFamilyAdult.contactPriority', 'gibbonPerson.surname', 'gibbonPerson.preferredName']);
 
         return $this->runSelect($query);
     }