Рефакторинг представления

diff --git a/erp24/views/users-message-management/export-kogort.php b/erp24/views/users-message-management/export-kogort.php
index 258014b3b6b5713e105e52e091c4d526c65cbac8..264935bf3138ec131a6bf70f2fe94fa20e3a161f 100644 (file)
--- a/erp24/views/users-message-management/export-kogort.php
+++ b/erp24/views/users-message-management/export-kogort.php
@@ -5,7 +5,7 @@ use yii\helpers\Url;
 /** @var array $links */
 /** @var string $month */
 /** @var string $year */
-
+$this->registerJsFile('/js/users-message-management/index.js', ['position' => \yii\web\View::POS_END]);
 $this->title = 'Рассылка по когортам';
 ?>
 
@@ -16,72 +16,72 @@ $this->title = 'Рассылка по когортам';
 
     <span class="display-6">Когорты</span>
     <hr>
-    <div class="col-4 col-lg-offset-8">
-        <form id="month-year-form" class="row align-items-center g-3" method="get" action="<?= \yii\helpers\Url::to(['controller/action']) ?>">
-            <div class="col">
-                <select name="month" class="form-control">
-                    <option value="" selected>Выберите месяц</option>
-                    <?php foreach (\yii_app\helpers\DateHelper::MONTH_NUMBER_NAMES as $key => $value): ?>
-                        <option value="<?= $key ?>" <?= $key == $month ? 'selected' : '' ?>><?= $value ?></option>
-                    <?php endforeach; ?>
-                </select>
-            </div>
+    <div class="row mb-3">
+        <div class="col-4 col-lg-offset-8">
+            <div id="month-year-form" class="row align-items-center g-3">
+                <div class="col">
+                    <select id="month-select" name="month" class="form-control">
+                        <option value="" selected>Выберите месяц</option>
+                        <?php foreach (\yii_app\helpers\DateHelper::MONTH_NUMBER_NAMES as $key => $value): ?>
+                            <option value="<?= $key ?>" <?= $key == $month ? 'selected' : '' ?>><?= $value ?></option>
+                        <?php endforeach; ?>
+                    </select>
+                </div>
 
-            <div class="col">
-                <select name="year" class="form-control">
-                    <option value="" selected>Выберите год</option>
-                    <?php for ($i = $year - 3; $i <= $year + 3; $i++): ?>
-                        <option value="<?= $i ?>" <?= $i == $year ? 'selected' : '' ?>><?= $i ?></option>
-                    <?php endfor; ?>
-                </select>
+                <div class="col">
+                    <select id="year-select" name="year" class="form-control">
+                        <option value="" selected>Выберите год</option>
+                        <?php for ($i = $year - 4; $i <= $year + 4; $i++): ?>
+                            <option value="<?= $i ?>" <?= $i == $year ? 'selected' : '' ?>><?= $i ?></option>
+                        <?php endfor; ?>
+                    </select>
+                </div>
             </div>
 
-            <div class="col-auto">
-                <button type="submit" class="btn btn-primary">Показать</button>
-            </div>
-        </form>
+        </div>
     </div>
 
-    <table class="table table-bordered table-striped">
-        <thead class="table-light">
-        <tr>
-            <th>День выгрузки</th>
-            <th>Target</th>
-            <th>Whatsapp</th>
-            <th>Звонок</th>
-        </tr>
-        </thead>
-        <tbody>
-        <?php foreach ($links as $date => $columns): ?>
+    <div id="data-table">
+        <table class="table table-bordered table-striped">
+            <thead class="table-light">
             <tr>
-                <td><?= Html::encode($date) ?></td>
-                <td >
-                    <a href="<?= Url::to($columns['target'][0]) ?>" target="_blank" download="users-target-<?= $date ?>.xlsx">
-                        Скачать EXCEL
-                    </a>
-                    <a href="<?= Url::to($columns['target'][1]) ?>" target="_blank" class="btn btn-outline-primary">
-                        Посмотреть
-                    </a>
-
-                </td>
-                <td >
-                    <a href="<?= Url::to($columns['whatsapp'][0]) ?>" target="_blank" download="users-whatsapp-<?= $date ?>.xlsx">
-                        Скачать EXCEL
-                    </a>
-                    <a href="<?= Url::to($columns['whatsapp'][1]) ?>" target="_blank" class="btn btn-outline-primary">
-                        Посмотреть
-                    </a>
-                </td>
-                <td >
-                    <a href="<?= Url::to($columns['call'][0]) ?>" target="_blank" download="users-call-<?= $date ?>.xlsx">
-                        Скачать EXCEL
-                    </a>
-                    <a href="<?= Url::to($columns['call'][1]) ?>" target="_blank" class="btn btn-outline-primary">
-                        Посмотреть
-                    </a>
-                </td>
+                <th>День выгрузки</th>
+                <th>Target</th>
+                <th>Whatsapp</th>
+                <th>Звонок</th>
             </tr>
-        <?php endforeach; ?>
-        </tbody>
-    </table>
-</div>
\ No newline at end of file
+            </thead>
+            <tbody>
+            <?php foreach ($links as $date => $columns): ?>
+                <tr>
+                    <td><?= Html::encode($date) ?></td>
+                    <td >
+                        <a href="<?= Url::to($columns['target'][0]) ?>" class="btn btn-link" target="_blank" download="users-target-<?= $date ?>.xlsx">
+                            Таргет-<?= $date ?>.xlsx
+                        </a>
+                        <a href="<?= Url::to($columns['target'][1]) ?>" target="_blank" class="btn btn-link">
+                            Посмотреть
+                        </a>
+
+                    </td>
+                    <td >
+                        <a href="<?= Url::to($columns['whatsapp'][0]) ?>" class="btn btn-link" target="_blank" download="users-whatsapp-<?= $date ?>.xlsx">
+                            Whatsapp-<?= $date ?>.xlsx
+                        </a>
+                        <a href="<?= Url::to($columns['whatsapp'][1]) ?>" class="btn btn-link" target="_blank" class="btn btn-link">
+                            Посмотреть
+                        </a>
+                    </td>
+                    <td >
+                        <a href="<?= Url::to($columns['call'][0]) ?>" class="btn btn-link" target="_blank" download="users-call-<?= $date ?>.xlsx">
+                            Звонок-<?= $date ?>.xlsx
+                        </a>
+                        <a href="<?= Url::to($columns['call'][1]) ?>" target="_blank" class="btn btn-link">
+                            Посмотреть
+                        </a>
+                    </td>
+                </tr>
+            <?php endforeach; ?>
+            </tbody>
+        </table>
+    </div>

diff --git a/erp24/views/users-message-management/index.php b/erp24/views/users-message-management/index.php
index 2cfa7b9d91aae71c6018647e8dc4f4474f3a1d3c..20bf7c7a9a00b9e9c7f99809263a695e4b4f15bc 100644 (file)
--- a/erp24/views/users-message-management/index.php
+++ b/erp24/views/users-message-management/index.php
@@ -201,12 +201,40 @@ $this->registerCss('
                 </div>
             </div>
             <div id="unloadingTab">
-                <?= $this->render('_export', [
-                    'links' => $links,
-                    'month' => $month,
-                    'year' => $year,
+                <div class="row mb-3">
+                    <div class="col-4 col-lg-offset-8">
+                        <div id="month-year-form" class="row align-items-center g-3">
+                            <div class="col">
+                                <select id="month-select" name="month" class="form-control">
+                                    <option value="" selected>Выберите месяц</option>
+                                    <?php foreach (\yii_app\helpers\DateHelper::MONTH_NUMBER_NAMES as $key => $value): ?>
+                                        <option value="<?= $key ?>" <?= $key == $month ? 'selected' : '' ?>><?= $value ?></option>
+                                    <?php endforeach; ?>
+                                </select>
+                            </div>
+
+                            <div class="col">
+                                <select id="year-select" name="year" class="form-control">
+                                    <option value="" selected>Выберите год</option>
+                                    <?php for ($i = $year - 4; $i <= $year + 4; $i++): ?>
+                                        <option value="<?= $i ?>" <?= $i == $year ? 'selected' : '' ?>><?= $i ?></option>
+                                    <?php endfor; ?>
+                                </select>
+                            </div>
+                        </div>
+
+                    </div>
+                </div>
+
+                <div id="data-table">
+                    <?= $this->render('_data_table', [
+                        'links' => $links,
+                        'month' => $month,
+                        'year' => $year,
+
+                    ]) ?>
+                </div>
 
-                ]) ?>
             </div>
         </div>
     </div>