From eec0575b89bdf6f46c98c5d8a9eba329604fa336 Mon Sep 17 00:00:00 2001
From: Ivan Ivanov <iv2nov@gmail.com>
Date: Fri, 19 Feb 2021 21:13:43 +0500
Subject: [PATCH] =?UTF-8?q?=D0=94=D0=BE=D0=B1=D0=B0=D0=B2=D0=B8=D0=BB?=
 =?UTF-8?q?=D0=B8=20=D1=84=D0=B8=D0=BB=D1=8C=D1=82=D1=80=20"=D0=A3=D1=87?=
 =?UTF-8?q?=D0=B5=D0=B1=D0=BD=D0=B0=D1=8F=20=D0=BF=D1=80=D0=BE=D0=B3=D1=80?=
 =?UTF-8?q?=D0=B0=D0=BC=D0=BC=D0=B0"?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 uisi/staff/index.php | 69 ++++++++++++++++++++++++++++++++++++++++----
 1 file changed, 64 insertions(+), 5 deletions(-)

diff --git a/uisi/staff/index.php b/uisi/staff/index.php
index 58e8e4b..4d5dd92 100644
--- a/uisi/staff/index.php
+++ b/uisi/staff/index.php
@@ -98,6 +98,20 @@ $style = '.cont1 td,th {
 $script = '';
 
 $groupsAllowed = array(13);
+
+// UF_STUDY_PROGRAM begin
+$arStudyProgramsAll = array();
+$rsUserFields = CUserFieldEnum::GetList(array(), array('USER_FIELD_NAME' => 'UF_STUDY_PROGRAM'));
+while ($arUserField = $rsUserFields->GetNext()) {
+    $arStudyProgramsAll[$arUserField['ID']] = $arUserField['VALUE'];
+}
+    
+$ufStudyProgram = htmlspecialcharsEx($_REQUEST['UF_STUDY_PROGRAM']);
+if (!array_key_exists($ufStudyProgram, $arStudyProgramsAll)) {
+    $ufStudyProgram = null;
+}
+// UF_STUDY_PROGRAM end
+
 $id = htmlspecialcharsEx($_REQUEST['id']);
 if ($id) {
     $arGroups = CUser::GetUserGroup($id);
@@ -124,7 +138,7 @@ if ($id) {
                  }
                  ';
 
-    $content = '<a href="/uisi/general/staff.php" title="'.$title.'"><- К списку сотрудников</a>';
+    $content = '<a href="/uisi/staff/" title="'.$title.'"><- К списку сотрудников</a>';
 
     $name_full = getFullName($arUser['NAME'], $arUser['SECOND_NAME'], $arUser['LAST_NAME']);
     $title .= ' - '.$name_full;
@@ -179,7 +193,20 @@ if ($id) {
 
     $content .= '</tbody></table>';
 } else {
-    $rsUsers = CUser::GetList(($by='LAST_NAME'), ($order='asc'), array('GROUPS_ID'=>$groupsAllowed), array('SELECT'=>array('UF_*')));
+    $arUsersFilter = array('GROUPS_ID'=>$groupsAllowed);
+
+    // UF_STUDY_PROGRAM begin
+    if ($ufStudyProgram) {
+        $arUsersFilter['UF_STUDY_PROGRAM'] = $ufStudyProgram;
+    }
+    // UF_STUDY_PROGRAM end
+
+    $rsUsers = CUser::GetList(
+        ($by='LAST_NAME'),
+        ($order='asc'),
+        $arUsersFilter,
+        array('SELECT'=>array('UF_*'))
+    );
 
     // разбиваем постранично по 50 записей
     // $rsUsers->NavStart(50);
@@ -210,9 +237,7 @@ if ($id) {
                    }';
 
     $content = '<h1>Педагогический состав</h1>';
-
-    $content = '<a href="/uisi/general/rukovodstvo.php"><- Руководство. Педагогический состав</a>';
-
+    
     $content .= '<table style="border-collapse: collapse;">
                     <thead>
                         <tr>
@@ -245,6 +270,23 @@ if ($id) {
 
         $content .= '</tr>';
 
+        // UF_STUDY_PROGRAM begin
+        if ($arUser['UF_STUDY_PROGRAM']) {
+            $arUserStudyPrograms = array();
+            foreach ($arUser['UF_STUDY_PROGRAM'] as $id) {
+                $arUserStudyPrograms[] = $arStudyProgramsAll[$id];
+            }
+            $previewRow = '<tr><td>Учебная программа:</td><td>';
+            if (count($arUser['UF_STUDY_PROGRAM']) > 1) {
+                $previewRow .= '<ul class="staff-info"><li>'.implode('</li><li>', $arUserStudyPrograms).'</li></ul>';
+            } else {
+                $previewRow .= $arUserStudyPrograms[0];
+            }
+            $previewRow .= '</td></tr>';
+            $arPreviewRows[] = $previewRow;
+        }
+        // UF_STUDY_PROGRAM end
+
         if ($arPreviewRows) {
             $content .= '<tr><td class="staff-list-item-preview" colspan="5"><table class="staff-list-item-preview-table"><tbody>';
             $content .= implode($arPreviewRows);
@@ -252,6 +294,22 @@ if ($id) {
         }
     }
 
+    $filter = '<form method="get"><label>Учебная программа: <select name="UF_STUDY_PROGRAM">';
+    $filter .= '<option value="null">----</option>';
+
+    // UF_STUDY_PROGRAM begin
+    foreach ($arStudyProgramsAll as $key => $value) {
+        $option = '<option value="'.$key.'"';
+        if ($key == $ufStudyProgram) {
+            $option .= ' selected';
+        }
+        $option .= '>'.$value.'</option>';
+        $filter .= $option;
+    }
+    // UF_STUDY_PROGRAM end
+
+    $filter .= '</select></label><input type="submit" value="Выбрать"></form><hr/>';
+
     $content .= '</tbody></table>';
 
     $script .= '$(".staff-list-item-preview-link").on("click", function() {
@@ -263,6 +321,7 @@ if ($id) {
 $APPLICATION->SetTitle($title);
 
 echo '<style>'.$style.'</style>';
+echo $filter;
 echo $content;
 echo '<script>$( function() { '.$script.' } );</script>';