From 56d7afe055574bfc64ae156a8befe4264940de38 Mon Sep 17 00:00:00 2001
From: maxim <makss.web@gmail.com>
Date: Mon, 6 Sep 2021 10:29:50 +0300
Subject: [PATCH 1/6] =?UTF-8?q?=D0=BD=D0=B5=20=D1=80=D0=B0=D0=B1=D0=BE?=
 =?UTF-8?q?=D1=82=D0=B0=D0=B5=D1=82=20=D0=BE=D0=BE=D0=BF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../modules/card/models/UserCardSearch.php    |    2 +-
 .../reports/controllers/AjaxController.php    |   42 +
 .../reports/controllers/ReportsController.php |   32 +
 backend/modules/reports/models/Month.php      |  101 +
 .../modules/reports/models/ReportsSearch.php  |   32 +-
 .../modules/reports/views/reports/index.php   |  128 +-
 .../modules/reports/views/reports/user.php    |  877 ++++++
 .../modules/reports/views/reports/view.php    |    2 +-
 backend/views/layouts/main.php                |    2 +
 backend/web/css/site.css                      |    3 +
 backend/web/js/site.js                        |    2 +
 composer.lock                                 | 2434 +++++++++++++----
 .../card/controllers/UserCardController.php   |    3 +-
 .../reports/controllers/ReportsController.php |    2 +-
 14 files changed, 3059 insertions(+), 603 deletions(-)
 create mode 100644 backend/modules/reports/controllers/AjaxController.php
 create mode 100644 backend/modules/reports/models/Month.php
 create mode 100644 backend/modules/reports/views/reports/user.php

diff --git a/backend/modules/card/models/UserCardSearch.php b/backend/modules/card/models/UserCardSearch.php
index a459119..cb6676b 100755
--- a/backend/modules/card/models/UserCardSearch.php
+++ b/backend/modules/card/models/UserCardSearch.php
@@ -85,7 +85,7 @@ class UserCardSearch extends UserCard
 
         $query->orderBy('user_card.updated_at DESC');
 
-        $query->groupBy('card_skill.card_id');
+//        $query->groupBy('card_skill.card_id');
 
         $sumQuery = clone $query;
 
diff --git a/backend/modules/reports/controllers/AjaxController.php b/backend/modules/reports/controllers/AjaxController.php
new file mode 100644
index 0000000..87ad13f
--- /dev/null
+++ b/backend/modules/reports/controllers/AjaxController.php
@@ -0,0 +1,42 @@
+<?php
+
+namespace backend\modules\reports\controllers;
+
+use backend\modules\reports\models\Month;
+use common\classes\Debug;
+use Yii;
+use backend\modules\reports\models\ReportsSearch;
+use yii\web\JsonResponseFormatter;
+use yii\web\Response;
+
+class AjaxController extends \yii\web\Controller
+{
+    public function actionGetReportsForMonthByIdYearMonth($id, $year=null, $month=null){
+        if (!($year and $month)){
+            $searchModel->month = date('m');
+            $searchModel->year = date('Y');
+            Debug::prn('Неверный год или месяц');
+        }
+
+        $searchModel = new ReportsSearch();
+        $searchModel->id = $id;
+        $searchModel->month = $month;
+        $searchModel->year = $year;
+
+        $dataProvider = $searchModel->search(Yii::$app->request->queryParams);
+
+        $reports = ['reports'=>array_column($dataProvider->getModels(), 'attributes')];
+        $month = new Month($year.'-'.$month.'-01');
+
+
+        $response = Yii::$app->response;
+
+        $response->format = Response::FORMAT_JSON;
+
+        $response->content = json_encode(array_merge($reports,
+            ['month'=>(array)$month]));
+        $response->getHeaders()->set('Content-Type', 'application/json; charset=utf-8');
+
+        return $response;
+    }
+}
\ No newline at end of file
diff --git a/backend/modules/reports/controllers/ReportsController.php b/backend/modules/reports/controllers/ReportsController.php
index 741d549..01bc53a 100644
--- a/backend/modules/reports/controllers/ReportsController.php
+++ b/backend/modules/reports/controllers/ReportsController.php
@@ -3,14 +3,17 @@
 namespace backend\modules\reports\controllers;
 
 use backend\modules\card\models\UserCardSearch;
+use backend\modules\reports\models\Month;
 use common\classes\Debug;
 use Yii;
 use common\models\Reports;
 use backend\modules\reports\models\ReportsSearch;
+use yii\base\Model;
 use yii\filters\AccessControl;
 use yii\web\Controller;
 use yii\web\NotFoundHttpException;
 use yii\filters\VerbFilter;
+use yii\web\Response;
 
 /**
  * ReportsController implements the CRUD actions for Reports model.
@@ -56,6 +59,34 @@ class ReportsController extends Controller
         ]);
     }
 
+
+    public function actionUser($id, $date = null)
+    {
+        if (!(isset($date) and preg_match("/^\d{4}\-(0[1-9]|1[012])\-(0[1-9]|[12][0-9]|3[01])$/", $date))) {
+//            Debug::dd('неверный формат даты');
+            $date = date('Y-m-01');
+        }
+        $date = date('Y-m-01', strtotime($date));
+
+        $searchModel = new ReportsSearch();
+        $searchModel->id = $id;
+        $dataProvider = $searchModel->search(Yii::$app->request->queryParams);
+
+        $reports = $dataProvider->getModels();
+//        Debug::dd($dataProvider);
+        $month = new Month($date);
+
+        if (!Yii::$app->request->isAjax) {
+            return $this->render('user', [
+                'ID' => $reports[0]->id,
+                'reports' => $reports,
+                'reports_month' => json_encode(array_merge(['reports'=>array_column($reports, 'attributes')],
+                    ['month'=>(array)$month])),
+                'date' => $date
+            ]);
+        }
+    }
+
     public function actionGroup()
     {
         $searchModel = new UserCardSearch();
@@ -65,6 +96,7 @@ class ReportsController extends Controller
         return $this->render('group', [
             'searchModel' => $searchModel,
             'dataProvider' => $dataProvider,
+
         ]);
     }
 
diff --git a/backend/modules/reports/models/Month.php b/backend/modules/reports/models/Month.php
new file mode 100644
index 0000000..7a5b0c1
--- /dev/null
+++ b/backend/modules/reports/models/Month.php
@@ -0,0 +1,101 @@
+<?php
+
+namespace backend\modules\reports\models;
+
+use common\classes\Debug;
+use yii\base\Model;
+use function GuzzleHttp\Psr7\str;
+
+class Month
+{
+
+    public $inactive_begin;
+    public $inactive_end;
+    public $active;
+    public $days;
+
+    public function __construct($date = null)
+    {
+//        $date = '2021-08-10';
+        $this->inactive_begin = [];
+        $this->inactive_end = [];
+//        Debug::prn($date);
+        if (!$date and !self::is_date($date)) {
+
+            $date = date('Y-m-d');
+            Debug::dd($date);
+        }
+//        Debug::dd($date);
+
+        $first_day_of_week = self::get_day_week(self::get_first_day($date));
+        $quantity_days = self::get_days_month($date);
+
+        $day = 1;
+
+        for (
+            $index = $first_day_of_week;
+            $index < $first_day_of_week + $quantity_days;
+            $index++, $day++
+        ) {
+            $this->active[$index] = $day;
+        }
+
+        $prev_month = date('Y-m-d', strtotime(self::get_first_day($date)) - 3600 * 37);
+
+        $day = self::get_days_month($prev_month);
+
+        for ($index = $first_day_of_week - 1; $index >= 1; $index--, $day--) {
+            $this->inactive_begin[$index] = $day;
+        }
+
+        $day = 1;
+        $index_end = ($first_day_of_week==7?42:35);
+        for ($index = $quantity_days + $first_day_of_week; $index <=$index_end; $index++, $day++) {
+            $this->inactive_end[$index] = $day;
+        }
+
+        $this->days = array_merge($this->inactive_end, $this->inactive_begin, $this->active);
+//        Debug::dd($this);
+
+    }
+
+    public static function next_day($date, $number)
+    {
+        return date('Y-m-d', strtotime($date) + 3600 * 24 * $number);
+    }
+
+    public static function get_first_day($date)
+    {
+        return date('Y-m-01', strtotime($date));
+    }
+
+    public static function get_day_week($date)
+    {
+        $day = date('w', strtotime(date($date)));
+        if($day==0)
+            return 7;
+        return $day;
+    }
+
+    public static function is_date($date)
+    {
+        $date = date_parse($date);
+        if ($date or checkdate($date['month'], $date['day'], $date['year']))
+            return true;
+        return false;
+    }
+
+
+    public static function get_days_month($date)
+    {
+        return date("t", strtotime($date));
+    }
+
+
+    public function a()
+    {
+//        $a = date('w', strtotime(date('')))
+    }
+
+
+}
\ No newline at end of file
diff --git a/backend/modules/reports/models/ReportsSearch.php b/backend/modules/reports/models/ReportsSearch.php
index edd2311..cad4c68 100644
--- a/backend/modules/reports/models/ReportsSearch.php
+++ b/backend/modules/reports/models/ReportsSearch.php
@@ -2,16 +2,21 @@
 
 namespace backend\modules\reports\models;
 
+use common\classes\Debug;
 use yii\base\Model;
 use yii\data\ActiveDataProvider;
 use common\models\Reports;
 
+
 /**
  * ReportsSearch represents the model behind the search form of `common\models\Reports`.
  */
 class ReportsSearch extends Reports
 {
     public $fio;
+    public $month;
+    public $year;
+
     /**
      * {@inheritdoc}
      */
@@ -57,23 +62,36 @@ class ReportsSearch extends Reports
 
         $this->load($params);
 
-        if (!$this->validate()) {
-            // uncomment the following line if you do not want to return any records when validation fails
-            // $query->where('0=1');
-            return $dataProvider;
+
+        if (isset($params['date']) and preg_match("/^\d{4}\-(0[1-9]|1[012])\-(0[1-9]|[12][0-9]|3[01])$/", $params['date']) and !isset($params['id'])) {
+            $this->created_at = $params['date'];
         }
 
+//        if (!$this->validate()) {
+//            // uncomment the following line if you do not want to return any records when validation fails
+//            // $query->where('0=1');
+//
+//            return $dataProvider;
+//        }
+
         // grid filtering conditions
+
+
+//        Debug::dd($params['date']);
+
         $query->andFilterWhere([
-            'id' => $this->id,
-            'created_at' => $this->created_at,
+            'user_card.id' => $this->id,
+            'reports.created_at' => $this->created_at,
             'user_card_id' => $this->user_card_id,
         ]);
 
         $query->andFilterWhere(['like', 'today', $this->today])
             ->andFilterWhere(['like', 'difficulties', $this->difficulties])
             ->andFilterWhere(['like', 'tomorrow', $this->tomorrow])
-            ->andFilterWhere(['like', 'user_card.fio', $this->fio]);
+            ->andFilterWhere(['like', 'user_card.fio', $this->fio])
+            ->andFilterWhere(['=', 'YEAR(reports.created_at)', $this->year])
+            ->andFilterWhere(['=', 'MONTH(reports.created_at)', $this->month]);
+
 
         return $dataProvider;
     }
diff --git a/backend/modules/reports/views/reports/index.php b/backend/modules/reports/views/reports/index.php
index 88d4d27..8728f83 100644
--- a/backend/modules/reports/views/reports/index.php
+++ b/backend/modules/reports/views/reports/index.php
@@ -9,48 +9,108 @@ use yii\grid\GridView;
 
 $this->title = 'Отчеты';
 $this->params['breadcrumbs'][] = $this->title;
+
+define('TODAY', date('Y-m-d'));
+define('WEEK_AGO', date('Y-m-d', time() - 3600 * 24 * 7));
+function next_day($date, $number)
+{
+    return date('Y-m-d', strtotime($date) + 3600 * 24 * $number);
+}
+
 ?>
 <div class="reports-index">
 
-    <?php // echo $this->render('_search', ['model' => $searchModel]); ?>
-
     <p>
         <?= Html::a('Добавить', ['create'], ['class' => 'btn btn-success']) ?>
         <?= Html::a('Сгрупированный по пользователям вид', ['group'], ['class' => 'btn btn-success']) ?>
     </p>
+    <p>
+        <?php for ($date = TODAY; $date != WEEK_AGO; $date = next_day($date, -1)): ?>
+                <?= Html::a($date, ['reports/?date=' . $date], ['class' => 'btn btn-primary']) ?>
+        <?php endfor; ?></div>
+<div class="row">
+    <div class="col-xs-6">
 
-    <?= GridView::widget([
-        'dataProvider' => $dataProvider,
-        'filterModel' => $searchModel,
-        'columns' => [
-            ['class' => 'yii\grid\SerialColumn'],
+        <form method="get" style="display: inline-flex;">
 
-            'created_at',
-            [
-                'attribute' => 'today',
-                'format' => 'raw',
-                'value' => function ($model) {
-                    $text = '';
-                    if ($model->task) {
-                        $i = 1;
-                        foreach ($model->task as $task) {
-                            $text .= "<p>$i. ($task->hours_spent ч.) $task->task</p>";
-                            $i++;
-                        }
-                    }
-                    return $text;
-                }
-            ],
-            'difficulties',
-            'tomorrow',
-            [
-                'format' => 'raw',
-                'attribute' => 'ФИО',
-                'filter' => Html::activeTextInput($searchModel, 'fio', ['class' => 'form-control']),
-                'value' => function ($data) { return \common\models\Reports::getFio($data); },
-            ],
+            <?= Html::input('date', 'date', isset($_GET['date']) ? $_GET['date'] : date('Y-m-d'), [
+                'class' => 'form-control',
+                'style' => 'display:',
+                'id' => 'date'
+
+            ]) ?>
+
+            <?= Html::button('Сортировка по дате', ['class' => 'btn btn-danger sort_by_date', 'type' => 'submit']) ?>
+
+            <?= Html::a('Все дни', ['index'], ['class' => 'btn btn-dark']) ?>
+
+
+        </form>
+    </div>
 
-            ['class' => 'yii\grid\ActionColumn'],
-        ],
-    ]); ?>
 </div>
+<!--    <div class="row" style="margin: 10px 0px 0 5px">-->
+</p>
+<?php
+//echo '<pre>';
+//var_dump($dataProvider);
+//echo '</pre>';?>
+<?= GridView::widget([
+    'dataProvider' => $dataProvider,
+    'filterModel' => $searchModel,
+
+    'columns' => [
+        ['class' => 'yii\grid\SerialColumn'],
+
+        'created_at',
+        [
+            'attribute' => 'today',
+            'format' => 'raw',
+            'value' => function ($model) {
+
+                $text = '';
+                if ($model->task) {
+                    $i = 1;
+                    foreach ($model->task as $task) {
+                        $text .= "<p>$i. ($task->hours_spent ч.) $task->task</p>";
+                        $i++;
+                    }
+                }
+                return $text;
+            }
+        ],
+        'difficulties',
+        'tomorrow',
+        [
+            'format' => 'raw',
+            'attribute' => 'ФИО',
+            'filter' => Html::activeTextInput($searchModel, 'fio', ['class' => 'form-control']),
+            'value' => function ($data) {
+                return '<a href="./reports/user?id='.$data['user_card_id'].'">' . \common\models\Reports::getFio($data) . '</a>';
+            },
+        ],
+
+        ['class' => 'yii\grid\ActionColumn'],
+    ],
+]);
+$this->registerCssFile('../../css/site.css');
+?>
+
+
+</div>
+
+<script>
+    // let date = document.querySelector('#date')
+    //     date.onchange = function (){
+    //     window.location.replace(`./?date=${date.value}`);
+    // }
+</script>
+<style>
+    .row * {
+        margin-right: 10px;
+    }
+
+    .row {
+        margin-left: 1px;
+    }
+</style>
\ No newline at end of file
diff --git a/backend/modules/reports/views/reports/user.php b/backend/modules/reports/views/reports/user.php
new file mode 100644
index 0000000..ebd161d
--- /dev/null
+++ b/backend/modules/reports/views/reports/user.php
@@ -0,0 +1,877 @@
+<?php
+
+use backend\modules\reports\models\ReportsSearch;
+use kartik\grid\GridView;
+use yii\data\Pagination;
+use yii\helpers\Html;
+use common\models\Reports;
+use  \common\classes\Debug;
+use backend\modules\reports\models\Month;
+
+
+/* @var $this yii\web\View */
+/* @var $searchModel backend\modules\reports\models\ReportsSearch */
+/* @var $dataProvider yii\data\ActiveDataProvider */
+/* @var $reports common\models\Reports */
+/* @var $ID */
+
+
+$month = new Month($date);
+$index_raw = 0;
+
+function next_day($date, $number)
+{
+    return date('Y-m-d', strtotime($date) + 3600 * 24 * $number);
+}
+
+function get_dates_created_at(Reports $report)
+{
+    return $report->created_at;
+}
+
+function get_color($date, $dates_created_at)
+{
+    if (in_array(Month::get_day_week($date), array(6, 7)))
+        return;
+    if (in_array($date, $dates_created_at)) {
+        return 'success';
+    } else
+        return 'danger';
+}
+
+$this->title = 'Календарь пользователя - ' . Reports::getFio($reports[0]);
+$dates_created_at = array_unique(array_map('get_dates_created_at', $reports));
+
+//for ($date = '2021-08-01', $i = 0; $date != '2021-09-01'; $date = next_day($date, 1), $i++) {
+//    if ($i == 7) {
+//        echo '<div>';
+//        $i = 0;
+//    }
+//    if (in_array($date, $dates_created_at)) {
+//        $color = 'primary';
+//    } else
+//        $color = 'danger';
+//    echo Html::a($date, ['reports/?date=' . $date], ['class' => 'btn btn-' . $color . '',
+//        'style' => 'margin: 10px;']);
+//
+//}
+//
+
+//
+//?>
+<?= Html::csrfMetaTags() ?>
+<section class="calendar-contain">
+
+
+    <aside class="calendar__sidebar">
+        <section class="title-bar">
+            <?= Html::input('date', 'date', isset($_GET['date']) ? $_GET['date'] : date('Y-m-d'), [
+                'class' => 'form-control',
+                'style' => 'display:',
+                'id' => 'date',
+            ]) ?>
+
+        </section>
+        <h2 class="sidebar__heading"><?= date('l') ?><br><?= date('F d') ?></h2>
+        <ul class="sidebar__list">
+            <table class="table table-striped table-bordered">
+                <thead>
+                <tr>
+                    <th>ID</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 class="action-column">&nbsp;</th>
+                </tr>
+                </thead>
+                <tbody>
+                <tr data-key="4">
+                    <td>1</td>
+                    <td><p>1. (1 ч.) asd</p></td>
+                    <td></td>
+                    <td></td>
+                    <td><a href="/secure/reports/reports/view?id=4" 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=4" 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=4" 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>
+                </tr>
+                <tr data-key="9">
+                    <td>2</td>
+                    <td><p>1. (23 ч.) asdasd</p></td>
+                    <td></td>
+                    <td></td>
+                    <td><a href="/secure/reports/reports/view?id=9" 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">
+                            </svg>
+                        </a> <a href="/secure/reports/reports/update?id=9" 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">
+                            </svg>
+                        </a> <a href="/secure/reports/reports/delete?id=9" 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">
+                            </svg>
+                        </a></td>
+                </tr>
+                </tbody>
+            </table>
+        </ul>
+    </aside>
+
+
+    <section class="calendar__days">
+        <!--        <section class="calendar__top-bar">-->
+        <!--            <span class="top-bar__days">Mon</span>-->
+        <!--            <span class="top-bar__days">Tue</span>-->
+        <!--            <span class="top-bar__days">Wed</span>-->
+        <!--            <span class="top-bar__days">Thu</span>-->
+        <!--            <span class="top-bar__days">Fri</span>-->
+        <!--            <span class="top-bar__days">Sat</span>-->
+        <!--            <span class="top-bar__days">Sun</span>-->
+        <!--        </section>-->
+        <!---->
+        <!--        --><?php
+        //        $index = 1;
+        //        if (count($month->inactive_begin)) {
+        //            echo '<section class="calendar__week">';
+        //
+        //            for ($index = 1; $index <= count($month->inactive_begin); $index++, $index_raw++)
+        //                echo '                <div class="calendar__day inactive">
+        //
+        //                    <span class="calendar__date">' . $month->inactive_begin[$index] . '</span>
+        //                </div>';
+        //        }
+        //        for (; $index <= array_key_last($month->active); $index++, $index_raw++) {
+        //
+        //            if ($index_raw % 7 == 0) {
+        //                if ($index != 1) echo '</section>';
+        //                echo '<section class="calendar__week">
+        //        ';
+        //            }
+        //            echo '
+        //        <div class="calendar__day">
+        //                    <span class="calendar__date ' . get_color(date('Y-m-' . $month->active[$index], strtotime($date)), $dates_created_at) . '">
+        //                        ' . $month->active[$index] . '
+        //        </span>
+        //        </div>
+        //        ';
+        //        }
+        //        ?>
+        <!--        --><?php //for (; $index <= array_key_last($month->inactive_end); $index++, $index_raw++): ?>
+        <!--            --><?php //if ($index_raw % 7 == 0)
+        //                echo '
+        //                </section>
+        //        <section class="calendar__week ">
+        //        ';
+        //            ?>
+        <!--            <div class="calendar__day inactive">-->
+        <!--                <span class="calendar__date "><? //= $month->inactive_end[$index] ?><!--</span>-->
+        <!--            </div>-->
+        <!--        --><?php //endfor; ?>
+    </section>
+
+</section>
+<script>
+
+    class CalendarBuilder {
+
+        constructor(month, reports, innerElem, datePicker, before = '') {
+            this.month = month;
+            this.Elem = innerElem;
+            this.reports = reports;
+            this.before = before;
+            this.datePicker = datePicker;
+
+            this.nameDate = document.querySelector('.sidebar__heading');
+
+            this.initBefore();
+        }
+
+        build() {
+            this.getInactiveBegin();
+            this.getActive();
+            this.getInactiveEnd();
+            this.loadInElem();
+
+            this.initAfter();
+            let rep = this.loadMonthReports();
+            console.log(rep)
+            console.log(123)
+            // this.activeButtonsDays();
+
+        }
+
+        update(month, reports = null) {
+            this.month = month;
+            this.reports = reports;
+
+            this.initBefore();
+
+            this.build();
+        }
+
+        initBefore() {
+            this.html = '';
+            this.index = 1;
+            this.indexRaw = 0;
+            this.classDay = 'calendar__day';
+            this.date = document.querySelector('#date').value.substr(0, 7);
+        }
+
+        initAfter() {
+            this.days = document.querySelectorAll('.calendar__day');
+        }
+
+        loadInElem() {
+            this.Elem.innerHTML = this.before + this.html;
+        }
+
+        activeButtonsDays() {
+            // console.log(this.days);
+            for (let i = 0; i < Object.keys(this.days).length; i++) {
+                // if (this.days[i].querySelector('.calendar__date.inactive')) {
+                //     this.clickInactive(this.days[i])''
+                // } else
+                console.log(this.days[i])
+                console.log(i)
+                this.days[i].dayOnClick = this.dayOnClick;
+                this.days[i].changeDateFutureOrPast = this.changeDateFutureOrPast;
+                this.days[i].nameDate = this.nameDate;
+                this.days[i].datePicker = this.datePicker;
+                this.days[i].IntToDate = this.IntToDate;
+                this.days[i].loadMonthReports = this.loadMonthReports;
+                this.days[i].update = this.update;
+
+                this.days[i].onclick = function () {
+                    this.dayOnClick(this)
+                };
+            }
+
+        }
+
+        dayOnClick(day) {
+            // console.log(day)
+            // alert(parseInt(days[i].textContent))
+            let number_date = parseInt(day.textContent);
+            number_date = this.IntToDate(number_date);
+
+            if (day.classList.contains('inactive')) {
+                this.changeDateFutureOrPast(number_date);
+            } else {
+                this.datePicker.value = this.datePicker.value.substr(0, 8) + number_date;
+
+
+                let date = new Date(this.datePicker.value);
+                let monthName = date.toLocaleString('default', {month: 'long'});
+                let dayWeekName = date.toLocaleString('default', {weekday: 'long'});
+
+                console.log(this.nameDate)
+                this.nameDate.innerHTML = dayWeekName + '<br>' + monthName + ' ' + date.toString().split(' ')[2];
+            }
+
+        }
+
+        changeDateFutureOrPast(number_date) {
+            let date = new Date(this.datePicker.value);
+            if (parseInt(this.textContent) <= 7) {
+                if (date.getMonth() == 11) {
+                    date = new Date(date.getFullYear() + 1, 0, 1);
+                } else {
+                    date = new Date(date.getFullYear(), date.getMonth() + 1, number_date);
+                }
+                // console.log(date.getFullYear() + '-' + (parseInt(date.getMonth())+1) + '-' + number_date)
+                // datePicker.value = date.toISOString().substring(0, 10);
+            } else {
+                if (date.getMonth() == 0) {
+                    date = new Date(date.getFullYear() - 1, 11, 1);
+                } else {
+                    date = new Date(date.getFullYear(), date.getMonth() - 1, 1);
+                }
+                // console.log(date.getFullYear() + '-' + (parseInt(date.getMonth())+1) + '-' + number_date)
+                // datePicker.value = date.getFullYear() + '-' + date.getMonth() + '-' + number_date
+            }
+            console.log(this)
+            this.loadMonthReports()
+                .then(function (reports_month) {
+                    console.log(reports_month)
+                    let reports = (JSON.parse(reports_month))[0]['reports']
+                    let month = (JSON.parse(reports_month))[0]['month']
+
+                    reports_month[1](month, reports);
+                })
+            this.datePicker.value = date.getFullYear() + '-' + this.IntToDate(parseInt(date.getMonth()) + 1) + '-' + number_date
+
+        }
+
+        IntToDate(number_date) {
+            if (Math.floor(number_date / 10) === 0)
+                number_date = '0' + number_date;
+            return number_date
+        }
+
+        getInactiveBegin() {
+            if (Object.keys(this.month['inactive_begin']).length > 0) {
+                this.html += '<section class="calendar__week">';
+
+                for (; this.index <= Object.keys(this.month['inactive_begin']).length; this.index++, this.indexRaw++) {
+                    this.html += this.getCalendarDay('inactive_begin', 'inactive');
+                }
+            }
+        }
+
+        getActive() {
+            for (; this.index <= this.getLastKey(this.month['active']); this.index++, this.indexRaw++) {
+                if (this.indexRaw % 7 == 0) {
+                    if (this.index != 1) {
+                        this.html += '</section>';
+                    }
+                    this.html += '<section class="calendar__week">';
+                }
+                this.html += this.getCalendarDay('active')
+            }
+        }
+
+        getInactiveEnd() {
+            for (; this.index <= this.getLastKey(this.month['inactive_end']); this.index++, this.indexRaw++) {
+                if (this.indexRaw % 7 == 0) {
+                    this.html += `</section>
+                            <section class="calendar__week ">`;
+                }
+                this.html += this.getCalendarDay('inactive_end', 'inactive');
+            }
+        }
+
+        getCalendarDay(type, className = '') {
+            return `<div class="${this.classDay} ${className}">
+                <span class="calendar__date ${this.getColor(this.date + '-' + this.month[type][this.index])}">${this.month[type][this.index]}</span>
+            </div>`;
+        }
+
+        getColor(date) {
+            let d = new Date(date)
+            if ([6, 0].includes(d.getDay()))
+                return;
+            for (let i in this.reports) {
+                if (this.reports[i]['created_at'] == date) {
+                    return 'success';
+                }
+            }
+            return 'danger';
+        }
+
+        getLastKey(obj) {
+            return Object.keys(obj)[Object.keys(obj).length - 1];
+        }
+
+        async loadMonthReports() {
+            let datePicker = this.datePicker;
+            let makeRequest = function () {
+                return new Promise(function (resolve, reject) {
+                    let monthNumber = datePicker.value.substr(5, 2);
+                    let yearNumber = datePicker.value.substr(0, 4);
+                    let req = new XMLHttpRequest();
+                    req.open('get', '../ajax/get-reports-for-month-by-id-year-month?id=<?=$ID?>' +
+                        '&month=' + monthNumber +
+                        '&year=' + yearNumber
+                    )
+                    ;
+                    req.setRequestHeader('Content-type', 'application/json');
+                    req.onload = function () {
+                        if (this.status >= 200 && this.status < 300) {
+                            let response = [req.response, this.update]
+
+                            resolve(response);
+                        }
+
+                    };
+                    req.send();
+                })
+            }
+            return await makeRequest();
+        }
+
+    }
+
+
+    const CALENDAR_BAR = `<section class="calendar__top-bar">
+        <span class="top-bar__days">Mon</span>
+    <span class="top-bar__days">Tue</span>
+    <span class="top-bar__days">Wed</span>
+    <span class="top-bar__days">Thu</span>
+    <span class="top-bar__days">Fri</span>
+    <span class="top-bar__days">Sat</span>
+    <span class="top-bar__days">Sun</span>
+    </section>`;
+
+    let reports = (JSON.parse('<?=$reports_month?>'))['reports']
+    let month = (JSON.parse('<?=$reports_month?>'))['month']
+    let datePicker = document.querySelector('#date');
+
+    let calendarBuilder = new CalendarBuilder(
+        month, reports, document.querySelector('.calendar__days'), datePicker, CALENDAR_BAR);
+    calendarBuilder.build()
+
+    let days = document.querySelectorAll('.calendar__day');
+
+
+    let oldDate = datePicker.value.substr(0, 7);
+
+    datePicker.onchange = function () {
+        console.log(this.value)
+        if (!isOldDatePicker(datePicker, oldDate)) {
+            oldDate = datePicker.value.substr(0, 7);
+
+            get_reports_ajax(datePicker)
+                .then(function (reports_month) {
+                    let reports = (JSON.parse(reports_month))['reports']
+                    let month = (JSON.parse(reports_month))['month']
+                    calendarBuilder.update(month, reports);
+                })
+        }
+    }
+
+
+    let nameDate = document.querySelector('.sidebar__heading');
+
+    function isOldDatePicker(datePicker, oldDate) {
+        if (datePicker.value.substr(0, 7) == oldDate)
+            return true;
+        return false
+    }
+
+
+    function get_reports_ajax(datePicker) {
+        return new Promise(function (resolve, reject) {
+            let monthNumber = datePicker.value.substr(5, 2);
+            let yearNumber = datePicker.value.substr(0, 4);
+            let req = new XMLHttpRequest();
+            req.open('get', '../ajax/get-reports-for-month-by-id-year-month?id=<?=$ID?>' +
+                '&month=' + monthNumber +
+                '&year=' + yearNumber
+            );
+            req.setRequestHeader('Content-type', 'application/json');
+            req.onload = function () {
+                if (this.status >= 200 && this.status < 300) {
+                    resolve(req.response);
+                }
+
+            };
+            req.send();
+        })
+    }
+
+
+</script>
+
+<style>
+
+    .calendar-contain {
+        position: relative;
+        left: 0;
+        right: 0;
+        border-radius: 0;
+        width: 100%;
+        overflow: hidden;
+        max-width: 1920px;
+        min-width: 450px;
+        margin: 1rem auto;
+        background-color: #f5f7f6;
+        box-shadow: 5px 5px 72px rgba(30, 46, 50, 0.5);
+        color: #040605;
+    }
+
+    @media screen and (min-width: 55em) {
+        .calendar-contain {
+            margin: auto;
+            top: 5%;
+        }
+    }
+
+    .title-bar {
+        position: relative;
+        width: 100%;
+        display: table;
+        text-align: right;
+        background: #f5f7f6;
+        padding: 0.5rem;
+        margin-bottom: 0;
+    }
+
+    .title-bar:after {
+        display: table;
+        clear: both;
+    }
+
+    .title-bar__burger {
+        display: block;
+        position: relative;
+        float: left;
+        overflow: hidden;
+        margin: 0;
+        padding: 0;
+        width: 38px;
+        height: 30px;
+        font-size: 0;
+        text-indent: -9999px;
+        appearance: none;
+        box-shadow: none;
+        border: none;
+        cursor: pointer;
+        background: none;
+    }
+
+    .title-bar__burger:focus {
+        outline: none;
+    }
+
+    .burger__lines {
+        display: block;
+        position: absolute;
+        width: 18px;
+        top: 15px;
+        left: 0;
+        right: 0;
+        margin: auto;
+        height: 1px;
+        background: #040605;
+    }
+
+    .burger__lines:before, .burger__lines:after {
+        position: absolute;
+        display: block;
+        left: 0;
+        width: 100%;
+        height: 1px;
+        background-color: #040605;
+        content: "";
+    }
+
+    .burger__lines:before {
+        top: -5px;
+    }
+
+    .burger__lines:after {
+        bottom: -5px;
+    }
+
+    .title-bar__year {
+        display: block;
+        position: relative;
+        float: left;
+        font-size: 1rem;
+        line-height: 30px;
+        width: 43%;
+        padding: 0 0.5rem;
+        text-align: left;
+    }
+
+    @media screen and (min-width: 55em) {
+        .title-bar__year {
+            width: 27%;
+        }
+    }
+
+    .title-bar__month {
+        position: relative;
+        /*float: center;*/
+        font-size: 1rem;
+        line-height: 30px;
+        width: 22%;
+        padding: 0 0.5rem;
+        text-align: center;
+        margin-right: 67px;
+        word-spacing: 30px;
+    }
+
+    @media screen and (min-width: 55em) {
+        .title-bar__month {
+            width: 12%;
+        }
+    }
+
+    .title-bar__minimize, .title-bar__maximize, .title-bar__close {
+        position: relative;
+        float: left;
+        width: 34px;
+        height: 34px;
+    }
+
+    .title-bar__minimize:before, .title-bar__maximize:before, .title-bar__close:before, .title-bar__minimize:after, .title-bar__maximize:after, .title-bar__close:after {
+        top: 30%;
+        right: 30%;
+        bottom: 30%;
+        left: 30%;
+        content: " ";
+        position: absolute;
+        border-color: #8e8e8e;
+        border-style: solid;
+        border-width: 0 0 2px 0;
+    }
+
+    .title-bar .title-bar__controls {
+        display: inline-block;
+        vertical-align: top;
+        position: relative;
+        float: right;
+        width: auto;
+    }
+
+    .title-bar .title-bar__controls:before, .title-bar .title-bar__controls:after {
+        content: none;
+    }
+
+    .title-bar .title-bar__minimize:before {
+        border-bottom-width: 2px;
+    }
+
+    .title-bar .title-bar__maximize:before {
+        border-width: 1px 1px 2px 1px;
+    }
+
+    .title-bar .title-bar__close:before, .title-bar .title-bar__close:after {
+        bottom: 50%;
+        top: 49.9%;
+    }
+
+    .title-bar .title-bar__close:before {
+        transform: rotate(45deg);
+    }
+
+    .title-bar .title-bar__close:after {
+        transform: rotate(-45deg);
+    }
+
+    .calendar__sidebar {
+        width: 100%;
+        margin: 0 auto;
+        float: none;
+        background: linear-gradient(120deg, #eff3f3, #e1e7e8);
+        padding-bottom: 0.7rem;
+    }
+
+    @media screen and (min-width: 55em) {
+        .calendar__sidebar {
+            position: absolute;
+            height: 100%;
+            width: 50%;
+            float: left;
+            margin-bottom: 0;
+        }
+    }
+
+    .calendar__sidebar .content {
+        padding: 2rem 1.5rem 2rem 4rem;
+        color: #040605;
+    }
+
+    .sidebar__nav {
+        display: flex;
+        align-items: center;
+        justify-content: flex-start;
+        margin-bottom: 0.9rem;
+        padding: 0.7rem 1rem;
+        background-color: #f5f7f6;
+    }
+
+    .sidebar__nav-item {
+        display: inline-block;
+        width: 22px;
+        margin-right: 23px;
+        padding: 0;
+        opacity: 0.8;
+    }
+
+    .sidebar__list {
+        list-style: none;
+        margin: 0;
+        padding-left: 1rem;
+        padding-right: 1rem;
+    }
+
+    .sidebar__list-item {
+        margin: 1.2rem 0;
+        color: #2d4338;
+        font-weight: 100;
+        font-size: 1rem;
+    }
+
+    .list-item__time {
+        display: inline-block;
+        width: 60px;
+    }
+
+    @media screen and (min-width: 55em) {
+        .list-item__time {
+            margin-right: 2rem;
+        }
+    }
+
+    .sidebar__list-item--complete {
+        color: rgba(4, 6, 5, 0.3);
+    }
+
+    .sidebar__list-item--complete .list-item__time {
+        color: rgba(4, 6, 5, 0.3);
+    }
+
+    .sidebar__heading {
+        font-size: 2.2rem;
+        font-weight: bold;
+        padding-left: 1rem;
+        padding-right: 1rem;
+        margin-bottom: 3rem;
+        margin-top: 1rem;
+    }
+
+    .sidebar__heading span {
+        float: right;
+        font-weight: 300;
+    }
+
+    .calendar__heading-highlight {
+        color: #2d444a;
+        font-weight: 900;
+    }
+
+    .calendar__days {
+        display: flex;
+        flex-flow: column wrap;
+        align-items: stretch;
+        width: 100%;
+        float: none;
+        min-height: 580px;
+        height: 100%;
+        font-size: 12px;
+        /*padding: 0.8rem 0 1rem 1rem;*/
+        #b8cad6 background: #f5f7f6;
+    }
+
+    @media screen and (min-width: 55em) {
+        .calendar__days {
+            width: 50%;
+            float: right;
+        }
+    }
+
+    .calendar__top-bar {
+        background: #b8cad6;
+        text-align: center;
+        display: flex;
+        flex: 56px 0 0;
+    }
+
+    .top-bar__days {
+        width: 100%;
+        padding: 0 5px;
+        color: #2d4338;
+        font-weight: 100;
+        -webkit-font-smoothing: subpixel-antialiased;
+        font-size: 1rem;
+    }
+
+    .calendar__week {
+        display: flex;
+        flex: 1 1 0;
+    }
+
+    .calendar__day {
+        text-align: center;
+        display: flex;
+        flex-flow: column wrap;
+        justify-content: space-between;
+        width: 100%;
+        padding: 1.9rem 0.2rem 0.2rem;
+    }
+
+
+    .calendar__date {
+        color: #040605;
+        font-size: 1.7rem;
+        font-weight: 600;
+        line-height: 0.7;
+    }
+
+    @media screen and (min-width: 55em) {
+        .calendar__date {
+            font-size: 2.3rem;
+        }
+    }
+
+    .calendar__week .inactive .calendar__date, .calendar__week .inactive .task-count {
+        color: #c6c6c6;
+    }
+
+    .calendar__week .today .calendar__date {
+        color: #fd588a;
+    }
+
+    .calendar__task {
+        color: #040605;
+        display: flex;
+        font-size: 0.8rem;
+    }
+
+    @media screen and (min-width: 55em) {
+        .calendar__task {
+            font-size: 1rem;
+        }
+    }
+
+    .calendar__task.calendar__task--today {
+        color: #fd588a;
+    }
+
+
+    .danger {
+        color: red;
+    }
+
+    .success {
+        color: green;
+    }
+
+    .calendar__day:hover {
+        color: #0a0a0a;
+        background: #a6a6a6;
+        cursor: pointer;
+    }
+</style>
+
+
diff --git a/backend/modules/reports/views/reports/view.php b/backend/modules/reports/views/reports/view.php
index 7f9eeb5..8c07e30 100644
--- a/backend/modules/reports/views/reports/view.php
+++ b/backend/modules/reports/views/reports/view.php
@@ -49,7 +49,7 @@ $this->params['breadcrumbs'][] = $this->title;
 //            'user_card_id',
             [
                 'format' => 'raw',
-                'attribute' => 'ФИО',
+                'attribute' => 'asdФИО',
                 'value' => function ($data) {
                     return \common\models\Reports::getFio($data);
                 },
diff --git a/backend/views/layouts/main.php b/backend/views/layouts/main.php
index 329db7a..4887ecb 100755
--- a/backend/views/layouts/main.php
+++ b/backend/views/layouts/main.php
@@ -35,6 +35,8 @@ if (Yii::$app->controller->action->id === 'login') {
         <?= Html::csrfMetaTags() ?>
         <title><?= Html::encode($this->title) ?></title>
         <?php $this->head() ?>
+        <link rel="stylesheet" href="https://maxcdn.bootstrapcdn.com/bootstrap/4.0.0/css/bootstrap.min.css" integrity="sha384-Gn5384xqQ1aoWXA+058RXPxPg6fy4IWvTNh0E263XmFcJlSAwiGgFAW/dAiS6JXm" crossorigin="anonymous">
+        <script src="https://maxcdn.bootstrapcdn.com/bootstrap/4.0.0/js/bootstrap.min.js" integrity="sha384-JZR6Spejh4U02d8jOt6vLEHfe/JQGiRRSQQxSfFWpi1MquVdAyjUar5+76PVCmYl" crossorigin="anonymous"></script>
     </head>
     <body class="hold-transition skin-blue sidebar-mini">
     <?php $this->beginBody() ?>
diff --git a/backend/web/css/site.css b/backend/web/css/site.css
index a909de9..8ae72ae 100755
--- a/backend/web/css/site.css
+++ b/backend/web/css/site.css
@@ -1,3 +1,6 @@
+.body{
+    display: none;
+}
 .media__upload_img{
     margin-bottom: 10px;
     float: left;
diff --git a/backend/web/js/site.js b/backend/web/js/site.js
index e920667..9d1bdf4 100644
--- a/backend/web/js/site.js
+++ b/backend/web/js/site.js
@@ -1,3 +1,5 @@
+alert(123);
+
 $(function(){
     $('#options').change(function(){
         month = $('#options :selected').val();
diff --git a/composer.lock b/composer.lock
index a68307d..f7cf5ea 100755
--- a/composer.lock
+++ b/composer.lock
@@ -4,7 +4,7 @@
         "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
         "This file is @generated automatically"
     ],
-    "content-hash": "720b3677e423d8946aeb7857883c7328",
+    "content-hash": "2417dff8722801fc2d8a22b7c7278413",
     "packages": [
         {
             "name": "2amigos/yii2-file-upload-widget",
@@ -62,6 +62,10 @@
                 "yii 2",
                 "yii2"
             ],
+            "support": {
+                "issues": "https://github.com/2amigos/yii2-file-upload-widget/issues",
+                "source": "https://github.com/2amigos/yii2-file-upload-widget/tree/master"
+            },
             "time": "2018-09-06T19:15:49+00:00"
         },
         {
@@ -123,6 +127,10 @@
                 "yii 2",
                 "yii2"
             ],
+            "support": {
+                "issues": "https://github.com/2amigos/yii2-gallery-widget/issues",
+                "source": "https://github.com/2amigos/yii2-gallery-widget/tree/master"
+            },
             "time": "2017-09-09T16:01:44+00:00"
         },
         {
@@ -166,6 +174,10 @@
                 "theme",
                 "web"
             ],
+            "support": {
+                "issues": "https://github.com/almasaeed2010/AdminLTE/issues",
+                "source": "https://github.com/ColorlibHQ/AdminLTE/tree/v2.4.18"
+            },
             "time": "2019-08-29T08:20:20+00:00"
         },
         {
@@ -206,20 +218,24 @@
                 "extension",
                 "yii2"
             ],
+            "support": {
+                "issues": "https://github.com/asmoday74/yii2-ckeditor5/issues",
+                "source": "https://github.com/asmoday74/yii2-ckeditor5/tree/1.0.2"
+            },
             "time": "2019-09-24T20:23:27+00:00"
         },
         {
             "name": "bower-asset/blueimp-canvas-to-blob",
-            "version": "v3.16.0",
+            "version": "v3.28.0",
             "source": {
                 "type": "git",
                 "url": "git@github.com:blueimp/JavaScript-Canvas-to-Blob.git",
-                "reference": "eab2845ebb03c9667ea6ade002ceadbef071c060"
+                "reference": "e618f54e5be896042e5155b9126ebc90bbc55455"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/blueimp/JavaScript-Canvas-to-Blob/zipball/eab2845ebb03c9667ea6ade002ceadbef071c060",
-                "reference": "eab2845ebb03c9667ea6ade002ceadbef071c060"
+                "url": "https://api.github.com/repos/blueimp/JavaScript-Canvas-to-Blob/zipball/e618f54e5be896042e5155b9126ebc90bbc55455",
+                "reference": "e618f54e5be896042e5155b9126ebc90bbc55455"
             },
             "type": "bower-asset"
         },
@@ -264,31 +280,31 @@
         },
         {
             "name": "bower-asset/blueimp-load-image",
-            "version": "v2.24.0",
+            "version": "v5.14.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/blueimp/JavaScript-Load-Image.git",
-                "reference": "1196b4ce3c56f01cacf90fc5527b324ecccdf3b0"
+                "reference": "cb5e5d0736101894d22ab1094f2fede402a89be0"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/blueimp/JavaScript-Load-Image/zipball/1196b4ce3c56f01cacf90fc5527b324ecccdf3b0",
-                "reference": "1196b4ce3c56f01cacf90fc5527b324ecccdf3b0"
+                "url": "https://api.github.com/repos/blueimp/JavaScript-Load-Image/zipball/cb5e5d0736101894d22ab1094f2fede402a89be0",
+                "reference": "cb5e5d0736101894d22ab1094f2fede402a89be0"
             },
             "type": "bower-asset"
         },
         {
             "name": "bower-asset/blueimp-tmpl",
-            "version": "v3.13.0",
+            "version": "v3.19.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/blueimp/JavaScript-Templates.git",
-                "reference": "07b3dd455b971cf5d087fc86889fcadae48ab2fc"
+                "reference": "0d0e03882313cf1c192fb4b68c4c78ab7d7d8c7a"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/blueimp/JavaScript-Templates/zipball/07b3dd455b971cf5d087fc86889fcadae48ab2fc",
-                "reference": "07b3dd455b971cf5d087fc86889fcadae48ab2fc"
+                "url": "https://api.github.com/repos/blueimp/JavaScript-Templates/zipball/0d0e03882313cf1c192fb4b68c4c78ab7d7d8c7a",
+                "reference": "0d0e03882313cf1c192fb4b68c4c78ab7d7d8c7a"
             },
             "type": "bower-asset"
         },
@@ -336,16 +352,16 @@
         },
         {
             "name": "bower-asset/jquery",
-            "version": "3.4.1",
+            "version": "3.6.0",
             "source": {
                 "type": "git",
-                "url": "git@github.com:jquery/jquery-dist.git",
-                "reference": "15bc73803f76bc53b654b9fdbbbc096f56d7c03d"
+                "url": "https://github.com/jquery/jquery-dist.git",
+                "reference": "e786e3d9707ffd9b0dd330ca135b66344dcef85a"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/jquery/jquery-dist/zipball/15bc73803f76bc53b654b9fdbbbc096f56d7c03d",
-                "reference": "15bc73803f76bc53b654b9fdbbbc096f56d7c03d"
+                "url": "https://api.github.com/repos/jquery/jquery-dist/zipball/e786e3d9707ffd9b0dd330ca135b66344dcef85a",
+                "reference": "e786e3d9707ffd9b0dd330ca135b66344dcef85a"
             },
             "type": "bower-asset",
             "license": [
@@ -375,16 +391,16 @@
         },
         {
             "name": "bower-asset/moment",
-            "version": "2.24.0",
+            "version": "2.29.1",
             "source": {
                 "type": "git",
                 "url": "git@github.com:moment/moment.git",
-                "reference": "96d0d6791ab495859d09a868803d31a55c917de1"
+                "reference": "b7ec8e2ec068e03de4f832f28362675bb9e02261"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/moment/moment/zipball/96d0d6791ab495859d09a868803d31a55c917de1",
-                "reference": "96d0d6791ab495859d09a868803d31a55c917de1"
+                "url": "https://api.github.com/repos/moment/moment/zipball/b7ec8e2ec068e03de4f832f28362675bb9e02261",
+                "reference": "b7ec8e2ec068e03de4f832f28362675bb9e02261"
             },
             "type": "bower-asset",
             "license": [
@@ -418,7 +434,7 @@
             "version": "v1.3.2",
             "source": {
                 "type": "git",
-                "url": "https://github.com/bestiejs/punycode.js.git",
+                "url": "git@github.com:bestiejs/punycode.js.git",
                 "reference": "38c8d3131a82567bfef18da09f7f4db68c84f8a3"
             },
             "dist": {
@@ -507,6 +523,10 @@
                 "markdown",
                 "markdown-extra"
             ],
+            "support": {
+                "issues": "https://github.com/cebe/markdown/issues",
+                "source": "https://github.com/cebe/markdown"
+            },
             "time": "2018-03-26T11:24:36+00:00"
         },
         {
@@ -550,6 +570,11 @@
                 "gravatar",
                 "yii"
             ],
+            "support": {
+                "irc": "irc://irc.freenode.net/yii",
+                "issues": "https://github.com/cebe/yii2-gravatar/issues",
+                "source": "https://github.com/cebe/yii2-gravatar"
+            },
             "time": "2013-12-10T17:49:58+00:00"
         },
         {
@@ -610,24 +635,28 @@
                 "theme",
                 "yii2"
             ],
+            "support": {
+                "issues": "https://github.com/dmstr/yii2-adminlte-asset/issues",
+                "source": "https://github.com/dmstr/yii2-adminlte-asset/tree/master"
+            },
             "time": "2018-07-24T14:47:13+00:00"
         },
         {
             "name": "doctrine/lexer",
-            "version": "1.1.0",
+            "version": "1.2.1",
             "source": {
                 "type": "git",
                 "url": "https://github.com/doctrine/lexer.git",
-                "reference": "e17f069ede36f7534b95adec71910ed1b49c74ea"
+                "reference": "e864bbf5904cb8f5bb334f99209b48018522f042"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/doctrine/lexer/zipball/e17f069ede36f7534b95adec71910ed1b49c74ea",
-                "reference": "e17f069ede36f7534b95adec71910ed1b49c74ea",
+                "url": "https://api.github.com/repos/doctrine/lexer/zipball/e864bbf5904cb8f5bb334f99209b48018522f042",
+                "reference": "e864bbf5904cb8f5bb334f99209b48018522f042",
                 "shasum": ""
             },
             "require": {
-                "php": "^7.2"
+                "php": "^7.2 || ^8.0"
             },
             "require-dev": {
                 "doctrine/coding-standard": "^6.0",
@@ -637,7 +666,7 @@
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "1.1.x-dev"
+                    "dev-master": "1.2.x-dev"
                 }
             },
             "autoload": {
@@ -672,7 +701,25 @@
                 "parser",
                 "php"
             ],
-            "time": "2019-07-30T19:33:28+00:00"
+            "support": {
+                "issues": "https://github.com/doctrine/lexer/issues",
+                "source": "https://github.com/doctrine/lexer/tree/1.2.1"
+            },
+            "funding": [
+                {
+                    "url": "https://www.doctrine-project.org/sponsorship.html",
+                    "type": "custom"
+                },
+                {
+                    "url": "https://www.patreon.com/phpdoctrine",
+                    "type": "patreon"
+                },
+                {
+                    "url": "https://tidelift.com/funding/github/packagist/doctrine%2Flexer",
+                    "type": "tidelift"
+                }
+            ],
+            "time": "2020-05-25T17:44:05+00:00"
         },
         {
             "name": "edofre/yii2-fullcalendar-scheduler",
@@ -725,31 +772,35 @@
                 "javascript",
                 "scheduler"
             ],
+            "support": {
+                "issues": "https://github.com/Edofre/yii2-fullcalendar-scheduler/issues",
+                "source": "https://github.com/Edofre/yii2-fullcalendar-scheduler/tree/v1.1.12"
+            },
             "time": "2018-03-28T09:19:09+00:00"
         },
         {
             "name": "egulias/email-validator",
-            "version": "2.1.11",
+            "version": "3.1.1",
             "source": {
                 "type": "git",
                 "url": "https://github.com/egulias/EmailValidator.git",
-                "reference": "92dd169c32f6f55ba570c309d83f5209cefb5e23"
+                "reference": "c81f18a3efb941d8c4d2e025f6183b5c6d697307"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/egulias/EmailValidator/zipball/92dd169c32f6f55ba570c309d83f5209cefb5e23",
-                "reference": "92dd169c32f6f55ba570c309d83f5209cefb5e23",
+                "url": "https://api.github.com/repos/egulias/EmailValidator/zipball/c81f18a3efb941d8c4d2e025f6183b5c6d697307",
+                "reference": "c81f18a3efb941d8c4d2e025f6183b5c6d697307",
                 "shasum": ""
             },
             "require": {
-                "doctrine/lexer": "^1.0.1",
-                "php": ">= 5.5"
+                "doctrine/lexer": "^1.2",
+                "php": ">=7.2",
+                "symfony/polyfill-intl-idn": "^1.15"
             },
             "require-dev": {
-                "dominicsayers/isemail": "dev-master",
-                "phpunit/phpunit": "^4.8.35||^5.7||^6.0",
-                "satooshi/php-coveralls": "^1.0.1",
-                "symfony/phpunit-bridge": "^4.4@dev"
+                "php-coveralls/php-coveralls": "^2.2",
+                "phpunit/phpunit": "^8.5.8|^9.3.3",
+                "vimeo/psalm": "^4"
             },
             "suggest": {
                 "ext-intl": "PHP Internationalization Libraries are required to use the SpoofChecking validation"
@@ -757,12 +808,12 @@
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "2.1.x-dev"
+                    "dev-master": "3.0.x-dev"
                 }
             },
             "autoload": {
                 "psr-4": {
-                    "Egulias\\EmailValidator\\": "EmailValidator"
+                    "Egulias\\EmailValidator\\": "src"
                 }
             },
             "notification-url": "https://packagist.org/downloads/",
@@ -783,20 +834,30 @@
                 "validation",
                 "validator"
             ],
-            "time": "2019-08-13T17:33:27+00:00"
+            "support": {
+                "issues": "https://github.com/egulias/EmailValidator/issues",
+                "source": "https://github.com/egulias/EmailValidator/tree/3.1.1"
+            },
+            "funding": [
+                {
+                    "url": "https://github.com/egulias",
+                    "type": "github"
+                }
+            ],
+            "time": "2021-04-01T18:37:14+00:00"
         },
         {
             "name": "ezyang/htmlpurifier",
-            "version": "v4.11.0",
+            "version": "v4.13.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/ezyang/htmlpurifier.git",
-                "reference": "83ab08bc1af7d808a9e0fbf024f1c24bfd73c0a7"
+                "reference": "08e27c97e4c6ed02f37c5b2b20488046c8d90d75"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/ezyang/htmlpurifier/zipball/83ab08bc1af7d808a9e0fbf024f1c24bfd73c0a7",
-                "reference": "83ab08bc1af7d808a9e0fbf024f1c24bfd73c0a7",
+                "url": "https://api.github.com/repos/ezyang/htmlpurifier/zipball/08e27c97e4c6ed02f37c5b2b20488046c8d90d75",
+                "reference": "08e27c97e4c6ed02f37c5b2b20488046c8d90d75",
                 "shasum": ""
             },
             "require": {
@@ -812,6 +873,9 @@
                 },
                 "files": [
                     "library/HTMLPurifier.composer.php"
+                ],
+                "exclude-from-classmap": [
+                    "/library/HTMLPurifier/Language/"
                 ]
             },
             "notification-url": "https://packagist.org/downloads/",
@@ -830,7 +894,11 @@
             "keywords": [
                 "html"
             ],
-            "time": "2019-07-14T18:58:38+00:00"
+            "support": {
+                "issues": "https://github.com/ezyang/htmlpurifier/issues",
+                "source": "https://github.com/ezyang/htmlpurifier/tree/master"
+            },
+            "time": "2020-06-29T00:56:53+00:00"
         },
         {
             "name": "fortawesome/font-awesome",
@@ -878,26 +946,30 @@
                 "font",
                 "icon"
             ],
+            "support": {
+                "issues": "https://github.com/FortAwesome/Font-Awesome/issues",
+                "source": "https://github.com/FortAwesome/Font-Awesome/tree/v4.7.0"
+            },
             "time": "2016-10-24T15:52:54+00:00"
         },
         {
             "name": "kartik-v/bootstrap-fileinput",
-            "version": "v5.0.6",
+            "version": "v5.2.3",
             "source": {
                 "type": "git",
                 "url": "https://github.com/kartik-v/bootstrap-fileinput.git",
-                "reference": "97fbfb5b16a3035c79534d5bd8a1d9bf4f76b1c5"
+                "reference": "a3340fd757a2a46fdeede677e366fce2e4f89d3a"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/kartik-v/bootstrap-fileinput/zipball/97fbfb5b16a3035c79534d5bd8a1d9bf4f76b1c5",
-                "reference": "97fbfb5b16a3035c79534d5bd8a1d9bf4f76b1c5",
+                "url": "https://api.github.com/repos/kartik-v/bootstrap-fileinput/zipball/a3340fd757a2a46fdeede677e366fce2e4f89d3a",
+                "reference": "a3340fd757a2a46fdeede677e366fce2e4f89d3a",
                 "shasum": ""
             },
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "5.0.x-dev"
+                    "dev-master": "5.2.x-dev"
                 }
             },
             "autoload": {
@@ -931,7 +1003,75 @@
                 "progress",
                 "upload"
             ],
-            "time": "2019-09-11T18:05:56+00:00"
+            "support": {
+                "issues": "https://github.com/kartik-v/bootstrap-fileinput/issues",
+                "source": "https://github.com/kartik-v/bootstrap-fileinput/tree/v5.2.3"
+            },
+            "funding": [
+                {
+                    "url": "https://opencollective.com/bootstrap-fileinput",
+                    "type": "open_collective"
+                }
+            ],
+            "time": "2021-07-25T06:58:43+00:00"
+        },
+        {
+            "name": "kartik-v/yii2-bootstrap4-dropdown",
+            "version": "v1.0.1",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/kartik-v/yii2-bootstrap4-dropdown.git",
+                "reference": "394cb4f85d82522ec5918f1581bdad518b324498"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/kartik-v/yii2-bootstrap4-dropdown/zipball/394cb4f85d82522ec5918f1581bdad518b324498",
+                "reference": "394cb4f85d82522ec5918f1581bdad518b324498",
+                "shasum": ""
+            },
+            "require": {
+                "kartik-v/yii2-krajee-base": ">=2.0"
+            },
+            "suggest": {
+                "yiisoft/yii2-bootstrap4": "The Yii 2 Bootstrap 4 extension must be installed separately for this extension to work."
+            },
+            "type": "yii2-extension",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "1.0.x-dev"
+                }
+            },
+            "autoload": {
+                "psr-4": {
+                    "kartik\\bs4dropdown\\": "src"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "BSD-3-Clause"
+            ],
+            "authors": [
+                {
+                    "name": "Kartik Visweswaran",
+                    "email": "kartikv2@gmail.com",
+                    "homepage": "http://www.krajee.com/"
+                }
+            ],
+            "description": "Enhanced Bootstrap 4 dropdown widget for Yii2 with nested submenu support",
+            "homepage": "https://github.com/kartik-v/yii2-bootstrap4-dropdown",
+            "keywords": [
+                "bootstrap",
+                "dropdown",
+                "jquery",
+                "nested",
+                "submenu",
+                "yii2"
+            ],
+            "support": {
+                "issues": "https://github.com/kartik-v/yii2-bootstrap4-dropdown/issues",
+                "source": "https://github.com/kartik-v/yii2-bootstrap4-dropdown/tree/master"
+            },
+            "time": "2020-03-27T10:45:23+00:00"
         },
         {
             "name": "kartik-v/yii2-dialog",
@@ -982,6 +1122,10 @@
                 "modal",
                 "yii2"
             ],
+            "support": {
+                "issues": "https://github.com/kartik-v/yii2-dialog/issues",
+                "source": "https://github.com/kartik-v/yii2-dialog/tree/master"
+            },
             "time": "2018-10-09T08:08:51+00:00"
         },
         {
@@ -990,20 +1134,22 @@
             "source": {
                 "type": "git",
                 "url": "https://github.com/kartik-v/yii2-grid.git",
-                "reference": "878da21514481b81fa2e4d989069095aa9a3f002"
+                "reference": "1aa635faba7778d354a7a1e48c66b87744eed2af"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/kartik-v/yii2-grid/zipball/878da21514481b81fa2e4d989069095aa9a3f002",
-                "reference": "878da21514481b81fa2e4d989069095aa9a3f002",
+                "url": "https://api.github.com/repos/kartik-v/yii2-grid/zipball/1aa635faba7778d354a7a1e48c66b87744eed2af",
+                "reference": "1aa635faba7778d354a7a1e48c66b87744eed2af",
                 "shasum": ""
             },
             "require": {
+                "kartik-v/yii2-bootstrap4-dropdown": "~1.0",
                 "kartik-v/yii2-dialog": "~1.0"
             },
             "suggest": {
                 "kartik-v/yii2-mpdf": "For exporting grids to PDF"
             },
+            "default-branch": true,
             "type": "yii2-extension",
             "extra": {
                 "branch-alias": {
@@ -1034,20 +1180,30 @@
                 "widget",
                 "yii2"
             ],
-            "time": "2020-01-04T12:20:10+00:00"
+            "support": {
+                "issues": "https://github.com/kartik-v/yii2-grid/issues",
+                "source": "https://github.com/kartik-v/yii2-grid/tree/master"
+            },
+            "funding": [
+                {
+                    "url": "https://opencollective.com/yii2-grid",
+                    "type": "open_collective"
+                }
+            ],
+            "time": "2020-11-26T15:46:03+00:00"
         },
         {
             "name": "kartik-v/yii2-krajee-base",
-            "version": "v2.0.5",
+            "version": "v2.0.6",
             "source": {
                 "type": "git",
                 "url": "https://github.com/kartik-v/yii2-krajee-base.git",
-                "reference": "9ddb662bdf49fdb671a90853912a40418a26a0dd"
+                "reference": "9b6bc8335e8e561e3953826efefd57b1df7bdce0"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/kartik-v/yii2-krajee-base/zipball/9ddb662bdf49fdb671a90853912a40418a26a0dd",
-                "reference": "9ddb662bdf49fdb671a90853912a40418a26a0dd",
+                "url": "https://api.github.com/repos/kartik-v/yii2-krajee-base/zipball/9b6bc8335e8e561e3953826efefd57b1df7bdce0",
+                "reference": "9b6bc8335e8e561e3953826efefd57b1df7bdce0",
                 "shasum": ""
             },
             "suggest": {
@@ -1086,7 +1242,11 @@
                 "widget",
                 "yii2"
             ],
-            "time": "2019-03-13T17:14:54+00:00"
+            "support": {
+                "issues": "https://github.com/kartik-v/yii2-krajee-base/issues",
+                "source": "https://github.com/kartik-v/yii2-krajee-base/tree/v2.0.6"
+            },
+            "time": "2021-04-08T18:07:22+00:00"
         },
         {
             "name": "kartik-v/yii2-widget-datepicker",
@@ -1094,17 +1254,18 @@
             "source": {
                 "type": "git",
                 "url": "https://github.com/kartik-v/yii2-widget-datepicker.git",
-                "reference": "d75bfb12918b29902d96ecf8decd7e40b007d77f"
+                "reference": "98257627814abf52aa8c1e6dc020d8eb6c1c39b5"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/kartik-v/yii2-widget-datepicker/zipball/d75bfb12918b29902d96ecf8decd7e40b007d77f",
-                "reference": "d75bfb12918b29902d96ecf8decd7e40b007d77f",
+                "url": "https://api.github.com/repos/kartik-v/yii2-widget-datepicker/zipball/98257627814abf52aa8c1e6dc020d8eb6c1c39b5",
+                "reference": "98257627814abf52aa8c1e6dc020d8eb6c1c39b5",
                 "shasum": ""
             },
             "require": {
                 "kartik-v/yii2-krajee-base": ">=2.0.0"
             },
+            "default-branch": true,
             "type": "yii2-extension",
             "extra": {
                 "branch-alias": {
@@ -1140,7 +1301,11 @@
                 "widget",
                 "yii2"
             ],
-            "time": "2019-08-23T17:23:20+00:00"
+            "support": {
+                "issues": "https://github.com/kartik-v/yii2-widget-datepicker/issues",
+                "source": "https://github.com/kartik-v/yii2-widget-datepicker/tree/master"
+            },
+            "time": "2020-12-29T09:25:58+00:00"
         },
         {
             "name": "kartik-v/yii2-widget-datetimepicker",
@@ -1148,17 +1313,18 @@
             "source": {
                 "type": "git",
                 "url": "https://github.com/kartik-v/yii2-widget-datetimepicker.git",
-                "reference": "c201f98d3b8e41dcce2c70678ae31008246fc430"
+                "reference": "f64114bff520ea67f48e2a4e6372915968eb2c69"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/kartik-v/yii2-widget-datetimepicker/zipball/c201f98d3b8e41dcce2c70678ae31008246fc430",
-                "reference": "c201f98d3b8e41dcce2c70678ae31008246fc430",
+                "url": "https://api.github.com/repos/kartik-v/yii2-widget-datetimepicker/zipball/f64114bff520ea67f48e2a4e6372915968eb2c69",
+                "reference": "f64114bff520ea67f48e2a4e6372915968eb2c69",
                 "shasum": ""
             },
             "require": {
                 "kartik-v/yii2-krajee-base": ">=2.0.0"
             },
+            "default-branch": true,
             "type": "yii2-extension",
             "extra": {
                 "branch-alias": {
@@ -1194,20 +1360,24 @@
                 "widget",
                 "yii2"
             ],
-            "time": "2019-12-16T09:37:15+00:00"
+            "support": {
+                "issues": "https://github.com/kartik-v/yii2-widget-datetimepicker/issues",
+                "source": "https://github.com/kartik-v/yii2-widget-datetimepicker/tree/master"
+            },
+            "time": "2020-09-11T13:24:42+00:00"
         },
         {
             "name": "kartik-v/yii2-widget-fileinput",
-            "version": "v1.0.9",
+            "version": "v1.1.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/kartik-v/yii2-widget-fileinput.git",
-                "reference": "fcf5bf41fac35363d3f24a01a34f228c2534c7b7"
+                "reference": "d43bb9d9638ba117bbaa0045250645dc843fcf7f"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/kartik-v/yii2-widget-fileinput/zipball/fcf5bf41fac35363d3f24a01a34f228c2534c7b7",
-                "reference": "fcf5bf41fac35363d3f24a01a34f228c2534c7b7",
+                "url": "https://api.github.com/repos/kartik-v/yii2-widget-fileinput/zipball/d43bb9d9638ba117bbaa0045250645dc843fcf7f",
+                "reference": "d43bb9d9638ba117bbaa0045250645dc843fcf7f",
                 "shasum": ""
             },
             "require": {
@@ -1217,7 +1387,7 @@
             "type": "yii2-extension",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "1.0.x-dev"
+                    "dev-master": "1.1.x-dev"
                 }
             },
             "autoload": {
@@ -1249,7 +1419,17 @@
                 "widget",
                 "yii2"
             ],
-            "time": "2019-04-19T11:45:08+00:00"
+            "support": {
+                "issues": "https://github.com/kartik-v/yii2-widget-fileinput/issues",
+                "source": "https://github.com/kartik-v/yii2-widget-fileinput/tree/v1.1.0"
+            },
+            "funding": [
+                {
+                    "url": "https://opencollective.com/yii2-widget-fileinput",
+                    "type": "open_collective"
+                }
+            ],
+            "time": "2020-10-23T19:54:51+00:00"
         },
         {
             "name": "kartik-v/yii2-widget-select2",
@@ -1257,22 +1437,23 @@
             "source": {
                 "type": "git",
                 "url": "https://github.com/kartik-v/yii2-widget-select2.git",
-                "reference": "798dcea12997d806da14c5affde2f166338a6d54"
+                "reference": "b30936d556639cdecd98bdd9733509a6be5dcc1c"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/kartik-v/yii2-widget-select2/zipball/798dcea12997d806da14c5affde2f166338a6d54",
-                "reference": "798dcea12997d806da14c5affde2f166338a6d54",
+                "url": "https://api.github.com/repos/kartik-v/yii2-widget-select2/zipball/b30936d556639cdecd98bdd9733509a6be5dcc1c",
+                "reference": "b30936d556639cdecd98bdd9733509a6be5dcc1c",
                 "shasum": ""
             },
             "require": {
                 "kartik-v/yii2-krajee-base": ">=1.9",
                 "select2/select2": ">=4.0"
             },
+            "default-branch": true,
             "type": "yii2-extension",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "2.1.x-dev"
+                    "dev-master": "2.2.x-dev"
                 }
             },
             "autoload": {
@@ -1303,7 +1484,17 @@
                 "widget",
                 "yii2"
             ],
-            "time": "2019-09-02T12:53:16+00:00"
+            "support": {
+                "issues": "https://github.com/kartik-v/yii2-widget-select2/issues",
+                "source": "https://github.com/kartik-v/yii2-widget-select2/tree/v2.2.1"
+            },
+            "funding": [
+                {
+                    "url": "https://opencollective.com/yii2-widget-select2",
+                    "type": "open_collective"
+                }
+            ],
+            "time": "2021-06-09T07:29:31+00:00"
         },
         {
             "name": "kavalar/hhapi",
@@ -1322,6 +1513,7 @@
             "require": {
                 "php": ">=7.0.0"
             },
+            "default-branch": true,
             "type": "library",
             "notification-url": "https://packagist.org/downloads/",
             "license": [
@@ -1333,20 +1525,107 @@
                     "email": "apuc06@mail.ru"
                 }
             ],
+            "support": {
+                "issues": "https://github.com/apuc/hhapi/issues",
+                "source": "https://github.com/apuc/hhapi/tree/master"
+            },
             "time": "2018-11-19T08:22:43+00:00"
         },
         {
-            "name": "mihaildev/yii2-elfinder",
-            "version": "1.3.0",
+            "name": "kavalar/telegram_bot",
+            "version": "0.2",
             "source": {
                 "type": "git",
-                "url": "https://github.com/MihailDev/yii2-elfinder.git",
-                "reference": "3cc3001a84e3cc3841131a0a947d7917948a60b1"
+                "url": "https://github.com/apuc/telegram_bot.git",
+                "reference": "f741e68a756c33f5e2f330c85e63ad1b9f301f42"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/MihailDev/yii2-elfinder/zipball/3cc3001a84e3cc3841131a0a947d7917948a60b1",
-                "reference": "3cc3001a84e3cc3841131a0a947d7917948a60b1",
+                "url": "https://api.github.com/repos/apuc/telegram_bot/zipball/f741e68a756c33f5e2f330c85e63ad1b9f301f42",
+                "reference": "f741e68a756c33f5e2f330c85e63ad1b9f301f42",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=7.0.0",
+                "telegram-bot/api": "^2.3"
+            },
+            "type": "library",
+            "autoload": {
+                "psr-4": {
+                    "kavalar\\": "src/"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Ivaniv Anton",
+                    "email": "anton.o.ivaniv@gmail.com"
+                }
+            ],
+            "description": "Telegram Bot Service",
+            "support": {
+                "issues": "https://github.com/apuc/telegram_bot/issues",
+                "source": "https://github.com/apuc/telegram_bot/tree/0.2"
+            },
+            "time": "2021-08-25T14:10:19+00:00"
+        },
+        {
+            "name": "kavalar/yii2-telegram-bot",
+            "version": "0.1",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/apuc/yii2-telegram-bot.git",
+                "reference": "34f084e32ee06e9cd1386a469a914bd9cac4f104"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/apuc/yii2-telegram-bot/zipball/34f084e32ee06e9cd1386a469a914bd9cac4f104",
+                "reference": "34f084e32ee06e9cd1386a469a914bd9cac4f104",
+                "shasum": ""
+            },
+            "require": {
+                "kavalar/telegram_bot": "^0.2.0",
+                "php": "^7.0.0",
+                "yiisoft/yii2": "~2.0.8"
+            },
+            "type": "yii2-extension",
+            "autoload": {
+                "psr-4": {
+                    "kavalar\\": "src/"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Ivaniv Anton",
+                    "email": "anton.o.ivaniv@gmail.com"
+                }
+            ],
+            "description": "Yii2 extensions for telegram bot service from kalavar/telegram_bot package",
+            "support": {
+                "issues": "https://github.com/apuc/yii2-telegram-bot/issues",
+                "source": "https://github.com/apuc/yii2-telegram-bot/tree/0.1"
+            },
+            "time": "2021-08-26T13:08:14+00:00"
+        },
+        {
+            "name": "mihaildev/yii2-elfinder",
+            "version": "1.4.0",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/MihailDev/yii2-elfinder.git",
+                "reference": "adc705b32f8d64f6bcf97d3c45d0a972c86e372e"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/MihailDev/yii2-elfinder/zipball/adc705b32f8d64f6bcf97d3c45d0a972c86e372e",
+                "reference": "adc705b32f8d64f6bcf97d3c45d0a972c86e372e",
                 "shasum": ""
             },
             "require": {
@@ -1385,7 +1664,11 @@
                 "filemanager",
                 "yii"
             ],
-            "time": "2018-10-01T17:00:54+00:00"
+            "support": {
+                "issues": "https://github.com/MihailDev/yii2-elfinder/issues",
+                "source": "https://github.com/MihailDev/yii2-elfinder/tree/1.4.0"
+            },
+            "time": "2019-06-07T20:43:53+00:00"
         },
         {
             "name": "mirocow/yii2-eav",
@@ -1442,6 +1725,10 @@
                 "fields",
                 "yii2"
             ],
+            "support": {
+                "issues": "https://github.com/Mirocow/yii2-eav/issues",
+                "source": "https://github.com/Mirocow/yii2-eav/tree/master"
+            },
             "time": "2017-01-07T19:07:59+00:00"
         },
         {
@@ -1487,6 +1774,10 @@
                 "extension",
                 "yii2"
             ],
+            "support": {
+                "issues": "https://github.com/nkovacs/yii2-datetimepicker/issues",
+                "source": "https://github.com/nkovacs/yii2-datetimepicker/tree/4-inline-mode"
+            },
             "time": "2017-03-28T08:57:15+00:00"
         },
         {
@@ -1546,6 +1837,56 @@
                 "MIT"
             ]
         },
+        {
+            "name": "paragonie/random_compat",
+            "version": "v9.99.100",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/paragonie/random_compat.git",
+                "reference": "996434e5492cb4c3edcb9168db6fbb1359ef965a"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/paragonie/random_compat/zipball/996434e5492cb4c3edcb9168db6fbb1359ef965a",
+                "reference": "996434e5492cb4c3edcb9168db6fbb1359ef965a",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">= 7"
+            },
+            "require-dev": {
+                "phpunit/phpunit": "4.*|5.*",
+                "vimeo/psalm": "^1"
+            },
+            "suggest": {
+                "ext-libsodium": "Provides a modern crypto API that can be used to generate random bytes."
+            },
+            "type": "library",
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Paragon Initiative Enterprises",
+                    "email": "security@paragonie.com",
+                    "homepage": "https://paragonie.com"
+                }
+            ],
+            "description": "PHP 5.x polyfill for random_bytes() and random_int() from PHP 7",
+            "keywords": [
+                "csprng",
+                "polyfill",
+                "pseudorandom",
+                "random"
+            ],
+            "support": {
+                "email": "info@paragonie.com",
+                "issues": "https://github.com/paragonie/random_compat/issues",
+                "source": "https://github.com/paragonie/random_compat"
+            },
+            "time": "2020-10-15T08:29:30+00:00"
+        },
         {
             "name": "rmrevin/yii2-fontawesome",
             "version": "2.17.1",
@@ -1596,20 +1937,24 @@
                 "font",
                 "yii"
             ],
+            "support": {
+                "issues": "https://github.com/rmrevin/yii2-fontawesome/issues",
+                "source": "https://github.com/rmrevin/yii2-fontawesome"
+            },
             "time": "2017-01-11T14:05:47+00:00"
         },
         {
             "name": "select2/select2",
-            "version": "4.0.11",
+            "version": "4.0.13",
             "source": {
                 "type": "git",
                 "url": "https://github.com/select2/select2.git",
-                "reference": "a2b0acc7077808006328710b73f330382935cfa8"
+                "reference": "45f2b83ceed5231afa7b3d5b12b58ad335edd82e"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/select2/select2/zipball/a2b0acc7077808006328710b73f330382935cfa8",
-                "reference": "a2b0acc7077808006328710b73f330382935cfa8",
+                "url": "https://api.github.com/repos/select2/select2/zipball/45f2b83ceed5231afa7b3d5b12b58ad335edd82e",
+                "reference": "45f2b83ceed5231afa7b3d5b12b58ad335edd82e",
                 "shasum": ""
             },
             "type": "component",
@@ -1634,20 +1979,24 @@
             ],
             "description": "Select2 is a jQuery based replacement for select boxes.",
             "homepage": "https://select2.org/",
-            "time": "2019-10-13T20:42:14+00:00"
+            "support": {
+                "issues": "https://github.com/select2/select2/issues",
+                "source": "https://github.com/select2/select2/tree/4.0.13"
+            },
+            "time": "2020-01-28T05:01:22+00:00"
         },
         {
             "name": "studio-42/elfinder",
-            "version": "2.1.50",
+            "version": "2.1.59",
             "source": {
                 "type": "git",
                 "url": "https://github.com/Studio-42/elFinder.git",
-                "reference": "ae1a24001af2727ef7ef4e8f32c7dc1b49709062"
+                "reference": "06ada3132cefd057e1d89cb016f8c82473d420d4"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/Studio-42/elFinder/zipball/ae1a24001af2727ef7ef4e8f32c7dc1b49709062",
-                "reference": "ae1a24001af2727ef7ef4e8f32c7dc1b49709062",
+                "url": "https://api.github.com/repos/Studio-42/elFinder/zipball/06ada3132cefd057e1d89cb016f8c82473d420d4",
+                "reference": "06ada3132cefd057e1d89cb016f8c82473d420d4",
                 "shasum": ""
             },
             "require": {
@@ -1692,36 +2041,39 @@
             ],
             "description": "File manager for web",
             "homepage": "http://elfinder.org",
-            "time": "2019-08-20T14:15:16+00:00"
+            "support": {
+                "issues": "https://github.com/Studio-42/elFinder/issues",
+                "source": "https://github.com/Studio-42/elFinder/tree/2.1.59"
+            },
+            "time": "2021-06-13T15:04:24+00:00"
         },
         {
             "name": "swiftmailer/swiftmailer",
-            "version": "v6.2.1",
+            "version": "v6.2.7",
             "source": {
                 "type": "git",
                 "url": "https://github.com/swiftmailer/swiftmailer.git",
-                "reference": "5397cd05b0a0f7937c47b0adcb4c60e5ab936b6a"
+                "reference": "15f7faf8508e04471f666633addacf54c0ab5933"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/swiftmailer/swiftmailer/zipball/5397cd05b0a0f7937c47b0adcb4c60e5ab936b6a",
-                "reference": "5397cd05b0a0f7937c47b0adcb4c60e5ab936b6a",
+                "url": "https://api.github.com/repos/swiftmailer/swiftmailer/zipball/15f7faf8508e04471f666633addacf54c0ab5933",
+                "reference": "15f7faf8508e04471f666633addacf54c0ab5933",
                 "shasum": ""
             },
             "require": {
-                "egulias/email-validator": "~2.0",
+                "egulias/email-validator": "^2.0|^3.1",
                 "php": ">=7.0.0",
                 "symfony/polyfill-iconv": "^1.0",
                 "symfony/polyfill-intl-idn": "^1.10",
                 "symfony/polyfill-mbstring": "^1.0"
             },
             "require-dev": {
-                "mockery/mockery": "~0.9.1",
-                "symfony/phpunit-bridge": "^3.4.19|^4.1.8"
+                "mockery/mockery": "^1.0",
+                "symfony/phpunit-bridge": "^4.4|^5.0"
             },
             "suggest": {
-                "ext-intl": "Needed to support internationalized email addresses",
-                "true/punycode": "Needed to support internationalized email addresses, if ext-intl is not installed"
+                "ext-intl": "Needed to support internationalized email addresses"
             },
             "type": "library",
             "extra": {
@@ -1754,24 +2106,38 @@
                 "mail",
                 "mailer"
             ],
-            "time": "2019-04-21T09:21:45+00:00"
+            "support": {
+                "issues": "https://github.com/swiftmailer/swiftmailer/issues",
+                "source": "https://github.com/swiftmailer/swiftmailer/tree/v6.2.7"
+            },
+            "funding": [
+                {
+                    "url": "https://github.com/fabpot",
+                    "type": "github"
+                },
+                {
+                    "url": "https://tidelift.com/funding/github/packagist/swiftmailer/swiftmailer",
+                    "type": "tidelift"
+                }
+            ],
+            "time": "2021-03-09T12:30:35+00:00"
         },
         {
             "name": "symfony/polyfill-iconv",
-            "version": "v1.12.0",
+            "version": "v1.23.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/polyfill-iconv.git",
-                "reference": "685968b11e61a347c18bf25db32effa478be610f"
+                "reference": "63b5bb7db83e5673936d6e3b8b3e022ff6474933"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/polyfill-iconv/zipball/685968b11e61a347c18bf25db32effa478be610f",
-                "reference": "685968b11e61a347c18bf25db32effa478be610f",
+                "url": "https://api.github.com/repos/symfony/polyfill-iconv/zipball/63b5bb7db83e5673936d6e3b8b3e022ff6474933",
+                "reference": "63b5bb7db83e5673936d6e3b8b3e022ff6474933",
                 "shasum": ""
             },
             "require": {
-                "php": ">=5.3.3"
+                "php": ">=7.1"
             },
             "suggest": {
                 "ext-iconv": "For best performance"
@@ -1779,7 +2145,11 @@
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "1.12-dev"
+                    "dev-main": "1.23-dev"
+                },
+                "thanks": {
+                    "name": "symfony/polyfill",
+                    "url": "https://github.com/symfony/polyfill"
                 }
             },
             "autoload": {
@@ -1813,26 +2183,43 @@
                 "portable",
                 "shim"
             ],
-            "time": "2019-08-06T08:03:45+00:00"
+            "support": {
+                "source": "https://github.com/symfony/polyfill-iconv/tree/v1.23.0"
+            },
+            "funding": [
+                {
+                    "url": "https://symfony.com/sponsor",
+                    "type": "custom"
+                },
+                {
+                    "url": "https://github.com/fabpot",
+                    "type": "github"
+                },
+                {
+                    "url": "https://tidelift.com/funding/github/packagist/symfony/symfony",
+                    "type": "tidelift"
+                }
+            ],
+            "time": "2021-05-27T09:27:20+00:00"
         },
         {
             "name": "symfony/polyfill-intl-idn",
-            "version": "v1.12.0",
+            "version": "v1.23.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/polyfill-intl-idn.git",
-                "reference": "6af626ae6fa37d396dc90a399c0ff08e5cfc45b2"
+                "reference": "65bd267525e82759e7d8c4e8ceea44f398838e65"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/polyfill-intl-idn/zipball/6af626ae6fa37d396dc90a399c0ff08e5cfc45b2",
-                "reference": "6af626ae6fa37d396dc90a399c0ff08e5cfc45b2",
+                "url": "https://api.github.com/repos/symfony/polyfill-intl-idn/zipball/65bd267525e82759e7d8c4e8ceea44f398838e65",
+                "reference": "65bd267525e82759e7d8c4e8ceea44f398838e65",
                 "shasum": ""
             },
             "require": {
-                "php": ">=5.3.3",
-                "symfony/polyfill-mbstring": "^1.3",
-                "symfony/polyfill-php72": "^1.9"
+                "php": ">=7.1",
+                "symfony/polyfill-intl-normalizer": "^1.10",
+                "symfony/polyfill-php72": "^1.10"
             },
             "suggest": {
                 "ext-intl": "For best performance"
@@ -1840,7 +2227,11 @@
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "1.12-dev"
+                    "dev-main": "1.23-dev"
+                },
+                "thanks": {
+                    "name": "symfony/polyfill",
+                    "url": "https://github.com/symfony/polyfill"
                 }
             },
             "autoload": {
@@ -1860,6 +2251,10 @@
                     "name": "Laurent Bassin",
                     "email": "laurent@bassin.info"
                 },
+                {
+                    "name": "Trevor Rowbotham",
+                    "email": "trevor.rowbotham@pm.me"
+                },
                 {
                     "name": "Symfony Community",
                     "homepage": "https://symfony.com/contributors"
@@ -1875,24 +2270,125 @@
                 "portable",
                 "shim"
             ],
-            "time": "2019-08-06T08:03:45+00:00"
+            "support": {
+                "source": "https://github.com/symfony/polyfill-intl-idn/tree/v1.23.0"
+            },
+            "funding": [
+                {
+                    "url": "https://symfony.com/sponsor",
+                    "type": "custom"
+                },
+                {
+                    "url": "https://github.com/fabpot",
+                    "type": "github"
+                },
+                {
+                    "url": "https://tidelift.com/funding/github/packagist/symfony/symfony",
+                    "type": "tidelift"
+                }
+            ],
+            "time": "2021-05-27T09:27:20+00:00"
         },
         {
-            "name": "symfony/polyfill-mbstring",
-            "version": "v1.12.0",
+            "name": "symfony/polyfill-intl-normalizer",
+            "version": "v1.23.0",
             "source": {
                 "type": "git",
-                "url": "https://github.com/symfony/polyfill-mbstring.git",
-                "reference": "b42a2f66e8f1b15ccf25652c3424265923eb4f17"
+                "url": "https://github.com/symfony/polyfill-intl-normalizer.git",
+                "reference": "8590a5f561694770bdcd3f9b5c69dde6945028e8"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/polyfill-mbstring/zipball/b42a2f66e8f1b15ccf25652c3424265923eb4f17",
-                "reference": "b42a2f66e8f1b15ccf25652c3424265923eb4f17",
+                "url": "https://api.github.com/repos/symfony/polyfill-intl-normalizer/zipball/8590a5f561694770bdcd3f9b5c69dde6945028e8",
+                "reference": "8590a5f561694770bdcd3f9b5c69dde6945028e8",
                 "shasum": ""
             },
             "require": {
-                "php": ">=5.3.3"
+                "php": ">=7.1"
+            },
+            "suggest": {
+                "ext-intl": "For best performance"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-main": "1.23-dev"
+                },
+                "thanks": {
+                    "name": "symfony/polyfill",
+                    "url": "https://github.com/symfony/polyfill"
+                }
+            },
+            "autoload": {
+                "psr-4": {
+                    "Symfony\\Polyfill\\Intl\\Normalizer\\": ""
+                },
+                "files": [
+                    "bootstrap.php"
+                ],
+                "classmap": [
+                    "Resources/stubs"
+                ]
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Nicolas Grekas",
+                    "email": "p@tchwork.com"
+                },
+                {
+                    "name": "Symfony Community",
+                    "homepage": "https://symfony.com/contributors"
+                }
+            ],
+            "description": "Symfony polyfill for intl's Normalizer class and related functions",
+            "homepage": "https://symfony.com",
+            "keywords": [
+                "compatibility",
+                "intl",
+                "normalizer",
+                "polyfill",
+                "portable",
+                "shim"
+            ],
+            "support": {
+                "source": "https://github.com/symfony/polyfill-intl-normalizer/tree/v1.23.0"
+            },
+            "funding": [
+                {
+                    "url": "https://symfony.com/sponsor",
+                    "type": "custom"
+                },
+                {
+                    "url": "https://github.com/fabpot",
+                    "type": "github"
+                },
+                {
+                    "url": "https://tidelift.com/funding/github/packagist/symfony/symfony",
+                    "type": "tidelift"
+                }
+            ],
+            "time": "2021-02-19T12:13:01+00:00"
+        },
+        {
+            "name": "symfony/polyfill-mbstring",
+            "version": "v1.23.1",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/symfony/polyfill-mbstring.git",
+                "reference": "9174a3d80210dca8daa7f31fec659150bbeabfc6"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/symfony/polyfill-mbstring/zipball/9174a3d80210dca8daa7f31fec659150bbeabfc6",
+                "reference": "9174a3d80210dca8daa7f31fec659150bbeabfc6",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=7.1"
             },
             "suggest": {
                 "ext-mbstring": "For best performance"
@@ -1900,7 +2396,11 @@
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "1.12-dev"
+                    "dev-main": "1.23-dev"
+                },
+                "thanks": {
+                    "name": "symfony/polyfill",
+                    "url": "https://github.com/symfony/polyfill"
                 }
             },
             "autoload": {
@@ -1934,29 +2434,50 @@
                 "portable",
                 "shim"
             ],
-            "time": "2019-08-06T08:03:45+00:00"
+            "support": {
+                "source": "https://github.com/symfony/polyfill-mbstring/tree/v1.23.1"
+            },
+            "funding": [
+                {
+                    "url": "https://symfony.com/sponsor",
+                    "type": "custom"
+                },
+                {
+                    "url": "https://github.com/fabpot",
+                    "type": "github"
+                },
+                {
+                    "url": "https://tidelift.com/funding/github/packagist/symfony/symfony",
+                    "type": "tidelift"
+                }
+            ],
+            "time": "2021-05-27T12:26:48+00:00"
         },
         {
             "name": "symfony/polyfill-php72",
-            "version": "v1.12.0",
+            "version": "v1.23.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/polyfill-php72.git",
-                "reference": "04ce3335667451138df4307d6a9b61565560199e"
+                "reference": "9a142215a36a3888e30d0a9eeea9766764e96976"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/polyfill-php72/zipball/04ce3335667451138df4307d6a9b61565560199e",
-                "reference": "04ce3335667451138df4307d6a9b61565560199e",
+                "url": "https://api.github.com/repos/symfony/polyfill-php72/zipball/9a142215a36a3888e30d0a9eeea9766764e96976",
+                "reference": "9a142215a36a3888e30d0a9eeea9766764e96976",
                 "shasum": ""
             },
             "require": {
-                "php": ">=5.3.3"
+                "php": ">=7.1"
             },
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "1.12-dev"
+                    "dev-main": "1.23-dev"
+                },
+                "thanks": {
+                    "name": "symfony/polyfill",
+                    "url": "https://github.com/symfony/polyfill"
                 }
             },
             "autoload": {
@@ -1989,25 +2510,102 @@
                 "portable",
                 "shim"
             ],
-            "time": "2019-08-06T08:03:45+00:00"
+            "support": {
+                "source": "https://github.com/symfony/polyfill-php72/tree/v1.23.0"
+            },
+            "funding": [
+                {
+                    "url": "https://symfony.com/sponsor",
+                    "type": "custom"
+                },
+                {
+                    "url": "https://github.com/fabpot",
+                    "type": "github"
+                },
+                {
+                    "url": "https://tidelift.com/funding/github/packagist/symfony/symfony",
+                    "type": "tidelift"
+                }
+            ],
+            "time": "2021-05-27T09:17:38+00:00"
         },
         {
-            "name": "unclead/yii2-multiple-input",
-            "version": "2.21.5",
+            "name": "telegram-bot/api",
+            "version": "v2.3.22",
             "source": {
                 "type": "git",
-                "url": "https://github.com/unclead/yii2-multiple-input.git",
-                "reference": "cad3cc288b8736ed6e9b161222628b1612ebbf69"
+                "url": "https://github.com/TelegramBot/Api.git",
+                "reference": "9a69f82121a5ef0e396c0c3a8be86caefd1376a8"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/unclead/yii2-multiple-input/zipball/cad3cc288b8736ed6e9b161222628b1612ebbf69",
-                "reference": "cad3cc288b8736ed6e9b161222628b1612ebbf69",
+                "url": "https://api.github.com/repos/TelegramBot/Api/zipball/9a69f82121a5ef0e396c0c3a8be86caefd1376a8",
+                "reference": "9a69f82121a5ef0e396c0c3a8be86caefd1376a8",
+                "shasum": ""
+            },
+            "require": {
+                "ext-curl": "*",
+                "php": ">=5.5.0"
+            },
+            "require-dev": {
+                "codeception/codeception": "*",
+                "phpunit/phpunit": "~4.0",
+                "squizlabs/php_codesniffer": "2.*"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "1.0-dev"
+                }
+            },
+            "autoload": {
+                "psr-4": {
+                    "TelegramBot\\Api\\": "src"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Ilya Gusev",
+                    "email": "mail@igusev.ru",
+                    "homepage": "https://php-cat.com",
+                    "role": "Developer"
+                }
+            ],
+            "description": "PHP Wrapper for Telegram Bot API",
+            "homepage": "https://github.com/TelegramBot/Api",
+            "keywords": [
+                "bot",
+                "bot api",
+                "php",
+                "telegram"
+            ],
+            "support": {
+                "issues": "https://github.com/TelegramBot/Api/issues",
+                "source": "https://github.com/TelegramBot/Api/tree/v2.3.22"
+            },
+            "time": "2021-03-09T07:49:55+00:00"
+        },
+        {
+            "name": "unclead/yii2-multiple-input",
+            "version": "2.24.0",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/unclead/yii2-multiple-input.git",
+                "reference": "fa4a69a96643b532ea2b49f86bdd6aeb6cd201a7"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/unclead/yii2-multiple-input/zipball/fa4a69a96643b532ea2b49f86bdd6aeb6cd201a7",
+                "reference": "fa4a69a96643b532ea2b49f86bdd6aeb6cd201a7",
                 "shasum": ""
             },
             "require": {
                 "php": ">=5.4.0",
-                "yiisoft/yii2": ">=2.0.13"
+                "yiisoft/yii2": ">=2.0.38"
             },
             "require-dev": {
                 "phpunit/phpunit": "5.7.*"
@@ -2038,25 +2636,29 @@
                 "yii2 multiple input",
                 "yii2 tabular input"
             ],
-            "time": "2019-06-17T09:43:34+00:00"
+            "support": {
+                "issues": "https://github.com/unclead/yii2-multiple-input/issues?state=open",
+                "source": "https://github.com/unclead/yii2-multiple-input"
+            },
+            "time": "2021-01-09T10:53:24+00:00"
         },
         {
             "name": "yiisoft/yii2",
-            "version": "2.0.28",
+            "version": "2.0.43",
             "source": {
                 "type": "git",
                 "url": "https://github.com/yiisoft/yii2-framework.git",
-                "reference": "80bf3a6e04a0128f753cb73ba7255d8e2ae3a02f"
+                "reference": "f370955faa3067d9b27879aaf14b0978a805cd59"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/yiisoft/yii2-framework/zipball/80bf3a6e04a0128f753cb73ba7255d8e2ae3a02f",
-                "reference": "80bf3a6e04a0128f753cb73ba7255d8e2ae3a02f",
+                "url": "https://api.github.com/repos/yiisoft/yii2-framework/zipball/f370955faa3067d9b27879aaf14b0978a805cd59",
+                "reference": "f370955faa3067d9b27879aaf14b0978a805cd59",
                 "shasum": ""
             },
             "require": {
                 "bower-asset/inputmask": "~3.2.2 | ~3.3.5",
-                "bower-asset/jquery": "3.4.*@stable | 3.3.*@stable | 3.2.*@stable | 3.1.*@stable | 2.2.*@stable | 2.1.*@stable | 1.11.*@stable | 1.12.*@stable",
+                "bower-asset/jquery": "3.6.*@stable | 3.5.*@stable | 3.4.*@stable | 3.3.*@stable | 3.2.*@stable | 3.1.*@stable | 2.2.*@stable | 2.1.*@stable | 1.11.*@stable | 1.12.*@stable",
                 "bower-asset/punycode": "1.3.*",
                 "bower-asset/yii2-pjax": "~2.0.1",
                 "cebe/markdown": "~1.0.0 | ~1.1.0 | ~1.2.0",
@@ -2064,6 +2666,7 @@
                 "ext-mbstring": "*",
                 "ezyang/htmlpurifier": "~4.6",
                 "lib-pcre": "*",
+                "paragonie/random_compat": ">=1",
                 "php": ">=5.4.0",
                 "yiisoft/yii2-composer": "~2.0.4"
             },
@@ -2089,13 +2692,13 @@
                 {
                     "name": "Qiang Xue",
                     "email": "qiang.xue@gmail.com",
-                    "homepage": "http://www.yiiframework.com/",
+                    "homepage": "https://www.yiiframework.com/",
                     "role": "Founder and project lead"
                 },
                 {
                     "name": "Alexander Makarov",
                     "email": "sam@rmcreative.ru",
-                    "homepage": "http://rmcreative.ru/",
+                    "homepage": "https://rmcreative.ru/",
                     "role": "Core framework development"
                 },
                 {
@@ -2106,7 +2709,7 @@
                 {
                     "name": "Carsten Brandt",
                     "email": "mail@cebe.cc",
-                    "homepage": "http://cebe.cc/",
+                    "homepage": "https://cebe.cc/",
                     "role": "Core framework development"
                 },
                 {
@@ -2133,25 +2736,46 @@
                 }
             ],
             "description": "Yii PHP Framework Version 2",
-            "homepage": "http://www.yiiframework.com/",
+            "homepage": "https://www.yiiframework.com/",
             "keywords": [
                 "framework",
                 "yii2"
             ],
-            "time": "2019-10-08T13:14:18+00:00"
+            "support": {
+                "forum": "http://www.yiiframework.com/forum/",
+                "irc": "irc://irc.libera.chat:6697/yii",
+                "issues": "https://github.com/yiisoft/yii2/issues?state=open",
+                "source": "https://github.com/yiisoft/yii2",
+                "wiki": "http://www.yiiframework.com/wiki/"
+            },
+            "funding": [
+                {
+                    "url": "https://github.com/yiisoft",
+                    "type": "github"
+                },
+                {
+                    "url": "https://opencollective.com/yiisoft",
+                    "type": "open_collective"
+                },
+                {
+                    "url": "https://tidelift.com/funding/github/packagist/yiisoft/yii2",
+                    "type": "tidelift"
+                }
+            ],
+            "time": "2021-08-09T17:38:43+00:00"
         },
         {
             "name": "yiisoft/yii2-bootstrap",
-            "version": "2.0.10",
+            "version": "2.0.11",
             "source": {
                 "type": "git",
                 "url": "https://github.com/yiisoft/yii2-bootstrap.git",
-                "reference": "073c9ab0a4eb71f2485d84c96a1967130300d8fc"
+                "reference": "83d144f4089adaa7064ad60dc4c1436daa2eb30e"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/yiisoft/yii2-bootstrap/zipball/073c9ab0a4eb71f2485d84c96a1967130300d8fc",
-                "reference": "073c9ab0a4eb71f2485d84c96a1967130300d8fc",
+                "url": "https://api.github.com/repos/yiisoft/yii2-bootstrap/zipball/83d144f4089adaa7064ad60dc4c1436daa2eb30e",
+                "reference": "83d144f4089adaa7064ad60dc4c1436daa2eb30e",
                 "shasum": ""
             },
             "require": {
@@ -2159,12 +2783,22 @@
                 "yiisoft/yii2": "~2.0.6"
             },
             "require-dev": {
-                "phpunit/phpunit": "<7"
+                "cweagans/composer-patches": "^1.7",
+                "phpunit/phpunit": "4.8.34"
             },
             "type": "yii2-extension",
             "extra": {
                 "branch-alias": {
                     "dev-master": "2.0.x-dev"
+                },
+                "patches": {
+                    "phpunit/phpunit-mock-objects": {
+                        "Fix PHP 7 and 8 compatibility": "https://yiisoft.github.io/phpunit-patches/phpunit_mock_objects.patch"
+                    },
+                    "phpunit/phpunit": {
+                        "Fix PHP 7 compatibility": "https://yiisoft.github.io/phpunit-patches/phpunit_php7.patch",
+                        "Fix PHP 8 compatibility": "https://yiisoft.github.io/phpunit-patches/phpunit_php8.patch"
+                    }
                 }
             },
             "autoload": {
@@ -2178,8 +2812,9 @@
             ],
             "authors": [
                 {
-                    "name": "Paul Klimov",
-                    "email": "klimov.paul@gmail.com"
+                    "name": "Qiang Xue",
+                    "email": "qiang.xue@gmail.com",
+                    "homepage": "http://www.yiiframework.com/"
                 },
                 {
                     "name": "Alexander Makarov",
@@ -2191,9 +2826,8 @@
                     "email": "amigo.cobos@gmail.com"
                 },
                 {
-                    "name": "Qiang Xue",
-                    "email": "qiang.xue@gmail.com",
-                    "homepage": "http://www.yiiframework.com/"
+                    "name": "Paul Klimov",
+                    "email": "klimov.paul@gmail.com"
                 }
             ],
             "description": "The Twitter Bootstrap extension for the Yii framework",
@@ -2201,27 +2835,48 @@
                 "bootstrap",
                 "yii2"
             ],
-            "time": "2019-04-23T13:18:43+00:00"
+            "support": {
+                "forum": "http://www.yiiframework.com/forum/",
+                "irc": "irc://irc.freenode.net/yii",
+                "issues": "https://github.com/yiisoft/yii2-bootstrap/issues",
+                "source": "https://github.com/yiisoft/yii2-bootstrap",
+                "wiki": "http://www.yiiframework.com/wiki/"
+            },
+            "funding": [
+                {
+                    "url": "https://github.com/yiisoft",
+                    "type": "github"
+                },
+                {
+                    "url": "https://opencollective.com/yiisoft",
+                    "type": "open_collective"
+                },
+                {
+                    "url": "https://tidelift.com/funding/github/packagist/yiisoft/yii2-bootstrap",
+                    "type": "tidelift"
+                }
+            ],
+            "time": "2021-08-09T20:54:06+00:00"
         },
         {
             "name": "yiisoft/yii2-composer",
-            "version": "2.0.8",
+            "version": "2.0.10",
             "source": {
                 "type": "git",
                 "url": "https://github.com/yiisoft/yii2-composer.git",
-                "reference": "5c7ca9836cf80b34db265332a7f2f8438eb469b9"
+                "reference": "94bb3f66e779e2774f8776d6e1bdeab402940510"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/yiisoft/yii2-composer/zipball/5c7ca9836cf80b34db265332a7f2f8438eb469b9",
-                "reference": "5c7ca9836cf80b34db265332a7f2f8438eb469b9",
+                "url": "https://api.github.com/repos/yiisoft/yii2-composer/zipball/94bb3f66e779e2774f8776d6e1bdeab402940510",
+                "reference": "94bb3f66e779e2774f8776d6e1bdeab402940510",
                 "shasum": ""
             },
             "require": {
-                "composer-plugin-api": "^1.0"
+                "composer-plugin-api": "^1.0 | ^2.0"
             },
             "require-dev": {
-                "composer/composer": "^1.0",
+                "composer/composer": "^1.0 | ^2.0@dev",
                 "phpunit/phpunit": "<7"
             },
             "type": "composer-plugin",
@@ -2256,7 +2911,28 @@
                 "extension installer",
                 "yii2"
             ],
-            "time": "2019-07-16T13:22:30+00:00"
+            "support": {
+                "forum": "http://www.yiiframework.com/forum/",
+                "irc": "irc://irc.freenode.net/yii",
+                "issues": "https://github.com/yiisoft/yii2-composer/issues",
+                "source": "https://github.com/yiisoft/yii2-composer",
+                "wiki": "http://www.yiiframework.com/wiki/"
+            },
+            "funding": [
+                {
+                    "url": "https://github.com/yiisoft",
+                    "type": "github"
+                },
+                {
+                    "url": "https://opencollective.com/yiisoft",
+                    "type": "open_collective"
+                },
+                {
+                    "url": "https://tidelift.com/funding/github/packagist/yiisoft/yii2-composer",
+                    "type": "tidelift"
+                }
+            ],
+            "time": "2020-06-24T00:04:01+00:00"
         },
         {
             "name": "yiisoft/yii2-jui",
@@ -2302,6 +2978,13 @@
                 "jQuery UI",
                 "yii2"
             ],
+            "support": {
+                "forum": "http://www.yiiframework.com/forum/",
+                "irc": "irc://irc.freenode.net/yii",
+                "issues": "https://github.com/yiisoft/yii2-jui/issues",
+                "source": "https://github.com/yiisoft/yii2-jui",
+                "wiki": "http://www.yiiframework.com/wiki/"
+            },
             "time": "2017-11-25T15:32:29+00:00"
         },
         {
@@ -2352,31 +3035,39 @@
                 "swiftmailer",
                 "yii2"
             ],
+            "support": {
+                "forum": "http://www.yiiframework.com/forum/",
+                "irc": "irc://irc.freenode.net/yii",
+                "issues": "https://github.com/yiisoft/yii2-swiftmailer/issues",
+                "source": "https://github.com/yiisoft/yii2-swiftmailer",
+                "wiki": "http://www.yiiframework.com/wiki/"
+            },
             "time": "2018-09-23T22:00:47+00:00"
         }
     ],
     "packages-dev": [
         {
             "name": "behat/gherkin",
-            "version": "v4.6.0",
+            "version": "v4.8.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/Behat/Gherkin.git",
-                "reference": "ab0a02ea14893860bca00f225f5621d351a3ad07"
+                "reference": "2391482cd003dfdc36b679b27e9f5326bd656acd"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/Behat/Gherkin/zipball/ab0a02ea14893860bca00f225f5621d351a3ad07",
-                "reference": "ab0a02ea14893860bca00f225f5621d351a3ad07",
+                "url": "https://api.github.com/repos/Behat/Gherkin/zipball/2391482cd003dfdc36b679b27e9f5326bd656acd",
+                "reference": "2391482cd003dfdc36b679b27e9f5326bd656acd",
                 "shasum": ""
             },
             "require": {
-                "php": ">=5.3.1"
+                "php": "~7.2|~8.0"
             },
             "require-dev": {
-                "phpunit/phpunit": "~4.5|~5",
-                "symfony/phpunit-bridge": "~2.7|~3|~4",
-                "symfony/yaml": "~2.3|~3|~4"
+                "cucumber/cucumber": "dev-gherkin-16.0.0",
+                "phpunit/phpunit": "~8|~9",
+                "symfony/phpunit-bridge": "~3|~4|~5",
+                "symfony/yaml": "~3|~4|~5"
             },
             "suggest": {
                 "symfony/yaml": "If you want to parse features, represented in YAML files"
@@ -2403,7 +3094,7 @@
                     "homepage": "http://everzet.com"
                 }
             ],
-            "description": "Gherkin DSL parser for PHP 5.3",
+            "description": "Gherkin DSL parser for PHP",
             "homepage": "http://behat.org/",
             "keywords": [
                 "BDD",
@@ -2413,7 +3104,11 @@
                 "gherkin",
                 "parser"
             ],
-            "time": "2019-01-16T14:22:17+00:00"
+            "support": {
+                "issues": "https://github.com/Behat/Gherkin/issues",
+                "source": "https://github.com/Behat/Gherkin/tree/v4.8.0"
+            },
+            "time": "2021-02-04T12:44:21+00:00"
         },
         {
             "name": "bower-asset/typeahead.js",
@@ -2521,20 +3216,24 @@
                 "functional testing",
                 "unit testing"
             ],
+            "support": {
+                "source": "https://github.com/Codeception/base/tree/2.5.6"
+            },
+            "abandoned": true,
             "time": "2019-04-24T11:36:34+00:00"
         },
         {
             "name": "codeception/phpunit-wrapper",
-            "version": "7.7.1",
+            "version": "7.8.2",
             "source": {
                 "type": "git",
                 "url": "https://github.com/Codeception/phpunit-wrapper.git",
-                "reference": "ab04a956264291505ea84998f43cf91639b4575d"
+                "reference": "cafed18048826790c527843f9b85e8cc79b866f1"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/Codeception/phpunit-wrapper/zipball/ab04a956264291505ea84998f43cf91639b4575d",
-                "reference": "ab04a956264291505ea84998f43cf91639b4575d",
+                "url": "https://api.github.com/repos/Codeception/phpunit-wrapper/zipball/cafed18048826790c527843f9b85e8cc79b866f1",
+                "reference": "cafed18048826790c527843f9b85e8cc79b866f1",
                 "shasum": ""
             },
             "require": {
@@ -2550,7 +3249,7 @@
             "type": "library",
             "autoload": {
                 "psr-4": {
-                    "Codeception\\PHPUnit\\": "src\\"
+                    "Codeception\\PHPUnit\\": "src/"
                 }
             },
             "notification-url": "https://packagist.org/downloads/",
@@ -2564,7 +3263,11 @@
                 }
             ],
             "description": "PHPUnit classes used by Codeception",
-            "time": "2019-02-26T20:35:32+00:00"
+            "support": {
+                "issues": "https://github.com/Codeception/phpunit-wrapper/issues",
+                "source": "https://github.com/Codeception/phpunit-wrapper/tree/7.8.2"
+            },
+            "time": "2020-12-28T14:00:26+00:00"
         },
         {
             "name": "codeception/stub",
@@ -2594,6 +3297,10 @@
                 "MIT"
             ],
             "description": "Flexible Stub wrapper for PHPUnit's Mock Builder",
+            "support": {
+                "issues": "https://github.com/Codeception/Stub/issues",
+                "source": "https://github.com/Codeception/Stub/tree/master"
+            },
             "time": "2019-03-02T15:35:10+00:00"
         },
         {
@@ -2630,40 +3337,39 @@
                 }
             ],
             "description": "BDD assertion library for PHPUnit",
+            "support": {
+                "issues": "https://github.com/Codeception/Verify/issues",
+                "source": "https://github.com/Codeception/Verify/tree/master"
+            },
             "time": "2017-01-09T10:58:51+00:00"
         },
         {
             "name": "doctrine/instantiator",
-            "version": "1.2.0",
+            "version": "1.4.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/doctrine/instantiator.git",
-                "reference": "a2c590166b2133a4633738648b6b064edae0814a"
+                "reference": "d56bf6102915de5702778fe20f2de3b2fe570b5b"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/doctrine/instantiator/zipball/a2c590166b2133a4633738648b6b064edae0814a",
-                "reference": "a2c590166b2133a4633738648b6b064edae0814a",
+                "url": "https://api.github.com/repos/doctrine/instantiator/zipball/d56bf6102915de5702778fe20f2de3b2fe570b5b",
+                "reference": "d56bf6102915de5702778fe20f2de3b2fe570b5b",
                 "shasum": ""
             },
             "require": {
-                "php": "^7.1"
+                "php": "^7.1 || ^8.0"
             },
             "require-dev": {
-                "doctrine/coding-standard": "^6.0",
+                "doctrine/coding-standard": "^8.0",
                 "ext-pdo": "*",
                 "ext-phar": "*",
-                "phpbench/phpbench": "^0.13",
-                "phpstan/phpstan-phpunit": "^0.11",
-                "phpstan/phpstan-shim": "^0.11",
-                "phpunit/phpunit": "^7.0"
+                "phpbench/phpbench": "^0.13 || 1.0.0-alpha2",
+                "phpstan/phpstan": "^0.12",
+                "phpstan/phpstan-phpunit": "^0.12",
+                "phpunit/phpunit": "^7.0 || ^8.0 || ^9.0"
             },
             "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-master": "1.2.x-dev"
-                }
-            },
             "autoload": {
                 "psr-4": {
                     "Doctrine\\Instantiator\\": "src/Doctrine/Instantiator/"
@@ -2677,7 +3383,7 @@
                 {
                     "name": "Marco Pivetta",
                     "email": "ocramius@gmail.com",
-                    "homepage": "http://ocramius.github.com/"
+                    "homepage": "https://ocramius.github.io/"
                 }
             ],
             "description": "A small, lightweight utility to instantiate objects in PHP without invoking their constructors",
@@ -2686,34 +3392,63 @@
                 "constructor",
                 "instantiate"
             ],
-            "time": "2019-03-17T17:37:11+00:00"
+            "support": {
+                "issues": "https://github.com/doctrine/instantiator/issues",
+                "source": "https://github.com/doctrine/instantiator/tree/1.4.0"
+            },
+            "funding": [
+                {
+                    "url": "https://www.doctrine-project.org/sponsorship.html",
+                    "type": "custom"
+                },
+                {
+                    "url": "https://www.patreon.com/phpdoctrine",
+                    "type": "patreon"
+                },
+                {
+                    "url": "https://tidelift.com/funding/github/packagist/doctrine%2Finstantiator",
+                    "type": "tidelift"
+                }
+            ],
+            "time": "2020-11-10T18:47:58+00:00"
         },
         {
-            "name": "fzaninotto/faker",
-            "version": "v1.8.0",
+            "name": "fakerphp/faker",
+            "version": "v1.15.0",
             "source": {
                 "type": "git",
-                "url": "https://github.com/fzaninotto/Faker.git",
-                "reference": "f72816b43e74063c8b10357394b6bba8cb1c10de"
+                "url": "https://github.com/FakerPHP/Faker.git",
+                "reference": "89c6201c74db25fa759ff16e78a4d8f32547770e"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/fzaninotto/Faker/zipball/f72816b43e74063c8b10357394b6bba8cb1c10de",
-                "reference": "f72816b43e74063c8b10357394b6bba8cb1c10de",
+                "url": "https://api.github.com/repos/FakerPHP/Faker/zipball/89c6201c74db25fa759ff16e78a4d8f32547770e",
+                "reference": "89c6201c74db25fa759ff16e78a4d8f32547770e",
                 "shasum": ""
             },
             "require": {
-                "php": "^5.3.3 || ^7.0"
+                "php": "^7.1 || ^8.0",
+                "psr/container": "^1.0",
+                "symfony/deprecation-contracts": "^2.2"
+            },
+            "conflict": {
+                "fzaninotto/faker": "*"
             },
             "require-dev": {
+                "bamarni/composer-bin-plugin": "^1.4.1",
                 "ext-intl": "*",
-                "phpunit/phpunit": "^4.8.35 || ^5.7",
-                "squizlabs/php_codesniffer": "^1.5"
+                "symfony/phpunit-bridge": "^4.4 || ^5.2"
+            },
+            "suggest": {
+                "ext-curl": "Required by Faker\\Provider\\Image to download images.",
+                "ext-dom": "Required by Faker\\Provider\\HtmlLorem for generating random HTML.",
+                "ext-iconv": "Required by Faker\\Provider\\ru_RU\\Text::realText() for generating real Russian text.",
+                "ext-mbstring": "Required for multibyte Unicode string functionality."
             },
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "1.8-dev"
+                    "dev-main": "v1.15-dev"
                 }
             },
             "autoload": {
@@ -2736,20 +3471,24 @@
                 "faker",
                 "fixtures"
             ],
-            "time": "2018-07-12T10:23:15+00:00"
+            "support": {
+                "issues": "https://github.com/FakerPHP/Faker/issues",
+                "source": "https://github.com/FakerPHP/Faker/tree/v1.15.0"
+            },
+            "time": "2021-07-06T20:39:40+00:00"
         },
         {
             "name": "guzzlehttp/psr7",
-            "version": "1.6.1",
+            "version": "1.8.2",
             "source": {
                 "type": "git",
                 "url": "https://github.com/guzzle/psr7.git",
-                "reference": "239400de7a173fe9901b9ac7c06497751f00727a"
+                "reference": "dc960a912984efb74d0a90222870c72c87f10c91"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/guzzle/psr7/zipball/239400de7a173fe9901b9ac7c06497751f00727a",
-                "reference": "239400de7a173fe9901b9ac7c06497751f00727a",
+                "url": "https://api.github.com/repos/guzzle/psr7/zipball/dc960a912984efb74d0a90222870c72c87f10c91",
+                "reference": "dc960a912984efb74d0a90222870c72c87f10c91",
                 "shasum": ""
             },
             "require": {
@@ -2762,15 +3501,15 @@
             },
             "require-dev": {
                 "ext-zlib": "*",
-                "phpunit/phpunit": "~4.8.36 || ^5.7.27 || ^6.5.8"
+                "phpunit/phpunit": "~4.8.36 || ^5.7.27 || ^6.5.14 || ^7.5.20 || ^8.5.8 || ^9.3.10"
             },
             "suggest": {
-                "zendframework/zend-httphandlerrunner": "Emit PSR-7 responses"
+                "laminas/laminas-httphandlerrunner": "Emit PSR-7 responses"
             },
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "1.6-dev"
+                    "dev-master": "1.7-dev"
                 }
             },
             "autoload": {
@@ -2807,24 +3546,28 @@
                 "uri",
                 "url"
             ],
-            "time": "2019-07-01T23:21:34+00:00"
+            "support": {
+                "issues": "https://github.com/guzzle/psr7/issues",
+                "source": "https://github.com/guzzle/psr7/tree/1.8.2"
+            },
+            "time": "2021-04-26T09:17:50+00:00"
         },
         {
             "name": "myclabs/deep-copy",
-            "version": "1.9.3",
+            "version": "1.10.2",
             "source": {
                 "type": "git",
                 "url": "https://github.com/myclabs/DeepCopy.git",
-                "reference": "007c053ae6f31bba39dfa19a7726f56e9763bbea"
+                "reference": "776f831124e9c62e1a2c601ecc52e776d8bb7220"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/myclabs/DeepCopy/zipball/007c053ae6f31bba39dfa19a7726f56e9763bbea",
-                "reference": "007c053ae6f31bba39dfa19a7726f56e9763bbea",
+                "url": "https://api.github.com/repos/myclabs/DeepCopy/zipball/776f831124e9c62e1a2c601ecc52e776d8bb7220",
+                "reference": "776f831124e9c62e1a2c601ecc52e776d8bb7220",
                 "shasum": ""
             },
             "require": {
-                "php": "^7.1"
+                "php": "^7.1 || ^8.0"
             },
             "replace": {
                 "myclabs/deep-copy": "self.version"
@@ -2855,7 +3598,17 @@
                 "object",
                 "object graph"
             ],
-            "time": "2019-08-09T12:45:53+00:00"
+            "support": {
+                "issues": "https://github.com/myclabs/DeepCopy/issues",
+                "source": "https://github.com/myclabs/DeepCopy/tree/1.10.2"
+            },
+            "funding": [
+                {
+                    "url": "https://tidelift.com/funding/github/packagist/myclabs/deep-copy",
+                    "type": "tidelift"
+                }
+            ],
+            "time": "2020-11-13T09:40:50+00:00"
         },
         {
             "name": "phar-io/manifest",
@@ -2910,6 +3663,10 @@
                 }
             ],
             "description": "Component for reading phar.io manifest information from a PHP Archive (PHAR)",
+            "support": {
+                "issues": "https://github.com/phar-io/manifest/issues",
+                "source": "https://github.com/phar-io/manifest/tree/master"
+            },
             "time": "2018-07-08T19:23:20+00:00"
         },
         {
@@ -2957,32 +3714,33 @@
                 }
             ],
             "description": "Library for handling version information and constraints",
+            "support": {
+                "issues": "https://github.com/phar-io/version/issues",
+                "source": "https://github.com/phar-io/version/tree/master"
+            },
             "time": "2018-07-08T19:19:57+00:00"
         },
         {
             "name": "phpdocumentor/reflection-common",
-            "version": "2.0.0",
+            "version": "2.2.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/phpDocumentor/ReflectionCommon.git",
-                "reference": "63a995caa1ca9e5590304cd845c15ad6d482a62a"
+                "reference": "1d01c49d4ed62f25aa84a747ad35d5a16924662b"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/phpDocumentor/ReflectionCommon/zipball/63a995caa1ca9e5590304cd845c15ad6d482a62a",
-                "reference": "63a995caa1ca9e5590304cd845c15ad6d482a62a",
+                "url": "https://api.github.com/repos/phpDocumentor/ReflectionCommon/zipball/1d01c49d4ed62f25aa84a747ad35d5a16924662b",
+                "reference": "1d01c49d4ed62f25aa84a747ad35d5a16924662b",
                 "shasum": ""
             },
             "require": {
-                "php": ">=7.1"
-            },
-            "require-dev": {
-                "phpunit/phpunit": "~6"
+                "php": "^7.2 || ^8.0"
             },
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "2.x-dev"
+                    "dev-2.x": "2.x-dev"
                 }
             },
             "autoload": {
@@ -3009,44 +3767,45 @@
                 "reflection",
                 "static analysis"
             ],
-            "time": "2018-08-07T13:53:10+00:00"
+            "support": {
+                "issues": "https://github.com/phpDocumentor/ReflectionCommon/issues",
+                "source": "https://github.com/phpDocumentor/ReflectionCommon/tree/2.x"
+            },
+            "time": "2020-06-27T09:03:43+00:00"
         },
         {
             "name": "phpdocumentor/reflection-docblock",
-            "version": "4.3.2",
+            "version": "5.2.2",
             "source": {
                 "type": "git",
                 "url": "https://github.com/phpDocumentor/ReflectionDocBlock.git",
-                "reference": "b83ff7cfcfee7827e1e78b637a5904fe6a96698e"
+                "reference": "069a785b2141f5bcf49f3e353548dc1cce6df556"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/phpDocumentor/ReflectionDocBlock/zipball/b83ff7cfcfee7827e1e78b637a5904fe6a96698e",
-                "reference": "b83ff7cfcfee7827e1e78b637a5904fe6a96698e",
+                "url": "https://api.github.com/repos/phpDocumentor/ReflectionDocBlock/zipball/069a785b2141f5bcf49f3e353548dc1cce6df556",
+                "reference": "069a785b2141f5bcf49f3e353548dc1cce6df556",
                 "shasum": ""
             },
             "require": {
-                "php": "^7.0",
-                "phpdocumentor/reflection-common": "^1.0.0 || ^2.0.0",
-                "phpdocumentor/type-resolver": "~0.4 || ^1.0.0",
-                "webmozart/assert": "^1.0"
+                "ext-filter": "*",
+                "php": "^7.2 || ^8.0",
+                "phpdocumentor/reflection-common": "^2.2",
+                "phpdocumentor/type-resolver": "^1.3",
+                "webmozart/assert": "^1.9.1"
             },
             "require-dev": {
-                "doctrine/instantiator": "^1.0.5",
-                "mockery/mockery": "^1.0",
-                "phpunit/phpunit": "^6.4"
+                "mockery/mockery": "~1.3.2"
             },
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "4.x-dev"
+                    "dev-master": "5.x-dev"
                 }
             },
             "autoload": {
                 "psr-4": {
-                    "phpDocumentor\\Reflection\\": [
-                        "src/"
-                    ]
+                    "phpDocumentor\\Reflection\\": "src"
                 }
             },
             "notification-url": "https://packagist.org/downloads/",
@@ -3057,38 +3816,44 @@
                 {
                     "name": "Mike van Riel",
                     "email": "me@mikevanriel.com"
+                },
+                {
+                    "name": "Jaap van Otterdijk",
+                    "email": "account@ijaap.nl"
                 }
             ],
             "description": "With this component, a library can provide support for annotations via DocBlocks or otherwise retrieve information that is embedded in a DocBlock.",
-            "time": "2019-09-12T14:27:41+00:00"
+            "support": {
+                "issues": "https://github.com/phpDocumentor/ReflectionDocBlock/issues",
+                "source": "https://github.com/phpDocumentor/ReflectionDocBlock/tree/master"
+            },
+            "time": "2020-09-03T19:13:55+00:00"
         },
         {
             "name": "phpdocumentor/type-resolver",
-            "version": "1.0.1",
+            "version": "1.4.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/phpDocumentor/TypeResolver.git",
-                "reference": "2e32a6d48972b2c1976ed5d8967145b6cec4a4a9"
+                "reference": "6a467b8989322d92aa1c8bf2bebcc6e5c2ba55c0"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/phpDocumentor/TypeResolver/zipball/2e32a6d48972b2c1976ed5d8967145b6cec4a4a9",
-                "reference": "2e32a6d48972b2c1976ed5d8967145b6cec4a4a9",
+                "url": "https://api.github.com/repos/phpDocumentor/TypeResolver/zipball/6a467b8989322d92aa1c8bf2bebcc6e5c2ba55c0",
+                "reference": "6a467b8989322d92aa1c8bf2bebcc6e5c2ba55c0",
                 "shasum": ""
             },
             "require": {
-                "php": "^7.1",
+                "php": "^7.2 || ^8.0",
                 "phpdocumentor/reflection-common": "^2.0"
             },
             "require-dev": {
-                "ext-tokenizer": "^7.1",
-                "mockery/mockery": "~1",
-                "phpunit/phpunit": "^7.0"
+                "ext-tokenizer": "*"
             },
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "1.x-dev"
+                    "dev-1.x": "1.x-dev"
                 }
             },
             "autoload": {
@@ -3107,20 +3872,24 @@
                 }
             ],
             "description": "A PSR-5 based resolver of Class names, Types and Structural Element Names",
-            "time": "2019-08-22T18:11:29+00:00"
+            "support": {
+                "issues": "https://github.com/phpDocumentor/TypeResolver/issues",
+                "source": "https://github.com/phpDocumentor/TypeResolver/tree/1.4.0"
+            },
+            "time": "2020-09-17T18:55:26+00:00"
         },
         {
             "name": "phpspec/php-diff",
-            "version": "v1.1.0",
+            "version": "v1.1.3",
             "source": {
                 "type": "git",
                 "url": "https://github.com/phpspec/php-diff.git",
-                "reference": "0464787bfa7cd13576c5a1e318709768798bec6a"
+                "reference": "fc1156187f9f6c8395886fe85ed88a0a245d72e9"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/phpspec/php-diff/zipball/0464787bfa7cd13576c5a1e318709768798bec6a",
-                "reference": "0464787bfa7cd13576c5a1e318709768798bec6a",
+                "url": "https://api.github.com/repos/phpspec/php-diff/zipball/fc1156187f9f6c8395886fe85ed88a0a245d72e9",
+                "reference": "fc1156187f9f6c8395886fe85ed88a0a245d72e9",
                 "shasum": ""
             },
             "type": "library",
@@ -3145,37 +3914,40 @@
                 }
             ],
             "description": "A comprehensive library for generating differences between two hashable objects (strings or arrays).",
-            "time": "2016-04-07T12:29:16+00:00"
+            "support": {
+                "source": "https://github.com/phpspec/php-diff/tree/v1.1.3"
+            },
+            "time": "2020-09-18T13:47:07+00:00"
         },
         {
             "name": "phpspec/prophecy",
-            "version": "1.9.0",
+            "version": "1.13.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/phpspec/prophecy.git",
-                "reference": "f6811d96d97bdf400077a0cc100ae56aa32b9203"
+                "reference": "be1996ed8adc35c3fd795488a653f4b518be70ea"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/phpspec/prophecy/zipball/f6811d96d97bdf400077a0cc100ae56aa32b9203",
-                "reference": "f6811d96d97bdf400077a0cc100ae56aa32b9203",
+                "url": "https://api.github.com/repos/phpspec/prophecy/zipball/be1996ed8adc35c3fd795488a653f4b518be70ea",
+                "reference": "be1996ed8adc35c3fd795488a653f4b518be70ea",
                 "shasum": ""
             },
             "require": {
-                "doctrine/instantiator": "^1.0.2",
-                "php": "^5.3|^7.0",
-                "phpdocumentor/reflection-docblock": "^2.0|^3.0.2|^4.0|^5.0",
-                "sebastian/comparator": "^1.1|^2.0|^3.0",
-                "sebastian/recursion-context": "^1.0|^2.0|^3.0"
+                "doctrine/instantiator": "^1.2",
+                "php": "^7.2 || ~8.0, <8.1",
+                "phpdocumentor/reflection-docblock": "^5.2",
+                "sebastian/comparator": "^3.0 || ^4.0",
+                "sebastian/recursion-context": "^3.0 || ^4.0"
             },
             "require-dev": {
-                "phpspec/phpspec": "^2.5|^3.2",
-                "phpunit/phpunit": "^4.8.35 || ^5.7 || ^6.5 || ^7.1"
+                "phpspec/phpspec": "^6.0",
+                "phpunit/phpunit": "^8.0 || ^9.0"
             },
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "1.8.x-dev"
+                    "dev-master": "1.11.x-dev"
                 }
             },
             "autoload": {
@@ -3208,7 +3980,11 @@
                 "spy",
                 "stub"
             ],
-            "time": "2019-10-03T11:07:50+00:00"
+            "support": {
+                "issues": "https://github.com/phpspec/prophecy/issues",
+                "source": "https://github.com/phpspec/prophecy/tree/1.13.0"
+            },
+            "time": "2021-03-17T13:42:18+00:00"
         },
         {
             "name": "phpunit/php-code-coverage",
@@ -3271,27 +4047,31 @@
                 "testing",
                 "xunit"
             ],
+            "support": {
+                "issues": "https://github.com/sebastianbergmann/php-code-coverage/issues",
+                "source": "https://github.com/sebastianbergmann/php-code-coverage/tree/master"
+            },
             "time": "2018-10-31T16:06:48+00:00"
         },
         {
             "name": "phpunit/php-file-iterator",
-            "version": "2.0.2",
+            "version": "2.0.4",
             "source": {
                 "type": "git",
                 "url": "https://github.com/sebastianbergmann/php-file-iterator.git",
-                "reference": "050bedf145a257b1ff02746c31894800e5122946"
+                "reference": "28af674ff175d0768a5a978e6de83f697d4a7f05"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/php-file-iterator/zipball/050bedf145a257b1ff02746c31894800e5122946",
-                "reference": "050bedf145a257b1ff02746c31894800e5122946",
+                "url": "https://api.github.com/repos/sebastianbergmann/php-file-iterator/zipball/28af674ff175d0768a5a978e6de83f697d4a7f05",
+                "reference": "28af674ff175d0768a5a978e6de83f697d4a7f05",
                 "shasum": ""
             },
             "require": {
-                "php": "^7.1"
+                "php": ">=7.1"
             },
             "require-dev": {
-                "phpunit/phpunit": "^7.1"
+                "phpunit/phpunit": "^8.5"
             },
             "type": "library",
             "extra": {
@@ -3321,7 +4101,17 @@
                 "filesystem",
                 "iterator"
             ],
-            "time": "2018-09-13T20:33:42+00:00"
+            "support": {
+                "issues": "https://github.com/sebastianbergmann/php-file-iterator/issues",
+                "source": "https://github.com/sebastianbergmann/php-file-iterator/tree/2.0.4"
+            },
+            "funding": [
+                {
+                    "url": "https://github.com/sebastianbergmann",
+                    "type": "github"
+                }
+            ],
+            "time": "2021-07-19T06:46:01+00:00"
         },
         {
             "name": "phpunit/php-text-template",
@@ -3362,27 +4152,31 @@
             "keywords": [
                 "template"
             ],
+            "support": {
+                "issues": "https://github.com/sebastianbergmann/php-text-template/issues",
+                "source": "https://github.com/sebastianbergmann/php-text-template/tree/1.2.1"
+            },
             "time": "2015-06-21T13:50:34+00:00"
         },
         {
             "name": "phpunit/php-timer",
-            "version": "2.1.2",
+            "version": "2.1.3",
             "source": {
                 "type": "git",
                 "url": "https://github.com/sebastianbergmann/php-timer.git",
-                "reference": "1038454804406b0b5f5f520358e78c1c2f71501e"
+                "reference": "2454ae1765516d20c4ffe103d85a58a9a3bd5662"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/php-timer/zipball/1038454804406b0b5f5f520358e78c1c2f71501e",
-                "reference": "1038454804406b0b5f5f520358e78c1c2f71501e",
+                "url": "https://api.github.com/repos/sebastianbergmann/php-timer/zipball/2454ae1765516d20c4ffe103d85a58a9a3bd5662",
+                "reference": "2454ae1765516d20c4ffe103d85a58a9a3bd5662",
                 "shasum": ""
             },
             "require": {
-                "php": "^7.1"
+                "php": ">=7.1"
             },
             "require-dev": {
-                "phpunit/phpunit": "^7.0"
+                "phpunit/phpunit": "^8.5"
             },
             "type": "library",
             "extra": {
@@ -3411,25 +4205,35 @@
             "keywords": [
                 "timer"
             ],
-            "time": "2019-06-07T04:22:29+00:00"
+            "support": {
+                "issues": "https://github.com/sebastianbergmann/php-timer/issues",
+                "source": "https://github.com/sebastianbergmann/php-timer/tree/2.1.3"
+            },
+            "funding": [
+                {
+                    "url": "https://github.com/sebastianbergmann",
+                    "type": "github"
+                }
+            ],
+            "time": "2020-11-30T08:20:02+00:00"
         },
         {
             "name": "phpunit/php-token-stream",
-            "version": "3.1.1",
+            "version": "3.1.3",
             "source": {
                 "type": "git",
                 "url": "https://github.com/sebastianbergmann/php-token-stream.git",
-                "reference": "995192df77f63a59e47f025390d2d1fdf8f425ff"
+                "reference": "9c1da83261628cb24b6a6df371b6e312b3954768"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/php-token-stream/zipball/995192df77f63a59e47f025390d2d1fdf8f425ff",
-                "reference": "995192df77f63a59e47f025390d2d1fdf8f425ff",
+                "url": "https://api.github.com/repos/sebastianbergmann/php-token-stream/zipball/9c1da83261628cb24b6a6df371b6e312b3954768",
+                "reference": "9c1da83261628cb24b6a6df371b6e312b3954768",
                 "shasum": ""
             },
             "require": {
                 "ext-tokenizer": "*",
-                "php": "^7.1"
+                "php": ">=7.1"
             },
             "require-dev": {
                 "phpunit/phpunit": "^7.0"
@@ -3460,20 +4264,31 @@
             "keywords": [
                 "tokenizer"
             ],
-            "time": "2019-09-17T06:23:10+00:00"
+            "support": {
+                "issues": "https://github.com/sebastianbergmann/php-token-stream/issues",
+                "source": "https://github.com/sebastianbergmann/php-token-stream/tree/3.1.3"
+            },
+            "funding": [
+                {
+                    "url": "https://github.com/sebastianbergmann",
+                    "type": "github"
+                }
+            ],
+            "abandoned": true,
+            "time": "2021-07-26T12:15:06+00:00"
         },
         {
             "name": "phpunit/phpunit",
-            "version": "7.5.16",
+            "version": "7.5.20",
             "source": {
                 "type": "git",
                 "url": "https://github.com/sebastianbergmann/phpunit.git",
-                "reference": "316afa6888d2562e04aeb67ea7f2017a0eb41661"
+                "reference": "9467db479d1b0487c99733bb1e7944d32deded2c"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/316afa6888d2562e04aeb67ea7f2017a0eb41661",
-                "reference": "316afa6888d2562e04aeb67ea7f2017a0eb41661",
+                "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/9467db479d1b0487c99733bb1e7944d32deded2c",
+                "reference": "9467db479d1b0487c99733bb1e7944d32deded2c",
                 "shasum": ""
             },
             "require": {
@@ -3544,31 +4359,30 @@
                 "testing",
                 "xunit"
             ],
-            "time": "2019-09-14T09:08:39+00:00"
+            "support": {
+                "issues": "https://github.com/sebastianbergmann/phpunit/issues",
+                "source": "https://github.com/sebastianbergmann/phpunit/tree/7.5.20"
+            },
+            "time": "2020-01-08T08:45:45+00:00"
         },
         {
             "name": "psr/container",
-            "version": "1.0.0",
+            "version": "1.1.1",
             "source": {
                 "type": "git",
                 "url": "https://github.com/php-fig/container.git",
-                "reference": "b7ce3b176482dbbc1245ebf52b181af44c2cf55f"
+                "reference": "8622567409010282b7aeebe4bb841fe98b58dcaf"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/php-fig/container/zipball/b7ce3b176482dbbc1245ebf52b181af44c2cf55f",
-                "reference": "b7ce3b176482dbbc1245ebf52b181af44c2cf55f",
+                "url": "https://api.github.com/repos/php-fig/container/zipball/8622567409010282b7aeebe4bb841fe98b58dcaf",
+                "reference": "8622567409010282b7aeebe4bb841fe98b58dcaf",
                 "shasum": ""
             },
             "require": {
-                "php": ">=5.3.0"
+                "php": ">=7.2.0"
             },
             "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-master": "1.0.x-dev"
-                }
-            },
             "autoload": {
                 "psr-4": {
                     "Psr\\Container\\": "src/"
@@ -3581,7 +4395,7 @@
             "authors": [
                 {
                     "name": "PHP-FIG",
-                    "homepage": "http://www.php-fig.org/"
+                    "homepage": "https://www.php-fig.org/"
                 }
             ],
             "description": "Common Container Interface (PHP FIG PSR-11)",
@@ -3593,7 +4407,11 @@
                 "container-interop",
                 "psr"
             ],
-            "time": "2017-02-14T16:28:37+00:00"
+            "support": {
+                "issues": "https://github.com/php-fig/container/issues",
+                "source": "https://github.com/php-fig/container/tree/1.1.1"
+            },
+            "time": "2021-03-05T17:36:06+00:00"
         },
         {
             "name": "psr/http-message",
@@ -3643,6 +4461,9 @@
                 "request",
                 "response"
             ],
+            "support": {
+                "source": "https://github.com/php-fig/http-message/tree/master"
+            },
             "time": "2016-08-06T14:39:51+00:00"
         },
         {
@@ -3683,27 +4504,31 @@
                 }
             ],
             "description": "A polyfill for getallheaders.",
+            "support": {
+                "issues": "https://github.com/ralouphie/getallheaders/issues",
+                "source": "https://github.com/ralouphie/getallheaders/tree/develop"
+            },
             "time": "2019-03-08T08:55:37+00:00"
         },
         {
             "name": "sebastian/code-unit-reverse-lookup",
-            "version": "1.0.1",
+            "version": "1.0.2",
             "source": {
                 "type": "git",
                 "url": "https://github.com/sebastianbergmann/code-unit-reverse-lookup.git",
-                "reference": "4419fcdb5eabb9caa61a27c7a1db532a6b55dd18"
+                "reference": "1de8cd5c010cb153fcd68b8d0f64606f523f7619"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/code-unit-reverse-lookup/zipball/4419fcdb5eabb9caa61a27c7a1db532a6b55dd18",
-                "reference": "4419fcdb5eabb9caa61a27c7a1db532a6b55dd18",
+                "url": "https://api.github.com/repos/sebastianbergmann/code-unit-reverse-lookup/zipball/1de8cd5c010cb153fcd68b8d0f64606f523f7619",
+                "reference": "1de8cd5c010cb153fcd68b8d0f64606f523f7619",
                 "shasum": ""
             },
             "require": {
-                "php": "^5.6 || ^7.0"
+                "php": ">=5.6"
             },
             "require-dev": {
-                "phpunit/phpunit": "^5.7 || ^6.0"
+                "phpunit/phpunit": "^8.5"
             },
             "type": "library",
             "extra": {
@@ -3728,29 +4553,39 @@
             ],
             "description": "Looks up which function or method a line of code belongs to",
             "homepage": "https://github.com/sebastianbergmann/code-unit-reverse-lookup/",
-            "time": "2017-03-04T06:30:41+00:00"
+            "support": {
+                "issues": "https://github.com/sebastianbergmann/code-unit-reverse-lookup/issues",
+                "source": "https://github.com/sebastianbergmann/code-unit-reverse-lookup/tree/1.0.2"
+            },
+            "funding": [
+                {
+                    "url": "https://github.com/sebastianbergmann",
+                    "type": "github"
+                }
+            ],
+            "time": "2020-11-30T08:15:22+00:00"
         },
         {
             "name": "sebastian/comparator",
-            "version": "3.0.2",
+            "version": "3.0.3",
             "source": {
                 "type": "git",
                 "url": "https://github.com/sebastianbergmann/comparator.git",
-                "reference": "5de4fc177adf9bce8df98d8d141a7559d7ccf6da"
+                "reference": "1071dfcef776a57013124ff35e1fc41ccd294758"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/comparator/zipball/5de4fc177adf9bce8df98d8d141a7559d7ccf6da",
-                "reference": "5de4fc177adf9bce8df98d8d141a7559d7ccf6da",
+                "url": "https://api.github.com/repos/sebastianbergmann/comparator/zipball/1071dfcef776a57013124ff35e1fc41ccd294758",
+                "reference": "1071dfcef776a57013124ff35e1fc41ccd294758",
                 "shasum": ""
             },
             "require": {
-                "php": "^7.1",
+                "php": ">=7.1",
                 "sebastian/diff": "^3.0",
                 "sebastian/exporter": "^3.1"
             },
             "require-dev": {
-                "phpunit/phpunit": "^7.1"
+                "phpunit/phpunit": "^8.5"
             },
             "type": "library",
             "extra": {
@@ -3768,6 +4603,10 @@
                 "BSD-3-Clause"
             ],
             "authors": [
+                {
+                    "name": "Sebastian Bergmann",
+                    "email": "sebastian@phpunit.de"
+                },
                 {
                     "name": "Jeff Welch",
                     "email": "whatthejeff@gmail.com"
@@ -3779,10 +4618,6 @@
                 {
                     "name": "Bernhard Schussek",
                     "email": "bschussek@2bepublished.at"
-                },
-                {
-                    "name": "Sebastian Bergmann",
-                    "email": "sebastian@phpunit.de"
                 }
             ],
             "description": "Provides the functionality to compare PHP values for equality",
@@ -3792,24 +4627,34 @@
                 "compare",
                 "equality"
             ],
-            "time": "2018-07-12T15:12:46+00:00"
+            "support": {
+                "issues": "https://github.com/sebastianbergmann/comparator/issues",
+                "source": "https://github.com/sebastianbergmann/comparator/tree/3.0.3"
+            },
+            "funding": [
+                {
+                    "url": "https://github.com/sebastianbergmann",
+                    "type": "github"
+                }
+            ],
+            "time": "2020-11-30T08:04:30+00:00"
         },
         {
             "name": "sebastian/diff",
-            "version": "3.0.2",
+            "version": "3.0.3",
             "source": {
                 "type": "git",
                 "url": "https://github.com/sebastianbergmann/diff.git",
-                "reference": "720fcc7e9b5cf384ea68d9d930d480907a0c1a29"
+                "reference": "14f72dd46eaf2f2293cbe79c93cc0bc43161a211"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/diff/zipball/720fcc7e9b5cf384ea68d9d930d480907a0c1a29",
-                "reference": "720fcc7e9b5cf384ea68d9d930d480907a0c1a29",
+                "url": "https://api.github.com/repos/sebastianbergmann/diff/zipball/14f72dd46eaf2f2293cbe79c93cc0bc43161a211",
+                "reference": "14f72dd46eaf2f2293cbe79c93cc0bc43161a211",
                 "shasum": ""
             },
             "require": {
-                "php": "^7.1"
+                "php": ">=7.1"
             },
             "require-dev": {
                 "phpunit/phpunit": "^7.5 || ^8.0",
@@ -3831,13 +4676,13 @@
                 "BSD-3-Clause"
             ],
             "authors": [
-                {
-                    "name": "Kore Nordmann",
-                    "email": "mail@kore-nordmann.de"
-                },
                 {
                     "name": "Sebastian Bergmann",
                     "email": "sebastian@phpunit.de"
+                },
+                {
+                    "name": "Kore Nordmann",
+                    "email": "mail@kore-nordmann.de"
                 }
             ],
             "description": "Diff implementation",
@@ -3848,24 +4693,34 @@
                 "unidiff",
                 "unified diff"
             ],
-            "time": "2019-02-04T06:01:07+00:00"
+            "support": {
+                "issues": "https://github.com/sebastianbergmann/diff/issues",
+                "source": "https://github.com/sebastianbergmann/diff/tree/3.0.3"
+            },
+            "funding": [
+                {
+                    "url": "https://github.com/sebastianbergmann",
+                    "type": "github"
+                }
+            ],
+            "time": "2020-11-30T07:59:04+00:00"
         },
         {
             "name": "sebastian/environment",
-            "version": "4.2.2",
+            "version": "4.2.4",
             "source": {
                 "type": "git",
                 "url": "https://github.com/sebastianbergmann/environment.git",
-                "reference": "f2a2c8e1c97c11ace607a7a667d73d47c19fe404"
+                "reference": "d47bbbad83711771f167c72d4e3f25f7fcc1f8b0"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/environment/zipball/f2a2c8e1c97c11ace607a7a667d73d47c19fe404",
-                "reference": "f2a2c8e1c97c11ace607a7a667d73d47c19fe404",
+                "url": "https://api.github.com/repos/sebastianbergmann/environment/zipball/d47bbbad83711771f167c72d4e3f25f7fcc1f8b0",
+                "reference": "d47bbbad83711771f167c72d4e3f25f7fcc1f8b0",
                 "shasum": ""
             },
             "require": {
-                "php": "^7.1"
+                "php": ">=7.1"
             },
             "require-dev": {
                 "phpunit/phpunit": "^7.5"
@@ -3901,24 +4756,34 @@
                 "environment",
                 "hhvm"
             ],
-            "time": "2019-05-05T09:05:15+00:00"
+            "support": {
+                "issues": "https://github.com/sebastianbergmann/environment/issues",
+                "source": "https://github.com/sebastianbergmann/environment/tree/4.2.4"
+            },
+            "funding": [
+                {
+                    "url": "https://github.com/sebastianbergmann",
+                    "type": "github"
+                }
+            ],
+            "time": "2020-11-30T07:53:42+00:00"
         },
         {
             "name": "sebastian/exporter",
-            "version": "3.1.2",
+            "version": "3.1.3",
             "source": {
                 "type": "git",
                 "url": "https://github.com/sebastianbergmann/exporter.git",
-                "reference": "68609e1261d215ea5b21b7987539cbfbe156ec3e"
+                "reference": "6b853149eab67d4da22291d36f5b0631c0fd856e"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/exporter/zipball/68609e1261d215ea5b21b7987539cbfbe156ec3e",
-                "reference": "68609e1261d215ea5b21b7987539cbfbe156ec3e",
+                "url": "https://api.github.com/repos/sebastianbergmann/exporter/zipball/6b853149eab67d4da22291d36f5b0631c0fd856e",
+                "reference": "6b853149eab67d4da22291d36f5b0631c0fd856e",
                 "shasum": ""
             },
             "require": {
-                "php": "^7.0",
+                "php": ">=7.0",
                 "sebastian/recursion-context": "^3.0"
             },
             "require-dev": {
@@ -3968,7 +4833,17 @@
                 "export",
                 "exporter"
             ],
-            "time": "2019-09-14T09:02:43+00:00"
+            "support": {
+                "issues": "https://github.com/sebastianbergmann/exporter/issues",
+                "source": "https://github.com/sebastianbergmann/exporter/tree/3.1.3"
+            },
+            "funding": [
+                {
+                    "url": "https://github.com/sebastianbergmann",
+                    "type": "github"
+                }
+            ],
+            "time": "2020-11-30T07:47:53+00:00"
         },
         {
             "name": "sebastian/global-state",
@@ -4019,24 +4894,28 @@
             "keywords": [
                 "global state"
             ],
+            "support": {
+                "issues": "https://github.com/sebastianbergmann/global-state/issues",
+                "source": "https://github.com/sebastianbergmann/global-state/tree/2.0.0"
+            },
             "time": "2017-04-27T15:39:26+00:00"
         },
         {
             "name": "sebastian/object-enumerator",
-            "version": "3.0.3",
+            "version": "3.0.4",
             "source": {
                 "type": "git",
                 "url": "https://github.com/sebastianbergmann/object-enumerator.git",
-                "reference": "7cfd9e65d11ffb5af41198476395774d4c8a84c5"
+                "reference": "e67f6d32ebd0c749cf9d1dbd9f226c727043cdf2"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/object-enumerator/zipball/7cfd9e65d11ffb5af41198476395774d4c8a84c5",
-                "reference": "7cfd9e65d11ffb5af41198476395774d4c8a84c5",
+                "url": "https://api.github.com/repos/sebastianbergmann/object-enumerator/zipball/e67f6d32ebd0c749cf9d1dbd9f226c727043cdf2",
+                "reference": "e67f6d32ebd0c749cf9d1dbd9f226c727043cdf2",
                 "shasum": ""
             },
             "require": {
-                "php": "^7.0",
+                "php": ">=7.0",
                 "sebastian/object-reflector": "^1.1.1",
                 "sebastian/recursion-context": "^3.0"
             },
@@ -4066,24 +4945,34 @@
             ],
             "description": "Traverses array structures and object graphs to enumerate all referenced objects",
             "homepage": "https://github.com/sebastianbergmann/object-enumerator/",
-            "time": "2017-08-03T12:35:26+00:00"
+            "support": {
+                "issues": "https://github.com/sebastianbergmann/object-enumerator/issues",
+                "source": "https://github.com/sebastianbergmann/object-enumerator/tree/3.0.4"
+            },
+            "funding": [
+                {
+                    "url": "https://github.com/sebastianbergmann",
+                    "type": "github"
+                }
+            ],
+            "time": "2020-11-30T07:40:27+00:00"
         },
         {
             "name": "sebastian/object-reflector",
-            "version": "1.1.1",
+            "version": "1.1.2",
             "source": {
                 "type": "git",
                 "url": "https://github.com/sebastianbergmann/object-reflector.git",
-                "reference": "773f97c67f28de00d397be301821b06708fca0be"
+                "reference": "9b8772b9cbd456ab45d4a598d2dd1a1bced6363d"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/object-reflector/zipball/773f97c67f28de00d397be301821b06708fca0be",
-                "reference": "773f97c67f28de00d397be301821b06708fca0be",
+                "url": "https://api.github.com/repos/sebastianbergmann/object-reflector/zipball/9b8772b9cbd456ab45d4a598d2dd1a1bced6363d",
+                "reference": "9b8772b9cbd456ab45d4a598d2dd1a1bced6363d",
                 "shasum": ""
             },
             "require": {
-                "php": "^7.0"
+                "php": ">=7.0"
             },
             "require-dev": {
                 "phpunit/phpunit": "^6.0"
@@ -4111,24 +5000,34 @@
             ],
             "description": "Allows reflection of object attributes, including inherited and non-public ones",
             "homepage": "https://github.com/sebastianbergmann/object-reflector/",
-            "time": "2017-03-29T09:07:27+00:00"
+            "support": {
+                "issues": "https://github.com/sebastianbergmann/object-reflector/issues",
+                "source": "https://github.com/sebastianbergmann/object-reflector/tree/1.1.2"
+            },
+            "funding": [
+                {
+                    "url": "https://github.com/sebastianbergmann",
+                    "type": "github"
+                }
+            ],
+            "time": "2020-11-30T07:37:18+00:00"
         },
         {
             "name": "sebastian/recursion-context",
-            "version": "3.0.0",
+            "version": "3.0.1",
             "source": {
                 "type": "git",
                 "url": "https://github.com/sebastianbergmann/recursion-context.git",
-                "reference": "5b0cd723502bac3b006cbf3dbf7a1e3fcefe4fa8"
+                "reference": "367dcba38d6e1977be014dc4b22f47a484dac7fb"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/recursion-context/zipball/5b0cd723502bac3b006cbf3dbf7a1e3fcefe4fa8",
-                "reference": "5b0cd723502bac3b006cbf3dbf7a1e3fcefe4fa8",
+                "url": "https://api.github.com/repos/sebastianbergmann/recursion-context/zipball/367dcba38d6e1977be014dc4b22f47a484dac7fb",
+                "reference": "367dcba38d6e1977be014dc4b22f47a484dac7fb",
                 "shasum": ""
             },
             "require": {
-                "php": "^7.0"
+                "php": ">=7.0"
             },
             "require-dev": {
                 "phpunit/phpunit": "^6.0"
@@ -4149,14 +5048,14 @@
                 "BSD-3-Clause"
             ],
             "authors": [
-                {
-                    "name": "Jeff Welch",
-                    "email": "whatthejeff@gmail.com"
-                },
                 {
                     "name": "Sebastian Bergmann",
                     "email": "sebastian@phpunit.de"
                 },
+                {
+                    "name": "Jeff Welch",
+                    "email": "whatthejeff@gmail.com"
+                },
                 {
                     "name": "Adam Harvey",
                     "email": "aharvey@php.net"
@@ -4164,24 +5063,34 @@
             ],
             "description": "Provides functionality to recursively process PHP variables",
             "homepage": "http://www.github.com/sebastianbergmann/recursion-context",
-            "time": "2017-03-03T06:23:57+00:00"
+            "support": {
+                "issues": "https://github.com/sebastianbergmann/recursion-context/issues",
+                "source": "https://github.com/sebastianbergmann/recursion-context/tree/3.0.1"
+            },
+            "funding": [
+                {
+                    "url": "https://github.com/sebastianbergmann",
+                    "type": "github"
+                }
+            ],
+            "time": "2020-11-30T07:34:24+00:00"
         },
         {
             "name": "sebastian/resource-operations",
-            "version": "2.0.1",
+            "version": "2.0.2",
             "source": {
                 "type": "git",
                 "url": "https://github.com/sebastianbergmann/resource-operations.git",
-                "reference": "4d7a795d35b889bf80a0cc04e08d77cedfa917a9"
+                "reference": "31d35ca87926450c44eae7e2611d45a7a65ea8b3"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/resource-operations/zipball/4d7a795d35b889bf80a0cc04e08d77cedfa917a9",
-                "reference": "4d7a795d35b889bf80a0cc04e08d77cedfa917a9",
+                "url": "https://api.github.com/repos/sebastianbergmann/resource-operations/zipball/31d35ca87926450c44eae7e2611d45a7a65ea8b3",
+                "reference": "31d35ca87926450c44eae7e2611d45a7a65ea8b3",
                 "shasum": ""
             },
             "require": {
-                "php": "^7.1"
+                "php": ">=7.1"
             },
             "type": "library",
             "extra": {
@@ -4206,7 +5115,17 @@
             ],
             "description": "Provides a list of PHP built-in functions that operate on resources",
             "homepage": "https://www.github.com/sebastianbergmann/resource-operations",
-            "time": "2018-10-04T04:07:39+00:00"
+            "support": {
+                "issues": "https://github.com/sebastianbergmann/resource-operations/issues",
+                "source": "https://github.com/sebastianbergmann/resource-operations/tree/2.0.2"
+            },
+            "funding": [
+                {
+                    "url": "https://github.com/sebastianbergmann",
+                    "type": "github"
+                }
+            ],
+            "time": "2020-11-30T07:30:19+00:00"
         },
         {
             "name": "sebastian/version",
@@ -4249,41 +5168,41 @@
             ],
             "description": "Library that helps with managing the version number of Git-hosted PHP projects",
             "homepage": "https://github.com/sebastianbergmann/version",
+            "support": {
+                "issues": "https://github.com/sebastianbergmann/version/issues",
+                "source": "https://github.com/sebastianbergmann/version/tree/master"
+            },
             "time": "2016-10-03T07:35:21+00:00"
         },
         {
             "name": "symfony/browser-kit",
-            "version": "v4.3.5",
+            "version": "v4.4.27",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/browser-kit.git",
-                "reference": "78b7611c45039e8ce81698be319851529bf040b1"
+                "reference": "9629d1524d8ced5a4ec3e94abdbd638b4ec8319b"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/browser-kit/zipball/78b7611c45039e8ce81698be319851529bf040b1",
-                "reference": "78b7611c45039e8ce81698be319851529bf040b1",
+                "url": "https://api.github.com/repos/symfony/browser-kit/zipball/9629d1524d8ced5a4ec3e94abdbd638b4ec8319b",
+                "reference": "9629d1524d8ced5a4ec3e94abdbd638b4ec8319b",
                 "shasum": ""
             },
             "require": {
-                "php": "^7.1.3",
-                "symfony/dom-crawler": "~3.4|~4.0"
+                "php": ">=7.1.3",
+                "symfony/dom-crawler": "^3.4|^4.0|^5.0",
+                "symfony/polyfill-php80": "^1.16"
             },
             "require-dev": {
-                "symfony/css-selector": "~3.4|~4.0",
-                "symfony/http-client": "^4.3",
-                "symfony/mime": "^4.3",
-                "symfony/process": "~3.4|~4.0"
+                "symfony/css-selector": "^3.4|^4.0|^5.0",
+                "symfony/http-client": "^4.3|^5.0",
+                "symfony/mime": "^4.3|^5.0",
+                "symfony/process": "^3.4|^4.0|^5.0"
             },
             "suggest": {
                 "symfony/process": ""
             },
             "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-master": "4.3-dev"
-                }
-            },
             "autoload": {
                 "psr-4": {
                     "Symfony\\Component\\BrowserKit\\": ""
@@ -4306,46 +5225,66 @@
                     "homepage": "https://symfony.com/contributors"
                 }
             ],
-            "description": "Symfony BrowserKit Component",
+            "description": "Simulates the behavior of a web browser, allowing you to make requests, click on links and submit forms programmatically",
             "homepage": "https://symfony.com",
-            "time": "2019-09-10T11:25:17+00:00"
+            "support": {
+                "source": "https://github.com/symfony/browser-kit/tree/v4.4.27"
+            },
+            "funding": [
+                {
+                    "url": "https://symfony.com/sponsor",
+                    "type": "custom"
+                },
+                {
+                    "url": "https://github.com/fabpot",
+                    "type": "github"
+                },
+                {
+                    "url": "https://tidelift.com/funding/github/packagist/symfony/symfony",
+                    "type": "tidelift"
+                }
+            ],
+            "time": "2021-07-21T12:19:41+00:00"
         },
         {
             "name": "symfony/console",
-            "version": "v4.3.5",
+            "version": "v4.4.29",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/console.git",
-                "reference": "929ddf360d401b958f611d44e726094ab46a7369"
+                "reference": "8baf0bbcfddfde7d7225ae8e04705cfd1081cd7b"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/console/zipball/929ddf360d401b958f611d44e726094ab46a7369",
-                "reference": "929ddf360d401b958f611d44e726094ab46a7369",
+                "url": "https://api.github.com/repos/symfony/console/zipball/8baf0bbcfddfde7d7225ae8e04705cfd1081cd7b",
+                "reference": "8baf0bbcfddfde7d7225ae8e04705cfd1081cd7b",
                 "shasum": ""
             },
             "require": {
-                "php": "^7.1.3",
+                "php": ">=7.1.3",
                 "symfony/polyfill-mbstring": "~1.0",
                 "symfony/polyfill-php73": "^1.8",
-                "symfony/service-contracts": "^1.1"
+                "symfony/polyfill-php80": "^1.16",
+                "symfony/service-contracts": "^1.1|^2"
             },
             "conflict": {
+                "psr/log": ">=3",
                 "symfony/dependency-injection": "<3.4",
-                "symfony/event-dispatcher": "<4.3",
+                "symfony/event-dispatcher": "<4.3|>=5",
+                "symfony/lock": "<4.4",
                 "symfony/process": "<3.3"
             },
             "provide": {
-                "psr/log-implementation": "1.0"
+                "psr/log-implementation": "1.0|2.0"
             },
             "require-dev": {
-                "psr/log": "~1.0",
-                "symfony/config": "~3.4|~4.0",
-                "symfony/dependency-injection": "~3.4|~4.0",
+                "psr/log": "^1|^2",
+                "symfony/config": "^3.4|^4.0|^5.0",
+                "symfony/dependency-injection": "^3.4|^4.0|^5.0",
                 "symfony/event-dispatcher": "^4.3",
-                "symfony/lock": "~3.4|~4.0",
-                "symfony/process": "~3.4|~4.0",
-                "symfony/var-dumper": "^4.3"
+                "symfony/lock": "^4.4|^5.0",
+                "symfony/process": "^3.4|^4.0|^5.0",
+                "symfony/var-dumper": "^4.3|^5.0"
             },
             "suggest": {
                 "psr/log": "For using the console logger",
@@ -4354,11 +5293,6 @@
                 "symfony/process": ""
             },
             "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-master": "4.3-dev"
-                }
-            },
             "autoload": {
                 "psr-4": {
                     "Symfony\\Component\\Console\\": ""
@@ -4381,33 +5315,46 @@
                     "homepage": "https://symfony.com/contributors"
                 }
             ],
-            "description": "Symfony Console Component",
+            "description": "Eases the creation of beautiful and testable command line interfaces",
             "homepage": "https://symfony.com",
-            "time": "2019-10-07T12:36:49+00:00"
+            "support": {
+                "source": "https://github.com/symfony/console/tree/v4.4.29"
+            },
+            "funding": [
+                {
+                    "url": "https://symfony.com/sponsor",
+                    "type": "custom"
+                },
+                {
+                    "url": "https://github.com/fabpot",
+                    "type": "github"
+                },
+                {
+                    "url": "https://tidelift.com/funding/github/packagist/symfony/symfony",
+                    "type": "tidelift"
+                }
+            ],
+            "time": "2021-07-27T19:04:53+00:00"
         },
         {
             "name": "symfony/css-selector",
-            "version": "v4.3.5",
+            "version": "v4.4.27",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/css-selector.git",
-                "reference": "f4b3ff6a549d9ed28b2b0ecd1781bf67cf220ee9"
+                "reference": "5194f18bd80d106f11efa8f7cd0fbdcc3af96ce6"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/css-selector/zipball/f4b3ff6a549d9ed28b2b0ecd1781bf67cf220ee9",
-                "reference": "f4b3ff6a549d9ed28b2b0ecd1781bf67cf220ee9",
+                "url": "https://api.github.com/repos/symfony/css-selector/zipball/5194f18bd80d106f11efa8f7cd0fbdcc3af96ce6",
+                "reference": "5194f18bd80d106f11efa8f7cd0fbdcc3af96ce6",
                 "shasum": ""
             },
             "require": {
-                "php": "^7.1.3"
+                "php": ">=7.1.3",
+                "symfony/polyfill-php80": "^1.16"
             },
             "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-master": "4.3-dev"
-                }
-            },
             "autoload": {
                 "psr-4": {
                     "Symfony\\Component\\CssSelector\\": ""
@@ -4434,45 +5381,125 @@
                     "homepage": "https://symfony.com/contributors"
                 }
             ],
-            "description": "Symfony CssSelector Component",
+            "description": "Converts CSS selectors to XPath expressions",
             "homepage": "https://symfony.com",
-            "time": "2019-10-02T08:36:26+00:00"
+            "support": {
+                "source": "https://github.com/symfony/css-selector/tree/v4.4.27"
+            },
+            "funding": [
+                {
+                    "url": "https://symfony.com/sponsor",
+                    "type": "custom"
+                },
+                {
+                    "url": "https://github.com/fabpot",
+                    "type": "github"
+                },
+                {
+                    "url": "https://tidelift.com/funding/github/packagist/symfony/symfony",
+                    "type": "tidelift"
+                }
+            ],
+            "time": "2021-07-21T12:19:41+00:00"
         },
         {
-            "name": "symfony/dom-crawler",
-            "version": "v4.3.5",
+            "name": "symfony/deprecation-contracts",
+            "version": "v2.4.0",
             "source": {
                 "type": "git",
-                "url": "https://github.com/symfony/dom-crawler.git",
-                "reference": "e9f7b4d19d69b133bd638eeddcdc757723b4211f"
+                "url": "https://github.com/symfony/deprecation-contracts.git",
+                "reference": "5f38c8804a9e97d23e0c8d63341088cd8a22d627"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/dom-crawler/zipball/e9f7b4d19d69b133bd638eeddcdc757723b4211f",
-                "reference": "e9f7b4d19d69b133bd638eeddcdc757723b4211f",
+                "url": "https://api.github.com/repos/symfony/deprecation-contracts/zipball/5f38c8804a9e97d23e0c8d63341088cd8a22d627",
+                "reference": "5f38c8804a9e97d23e0c8d63341088cd8a22d627",
                 "shasum": ""
             },
             "require": {
-                "php": "^7.1.3",
+                "php": ">=7.1"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-main": "2.4-dev"
+                },
+                "thanks": {
+                    "name": "symfony/contracts",
+                    "url": "https://github.com/symfony/contracts"
+                }
+            },
+            "autoload": {
+                "files": [
+                    "function.php"
+                ]
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Nicolas Grekas",
+                    "email": "p@tchwork.com"
+                },
+                {
+                    "name": "Symfony Community",
+                    "homepage": "https://symfony.com/contributors"
+                }
+            ],
+            "description": "A generic function and convention to trigger deprecation notices",
+            "homepage": "https://symfony.com",
+            "support": {
+                "source": "https://github.com/symfony/deprecation-contracts/tree/v2.4.0"
+            },
+            "funding": [
+                {
+                    "url": "https://symfony.com/sponsor",
+                    "type": "custom"
+                },
+                {
+                    "url": "https://github.com/fabpot",
+                    "type": "github"
+                },
+                {
+                    "url": "https://tidelift.com/funding/github/packagist/symfony/symfony",
+                    "type": "tidelift"
+                }
+            ],
+            "time": "2021-03-23T23:28:01+00:00"
+        },
+        {
+            "name": "symfony/dom-crawler",
+            "version": "v4.4.27",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/symfony/dom-crawler.git",
+                "reference": "86aa075c9e0b13ac7db8d73d1f9d8b656143881a"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/symfony/dom-crawler/zipball/86aa075c9e0b13ac7db8d73d1f9d8b656143881a",
+                "reference": "86aa075c9e0b13ac7db8d73d1f9d8b656143881a",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=7.1.3",
                 "symfony/polyfill-ctype": "~1.8",
-                "symfony/polyfill-mbstring": "~1.0"
+                "symfony/polyfill-mbstring": "~1.0",
+                "symfony/polyfill-php80": "^1.16"
             },
             "conflict": {
                 "masterminds/html5": "<2.6"
             },
             "require-dev": {
                 "masterminds/html5": "^2.6",
-                "symfony/css-selector": "~3.4|~4.0"
+                "symfony/css-selector": "^3.4|^4.0|^5.0"
             },
             "suggest": {
                 "symfony/css-selector": ""
             },
             "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-master": "4.3-dev"
-                }
-            },
             "autoload": {
                 "psr-4": {
                     "Symfony\\Component\\DomCrawler\\": ""
@@ -4495,27 +5522,45 @@
                     "homepage": "https://symfony.com/contributors"
                 }
             ],
-            "description": "Symfony DomCrawler Component",
+            "description": "Eases DOM navigation for HTML and XML documents",
             "homepage": "https://symfony.com",
-            "time": "2019-09-28T21:25:05+00:00"
+            "support": {
+                "source": "https://github.com/symfony/dom-crawler/tree/v4.4.27"
+            },
+            "funding": [
+                {
+                    "url": "https://symfony.com/sponsor",
+                    "type": "custom"
+                },
+                {
+                    "url": "https://github.com/fabpot",
+                    "type": "github"
+                },
+                {
+                    "url": "https://tidelift.com/funding/github/packagist/symfony/symfony",
+                    "type": "tidelift"
+                }
+            ],
+            "time": "2021-07-23T15:41:52+00:00"
         },
         {
             "name": "symfony/event-dispatcher",
-            "version": "v4.3.5",
+            "version": "v4.4.27",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/event-dispatcher.git",
-                "reference": "6229f58993e5a157f6096fc7145c0717d0be8807"
+                "reference": "958a128b184fcf0ba45ec90c0e88554c9327c2e9"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/event-dispatcher/zipball/6229f58993e5a157f6096fc7145c0717d0be8807",
-                "reference": "6229f58993e5a157f6096fc7145c0717d0be8807",
+                "url": "https://api.github.com/repos/symfony/event-dispatcher/zipball/958a128b184fcf0ba45ec90c0e88554c9327c2e9",
+                "reference": "958a128b184fcf0ba45ec90c0e88554c9327c2e9",
                 "shasum": ""
             },
             "require": {
-                "php": "^7.1.3",
-                "symfony/event-dispatcher-contracts": "^1.1"
+                "php": ">=7.1.3",
+                "symfony/event-dispatcher-contracts": "^1.1",
+                "symfony/polyfill-php80": "^1.16"
             },
             "conflict": {
                 "symfony/dependency-injection": "<3.4"
@@ -4525,24 +5570,20 @@
                 "symfony/event-dispatcher-implementation": "1.1"
             },
             "require-dev": {
-                "psr/log": "~1.0",
-                "symfony/config": "~3.4|~4.0",
-                "symfony/dependency-injection": "~3.4|~4.0",
-                "symfony/expression-language": "~3.4|~4.0",
-                "symfony/http-foundation": "^3.4|^4.0",
-                "symfony/service-contracts": "^1.1",
-                "symfony/stopwatch": "~3.4|~4.0"
+                "psr/log": "^1|^2|^3",
+                "symfony/config": "^3.4|^4.0|^5.0",
+                "symfony/dependency-injection": "^3.4|^4.0|^5.0",
+                "symfony/error-handler": "~3.4|~4.4",
+                "symfony/expression-language": "^3.4|^4.0|^5.0",
+                "symfony/http-foundation": "^3.4|^4.0|^5.0",
+                "symfony/service-contracts": "^1.1|^2",
+                "symfony/stopwatch": "^3.4|^4.0|^5.0"
             },
             "suggest": {
                 "symfony/dependency-injection": "",
                 "symfony/http-kernel": ""
             },
             "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-master": "4.3-dev"
-                }
-            },
             "autoload": {
                 "psr-4": {
                     "Symfony\\Component\\EventDispatcher\\": ""
@@ -4565,26 +5606,43 @@
                     "homepage": "https://symfony.com/contributors"
                 }
             ],
-            "description": "Symfony EventDispatcher Component",
+            "description": "Provides tools that allow your application components to communicate with each other by dispatching events and listening to them",
             "homepage": "https://symfony.com",
-            "time": "2019-10-01T16:40:32+00:00"
+            "support": {
+                "source": "https://github.com/symfony/event-dispatcher/tree/v4.4.27"
+            },
+            "funding": [
+                {
+                    "url": "https://symfony.com/sponsor",
+                    "type": "custom"
+                },
+                {
+                    "url": "https://github.com/fabpot",
+                    "type": "github"
+                },
+                {
+                    "url": "https://tidelift.com/funding/github/packagist/symfony/symfony",
+                    "type": "tidelift"
+                }
+            ],
+            "time": "2021-07-23T15:41:52+00:00"
         },
         {
             "name": "symfony/event-dispatcher-contracts",
-            "version": "v1.1.7",
+            "version": "v1.1.9",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/event-dispatcher-contracts.git",
-                "reference": "c43ab685673fb6c8d84220c77897b1d6cdbe1d18"
+                "reference": "84e23fdcd2517bf37aecbd16967e83f0caee25a7"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/event-dispatcher-contracts/zipball/c43ab685673fb6c8d84220c77897b1d6cdbe1d18",
-                "reference": "c43ab685673fb6c8d84220c77897b1d6cdbe1d18",
+                "url": "https://api.github.com/repos/symfony/event-dispatcher-contracts/zipball/84e23fdcd2517bf37aecbd16967e83f0caee25a7",
+                "reference": "84e23fdcd2517bf37aecbd16967e83f0caee25a7",
                 "shasum": ""
             },
             "require": {
-                "php": "^7.1.3"
+                "php": ">=7.1.3"
             },
             "suggest": {
                 "psr/event-dispatcher": "",
@@ -4594,6 +5652,10 @@
             "extra": {
                 "branch-alias": {
                     "dev-master": "1.1-dev"
+                },
+                "thanks": {
+                    "name": "symfony/contracts",
+                    "url": "https://github.com/symfony/contracts"
                 }
             },
             "autoload": {
@@ -4625,31 +5687,44 @@
                 "interoperability",
                 "standards"
             ],
-            "time": "2019-09-17T09:54:03+00:00"
+            "support": {
+                "source": "https://github.com/symfony/event-dispatcher-contracts/tree/v1.1.9"
+            },
+            "funding": [
+                {
+                    "url": "https://symfony.com/sponsor",
+                    "type": "custom"
+                },
+                {
+                    "url": "https://github.com/fabpot",
+                    "type": "github"
+                },
+                {
+                    "url": "https://tidelift.com/funding/github/packagist/symfony/symfony",
+                    "type": "tidelift"
+                }
+            ],
+            "time": "2020-07-06T13:19:58+00:00"
         },
         {
             "name": "symfony/finder",
-            "version": "v4.3.5",
+            "version": "v4.4.27",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/finder.git",
-                "reference": "5e575faa95548d0586f6bedaeabec259714e44d1"
+                "reference": "42414d7ac96fc2880a783b872185789dea0d4262"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/finder/zipball/5e575faa95548d0586f6bedaeabec259714e44d1",
-                "reference": "5e575faa95548d0586f6bedaeabec259714e44d1",
+                "url": "https://api.github.com/repos/symfony/finder/zipball/42414d7ac96fc2880a783b872185789dea0d4262",
+                "reference": "42414d7ac96fc2880a783b872185789dea0d4262",
                 "shasum": ""
             },
             "require": {
-                "php": "^7.1.3"
+                "php": ">=7.1.3",
+                "symfony/polyfill-php80": "^1.16"
             },
             "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-master": "4.3-dev"
-                }
-            },
             "autoload": {
                 "psr-4": {
                     "Symfony\\Component\\Finder\\": ""
@@ -4672,26 +5747,43 @@
                     "homepage": "https://symfony.com/contributors"
                 }
             ],
-            "description": "Symfony Finder Component",
+            "description": "Finds files and directories via an intuitive fluent interface",
             "homepage": "https://symfony.com",
-            "time": "2019-09-16T11:29:48+00:00"
+            "support": {
+                "source": "https://github.com/symfony/finder/tree/v4.4.27"
+            },
+            "funding": [
+                {
+                    "url": "https://symfony.com/sponsor",
+                    "type": "custom"
+                },
+                {
+                    "url": "https://github.com/fabpot",
+                    "type": "github"
+                },
+                {
+                    "url": "https://tidelift.com/funding/github/packagist/symfony/symfony",
+                    "type": "tidelift"
+                }
+            ],
+            "time": "2021-07-23T15:41:52+00:00"
         },
         {
             "name": "symfony/polyfill-ctype",
-            "version": "v1.12.0",
+            "version": "v1.23.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/polyfill-ctype.git",
-                "reference": "550ebaac289296ce228a706d0867afc34687e3f4"
+                "reference": "46cd95797e9df938fdd2b03693b5fca5e64b01ce"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/polyfill-ctype/zipball/550ebaac289296ce228a706d0867afc34687e3f4",
-                "reference": "550ebaac289296ce228a706d0867afc34687e3f4",
+                "url": "https://api.github.com/repos/symfony/polyfill-ctype/zipball/46cd95797e9df938fdd2b03693b5fca5e64b01ce",
+                "reference": "46cd95797e9df938fdd2b03693b5fca5e64b01ce",
                 "shasum": ""
             },
             "require": {
-                "php": ">=5.3.3"
+                "php": ">=7.1"
             },
             "suggest": {
                 "ext-ctype": "For best performance"
@@ -4699,7 +5791,11 @@
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "1.12-dev"
+                    "dev-main": "1.23-dev"
+                },
+                "thanks": {
+                    "name": "symfony/polyfill",
+                    "url": "https://github.com/symfony/polyfill"
                 }
             },
             "autoload": {
@@ -4732,29 +5828,50 @@
                 "polyfill",
                 "portable"
             ],
-            "time": "2019-08-06T08:03:45+00:00"
+            "support": {
+                "source": "https://github.com/symfony/polyfill-ctype/tree/v1.23.0"
+            },
+            "funding": [
+                {
+                    "url": "https://symfony.com/sponsor",
+                    "type": "custom"
+                },
+                {
+                    "url": "https://github.com/fabpot",
+                    "type": "github"
+                },
+                {
+                    "url": "https://tidelift.com/funding/github/packagist/symfony/symfony",
+                    "type": "tidelift"
+                }
+            ],
+            "time": "2021-02-19T12:13:01+00:00"
         },
         {
             "name": "symfony/polyfill-php73",
-            "version": "v1.12.0",
+            "version": "v1.23.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/polyfill-php73.git",
-                "reference": "2ceb49eaccb9352bff54d22570276bb75ba4a188"
+                "reference": "fba8933c384d6476ab14fb7b8526e5287ca7e010"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/polyfill-php73/zipball/2ceb49eaccb9352bff54d22570276bb75ba4a188",
-                "reference": "2ceb49eaccb9352bff54d22570276bb75ba4a188",
+                "url": "https://api.github.com/repos/symfony/polyfill-php73/zipball/fba8933c384d6476ab14fb7b8526e5287ca7e010",
+                "reference": "fba8933c384d6476ab14fb7b8526e5287ca7e010",
                 "shasum": ""
             },
             "require": {
-                "php": ">=5.3.3"
+                "php": ">=7.1"
             },
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "1.12-dev"
+                    "dev-main": "1.23-dev"
+                },
+                "thanks": {
+                    "name": "symfony/polyfill",
+                    "url": "https://github.com/symfony/polyfill"
                 }
             },
             "autoload": {
@@ -4790,25 +5907,125 @@
                 "portable",
                 "shim"
             ],
-            "time": "2019-08-06T08:03:45+00:00"
+            "support": {
+                "source": "https://github.com/symfony/polyfill-php73/tree/v1.23.0"
+            },
+            "funding": [
+                {
+                    "url": "https://symfony.com/sponsor",
+                    "type": "custom"
+                },
+                {
+                    "url": "https://github.com/fabpot",
+                    "type": "github"
+                },
+                {
+                    "url": "https://tidelift.com/funding/github/packagist/symfony/symfony",
+                    "type": "tidelift"
+                }
+            ],
+            "time": "2021-02-19T12:13:01+00:00"
         },
         {
-            "name": "symfony/service-contracts",
-            "version": "v1.1.7",
+            "name": "symfony/polyfill-php80",
+            "version": "v1.23.1",
             "source": {
                 "type": "git",
-                "url": "https://github.com/symfony/service-contracts.git",
-                "reference": "ffcde9615dc5bb4825b9f6aed07716f1f57faae0"
+                "url": "https://github.com/symfony/polyfill-php80.git",
+                "reference": "1100343ed1a92e3a38f9ae122fc0eb21602547be"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/service-contracts/zipball/ffcde9615dc5bb4825b9f6aed07716f1f57faae0",
-                "reference": "ffcde9615dc5bb4825b9f6aed07716f1f57faae0",
+                "url": "https://api.github.com/repos/symfony/polyfill-php80/zipball/1100343ed1a92e3a38f9ae122fc0eb21602547be",
+                "reference": "1100343ed1a92e3a38f9ae122fc0eb21602547be",
                 "shasum": ""
             },
             "require": {
-                "php": "^7.1.3",
-                "psr/container": "^1.0"
+                "php": ">=7.1"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-main": "1.23-dev"
+                },
+                "thanks": {
+                    "name": "symfony/polyfill",
+                    "url": "https://github.com/symfony/polyfill"
+                }
+            },
+            "autoload": {
+                "psr-4": {
+                    "Symfony\\Polyfill\\Php80\\": ""
+                },
+                "files": [
+                    "bootstrap.php"
+                ],
+                "classmap": [
+                    "Resources/stubs"
+                ]
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Ion Bazan",
+                    "email": "ion.bazan@gmail.com"
+                },
+                {
+                    "name": "Nicolas Grekas",
+                    "email": "p@tchwork.com"
+                },
+                {
+                    "name": "Symfony Community",
+                    "homepage": "https://symfony.com/contributors"
+                }
+            ],
+            "description": "Symfony polyfill backporting some PHP 8.0+ features to lower PHP versions",
+            "homepage": "https://symfony.com",
+            "keywords": [
+                "compatibility",
+                "polyfill",
+                "portable",
+                "shim"
+            ],
+            "support": {
+                "source": "https://github.com/symfony/polyfill-php80/tree/v1.23.1"
+            },
+            "funding": [
+                {
+                    "url": "https://symfony.com/sponsor",
+                    "type": "custom"
+                },
+                {
+                    "url": "https://github.com/fabpot",
+                    "type": "github"
+                },
+                {
+                    "url": "https://tidelift.com/funding/github/packagist/symfony/symfony",
+                    "type": "tidelift"
+                }
+            ],
+            "time": "2021-07-28T13:41:28+00:00"
+        },
+        {
+            "name": "symfony/service-contracts",
+            "version": "v2.4.0",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/symfony/service-contracts.git",
+                "reference": "f040a30e04b57fbcc9c6cbcf4dbaa96bd318b9bb"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/symfony/service-contracts/zipball/f040a30e04b57fbcc9c6cbcf4dbaa96bd318b9bb",
+                "reference": "f040a30e04b57fbcc9c6cbcf4dbaa96bd318b9bb",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=7.2.5",
+                "psr/container": "^1.1"
             },
             "suggest": {
                 "symfony/service-implementation": ""
@@ -4816,7 +6033,11 @@
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "1.1-dev"
+                    "dev-main": "2.4-dev"
+                },
+                "thanks": {
+                    "name": "symfony/contracts",
+                    "url": "https://github.com/symfony/contracts"
                 }
             },
             "autoload": {
@@ -4848,41 +6069,53 @@
                 "interoperability",
                 "standards"
             ],
-            "time": "2019-09-17T11:12:18+00:00"
+            "support": {
+                "source": "https://github.com/symfony/service-contracts/tree/v2.4.0"
+            },
+            "funding": [
+                {
+                    "url": "https://symfony.com/sponsor",
+                    "type": "custom"
+                },
+                {
+                    "url": "https://github.com/fabpot",
+                    "type": "github"
+                },
+                {
+                    "url": "https://tidelift.com/funding/github/packagist/symfony/symfony",
+                    "type": "tidelift"
+                }
+            ],
+            "time": "2021-04-01T10:43:52+00:00"
         },
         {
             "name": "symfony/yaml",
-            "version": "v4.3.5",
+            "version": "v4.4.29",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/yaml.git",
-                "reference": "41e16350a2a1c7383c4735aa2f9fce74cf3d1178"
+                "reference": "3abcc4db06d4e776825eaa3ed8ad924d5bc7432a"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/yaml/zipball/41e16350a2a1c7383c4735aa2f9fce74cf3d1178",
-                "reference": "41e16350a2a1c7383c4735aa2f9fce74cf3d1178",
+                "url": "https://api.github.com/repos/symfony/yaml/zipball/3abcc4db06d4e776825eaa3ed8ad924d5bc7432a",
+                "reference": "3abcc4db06d4e776825eaa3ed8ad924d5bc7432a",
                 "shasum": ""
             },
             "require": {
-                "php": "^7.1.3",
+                "php": ">=7.1.3",
                 "symfony/polyfill-ctype": "~1.8"
             },
             "conflict": {
                 "symfony/console": "<3.4"
             },
             "require-dev": {
-                "symfony/console": "~3.4|~4.0"
+                "symfony/console": "^3.4|^4.0|^5.0"
             },
             "suggest": {
                 "symfony/console": "For validating YAML files using the lint command"
             },
             "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-master": "4.3-dev"
-                }
-            },
             "autoload": {
                 "psr-4": {
                     "Symfony\\Component\\Yaml\\": ""
@@ -4905,29 +6138,46 @@
                     "homepage": "https://symfony.com/contributors"
                 }
             ],
-            "description": "Symfony Yaml Component",
+            "description": "Loads and dumps YAML files",
             "homepage": "https://symfony.com",
-            "time": "2019-09-11T15:41:19+00:00"
+            "support": {
+                "source": "https://github.com/symfony/yaml/tree/v4.4.29"
+            },
+            "funding": [
+                {
+                    "url": "https://symfony.com/sponsor",
+                    "type": "custom"
+                },
+                {
+                    "url": "https://github.com/fabpot",
+                    "type": "github"
+                },
+                {
+                    "url": "https://tidelift.com/funding/github/packagist/symfony/symfony",
+                    "type": "tidelift"
+                }
+            ],
+            "time": "2021-07-27T16:19:30+00:00"
         },
         {
             "name": "theseer/tokenizer",
-            "version": "1.1.3",
+            "version": "1.2.1",
             "source": {
                 "type": "git",
                 "url": "https://github.com/theseer/tokenizer.git",
-                "reference": "11336f6f84e16a720dae9d8e6ed5019efa85a0f9"
+                "reference": "34a41e998c2183e22995f158c581e7b5e755ab9e"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/theseer/tokenizer/zipball/11336f6f84e16a720dae9d8e6ed5019efa85a0f9",
-                "reference": "11336f6f84e16a720dae9d8e6ed5019efa85a0f9",
+                "url": "https://api.github.com/repos/theseer/tokenizer/zipball/34a41e998c2183e22995f158c581e7b5e755ab9e",
+                "reference": "34a41e998c2183e22995f158c581e7b5e755ab9e",
                 "shasum": ""
             },
             "require": {
                 "ext-dom": "*",
                 "ext-tokenizer": "*",
                 "ext-xmlwriter": "*",
-                "php": "^7.0"
+                "php": "^7.2 || ^8.0"
             },
             "type": "library",
             "autoload": {
@@ -4947,33 +6197,47 @@
                 }
             ],
             "description": "A small library for converting tokenized PHP source code into XML and potentially other formats",
-            "time": "2019-06-13T22:48:21+00:00"
+            "support": {
+                "issues": "https://github.com/theseer/tokenizer/issues",
+                "source": "https://github.com/theseer/tokenizer/tree/1.2.1"
+            },
+            "funding": [
+                {
+                    "url": "https://github.com/theseer",
+                    "type": "github"
+                }
+            ],
+            "time": "2021-07-28T10:34:58+00:00"
         },
         {
             "name": "webmozart/assert",
-            "version": "1.5.0",
+            "version": "1.10.0",
             "source": {
                 "type": "git",
-                "url": "https://github.com/webmozart/assert.git",
-                "reference": "88e6d84706d09a236046d686bbea96f07b3a34f4"
+                "url": "https://github.com/webmozarts/assert.git",
+                "reference": "6964c76c7804814a842473e0c8fd15bab0f18e25"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/webmozart/assert/zipball/88e6d84706d09a236046d686bbea96f07b3a34f4",
-                "reference": "88e6d84706d09a236046d686bbea96f07b3a34f4",
+                "url": "https://api.github.com/repos/webmozarts/assert/zipball/6964c76c7804814a842473e0c8fd15bab0f18e25",
+                "reference": "6964c76c7804814a842473e0c8fd15bab0f18e25",
                 "shasum": ""
             },
             "require": {
-                "php": "^5.3.3 || ^7.0",
+                "php": "^7.2 || ^8.0",
                 "symfony/polyfill-ctype": "^1.8"
             },
+            "conflict": {
+                "phpstan/phpstan": "<0.12.20",
+                "vimeo/psalm": "<4.6.1 || 4.6.2"
+            },
             "require-dev": {
-                "phpunit/phpunit": "^4.8.36 || ^7.5.13"
+                "phpunit/phpunit": "^8.5.13"
             },
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "1.3-dev"
+                    "dev-master": "1.10-dev"
                 }
             },
             "autoload": {
@@ -4997,7 +6261,11 @@
                 "check",
                 "validate"
             ],
-            "time": "2019-08-24T08:43:50+00:00"
+            "support": {
+                "issues": "https://github.com/webmozarts/assert/issues",
+                "source": "https://github.com/webmozarts/assert/tree/1.10.0"
+            },
+            "time": "2021-03-09T10:59:23+00:00"
         },
         {
             "name": "yiisoft/yii2-debug",
@@ -5044,35 +6312,56 @@
                 "debugger",
                 "yii2"
             ],
+            "support": {
+                "forum": "http://www.yiiframework.com/forum/",
+                "irc": "irc://irc.freenode.net/yii",
+                "issues": "https://github.com/yiisoft/yii2-debug/issues",
+                "source": "https://github.com/yiisoft/yii2-debug",
+                "wiki": "http://www.yiiframework.com/wiki/"
+            },
             "time": "2018-09-23T21:41:04+00:00"
         },
         {
             "name": "yiisoft/yii2-faker",
-            "version": "2.0.4",
+            "version": "2.0.5",
             "source": {
                 "type": "git",
                 "url": "https://github.com/yiisoft/yii2-faker.git",
-                "reference": "3df62b1dcb272a8413f9c6e532c9d73f325ccde1"
+                "reference": "8c361657143bfaea58ff7dcc9bf51f1991a46f5d"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/yiisoft/yii2-faker/zipball/3df62b1dcb272a8413f9c6e532c9d73f325ccde1",
-                "reference": "3df62b1dcb272a8413f9c6e532c9d73f325ccde1",
+                "url": "https://api.github.com/repos/yiisoft/yii2-faker/zipball/8c361657143bfaea58ff7dcc9bf51f1991a46f5d",
+                "reference": "8c361657143bfaea58ff7dcc9bf51f1991a46f5d",
                 "shasum": ""
             },
             "require": {
-                "fzaninotto/faker": "~1.4",
+                "fakerphp/faker": "~1.9|~1.10",
                 "yiisoft/yii2": "~2.0.0"
             },
+            "require-dev": {
+                "cweagans/composer-patches": "^1.7",
+                "phpunit/phpunit": "4.8.34"
+            },
             "type": "yii2-extension",
             "extra": {
                 "branch-alias": {
                     "dev-master": "2.0.x-dev"
+                },
+                "composer-exit-on-patch-failure": true,
+                "patches": {
+                    "phpunit/phpunit-mock-objects": {
+                        "Fix PHP 7 and 8 compatibility": "https://yiisoft.github.io/phpunit-patches/phpunit_mock_objects.patch"
+                    },
+                    "phpunit/phpunit": {
+                        "Fix PHP 7 compatibility": "https://yiisoft.github.io/phpunit-patches/phpunit_php7.patch",
+                        "Fix PHP 8 compatibility": "https://yiisoft.github.io/phpunit-patches/phpunit_php8.patch"
+                    }
                 }
             },
             "autoload": {
                 "psr-4": {
-                    "yii\\faker\\": ""
+                    "yii\\faker\\": "src"
                 }
             },
             "notification-url": "https://packagist.org/downloads/",
@@ -5091,7 +6380,28 @@
                 "faker",
                 "yii2"
             ],
-            "time": "2018-02-19T20:27:10+00:00"
+            "support": {
+                "forum": "http://www.yiiframework.com/forum/",
+                "irc": "irc://irc.freenode.net/yii",
+                "issues": "https://github.com/yiisoft/yii2-faker/issues",
+                "source": "https://github.com/yiisoft/yii2-faker",
+                "wiki": "http://www.yiiframework.com/wiki/"
+            },
+            "funding": [
+                {
+                    "url": "https://github.com/yiisoft",
+                    "type": "github"
+                },
+                {
+                    "url": "https://opencollective.com/yiisoft",
+                    "type": "open_collective"
+                },
+                {
+                    "url": "https://tidelift.com/funding/github/packagist/yiisoft/yii2-faker",
+                    "type": "tidelift"
+                }
+            ],
+            "time": "2020-11-10T12:27:35+00:00"
         },
         {
             "name": "yiisoft/yii2-gii",
@@ -5140,6 +6450,13 @@
                 "gii",
                 "yii2"
             ],
+            "support": {
+                "forum": "http://www.yiiframework.com/forum/",
+                "irc": "irc://irc.freenode.net/yii",
+                "issues": "https://github.com/yiisoft/yii2-gii/issues",
+                "source": "https://github.com/yiisoft/yii2-gii",
+                "wiki": "http://www.yiiframework.com/wiki/"
+            },
             "time": "2018-12-08T10:07:49+00:00"
         }
     ],
@@ -5157,5 +6474,6 @@
     "platform": {
         "php": ">=7.1.0"
     },
-    "platform-dev": []
+    "platform-dev": [],
+    "plugin-api-version": "2.1.0"
 }
diff --git a/frontend/modules/card/controllers/UserCardController.php b/frontend/modules/card/controllers/UserCardController.php
index 4ff4ed0..40dfa43 100755
--- a/frontend/modules/card/controllers/UserCardController.php
+++ b/frontend/modules/card/controllers/UserCardController.php
@@ -45,8 +45,9 @@ class UserCardController extends Controller
     public function actionIndex()
     {
         $id_user = Yii::$app->user->id;
+        echo $id_user;
+//        die();
         $result = UserCard::find()->where(['id_user' => $id_user])->asArray()->all();
-
         if($result) {
             $id = $result[0]['id'];
             $dataProvider = new ActiveDataProvider([
diff --git a/frontend/modules/reports/controllers/ReportsController.php b/frontend/modules/reports/controllers/ReportsController.php
index 0ba2de3..13eb57a 100644
--- a/frontend/modules/reports/controllers/ReportsController.php
+++ b/frontend/modules/reports/controllers/ReportsController.php
@@ -50,7 +50,7 @@ class ReportsController extends Controller
         $dataProvider->query
             ->where(['user_card.id_user' => Yii::$app->user->identity->id])
             ->innerJoin('user_card', 'reports.user_card_id = user_card.id');
-
+        
         return $this->render('index', [
             'searchModel' => $searchModel,
             'dataProvider' => $dataProvider,

From cd7c620e1ddcfd1ade2892f77bb23b5842e34623 Mon Sep 17 00:00:00 2001
From: maxim <makss.web@gmail.com>
Date: Mon, 6 Sep 2021 16:23:20 +0300
Subject: [PATCH 2/6] =?UTF-8?q?=D0=B3=D0=BE=D1=82=D0=BE=D0=B2=D1=8B=D0=B9?=
 =?UTF-8?q?=20=D0=BA=D0=B0=D0=BB=D0=B5=D0=BD=D0=B4=D0=B0=D1=80=D1=8C,=20?=
 =?UTF-8?q?=D0=BD=D0=B5=D0=BC=D0=BD=D0=BE=D0=B3=D0=BE=20=D0=BC=D1=83=D1=81?=
 =?UTF-8?q?=D0=BE=D1=80=D0=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../reports/controllers/AjaxController.php    |   11 +-
 .../reports/controllers/ReportsController.php |   14 +-
 backend/modules/reports/models/Month.php      |    4 +-
 .../modules/reports/views/reports/_user.php   | 1786 +++++++++++++++++
 .../modules/reports/views/reports/index.php   |    2 +-
 .../modules/reports/views/reports/user.php    |  377 ++--
 6 files changed, 2007 insertions(+), 187 deletions(-)
 create mode 100644 backend/modules/reports/views/reports/_user.php

diff --git a/backend/modules/reports/controllers/AjaxController.php b/backend/modules/reports/controllers/AjaxController.php
index 87ad13f..429d241 100644
--- a/backend/modules/reports/controllers/AjaxController.php
+++ b/backend/modules/reports/controllers/AjaxController.php
@@ -11,6 +11,7 @@ use yii\web\Response;
 
 class AjaxController extends \yii\web\Controller
 {
+
     public function actionGetReportsForMonthByIdYearMonth($id, $year=null, $month=null){
         if (!($year and $month)){
             $searchModel->month = date('m');
@@ -25,7 +26,13 @@ class AjaxController extends \yii\web\Controller
 
         $dataProvider = $searchModel->search(Yii::$app->request->queryParams);
 
-        $reports = ['reports'=>array_column($dataProvider->getModels(), 'attributes')];
+        $reports = $dataProvider->getModels();
+        $reports_no_task = array_column($reports, 'attributes');
+        for ($i = 0; $i<count($reports); $i++){
+            $reports_no_task[$i]['today'] = array_column( $reports[$i]->task, 'attributes');
+        }
+        $reports = $reports_no_task;
+
         $month = new Month($year.'-'.$month.'-01');
 
 
@@ -33,7 +40,7 @@ class AjaxController extends \yii\web\Controller
 
         $response->format = Response::FORMAT_JSON;
 
-        $response->content = json_encode(array_merge($reports,
+        $response->content = json_encode(array_merge(['reports' => $reports_no_task],
             ['month'=>(array)$month]));
         $response->getHeaders()->set('Content-Type', 'application/json; charset=utf-8');
 
diff --git a/backend/modules/reports/controllers/ReportsController.php b/backend/modules/reports/controllers/ReportsController.php
index 01bc53a..19a0fa8 100644
--- a/backend/modules/reports/controllers/ReportsController.php
+++ b/backend/modules/reports/controllers/ReportsController.php
@@ -73,15 +73,21 @@ class ReportsController extends Controller
         $dataProvider = $searchModel->search(Yii::$app->request->queryParams);
 
         $reports = $dataProvider->getModels();
-//        Debug::dd($dataProvider);
+
+        $ID = $reports[0]->user_card_id;
+
+        $reports_no_task = array_column($reports, 'attributes');
+        for ($i = 0; $i < count($reports); $i++) {
+            $reports_no_task[$i]['today'] = array_column($reports[$i]->task, 'attributes');
+        }
         $month = new Month($date);
 
         if (!Yii::$app->request->isAjax) {
             return $this->render('user', [
-                'ID' => $reports[0]->id,
+                'ID' => $ID,
                 'reports' => $reports,
-                'reports_month' => json_encode(array_merge(['reports'=>array_column($reports, 'attributes')],
-                    ['month'=>(array)$month])),
+                'reports_month' => json_encode(array_merge(['reports' => $reports_no_task],
+                    ['month' => (array)$month])),
                 'date' => $date
             ]);
         }
diff --git a/backend/modules/reports/models/Month.php b/backend/modules/reports/models/Month.php
index 7a5b0c1..e52cf44 100644
--- a/backend/modules/reports/models/Month.php
+++ b/backend/modules/reports/models/Month.php
@@ -47,9 +47,9 @@ class Month
         for ($index = $first_day_of_week - 1; $index >= 1; $index--, $day--) {
             $this->inactive_begin[$index] = $day;
         }
-
+//        Debug::dd($first_day_of_week);
         $day = 1;
-        $index_end = ($first_day_of_week==7?42:35);
+        $index_end = (in_array($first_day_of_week, [6,7])?42:35);
         for ($index = $quantity_days + $first_day_of_week; $index <=$index_end; $index++, $day++) {
             $this->inactive_end[$index] = $day;
         }
diff --git a/backend/modules/reports/views/reports/_user.php b/backend/modules/reports/views/reports/_user.php
new file mode 100644
index 0000000..c595a5c
--- /dev/null
+++ b/backend/modules/reports/views/reports/_user.php
@@ -0,0 +1,1786 @@
+<?php
+
+use backend\modules\reports\models\ReportsSearch;
+use kartik\grid\GridView;
+use yii\data\Pagination;
+use yii\helpers\Html;
+use common\models\Reports;
+use  \common\classes\Debug;
+use backend\modules\reports\models\Month;
+
+
+/* @var $this yii\web\View */
+/* @var $searchModel backend\modules\reports\models\ReportsSearch */
+/* @var $dataProvider yii\data\ActiveDataProvider */
+/* @var $reports common\models\Reports */
+/* @var $ID */
+
+
+$month = new Month($date);
+$index_raw = 0;
+
+function next_day($date, $number)
+{
+    return date('Y-m-d', strtotime($date) + 3600 * 24 * $number);
+}
+
+function get_dates_created_at(Reports $report)
+{
+    return $report->created_at;
+}
+
+function get_color($date, $dates_created_at)
+{
+    if (in_array(Month::get_day_week($date), array(6, 7)))
+        return;
+    if (in_array($date, $dates_created_at)) {
+        return 'success';
+    } else
+        return 'danger';
+}
+
+$this->title = 'Календарь пользователя - ' . Reports::getFio($reports[0]);
+$dates_created_at = array_unique(array_map('get_dates_created_at', $reports));
+
+//for ($date = '2021-08-01', $i = 0; $date != '2021-09-01'; $date = next_day($date, 1), $i++) {
+//    if ($i == 7) {
+//        echo '<div>';
+//        $i = 0;
+//    }
+//    if (in_array($date, $dates_created_at)) {
+//        $color = 'primary';
+//    } else
+//        $color = 'danger';
+//    echo Html::a($date, ['reports/?date=' . $date], ['class' => 'btn btn-' . $color . '',
+//        'style' => 'margin: 10px;']);
+//
+//}
+//
+
+//
+//?>
+<?= Html::csrfMetaTags() ?>
+<section class="calendar-contain">
+
+
+    <aside class="calendar__sidebar">
+        <section class="title-bar">
+            <?= Html::input('date', 'date', isset($_GET['date']) ? $_GET['date'] : date('Y-m-d'), [
+                'class' => 'form-control',
+                'style' => 'display:',
+                'id' => 'date',
+            ]) ?>
+
+        </section>
+        <h2 class="sidebar__heading"><?= date('l') ?><br><?= date('F d') ?></h2>
+        <ul class="sidebar__list">
+            <table class="table table-striped table-bordered">
+                <thead>
+                <tr>
+                    <th>ID</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 class="action-column">&nbsp;</th>
+                </tr>
+                </thead>
+                <tbody>
+                <tr data-key="4">
+                    <td>1</td>
+                    <td><p>1. (1 ч.) asd</p></td>
+                    <td></td>
+                    <td></td>
+                    <td><a href="/secure/reports/reports/view?id=4" 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=4" 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=4" 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>
+                </tr>
+                <tr data-key="9">
+                    <td>2</td>
+                    <td><p>1. (23 ч.) asdasd</p></td>
+                    <td></td>
+                    <td></td>
+                    <td><a href="/secure/reports/reports/view?id=9" 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">
+                            </svg>
+                        </a> <a href="/secure/reports/reports/update?id=9" 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">
+                            </svg>
+                        </a> <a href="/secure/reports/reports/delete?id=9" 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">
+                            </svg>
+                        </a></td>
+                </tr>
+                </tbody>
+            </table>
+        </ul>
+    </aside>
+
+
+    <section class="calendar__days">
+        <!--        <section class="calendar__top-bar">-->
+        <!--            <span class="top-bar__days">Mon</span>-->
+        <!--            <span class="top-bar__days">Tue</span>-->
+        <!--            <span class="top-bar__days">Wed</span>-->
+        <!--            <span class="top-bar__days">Thu</span>-->
+        <!--            <span class="top-bar__days">Fri</span>-->
+        <!--            <span class="top-bar__days">Sat</span>-->
+        <!--            <span class="top-bar__days">Sun</span>-->
+        <!--        </section>-->
+        <!---->
+        <!--        --><?php
+        //        $index = 1;
+        //        if (count($month->inactive_begin)) {
+        //            echo '<section class="calendar__week">';
+        //
+        //            for ($index = 1; $index <= count($month->inactive_begin); $index++, $index_raw++)
+        //                echo '                <div class="calendar__day inactive">
+        //
+        //                    <span class="calendar__date">' . $month->inactive_begin[$index] . '</span>
+        //                </div>';
+        //        }
+        //        for (; $index <= array_key_last($month->active); $index++, $index_raw++) {
+        //
+        //            if ($index_raw % 7 == 0) {
+        //                if ($index != 1) echo '</section>';
+        //                echo '<section class="calendar__week">
+        //        ';
+        //            }
+        //            echo '
+        //        <div class="calendar__day">
+        //                    <span class="calendar__date ' . get_color(date('Y-m-' . $month->active[$index], strtotime($date)), $dates_created_at) . '">
+        //                        ' . $month->active[$index] . '
+        //        </span>
+        //        </div>
+        //        ';
+        //        }
+        //        ?>
+        <!--        --><?php //for (; $index <= array_key_last($month->inactive_end); $index++, $index_raw++): ?>
+        <!--            --><?php //if ($index_raw % 7 == 0)
+        //                echo '
+        //                </section>
+        //        <section class="calendar__week ">
+        //        ';
+        //            ?>
+        <!--            <div class="calendar__day inactive">-->
+        <!--                <span class="calendar__date "><? //= $month->inactive_end[$index] ?><!--</span>-->
+        <!--            </div>-->
+        <!--        --><?php //endfor; ?>
+    </section>
+
+</section>
+<script>
+
+    class CalendarBuilder {
+
+        constructor(month, reports, innerElem, datePicker, before = '') {
+            this.month = month;
+            this.Elem = innerElem;
+            this.reports = reports;
+            this.before = before;
+            this.datePicker = datePicker;
+
+            this.nameDate = document.querySelector('.sidebar__heading');
+
+            this.initBefore();
+        }
+
+        build() {
+            this.getInactiveBegin();
+            this.getActive();
+            this.getInactiveEnd();
+            this.loadInElem();
+
+            this.initAfter();
+            let rep = this.loadMonthReports();
+            console.log(rep)
+            console.log(123)
+            // this.activeButtonsDays();
+
+        }
+
+        update(month, reports = null) {
+            this.month = month;
+            this.reports = reports;
+
+            this.initBefore();
+
+            this.build();
+        }
+
+        initBefore() {
+            this.html = '';
+            this.index = 1;
+            this.indexRaw = 0;
+            this.classDay = 'calendar__day';
+            this.date = document.querySelector('#date').value.substr(0, 7);
+        }
+
+        initAfter() {
+            this.days = document.querySelectorAll('.calendar__day');
+        }
+
+        loadInElem() {
+            this.Elem.innerHTML = this.before + this.html;
+        }
+
+        // activeButtonsDays() {
+        //     // console.log(this.days);
+        //     for (let i = 0; i < Object.keys(this.days).length; i++) {
+        //         // if (this.days[i].querySelector('.calendar__date.inactive')) {
+        //         //     this.clickInactive(this.days[i])''
+        //         // } else
+        //         console.log(this.days[i])
+        //         console.log(i)
+        //         this.days[i].dayOnClick = this.dayOnClick;
+        //         this.days[i].changeDateFutureOrPast = this.changeDateFutureOrPast;
+        //         this.days[i].nameDate = this.nameDate;
+        //         this.days[i].datePicker = this.datePicker;
+        //         this.days[i].IntToDate = this.IntToDate;
+        //         this.days[i].loadMonthReports = this.loadMonthReports;
+        //         this.days[i].update = this.update;
+        //
+        //         this.days[i].onclick = function () {
+        //             this.dayOnClick(this)
+        //         };
+        //     }
+        //
+        // }
+        //
+        // dayOnClick(day) {
+        //     // console.log(day)
+        //     // alert(parseInt(days[i].textContent))
+        //     let number_date = parseInt(day.textContent);
+        //     number_date = this.IntToDate(number_date);
+        //
+        //     if (day.classList.contains('inactive')) {
+        //         this.changeDateFutureOrPast(number_date);
+        //     } else {
+        //         this.datePicker.value = this.datePicker.value.substr(0, 8) + number_date;
+        //
+        //
+        //         let date = new Date(this.datePicker.value);
+        //         let monthName = date.toLocaleString('default', {month: 'long'});
+        //         let dayWeekName = date.toLocaleString('default', {weekday: 'long'});
+        //
+        //         console.log(this.nameDate)
+        //         this.nameDate.innerHTML = dayWeekName + '<br>' + monthName + ' ' + date.toString().split(' ')[2];
+        //     }
+        //
+        // }
+        //
+        // changeDateFutureOrPast(number_date) {
+        //     let date = new Date(this.datePicker.value);
+        //     if (parseInt(this.textContent) <= 7) {
+        //         if (date.getMonth() == 11) {
+        //             date = new Date(date.getFullYear() + 1, 0, 1);
+        //         } else {
+        //             date = new Date(date.getFullYear(), date.getMonth() + 1, number_date);
+        //         }
+        //         // console.log(date.getFullYear() + '-' + (parseInt(date.getMonth())+1) + '-' + number_date)
+        //         // datePicker.value = date.toISOString().substring(0, 10);
+        //     } else {
+        //         if (date.getMonth() == 0) {
+        //             date = new Date(date.getFullYear() - 1, 11, 1);
+        //         } else {
+        //             date = new Date(date.getFullYear(), date.getMonth() - 1, 1);
+        //         }
+        //         // console.log(date.getFullYear() + '-' + (parseInt(date.getMonth())+1) + '-' + number_date)
+        //         // datePicker.value = date.getFullYear() + '-' + date.getMonth() + '-' + number_date
+        //     }
+        //     console.log(this)
+        //     this.loadMonthReports()
+        //         .then(function (reports_month) {
+        //             console.log(reports_month)
+        //             let reports = (JSON.parse(reports_month))[0]['reports']
+        //             let month = (JSON.parse(reports_month))[0]['month']
+        //
+        //             reports_month[1](month, reports);
+        //         })
+        //     this.datePicker.value = date.getFullYear() + '-' + this.IntToDate(parseInt(date.getMonth()) + 1) + '-' + number_date
+        //
+        // }
+
+        IntToDate(number_date) {
+            if (Math.floor(number_date / 10) === 0)
+                number_date = '0' + number_date;
+            return number_date
+        }
+
+        getInactiveBegin() {
+            if (Object.keys(this.month['inactive_begin']).length > 0) {
+                this.html += '<section class="calendar__week">';
+
+                for (; this.index <= Object.keys(this.month['inactive_begin']).length; this.index++, this.indexRaw++) {
+                    this.html += this.getCalendarDay('inactive_begin', 'inactive');
+                }
+            }
+        }
+
+        getActive() {
+            for (; this.index <= this.getLastKey(this.month['active']); this.index++, this.indexRaw++) {
+                if (this.indexRaw % 7 == 0) {
+                    if (this.index != 1) {
+                        this.html += '</section>';
+                    }
+                    this.html += '<section class="calendar__week">';
+                }
+                this.html += this.getCalendarDay('active')
+            }
+        }
+
+        getInactiveEnd() {
+            for (; this.index <= this.getLastKey(this.month['inactive_end']); this.index++, this.indexRaw++) {
+                if (this.indexRaw % 7 == 0) {
+                    this.html += `</section>
+                            <section class="calendar__week ">`;
+                }
+                this.html += this.getCalendarDay('inactive_end', 'inactive');
+            }
+        }
+
+        getCalendarDay(type, className = '') {
+            return `<div class="${this.classDay} ${className}">
+                <span class="calendar__date ${this.getColor(this.date + '-' + this.month[type][this.index])}">${this.month[type][this.index]}</span>
+            </div>`;
+        }
+
+        getColor(date) {
+            let d = new Date(date)
+            if ([6, 0].includes(d.getDay()))
+                return;
+            for (let i in this.reports) {
+                if (this.reports[i]['created_at'] == date) {
+                    return 'success';
+                }
+            }
+            return 'danger';
+        }
+
+        getLastKey(obj) {
+            return Object.keys(obj)[Object.keys(obj).length - 1];
+        }
+
+        //async loadMonthReports() {
+        //    let datePicker = this.datePicker;
+        //    let makeRequest = function () {
+        //        return new Promise(function (resolve, reject) {
+        //            let monthNumber = datePicker.value.substr(5, 2);
+        //            let yearNumber = datePicker.value.substr(0, 4);
+        //            let req = new XMLHttpRequest();
+        //            req.open('get', '../ajax/get-reports-for-month-by-id-year-month?id=<?//=$ID?>//' +
+        //                '&month=' + monthNumber +
+        //                '&year=' + yearNumber
+        //            )
+        //            ;
+        //            req.setRequestHeader('Content-type', 'application/json');
+        //            req.onload = function () {
+        //                if (this.status >= 200 && this.status < 300) {
+        //                    let response = [req.response, this.update]
+        //
+        //                    resolve(response);
+        //                }
+        //
+        //            };
+        //            req.send();
+        //        })
+        //    }
+        //    return await makeRequest();
+        //}
+
+    }
+
+
+    const CALENDAR_BAR = `<section class="calendar__top-bar">
+        <span class="top-bar__days">Mon</span>
+    <span class="top-bar__days">Tue</span>
+    <span class="top-bar__days">Wed</span>
+    <span class="top-bar__days">Thu</span>
+    <span class="top-bar__days">Fri</span>
+    <span class="top-bar__days">Sat</span>
+    <span class="top-bar__days">Sun</span>
+    </section>`;
+
+    let reports = (JSON.parse('<?=$reports_month?>'))['reports']
+    let month = (JSON.parse('<?=$reports_month?>'))['month']
+    let datePicker = document.querySelector('#date');
+
+    let calendarBuilder = new CalendarBuilder(
+        month, reports, document.querySelector('.calendar__days'), datePicker, CALENDAR_BAR);
+    calendarBuilder.build()
+
+    let days = document.querySelectorAll('.calendar__day');
+
+
+    let oldDate = datePicker.value.substr(0, 7);
+
+    datePicker.onchange = function () {
+        console.log(this.value)
+        if (!isOldDatePicker(datePicker, oldDate)) {
+            oldDate = datePicker.value.substr(0, 7);
+
+            get_reports_ajax(datePicker)
+                .then(function (reports_month) {
+                    let reports = (JSON.parse(reports_month))['reports']
+                    let month = (JSON.parse(reports_month))['month']
+                    calendarBuilder.update(month, reports);
+                })
+        }
+    }
+
+
+    let nameDate = document.querySelector('.sidebar__heading');
+
+    function isOldDatePicker(datePicker, oldDate) {
+        if (datePicker.value.substr(0, 7) == oldDate)
+            return true;
+        return false
+    }
+
+
+    function get_reports_ajax(datePicker) {
+        return new Promise(function (resolve, reject) {
+            let monthNumber = datePicker.value.substr(5, 2);
+            let yearNumber = datePicker.value.substr(0, 4);
+            let req = new XMLHttpRequest();
+            req.open('get', '../ajax/get-reports-for-month-by-id-year-month?id=<?=$ID?>' +
+                '&month=' + monthNumber +
+                '&year=' + yearNumber
+            );
+            req.setRequestHeader('Content-type', 'application/json');
+            req.onload = function () {
+                if (this.status >= 200 && this.status < 300) {
+                    resolve(req.response);
+                }
+
+            };
+            req.send();
+        })
+    }
+
+
+</script>
+
+<style>
+
+    .calendar-contain {
+        position: relative;
+        left: 0;
+        right: 0;
+        border-radius: 0;
+        width: 100%;
+        overflow: hidden;
+        max-width: 1920px;
+        min-width: 450px;
+        margin: 1rem auto;
+        background-color: #f5f7f6;
+        box-shadow: 5px 5px 72px rgba(30, 46, 50, 0.5);
+        color: #040605;
+    }
+
+    @media screen and (min-width: 55em) {
+        .calendar-contain {
+            margin: auto;
+            top: 5%;
+        }
+    }
+
+    .title-bar {
+        position: relative;
+        width: 100%;
+        display: table;
+        text-align: right;
+        background: #f5f7f6;
+        padding: 0.5rem;
+        margin-bottom: 0;
+    }
+
+    .title-bar:after {
+        display: table;
+        clear: both;
+    }
+
+    .title-bar__burger {
+        display: block;
+        position: relative;
+        float: left;
+        overflow: hidden;
+        margin: 0;
+        padding: 0;
+        width: 38px;
+        height: 30px;
+        font-size: 0;
+        text-indent: -9999px;
+        appearance: none;
+        box-shadow: none;
+        border: none;
+        cursor: pointer;
+        background: none;
+    }
+
+    .title-bar__burger:focus {
+        outline: none;
+    }
+
+    .burger__lines {
+        display: block;
+        position: absolute;
+        width: 18px;
+        top: 15px;
+        left: 0;
+        right: 0;
+        margin: auto;
+        height: 1px;
+        background: #040605;
+    }
+
+    .burger__lines:before, .burger__lines:after {
+        position: absolute;
+        display: block;
+        left: 0;
+        width: 100%;
+        height: 1px;
+        background-color: #040605;
+        content: "";
+    }
+
+    .burger__lines:before {
+        top: -5px;
+    }
+
+    .burger__lines:after {
+        bottom: -5px;
+    }
+
+    .title-bar__year {
+        display: block;
+        position: relative;
+        float: left;
+        font-size: 1rem;
+        line-height: 30px;
+        width: 43%;
+        padding: 0 0.5rem;
+        text-align: left;
+    }
+
+    @media screen and (min-width: 55em) {
+        .title-bar__year {
+            width: 27%;
+        }
+    }
+
+    .title-bar__month {
+        position: relative;
+        /*float: center;*/
+        font-size: 1rem;
+        line-height: 30px;
+        width: 22%;
+        padding: 0 0.5rem;
+        text-align: center;
+        margin-right: 67px;
+        word-spacing: 30px;
+    }
+
+    @media screen and (min-width: 55em) {
+        .title-bar__month {
+            width: 12%;
+        }
+    }
+
+    .title-bar__minimize, .title-bar__maximize, .title-bar__close {
+        position: relative;
+        float: left;
+        width: 34px;
+        height: 34px;
+    }
+
+    .title-bar__minimize:before, .title-bar__maximize:before, .title-bar__close:before, .title-bar__minimize:after, .title-bar__maximize:after, .title-bar__close:after {
+        top: 30%;
+        right: 30%;
+        bottom: 30%;
+        left: 30%;
+        content: " ";
+        position: absolute;
+        border-color: #8e8e8e;
+        border-style: solid;
+        border-width: 0 0 2px 0;
+    }
+
+    .title-bar .title-bar__controls {
+        display: inline-block;
+        vertical-align: top;
+        position: relative;
+        float: right;
+        width: auto;
+    }
+
+    .title-bar .title-bar__controls:before, .title-bar .title-bar__controls:after {
+        content: none;
+    }
+
+    .title-bar .title-bar__minimize:before {
+        border-bottom-width: 2px;
+    }
+
+    .title-bar .title-bar__maximize:before {
+        border-width: 1px 1px 2px 1px;
+    }
+
+    .title-bar .title-bar__close:before, .title-bar .title-bar__close:after {
+        bottom: 50%;
+        top: 49.9%;
+    }
+
+    .title-bar .title-bar__close:before {
+        transform: rotate(45deg);
+    }
+
+    .title-bar .title-bar__close:after {
+        transform: rotate(-45deg);
+    }
+
+    .calendar__sidebar {
+        width: 100%;
+        margin: 0 auto;
+        float: none;
+        background: linear-gradient(120deg, #eff3f3, #e1e7e8);
+        padding-bottom: 0.7rem;
+    }
+
+    @media screen and (min-width: 55em) {
+        .calendar__sidebar {
+            position: absolute;
+            height: 100%;
+            width: 50%;
+            float: left;
+            margin-bottom: 0;
+        }
+    }
+
+    .calendar__sidebar .content {
+        padding: 2rem 1.5rem 2rem 4rem;
+        color: #040605;
+    }
+
+    .sidebar__nav {
+        display: flex;
+        align-items: center;
+        justify-content: flex-start;
+        margin-bottom: 0.9rem;
+        padding: 0.7rem 1rem;
+        background-color: #f5f7f6;
+    }
+
+    .sidebar__nav-item {
+        display: inline-block;
+        width: 22px;
+        margin-right: 23px;
+        padding: 0;
+        opacity: 0.8;
+    }
+
+    .sidebar__list {
+        list-style: none;
+        margin: 0;
+        padding-left: 1rem;
+        padding-right: 1rem;
+    }
+
+    .sidebar__list-item {
+        margin: 1.2rem 0;
+        color: #2d4338;
+        font-weight: 100;
+        font-size: 1rem;
+    }
+
+    .list-item__time {
+        display: inline-block;
+        width: 60px;
+    }
+
+    @media screen and (min-width: 55em) {
+        .list-item__time {
+            margin-right: 2rem;
+        }
+    }
+
+    .sidebar__list-item--complete {
+        color: rgba(4, 6, 5, 0.3);
+    }
+
+    .sidebar__list-item--complete .list-item__time {
+        color: rgba(4, 6, 5, 0.3);
+    }
+
+    .sidebar__heading {
+        font-size: 2.2rem;
+        font-weight: bold;
+        padding-left: 1rem;
+        padding-right: 1rem;
+        margin-bottom: 3rem;
+        margin-top: 1rem;
+    }
+
+    .sidebar__heading span {
+        float: right;
+        font-weight: 300;
+    }
+
+    .calendar__heading-highlight {
+        color: #2d444a;
+        font-weight: 900;
+    }
+
+    .calendar__days {
+        display: flex;
+        flex-flow: column wrap;
+        align-items: stretch;
+        width: 100%;
+        float: none;
+        min-height: 580px;
+        height: 100%;
+        font-size: 12px;
+        /*padding: 0.8rem 0 1rem 1rem;*/
+        #b8cad6 background: #f5f7f6;
+    }
+
+    @media screen and (min-width: 55em) {
+        .calendar__days {
+            width: 50%;
+            float: right;
+        }
+    }
+
+    .calendar__top-bar {
+        background: #b8cad6;
+        text-align: center;
+        display: flex;
+        flex: 56px 0 0;
+    }
+
+    .top-bar__days {
+        width: 100%;
+        padding: 0 5px;
+        color: #2d4338;
+        font-weight: 100;
+        -webkit-font-smoothing: subpixel-antialiased;
+        font-size: 1rem;
+    }
+
+    .calendar__week {
+        display: flex;
+        flex: 1 1 0;
+    }
+
+    .calendar__day {
+        text-align: center;
+        display: flex;
+        flex-flow: column wrap;
+        justify-content: space-between;
+        width: 100%;
+        padding: 1.9rem 0.2rem 0.2rem;
+    }
+
+
+    .calendar__date {
+        color: #040605;
+        font-size: 1.7rem;
+        font-weight: 600;
+        line-height: 0.7;
+    }
+
+    @media screen and (min-width: 55em) {
+        .calendar__date {
+            font-size: 2.3rem;
+        }
+    }
+
+    .calendar__week .inactive .calendar__date, .calendar__week .inactive .task-count {
+        color: #c6c6c6;
+    }
+
+    .calendar__week .today .calendar__date {
+        color: #fd588a;
+    }
+
+    .calendar__task {
+        color: #040605;
+        display: flex;
+        font-size: 0.8rem;
+    }
+
+    @media screen and (min-width: 55em) {
+        .calendar__task {
+            font-size: 1rem;
+        }
+    }
+
+    .calendar__task.calendar__task--today {
+        color: #fd588a;
+    }
+
+
+    .danger {
+        color: red;
+    }
+
+    .success {
+        color: green;
+    }
+
+    .calendar__day:hover {
+        color: #0a0a0a;
+        background: #a6a6a6;
+        cursor: pointer;
+    }
+</style>
+
+
+<!--_________________________________________________________________________-->
+
+
+
+
+<?php
+
+use backend\modules\reports\models\ReportsSearch;
+use kartik\grid\GridView;
+use yii\data\Pagination;
+use yii\helpers\Html;
+use common\models\Reports;
+use  \common\classes\Debug;
+use backend\modules\reports\models\Month;
+
+
+/* @var $this yii\web\View */
+/* @var $searchModel backend\modules\reports\models\ReportsSearch */
+/* @var $dataProvider yii\data\ActiveDataProvider */
+/* @var $reports common\models\Reports */
+/* @var $ID */
+
+
+$month = new Month($date);
+$index_raw = 0;
+
+function next_day($date, $number)
+{
+    return date('Y-m-d', strtotime($date) + 3600 * 24 * $number);
+}
+
+function get_dates_created_at(Reports $report)
+{
+    return $report->created_at;
+}
+
+function get_color($date, $dates_created_at)
+{
+    if (in_array(Month::get_day_week($date), array(6, 7)))
+        return;
+    if (in_array($date, $dates_created_at)) {
+        return 'success';
+    } else
+        return 'danger';
+}
+
+$this->title = 'Календарь пользователя - ' . Reports::getFio($reports[0]);
+$dates_created_at = array_unique(array_map('get_dates_created_at', $reports));
+
+//for ($date = '2021-08-01', $i = 0; $date != '2021-09-01'; $date = next_day($date, 1), $i++) {
+//    if ($i == 7) {
+//        echo '<div>';
+//        $i = 0;
+//    }
+//    if (in_array($date, $dates_created_at)) {
+//        $color = 'primary';
+//    } else
+//        $color = 'danger';
+//    echo Html::a($date, ['reports/?date=' . $date], ['class' => 'btn btn-' . $color . '',
+//        'style' => 'margin: 10px;']);
+//
+//}
+//
+
+//
+//?>
+<?= Html::csrfMetaTags() ?>
+<section class="calendar-contain">
+
+
+    <aside class="calendar__sidebar">
+        <section class="title-bar">
+            <?= Html::input('date', 'date', isset($_GET['date']) ? $_GET['date'] : date('Y-m-d'), [
+                'class' => 'form-control',
+                'style' => 'display:',
+                'id' => 'date',
+            ]) ?>
+
+        </section>
+        <h2 class="sidebar__heading"><?= date('l') ?><br><?= date('F d') ?></h2>
+        <ul class="sidebar__list">
+            <table class="table table-striped table-bordered">
+                <thead>
+                <tr>
+                    <th>ID</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 class="action-column">&nbsp;</th>
+                </tr>
+                </thead>
+                <tbody>
+                <tr data-key="4">
+                    <td>1</td>
+                    <td><p>1. (1 ч.) asd</p></td>
+                    <td></td>
+                    <td></td>
+                    <td><a href="/secure/reports/reports/view?id=4" 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=4" 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=4" 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>
+                </tr>
+                <tr data-key="9">
+                    <td>2</td>
+                    <td><p>1. (23 ч.) asdasd</p></td>
+                    <td></td>
+                    <td></td>
+                    <td><a href="/secure/reports/reports/view?id=9" 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">
+                            </svg>
+                        </a> <a href="/secure/reports/reports/update?id=9" 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">
+                            </svg>
+                        </a> <a href="/secure/reports/reports/delete?id=9" 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">
+                            </svg>
+                        </a></td>
+                </tr>
+                </tbody>
+            </table>
+        </ul>
+    </aside>
+
+
+    <section class="calendar__days">
+        <!--        <section class="calendar__top-bar">-->
+        <!--            <span class="top-bar__days">Mon</span>-->
+        <!--            <span class="top-bar__days">Tue</span>-->
+        <!--            <span class="top-bar__days">Wed</span>-->
+        <!--            <span class="top-bar__days">Thu</span>-->
+        <!--            <span class="top-bar__days">Fri</span>-->
+        <!--            <span class="top-bar__days">Sat</span>-->
+        <!--            <span class="top-bar__days">Sun</span>-->
+        <!--        </section>-->
+        <!---->
+        <!--        --><?php
+        //        $index = 1;
+        //        if (count($month->inactive_begin)) {
+        //            echo '<section class="calendar__week">';
+        //
+        //            for ($index = 1; $index <= count($month->inactive_begin); $index++, $index_raw++)
+        //                echo '                <div class="calendar__day inactive">
+        //
+        //                    <span class="calendar__date">' . $month->inactive_begin[$index] . '</span>
+        //                </div>';
+        //        }
+        //        for (; $index <= array_key_last($month->active); $index++, $index_raw++) {
+        //
+        //            if ($index_raw % 7 == 0) {
+        //                if ($index != 1) echo '</section>';
+        //                echo '<section class="calendar__week">
+        //        ';
+        //            }
+        //            echo '
+        //        <div class="calendar__day">
+        //                    <span class="calendar__date ' . get_color(date('Y-m-' . $month->active[$index], strtotime($date)), $dates_created_at) . '">
+        //                        ' . $month->active[$index] . '
+        //        </span>
+        //        </div>
+        //        ';
+        //        }
+        //        ?>
+        <!--        --><?php //for (; $index <= array_key_last($month->inactive_end); $index++, $index_raw++): ?>
+        <!--            --><?php //if ($index_raw % 7 == 0)
+        //                echo '
+        //                </section>
+        //        <section class="calendar__week ">
+        //        ';
+        //            ?>
+        <!--            <div class="calendar__day inactive">-->
+        <!--                <span class="calendar__date "><? //= $month->inactive_end[$index] ?><!--</span>-->
+        <!--            </div>-->
+        <!--        --><?php //endfor; ?>
+    </section>
+
+</section>
+<script>
+
+    class HtmlCalendar {
+
+        constructor(month, reports, before = '') {
+            this.month = month;
+            this.reports = reports;
+            this.before = before;
+            this.datePicker = datePicker;
+
+            this.classDay = 'calendar__day';
+
+            this.nameDate = document.querySelector('.sidebar__heading');
+
+            this.initBefore();
+        }
+
+        getHtml() {
+            this.getInactiveBegin();
+            this.getActive();
+            this.getInactiveEnd();
+            return this.html;
+        }
+
+        update(month, reports) {
+            this.month = month;
+            this.reports = reports;
+            this.initBefore();
+
+        }
+
+        initBefore() {
+            this.html = '';
+            this.index = 1;
+            this.indexRaw = 0;
+            this.date = document.querySelector('#date').value.substr(0, 7);
+        }
+
+        getInactiveBegin() {
+            if (Object.keys(this.month['inactive_begin']).length > 0) {
+                this.html += '<section class="calendar__week">';
+
+                for (; this.index <= Object.keys(this.month['inactive_begin']).length; this.index++, this.indexRaw++) {
+                    this.html += this.getCalendarDay('inactive_begin', 'inactive');
+                }
+            }
+        }
+
+        getActive() {
+            for (; this.index <= this.getLastKey(this.month['active']); this.index++, this.indexRaw++) {
+                if (this.indexRaw % 7 == 0) {
+                    if (this.index != 1) {
+                        this.html += '</section>';
+                    }
+                    this.html += '<section class="calendar__week">';
+                }
+                this.html += this.getCalendarDay('active')
+            }
+        }
+
+        getInactiveEnd() {
+            for (; this.index <= this.getLastKey(this.month['inactive_end']); this.index++, this.indexRaw++) {
+                if (this.indexRaw % 7 == 0) {
+                    this.html += `</section>
+                            <section class="calendar__week ">`;
+                }
+                this.html += this.getCalendarDay('inactive_end', 'inactive');
+            }
+        }
+
+        getCalendarDay(type, className = '') {
+            return `<div class="${this.classDay} ${className}">
+                <span class="calendar__date ${this.getColor(this.date + '-' + this.month[type][this.index])}">${this.month[type][this.index]}</span>
+            </div>`;
+        }
+
+        getColor(date) {
+            let d = new Date(date)
+            if ([6, 0].includes(d.getDay()))
+                return;
+            for (let i in this.reports) {
+                if (this.reports[i]['created_at'] == date) {
+                    return 'success';
+                }
+            }
+            return 'danger';
+        }
+
+        getLastKey(obj) {
+            return Object.keys(obj)[Object.keys(obj).length - 1];
+        }
+    }
+
+    class HtmlReports {
+        constructor(reports) {
+            //TODO выходные дни - праздники
+            this.reports = reports;
+        }
+
+        getHtmlByDate(date) {
+
+            if ([0, 6].includes(new Date(date).getDay())) {
+                return "Выходной день";
+            }
+            if (!this.reports)
+                return 'Нет репортов за месяц';
+            let j = 0;
+            let html = `<ul class="sidebar__list">
+                <table class="table table-striped table-bordered">
+                    <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 class="action-column">&nbsp;</th>
+                    </tr>
+                    </thead>
+                    <tbody>`;
+            for (let k = 0, i = 0, report = this.reports[i]; i < Object.keys(this.reports).length; i++) {
+                report = this.reports[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>
+`;
+                }
+            }
+            if (j == 0) {
+                return "За этот день не было отчетов";
+            }
+
+
+            return html;
+        }
+    };
+
+
+    const CALENDAR_BAR = ` < section
+
+                class
+
+                = "calendar__top-bar" >
+                    < span
+
+                class
+
+                = "top-bar__days" > Mon < /span>
+                <span class="top-bar__days">Tue</span>
+                <span class="top-bar__days">Wed</span>
+                <span class="top-bar__days">Thu</span>
+                <span class="top-bar__days">Fri</span>
+                <span class="top-bar__days">Sat</span>
+                <span class="top-bar__days">Sun</span>
+            </section>
+                `;
+
+    let asd = JSON.parse('<?=$reports_month?>')
+    let reports = (JSON.parse('<?=$reports_month?>'))['reports'];
+    let month = (JSON.parse('<?=$reports_month?>'))['month'];
+    let datePicker = document.querySelector('#date');
+    let nameDate = document.querySelector('.sidebar__heading');
+
+    let reportsBoard = document.querySelector('.sidebar__list');
+    let htmlReports = new HtmlReports(reports);
+
+    let htmlCalendar = new HtmlCalendar(month, reports, CALENDAR_BAR);
+    let calendar = document.querySelector('.calendar__days');
+
+
+    async function main() {
+        calendar.load = async function () {
+
+            htmlCalendar.update(month, reports)
+            let reportsMonth = await updateMonthReports('2021-08-10')
+            console.log(reportsMonth);
+            console.log(123123123)
+            console.log(asd)
+
+
+            reports = reportsMonth['reports'];
+            month = reportsMonth['month'];
+            calendar.innerHTML = htmlCalendar.getHtml();
+
+            htmlReports.reports = reports;
+            htmlReports.getHtmlByDate('2021-08-31')
+
+            datePicker.onchange = async function () {
+                if (!isOldDatePicker(datePicker, oldDate)) {
+                    oldDate = datePicker.value.substr(0, 7);
+
+                    // updateMonthReports(datePicker.value)
+
+                    let reportsMonth = await updateMonthReports('2021-08-10')
+                    console.log(reportsMonth);
+                    console.log(123123123)
+                    console.log(asd)
+
+
+                    reports = reportsMonth['reports'];
+                    month = reportsMonth['month'];
+
+                    calendar.load();
+
+
+                }
+                let date = new Date(datePicker.value);
+                let monthName = date.toLocaleString('default', {month: 'long'});
+                let dayWeekName = date.toLocaleString('default', {weekday: 'long'});
+                nameDate.innerHTML = `${dayWeekName} <br>${monthName} ${datePicker.value.substr(8, 2)}`;
+                reportsBoard.innerHTML = htmlReports.getHtmlByDate(datePicker.value)
+            }
+
+            let days = document.querySelectorAll('.calendar__day');
+            for (let i = 0; i < Object.keys(days).length; i++) {
+                let dateDay = parseInt(days[i].textContent);
+
+                if (days[i].classList.contains('inactive')) {
+                    days[i].onclick = function () {
+
+                    }
+                } else {
+                    days[i].onclick = function () {
+                        datePicker.value = datePicker.value.substr(0, 8) + IntToDate(dateDay);
+                        datePicker.onchange()
+                    }
+                }
+            }
+        }
+
+
+        calendar.load()
+        // reportsMonth = await updateMonthReports('2021-08-10')
+        //
+        // reports = reportsMonth['reports'];
+        // month = reportsMonth['month'];
+
+    }
+
+    main()
+
+
+    let oldDate = datePicker.value.substr(0, 7);
+
+
+    function isOldDatePicker(datePicker, oldDate) {
+        if (datePicker.value.substr(0, 7) == oldDate)
+            return true;
+        return false
+    }
+
+
+    async function updateMonthReports(date) {
+
+        let monthNumber = date.substr(5, 2);
+        let yearNumber = date.substr(0, 4);
+
+        return fetch('../ajax/get-reports-for-month-by-id-year-month?id=<?=$ID?>' +
+            '&month=' + monthNumber +
+            '&year=' + yearNumber)
+            .then(async (res) => {
+                return await res.json()
+            })
+
+    }
+
+
+    function IntToDate(number_date) {
+        if (Math.floor(number_date / 10) === 0)
+            number_date = '0' + number_date;
+        return number_date
+    }
+
+</script>
+
+<style>
+
+    .calendar-contain {
+        position: relative;
+        left: 0;
+        right: 0;
+        border-radius: 0;
+        width: 100%;
+        overflow: hidden;
+        max-width: 1920px;
+        min-width: 450px;
+        margin: 1rem auto;
+        background-color: #f5f7f6;
+        box-shadow: 5px 5px 72px rgba(30, 46, 50, 0.5);
+        color: #040605;
+    }
+
+    @media screen and (min-width: 55em) {
+        .calendar-contain {
+            margin: auto;
+            top: 5%;
+        }
+    }
+
+    .title-bar {
+        position: relative;
+        width: 100%;
+        display: table;
+        text-align: right;
+        background: #f5f7f6;
+        padding: 0.5rem;
+        margin-bottom: 0;
+    }
+
+    .title-bar:after {
+        display: table;
+        clear: both;
+    }
+
+    .title-bar__burger {
+        display: block;
+        position: relative;
+        float: left;
+        overflow: hidden;
+        margin: 0;
+        padding: 0;
+        width: 38px;
+        height: 30px;
+        font-size: 0;
+        text-indent: -9999px;
+        appearance: none;
+        box-shadow: none;
+        border: none;
+        cursor: pointer;
+        background: none;
+    }
+
+    .title-bar__burger:focus {
+        outline: none;
+    }
+
+    .burger__lines {
+        display: block;
+        position: absolute;
+        width: 18px;
+        top: 15px;
+        left: 0;
+        right: 0;
+        margin: auto;
+        height: 1px;
+        background: #040605;
+    }
+
+    .burger__lines:before, .burger__lines:after {
+        position: absolute;
+        display: block;
+        left: 0;
+        width: 100%;
+        height: 1px;
+        background-color: #040605;
+        content: "";
+    }
+
+    .burger__lines:before {
+        top: -5px;
+    }
+
+    .burger__lines:after {
+        bottom: -5px;
+    }
+
+    .title-bar__year {
+        display: block;
+        position: relative;
+        float: left;
+        font-size: 1rem;
+        line-height: 30px;
+        width: 43%;
+        padding: 0 0.5rem;
+        text-align: left;
+    }
+
+    @media screen and (min-width: 55em) {
+        .title-bar__year {
+            width: 27%;
+        }
+    }
+
+    .title-bar__month {
+        position: relative;
+        /*float: center;*/
+        font-size: 1rem;
+        line-height: 30px;
+        width: 22%;
+        padding: 0 0.5rem;
+        text-align: center;
+        margin-right: 67px;
+        word-spacing: 30px;
+    }
+
+    @media screen and (min-width: 55em) {
+        .title-bar__month {
+            width: 12%;
+        }
+    }
+
+    .title-bar__minimize, .title-bar__maximize, .title-bar__close {
+        position: relative;
+        float: left;
+        width: 34px;
+        height: 34px;
+    }
+
+    .title-bar__minimize:before, .title-bar__maximize:before, .title-bar__close:before, .title-bar__minimize:after, .title-bar__maximize:after, .title-bar__close:after {
+        top: 30%;
+        right: 30%;
+        bottom: 30%;
+        left: 30%;
+        content: " ";
+        position: absolute;
+        border-color: #8e8e8e;
+        border-style: solid;
+        border-width: 0 0 2px 0;
+    }
+
+    .title-bar .title-bar__controls {
+        display: inline-block;
+        vertical-align: top;
+        position: relative;
+        float: right;
+        width: auto;
+    }
+
+    .title-bar .title-bar__controls:before, .title-bar .title-bar__controls:after {
+        content: none;
+    }
+
+    .title-bar .title-bar__minimize:before {
+        border-bottom-width: 2px;
+    }
+
+    .title-bar .title-bar__maximize:before {
+        border-width: 1px 1px 2px 1px;
+    }
+
+    .title-bar .title-bar__close:before, .title-bar .title-bar__close:after {
+        bottom: 50%;
+        top: 49.9%;
+    }
+
+    .title-bar .title-bar__close:before {
+        transform: rotate(45deg);
+    }
+
+    .title-bar .title-bar__close:after {
+        transform: rotate(-45deg);
+    }
+
+    .calendar__sidebar {
+        width: 100%;
+        margin: 0 auto;
+        float: none;
+        background: linear-gradient(120deg, #eff3f3, #e1e7e8);
+        padding-bottom: 0.7rem;
+    }
+
+    @media screen and (min-width: 55em) {
+        .calendar__sidebar {
+            position: absolute;
+            height: 100%;
+            width: 50%;
+            float: left;
+            margin-bottom: 0;
+        }
+    }
+
+    .calendar__sidebar .content {
+        padding: 2rem 1.5rem 2rem 4rem;
+        color: #040605;
+    }
+
+    .sidebar__nav {
+        display: flex;
+        align-items: center;
+        justify-content: flex-start;
+        margin-bottom: 0.9rem;
+        padding: 0.7rem 1rem;
+        background-color: #f5f7f6;
+    }
+
+    .sidebar__nav-item {
+        display: inline-block;
+        width: 22px;
+        margin-right: 23px;
+        padding: 0;
+        opacity: 0.8;
+    }
+
+    .sidebar__list {
+        list-style: none;
+        margin: 0;
+        padding-left: 1rem;
+        padding-right: 1rem;
+    }
+
+    .sidebar__list-item {
+        margin: 1.2rem 0;
+        color: #2d4338;
+        font-weight: 100;
+        font-size: 1rem;
+    }
+
+    .list-item__time {
+        display: inline-block;
+        width: 60px;
+    }
+
+    @media screen and (min-width: 55em) {
+        .list-item__time {
+            margin-right: 2rem;
+        }
+    }
+
+    .sidebar__list-item--complete {
+        color: rgba(4, 6, 5, 0.3);
+    }
+
+    .sidebar__list-item--complete .list-item__time {
+        color: rgba(4, 6, 5, 0.3);
+    }
+
+    .sidebar__heading {
+        font-size: 2.2rem;
+        font-weight: bold;
+        padding-left: 1rem;
+        padding-right: 1rem;
+        margin-bottom: 3rem;
+        margin-top: 1rem;
+    }
+
+    .sidebar__heading span {
+        float: right;
+        font-weight: 300;
+    }
+
+    .calendar__heading-highlight {
+        color: #2d444a;
+        font-weight: 900;
+    }
+
+    .calendar__days {
+        display: flex;
+        flex-flow: column wrap;
+        align-items: stretch;
+        width: 100%;
+        float: none;
+        min-height: 580px;
+        height: 100%;
+        font-size: 12px;
+        /*padding: 0.8rem 0 1rem 1rem;*/
+        #b8cad6 background: #f5f7f6;
+    }
+
+    @media screen and (min-width: 55em) {
+        .calendar__days {
+            width: 50%;
+            float: right;
+        }
+    }
+
+    .calendar__top-bar {
+        background: #b8cad6;
+        text-align: center;
+        display: flex;
+        flex: 56px 0 0;
+    }
+
+    .top-bar__days {
+        width: 100%;
+        padding: 0 5px;
+        color: #2d4338;
+        font-weight: 100;
+        -webkit-font-smoothing: subpixel-antialiased;
+        font-size: 1rem;
+    }
+
+    .calendar__week {
+        display: flex;
+        flex: 1 1 0;
+    }
+
+    .calendar__day {
+        text-align: center;
+        display: flex;
+        flex-flow: column wrap;
+        justify-content: space-between;
+        width: 100%;
+        padding: 1.9rem 0.2rem 0.2rem;
+    }
+
+
+    .calendar__date {
+        color: #040605;
+        font-size: 1.7rem;
+        font-weight: 600;
+        line-height: 0.7;
+    }
+
+    @media screen and (min-width: 55em) {
+        .calendar__date {
+            font-size: 2.3rem;
+        }
+    }
+
+    .calendar__week .inactive .calendar__date, .calendar__week .inactive .task-count {
+        color: #c6c6c6;
+    }
+
+    .calendar__week .today .calendar__date {
+        color: #fd588a;
+    }
+
+    .calendar__task {
+        color: #040605;
+        display: flex;
+        font-size: 0.8rem;
+    }
+
+    @media screen and (min-width: 55em) {
+        .calendar__task {
+            font-size: 1rem;
+        }
+    }
+
+    .calendar__task.calendar__task--today {
+        color: #fd588a;
+    }
+
+
+    .danger {
+        color: red;
+    }
+
+    .success {
+        color: green;
+    }
+
+    .calendar__day:hover {
+        color: #0a0a0a;
+        background: #a6a6a6;
+        cursor: pointer;
+    }
+</style>
+
+
diff --git a/backend/modules/reports/views/reports/index.php b/backend/modules/reports/views/reports/index.php
index 8728f83..c2fcb72 100644
--- a/backend/modules/reports/views/reports/index.php
+++ b/backend/modules/reports/views/reports/index.php
@@ -86,7 +86,7 @@ function next_day($date, $number)
             'attribute' => 'ФИО',
             'filter' => Html::activeTextInput($searchModel, 'fio', ['class' => 'form-control']),
             'value' => function ($data) {
-                return '<a href="./reports/user?id='.$data['user_card_id'].'">' . \common\models\Reports::getFio($data) . '</a>';
+                return '<a href="./user?id='.$data['user_card_id'].'">' . \common\models\Reports::getFio($data) . '</a>';
             },
         ],
 
diff --git a/backend/modules/reports/views/reports/user.php b/backend/modules/reports/views/reports/user.php
index ebd161d..a1cf635 100644
--- a/backend/modules/reports/views/reports/user.php
+++ b/backend/modules/reports/views/reports/user.php
@@ -210,142 +210,42 @@ $dates_created_at = array_unique(array_map('get_dates_created_at', $reports));
 </section>
 <script>
 
-    class CalendarBuilder {
+    class HtmlCalendar {
 
-        constructor(month, reports, innerElem, datePicker, before = '') {
+        constructor(month, reports, before = '') {
             this.month = month;
-            this.Elem = innerElem;
             this.reports = reports;
             this.before = before;
             this.datePicker = datePicker;
 
+            this.classDay = 'calendar__day';
+
             this.nameDate = document.querySelector('.sidebar__heading');
 
             this.initBefore();
         }
 
-        build() {
+        getHtml() {
             this.getInactiveBegin();
             this.getActive();
             this.getInactiveEnd();
-            this.loadInElem();
-
-            this.initAfter();
-            let rep = this.loadMonthReports();
-            console.log(rep)
-            console.log(123)
-            // this.activeButtonsDays();
-
+            return this.html;
         }
 
-        update(month, reports = null) {
+        update(month, reports) {
             this.month = month;
             this.reports = reports;
-
             this.initBefore();
 
-            this.build();
         }
 
         initBefore() {
             this.html = '';
             this.index = 1;
             this.indexRaw = 0;
-            this.classDay = 'calendar__day';
             this.date = document.querySelector('#date').value.substr(0, 7);
         }
 
-        initAfter() {
-            this.days = document.querySelectorAll('.calendar__day');
-        }
-
-        loadInElem() {
-            this.Elem.innerHTML = this.before + this.html;
-        }
-
-        activeButtonsDays() {
-            // console.log(this.days);
-            for (let i = 0; i < Object.keys(this.days).length; i++) {
-                // if (this.days[i].querySelector('.calendar__date.inactive')) {
-                //     this.clickInactive(this.days[i])''
-                // } else
-                console.log(this.days[i])
-                console.log(i)
-                this.days[i].dayOnClick = this.dayOnClick;
-                this.days[i].changeDateFutureOrPast = this.changeDateFutureOrPast;
-                this.days[i].nameDate = this.nameDate;
-                this.days[i].datePicker = this.datePicker;
-                this.days[i].IntToDate = this.IntToDate;
-                this.days[i].loadMonthReports = this.loadMonthReports;
-                this.days[i].update = this.update;
-
-                this.days[i].onclick = function () {
-                    this.dayOnClick(this)
-                };
-            }
-
-        }
-
-        dayOnClick(day) {
-            // console.log(day)
-            // alert(parseInt(days[i].textContent))
-            let number_date = parseInt(day.textContent);
-            number_date = this.IntToDate(number_date);
-
-            if (day.classList.contains('inactive')) {
-                this.changeDateFutureOrPast(number_date);
-            } else {
-                this.datePicker.value = this.datePicker.value.substr(0, 8) + number_date;
-
-
-                let date = new Date(this.datePicker.value);
-                let monthName = date.toLocaleString('default', {month: 'long'});
-                let dayWeekName = date.toLocaleString('default', {weekday: 'long'});
-
-                console.log(this.nameDate)
-                this.nameDate.innerHTML = dayWeekName + '<br>' + monthName + ' ' + date.toString().split(' ')[2];
-            }
-
-        }
-
-        changeDateFutureOrPast(number_date) {
-            let date = new Date(this.datePicker.value);
-            if (parseInt(this.textContent) <= 7) {
-                if (date.getMonth() == 11) {
-                    date = new Date(date.getFullYear() + 1, 0, 1);
-                } else {
-                    date = new Date(date.getFullYear(), date.getMonth() + 1, number_date);
-                }
-                // console.log(date.getFullYear() + '-' + (parseInt(date.getMonth())+1) + '-' + number_date)
-                // datePicker.value = date.toISOString().substring(0, 10);
-            } else {
-                if (date.getMonth() == 0) {
-                    date = new Date(date.getFullYear() - 1, 11, 1);
-                } else {
-                    date = new Date(date.getFullYear(), date.getMonth() - 1, 1);
-                }
-                // console.log(date.getFullYear() + '-' + (parseInt(date.getMonth())+1) + '-' + number_date)
-                // datePicker.value = date.getFullYear() + '-' + date.getMonth() + '-' + number_date
-            }
-            console.log(this)
-            this.loadMonthReports()
-                .then(function (reports_month) {
-                    console.log(reports_month)
-                    let reports = (JSON.parse(reports_month))[0]['reports']
-                    let month = (JSON.parse(reports_month))[0]['month']
-
-                    reports_month[1](month, reports);
-                })
-            this.datePicker.value = date.getFullYear() + '-' + this.IntToDate(parseInt(date.getMonth()) + 1) + '-' + number_date
-
-        }
-
-        IntToDate(number_date) {
-            if (Math.floor(number_date / 10) === 0)
-                number_date = '0' + number_date;
-            return number_date
-        }
-
         getInactiveBegin() {
             if (Object.keys(this.month['inactive_begin']).length > 0) {
                 this.html += '<section class="calendar__week">';
@@ -399,76 +299,179 @@ $dates_created_at = array_unique(array_map('get_dates_created_at', $reports));
         getLastKey(obj) {
             return Object.keys(obj)[Object.keys(obj).length - 1];
         }
+    }
 
-        async loadMonthReports() {
-            let datePicker = this.datePicker;
-            let makeRequest = function () {
-                return new Promise(function (resolve, reject) {
-                    let monthNumber = datePicker.value.substr(5, 2);
-                    let yearNumber = datePicker.value.substr(0, 4);
-                    let req = new XMLHttpRequest();
-                    req.open('get', '../ajax/get-reports-for-month-by-id-year-month?id=<?=$ID?>' +
-                        '&month=' + monthNumber +
-                        '&year=' + yearNumber
-                    )
-                    ;
-                    req.setRequestHeader('Content-type', 'application/json');
-                    req.onload = function () {
-                        if (this.status >= 200 && this.status < 300) {
-                            let response = [req.response, this.update]
+    class HtmlReports {
+        constructor(reports) {
+            //TODO выходные дни - праздники
+            this.reports = reports;
+        }
 
-                            resolve(response);
-                        }
+        getHtmlByDate(date) {
 
-                    };
-                    req.send();
-                })
+            if ([0, 6].includes(new Date(date).getDay())) {
+                return "Выходной день";
             }
-            return await makeRequest();
+            if (!this.reports)
+                return 'Нет репортов за месяц';
+            let j = 0;
+            let html = `<ul class="sidebar__list">
+                <table class="table table-striped table-bordered">
+                    <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 class="action-column">&nbsp;</th>
+                    </tr>
+                    </thead>
+                    <tbody>`;
+            for (let k = 0, i = 0, report = this.reports[i]; i < Object.keys(this.reports).length; i++) {
+                report = this.reports[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>
+`;
+                }
+            }
+            if (j == 0) {
+                return "За этот день не было отчетов";
+            }
+
+
+            return html;
         }
-
-    }
+    };
 
 
-    const CALENDAR_BAR = `<section class="calendar__top-bar">
-        <span class="top-bar__days">Mon</span>
-    <span class="top-bar__days">Tue</span>
-    <span class="top-bar__days">Wed</span>
-    <span class="top-bar__days">Thu</span>
-    <span class="top-bar__days">Fri</span>
-    <span class="top-bar__days">Sat</span>
-    <span class="top-bar__days">Sun</span>
-    </section>`;
+    const CALENDAR_BAR = ` < section
 
-    let reports = (JSON.parse('<?=$reports_month?>'))['reports']
-    let month = (JSON.parse('<?=$reports_month?>'))['month']
+                class
+
+                = "calendar__top-bar" >
+                    < span
+
+                class
+
+                = "top-bar__days" > Mon < /span>
+                <span class="top-bar__days">Tue</span>
+                <span class="top-bar__days">Wed</span>
+                <span class="top-bar__days">Thu</span>
+                <span class="top-bar__days">Fri</span>
+                <span class="top-bar__days">Sat</span>
+                <span class="top-bar__days">Sun</span>
+            </section>
+                `;
+
+    let reports = (JSON.parse('<?=$reports_month?>'))['reports'];
+    let month = (JSON.parse('<?=$reports_month?>'))['month'];
     let datePicker = document.querySelector('#date');
-
-    let calendarBuilder = new CalendarBuilder(
-        month, reports, document.querySelector('.calendar__days'), datePicker, CALENDAR_BAR);
-    calendarBuilder.build()
-
-    let days = document.querySelectorAll('.calendar__day');
-
-
     let oldDate = datePicker.value.substr(0, 7);
+    let nameDate = document.querySelector('.sidebar__heading');
 
-    datePicker.onchange = function () {
-        console.log(this.value)
-        if (!isOldDatePicker(datePicker, oldDate)) {
-            oldDate = datePicker.value.substr(0, 7);
+    let reportsBoard = document.querySelector('.sidebar__list');
+    let htmlReports = new HtmlReports(reports);
 
-            get_reports_ajax(datePicker)
-                .then(function (reports_month) {
-                    let reports = (JSON.parse(reports_month))['reports']
-                    let month = (JSON.parse(reports_month))['month']
-                    calendarBuilder.update(month, reports);
-                })
+    let htmlCalendar = new HtmlCalendar(month, reports, CALENDAR_BAR);
+    let calendar = document.querySelector('.calendar__days');
+
+
+    calendar.load = async function () {
+
+        htmlCalendar.update(month, reports)
+        calendar.innerHTML = htmlCalendar.getHtml();
+
+        htmlReports.reports = reports;
+        htmlReports.getHtmlByDate('2021-08-31')
+
+        datePicker.onchange = function () {
+            if (!isOldDatePicker(datePicker, oldDate)) {
+                oldDate = datePicker.value.substr(0, 7);
+
+                updateMonthReports(datePicker.value)
+                    .then(reportsMonth => {
+                        reports = reportsMonth['reports'];
+                        month = reportsMonth['month'];
+
+                        calendar.load();
+                    })
+
+            }
+            let date = new Date(datePicker.value);
+            let monthName = date.toLocaleString('default', {month: 'long'});
+            let dayWeekName = date.toLocaleString('default', {weekday: 'long'});
+            nameDate.innerHTML = `${dayWeekName} <br>${monthName} ${datePicker.value.substr(8, 2)}`;
+            reportsBoard.innerHTML = htmlReports.getHtmlByDate(datePicker.value)
+        }
+
+        let days = document.querySelectorAll('.calendar__day');
+        for (let i = 0; i < Object.keys(days).length; i++) {
+            let dateDay = parseInt(days[i].textContent);
+
+            if (days[i].classList.contains('inactive')) {
+                days[i].onclick = function () {
+                    let date = getFutureDate(datePicker.value, parseInt(days[i].textContent))
+                    console.log(date)
+                    datePicker.value = date;
+                    datePicker.onchange()
+                }
+            } else {
+                days[i].onclick = function () {
+                    datePicker.value = datePicker.value.substr(0, 8) + IntToDate(dateDay);
+                    datePicker.onchange()
+                }
+            }
         }
     }
 
+    calendar.load()
 
-    let nameDate = document.querySelector('.sidebar__heading');
 
     function isOldDatePicker(datePicker, oldDate) {
         if (datePicker.value.substr(0, 7) == oldDate)
@@ -477,26 +480,44 @@ $dates_created_at = array_unique(array_map('get_dates_created_at', $reports));
     }
 
 
-    function get_reports_ajax(datePicker) {
-        return new Promise(function (resolve, reject) {
-            let monthNumber = datePicker.value.substr(5, 2);
-            let yearNumber = datePicker.value.substr(0, 4);
-            let req = new XMLHttpRequest();
-            req.open('get', '../ajax/get-reports-for-month-by-id-year-month?id=<?=$ID?>' +
-                '&month=' + monthNumber +
-                '&year=' + yearNumber
-            );
-            req.setRequestHeader('Content-type', 'application/json');
-            req.onload = function () {
-                if (this.status >= 200 && this.status < 300) {
-                    resolve(req.response);
-                }
+    async function updateMonthReports(date) {
+
+        let monthNumber = date.substr(5, 2);
+        let yearNumber = date.substr(0, 4);
+
+        return fetch('../ajax/get-reports-for-month-by-id-year-month?id=<?=$ID?>' +
+            '&month=' + monthNumber +
+            '&year=' + yearNumber)
+            .then((res) => {
+                return res.json()
+            })
 
-            };
-            req.send();
-        })
     }
 
+    function getFutureDate(dat, value) {
+        let date = new Date(dat);
+        if (value < 8) {
+            if (date.getMonth() == 11) {
+                date = new Date(date.getFullYear() + 1, 0, value);
+            } else {
+                date = new Date(date.getFullYear(), date.getMonth() + 1, value);
+            }
+        } else {
+            if (date.getMonth() == 0) {
+                date = new Date(date.getFullYear() - 1, 11, value);
+            } else {
+                date = new Date(date.getFullYear(), date.getMonth() - 1, value);
+            }
+        }
+        return date.getFullYear() + '-' + IntToDate(date.getMonth()+1) + '-' + IntToDate(value);
+
+    }
+
+    function IntToDate(number_date) {
+        if (Math.floor(number_date / 10) === 0)
+            number_date = '0' + number_date;
+        return number_date
+    }
 
 </script>
 

From 1fc92ac77390debc68759221fa502eee0002a6ee Mon Sep 17 00:00:00 2001
From: maxim <makss.web@gmail.com>
Date: Mon, 6 Sep 2021 16:31:10 +0300
Subject: [PATCH 3/6] =?UTF-8?q?=D0=BF=D0=BE=20=D1=83=D0=BC=D0=BE=D0=BB?=
 =?UTF-8?q?=D1=87=D0=B0=D0=BD=D0=B8=D1=8E=20=D0=B4=D0=B5=D0=BD=D1=8C=20?=
 =?UTF-8?q?=D0=B8=20=D1=80=D0=B5=D0=BF=D0=BE=D1=80=D1=82=D1=8B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 backend/modules/reports/models/Month.php      |  12 --
 .../modules/reports/views/reports/index.php   |   2 +-
 .../modules/reports/views/reports/user.php    | 165 +-----------------
 3 files changed, 8 insertions(+), 171 deletions(-)

diff --git a/backend/modules/reports/models/Month.php b/backend/modules/reports/models/Month.php
index e52cf44..f5512c6 100644
--- a/backend/modules/reports/models/Month.php
+++ b/backend/modules/reports/models/Month.php
@@ -16,16 +16,13 @@ class Month
 
     public function __construct($date = null)
     {
-//        $date = '2021-08-10';
         $this->inactive_begin = [];
         $this->inactive_end = [];
-//        Debug::prn($date);
         if (!$date and !self::is_date($date)) {
 
             $date = date('Y-m-d');
             Debug::dd($date);
         }
-//        Debug::dd($date);
 
         $first_day_of_week = self::get_day_week(self::get_first_day($date));
         $quantity_days = self::get_days_month($date);
@@ -47,7 +44,6 @@ class Month
         for ($index = $first_day_of_week - 1; $index >= 1; $index--, $day--) {
             $this->inactive_begin[$index] = $day;
         }
-//        Debug::dd($first_day_of_week);
         $day = 1;
         $index_end = (in_array($first_day_of_week, [6,7])?42:35);
         for ($index = $quantity_days + $first_day_of_week; $index <=$index_end; $index++, $day++) {
@@ -55,7 +51,6 @@ class Month
         }
 
         $this->days = array_merge($this->inactive_end, $this->inactive_begin, $this->active);
-//        Debug::dd($this);
 
     }
 
@@ -91,11 +86,4 @@ class Month
         return date("t", strtotime($date));
     }
 
-
-    public function a()
-    {
-//        $a = date('w', strtotime(date('')))
-    }
-
-
 }
\ No newline at end of file
diff --git a/backend/modules/reports/views/reports/index.php b/backend/modules/reports/views/reports/index.php
index c2fcb72..8728f83 100644
--- a/backend/modules/reports/views/reports/index.php
+++ b/backend/modules/reports/views/reports/index.php
@@ -86,7 +86,7 @@ function next_day($date, $number)
             'attribute' => 'ФИО',
             'filter' => Html::activeTextInput($searchModel, 'fio', ['class' => 'form-control']),
             'value' => function ($data) {
-                return '<a href="./user?id='.$data['user_card_id'].'">' . \common\models\Reports::getFio($data) . '</a>';
+                return '<a href="./reports/user?id='.$data['user_card_id'].'">' . \common\models\Reports::getFio($data) . '</a>';
             },
         ],
 
diff --git a/backend/modules/reports/views/reports/user.php b/backend/modules/reports/views/reports/user.php
index a1cf635..7e8e4eb 100644
--- a/backend/modules/reports/views/reports/user.php
+++ b/backend/modules/reports/views/reports/user.php
@@ -1,11 +1,7 @@
 <?php
 
-use backend\modules\reports\models\ReportsSearch;
-use kartik\grid\GridView;
-use yii\data\Pagination;
 use yii\helpers\Html;
 use common\models\Reports;
-use  \common\classes\Debug;
 use backend\modules\reports\models\Month;
 
 
@@ -14,6 +10,9 @@ use backend\modules\reports\models\Month;
 /* @var $dataProvider yii\data\ActiveDataProvider */
 /* @var $reports common\models\Reports */
 /* @var $ID */
+/* @var $reports_month */
+/* @var $date */
+
 
 
 $month = new Month($date);
@@ -41,28 +40,8 @@ function get_color($date, $dates_created_at)
 
 $this->title = 'Календарь пользователя - ' . Reports::getFio($reports[0]);
 $dates_created_at = array_unique(array_map('get_dates_created_at', $reports));
-
-//for ($date = '2021-08-01', $i = 0; $date != '2021-09-01'; $date = next_day($date, 1), $i++) {
-//    if ($i == 7) {
-//        echo '<div>';
-//        $i = 0;
-//    }
-//    if (in_array($date, $dates_created_at)) {
-//        $color = 'primary';
-//    } else
-//        $color = 'danger';
-//    echo Html::a($date, ['reports/?date=' . $date], ['class' => 'btn btn-' . $color . '',
-//        'style' => 'margin: 10px;']);
-//
-//}
-//
-
-//
-//?>
-<?= Html::csrfMetaTags() ?>
+?>
 <section class="calendar-contain">
-
-
     <aside class="calendar__sidebar">
         <section class="title-bar">
             <?= Html::input('date', 'date', isset($_GET['date']) ? $_GET['date'] : date('Y-m-d'), [
@@ -74,137 +53,10 @@ $dates_created_at = array_unique(array_map('get_dates_created_at', $reports));
         </section>
         <h2 class="sidebar__heading"><?= date('l') ?><br><?= date('F d') ?></h2>
         <ul class="sidebar__list">
-            <table class="table table-striped table-bordered">
-                <thead>
-                <tr>
-                    <th>ID</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 class="action-column">&nbsp;</th>
-                </tr>
-                </thead>
-                <tbody>
-                <tr data-key="4">
-                    <td>1</td>
-                    <td><p>1. (1 ч.) asd</p></td>
-                    <td></td>
-                    <td></td>
-                    <td><a href="/secure/reports/reports/view?id=4" 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=4" 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=4" 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>
-                </tr>
-                <tr data-key="9">
-                    <td>2</td>
-                    <td><p>1. (23 ч.) asdasd</p></td>
-                    <td></td>
-                    <td></td>
-                    <td><a href="/secure/reports/reports/view?id=9" 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">
-                            </svg>
-                        </a> <a href="/secure/reports/reports/update?id=9" 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">
-                            </svg>
-                        </a> <a href="/secure/reports/reports/delete?id=9" 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">
-                            </svg>
-                        </a></td>
-                </tr>
-                </tbody>
-            </table>
+
         </ul>
     </aside>
-
-
     <section class="calendar__days">
-        <!--        <section class="calendar__top-bar">-->
-        <!--            <span class="top-bar__days">Mon</span>-->
-        <!--            <span class="top-bar__days">Tue</span>-->
-        <!--            <span class="top-bar__days">Wed</span>-->
-        <!--            <span class="top-bar__days">Thu</span>-->
-        <!--            <span class="top-bar__days">Fri</span>-->
-        <!--            <span class="top-bar__days">Sat</span>-->
-        <!--            <span class="top-bar__days">Sun</span>-->
-        <!--        </section>-->
-        <!---->
-        <!--        --><?php
-        //        $index = 1;
-        //        if (count($month->inactive_begin)) {
-        //            echo '<section class="calendar__week">';
-        //
-        //            for ($index = 1; $index <= count($month->inactive_begin); $index++, $index_raw++)
-        //                echo '                <div class="calendar__day inactive">
-        //
-        //                    <span class="calendar__date">' . $month->inactive_begin[$index] . '</span>
-        //                </div>';
-        //        }
-        //        for (; $index <= array_key_last($month->active); $index++, $index_raw++) {
-        //
-        //            if ($index_raw % 7 == 0) {
-        //                if ($index != 1) echo '</section>';
-        //                echo '<section class="calendar__week">
-        //        ';
-        //            }
-        //            echo '
-        //        <div class="calendar__day">
-        //                    <span class="calendar__date ' . get_color(date('Y-m-' . $month->active[$index], strtotime($date)), $dates_created_at) . '">
-        //                        ' . $month->active[$index] . '
-        //        </span>
-        //        </div>
-        //        ';
-        //        }
-        //        ?>
-        <!--        --><?php //for (; $index <= array_key_last($month->inactive_end); $index++, $index_raw++): ?>
-        <!--            --><?php //if ($index_raw % 7 == 0)
-        //                echo '
-        //                </section>
-        //        <section class="calendar__week ">
-        //        ';
-        //            ?>
-        <!--            <div class="calendar__day inactive">-->
-        <!--                <span class="calendar__date "><? //= $month->inactive_end[$index] ?><!--</span>-->
-        <!--            </div>-->
-        <!--        --><?php //endfor; ?>
     </section>
 
 </section>
@@ -389,7 +241,6 @@ ${report['today'][j]['task']}</p>`
         }
     };
 
-
     const CALENDAR_BAR = ` < section
 
                 class
@@ -457,7 +308,6 @@ ${report['today'][j]['task']}</p>`
             if (days[i].classList.contains('inactive')) {
                 days[i].onclick = function () {
                     let date = getFutureDate(datePicker.value, parseInt(days[i].textContent))
-                    console.log(date)
                     datePicker.value = date;
                     datePicker.onchange()
                 }
@@ -471,7 +321,7 @@ ${report['today'][j]['task']}</p>`
     }
 
     calendar.load()
-
+    datePicker.onchange()
 
     function isOldDatePicker(datePicker, oldDate) {
         if (datePicker.value.substr(0, 7) == oldDate)
@@ -479,7 +329,6 @@ ${report['today'][j]['task']}</p>`
         return false
     }
 
-
     async function updateMonthReports(date) {
 
         let monthNumber = date.substr(5, 2);
@@ -509,7 +358,7 @@ ${report['today'][j]['task']}</p>`
                 date = new Date(date.getFullYear(), date.getMonth() - 1, value);
             }
         }
-        return date.getFullYear() + '-' + IntToDate(date.getMonth()+1) + '-' + IntToDate(value);
+        return date.getFullYear() + '-' + IntToDate(date.getMonth() + 1) + '-' + IntToDate(value);
 
     }
 

From 1875dacfbbb0703acf4c8f4476122765809684eb Mon Sep 17 00:00:00 2001
From: maxim <makss.web@gmail.com>
Date: Mon, 6 Sep 2021 16:40:05 +0300
Subject: [PATCH 4/6] =?UTF-8?q?=D1=87=D0=B8=D1=81=D1=82=D0=BA=D0=B0=20?=
 =?UTF-8?q?=D0=BC=D1=83=D1=81=D0=BE=D1=80=D0=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../modules/reports/controllers/AjaxController.php |  2 --
 .../reports/controllers/ReportsController.php      |  4 ----
 backend/modules/reports/models/ReportsSearch.php   | 14 +++++++-------
 3 files changed, 7 insertions(+), 13 deletions(-)

diff --git a/backend/modules/reports/controllers/AjaxController.php b/backend/modules/reports/controllers/AjaxController.php
index 429d241..8941ba1 100644
--- a/backend/modules/reports/controllers/AjaxController.php
+++ b/backend/modules/reports/controllers/AjaxController.php
@@ -21,8 +21,6 @@ class AjaxController extends \yii\web\Controller
 
         $searchModel = new ReportsSearch();
         $searchModel->id = $id;
-        $searchModel->month = $month;
-        $searchModel->year = $year;
 
         $dataProvider = $searchModel->search(Yii::$app->request->queryParams);
 
diff --git a/backend/modules/reports/controllers/ReportsController.php b/backend/modules/reports/controllers/ReportsController.php
index 19a0fa8..11793d8 100644
--- a/backend/modules/reports/controllers/ReportsController.php
+++ b/backend/modules/reports/controllers/ReportsController.php
@@ -4,16 +4,13 @@ namespace backend\modules\reports\controllers;
 
 use backend\modules\card\models\UserCardSearch;
 use backend\modules\reports\models\Month;
-use common\classes\Debug;
 use Yii;
 use common\models\Reports;
 use backend\modules\reports\models\ReportsSearch;
-use yii\base\Model;
 use yii\filters\AccessControl;
 use yii\web\Controller;
 use yii\web\NotFoundHttpException;
 use yii\filters\VerbFilter;
-use yii\web\Response;
 
 /**
  * ReportsController implements the CRUD actions for Reports model.
@@ -63,7 +60,6 @@ class ReportsController extends Controller
     public function actionUser($id, $date = null)
     {
         if (!(isset($date) and preg_match("/^\d{4}\-(0[1-9]|1[012])\-(0[1-9]|[12][0-9]|3[01])$/", $date))) {
-//            Debug::dd('неверный формат даты');
             $date = date('Y-m-01');
         }
         $date = date('Y-m-01', strtotime($date));
diff --git a/backend/modules/reports/models/ReportsSearch.php b/backend/modules/reports/models/ReportsSearch.php
index cad4c68..5acbe3c 100644
--- a/backend/modules/reports/models/ReportsSearch.php
+++ b/backend/modules/reports/models/ReportsSearch.php
@@ -2,7 +2,6 @@
 
 namespace backend\modules\reports\models;
 
-use common\classes\Debug;
 use yii\base\Model;
 use yii\data\ActiveDataProvider;
 use common\models\Reports;
@@ -14,8 +13,6 @@ use common\models\Reports;
 class ReportsSearch extends Reports
 {
     public $fio;
-    public $month;
-    public $year;
 
     /**
      * {@inheritdoc}
@@ -66,6 +63,12 @@ class ReportsSearch extends Reports
         if (isset($params['date']) and preg_match("/^\d{4}\-(0[1-9]|1[012])\-(0[1-9]|[12][0-9]|3[01])$/", $params['date']) and !isset($params['id'])) {
             $this->created_at = $params['date'];
         }
+        if (isset($params['year'])) {
+            $query->andFilterWhere(['=', 'YEAR(reports.created_at)', $params['year']]);
+        }
+        if (isset($params['month'])) {
+            $query->andFilterWhere(['=', 'MONTH(reports.created_at)', $params['month']]);
+        }
 
 //        if (!$this->validate()) {
 //            // uncomment the following line if you do not want to return any records when validation fails
@@ -77,7 +80,6 @@ class ReportsSearch extends Reports
         // grid filtering conditions
 
 
-//        Debug::dd($params['date']);
 
         $query->andFilterWhere([
             'user_card.id' => $this->id,
@@ -88,9 +90,7 @@ class ReportsSearch extends Reports
         $query->andFilterWhere(['like', 'today', $this->today])
             ->andFilterWhere(['like', 'difficulties', $this->difficulties])
             ->andFilterWhere(['like', 'tomorrow', $this->tomorrow])
-            ->andFilterWhere(['like', 'user_card.fio', $this->fio])
-            ->andFilterWhere(['=', 'YEAR(reports.created_at)', $this->year])
-            ->andFilterWhere(['=', 'MONTH(reports.created_at)', $this->month]);
+            ->andFilterWhere(['like', 'user_card.fio', $this->fio]);
 
 
         return $dataProvider;

From 6377b84396cd61ab582cc41ce243f325cc607ce5 Mon Sep 17 00:00:00 2001
From: maxim <makss.web@gmail.com>
Date: Mon, 6 Sep 2021 18:10:47 +0300
Subject: [PATCH 5/6] =?UTF-8?q?=D1=83=D0=B1=D1=80=D0=B0=D0=BB=20=D0=BD?=
 =?UTF-8?q?=D0=B5=D0=BD=D1=83=D0=B6=D0=BD=D1=8B=D0=B9=20=D0=B4=D0=B5=D0=B1?=
 =?UTF-8?q?=D0=B0=D0=B3=20=D0=B4=D0=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 backend/modules/reports/models/Month.php | 2 --
 1 file changed, 2 deletions(-)

diff --git a/backend/modules/reports/models/Month.php b/backend/modules/reports/models/Month.php
index f5512c6..3dd02a8 100644
--- a/backend/modules/reports/models/Month.php
+++ b/backend/modules/reports/models/Month.php
@@ -19,9 +19,7 @@ class Month
         $this->inactive_begin = [];
         $this->inactive_end = [];
         if (!$date and !self::is_date($date)) {
-
             $date = date('Y-m-d');
-            Debug::dd($date);
         }
 
         $first_day_of_week = self::get_day_week(self::get_first_day($date));

From 1883039c800d351e8142ad01065fc8edb16ec2ca Mon Sep 17 00:00:00 2001
From: maxim <makss.web@gmail.com>
Date: Tue, 7 Sep 2021 15:24:24 +0300
Subject: [PATCH 6/6] =?UTF-8?q?=D0=94=D0=B5=D0=B1=D0=B0=D0=B3=D0=B8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../modules/card/views/user-card/index.php    |  2 +-
 .../reports/controllers/ReportsController.php |  8 ++
 .../modules/reports/models/ReportsSearch.php  |  3 -
 .../modules/reports/views/reports/index.php   | 89 +++++++++++++------
 backend/web/js/site.js                        |  1 -
 5 files changed, 71 insertions(+), 32 deletions(-)

diff --git a/backend/modules/card/views/user-card/index.php b/backend/modules/card/views/user-card/index.php
index a92b535..6c73bda 100755
--- a/backend/modules/card/views/user-card/index.php
+++ b/backend/modules/card/views/user-card/index.php
@@ -79,7 +79,7 @@ $this->params['breadcrumbs'][] = $this->title;
                     'data' => \common\models\UserCard::getNameSkills(),
                     'options' => ['multiple' => true, 'placeholder' => 'Выбрать параметр', 'class' => 'form-control'],
                     'pluginOptions' => [
-                        'allowClear' => true
+                        'allowClear' => true,
                     ],
                 ]),
             ],
diff --git a/backend/modules/reports/controllers/ReportsController.php b/backend/modules/reports/controllers/ReportsController.php
index 11793d8..1d34af4 100644
--- a/backend/modules/reports/controllers/ReportsController.php
+++ b/backend/modules/reports/controllers/ReportsController.php
@@ -48,11 +48,19 @@ class ReportsController extends Controller
     public function actionIndex()
     {
         $searchModel = new ReportsSearch();
+        $reports = $searchModel->search([])->getModels();
         $dataProvider = $searchModel->search(Yii::$app->request->queryParams);
 
+        $user_id__fio = [];
+        for ($i=0; $i<count($reports);$i++){
+            $user_id__fio[$reports[$i]->user_card_id] = \common\models\Reports::getFio($reports[$i]);
+        }
+
         return $this->render('index', [
             'searchModel' => $searchModel,
             'dataProvider' => $dataProvider,
+            'user_id__fio' => $user_id__fio,
+
         ]);
     }
 
diff --git a/backend/modules/reports/models/ReportsSearch.php b/backend/modules/reports/models/ReportsSearch.php
index 5acbe3c..1c5a158 100644
--- a/backend/modules/reports/models/ReportsSearch.php
+++ b/backend/modules/reports/models/ReportsSearch.php
@@ -60,9 +60,6 @@ class ReportsSearch extends Reports
         $this->load($params);
 
 
-        if (isset($params['date']) and preg_match("/^\d{4}\-(0[1-9]|1[012])\-(0[1-9]|[12][0-9]|3[01])$/", $params['date']) and !isset($params['id'])) {
-            $this->created_at = $params['date'];
-        }
         if (isset($params['year'])) {
             $query->andFilterWhere(['=', 'YEAR(reports.created_at)', $params['year']]);
         }
diff --git a/backend/modules/reports/views/reports/index.php b/backend/modules/reports/views/reports/index.php
index 8728f83..01575b1 100644
--- a/backend/modules/reports/views/reports/index.php
+++ b/backend/modules/reports/views/reports/index.php
@@ -1,11 +1,14 @@
 <?php
 
+
 use yii\helpers\Html;
 use yii\grid\GridView;
 
+
 /* @var $this yii\web\View */
 /* @var $searchModel backend\modules\reports\models\ReportsSearch */
 /* @var $dataProvider yii\data\ActiveDataProvider */
+/* @var $user_id__fio */
 
 $this->title = 'Отчеты';
 $this->params['breadcrumbs'][] = $this->title;
@@ -16,7 +19,6 @@ function next_day($date, $number)
 {
     return date('Y-m-d', strtotime($date) + 3600 * 24 * $number);
 }
-
 ?>
 <div class="reports-index">
 
@@ -25,20 +27,47 @@ function next_day($date, $number)
         <?= Html::a('Сгрупированный по пользователям вид', ['group'], ['class' => 'btn btn-success']) ?>
     </p>
     <p>
-        <?php for ($date = TODAY; $date != WEEK_AGO; $date = next_day($date, -1)): ?>
-                <?= Html::a($date, ['reports/?date=' . $date], ['class' => 'btn btn-primary']) ?>
-        <?php endfor; ?></div>
+        <?php
+        if (!$_GET){
+            $url = '../..'.Yii::$app->request->url .'?ReportsSearch[created_at]=';
+        } else{
+            $url = '../..'.Yii::$app->request->url .'&ReportsSearch[created_at]=';
+        }
+
+        for ($date = TODAY;
+        $date != WEEK_AGO;
+        $date = next_day($date, -1)): ?>
+
+        <?= Html::a($date, [$url. $date], ['class' => 'btn btn-primary']) ?>
+    <?php endfor; ?></div>
 <div class="row">
     <div class="col-xs-6">
 
         <form method="get" style="display: inline-flex;">
+            <?php if(isset($_GET['ReportsSearch'])):?>
+            <input name="ReportsSearch[today]" type="hidden" value="<?=($_GET['ReportsSearch']['today'])?>">
+            <input name="ReportsSearch[difficulties]" type="hidden" value="<?=($_GET['ReportsSearch']['difficulties'])?>">
+            <input name="ReportsSearch[tomorrow]" type="hidden" value="<?=($_GET['ReportsSearch']['tomorrow'])?>">
+            <input name="ReportsSearch[user_card_id]" type="hidden">
+            <?php if(isset($_GET['ReportsSearch']['user_card_id'])){
+                foreach ($_GET['ReportsSearch']['user_card_id'] as $res)
+                echo
+                 '<input name="ReportsSearch[user_card_id][]" type="hidden" value="'.$res.'">';
+            }
+            ?>
+            <?php endif;
+            ?>
+
+            <?= Html::input('date', 'ReportsSearch[created_at]',
+                isset($_GET['ReportsSearch']['created_at']) ? $_GET['ReportsSearch']['created_at'] : date('Y-m-d'), [
+                    'class' => 'form-control',
+                    'style' => 'display:',
+                    'id' => 'date'
+
+                ]) ?>
+
 
-            <?= Html::input('date', 'date', isset($_GET['date']) ? $_GET['date'] : date('Y-m-d'), [
-                'class' => 'form-control',
-                'style' => 'display:',
-                'id' => 'date'
 
-            ]) ?>
 
             <?= Html::button('Сортировка по дате', ['class' => 'btn btn-danger sort_by_date', 'type' => 'submit']) ?>
 
@@ -49,12 +78,7 @@ function next_day($date, $number)
     </div>
 
 </div>
-<!--    <div class="row" style="margin: 10px 0px 0 5px">-->
 </p>
-<?php
-//echo '<pre>';
-//var_dump($dataProvider);
-//echo '</pre>';?>
 <?= GridView::widget([
     'dataProvider' => $dataProvider,
     'filterModel' => $searchModel,
@@ -62,7 +86,18 @@ function next_day($date, $number)
     'columns' => [
         ['class' => 'yii\grid\SerialColumn'],
 
-        'created_at',
+        [
+            'format' => 'raw',
+            'attribute' => 'created_at',
+            'filter' =>   Html::input('date', 'ReportsSearch[created_at]',
+                null, [
+                    'class' => 'form-control',
+                    'style' => 'display:',
+                    'id' => 'date'
+
+                ]) ,
+            'value' => 'created_at',
+        ],
         [
             'attribute' => 'today',
             'format' => 'raw',
@@ -83,10 +118,19 @@ function next_day($date, $number)
         'tomorrow',
         [
             'format' => 'raw',
-            'attribute' => 'ФИО',
-            'filter' => Html::activeTextInput($searchModel, 'fio', ['class' => 'form-control']),
+            'attribute' => 'user_card_id',
+            'filter' => kartik\select2\Select2::widget([
+                'model' => $searchModel,
+                'attribute' => 'user_card_id',
+                'data' => $user_id__fio,
+                'options' => ['multiple' => true, 'class' => 'form-control'],
+                'pluginOptions' => [
+
+                    'multiple' => true,
+                ],
+            ]),
             'value' => function ($data) {
-                return '<a href="./reports/user?id='.$data['user_card_id'].'">' . \common\models\Reports::getFio($data) . '</a>';
+                return '<a href="'.Yii::getAlias('@web').'/reports/reports/user?id=' . $data['user_card_id'] . '">' . \common\models\Reports::getFio($data) . '</a>';
             },
         ],
 
@@ -99,18 +143,9 @@ $this->registerCssFile('../../css/site.css');
 
 </div>
 
-<script>
-    // let date = document.querySelector('#date')
-    //     date.onchange = function (){
-    //     window.location.replace(`./?date=${date.value}`);
-    // }
-</script>
 <style>
     .row * {
         margin-right: 10px;
     }
 
-    .row {
-        margin-left: 1px;
-    }
 </style>
\ No newline at end of file
diff --git a/backend/web/js/site.js b/backend/web/js/site.js
index 9d1bdf4..6fa1192 100644
--- a/backend/web/js/site.js
+++ b/backend/web/js/site.js
@@ -1,4 +1,3 @@
-alert(123);
 
 $(function(){
     $('#options').change(function(){