From 9066e28d35824f61a2b24ef1b46c1309b11393d6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=D0=9A=D0=BE=D1=88=D0=BA=D0=B8=D0=BD=20=D0=A1=D0=B5=D1=80?=
 =?UTF-8?q?=D0=B3=D0=B5=D0=B9?= <ckoshkin@yandex.ru>
Date: Wed, 17 Dec 2025 11:14:26 +0300
Subject: [PATCH] =?UTF-8?q?=D0=9F=D0=BE=D0=BF=D1=80=D0=B0=D0=B2=D0=B8?=
 =?UTF-8?q?=D0=BB=20=D0=BE=D1=82=D0=BE=D0=B1=D1=80=D0=B0=D0=B6=D0=B5=D0=BD?=
 =?UTF-8?q?=D0=B8=D0=B5=20=D0=BE=D1=82=D0=BC=D0=B5=D1=82=D0=BE=D0=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../templates/mainapp/signal_marks.html       | 1161 ++++++++++-------
 dbapp/mainapp/views/marks.py                  |  191 ++-
 2 files changed, 849 insertions(+), 503 deletions(-)

diff --git a/dbapp/mainapp/templates/mainapp/signal_marks.html b/dbapp/mainapp/templates/mainapp/signal_marks.html
index ae02df6..e4ca229 100644
--- a/dbapp/mainapp/templates/mainapp/signal_marks.html
+++ b/dbapp/mainapp/templates/mainapp/signal_marks.html
@@ -7,222 +7,111 @@
 {% block extra_css %}
 <link href="{% static 'tabulator/css/tabulator_bootstrap5.min.css' %}" rel="stylesheet">
 <style>
-    .satellite-selector {
-        background-color: #f8f9fa;
-        border: 1px solid #dee2e6;
-        border-radius: 0.375rem;
-        padding: 1.5rem;
-        margin-bottom: 1.5rem;
-    }
+    .satellite-selector { background-color: #f8f9fa; border: 1px solid #dee2e6; border-radius: 0.375rem; padding: 1.5rem; margin-bottom: 1.5rem; }
+    .nav-tabs .nav-link.active { background-color: #0d6efd; color: white; border-color: #0d6efd; }
     
-    .nav-tabs .nav-link.active {
-        background-color: #0d6efd;
-        color: white;
-        border-color: #0d6efd;
-    }
+    .mark-cell { text-align: center; padding: 4px 6px; font-size: 0.8rem; white-space: nowrap; }
+    .mark-present { background-color: #d4edda !important; color: #155724; }
+    .mark-absent { background-color: #f8d7da !important; color: #721c24; }
+    .mark-empty { background-color: #f8f9fa; color: #adb5bd; }
     
-    /* Стили для ячеек истории */
-    .mark-cell {
-        text-align: center;
-        padding: 4px 6px;
-        font-size: 0.8rem;
-        min-width: 70px;
-    }
+    .mark-btn-group { display: flex; gap: 4px; justify-content: center; }
+    .mark-btn { padding: 2px 10px; font-size: 0.8rem; border-radius: 4px; cursor: pointer; border: 2px solid transparent; }
+    .mark-btn-yes { background-color: #e8f5e9; color: #2e7d32; border-color: #a5d6a7; }
+    .mark-btn-yes.selected { background-color: #4caf50; color: white; }
+    .mark-btn-no { background-color: #ffebee; color: #c62828; border-color: #ef9a9a; }
+    .mark-btn-no.selected { background-color: #f44336; color: white; }
     
-    .mark-present {
-        background-color: #d4edda !important;
-        color: #155724;
-    }
+    .filter-panel { background-color: #f8f9fa; border: 1px solid #dee2e6; border-radius: 0.375rem; padding: 1rem; margin-bottom: 1rem; }
     
-    .mark-absent {
-        background-color: #f8d7da !important;
-        color: #721c24;
-    }
+    .history-table { font-size: 0.85rem; border-collapse: collapse; border-spacing: 0; }
+    .history-table th { position: sticky; top: 0; background: #343a40; color: white; font-weight: 500; white-space: nowrap; padding: 6px 8px; font-size: 0.75rem; z-index: 5; border: 1px solid #495057; }
+    .history-table td { padding: 4px 6px; vertical-align: middle; border: 1px solid #dee2e6; }
     
-    .mark-empty {
-        background-color: #f8f9fa;
-        color: #adb5bd;
-    }
+    /* Фиксированные колонки - жёсткие размеры */
+    .history-table .sticky-col { position: sticky; background: #f8f9fa; z-index: 2; box-sizing: border-box; }
+    .history-table thead .sticky-col { background: #343a40; z-index: 10; }
+    .history-table tbody tr:hover .sticky-col { background: #e9ecef; }
     
-    .mark-user {
-        font-size: 0.7rem;
-        color: #6c757d;
-        display: block;
-    }
+    /* Жёсткие размеры для всех фиксированных колонок */
+    .history-table .col-name { left: 0; width: 250px !important; min-width: 250px !important; max-width: 250px !important; white-space: normal; word-break: break-word; }
+    .history-table .col-frequency { left: 250px; width: 80px !important; min-width: 80px !important; max-width: 80px !important; text-align: center; }
+    .history-table .col-freq_range { left: 330px; width: 70px !important; min-width: 70px !important; max-width: 70px !important; text-align: center; }
+    .history-table .col-polarization { left: 400px; width: 70px !important; min-width: 70px !important; max-width: 70px !important; text-align: center; }
+    .history-table .col-modulation { left: 470px; width: 70px !important; min-width: 70px !important; max-width: 70px !important; text-align: center; }
+    .history-table .col-bod_velocity { left: 540px; width: 80px !important; min-width: 80px !important; max-width: 80px !important; text-align: center; }
     
-    /* Стили для кнопок отметок */
-    .mark-btn-group {
-        display: flex;
-        gap: 4px;
-        justify-content: center;
-    }
+    .history-wrapper { max-height: 65vh; overflow: auto; }
+    .col-hidden { display: none !important; }
+    .view-mode-switch { display: flex; align-items: center; gap: 0.5rem; }
+    .view-mode-switch .form-check-input { width: 3em; height: 1.5em; }
     
-    .mark-btn {
-        padding: 2px 10px;
-        font-size: 0.8rem;
-        border-radius: 4px;
-        cursor: pointer;
-        border: 2px solid transparent;
-    }
+    /* Отметки в ячейке - всегда в один ряд */
+    .marks-container { display: flex; gap: 3px; justify-content: center; align-items: center; flex-wrap: nowrap; }
+    .mark-icon { font-size: 0.85rem; font-weight: bold; cursor: default; padding: 1px 3px; border-radius: 2px; }
+    .mark-icon-yes { color: #155724; background: #d4edda; }
+    .mark-icon-no { color: #721c24; background: #f8d7da; }
     
-    .mark-btn-yes {
-        background-color: #e8f5e9;
-        color: #2e7d32;
-        border-color: #a5d6a7;
-    }
+    /* Ячейка с отметками - авто-ширина */
+    .history-table td.mark-cell-container { white-space: nowrap; min-width: 40px; }
     
-    .mark-btn-yes.selected {
-        background-color: #4caf50;
-        color: white;
-    }
-    
-    .mark-btn-no {
-        background-color: #ffebee;
-        color: #c62828;
-        border-color: #ef9a9a;
-    }
-    
-    .mark-btn-no.selected {
-        background-color: #f44336;
-        color: white;
-    }
-    
-    .filter-panel {
-        background-color: #f8f9fa;
-        border: 1px solid #dee2e6;
-        border-radius: 0.375rem;
-        padding: 1rem;
-        margin-bottom: 1rem;
-    }
-    
-    /* Таблица истории */
-    .history-table {
-        font-size: 0.85rem;
-    }
-    
-    .history-table th {
-        position: sticky;
-        top: 0;
-        background: #343a40;
-        color: white;
-        font-weight: 500;
-        white-space: nowrap;
-        padding: 6px 8px;
-        font-size: 0.75rem;
-    }
-    
-    .history-table td {
-        padding: 4px 6px;
-        vertical-align: middle;
-    }
-    
-    .history-table .name-col {
-        position: sticky;
-        left: 0;
-        background: #f8f9fa;
-        min-width: 250px;
-        white-space: normal;
-        word-break: break-word;
-    }
-    
-    .history-table thead .name-col {
-        background: #343a40;
-        z-index: 10;
-    }
-    
-    .history-wrapper {
-        max-height: 65vh;
-        overflow: auto;
-    }
+    /* Bootstrap tooltip стили */
+    .tooltip-inner { text-align: left !important; max-width: 300px; }
 </style>
 {% endblock %}
 
 {% block content %}
 <div class="{% if full_width_page %}container-fluid{% else %}container{% endif %} px-3">
-    <div class="row mb-3">
-        <div class="col-12">
-            <h2>Отметки сигналов</h2>
-        </div>
-    </div>
-
-    <!-- Satellite Selector -->
-    <div class="row mb-3">
-        <div class="col-12">
-            <div class="satellite-selector">
-                <h5> Выберите спутник:</h5>
-                <div class="row">
-                    <div class="col-md-6">
-                        <select id="satellite-select" class="form-select" onchange="selectSatellite()">
-                            <option value="">-- Выберите спутник --</option>
-                            {% for satellite in satellites %}
-                            <option value="{{ satellite.id }}" {% if satellite.id == selected_satellite_id %}selected{% endif %}>
-                                {{ satellite.name }}
-                            </option>
-                            {% endfor %}
-                        </select>
-                    </div>
-                </div>
+    <div class="row mb-3"><div class="col-12"><h2>Отметки сигналов</h2></div></div>
+    <div class="row mb-3"><div class="col-12">
+        <div class="satellite-selector">
+            <h5>Выберите спутник:</h5>
+            <div class="row"><div class="col-md-6">
+                <select id="satellite-select" class="form-select" onchange="selectSatellite()">
+                    <option value="">-- Выберите спутник --</option>
+                    {% for satellite in satellites %}
+                    <option value="{{ satellite.id }}" {% if satellite.id == selected_satellite_id %}selected{% endif %}>{{ satellite.name }}</option>
+                    {% endfor %}
+                </select>
             </div>
         </div>
     </div>
 
     {% if selected_satellite %}
-    <!-- Tabs -->
     <ul class="nav nav-tabs" id="marksTabs" role="tablist">
         <li class="nav-item" role="presentation">
-            <button class="nav-link active" id="entry-tab" data-bs-toggle="tab" data-bs-target="#entry-pane" 
-                    type="button" role="tab">
-                <i class="bi bi-pencil-square"></i> Проставить отметки
-            </button>
+            <button class="nav-link active" id="entry-tab" data-bs-toggle="tab" data-bs-target="#entry-pane" type="button" role="tab"><i class="bi bi-pencil-square"></i> Проставить отметки</button>
         </li>
         <li class="nav-item" role="presentation">
-            <button class="nav-link" id="history-tab" data-bs-toggle="tab" data-bs-target="#history-pane" 
-                    type="button" role="tab">
-                <i class="bi bi-clock-history"></i> История отметок
-            </button>
+            <button class="nav-link" id="history-tab" data-bs-toggle="tab" data-bs-target="#history-pane" type="button" role="tab"><i class="bi bi-clock-history"></i> История отметок</button>
         </li>
     </ul>
-
     <div class="tab-content" id="marksTabsContent">
-        <!-- Entry Tab -->
+        <!-- Entry Pane -->
         <div class="tab-pane fade show active" id="entry-pane" role="tabpanel">
             <div class="card">
                 <div class="card-header d-flex justify-content-between align-items-center flex-wrap gap-2">
-                    <div>
-                        <input type="text" id="entry-search" class="form-control form-control-sm" 
-                               placeholder="Поиск по имени..." style="width: 200px;">
-                    </div>
+                    <div><input type="text" id="entry-search" class="form-control form-control-sm" placeholder="Поиск по имени..." style="width: 200px;"></div>
                     <div class="d-flex gap-2">
-                        {% if user|has_perm:'tech_analyze_create' %}
-                        <button class="btn btn-outline-primary btn-sm" onclick="openCreateModal()">
-                            <i class="bi bi-plus-lg"></i> Создать теханализ
-                        </button>
-                        {% endif %}
-                        {% if user|has_perm:'mark_create' %}
-                        <button class="btn btn-success" id="save-marks-btn" onclick="saveMarks()" disabled>
-                            <i class="bi bi-check-lg"></i> Сохранить 
-                            <span class="badge bg-light text-dark" id="marks-count">0</span>
-                        </button>
-                        {% endif %}
+                        {% if user|has_perm:'tech_analyze_create' %}<button class="btn btn-outline-primary btn-sm" onclick="openCreateModal()"><i class="bi bi-plus-lg"></i> Создать теханализ</button>{% endif %}
+                        {% if user|has_perm:'mark_create' %}<button class="btn btn-success" id="save-marks-btn" onclick="saveMarks()" disabled><i class="bi bi-check-lg"></i> Сохранить <span class="badge bg-light text-dark" id="marks-count">0</span></button>{% endif %}
                     </div>
                 </div>
-                <div class="card-body p-0">
-                    <div id="entry-table"></div>
-                </div>
+                <div class="card-body p-0"><div id="entry-table"></div></div>
             </div>
         </div>
-
-        <!-- History Tab -->
+        
+        <!-- History Pane -->
         <div class="tab-pane fade" id="history-pane" role="tabpanel">
             <div class="filter-panel">
-                <div class="row align-items-end">
+                <div class="row align-items-end g-2">
                     <div class="col-md-2">
-                        <label class="form-label">Дата от:</label>
-                        <input type="date" id="history-date-from" class="form-control form-control-sm">
-                    </div>
-                    <div class="col-md-2">
-                        <label class="form-label">Дата до:</label>
-                        <input type="date" id="history-date-to" class="form-control form-control-sm">
+                        <label class="form-label">Режим:</label>
+                        <div class="view-mode-switch">
+                            <span class="small">Диапазоны</span>
+                            <div class="form-check form-switch mb-0"><input class="form-check-input" type="checkbox" id="view-mode-toggle" onchange="toggleViewMode()"></div>
+                            <span class="small">90 дней</span>
+                        </div>
                     </div>
                     <div class="col-md-2">
                         <label class="form-label">Показывать:</label>
@@ -231,111 +120,187 @@
                             <option value="50">50</option>
                             <option value="100">100</option>
                             <option value="200">200</option>
-                            <option value="500">500</option>
                         </select>
                     </div>
-                    <div class="col-md-3">
-                        <label class="form-label">Поиск по имени:</label>
-                        <input type="text" id="history-search" class="form-control form-control-sm" 
-                               placeholder="Введите имя..." oninput="filterHistoryTable()">
+                    <div class="col-md-4">
+                        <label class="form-label">Поиск (имя или частота):</label>
+                        <input type="text" id="history-search" class="form-control form-control-sm" placeholder="Введите имя или частоту..." oninput="filterHistoryTable()">
                     </div>
-                    <div class="col-md-3">
-                        <button class="btn btn-primary btn-sm" onclick="loadHistory()">
-                            Показать
-                        </button>
-                        <button class="btn btn-secondary btn-sm" onclick="resetHistoryFilters()">
-                            Сбросить
-                        </button>
-                    </div>
-                </div>
-            </div>
-            <div class="card">
-                <div class="card-body p-0">
-                    <div class="history-wrapper" id="history-container">
-                        <div class="text-center p-4 text-muted">
-                            Нажмите "Показать" для загрузки данных
+                    <div class="col-md-4">
+                        <div class="d-flex gap-2 flex-wrap">
+                            <button class="btn btn-primary btn-sm" onclick="loadHistory()">Показать</button>
+                            <button class="btn btn-secondary btn-sm" onclick="resetHistoryFilters()">Сбросить</button>
+                            <button class="btn btn-outline-primary btn-sm" type="button" data-bs-toggle="offcanvas" data-bs-target="#historyFiltersOffcanvas">
+                                <i class="bi bi-funnel"></i> Фильтры <span id="historyFilterCounter" class="badge bg-danger" style="display: none;">0</span>
+                            </button>
+                            <div class="dropdown">
+                                <button class="btn btn-outline-secondary btn-sm dropdown-toggle" type="button" data-bs-toggle="dropdown" data-bs-auto-close="outside"><i class="bi bi-gear"></i> Колонки</button>
+                                <ul class="dropdown-menu" style="min-width: 200px;">
+                                    <li><label class="dropdown-item"><input type="checkbox" id="col-toggle-all" onchange="toggleAllHistoryColumns(this)"> Выбрать всё</label></li>
+                                    <li><hr class="dropdown-divider"></li>
+                                    <li><label class="dropdown-item"><input type="checkbox" class="history-col-toggle" data-col="name" checked onchange="toggleHistoryColumn(this)"> Имя</label></li>
+                                    <li><label class="dropdown-item"><input type="checkbox" class="history-col-toggle" data-col="frequency" onchange="toggleHistoryColumn(this)"> Частота</label></li>
+                                    <li><label class="dropdown-item"><input type="checkbox" class="history-col-toggle" data-col="freq_range" onchange="toggleHistoryColumn(this)"> Полоса</label></li>
+                                    <li><label class="dropdown-item"><input type="checkbox" class="history-col-toggle" data-col="polarization" onchange="toggleHistoryColumn(this)"> Поляризация</label></li>
+                                    <li><label class="dropdown-item"><input type="checkbox" class="history-col-toggle" data-col="modulation" onchange="toggleHistoryColumn(this)"> Модуляция</label></li>
+                                    <li><label class="dropdown-item"><input type="checkbox" class="history-col-toggle" data-col="bod_velocity" onchange="toggleHistoryColumn(this)"> Бодовая скорость</label></li>
+                                </ul>
+                            </div>
                         </div>
                     </div>
                 </div>
             </div>
+            <div class="card"><div class="card-body p-0"><div class="history-wrapper" id="history-container"><div class="text-center p-4 text-muted">Нажмите "Показать" для загрузки данных</div></div></div></div>
         </div>
     </div>
     {% else %}
-    <div class="alert alert-info text-center">
-        <h5> Пожалуйста, выберите спутник</h5>
-    </div>
+    <div class="alert alert-info text-center"><h5>Пожалуйста, выберите спутник</h5></div>
     {% endif %}
 </div>
 
-{% if user|has_perm:'tech_analyze_create' %}
-<!-- Modal for creating TechAnalyze -->
+<!-- Offcanvas Filters (LEFT side) -->
+<div class="offcanvas offcanvas-start" tabindex="-1" id="historyFiltersOffcanvas" aria-labelledby="historyFiltersLabel">
+    <div class="offcanvas-header">
+        <h5 class="offcanvas-title" id="historyFiltersLabel">Фильтры истории</h5>
+        <button type="button" class="btn-close" data-bs-dismiss="offcanvas" aria-label="Закрыть"></button>
+    </div>
+    <div class="offcanvas-body">
+        <!-- Date Range (only for grouped mode) -->
+        <div class="mb-3" id="date-filter-section">
+            <label class="form-label fw-bold">Период (для режима диапазонов):</label>
+            <div class="row g-2">
+                <div class="col-6">
+                    <label class="form-label small">От:</label>
+                    <input type="date" id="history-date-from" class="form-control form-control-sm">
+                </div>
+                <div class="col-6">
+                    <label class="form-label small">До:</label>
+                    <input type="date" id="history-date-to" class="form-control form-control-sm">
+                </div>
+            </div>
+            <small class="text-muted">В режиме "90 дней" даты игнорируются</small>
+        </div>
+        <!-- Polarization -->
+        <div class="mb-3">
+            <label class="form-label fw-bold">Поляризация:</label>
+            <div class="d-flex justify-content-between mb-1">
+                <button type="button" class="btn btn-sm btn-outline-secondary py-0" onclick="selectAllFilterOptions('filter-polarization', true)">Все</button>
+                <button type="button" class="btn btn-sm btn-outline-secondary py-0" onclick="selectAllFilterOptions('filter-polarization', false)">Снять</button>
+            </div>
+            <select id="filter-polarization" class="form-select form-select-sm" multiple size="5">
+                {% for pol in polarizations %}
+                <option value="{{ pol.id }}">{{ pol.name }}</option>
+                {% endfor %}
+            </select>
+        </div>
+        
+        <!-- Modulation -->
+        <div class="mb-3">
+            <label class="form-label fw-bold">Модуляция:</label>
+            <div class="d-flex justify-content-between mb-1">
+                <button type="button" class="btn btn-sm btn-outline-secondary py-0" onclick="selectAllFilterOptions('filter-modulation', true)">Все</button>
+                <button type="button" class="btn btn-sm btn-outline-secondary py-0" onclick="selectAllFilterOptions('filter-modulation', false)">Снять</button>
+            </div>
+            <select id="filter-modulation" class="form-select form-select-sm" multiple size="5">
+                {% for mod in modulations %}
+                <option value="{{ mod.id }}">{{ mod.name }}</option>
+                {% endfor %}
+            </select>
+        </div>
+        
+        <!-- Frequency Range -->
+        <div class="mb-3">
+            <label class="form-label fw-bold">Частота (МГц):</label>
+            <div class="row g-2">
+                <div class="col-6"><input type="number" id="filter-freq-min" class="form-control form-control-sm" placeholder="От" step="0.001"></div>
+                <div class="col-6"><input type="number" id="filter-freq-max" class="form-control form-control-sm" placeholder="До" step="0.001"></div>
+            </div>
+        </div>
+        
+        <!-- Bandwidth Range -->
+        <div class="mb-3">
+            <label class="form-label fw-bold">Полоса (МГц):</label>
+            <div class="row g-2">
+                <div class="col-6"><input type="number" id="filter-freq-range-min" class="form-control form-control-sm" placeholder="От" step="0.001"></div>
+                <div class="col-6"><input type="number" id="filter-freq-range-max" class="form-control form-control-sm" placeholder="До" step="0.001"></div>
+            </div>
+        </div>
+        
+        <!-- Baud Velocity Range -->
+        <div class="mb-3">
+            <label class="form-label fw-bold">Бодовая скорость:</label>
+            <div class="row g-2">
+                <div class="col-6"><input type="number" id="filter-bod-min" class="form-control form-control-sm" placeholder="От" step="0.1"></div>
+                <div class="col-6"><input type="number" id="filter-bod-max" class="form-control form-control-sm" placeholder="До" step="0.1"></div>
+            </div>
+        </div>
+        <div class="d-grid gap-2">
+            <button class="btn btn-primary" onclick="loadHistory(); bootstrap.Offcanvas.getInstance(document.getElementById('historyFiltersOffcanvas')).hide();">
+                Применить фильтры
+            </button>
+            <button class="btn btn-outline-secondary" onclick="clearAllFilters()">
+                Очистить фильтры
+            </button>
+        </div>
+    </div>
+</div>
+
+<!-- Create TechAnalyze Modal -->
 <div class="modal fade" id="createTechAnalyzeModal" tabindex="-1">
-    <div class="modal-dialog modal-lg">
+    <div class="modal-dialog">
         <div class="modal-content">
             <div class="modal-header">
-                <h5 class="modal-title"><i class="bi bi-plus-circle"></i> Создать теханализ</h5>
+                <h5 class="modal-title">Создать теханализ</h5>
                 <button type="button" class="btn-close" data-bs-dismiss="modal"></button>
             </div>
             <div class="modal-body">
-                <form id="create-tech-analyze-form">
-                    <div class="row">
-                        <div class="col-md-6 mb-3">
-                            <label class="form-label">Имя <span class="text-danger">*</span></label>
-                            <input type="text" class="form-control" id="ta-name" required>
-                        </div>
-                        <div class="col-md-6 mb-3">
-                            <label class="form-label">Частота, МГц</label>
-                            <input type="number" step="0.001" class="form-control" id="ta-frequency">
-                        </div>
+                <div class="mb-3">
+                    <label class="form-label">Имя <span class="text-danger">*</span></label>
+                    <input type="text" id="ta-name" class="form-control" required>
+                </div>
+                <div class="row">
+                    <div class="col-md-6 mb-3">
+                        <label class="form-label">Частота (МГц)</label>
+                        <input type="number" id="ta-frequency" class="form-control" step="0.001">
                     </div>
-                    <div class="row">
-                        <div class="col-md-4 mb-3">
-                            <label class="form-label">Полоса, МГц</label>
-                            <input type="number" step="0.001" class="form-control" id="ta-freq-range">
-                        </div>
-                        <div class="col-md-4 mb-3">
-                            <label class="form-label">Сим. скорость</label>
-                            <input type="number" class="form-control" id="ta-bod-velocity">
-                        </div>
-                        <div class="col-md-4 mb-3">
-                            <label class="form-label">Поляризация</label>
-                            <select class="form-select" id="ta-polarization">
-                                <option value="">-- Выберите --</option>
-                                {% for p in polarizations %}
-                                <option value="{{ p.name }}">{{ p.name }}</option>
-                                {% endfor %}
-                            </select>
-                        </div>
+                    <div class="col-md-6 mb-3">
+                        <label class="form-label">Полоса (кГц)</label>
+                        <input type="number" id="ta-freq-range" class="form-control" step="0.1">
                     </div>
-                    <div class="row">
-                        <div class="col-md-6 mb-3">
-                            <label class="form-label">Модуляция</label>
-                            <select class="form-select" id="ta-modulation">
-                            <option value="">-- Выберите --</option>
-                                {% for m in modulations %}
-                                <option value="{{ m.name }}">{{ m.name }}</option>
-                                {% endfor %}
-                            </select>
-                        </div>
-                        <div class="col-md-6 mb-3">
-                            <label class="form-label">Стандарт</label>
-                            <select class="form-select" id="ta-standard">
-                                <option value="">-- Выберите --</option>
-                                {% for s in standards %}
-                                <option value="{{ s.name }}">{{ s.name }}</option>
-                                {% endfor %}
-                            </select>
-                        </div>
+                </div>
+                <div class="row">
+                    <div class="col-md-6 mb-3">
+                        <label class="form-label">Поляризация</label>
+                        <select id="ta-polarization" class="form-select">
+                            <option value="">-</option>
+                            {% for pol in polarizations %}<option value="{{ pol.name }}">{{ pol.name }}</option>{% endfor %}
+                        </select>
                     </div>
-                    {% if user|has_perm:'mark_create' %}
-                    <div class="form-check mb-3">
-                        <input class="form-check-input" type="checkbox" id="ta-add-mark" checked>
-                        <label class="form-check-label" for="ta-add-mark">
-                            Сразу добавить отметку "Есть сигнал"
-                        </label>
+                    <div class="col-md-6 mb-3">
+                        <label class="form-label">Модуляция</label>
+                        <select id="ta-modulation" class="form-select">
+                            <option value="">-</option>
+                            {% for mod in modulations %}<option value="{{ mod.name }}">{{ mod.name }}</option>{% endfor %}
+                        </select>
                     </div>
-                    {% endif %}
-                </form>
+                </div>
+                <div class="row">
+                    <div class="col-md-6 mb-3">
+                        <label class="form-label">Бодовая скорость</label>
+                        <input type="number" id="ta-bod-velocity" class="form-control" step="0.1">
+                    </div>
+                    <div class="col-md-6 mb-3">
+                        <label class="form-label">Стандарт</label>
+                        <select id="ta-standard" class="form-select">
+                            <option value="">-</option>
+                            {% for std in standards %}<option value="{{ std.name }}">{{ std.name }}</option>{% endfor %}
+                        </select>
+                    </div>
+                </div>
+                <div class="mb-3">
+                    <label class="form-label">Примечание</label>
+                    <textarea id="ta-note" class="form-control" rows="2"></textarea>
+                </div>
             </div>
             <div class="modal-footer">
                 <button type="button" class="btn btn-secondary" data-bs-dismiss="modal">Отмена</button>
@@ -344,120 +309,186 @@
         </div>
     </div>
 </div>
-{% endif %}
 {% endblock %}
 
+
 {% block extra_js %}
 <script src="{% static 'tabulator/js/tabulator.min.js' %}"></script>
 <script>
-const SATELLITE_ID = {% if selected_satellite_id %}{{ selected_satellite_id }}{% else %}null{% endif %};
-const CSRF_TOKEN = '{{ csrf_token }}';
-const CAN_CREATE_MARK = {% if user|has_perm:'mark_create' %}true{% else %}false{% endif %};
-const CAN_CREATE_TECH_ANALYZE = {% if user|has_perm:'tech_analyze_create' %}true{% else %}false{% endif %};
-
+const satelliteId = {% if selected_satellite_id %}{{ selected_satellite_id }}{% else %}null{% endif %};
 let entryTable = null;
 let pendingMarks = {};
+let historyData = [];
+let currentViewMode = 'grouped';
 
+// Column visibility state
+const COLUMN_STORAGE_KEY = 'signalMarksHistoryColumns';
+let columnVisibility = {
+    name: true,
+    frequency: false,
+    freq_range: false,
+    polarization: false,
+    modulation: false,
+    bod_velocity: false
+};
+
+// Load column visibility from localStorage
+function loadColumnVisibility() {
+    const saved = localStorage.getItem(COLUMN_STORAGE_KEY);
+    if (saved) {
+        try {
+            columnVisibility = JSON.parse(saved);
+        } catch (e) {}
+    }
+    // Apply to checkboxes
+    document.querySelectorAll('.history-col-toggle').forEach(cb => {
+        const col = cb.dataset.col;
+        cb.checked = columnVisibility[col] !== false;
+    });
+    updateSelectAllCheckbox();
+}
+
+function saveColumnVisibility() {
+    localStorage.setItem(COLUMN_STORAGE_KEY, JSON.stringify(columnVisibility));
+}
+
+function toggleHistoryColumn(checkbox) {
+    const col = checkbox.dataset.col;
+    columnVisibility[col] = checkbox.checked;
+    saveColumnVisibility();
+    applyColumnVisibility();
+    updateSelectAllCheckbox();
+    updateStickyPositions();
+}
+
+function toggleAllHistoryColumns(checkbox) {
+    const checked = checkbox.checked;
+    document.querySelectorAll('.history-col-toggle').forEach(cb => {
+        cb.checked = checked;
+        columnVisibility[cb.dataset.col] = checked;
+    });
+    saveColumnVisibility();
+    applyColumnVisibility();
+    updateStickyPositions();
+}
+
+function updateSelectAllCheckbox() {
+    const checkboxes = document.querySelectorAll('.history-col-toggle');
+    const allChecked = Array.from(checkboxes).every(cb => cb.checked);
+    document.getElementById('col-toggle-all').checked = allChecked;
+}
+
+function applyColumnVisibility() {
+    const cols = ['name', 'frequency', 'freq_range', 'polarization', 'modulation', 'bod_velocity'];
+    cols.forEach(col => {
+        const cells = document.querySelectorAll(`.col-${col}`);
+        cells.forEach(cell => {
+            if (columnVisibility[col]) {
+                cell.classList.remove('col-hidden');
+            } else {
+                cell.classList.add('col-hidden');
+            }
+        });
+    });
+}
+
+// Calculate and update sticky positions based on visible columns
+function updateStickyPositions() {
+    const colWidths = {
+        name: 250,
+        frequency: 80,
+        freq_range: 70,
+        polarization: 70,
+        modulation: 70,
+        bod_velocity: 80
+    };
+    const cols = ['name', 'frequency', 'freq_range', 'polarization', 'modulation', 'bod_velocity'];
+    let leftPos = 0;
+    
+    cols.forEach(col => {
+        const cells = document.querySelectorAll(`.col-${col}`);
+        if (columnVisibility[col]) {
+            cells.forEach(cell => {
+                cell.style.left = leftPos + 'px';
+            });
+            leftPos += colWidths[col];
+        }
+    });
+}
+
+// Satellite selection
 function selectSatellite() {
-    const select = document.getElementById('satellite-select');
-    if (select.value) {
-        window.location.search = `satellite_id=${select.value}`;
-    } else {
-        window.location.search = '';
+    const id = document.getElementById('satellite-select').value;
+    if (id) {
+        window.location.href = `?satellite_id=${id}`;
     }
 }
 
 // Entry table
 function initEntryTable() {
-    if (!SATELLITE_ID) return;
-    
-    // Базовые колонки
-    const columns = [
-        {title: "ID", field: "id", width: 60},
-        {title: "Имя", field: "name", width: 500},
-        {title: "Частота", field: "frequency", width: 120, hozAlign: "right",
-            formatter: c => c.getValue() ? c.getValue().toFixed(3) : '-'},
-        {title: "Полоса", field: "freq_range", width: 120, hozAlign: "right",
-            formatter: c => c.getValue() ? c.getValue().toFixed(3) : '-'},
-        {title: "Сим.v", field: "bod_velocity", width: 120, hozAlign: "right",
-            formatter: c => c.getValue() ? Math.round(c.getValue()) : '-'},
-        {title: "Пол.", field: "polarization", width: 105, hozAlign: "center"},
-        {title: "Мод.", field: "modulation", width: 95, hozAlign: "center"},
-        {title: "Станд.", field: "standard", width: 125},
-        {title: "Посл. отметка", field: "last_mark", width: 190,
-            formatter: function(c) {
-                const d = c.getValue();
-                if (!d) return '<span class="text-muted">—</span>';
-                const icon = d.mark ? '✓' : '✗';
-                const cls = d.mark ? 'text-success' : 'text-danger';
-                return `<span class="${cls}">${icon}</span> ${d.timestamp}`;
-            }
-        },
-    ];
-    
-    // Добавляем колонку отметок только если есть право
-    if (CAN_CREATE_MARK) {
-        columns.push({
-            title: "Отметка", field: "id", width: 100, hozAlign: "center", headerSort: false,
-            formatter: function(c) {
-                const row = c.getRow().getData();
-                const id = row.id;
-                if (!row.can_add_mark) return '<span class="text-muted small">5 мин</span>';
-                const yesS = pendingMarks[id] === true ? 'selected' : '';
-                const noS = pendingMarks[id] === false ? 'selected' : '';
-                return `<div class="mark-btn-group">
-                    <button type="button" class="mark-btn mark-btn-yes ${yesS}" data-id="${id}" data-val="true">✓</button>
-                    <button type="button" class="mark-btn mark-btn-no ${noS}" data-id="${id}" data-val="false">✗</button>
-                </div>`;
-            }
-        });
-    }
+    if (!satelliteId) return;
     
     entryTable = new Tabulator("#entry-table", {
         ajaxURL: "{% url 'mainapp:signal_marks_entry_api' %}",
-        ajaxParams: { satellite_id: SATELLITE_ID },
+        ajaxParams: { satellite_id: satelliteId },
+        ajaxConfig: "GET",
         pagination: true,
         paginationMode: "remote",
         paginationSize: 100,
-        paginationSizeSelector: [50, 100, 200, 500, true],
-        layout: "fitColumns",
-        height: "65vh",
+        paginationSizeSelector: [50, 100, 200, true],
+        layout: "fitDataFill",
+        height: "60vh",
         placeholder: "Нет данных",
-        columns: columns,
+        columns: [
+            { title: "ID", field: "id", width: 70 },
+            { title: "Имя", field: "name", minWidth: 200 },
+            { title: "Частота", field: "frequency", width: 90, hozAlign: "center" },
+            { title: "Полоса", field: "freq_range", width: 80, hozAlign: "center" },
+            { title: "Пол.", field: "polarization", width: 80, hozAlign: "center" },
+            { title: "Мод.", field: "modulation", width: 60, hozAlign: "center" },
+            { title: "Бод. скор.", field: "bod_velocity", width: 90, hozAlign: "center" },
+            { title: "Отметок", field: "mark_count", width: 80, hozAlign: "center" },
+            { title: "Последняя отметка", field: "last_mark", width: 330, formatter: function(cell) {
+                const val = cell.getValue();
+                if (!val) return '<span class="text-muted">-</span>';
+                const icon = val.mark ? '✓' : '✗';
+                const cls = val.mark ? 'text-success' : 'text-danger';
+                return `<span class="${cls}">${icon}</span> ${val.timestamp} (${val.user})`;
+            }},
+            { title: "Отметка", field: "id", width: 120, hozAlign: "center", formatter: function(cell) {
+                const row = cell.getRow().getData();
+                if (!row.can_add_mark) {
+                    return '<span class="text-muted small">< 5 мин</span>';
+                }
+                const id = row.id;
+                const pending = pendingMarks[id];
+                return `<div class="mark-btn-group">
+                    <span class="mark-btn mark-btn-yes ${pending === true ? 'selected' : ''}" onclick="setMark(${id}, true)">✓</span>
+                    <span class="mark-btn mark-btn-no ${pending === false ? 'selected' : ''}" onclick="setMark(${id}, false)">✗</span>
+                </div>`;
+            }}
+        ],
+        ajaxResponse: function(url, params, response) {
+            return { last_page: response.last_page, data: response.data };
+        }
     });
     
-    // Делегирование событий для кнопок отметок - без перерисовки таблицы
-    document.getElementById('entry-table').addEventListener('click', function(e) {
-        const btn = e.target.closest('.mark-btn');
-        if (!btn) return;
-        
-        e.preventDefault();
-        e.stopPropagation();
-        
-        const id = parseInt(btn.dataset.id);
-        const val = btn.dataset.val === 'true';
-        
-        // Переключаем отметку
-        if (pendingMarks[id] === val) {
-            delete pendingMarks[id];
-        } else {
-            pendingMarks[id] = val;
-        }
-        
-        // Обновляем только кнопки в этой строке
-        const container = btn.closest('.mark-btn-group');
-        if (container) {
-            const yesBtn = container.querySelector('.mark-btn-yes');
-            const noBtn = container.querySelector('.mark-btn-no');
-            
-            yesBtn.classList.toggle('selected', pendingMarks[id] === true);
-            noBtn.classList.toggle('selected', pendingMarks[id] === false);
-        }
-        
-        updateMarksCount();
+    // Search filter
+    document.getElementById('entry-search').addEventListener('input', function() {
+        entryTable.setData("{% url 'mainapp:signal_marks_entry_api' %}", { satellite_id: satelliteId, search: this.value });
     });
 }
 
+function setMark(id, value) {
+    if (pendingMarks[id] === value) {
+        delete pendingMarks[id];
+    } else {
+        pendingMarks[id] = value;
+    }
+    updateMarksCount();
+    entryTable.redraw(true);
+}
+
 function updateMarksCount() {
     const count = Object.keys(pendingMarks).length;
     document.getElementById('marks-count').textContent = count;
@@ -466,61 +497,80 @@ function updateMarksCount() {
 
 function saveMarks() {
     const marks = Object.entries(pendingMarks).map(([id, mark]) => ({
-        tech_analyze_id: parseInt(id), mark: mark
+        tech_analyze_id: parseInt(id),
+        mark: mark
     }));
-    if (!marks.length) return;
-    
-    const btn = document.getElementById('save-marks-btn');
-    btn.disabled = true;
-    btn.innerHTML = '<span class="spinner-border spinner-border-sm"></span> Сохранение...';
     
     fetch("{% url 'mainapp:save_signal_marks' %}", {
         method: 'POST',
-        headers: {'Content-Type': 'application/json', 'X-CSRFToken': CSRF_TOKEN},
-        body: JSON.stringify({ marks })
+        headers: {
+            'Content-Type': 'application/json',
+            'X-CSRFToken': '{{ csrf_token }}'
+        },
+        body: JSON.stringify({ marks: marks })
     })
     .then(r => r.json())
     .then(data => {
-        // Восстанавливаем кнопку сначала
-        btn.innerHTML = '<i class="bi bi-check-lg"></i> Сохранить <span class="badge bg-light text-dark" id="marks-count">0</span>';
-        
         if (data.success) {
+            alert(`Сохранено: ${data.created}, пропущено: ${data.skipped}`);
             pendingMarks = {};
             updateMarksCount();
-            // Перезагружаем данные таблицы
-            if (entryTable) {
-                entryTable.setData("{% url 'mainapp:signal_marks_entry_api' %}", { satellite_id: SATELLITE_ID });
-            }
-            alert(`Сохранено: ${data.created}` + (data.skipped ? `, пропущено: ${data.skipped}` : ''));
+            entryTable.setData();
         } else {
-            updateMarksCount();
-            alert('Ошибка: ' + (data.error || 'Неизвестная ошибка'));
+            alert('Ошибка: ' + data.error);
         }
-    })
-    .catch(e => {
-        console.error('Save error:', e);
-        btn.innerHTML = '<i class="bi bi-check-lg"></i> Сохранить <span class="badge bg-light text-dark" id="marks-count">0</span>';
-        updateMarksCount();
-        alert('Ошибка сохранения: ' + e.message);
     });
 }
 
-// History
+// View mode toggle
+function toggleViewMode() {
+    currentViewMode = document.getElementById('view-mode-toggle').checked ? 'all_marks' : 'grouped';
+    // Show/hide date filter section
+    const dateSection = document.getElementById('date-filter-section');
+    if (dateSection) {
+        dateSection.style.opacity = currentViewMode === 'all_marks' ? '0.5' : '1';
+    }
+}
+
+// History table
 function loadHistory() {
-    const dateFrom = document.getElementById('history-date-from').value;
-    const dateTo = document.getElementById('history-date-to').value;
-    const pageSize = document.getElementById('history-page-size').value;
+    if (!satelliteId) return;
+    
     const container = document.getElementById('history-container');
+    container.innerHTML = '<div class="text-center p-4"><div class="spinner-border"></div> Загрузка...</div>';
     
-    container.innerHTML = '<div class="text-center p-4"><span class="spinner-border"></span></div>';
+    const params = new URLSearchParams({
+        satellite_id: satelliteId,
+        view_mode: currentViewMode,
+        size: document.getElementById('history-page-size').value,
+        date_from: document.getElementById('history-date-from')?.value || '',
+        date_to: document.getElementById('history-date-to')?.value || ''
+    });
     
-    let url = `{% url 'mainapp:signal_marks_history_api' %}?satellite_id=${SATELLITE_ID}`;
-    if (dateFrom) url += `&date_from=${dateFrom}`;
-    if (dateTo) url += `&date_to=${dateTo}`;
-    // size=0 означает "все записи"
-    url += `&size=${pageSize || 0}`;
+    // Add filter params
+    const polSelect = document.getElementById('filter-polarization');
+    Array.from(polSelect.selectedOptions).forEach(opt => params.append('polarization_id', opt.value));
     
-    fetch(url)
+    const modSelect = document.getElementById('filter-modulation');
+    Array.from(modSelect.selectedOptions).forEach(opt => params.append('modulation_id', opt.value));
+    
+    // Map filter IDs to API parameter names
+    const filterMapping = {
+        'freq-min': 'freq_min',
+        'freq-max': 'freq_max',
+        'freq-range-min': 'freq_range_min',
+        'freq-range-max': 'freq_range_max',
+        'bod-min': 'bod_velocity_min',
+        'bod-max': 'bod_velocity_max'
+    };
+    Object.entries(filterMapping).forEach(([id, paramName]) => {
+        const el = document.getElementById('filter-' + id);
+        if (el && el.value) {
+            params.append(paramName, el.value);
+        }
+    });
+    
+    fetch(`{% url 'mainapp:signal_marks_history_api' %}?${params}`)
         .then(r => r.json())
         .then(data => {
             if (data.error) {
@@ -531,141 +581,250 @@ function loadHistory() {
                 container.innerHTML = `<div class="alert alert-info m-3">${data.message}</div>`;
                 return;
             }
-            
-            // Build HTML table
-            let html = '<table class="table table-bordered table-sm history-table mb-0">';
-            html += '<thead><tr>';
-            html += '<th class="name-col">Имя</th>';
-            
-            for (const period of data.periods) {
-                html += `<th class="mark-cell">${period}</th>`;
+            historyData = data.data;
+            if (data.view_mode === 'all_marks') {
+                renderAllMarksTable(data);
+            } else {
+                renderGroupedTable(data);
             }
-            html += '</tr></thead><tbody>';
-            
-            for (const row of data.data) {
-                html += '<tr>';
-                html += `<td class="name-col">${row.name}</td>`;
-                
-                for (const mark of row.marks) {
-                    if (mark) {
-                        const cls = mark.mark ? 'mark-present' : 'mark-absent';
-                        const icon = mark.mark ? '✓' : '✗';
-                        html += `<td class="mark-cell ${cls}">
-                            <strong>${icon}</strong>
-                            <span class="mark-user">${mark.user}</span>
-                            <span class="mark-user">${mark.time}</span>
-                        </td>`;
-                    } else {
-                        html += '<td class="mark-cell mark-empty">—</td>';
-                    }
-                }
-                html += '</tr>';
-            }
-            
-            html += '</tbody></table>';
-            container.innerHTML = html;
+            updateFilterCounter();
         })
-        .catch(e => {
-            container.innerHTML = '<div class="alert alert-danger m-3">Ошибка загрузки</div>';
+        .catch(err => {
+            container.innerHTML = `<div class="alert alert-danger m-3">Ошибка загрузки: ${err}</div>`;
         });
 }
 
-function resetHistoryFilters() {
-    document.getElementById('history-date-from').value = '';
-    document.getElementById('history-date-to').value = '';
-    document.getElementById('history-page-size').value = '0';
-    document.getElementById('history-search').value = '';
-    loadHistory();
+function renderGroupedTable(data) {
+    const container = document.getElementById('history-container');
+    let html = '<table class="table table-bordered table-sm history-table"><thead><tr>';
+    html += '<th class="sticky-col col-name">Имя</th>';
+    html += '<th class="sticky-col col-frequency">Частота</th>';
+    html += '<th class="sticky-col col-freq_range">Полоса</th>';
+    html += '<th class="sticky-col col-polarization">Поляризация</th>';
+    html += '<th class="sticky-col col-modulation">Мод.</th>';
+    html += '<th class="sticky-col col-bod_velocity">Бод. скор.</th>';
+    data.periods.forEach(p => { html += `<th class="mark-cell">${p}</th>`; });
+    html += '</tr></thead><tbody>';
+    
+    data.data.forEach(row => {
+        html += '<tr>';
+        html += `<td class="sticky-col col-name">${row.name}</td>`;
+        html += `<td class="sticky-col col-frequency">${row.frequency || '-'}</td>`;
+        html += `<td class="sticky-col col-freq_range">${row.freq_range || '-'}</td>`;
+        html += `<td class="sticky-col col-polarization">${row.polarization}</td>`;
+        html += `<td class="sticky-col col-modulation">${row.modulation}</td>`;
+        html += `<td class="sticky-col col-bod_velocity">${row.bod_velocity || '-'}</td>`;
+        row.marks.forEach(m => {
+            if (m) {
+                const cls = m.mark ? 'mark-present' : 'mark-absent';
+                const icon = m.mark ? '✓' : '✗';
+                html += `<td class="mark-cell ${cls}" title="${m.time} - ${m.user}">${icon}<br><small>${m.user}</small></td>`;
+            } else {
+                html += '<td class="mark-cell mark-empty">-</td>';
+            }
+        });
+        html += '</tr>';
+    });
+    
+    html += '</tbody></table>';
+    container.innerHTML = html;
+    loadColumnVisibility();
+    applyColumnVisibility();
+    updateStickyPositions();
+}
+
+function renderAllMarksTable(data) {
+    const container = document.getElementById('history-container');
+    let html = '<table class="table table-bordered table-sm history-table"><thead><tr>';
+    html += '<th class="sticky-col col-name">Имя</th>';
+    html += '<th class="sticky-col col-frequency">Частота</th>';
+    html += '<th class="sticky-col col-freq_range">Полоса</th>';
+    html += '<th class="sticky-col col-polarization">Пол.</th>';
+    html += '<th class="sticky-col col-modulation">Мод.</th>';
+    html += '<th class="sticky-col col-bod_velocity">Бод. скор.</th>';
+    data.periods.forEach(p => { html += `<th class="mark-cell">${p}</th>`; });
+    html += '</tr></thead><tbody>';
+    
+    data.data.forEach(row => {
+        html += '<tr>';
+        html += `<td class="sticky-col col-name">${row.name}</td>`;
+        html += `<td class="sticky-col col-frequency">${row.frequency || '-'}</td>`;
+        html += `<td class="sticky-col col-freq_range">${row.freq_range || '-'}</td>`;
+        html += `<td class="sticky-col col-polarization">${row.polarization}</td>`;
+        html += `<td class="sticky-col col-modulation">${row.modulation}</td>`;
+        html += `<td class="sticky-col col-bod_velocity">${row.bod_velocity || '-'}</td>`;
+        
+        row.marks.forEach(m => {
+            if (m && m.items && m.items.length > 0) {
+                // Sort items from earliest to latest time
+                const sortedItems = [...m.items].sort((a, b) => {
+                    const timeA = a.time.split(':').map(Number);
+                    const timeB = b.time.split(':').map(Number);
+                    return (timeA[0] * 60 + timeA[1]) - (timeB[0] * 60 + timeB[1]);
+                });
+                
+                // Build tooltip content
+                const tooltipLines = sortedItems.map(item => {
+                    const icon = item.mark ? '✓' : '✗';
+                    return `${icon} ${item.time} - ${item.user}`;
+                });
+                const tooltipContent = tooltipLines.join('<br>');
+                
+                // Build marks icons
+                let iconsHtml = '<div class="marks-container">';
+                sortedItems.forEach(item => {
+                    const iconCls = item.mark ? 'mark-icon-yes' : 'mark-icon-no';
+                    const icon = item.mark ? '✓' : '✗';
+                    iconsHtml += `<span class="mark-icon ${iconCls}">${icon}</span>`;
+                });
+                iconsHtml += '</div>';
+                
+                html += `<td class="mark-cell mark-cell-container" data-bs-toggle="tooltip" data-bs-html="true" data-bs-placement="top" title="${tooltipContent.replace(/"/g, '&quot;')}">${iconsHtml}</td>`;
+            } else {
+                html += '<td class="mark-cell mark-empty">-</td>';
+            }
+        });
+        html += '</tr>';
+    });
+    
+    html += '</tbody></table>';
+    container.innerHTML = html;
+    loadColumnVisibility();
+    applyColumnVisibility();
+    updateStickyPositions();
+    
+    // Initialize Bootstrap tooltips
+    const tooltipTriggerList = container.querySelectorAll('[data-bs-toggle="tooltip"]');
+    tooltipTriggerList.forEach(el => new bootstrap.Tooltip(el));
 }
 
 function filterHistoryTable() {
-    const searchValue = document.getElementById('history-search').value.toLowerCase().trim();
-    const table = document.querySelector('.history-table');
-    if (!table) return;
+    const search = document.getElementById('history-search').value.toLowerCase().trim();
+    const rows = document.querySelectorAll('#history-container tbody tr');
     
-    const rows = table.querySelectorAll('tbody tr');
     rows.forEach(row => {
-        const nameCell = row.querySelector('.name-col');
-        if (nameCell) {
-            const name = nameCell.textContent.toLowerCase();
-            row.style.display = name.includes(searchValue) ? '' : 'none';
+        const name = row.querySelector('.col-name')?.textContent.toLowerCase() || '';
+        const freq = row.querySelector('.col-frequency')?.textContent.toLowerCase() || '';
+        const match = !search || name.includes(search) || freq.includes(search);
+        row.style.display = match ? '' : 'none';
+    });
+}
+
+function resetHistoryFilters() {
+    document.getElementById('history-search').value = '';
+    document.getElementById('history-date-from').value = '';
+    document.getElementById('history-date-to').value = '';
+    document.getElementById('filter-polarization').selectedIndex = -1;
+    document.getElementById('filter-modulation').selectedIndex = -1;
+    document.getElementById('filter-freq-min').value = '';
+    document.getElementById('filter-freq-max').value = '';
+    document.getElementById('filter-freq-range-min').value = '';
+    document.getElementById('filter-freq-range-max').value = '';
+    document.getElementById('filter-bod-min').value = '';
+    document.getElementById('filter-bod-max').value = '';
+    document.getElementById('view-mode-toggle').checked = false;
+    currentViewMode = 'grouped';
+    updateFilterCounter();
+}
+
+function clearAllFilters() {
+    document.getElementById('filter-polarization').selectedIndex = -1;
+    document.getElementById('filter-modulation').selectedIndex = -1;
+    document.getElementById('filter-freq-min').value = '';
+    document.getElementById('filter-freq-max').value = '';
+    document.getElementById('filter-freq-range-min').value = '';
+    document.getElementById('filter-freq-range-max').value = '';
+    document.getElementById('filter-bod-min').value = '';
+    document.getElementById('filter-bod-max').value = '';
+    document.getElementById('history-date-from').value = '';
+    document.getElementById('history-date-to').value = '';
+    updateFilterCounter();
+}
+
+function selectAllFilterOptions(selectId, select) {
+    const el = document.getElementById(selectId);
+    Array.from(el.options).forEach(opt => opt.selected = select);
+}
+
+function updateFilterCounter() {
+    let count = 0;
+    if (document.getElementById('filter-polarization').selectedOptions.length > 0) count++;
+    if (document.getElementById('filter-modulation').selectedOptions.length > 0) count++;
+    if (document.getElementById('filter-freq-min').value) count++;
+    if (document.getElementById('filter-freq-max').value) count++;
+    if (document.getElementById('filter-freq-range-min').value) count++;
+    if (document.getElementById('filter-freq-range-max').value) count++;
+    if (document.getElementById('filter-bod-min').value) count++;
+    if (document.getElementById('filter-bod-max').value) count++;
+    if (document.getElementById('history-date-from').value) count++;
+    if (document.getElementById('history-date-to').value) count++;
+    
+    const badge = document.getElementById('historyFilterCounter');
+    if (count > 0) {
+        badge.textContent = count;
+        badge.style.display = '';
+    } else {
+        badge.style.display = 'none';
+    }
+}
+
+// Create TechAnalyze
+function openCreateModal() {
+    document.getElementById('ta-name').value = '';
+    document.getElementById('ta-frequency').value = '';
+    document.getElementById('ta-freq-range').value = '';
+    document.getElementById('ta-polarization').value = '';
+    document.getElementById('ta-modulation').value = '';
+    document.getElementById('ta-bod-velocity').value = '';
+    document.getElementById('ta-standard').value = '';
+    document.getElementById('ta-note').value = '';
+    new bootstrap.Modal(document.getElementById('createTechAnalyzeModal')).show();
+}
+
+function createTechAnalyze() {
+    const data = {
+        satellite_id: satelliteId,
+        name: document.getElementById('ta-name').value,
+        frequency: document.getElementById('ta-frequency').value,
+        freq_range: document.getElementById('ta-freq-range').value,
+        polarization: document.getElementById('ta-polarization').value,
+        modulation: document.getElementById('ta-modulation').value,
+        bod_velocity: document.getElementById('ta-bod-velocity').value,
+        standard: document.getElementById('ta-standard').value,
+        note: document.getElementById('ta-note').value
+    };
+    
+    fetch("{% url 'mainapp:create_tech_analyze_for_marks' %}", {
+        method: 'POST',
+        headers: {
+            'Content-Type': 'application/json',
+            'X-CSRFToken': '{{ csrf_token }}'
+        },
+        body: JSON.stringify(data)
+    })
+    .then(r => r.json())
+    .then(resp => {
+        if (resp.success) {
+            bootstrap.Modal.getInstance(document.getElementById('createTechAnalyzeModal')).hide();
+            alert('Теханализ создан');
+            if (entryTable) entryTable.setData();
+        } else {
+            alert('Ошибка: ' + resp.error);
         }
     });
 }
 
 // Init
 document.addEventListener('DOMContentLoaded', function() {
-    const searchInput = document.getElementById('entry-search');
-    if (searchInput) {
-        let timeout;
-        searchInput.addEventListener('input', function() {
-            clearTimeout(timeout);
-            timeout = setTimeout(() => {
-                if (entryTable) {
-                    entryTable.setData("{% url 'mainapp:signal_marks_entry_api' %}", {
-                        satellite_id: SATELLITE_ID, search: this.value
-                    });
-                }
-            }, 300);
-        });
+    loadColumnVisibility();
+    // Синхронизируем currentViewMode с состоянием checkbox (браузер может сохранить состояние)
+    const viewModeToggle = document.getElementById('view-mode-toggle');
+    if (viewModeToggle) {
+        currentViewMode = viewModeToggle.checked ? 'all_marks' : 'grouped';
+    }
+    if (satelliteId) {
+        initEntryTable();
     }
-    
-    initEntryTable();
-    
-    document.getElementById('history-tab').addEventListener('shown.bs.tab', function() {
-        loadHistory();
-    });
 });
-
-// Modal
-function openCreateModal() {
-    if (!CAN_CREATE_TECH_ANALYZE) {
-        alert('У вас нет прав для создания теханализа');
-        return;
-    }
-    document.getElementById('create-tech-analyze-form').reset();
-    const addMarkCheckbox = document.getElementById('ta-add-mark');
-    if (addMarkCheckbox) addMarkCheckbox.checked = true;
-    new bootstrap.Modal(document.getElementById('createTechAnalyzeModal')).show();
-}
-
-function createTechAnalyze() {
-    if (!CAN_CREATE_TECH_ANALYZE) {
-        alert('У вас нет прав для создания теханализа');
-        return;
-    }
-    const name = document.getElementById('ta-name').value.trim();
-    if (!name) { alert('Укажите имя'); return; }
-    
-    fetch("{% url 'mainapp:create_tech_analyze_for_marks' %}", {
-        method: 'POST',
-        headers: {'Content-Type': 'application/json', 'X-CSRFToken': CSRF_TOKEN},
-        body: JSON.stringify({
-            satellite_id: SATELLITE_ID,
-            name: name,
-            frequency: document.getElementById('ta-frequency').value,
-            freq_range: document.getElementById('ta-freq-range').value,
-            bod_velocity: document.getElementById('ta-bod-velocity').value,
-            polarization: document.getElementById('ta-polarization').value,
-            modulation: document.getElementById('ta-modulation').value,
-            standard: document.getElementById('ta-standard').value,
-        })
-    })
-    .then(r => r.json())
-    .then(result => {
-        if (result.success) {
-            bootstrap.Modal.getInstance(document.getElementById('createTechAnalyzeModal')).hide();
-            const addMarkCheckbox = document.getElementById('ta-add-mark');
-            if (CAN_CREATE_MARK && addMarkCheckbox && addMarkCheckbox.checked) {
-                pendingMarks[result.tech_analyze.id] = true;
-                updateMarksCount();
-            }
-            entryTable.setData();
-        } else {
-            alert('Ошибка: ' + (result.error || 'Неизвестная ошибка'));
-        }
-    })
-    .catch(e => alert('Ошибка создания'));
-}
 </script>
 {% endblock %}
diff --git a/dbapp/mainapp/views/marks.py b/dbapp/mainapp/views/marks.py
index b270012..89e56b2 100644
--- a/dbapp/mainapp/views/marks.py
+++ b/dbapp/mainapp/views/marks.py
@@ -68,6 +68,7 @@ class SignalMarksHistoryAPIView(LoginRequiredMixin, View):
     """
     API для получения истории отметок с фиксированными 15 колонками.
     Делит выбранный временной диапазон на 15 равных периодов.
+    Поддерживает два режима: группировка по диапазонам и все отметки за 90 дней.
     """
     
     NUM_COLUMNS = 15  # Фиксированное количество колонок
@@ -81,6 +82,18 @@ class SignalMarksHistoryAPIView(LoginRequiredMixin, View):
         date_to = request.GET.get('date_to')
         page = int(request.GET.get('page', 1))
         size = int(request.GET.get('size', 50))
+        view_mode = request.GET.get('view_mode', 'grouped')  # 'grouped' или 'all_marks'
+        
+        # Фильтры
+        polarization_ids = request.GET.getlist('polarization_id')
+        modulation_ids = request.GET.getlist('modulation_id')
+        freq_min = request.GET.get('freq_min')
+        freq_max = request.GET.get('freq_max')
+        freq_range_min = request.GET.get('freq_range_min')
+        freq_range_max = request.GET.get('freq_range_max')
+        bod_velocity_min = request.GET.get('bod_velocity_min')
+        bod_velocity_max = request.GET.get('bod_velocity_max')
+        search = request.GET.get('search', '').strip()
         
         if not satellite_id:
             return JsonResponse({'error': 'Не выбран спутник'}, status=400)
@@ -92,11 +105,56 @@ class SignalMarksHistoryAPIView(LoginRequiredMixin, View):
             'polarization', 'modulation', 'standard'
         ).order_by('frequency', 'name')
         
+        # Применяем фильтры к теханализам
+        if polarization_ids:
+            tech_analyzes = tech_analyzes.filter(polarization_id__in=polarization_ids)
+        if modulation_ids:
+            tech_analyzes = tech_analyzes.filter(modulation_id__in=modulation_ids)
+        if freq_min:
+            try:
+                tech_analyzes = tech_analyzes.filter(frequency__gte=float(freq_min))
+            except ValueError:
+                pass
+        if freq_max:
+            try:
+                tech_analyzes = tech_analyzes.filter(frequency__lte=float(freq_max))
+            except ValueError:
+                pass
+        if freq_range_min:
+            try:
+                tech_analyzes = tech_analyzes.filter(freq_range__gte=float(freq_range_min))
+            except ValueError:
+                pass
+        if freq_range_max:
+            try:
+                tech_analyzes = tech_analyzes.filter(freq_range__lte=float(freq_range_max))
+            except ValueError:
+                pass
+        if bod_velocity_min:
+            try:
+                tech_analyzes = tech_analyzes.filter(bod_velocity__gte=float(bod_velocity_min))
+            except ValueError:
+                pass
+        if bod_velocity_max:
+            try:
+                tech_analyzes = tech_analyzes.filter(bod_velocity__lte=float(bod_velocity_max))
+            except ValueError:
+                pass
+        if search:
+            tech_analyzes = tech_analyzes.filter(
+                Q(name__icontains=search) | Q(id__icontains=search)
+            )
+        
         # Базовый фильтр отметок по спутнику
         marks_base_qs = ObjectMark.objects.filter(
             tech_analyze__satellite_id=satellite_id
         ).select_related('created_by__user', 'tech_analyze')
         
+        # Режим "все отметки за 90 дней"
+        if view_mode == 'all_marks':
+            return self._get_all_marks_mode(request, tech_analyzes, marks_base_qs, size, page)
+        
+        # Режим группировки по диапазонам (по умолчанию)
         # Определяем диапазон дат
         parsed_date_from = None
         parsed_date_to = None
@@ -127,6 +185,7 @@ class SignalMarksHistoryAPIView(LoginRequiredMixin, View):
                 'last_page': 1,
                 'total': 0,
                 'message': 'Нет отметок в выбранном диапазоне',
+                'view_mode': view_mode,
             })
         
         # Используем указанные даты или данные из БД
@@ -143,9 +202,9 @@ class SignalMarksHistoryAPIView(LoginRequiredMixin, View):
         total_duration = end_dt - start_dt
         period_duration = total_duration / self.NUM_COLUMNS
         
-        # Генерируем границы периодов
+        # Генерируем границы периодов (от новых к старым)
         periods = []
-        for i in range(self.NUM_COLUMNS):
+        for i in range(self.NUM_COLUMNS - 1, -1, -1):
             period_start = start_dt + (period_duration * i)
             period_end = start_dt + (period_duration * (i + 1))
             periods.append({
@@ -172,6 +231,11 @@ class SignalMarksHistoryAPIView(LoginRequiredMixin, View):
             row = {
                 'id': ta.id,
                 'name': ta.name,
+                'frequency': float(ta.frequency) if ta.frequency else 0,
+                'freq_range': float(ta.freq_range) if ta.freq_range else 0,
+                'polarization': ta.polarization.name if ta.polarization else '-',
+                'modulation': ta.modulation.name if ta.modulation else '-',
+                'bod_velocity': float(ta.bod_velocity) if ta.bod_velocity else 0,
                 'marks': [],
             }
             
@@ -204,6 +268,129 @@ class SignalMarksHistoryAPIView(LoginRequiredMixin, View):
             'data': data,
             'last_page': num_pages,
             'total': total_count,
+            'view_mode': view_mode,
+        })
+    
+    def _get_all_marks_mode(self, request, tech_analyzes, marks_base_qs, size, page):
+        """
+        Режим отображения отметок за последние 90 дней.
+        Группировка по дням (1 колонка = 1 день) для оптимизации.
+        Максимум 90 колонок.
+        """
+        from datetime import datetime, date
+        
+        # Фильтруем отметки за последние 90 дней
+        date_90_days_ago = timezone.now() - timedelta(days=90)
+        marks_base_qs = marks_base_qs.filter(timestamp__gte=date_90_days_ago)
+        
+        # Получаем диапазон дат с отметками
+        date_range = marks_base_qs.aggregate(
+            min_date=Min('timestamp'),
+            max_date=Max('timestamp')
+        )
+        
+        min_date = date_range['min_date']
+        max_date = date_range['max_date']
+        
+        if not min_date or not max_date:
+            return JsonResponse({
+                'periods': [],
+                'data': [],
+                'last_page': 1,
+                'total': 0,
+                'message': 'Нет отметок за последние 90 дней',
+                'view_mode': 'all_marks',
+            })
+        
+        # Генерируем список дней от max_date до min_date (от новых к старым)
+        days = []
+        current_date = max_date.date()
+        end_date = min_date.date()
+        while current_date >= end_date:
+            days.append(current_date)
+            current_date -= timedelta(days=1)
+        
+        # Формируем заголовки колонок (дни)
+        periods = []
+        for day in days:
+            periods.append({
+                'date': day,
+                'label': day.strftime('%d.%m'),
+            })
+        
+        # Пагинация теханализов
+        if size == 0:
+            page_obj = tech_analyzes
+            num_pages = 1
+            total_count = tech_analyzes.count()
+        else:
+            paginator = Paginator(tech_analyzes, size)
+            page_obj = paginator.get_page(page)
+            num_pages = paginator.num_pages
+            total_count = paginator.count
+        
+        # Получаем ID теханализов на текущей странице
+        ta_ids = [ta.id for ta in page_obj]
+        
+        # Загружаем все отметки для этих теханализов одним запросом
+        all_marks = list(marks_base_qs.filter(
+            tech_analyze_id__in=ta_ids
+        ).order_by('-timestamp'))
+        
+        # Создаём словарь: {(tech_analyze_id, date): список всех отметок за день}
+        marks_dict = {}
+        for mark in all_marks:
+            mark_date = timezone.localtime(mark.timestamp).date()
+            key = (mark.tech_analyze_id, mark_date)
+            if key not in marks_dict:
+                marks_dict[key] = []
+            marks_dict[key].append(mark)
+        
+        # Формируем данные
+        data = []
+        for ta in page_obj:
+            row = {
+                'id': ta.id,
+                'name': ta.name,
+                'frequency': float(ta.frequency) if ta.frequency else 0,
+                'freq_range': float(ta.freq_range) if ta.freq_range else 0,
+                'polarization': ta.polarization.name if ta.polarization else '-',
+                'modulation': ta.modulation.name if ta.modulation else '-',
+                'bod_velocity': float(ta.bod_velocity) if ta.bod_velocity else 0,
+                'marks': [],
+            }
+            
+            # Для каждого дня собираем все отметки
+            for period in periods:
+                key = (ta.id, period['date'])
+                day_marks = marks_dict.get(key, [])
+                
+                if day_marks:
+                    # Формируем список всех отметок за день
+                    marks_list = []
+                    for mark in day_marks:
+                        local_time = timezone.localtime(mark.timestamp)
+                        marks_list.append({
+                            'mark': mark.mark,
+                            'user': str(mark.created_by) if mark.created_by else '-',
+                            'time': local_time.strftime('%H:%M'),
+                        })
+                    row['marks'].append({
+                        'count': len(marks_list),
+                        'items': marks_list,
+                    })
+                else:
+                    row['marks'].append(None)
+            
+            data.append(row)
+        
+        return JsonResponse({
+            'periods': [p['label'] for p in periods],
+            'data': data,
+            'last_page': num_pages,
+            'total': total_count,
+            'view_mode': 'all_marks',
+            'date_range': f"Последние 90 дней (с {date_90_days_ago.strftime('%d.%m.%Y')})",
         })
     
     def _format_period_label(self, start, end, total_duration):