From 564e8c6bf7570fc4195ddd942fc23c14d0c10e32 Mon Sep 17 00:00:00 2001
From: RomanGolienko <romangolienko@yandex.ru>
Date: Tue, 14 Jan 2025 12:12:03 +0300
Subject: [PATCH] =?UTF-8?q?=D0=94=D0=BE=D0=B1=D0=B0=D0=B2=D0=BB=D0=B5?=
 =?UTF-8?q?=D0=BD=D0=BE=20=D0=BE=D1=82=D0=BE=D0=B1=D1=80=D0=B0=D0=B6=D0=B5?=
 =?UTF-8?q?=D0=BD=D0=B8=D0=B5=20=D1=81=D1=82=D0=B0=D1=82=D1=83=D1=81=D0=B0?=
 =?UTF-8?q?=20=D1=81=D1=82=D0=B0=D1=80=D0=BE=D1=81=D1=82=D1=8B=20=D0=B2=20?=
 =?UTF-8?q?=D0=B3=D1=80=D1=83=D0=BF=D0=BF=D0=B5=20=D0=B2=20=D0=B1=D0=BE?=
 =?UTF-8?q?=D0=BA=D0=BE=D0=B2=D0=BE=D0=B9=20=D0=BF=D0=B0=D0=BD=D0=B5=D0=BB?=
 =?UTF-8?q?=D0=B8=20=D0=BD=D0=B0=20=D0=B0=D0=B4=D0=BC=D0=B8=D0=BD.=20?=
 =?UTF-8?q?=D1=81=D1=82=D1=80=D0=B0=D0=BD=D0=B8=D1=86=D0=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 inc/attendancelog.php | 22 ++++++++++++++++++++--
 tpl/headman.html      | 32 ++++++++++++++++++++++----------
 2 files changed, 42 insertions(+), 12 deletions(-)

diff --git a/inc/attendancelog.php b/inc/attendancelog.php
index 9812d97..a8c90b3 100644
--- a/inc/attendancelog.php
+++ b/inc/attendancelog.php
@@ -247,6 +247,11 @@ class attendancelog {
             return $out;
         }
     }
+    function getHeadman($group){
+        $sql_search = 'SELECT * FROM acs_attendancelog_headmen WHERE gruppa="'. $group .'" ';
+        $tmp = $this->DB->QUR_SEL($sql_search);
+        return $tmp[1];
+    }
     function HTML()
     {
         GLOBAL $smarty;
@@ -260,7 +265,6 @@ class attendancelog {
         $predmetsAddEdit = $this->predmetsAddEdit('Исследование операций и методы оптимизации');
         $gruppsSearch = $this->gruppsSearch($_POST['all_grupps_search']);
 
-
         //$html .= '<pre>'. print_r($groups,1) . '</pre>';
         //$html .= '<pre>'. print_r($gruppsSearch,1) . '</pre>';
         //$html .= '<pre>'. print_r($currentUserInfo,1) . '</pre>';
@@ -283,10 +287,21 @@ class attendancelog {
         $smarty->assign('currentUserInfo', $currentUserInfo);
         if($page == 'headman') {
             $facult_groups = $this->getAllGrupps($currentUserInfo['facult']['facult_id']);
+            foreach ($facult_groups as $key => $group) {
+                $students = $this->getStudentsByGroup($group['sokr'], $group['fo']);
+                $students = $students['students'];
+                $headman = $this->getHeadman($group['sokr']);
+                foreach($students as $user_id => $student_name) {
+                    if ($headman['user_id'] == $user_id){
+                        $facult_groups[$key]['headman'] = $student_name;
+                    }
+                }
+            }
             $smarty->assign('facult_groups',$facult_groups);
             $smarty->assign('headmanPageActionResult', $headmanPageActionResult);
             $smarty->clearCache('moduls/attendancelog/tpl/headman.html');
             $html .= $smarty->fetch('moduls/attendancelog/tpl/headman.html');
+
         }
         if ($page == ''){
             if($currentUserInfo['role'] == 'student'){
@@ -294,7 +309,10 @@ class attendancelog {
                 header($header);
             }
             $groups = $this->getAllGrupps();
-            $facult_groups = $this->getAllGrupps($currentUserInfo['facult']['facult_id']);
+            if (isset($currentUserInfo['facult']['facult_id'])){
+                $facult_groups = $this->getAllGrupps($currentUserInfo['facult']['facult_id']);
+            }
+
             if(isset($_POST['all_grupps_search'])){
                 $groups = $this->gruppsSearch($_POST['all_grupps_search']);
             }
diff --git a/tpl/headman.html b/tpl/headman.html
index 537c37c..854b4b6 100644
--- a/tpl/headman.html
+++ b/tpl/headman.html
@@ -28,19 +28,25 @@
 
 {if $des == 'add_edit'}
     <div class="row-fluid">
-        <div class="span3">
+        <div class="span4">
             <div class="widget blue">
                 <div class="widget-title">
                     <h4><i class="icon-reorder"></i> Выбрать группу  </h4>
                     <span class="tools"><a href="javascript:;" class="icon-chevron-down"></a></span>
                 </div>
                 <div class="widget-body">
-                    <table class="table table-striped table-bordered">
-                        <caption><h4></h4> </caption>
+                    <table class="table table-bordered">
+                        <thead>
+                        <tr>
+                            <th>Группа</th>
+                            <th>Староста</th>
+                        </tr>
+                        </thead>
                         <tbody>
                         {foreach from=$facult_groups key=key item=group}
-                        <tr>
-                            <td {if isset($smarty.get.id) AND $group['id'] == $smarty.get.id } style="text-align: center; background-color: #dff0d8; " {else} style="text-align: center;"  {/if}><a href="/modul/attendancelog/headman/add_edit/{$group['id']}/"> <h4>{$group.sokr}</h4></a></td>
+                        <tr {if isset($smarty.get.id) AND $group['id'] == $smarty.get.id } style="background-color: #dff0d8;"{/if}>
+                            <td><a href="/modul/attendancelog/headman/add_edit/{$group['id']}/"> <h5 class="text-center">{$group.sokr}</h5></a></td>
+                            <td> <h5 class="text-center">{if isset($group.headman)}{$group.headman} {else} <span style="color: red">не назначен !</span>  {/if}</h5></td>
                         </tr>
                         {/foreach}
                         </tbody>
@@ -48,7 +54,7 @@
                 </div>
             </div>
         </div>
-        <div class="span9">
+        <div class="span8">
             {if isset($headmanPageActionResult.headman) }
             <div class="alert alert-info"> <button class="close" data-dismiss="alert">×</button> <h3>Староста уже выбран(а)! - <strong> {$headmanPageActionResult.headman}</strong></h3> </div>
             {/if}
@@ -63,7 +69,7 @@
                             <caption><h4>{$headmanPageActionResult.current_group.sokr}</h4></caption>
                             <tbody>
                                 {foreach from=$headmanPageActionResult.students key=user_id item=info}
-                                    <tr {if $info.headman == 1} style="color: #468847; background-color: #dff0d8;" {/if}>
+                                    <tr {if $info.headman == 1} style="c6olor: #48847; background-color: #dff0d8;" {/if}>
                                         <td> <h5>{$info.student_name}</h5> </td>
                                         <td style="min-width: 30%"><h5><input type="radio" name="headman_request" value="{$user_id}" {if $info.headman == 1} checked {/if}></h5></td>
                                     </tr>
@@ -89,11 +95,17 @@
                 </div>
                 <div class="widget-body">
                     <table class="table table-striped table-bordered">
-                        <caption><h4></h4> </caption>
+                        <thead>
+                        <tr>
+                            <th>Группа</th>
+                            <th>Староста</th>
+                        </tr>
+                        </thead>
                         <tbody>
                         {foreach from=$facult_groups key=key item=group}
-                        <tr>
-                            <td style="text-align: center"><a href="/modul/attendancelog/headman/add_edit/{$group['id']}/"><h4>{$group.sokr}</h4></a></td>
+                        <tr {if isset($smarty.get.id) AND $group['id'] == $smarty.get.id } style="background-color: #dff0d8;"{/if}>
+                            <td><a href="/modul/attendancelog/headman/add_edit/{$group['id']}/"> <h5 class="text-center">{$group.sokr}</h5></a></td>
+                            <td> <h5 class="text-center">{if isset($group.headman)}{$group.headman} {else} <span style="color: #9d0202">не назначен !</span>  {/if}</h5></td>
                         </tr>
                         {/foreach}
                         </tbody>