готовый календарь, немного мусора

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');
 

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')],
+                'reports_month' => json_encode(array_merge(['reports' => $reports_no_task],
-                    ['month'=>(array)$month])),
+                    ['month' => (array)$month])),
                 'date' => $date
             ]);
         }

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;
         }

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>';
             },
         ],
 

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();
+            return this.html;
-
-            this.initAfter();
-            let rep = this.loadMonthReports();
-            console.log(rep)
-            console.log(123)
-            // this.activeButtonsDays();
-
         }
 
-        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() {
+    class HtmlReports {
-            let datePicker = this.datePicker;
+        constructor(reports) {
-            let makeRequest = function () {
+            //TODO выходные дни - праздники
-                return new Promise(function (resolve, reject) {
+            this.reports = reports;
-                    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);
+        getHtmlByDate(date) {
-                        }
 
-                    };
+            if ([0, 6].includes(new Date(date).getDay())) {
-                    req.send();
+                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">
+    const CALENDAR_BAR = ` < section
-        <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']
+                class
-    let month = (JSON.parse('<?=$reports_month?>'))['month']
+
+                = "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 () {
+    let reportsBoard = document.querySelector('.sidebar__list');
-        console.log(this.value)
+    let htmlReports = new HtmlReports(reports);
-        if (!isOldDatePicker(datePicker, oldDate)) {
-            oldDate = datePicker.value.substr(0, 7);
 
-            get_reports_ajax(datePicker)
+    let htmlCalendar = new HtmlCalendar(month, reports, CALENDAR_BAR);
-                .then(function (reports_month) {
+    let calendar = document.querySelector('.calendar__days');
-                    let reports = (JSON.parse(reports_month))['reports']
+
-                    let month = (JSON.parse(reports_month))['month']
+
-                    calendarBuilder.update(month, reports);
+    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) {
+    async function updateMonthReports(date) {
-        return new Promise(function (resolve, reject) {
+
-            let monthNumber = datePicker.value.substr(5, 2);
+        let monthNumber = date.substr(5, 2);
-            let yearNumber = datePicker.value.substr(0, 4);
+        let yearNumber = date.substr(0, 4);
-            let req = new XMLHttpRequest();
+
-            req.open('get', '../ajax/get-reports-for-month-by-id-year-month?id=<?=$ID?>' +
+        return fetch('../ajax/get-reports-for-month-by-id-year-month?id=<?=$ID?>' +
-                '&month=' + monthNumber +
+            '&month=' + monthNumber +
-                '&year=' + yearNumber
+            '&year=' + yearNumber)
-            );
+            .then((res) => {
-            req.setRequestHeader('Content-type', 'application/json');
+                return res.json()
-            req.onload = function () {
+            })
-                if (this.status >= 200 && this.status < 300) {
-                    resolve(req.response);
-                }
 
-            };
-            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>