Новая логика группировки данных для отображения.

фикс опечатки
добавлены формы, возращающие данные по группе, добавлены условия для раскрытия и отображения
2024-11-22 13:11:58 +03:00 · 2024-11-14 17:03:15 +03:00 · 2024-11-14 17:02:12 +03:00 · 2024-11-14 17:00:33 +03:00 · 2024-11-13 16:27:28 +03:00 · 2024-11-13 16:26:13 +03:00
3 changed files with 199 additions and 50 deletions
--- a/inc/attendancelog.php
+++ b/inc/attendancelog.php
@ -7,7 +7,7 @@ class attendancelog {
        $this->name = $name;
    }
    function getAllGrupps() {
-        $sql_search = 'SELECT id, sokr, fo, kurs FROM acs_grupp ORDER BY `sokr` DESC';
+        $sql_search = 'SELECT id, sokr, fo, kurs FROM acs_grupp WHERE fo="ОФО"  ORDER BY `sokr` DESC';
        $rez = $this->DB->QUR_SEL($sql_search);
        return $rez;
    }
@ -18,14 +18,100 @@ class attendancelog {
        $url = 'https://eios.mkgtu.ru/api.php?des=studentsByGrupp&param1=' . $groupName . '&param2=' . $educationForm;
        return json_decode(file_get_contents($url),1);
    }
+    function getClassesByGroup($groupName,$educationForm)
+    {
+        $tmp = explode('-', $groupName);
+        $groupName = trim($tmp[0]);
+        $groupNumber = substr($tmp[1],0,2);
+        $educationForm = urlencode($educationForm);
+        $groupName = urlencode($groupName);
+        $groupNumber = urlencode($groupNumber);
+        $url = 'https://local.mkgtu.ru/raspisnew/api.php?des=raspis_grupp&name='. $groupName .'&number='. $groupNumber .'&fo=' . $educationForm;
+        return json_decode(file_get_contents($url),1);
+        //return $url;
+    }
+    function currentTime() { //возвращает информацию о текущем моменте для пользователя
+        $rez = array();
+        $moment = getdate();
+        $curr_minutes = $moment['hours'] * 60 + $moment['seconds'];
+        $minutes = 480;
+        for($i = 1; $i < 8; $i++) { //возвращает текущую пару в университете
+            if ($curr_minutes >= $minutes-10 AND $curr_minutes <= $minutes + 90){
+                $rez['time1'] = $i;
+            }
+            if ($i == 4){
+                $minutes = $minutes + 110;
+            }else{
+                $minutes = $minutes + 100;
+            }
+        }
+        $week = json_decode(file_get_contents('https://local.mkgtu.ru/raspisnew/api.php?des=raspis_week_cur'),1);
+        $rez['day1'] = $moment['wday'];
+        $rez['mday'] = $moment['mday'];
+        $rez['mon'] = $moment['mon'];
+        $rez['0'] = $moment['0'];
+        $rez['year'] = $moment['year'];
+        $rez['date'] = date("Y-m-d");
+        $rez['week1'] = $week['week_cur'];
+        return $rez;
+    }
+    function timeGroup() {
+
+        $raspis = $this->mainPageAction();
+
+        $out = array();
+        $currentTime = $this->currentTime();
+        $first_weekday_of_year =  $currentTime['year'] .'-01-01';
+        $first_weekday_of_year= date('w', strtotime($first_weekday_of_year));
+        $weekday = $first_weekday_of_year;
+        for ($month = 1; $month <= 12; $month++){
+            $day_in_month = cal_days_in_month(CAL_GREGORIAN, $month, $currentTime['year']);
+            $day = 1;
+            $week = 1;
+            for ($day; $day <= $day_in_month; $day++){
+                if($weekday > 7){
+                    $weekday = 1;
+                    $week++;
+                }
+                $tmp1 = $currentTime['year'] . '-' . $month . '-' . '01';
+                $month_name = date('M',strtotime($tmp1));
+                $out[$currentTime['year']][$month_name][$week . ' неделя'][$day] = $raspis['info'][$weekday];
+
+
+                $weekday++;
+
+            }
+        }
+
+        return $out;
+    }
+    function getGroupNameByID($id) {
+        $sql_search = 'SELECT sokr, fo FROM acs_grupp WHERE id='. $id .' ';
+        return $this->DB->QUR_SEL($sql_search);
+    }
    function mainPageAction()
    {
        $des = ''; if(isset($_GET['des'])) $des = $_GET['des'];
        if ($des == 'show'){
-            //получаем список студентов по группе
-            $sql_search = 'SELECT sokr, fo FROM acs_grupp WHERE id='. $_GET['id'] .' ';
-            $current_group = $this->DB->QUR_SEL($sql_search);
-            return $this->getStudentsByGroup($current_group[1]['sokr'], $current_group[1]['fo']);
+            //получаем список пар по имени группы
+//            $current_group = $this->getGroupNamebyID($_GET['id']);
+//            return $this->getStudentsByGroup($current_group[1]['sokr'], $current_group[1]['fo']);
+
+
+            $current_group = $this->getGroupNamebyID($_GET['id']);
+            $current_group_classes = $this->getClassesByGroup($current_group[1]['sokr'], $current_group[1]['fo']);
+            $currentTime = $this->currentTime();
+            $out = array();
+            foreach ($current_group_classes['raspis'] as $class) {
+                if ($class['week1'] == $currentTime['week1']) {
+                    $out['info'][$class['day1']]['day_name'] = $class['day_name'];
+                    $out['info'][$class['day1']][$class['time1']] = $class;
+                    $out['students'] = $this->getStudentsByGroup($current_group[1]['sokr'], $current_group[1]['fo']);
+                }
+            }
+            return $out;
+        }elseif($des == 'calendar_show'){
+
        }
    }
    function HTML()
@ -33,14 +119,21 @@ class attendancelog {
        $html = '';
        $groups = $this->getAllGrupps();
        $actionResult = $this->mainPageAction();
+        $currentTime = $this->currentTime();
+        $timeGroup = $this->timeGroup();
        //$html .= '<pre>'. print_r($groups,1) . '</pre>';
        //$html .= '<pre>'. print_r($actionResult,1) . '</pre>';
+        $html .= '<pre>'. print_r($timeGroup,1) . '</pre>';
+        //$html .= '<pre>'. print_r($currentTime,1) . '</pre>';
        //$html .= '<pre>'. print_r($_GET,1) . '</pre>';
+        //$html .= '<pre>'. print_r($_POST,1) . '</pre>';
+        //$html .= '<pre>'. print_r($_SESSION,1) . '</pre>';
        GLOBAL $smarty;
        $page = ''; if(isset($_GET['page'])) $page = $_GET['page'];
        $des = ''; if(isset($_GET['des'])) $des = $_GET['des'];
        $smarty->assign('des', $des);
        $smarty->assign('name', $this->name);
+        $smarty->assign('currentTime', $currentTime);
        if($page == 'headman') {
            $smarty->clearCache('moduls/attendancelog/tpl/headman.html');
            $html .= $smarty->fetch('moduls/attendancelog/tpl/headman.html');
@ -52,7 +145,12 @@ class attendancelog {

        }
        if ($page == 'main'){
-            $smarty->assign('actionResult', $actionResult);
+            if ($des == 'show'){
+                $smarty->assign('actionResult', $actionResult);
+                $groupName = $this->getGroupNameByID($_GET['id']);
+                $groupName = $groupName[1]['sokr'];
+                $smarty->assign('groupName', $groupName);
+            }
            $smarty->assign('groups',$groups);
            $smarty->clearCache('moduls/attendancelog/tpl/main_page.html');
            $html .= $smarty->fetch('moduls/attendancelog/tpl/main_page.html');
--- a/tpl/headman.html
+++ b/tpl/headman.html
@ -14,8 +14,8 @@
            <div class="navbar-inner">
                <div class="container">
                    <ul class="nav ">
-                        <li><a href="https://eios.mkgtu.ru/modul/attendancelog/">Главная</a></li>
-                        <li class="active" ><a href="https://eios.mkgtu.ru/modul/attendancelog/headman/">Старосты</a></li>
+                        <li><a href="/modul/attendancelog/">Главная</a></li>
+                        <li class="active" ><a href="/modul/attendancelog/headman/">Старосты</a></li>
                    </ul>
                    <ul class="nav pull-right">
                        <li><a href="#">{$name}</a></li>
--- a/tpl/main_page.html
+++ b/tpl/main_page.html
@ -14,8 +14,8 @@
                <div class="navbar-inner">
                    <div class="container">
                        <ul class="nav ">
-                            <li class="active" ><a href="https://eios.mkgtu.ru/modul/attendancelog/">Главная</a></li>
-                            <li><a href="https://eios.mkgtu.ru/modul/attendancelog/headman/">Старосты</a></li>
+                            <li class="active" ><a href="/modul/attendancelog/">Главная</a></li>
+                            <li><a href="/modul/attendancelog/headman/">Старосты</a></li>
                        </ul>
                        <ul class="nav pull-right">
                            <li><a href="#">{$name}</a></li>
@ -27,53 +27,103 @@
    </div>

 {if $des == 'show'}
-    <a href="https://eios.mkgtu.ru/modul/attendancelog/" role="button" class="btn"> Вернуться </a>
+    <a href="/modul/attendancelog/" role="button" class="btn"> Вернуться </a>
    <div class="row-fluid">
-        <div class="span9">
+        <div class="span12">
            <div class="widget blue">
                <div class="widget-title">
-                    <h4><i class="icon-reorder"></i></h4>
+                    <h4><i class="icon-reorder"></i> Посещение группы {$groupName} </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> Посещения группы </caption>
-                    </table>
-                </div>
-            </div>
-        </div>
-    </div>
-    <div class="row-fluid">
-        <div class="span9">
-            <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> Студенты группы </caption>
-                        <thead>
-                        <tr>
-                            <th>Номер</th>
-                            <th>Имя</th>
-                        </tr>
-                        </thead>
-                        <tbody>
-                        {foreach from=$actionResult['students'] key=key item=name}
-                        <tr>
-                            <td>{$key +1 }</td>
-                            <td>{$name}</td>
-                        </tr>
-                        {/foreach}
-                        </tbody>
-                    </table>
+                    <div class="tabbable custom-tab">
+                        <ul class="nav nav-tabs">
+                            {foreach from=$actionResult.info key=key item=day}
+                                <li {if $key == $currentTime.day1} class="active" {/if}><a href="#tab_1_{$key}" data-toggle="tab">{$day['day_name']}</a></li>
+                            {/foreach}
+                        </ul>
+                        <div class="tab-content" style="overflow-x: scroll">
+                            {foreach from=$actionResult.info key=key item=day}
+                                    <div class="tab-pane {if $key == $currentTime.day1} active {/if}" id="tab_1_{$key}">
+                                            <div class="accordion" id="accordion{$key}">
+                                                {foreach from=$day key=key item=class}
+                                                {if $key != 0}
+                                                <table class="table">
+                                                    <tbody>
+                                                        <tr>
+                                                            <td style="vertical-align: middle; text-align: center;"><h3 class="text-warning">{$class.time1}</h3></td>
+                                                            <td style="vertical-align: middle; "><div class="accordion-group">
+                                                                <div class="accordion-heading">
+                                                                    <a class="accordion-toggle {if $key != $currentTime.time1 } collapsed {/if}" data-toggle="collapse" data-parent="#accordion{$day.day1}" href="#collapse_{$class.day1}-{$class.time1}">
+                                                                        {$class.predmet}
+                                                                    </a>
+                                                                </div>
+                                                                <div id="collapse_{$class.day1}-{$class.time1}" class="accordion-body collapse {if $key == $currentTime.time1 } in {/if}">
+                                                                    <div class="accordion-inner">
+                                                                        <form action="" method="post">
+                                                                            <table class="table table-striped">
+                                                                                <thead>
+                                                                                <tr>
+                                                                                    <th>No</th>
+                                                                                    <th>ФИО</th>
+                                                                                    <th>Присутствие</th>
+                                                                                    <th>Примечание</th>
+                                                                                </tr>
+                                                                                </thead>
+                                                                                <tbody>
+                                                                                {foreach from=$actionResult.students.students key=key item=student}
+                                                                                <tr>
+                                                                                    <td>{$key}</td>
+                                                                                    <td>{$student}</td>
+                                                                                    <td>
+                                                                                        <input type="hidden" name="attendance_add_edit[attendance][{$student}]" value="off">
+                                                                                        <input type="hidden" name="attendance_add_edit[info]['week1']" value="{$class.week1}">
+                                                                                        <input type="hidden" name="attendance_add_edit[info]['day1']" value="{$class.day1}">
+                                                                                        <input type="hidden" name="attendance_add_edit[info]['time1']" value="{$class.time1}">
+                                                                                        <input type="hidden" name="attendance_add_edit[info]['predmet']" value="{$class.predmet}">
+                                                                                        <input type="hidden" name="attendance_add_edit[info]['gruppa']" value="{$groupName}">
+                                                                                        <input type="checkbox" name="attendance_add_edit[attendance][{$student}]" id="{$key}">
+                                                                                    </td>
+                                                                                    <td><input type="text" name="" id="" value=""></td>
+                                                                                </tr>
+                                                                                {/foreach}
+                                                                                </tbody>
+                                                                            </table>
+                                                                            <button type="submit" class="btn btn-success">Сохранить</button>
+                                                                        </form>
+                                                                    </div>
+                                                                </div>
+
+                                                            </div></td>
+                                                        </tr>
+                                                    </tbody>
+
+                                                </table>
+                                                {/if}
+                                                {/foreach}
+                                            </div>
+                                        </div>
+                            {/foreach}
+                        </div>
+                    </div>
                </div>
            </div>
        </div>
    </div>
 {else}
    <div class="row-fluid">
+        <div class="span4">
+            <div class="widget yellow">
+                <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">
+
+                </div>
+            </div>
+
+        </div>
        <div class="span8">
            <div class="widget red">
                <div class="widget-title">
@ -93,11 +143,11 @@
                        <tbody>
                            {foreach from=$groups key=key item=group}
                                {if $key != 0}
-                                <tr>
-                                    <td><a href="https://eios.mkgtu.ru/modul/attendancelog/main/show/{$group['id']}/">{$group['sokr']}</a></td>
-                                    <td>{$group['fo']}</td>
-                                    <td>{$group['kurs']}</td>
-                                </tr>
+                                    <tr>
+                                        <td><a href="/modul/attendancelog/main/show/{$group['id']}/">{$group.sokr}</a></td>
+                                        <td>{$group['fo']}</td>
+                                        <td>{$group['kurs']}</td>
+                                    </tr>
                                {/if}
                            {/foreach}
                        </tbody>
@ -105,5 +155,6 @@
                </div>
            </div>
        </div>
+
    </div>
 {/if}
Author	SHA1	Message	Date
RomanGolienko	576b4672ac	Новая логика группировки данных для отображения.	2024-11-22 13:11:58 +03:00
RomanGolienko	8f011bc0ed	фикс опечатки	2024-11-14 17:03:15 +03:00
RomanGolienko	34788f5973	добавлены формы, возращающие данные по группе, добавлены условия для раскрытия и отображения	2024-11-14 17:02:12 +03:00
RomanGolienko	1968c77a6f	добавлена функция, возвращющая текущие параметры времени + изменена структура массива в mainPageAction	2024-11-14 17:00:33 +03:00
RomanGolienko	c63df969c4	верстка таблиц журналов	2024-11-13 16:27:28 +03:00
RomanGolienko	26ee706cb9	формирование массива с данными по группам, получение списка группы	2024-11-13 16:26:13 +03:00
RomanGolienko	79094a385a	adding calendar table and logic	2024-11-12 14:57:17 +03:00
RomanGolienko	42efa74025	links fix	2024-11-12 13:41:45 +03:00