From 42d0d958fda8bbd9cfb8b98c979caab35eaec800 Mon Sep 17 00:00:00 2001
From: maxim <makss.web@gmail.com>
Date: Mon, 13 Sep 2021 12:12:17 +0300
Subject: [PATCH] =?UTF-8?q?=D0=A0=D0=B5=D1=84=D0=B0=D0=BA=D1=82=D0=BE?=
 =?UTF-8?q?=D1=80=D0=B8=D0=BD=D0=B3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../reports/views/reports/calendar.php        | 64 ++++---------------
 1 file changed, 12 insertions(+), 52 deletions(-)

diff --git a/backend/modules/reports/views/reports/calendar.php b/backend/modules/reports/views/reports/calendar.php
index 54f624c..2496e4b 100644
--- a/backend/modules/reports/views/reports/calendar.php
+++ b/backend/modules/reports/views/reports/calendar.php
@@ -1,7 +1,7 @@
 <?php
 
+use backend\widgets\Calendar;
 use yii\helpers\Html;
-use yii\helpers\Url;
 
 /* @var $this yii\web\View */
 /* @var $fio */
@@ -9,7 +9,9 @@ use yii\helpers\Url;
 
 $this->title = 'Календарь пользователя - ' . $fio;
 ?>
-<?= \backend\widgets\Calendar::widget([
+
+<?=Calendar::widget([
+
     'button' => Html::a('<i class="fas fa-long-arrow-alt-left"></i> Назад',
         Yii::$app->request->referrer, ['class' => 'btn btn-primary',]),
 
@@ -41,7 +43,6 @@ $this->title = 'Календарь пользователя - ' . $fio;
                 return 'success';
             }
         }
-
         return 'danger';
     }",
 
@@ -55,75 +56,34 @@ $this->title = 'Календарь пользователя - ' . $fio;
                     <thead>
                     <tr>
                         <th>#</th>
-                        <th><a href='/secure/reports/reports/index?date=2021-08-31&amp;sort=today' data-sort='today'>Что
-                            было сделано
-                            сегодня?</a></th>
-                        <th><a href='/secure/reports/reports/index?date=2021-08-31&amp;sort=difficulties'
-                               data-sort='difficulties'>Какие
-                            сложности возникли?</a></th>
-                        <th><a href='/secure/reports/reports/index?date=2021-08-31&amp;sort=tomorrow' data-sort='tomorrow'>Что
-                            планируется сделать завтра?</a></th>
+                        <th>Что было сделано сегодня?</th>
+                        <th>Какие сложности возникли?</th>
+                        <th>Что планируется сделать завтра?</th>
                         <th class='action-column'>&nbsp;</th>
                     </tr>
                     </thead>
                     <tbody>`;
-        for (let k = 0, i = 0, report = content[i]; i < content.length; i++) {
-            report = content[i];
+        for (let k = 0, i = 0; i < content.length; i++) {
+            let report = content[i];
             if (report['created_at'] == date) {
                 k++;
                 html += `<tr data-key='\${report['id']}'>
                     <td>\${k}</td><td>`;
+                    
                 for (j = 0; j < Object.keys(report['today']).length; j++) {
                     html += `<p>\${j + 1}. (\${report['today'][j]['hours_spent']} ч.)
 \${report['today'][j]['task']}</p>`
                 }
-
+                
                 html += `</td>
                     <td>\${report['difficulties']}</td>
                     <td>\${report['tomorrow']}</td>
-                    <td>
-<a href='/secure/reports/reports/view?id=\${report['id']}' title='Просмотр' aria-label='Просмотр'
-                           data-pjax='0'>
-                            <svg aria-hidden='true'
-                                 style='display:inline-block;font-size:inherit;height:1em;overflow:visible;vertical-align:-.125em;width:1.125em'
-                                 xmlns='http://www.w3.org/2000/svg' viewBox='0 0 576 512'>
-                                <path fill='currentColor'
-                                      d='M573 241C518 136 411 64 288 64S58 136 3 241a32 32 0 000 30c55 105 162 177 285 177s230-72 285-177a32 32 0 000-30zM288 400a144 144 0 11144-144 144 144 0 01-144 144zm0-240a95 95 0 00-25 4 48 48 0 01-67 67 96 96 0 1092-71z'></path>
-                            </svg>
-                        </a>
-<a href='/secure/reports/reports/update?id=\${report['id']}' title='Редактировать'
-                                aria-label='Редактировать'
-                                data-pjax='0'>
-                            <svg aria-hidden='true'
-                                 style='display:inline-block;font-size:inherit;height:1em;overflow:visible;vertical-align:-.125em;width:1em'
-                                 xmlns='http://www.w3.org/2000/svg' viewBox='0 0 512 512'>
-                                <path fill='currentColor'
-                                      d='M498 142l-46 46c-5 5-13 5-17 0L324 77c-5-5-5-12 0-17l46-46c19-19 49-19 68 0l60 60c19 19 19 49 0 68zm-214-42L22 362 0 484c-3 16 12 30 28 28l122-22 262-262c5-5 5-13 0-17L301 100c-4-5-12-5-17 0zM124 340c-5-6-5-14 0-20l154-154c6-5 14-5 20 0s5 14 0 20L144 340c-6 5-14 5-20 0zm-36 84h48v36l-64 12-32-31 12-65h36v48z'></path>
-                            </svg>
-                        </a>
-<a href='/secure/reports/reports/delete?id=\${report['id']}' title='Удалить' aria-label='Удалить'
-                                data-pjax='0'
-                                data-confirm='Вы уверены, что хотите удалить этот элемент?' data-method='post'>
-                            <svg aria-hidden='true'
-                                 style='display:inline-block;font-size:inherit;height:1em;overflow:visible;vertical-align:-.125em;width:.875em'
-                                 xmlns='http://www.w3.org/2000/svg' viewBox='0 0 448 512'>
-                                <path fill='currentColor'
-                                      d='M32 464a48 48 0 0048 48h288a48 48 0 0048-48V128H32zm272-256a16 16 0 0132 0v224a16 16 0 01-32 0zm-96 0a16 16 0 0132 0v224a16 16 0 01-32 0zm-96 0a16 16 0 0132 0v224a16 16 0 01-32 0zM432 32H312l-9-19a24 24 0 00-22-13H167a24 24 0 00-22 13l-9 19H16A16 16 0 000 48v32a16 16 0 0016 16h416a16 16 0 0016-16V48a16 16 0 00-16-16z'></path>
-                            </svg>
-                        </a></td>
-`;
+                    \${CalendarHelper._getActionColumn(`/secure/reports/reports`, report['id'])}`;
             }
         }
         if (j == 0) {
             return 'За этот день не было отчетов';
         }
-
-
         return html;
     }"
 ]) ?>
-
-
-
-
-