Merge branch 'dynamic_schedule' of https://gitea.zuev.company/Zuev/magistr into dynamic_schedule

frontend/admin/css/auditorium-workload.css

@@ -18,6 +18,11 @@
     min-width: 240px;
 }
 
+.workload-target-control {
+    flex: 0 1 220px;
+    min-width: 200px;
+}
+
 .workload-display-select {
     width: 100%;
     min-height: 38px;
@@ -564,6 +569,297 @@
     background: var(--bg-input);
 }
 
+.schedule-view-shell {
+    min-height: calc(100vh - 8.5rem);
+    display: grid;
+    grid-template-rows: auto auto minmax(420px, 1fr);
+    gap: 1rem;
+}
+
+.schedule-view-control-card,
+.schedule-view-results-card,
+.schedule-view-table-card {
+    animation-duration: 0.28s;
+}
+
+.schedule-view-control-header,
+.schedule-view-results-header,
+.schedule-view-table-header {
+    display: flex;
+    align-items: flex-start;
+    justify-content: space-between;
+    gap: 1rem;
+}
+
+.schedule-view-control-header h2,
+.schedule-view-results-header h2,
+.schedule-view-table-header h2 {
+    margin-bottom: 0.3rem;
+}
+
+.schedule-view-control-grid,
+.schedule-view-extra-grid {
+    display: grid;
+    gap: 1rem;
+    align-items: end;
+}
+
+.schedule-view-control-grid {
+    grid-template-columns: minmax(160px, 0.8fr) minmax(220px, 1.25fr) minmax(170px, 0.8fr) minmax(210px, 0.9fr);
+    margin-top: 1rem;
+}
+
+.schedule-view-extra-grid {
+    grid-template-columns: repeat(3, minmax(180px, 1fr));
+    margin-top: 0.9rem;
+}
+
+.schedule-view-period-control {
+    min-width: 0;
+}
+
+.form-label {
+    display: block;
+    margin-bottom: 0.5rem;
+    color: var(--text-secondary);
+    font-size: 0.85rem;
+    font-weight: 500;
+}
+
+.schedule-view-period-buttons,
+.schedule-view-result-actions,
+.schedule-view-day-tabs {
+    display: flex;
+    align-items: center;
+    gap: 0.45rem;
+}
+
+.schedule-view-shell .btn-secondary {
+    min-height: 42px;
+    padding: 0.65rem 0.9rem;
+    border: 1px solid var(--bg-card-border);
+    border-radius: var(--radius-sm);
+    background: var(--bg-input);
+    color: var(--text-primary);
+    font: inherit;
+    font-size: 0.9rem;
+    font-weight: 600;
+    cursor: pointer;
+    transition: background var(--transition), border-color var(--transition), color var(--transition), transform var(--transition);
+}
+
+.schedule-view-shell .btn-secondary:hover:not(:disabled) {
+    background: var(--bg-hover);
+    border-color: var(--accent);
+    color: var(--accent-hover);
+    transform: translateY(-1px);
+}
+
+.schedule-view-shell .btn-secondary:disabled {
+    cursor: default;
+    opacity: 0.45;
+}
+
+.schedule-view-extra-filters {
+    margin-top: 0.9rem;
+    border-top: 1px solid var(--bg-card-border);
+    padding-top: 0.85rem;
+}
+
+.schedule-view-extra-filters summary {
+    width: fit-content;
+    color: var(--text-secondary);
+    font-size: 0.88rem;
+    font-weight: 600;
+    cursor: pointer;
+}
+
+.schedule-view-result-actions {
+    min-height: 42px;
+    justify-content: flex-end;
+    color: var(--text-secondary);
+    font-size: 0.88rem;
+    text-align: right;
+}
+
+.schedule-view-result-tabs {
+    display: flex;
+    gap: 0.55rem;
+    margin-top: 1rem;
+    padding-bottom: 0.1rem;
+    overflow-x: auto;
+}
+
+.schedule-view-result-tab {
+    flex: 0 0 auto;
+    display: inline-flex;
+    flex-direction: column;
+    align-items: flex-start;
+    gap: 0.18rem;
+    min-width: 150px;
+    max-width: 240px;
+    padding: 0.65rem 0.85rem;
+    border: 1px solid var(--bg-card-border);
+    border-radius: var(--radius-sm);
+    background: var(--bg-input);
+    color: var(--text-primary);
+    font: inherit;
+    text-align: left;
+    cursor: pointer;
+    transition: background var(--transition), border-color var(--transition), transform var(--transition);
+}
+
+.schedule-view-result-tab span,
+.schedule-view-result-tab small {
+    max-width: 100%;
+    overflow: hidden;
+    text-overflow: ellipsis;
+    white-space: nowrap;
+}
+
+.schedule-view-result-tab small {
+    color: var(--text-secondary);
+    font-size: 0.72rem;
+}
+
+.schedule-view-result-tab:hover,
+.schedule-view-result-tab.active {
+    background: color-mix(in srgb, var(--accent) 12%, var(--bg-input));
+    border-color: var(--accent);
+    transform: translateY(-1px);
+}
+
+.schedule-view-empty-result {
+    display: inline-flex;
+    align-items: center;
+    min-height: 38px;
+    color: var(--text-secondary);
+    font-size: 0.88rem;
+}
+
+.schedule-view-table-card {
+    min-height: 0;
+    display: flex;
+    flex-direction: column;
+    overflow: hidden;
+}
+
+.schedule-view-table-header {
+    flex: 0 0 auto;
+    margin-bottom: 1rem;
+}
+
+.schedule-view-table-stage {
+    flex: 1 1 auto;
+    min-height: 0;
+    display: flex;
+    flex-direction: column;
+}
+
+.schedule-view-week-panel {
+    flex: 1 1 auto;
+    min-height: 0;
+    display: flex;
+    flex-direction: column;
+    gap: 0;
+}
+
+.schedule-view-grid-container {
+    flex: 1 1 auto;
+    min-height: 0;
+    height: 100%;
+    max-height: none;
+}
+
+.schedule-view-matrix-table {
+    min-width: 980px;
+}
+
+.schedule-view-matrix-table th,
+.schedule-view-matrix-table td {
+    min-width: 150px;
+    height: 172px;
+}
+
+.schedule-view-lesson-card .lesson-meta + .lesson-meta {
+    margin-top: 0.1rem;
+}
+
+.schedule-view-state {
+    min-height: 100%;
+    border: 1px solid var(--bg-card-border);
+    border-radius: var(--radius-sm);
+    background: var(--bg-input);
+}
+
+.schedule-view-day-tabs {
+    flex-wrap: wrap;
+    justify-content: flex-end;
+}
+
+.schedule-view-day-tab {
+    min-width: 42px;
+    min-height: 34px;
+    border: 1px solid var(--bg-card-border);
+    border-radius: var(--radius-sm);
+    background: var(--bg-input);
+    color: var(--text-secondary);
+    font: inherit;
+    font-size: 0.78rem;
+    font-weight: 700;
+    cursor: pointer;
+}
+
+.schedule-view-day-tab.active {
+    border-color: var(--accent);
+    background: color-mix(in srgb, var(--accent) 15%, var(--bg-input));
+    color: var(--text-primary);
+}
+
+.schedule-view-mobile-day {
+    display: flex;
+    flex-direction: column;
+    gap: 0.75rem;
+}
+
+.schedule-view-mobile-day-heading,
+.schedule-view-mobile-slot {
+    border: 1px solid var(--bg-card-border);
+    border-radius: var(--radius-sm);
+    background: var(--bg-input);
+}
+
+.schedule-view-mobile-day-heading {
+    padding: 0.8rem 0.9rem;
+}
+
+.schedule-view-mobile-day-heading strong,
+.schedule-view-mobile-day-heading span,
+.schedule-view-mobile-slot-time strong,
+.schedule-view-mobile-slot-time span {
+    display: block;
+}
+
+.schedule-view-mobile-day-heading span,
+.schedule-view-mobile-slot-time span {
+    margin-top: 0.25rem;
+    color: var(--text-secondary);
+    font-size: 0.78rem;
+}
+
+.schedule-view-mobile-slot {
+    overflow: hidden;
+}
+
+.schedule-view-mobile-slot-time {
+    padding: 0.7rem 0.85rem;
+    border-bottom: 1px solid var(--bg-card-border);
+}
+
+.schedule-view-mobile-slot-content .room-week-unified {
+    min-height: 124px;
+}
+
 /* Настройка scrollbar для контейнера сетки */
 .workload-grid-container::-webkit-scrollbar {
     width: 8px;
@@ -580,7 +876,14 @@
     background: rgba(0, 0, 0, 0.15);
 }
 
+@media (max-width: 1180px) {
+    .schedule-view-control-grid {
+        grid-template-columns: repeat(2, minmax(0, 1fr));
+    }
+}
+
 @media (max-width: 768px) {
+    .workload-target-control,
     .workload-display-control {
         min-width: 100%;
     }
@@ -596,4 +899,54 @@
     .room-grid-container {
         height: 520px;
     }
+
+    .schedule-view-shell {
+        min-height: auto;
+        grid-template-rows: auto;
+    }
+
+    .schedule-view-control-header,
+    .schedule-view-results-header,
+    .schedule-view-table-header {
+        display: grid;
+        grid-template-columns: 1fr;
+    }
+
+    .schedule-view-control-grid,
+    .schedule-view-extra-grid {
+        grid-template-columns: 1fr;
+    }
+
+    .schedule-view-period-buttons,
+    .schedule-view-result-actions,
+    .schedule-view-day-tabs {
+        width: 100%;
+    }
+
+    .schedule-view-period-buttons .btn-secondary,
+    .schedule-view-result-actions .btn-secondary {
+        flex: 1;
+    }
+
+    .schedule-view-result-actions {
+        justify-content: stretch;
+        text-align: center;
+    }
+
+    .schedule-view-result-actions span {
+        flex: 2;
+        align-self: center;
+    }
+
+    .schedule-view-result-tab {
+        min-width: 72%;
+    }
+
+    .schedule-view-table-card {
+        min-height: 520px;
+    }
+
+    .schedule-view-day-tabs {
+        justify-content: flex-start;
+    }
 }

frontend/admin/css/components.css

@@ -104,6 +104,111 @@
     opacity: 0.5;
 }
 
+.form-group select,
+.filter-row select,
+.schedule-view-filter-grid select {
+    width: 100%;
+    padding: 0.75rem 1rem;
+    background: var(--bg-input);
+    border: 1px solid var(--bg-card-border);
+    border-radius: var(--radius-sm);
+    color: var(--text-primary);
+    font-family: inherit;
+    font-size: 0.95rem;
+    outline: none;
+    transition: all var(--transition);
+}
+
+.form-group select:focus,
+.filter-row select:focus,
+.schedule-view-filter-grid select:focus {
+    background: var(--bg-input-focus);
+    border-color: var(--accent);
+    box-shadow: 0 0 0 4px var(--accent-glow);
+}
+
+.stack-form {
+    display: grid;
+    gap: 1rem;
+}
+
+.stack-form textarea {
+    width: 100%;
+    min-height: 150px;
+    resize: vertical;
+    padding: 0.75rem 1rem;
+    background: var(--bg-input);
+    border: 1px solid var(--bg-card-border);
+    border-radius: var(--radius-sm);
+    color: var(--text-primary);
+    font-family: inherit;
+    font-size: 0.95rem;
+    outline: none;
+    transition: all var(--transition);
+}
+
+.stack-form textarea:focus {
+    background: var(--bg-input-focus);
+    border-color: var(--accent);
+    box-shadow: 0 0 0 4px var(--accent-glow);
+}
+
+.schedule-view-filter-grid {
+    display: grid;
+    grid-template-columns: repeat(4, minmax(170px, 1fr));
+    gap: 1rem;
+    align-items: end;
+}
+
+.schedule-view-metrics,
+.department-workspace-grid {
+    display: grid;
+    grid-template-columns: repeat(2, minmax(0, 1fr));
+    gap: 1rem;
+}
+
+.metric-grid {
+    display: grid;
+    gap: 0.75rem;
+}
+
+.metric-card,
+.department-comment-item {
+    padding: 0.85rem;
+    background: var(--bg-input);
+    border: 1px solid var(--bg-card-border);
+    border-radius: var(--radius-sm);
+}
+
+.metric-card strong,
+.department-comment-item strong {
+    display: block;
+    margin-bottom: 0.35rem;
+    color: var(--text-primary);
+}
+
+.metric-card span,
+.metric-card small,
+.department-comment-item span {
+    display: block;
+    color: var(--text-secondary);
+}
+
+.department-workload-list {
+    margin-top: 1rem;
+}
+
+.department-comment-list {
+    display: grid;
+    gap: 0.75rem;
+    margin-top: 1rem;
+}
+
+.department-comment-item p {
+    margin-top: 0.5rem;
+    color: var(--text-primary);
+}
+
 .schedule-section-label {
     display: block;
     font-size: 0.78rem;
@@ -578,6 +683,12 @@
 }
 
 @media (max-width: 1180px) {
+    .schedule-view-filter-grid,
+    .schedule-view-metrics,
+    .department-workspace-grid {
+        grid-template-columns: 1fr;
+    }
+
     .schedule-hours-grid {
         grid-template-columns: 1fr;
     }

frontend/admin/css/layout.css

@@ -72,6 +72,11 @@
     overflow: hidden;
 }
 
+.nav-item[hidden],
+.settings-menu-item[hidden] {
+    display: none !important;
+}
+
 .nav-item::before {
     content: '';
     position: absolute;
@@ -411,4 +416,4 @@
         visibility: visible;
         pointer-events: auto;
     }
-}
+}