From 2881642d7d2d7541cc3bd8202782f8a96182b850 Mon Sep 17 00:00:00 2001
From: RomanGolienko <romangolienko@yandex.ru>
Date: Tue, 3 Dec 2024 13:51:43 +0300
Subject: [PATCH] =?UTF-8?q?=D0=BE=D0=BF=D1=82=D0=B8=D0=BC=D0=B8=D0=B7?=
 =?UTF-8?q?=D0=B0=D1=86=D0=B8=D1=8F=20UI/UX?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 tpl/main_page.html | 63 +++++++++++++++++++++++-----------------------
 1 file changed, 32 insertions(+), 31 deletions(-)

diff --git a/tpl/main_page.html b/tpl/main_page.html
index a561005..c001c58 100644
--- a/tpl/main_page.html
+++ b/tpl/main_page.html
@@ -29,13 +29,28 @@
 {if $des == 'show'}
     <a href="/modul/attendancelog/" role="button" class="btn"> Вернуться </a>
     <div class="row-fluid">
-        <div class="span8">
+        <div class="span12">
             <div class="widget blue">
                 <div class="widget-title">
                     <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">
+                    <form action="" method="post">
+                        <label for="date_request">Выберите дату</label>
+                        <input
+                                type="date"
+                                name="date_request"
+                                id="date_request"
+                                max="{$currentTime['date']}"
+                                {if isset($smarty.post.date_request)}
+                                    value="{$smarty.post.date_request}"
+                                {else}
+                                    value="{$currentTime.date}"
+                                {/if}
+                        >
+                        <button type="submit" class="btn btn-success"> Найти</button>
+                    </form>
                     {if $actionResult|count < 1}
                         <h3> У группы нет пар в этот день!</h3>
                     {else}
@@ -44,6 +59,9 @@
                             ({$actionResult.day_name})
                             {if isset($smarty.post.date_request)}
                                 {$smarty.post.date_request}
+                                {if $smarty.post.date_request == $currentTime.date }
+                                    <span class="label label-success"> Сегодня!</span>
+                                {/if}
                             {else}
                                 {$currentTime.date}
                                 <span class="label label-success"> Сегодня!</span>
@@ -62,7 +80,7 @@
                                             {$class.predmet}
                                         </a>
                                     </div>
-                                    <div id="collapse_{$class.day1}-{$class.time1}" class="accordion-body collapse {if $key == $currentTime.time1 } in {/if}">
+                                    <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">
@@ -78,14 +96,7 @@
                                                         <td>{$student}</td>
                                                         <td>
                                                             <input type="hidden" name="attendance_add_edit[attendance][{$student}]" value="off">
-                                                            <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}">
-                                                            {if isset($smarty.post.date_request)}
-                                                                <input type="hidden" name="attendance_add_edit[info][date]" value="{$smarty.post.date_request}">
-                                                            {else}
-                                                                <input type="hidden" name="attendance_add_edit[info][date]" value="{$currentTime.date}">
-                                                            {/if}
+
                                                             <label for="{$student|replace:' ':''}{$key}"></label>
                                                             <input class="custom-checkbox" type="checkbox" name="attendance_add_edit[attendance][{$student}]" id="{$student|replace:' ':''}{$key}" {if $att == 'on'} checked  {/if}>
 
@@ -94,6 +105,15 @@
                                                     {/foreach}
                                                     </tbody>
                                                 </table>
+                                                <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}">
+                                                {if isset($smarty.post.date_request)}
+                                                <input type="hidden" name="attendance_add_edit[info][date]" value="{$smarty.post.date_request}">
+                                                {else}
+                                                <input type="hidden" name="attendance_add_edit[info][date]" value="{$currentTime.date}">
+                                                {/if}
+                                                <input type="hidden" name="date_request" value="{$smarty.post.date_request}">
                                                 <button type="submit" class="btn btn-success">Сохранить</button>
                                             </form>
                                         </div>
@@ -111,26 +131,7 @@
                 </div>
             </div>
         </div>
-        <div class="span4">
-            <div class="widget yellow">
-                <div class="widget-title">
-                    <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">
-                    <form action="" method="post">
-                        <label for="date_request">Выберите дату</label>
-                        <input
-                                type="date"
-                                name="date_request"
-                                id="date_request"
-                                max="{$currentTime['date']}"
-                        >
-                        <button type="submit" class="btn btn-success"> Найти</button>
-                    </form>
-                </div>
-            </div>
-        </div>
+
     </div>
 {else}
     <div class="row-fluid">
@@ -141,7 +142,7 @@
                     <span class="tools"><a href="javascript:;" class="icon-chevron-down"></a></span>
                 </div>
                 <div class="widget-body">
-
+                    <a href="/modul/attendancelog/main/show/{$myGrupps['id']}/">{$myGrupps.sokr}</a>
                 </div>
             </div>