From 2ed7a1b1bd71b2e65c2b74d81f768f841a5088af Mon Sep 17 00:00:00 2001 From: Vladimir Fomichev Date: Tue, 10 Sep 2024 09:50:13 +0300 Subject: [PATCH] =?utf8?q?=D0=B8=D1=81=D0=BF=D1=80=D0=B0=D0=B2=D0=BB=D0=B5?= =?utf8?q?=D0=BD=D0=B0=20=D0=B7=D0=B0=D0=BF=C3=90=D0=B4=D0=BE=D0=B1=D0=B0?= =?utf8?q?=D0=B8=C3=90=D0=B7=D0=BC=D0=B5=D0=BD=D0=B5=D0=BD=D0=BE=20=D0=BF?= =?utf8?q?=D1=80=D0=B5=D0=B4=D1=81=D1=82=D0=B0=D0=B2=D0=BB=D0=B5=D0=BD?= =?utf8?q?=D0=B8=D0=B5=20=D0=BF=D1=80=D0=BE=D1=81=D0=BC=D0=BE=D1=82=D1=80?= =?utf8?q?=D0=B0=20=D0=BA=D0=BB=D0=B0=D1=81=D1=82=D0=B5=D1=80=D0=BE=D0=B2?= MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit --- .../controllers/ClusterLinkEditController.php | 6 +- erp24/views/cluster_link_store_edit/view.php | 240 +++++++++++------- 2 files changed, 157 insertions(+), 89 deletions(-) diff --git a/erp24/controllers/ClusterLinkEditController.php b/erp24/controllers/ClusterLinkEditController.php index 4c4a029b..6fd51fad 100644 --- a/erp24/controllers/ClusterLinkEditController.php +++ b/erp24/controllers/ClusterLinkEditController.php @@ -314,8 +314,8 @@ class ClusterLinkEditController extends Controller } //var_dump($yearPost); // die('stop'); - // return $this->redirect('view', ['year' => $yearPost]); - return $this->render('/cluster_link_store_edit/update', [ + return $this->redirect('view'); + /* return $this->render('/cluster_link_store_edit/update', [ 'model' => $model, 'years' => $years, 'year' => $yearPost, @@ -324,7 +324,7 @@ class ClusterLinkEditController extends Controller 'clusterManager' => $clusterManager, 'monthNames' => $monthNames, 'inputDate' => $inputDate, - ]); + ]);*/ } return $this->render('/cluster_link_store_edit/update', [ diff --git a/erp24/views/cluster_link_store_edit/view.php b/erp24/views/cluster_link_store_edit/view.php index 2aa44a9b..385b335e 100644 --- a/erp24/views/cluster_link_store_edit/view.php +++ b/erp24/views/cluster_link_store_edit/view.php @@ -1,3 +1,4 @@ + title = 'Изменение кустов '; +$this->title = 'Просмотр кустов'; + +// Определяем текущий квартал +$currentMonth = date('n'); // Текущий месяц (1-12) +$currentQuarter = ceil($currentMonth / 3); // Определяем квартал (1-4) ?> -
+

title) ?>

'btn btn-primary']) ?> 'btn btn-primary']) ?>

-
- - - -

year) ?? '' ?>

- - + +
+
+ + 'form-select form-select-sm mb-1', + 'aria-label' => 'Год', + ]) ?> +
+
+ + '1 квартал (январь - март)', + 2 => '2 квартал (апрель - июнь)', + 3 => '3 квартал (июль - сентябрь)', + 4 => '4 квартал (октябрь - декабрь)', + ], [ + 'id' => 'quarter-select', + 'class' => 'form-select form-select-sm mb-1', + 'aria-label' => 'Квартал', + 'name' => '', + ]) ?> +
+
+
+ + +
+
+
+ Кластер 1 +
+
+
+ Кластер 2 +
+
+
+ Кластер 3 +
+
+
+ Кластер 4 +
+
+
+ Кластер 5 +
+
+
+ Не выбран +
+
+
- + +
+ + + + $month): ?> + + + + + + $month): ?> + + + + + + + + $store): ?> - - - - - - - - - - $store) { - ?> - - $month) { - - foreach (range(1,4) as $numWeekMonth) { - - ?> + $month): ?> + + + + + + + +
Магазины / Месяца
Нед. №
Месяца
Магазины№ нед. - - -
- + +
+
- $nameClusterField = 'store_' . $keyStore .'__month_' . $keyMonth.'__weekMonth_' . $numWeekMonth; - - - ?> - + + -- 2.39.5