Миллион изменений, создание вкладки "Расписание занятий"
This commit is contained in:
Zuev
@@ -95,7 +95,7 @@
|
||||
color: var(--text-secondary);
|
||||
}
|
||||
|
||||
/* Lesson Cards inside grid cells */
|
||||
/* Карточки занятий внутри ячеек сетки */
|
||||
.lesson-card {
|
||||
background: var(--bg-card);
|
||||
border: 1px solid var(--bg-card-border);
|
||||
|
||||
@@ -104,6 +104,104 @@
|
||||
opacity: 0.5;
|
||||
}
|
||||
|
||||
.schedule-section-label {
|
||||
display: block;
|
||||
font-size: 0.78rem;
|
||||
font-weight: 500;
|
||||
color: var(--text-secondary);
|
||||
margin: 1rem 0 0.5rem;
|
||||
text-transform: uppercase;
|
||||
letter-spacing: 0.04em;
|
||||
}
|
||||
|
||||
.schedule-checkbox-grid {
|
||||
display: grid;
|
||||
grid-template-columns: repeat(auto-fit, minmax(180px, 1fr));
|
||||
gap: 0.35rem;
|
||||
padding: 0.5rem;
|
||||
background: var(--bg-input);
|
||||
border: 1px solid var(--bg-card-border);
|
||||
border-radius: var(--radius-sm);
|
||||
}
|
||||
|
||||
.schedule-slots-panel {
|
||||
margin-top: 1rem;
|
||||
}
|
||||
|
||||
.schedule-slots-list {
|
||||
display: flex;
|
||||
flex-direction: column;
|
||||
gap: 0.75rem;
|
||||
margin-top: 0.75rem;
|
||||
}
|
||||
|
||||
.schedule-slot-row {
|
||||
display: grid;
|
||||
grid-template-columns: repeat(7, minmax(130px, 1fr)) auto;
|
||||
gap: 0.75rem;
|
||||
align-items: end;
|
||||
padding: 0.75rem;
|
||||
background: var(--bg-input);
|
||||
border: 1px solid var(--bg-card-border);
|
||||
border-radius: var(--radius-sm);
|
||||
}
|
||||
|
||||
.schedule-slot-summary,
|
||||
.schedule-semester-line {
|
||||
margin-bottom: 0.35rem;
|
||||
}
|
||||
|
||||
.schedule-semester-line {
|
||||
display: flex;
|
||||
align-items: center;
|
||||
justify-content: space-between;
|
||||
gap: 0.5rem;
|
||||
}
|
||||
|
||||
.schedule-inline-table {
|
||||
margin-top: 1rem;
|
||||
}
|
||||
|
||||
.matrix-grid {
|
||||
display: grid;
|
||||
grid-template-columns: repeat(auto-fit, minmax(140px, 1fr));
|
||||
gap: 0.75rem;
|
||||
margin-top: 1rem;
|
||||
}
|
||||
|
||||
.matrix-week {
|
||||
display: grid;
|
||||
gap: 0.45rem;
|
||||
padding: 0.75rem;
|
||||
background: var(--bg-input);
|
||||
border: 1px solid var(--bg-card-border);
|
||||
border-radius: var(--radius-sm);
|
||||
}
|
||||
|
||||
.matrix-week > span {
|
||||
color: var(--text-secondary);
|
||||
font-size: 0.78rem;
|
||||
font-weight: 600;
|
||||
text-transform: uppercase;
|
||||
letter-spacing: 0.04em;
|
||||
}
|
||||
|
||||
.muted {
|
||||
color: var(--text-secondary);
|
||||
}
|
||||
|
||||
@media (max-width: 1180px) {
|
||||
.schedule-slot-row {
|
||||
grid-template-columns: repeat(2, minmax(180px, 1fr));
|
||||
}
|
||||
}
|
||||
|
||||
@media (max-width: 640px) {
|
||||
.schedule-slot-row {
|
||||
grid-template-columns: 1fr;
|
||||
}
|
||||
}
|
||||
|
||||
/* Hide Number Arrows */
|
||||
input[type="number"]::-webkit-outer-spin-button,
|
||||
input[type="number"]::-webkit-inner-spin-button {
|
||||
@@ -1032,4 +1130,4 @@ tbody tr:hover {
|
||||
position: fixed;
|
||||
top: 1.25rem;
|
||||
right: 1.25rem;
|
||||
}
|
||||
}
|
||||
|
||||
@@ -1,344 +0,0 @@
|
||||
/* ===== Оверлей для модалок создания записей (к/ф) ===== */
|
||||
.cs-overlay {
|
||||
display: none;
|
||||
position: fixed;
|
||||
inset: 0;
|
||||
z-index: 1000;
|
||||
background: rgba(0, 0, 0, 0.55);
|
||||
backdrop-filter: blur(4px);
|
||||
-webkit-backdrop-filter: blur(4px);
|
||||
}
|
||||
|
||||
.cs-overlay.open {
|
||||
display: block;
|
||||
}
|
||||
|
||||
.cs-overlay-scroll {
|
||||
width: 100%;
|
||||
height: 100%;
|
||||
overflow-y: auto;
|
||||
padding: 2rem 1rem;
|
||||
display: flex;
|
||||
flex-direction: column;
|
||||
align-items: center;
|
||||
gap: 1rem;
|
||||
}
|
||||
|
||||
/* Общие стили для обеих модалок */
|
||||
.cs-modal {
|
||||
width: 100%;
|
||||
max-width: 1100px;
|
||||
position: relative;
|
||||
animation: csModalAppear 0.25s ease-out;
|
||||
}
|
||||
|
||||
/* Модалка 1 (форма) всегда поверх модалки 2 (таблицы),
|
||||
чтобы выпадающие списки не уходили под таблицу */
|
||||
.cs-modal-form {
|
||||
z-index: 2;
|
||||
}
|
||||
|
||||
.cs-modal-table {
|
||||
z-index: 1;
|
||||
}
|
||||
|
||||
@keyframes csModalAppear {
|
||||
from { opacity: 0; transform: translateY(-12px); }
|
||||
to { opacity: 1; transform: translateY(0); }
|
||||
}
|
||||
|
||||
.cs-modal-header {
|
||||
display: flex;
|
||||
justify-content: space-between;
|
||||
align-items: center;
|
||||
margin-bottom: 1rem;
|
||||
}
|
||||
|
||||
.cs-modal-header h2 {
|
||||
margin: 0;
|
||||
}
|
||||
|
||||
/* Кнопка закрытия */
|
||||
.btn-close-panel {
|
||||
background: none;
|
||||
border: 1px solid var(--bg-card-border);
|
||||
border-radius: var(--radius-sm);
|
||||
font-size: 1.3rem;
|
||||
line-height: 1;
|
||||
padding: 0.25rem 0.6rem;
|
||||
color: var(--text-secondary);
|
||||
cursor: pointer;
|
||||
transition: color var(--transition), background var(--transition), border-color var(--transition);
|
||||
}
|
||||
|
||||
.btn-close-panel:hover {
|
||||
color: var(--error);
|
||||
background: rgba(239, 68, 68, 0.1);
|
||||
border-color: var(--error);
|
||||
}
|
||||
|
||||
.wrap{
|
||||
max-width: 900px;
|
||||
margin: 0 auto;
|
||||
background: var(--bg-card);
|
||||
border: 1px solid var(--bg-card-border);
|
||||
border-radius: 12px;
|
||||
overflow: hidden;
|
||||
box-shadow: 0 6px 20px rgba(0,0,0,.06);
|
||||
}
|
||||
|
||||
.header{
|
||||
padding: 14px 16px;
|
||||
border-bottom: 1px solid var(--bg-card-border);
|
||||
font-weight: 700;
|
||||
color: var(--text-primary);
|
||||
}
|
||||
|
||||
details.table-item{
|
||||
border-top: 1px solid var(--bg-card-border);
|
||||
}
|
||||
details.table-item:first-of-type{ border-top:none; }
|
||||
|
||||
summary{
|
||||
list-style: none;
|
||||
cursor: pointer;
|
||||
user-select: none;
|
||||
padding: 12px 16px;
|
||||
display: flex;
|
||||
align-items: center;
|
||||
gap: 10px;
|
||||
}
|
||||
summary::-webkit-details-marker{ display:none; }
|
||||
|
||||
.chev{
|
||||
width: 28px;
|
||||
height: 28px;
|
||||
border: 1px solid var(--bg-card-border);
|
||||
border-radius: 10px;
|
||||
display: grid;
|
||||
place-items: center;
|
||||
flex: 0 0 auto;
|
||||
|
||||
color: var(--text-secondary);
|
||||
background: var(--bg-input);
|
||||
|
||||
transition: transform .18s ease, color .18s ease, border-color .18s ease, background .18s ease;
|
||||
}
|
||||
|
||||
.chev-icon{
|
||||
width: 16px;
|
||||
height: 16px;
|
||||
display: block;
|
||||
}
|
||||
|
||||
summary:hover .chev{
|
||||
background: var(--bg-hover);
|
||||
border-color: color-mix(in srgb, var(--accent) 22%, var(--bg-card-border));
|
||||
color: var(--text-primary);
|
||||
}
|
||||
|
||||
details[open] .chev{
|
||||
transform: rotate(180deg);
|
||||
color: var(--accent);
|
||||
border-color: color-mix(in srgb, var(--accent) 35%, var(--bg-card-border));
|
||||
background: color-mix(in srgb, var(--accent) 10%, var(--bg-input));
|
||||
}
|
||||
|
||||
.meta{ color: var(--text-secondary); font-size: 12px; }
|
||||
|
||||
.content{ padding: 0 16px 16px 16px; }
|
||||
|
||||
.wrap table{
|
||||
width: 100%;
|
||||
border-collapse: collapse;
|
||||
border: 1px solid var(--bg-card-border);
|
||||
border-radius: 10px;
|
||||
overflow: hidden;
|
||||
background: var(--bg-card);
|
||||
}
|
||||
|
||||
.wrap thead th{
|
||||
text-align: left;
|
||||
font-size: 13px;
|
||||
color: var(--text-secondary);
|
||||
background: var(--bg-input);
|
||||
border-bottom: 1px solid var(--bg-card-border);
|
||||
padding: 10px 12px;
|
||||
}
|
||||
|
||||
.wrap tbody td{
|
||||
padding: 10px 12px;
|
||||
border-bottom: 1px solid var(--bg-card-border);
|
||||
font-size: 14px;
|
||||
color: var(--text-primary);
|
||||
}
|
||||
|
||||
.wrap tbody tr:hover{ background: var(--bg-hover); }
|
||||
|
||||
.title-multiline{
|
||||
display: flex;
|
||||
flex-direction: column;
|
||||
gap: 2px;
|
||||
line-height: 1.2;
|
||||
}
|
||||
|
||||
.title-multiline .title-main{
|
||||
font-weight: 700;
|
||||
color: var(--text-primary);
|
||||
}
|
||||
|
||||
.title-multiline .title-sub{
|
||||
font-weight: 500;
|
||||
font-size: 12px;
|
||||
color: var(--text-secondary);
|
||||
}
|
||||
|
||||
.title-multiline b{
|
||||
font-weight: 700;
|
||||
color: var(--text-primary);
|
||||
}
|
||||
|
||||
/* summary = 3 колонки: [chev] [title] [meta] */
|
||||
details.table-item > summary{
|
||||
display: grid;
|
||||
grid-template-columns: 28px 1fr auto;
|
||||
gap: 12px;
|
||||
align-items: start; /* важно: всё прижимаем к верху */
|
||||
padding: 12px 16px;
|
||||
}
|
||||
|
||||
/* чтобы текст нормально переносился и не растягивал мету */
|
||||
details.table-item > summary .title{
|
||||
min-width: 0; /* важно для grid, иначе может распирать */
|
||||
}
|
||||
|
||||
/* "2 записи" всегда справа и сверху, аккуратно */
|
||||
details.table-item > summary .meta{
|
||||
justify-self: end;
|
||||
align-self: start;
|
||||
white-space: nowrap;
|
||||
padding-top: 4px; /* чуть опустить относительно первой строки */
|
||||
font-size: 12px;
|
||||
color: var(--text-secondary);
|
||||
}
|
||||
|
||||
/* стрелка тоже сверху */
|
||||
details.table-item > summary .chev{
|
||||
align-self: start;
|
||||
margin-top: 2px;
|
||||
}
|
||||
|
||||
.records-search{
|
||||
width: min(360px, 60vw);
|
||||
padding: 0.45rem 0.7rem;
|
||||
background: var(--bg-input);
|
||||
border: 1px solid var(--bg-card-border);
|
||||
border-radius: var(--radius-sm);
|
||||
color: var(--text-primary);
|
||||
font-size: 0.9rem;
|
||||
outline: none;
|
||||
transition: border-color .2s ease, box-shadow .2s ease, background .2s ease;
|
||||
}
|
||||
|
||||
.records-search::placeholder{ color: var(--text-placeholder); }
|
||||
|
||||
.records-search:focus{
|
||||
background: var(--bg-input-focus);
|
||||
border-color: var(--accent);
|
||||
box-shadow: 0 0 0 3px var(--accent-glow);
|
||||
}
|
||||
/* Таблица внутри раскрывающегося блока */
|
||||
details.table-item .content table{
|
||||
width: 100%;
|
||||
border-collapse: separate; /* нужно для красивых линий */
|
||||
border-spacing: 0;
|
||||
border: 1px solid var(--bg-card-border);
|
||||
border-radius: 12px;
|
||||
overflow: hidden;
|
||||
background: var(--bg-card);
|
||||
}
|
||||
|
||||
/* Шапка */
|
||||
details.table-item .content thead th{
|
||||
position: sticky; /* опционально: шапка прилипает при скролле */
|
||||
top: 0;
|
||||
z-index: 1;
|
||||
|
||||
background: var(--bg-input);
|
||||
color: var(--text-secondary);
|
||||
border-bottom: 1px solid var(--bg-card-border);
|
||||
}
|
||||
|
||||
/* Ячейки: одинаковые отступы */
|
||||
details.table-item .content th,
|
||||
details.table-item .content td{
|
||||
padding: 0.75rem 0.85rem;
|
||||
vertical-align: top;
|
||||
}
|
||||
|
||||
/* Вертикальные разделители между колонками */
|
||||
details.table-item .content th:not(:last-child),
|
||||
details.table-item .content td:not(:last-child){
|
||||
border-right: 1px solid var(--bg-card-border);
|
||||
}
|
||||
|
||||
/* Горизонтальные разделители между строками */
|
||||
details.table-item .content tbody td{
|
||||
border-bottom: 1px solid var(--bg-card-border);
|
||||
color: var(--text-primary);
|
||||
}
|
||||
|
||||
/* У последней строки нет нижней линии */
|
||||
details.table-item .content tbody tr:last-child td{
|
||||
border-bottom: none;
|
||||
}
|
||||
|
||||
/* "Зебра" для читабельности */
|
||||
details.table-item .content tbody tr:nth-child(even){
|
||||
background: color-mix(in srgb, var(--bg-card) 70%, var(--bg-hover));
|
||||
}
|
||||
|
||||
/* Ховер по строке */
|
||||
details.table-item .content tbody tr:hover{
|
||||
background: var(--bg-hover);
|
||||
}
|
||||
|
||||
/* (Опционально) Чтобы длинный текст не ломал ширину */
|
||||
details.table-item .content td{
|
||||
word-break: break-word;
|
||||
}
|
||||
|
||||
/* (Опционально) если таблица широкая — пусть скроллится горизонтально */
|
||||
details.table-item .content{
|
||||
overflow-x: auto;
|
||||
}
|
||||
|
||||
/* ===== Контейнер занятий преподавателя в модалках ===== */
|
||||
.cs-modal-table .lessons-container {
|
||||
max-height: 50vh;
|
||||
overflow-y: auto;
|
||||
padding-right: 0.5rem;
|
||||
scrollbar-width: thin;
|
||||
scrollbar-color: rgba(99, 102, 241, 0.55) rgba(255, 255, 255, 0.06);
|
||||
}
|
||||
|
||||
.cs-modal-table .lessons-container::-webkit-scrollbar {
|
||||
width: 10px;
|
||||
}
|
||||
|
||||
.cs-modal-table .lessons-container::-webkit-scrollbar-track {
|
||||
background: rgba(255, 255, 255, 0.06);
|
||||
border-radius: 10px;
|
||||
}
|
||||
|
||||
.cs-modal-table .lessons-container::-webkit-scrollbar-thumb {
|
||||
background: rgba(99, 102, 241, 0.55);
|
||||
border-radius: 10px;
|
||||
border: 2px solid rgba(0, 0, 0, 0);
|
||||
background-clip: padding-box;
|
||||
}
|
||||
|
||||
.cs-modal-table .lessons-container::-webkit-scrollbar-thumb:hover {
|
||||
background: rgba(99, 102, 241, 0.75);
|
||||
}
|
||||
|
||||
@@ -59,360 +59,3 @@
|
||||
.modal-close:hover {
|
||||
color: var(--error);
|
||||
}
|
||||
|
||||
/* ===== Кнопки ===== */
|
||||
.btn-add-lesson {
|
||||
padding: 0.35rem 0.7rem;
|
||||
background: rgba(16, 185, 129, 0.1);
|
||||
border: 1px solid rgba(16, 185, 129, 0.2);
|
||||
border-radius: var(--radius-sm);
|
||||
color: var(--success);
|
||||
font-family: inherit;
|
||||
font-size: 0.8rem;
|
||||
cursor: pointer;
|
||||
transition: background var(--transition), transform var(--transition);
|
||||
position: relative;
|
||||
overflow: hidden;
|
||||
}
|
||||
|
||||
.btn-add-lesson:hover {
|
||||
background: rgba(16, 185, 129, 0.2);
|
||||
transform: scale(1.05);
|
||||
}
|
||||
|
||||
.btn-view-lessons {
|
||||
padding: 0.35rem 0.7rem;
|
||||
background: rgba(99, 102, 241, 0.1);
|
||||
border: 1px solid rgba(99, 102, 241, 0.2);
|
||||
border-radius: var(--radius-sm);
|
||||
color: var(--accent);
|
||||
font-family: inherit;
|
||||
font-size: 0.8rem;
|
||||
cursor: pointer;
|
||||
transition: all var(--transition);
|
||||
white-space: nowrap;
|
||||
}
|
||||
|
||||
.btn-view-lessons:hover {
|
||||
background: rgba(99, 102, 241, 0.2);
|
||||
transform: translateY(-1px);
|
||||
}
|
||||
|
||||
/* ===== Кнопки-переключатели (неделя) ===== */
|
||||
.btn-checkbox {
|
||||
display: inline-block;
|
||||
cursor: pointer;
|
||||
}
|
||||
|
||||
.btn-checkbox input {
|
||||
position: absolute;
|
||||
opacity: 0;
|
||||
width: 0;
|
||||
height: 0;
|
||||
}
|
||||
|
||||
.checkbox-btn {
|
||||
display: inline-block;
|
||||
padding: 0.5rem 1rem;
|
||||
background: var(--bg-secondary);
|
||||
border: 1px solid var(--bg-card-border);
|
||||
border-radius: var(--radius-sm);
|
||||
color: var(--text-primary);
|
||||
transition: all var(--transition);
|
||||
user-select: none;
|
||||
}
|
||||
|
||||
.btn-checkbox input:checked + .checkbox-btn {
|
||||
background: var(--success, #10b981);
|
||||
border-color: var(--success, #10b981);
|
||||
color: #fff;
|
||||
}
|
||||
|
||||
/* ===========================================================
|
||||
===== 2-е модальное окно (View Lessons) — ОСНОВНЫЕ ПРАВКИ =====
|
||||
Требования:
|
||||
- слева
|
||||
- ~30% ширины
|
||||
- сверху начинается СРАЗУ под 1-й модалкой
|
||||
- высота = весь остаток до низа экрана
|
||||
- визуально "ниже" 1-й модалки (и по z-index тоже ниже)
|
||||
=========================================================== */
|
||||
|
||||
#modal-view-lessons.modal-overlay {
|
||||
background: transparent !important;
|
||||
backdrop-filter: none !important;
|
||||
pointer-events: none;
|
||||
z-index: 999; /* ниже чем 1-е (1000) */
|
||||
}
|
||||
|
||||
/* В открытом состоянии: прижать влево и опустить вниз на высоту "шапки" */
|
||||
#modal-view-lessons.modal-overlay.open {
|
||||
justify-content: flex-start;
|
||||
align-items: flex-start;
|
||||
|
||||
padding-left: 1rem;
|
||||
padding-right: 1rem;
|
||||
|
||||
/* ключевое: высота 1-й модалки приходит из JS через --add-lesson-height */
|
||||
padding-top: var(--add-lesson-height, 0px);
|
||||
}
|
||||
|
||||
/* Панель 2-й модалки */
|
||||
#modal-view-lessons .view-lessons-modal {
|
||||
width: 30vw !important;
|
||||
max-width: 30vw !important;
|
||||
min-width: 320px;
|
||||
|
||||
pointer-events: auto;
|
||||
|
||||
background: var(--bg-primary);
|
||||
border: 1px solid var(--bg-card-border);
|
||||
border-radius: var(--radius-md);
|
||||
padding: 2rem;
|
||||
|
||||
position: relative;
|
||||
box-shadow: 0 20px 50px rgba(0, 0, 0, 0.5);
|
||||
|
||||
margin: 0;
|
||||
|
||||
/* отключаем "пружинку" от .modal-content */
|
||||
transform: none;
|
||||
|
||||
/* ключевое: занимает остаток по высоте */
|
||||
height: calc(100vh - var(--add-lesson-height, 0px));
|
||||
max-height: calc(100vh - var(--add-lesson-height, 0px));
|
||||
|
||||
/* чтобы скролл был внутри, а не у всей модалки */
|
||||
display: flex;
|
||||
flex-direction: column;
|
||||
overflow: hidden;
|
||||
}
|
||||
|
||||
/* Header во 2-й модалке */
|
||||
#modal-veiw-lessons .modal-header {
|
||||
display: flex;
|
||||
justify-content: space-between;
|
||||
align-items: center;
|
||||
margin-bottom: 1rem;
|
||||
padding-right: 2rem;
|
||||
flex: 0 0 auto;
|
||||
}
|
||||
|
||||
#modal-view-lessons .modal-header h2 {
|
||||
margin: 0;
|
||||
font-size: 1.3rem;
|
||||
color: var(--text-primary);
|
||||
}
|
||||
|
||||
/* Контейнер занятий: растягивается и скроллится */
|
||||
#modal-view-lessons .lessons-container {
|
||||
flex: 1 1 auto;
|
||||
overflow-y: auto;
|
||||
|
||||
/* перебиваем старое ограничение */
|
||||
max-height: none;
|
||||
|
||||
padding-right: 0.5rem;
|
||||
}
|
||||
|
||||
/* ===== Карточки занятий ===== */
|
||||
.lesson-card {
|
||||
background: var(--bg-card);
|
||||
border: 1px solid var(--bg-card-border);
|
||||
border-radius: var(--radius-sm);
|
||||
padding: 1.2rem;
|
||||
margin-bottom: 1rem;
|
||||
transition: all 0.2s ease;
|
||||
}
|
||||
|
||||
.lesson-card:hover {
|
||||
transform: translateY(-2px);
|
||||
box-shadow: 0 8px 20px rgba(0, 0, 0, 0.15);
|
||||
border-color: var(--accent);
|
||||
}
|
||||
|
||||
.lesson-card-header {
|
||||
display: flex;
|
||||
justify-content: space-between;
|
||||
align-items: center;
|
||||
margin-bottom: 0.8rem;
|
||||
padding-bottom: 0.5rem;
|
||||
border-bottom: 1px dashed var(--bg-card-border);
|
||||
}
|
||||
|
||||
.lesson-group {
|
||||
font-weight: 700;
|
||||
color: var(--accent);
|
||||
font-size: 1rem;
|
||||
background: rgba(99, 102, 241, 0.1);
|
||||
padding: 0.3rem 0.8rem;
|
||||
border-radius: 20px;
|
||||
}
|
||||
|
||||
.lesson-time {
|
||||
color: var(--text-secondary);
|
||||
font-size: 0.9rem;
|
||||
display: flex;
|
||||
align-items: center;
|
||||
gap: 0.3rem;
|
||||
}
|
||||
|
||||
.lesson-time::before {
|
||||
content: "🕒";
|
||||
font-size: 0.9rem;
|
||||
opacity: 0.7;
|
||||
}
|
||||
|
||||
.lesson-card-body {
|
||||
display: flex;
|
||||
flex-direction: column;
|
||||
gap: 0.5rem;
|
||||
}
|
||||
|
||||
.lesson-subject {
|
||||
font-weight: 600;
|
||||
color: var(--text-primary);
|
||||
font-size: 1.1rem;
|
||||
display: flex;
|
||||
align-items: center;
|
||||
gap: 0.5rem;
|
||||
}
|
||||
|
||||
.lesson-subject::before {
|
||||
content: "📚";
|
||||
font-size: 1rem;
|
||||
opacity: 0.7;
|
||||
}
|
||||
|
||||
.lesson-details {
|
||||
display: flex;
|
||||
flex-wrap: wrap;
|
||||
gap: 0.8rem;
|
||||
margin-top: 0.5rem;
|
||||
}
|
||||
|
||||
.lesson-detail-item {
|
||||
background: var(--bg-input);
|
||||
padding: 0.3rem 0.8rem;
|
||||
border-radius: 15px;
|
||||
font-size: 0.85rem;
|
||||
color: var(--text-secondary);
|
||||
border: 1px solid var(--bg-card-border);
|
||||
}
|
||||
|
||||
/* День недели как разделитель */
|
||||
.lesson-day-divider {
|
||||
margin: 1.5rem 0 1rem 0;
|
||||
font-weight: 700;
|
||||
color: var(--accent);
|
||||
font-size: 1.1rem;
|
||||
text-transform: uppercase;
|
||||
letter-spacing: 0.05em;
|
||||
border-bottom: 2px solid var(--accent-glow);
|
||||
padding-bottom: 0.3rem;
|
||||
}
|
||||
|
||||
.lesson-day-divider:first-of-type {
|
||||
margin-top: 0;
|
||||
}
|
||||
|
||||
/* Загрузка/пусто */
|
||||
.loading-lessons,
|
||||
.no-lessons {
|
||||
text-align: center;
|
||||
color: var(--text-secondary);
|
||||
padding: 3rem;
|
||||
font-size: 1rem;
|
||||
background: var(--bg-card);
|
||||
border-radius: var(--radius-sm);
|
||||
}
|
||||
|
||||
/* Светлая тема */
|
||||
[data-theme="light"] .lesson-card {
|
||||
background: #fff;
|
||||
border-color: rgba(0, 0, 0, 0.1);
|
||||
}
|
||||
|
||||
[data-theme="light"] .lesson-group {
|
||||
background: rgba(99, 102, 241, 0.05);
|
||||
}
|
||||
|
||||
/* ===== Адаптивность ===== */
|
||||
@media (max-width: 1200px) {
|
||||
#modal-view-lessons .view-lessons-modal {
|
||||
width: 40vw !important;
|
||||
max-width: 40vw !important;
|
||||
}
|
||||
}
|
||||
|
||||
@media (max-width: 768px) {
|
||||
/* На мобилке делаем поведение более "обычным" */
|
||||
#modal-view-lessons.modal-overlay.open {
|
||||
padding-top: 1rem;
|
||||
justify-content: center;
|
||||
align-items: flex-start;
|
||||
}
|
||||
|
||||
#modal-view-lessons .view-lessons-modal {
|
||||
width: 90vw !important;
|
||||
max-width: 90vw !important;
|
||||
min-width: 0;
|
||||
|
||||
/* чтобы занимало почти весь экран */
|
||||
height: calc(100vh - 2rem);
|
||||
max-height: calc(100vh - 2rem);
|
||||
}
|
||||
|
||||
.lesson-card-header {
|
||||
flex-direction: column;
|
||||
align-items: flex-start;
|
||||
gap: 0.5rem;
|
||||
}
|
||||
}
|
||||
|
||||
/* ===== Скролл во 2-й модалке ===== */
|
||||
#modal-view-lessons .lessons-container {
|
||||
scrollbar-width: thin; /* Firefox */
|
||||
scrollbar-color: rgba(99, 102, 241, 0.55) rgba(255, 255, 255, 0.06); /* thumb track */
|
||||
}
|
||||
|
||||
/* WebKit (Chrome/Edge/Safari) */
|
||||
#modal-view-lessons .lessons-container::-webkit-scrollbar {
|
||||
width: 10px;
|
||||
}
|
||||
|
||||
#modal-view-lessons .lessons-container::-webkit-scrollbar-track {
|
||||
background: rgba(255, 255, 255, 0.06);
|
||||
border-radius: 10px;
|
||||
}
|
||||
|
||||
#modal-view-lessons .lessons-container::-webkit-scrollbar-thumb {
|
||||
background: rgba(99, 102, 241, 0.55); /* под accent */
|
||||
border-radius: 10px;
|
||||
border: 2px solid rgba(0, 0, 0, 0); /* чтобы выглядел “тоньше” */
|
||||
background-clip: padding-box;
|
||||
}
|
||||
|
||||
#modal-view-lessons .lessons-container::-webkit-scrollbar-thumb:hover {
|
||||
background: rgba(99, 102, 241, 0.75);
|
||||
}
|
||||
|
||||
/* Общий блюр/затемнение за модалками */
|
||||
#modal-backdrop{
|
||||
position: fixed;
|
||||
inset: 0;
|
||||
background: rgba(0,0,0,0.55);
|
||||
backdrop-filter: blur(6px);
|
||||
-webkit-backdrop-filter: blur(6px);
|
||||
|
||||
opacity: 0;
|
||||
pointer-events: none;
|
||||
transition: opacity var(--transition);
|
||||
z-index: 998; /* ниже модалок: 999 и 1000 */
|
||||
}
|
||||
|
||||
#modal-backdrop.open{
|
||||
opacity: 1;
|
||||
pointer-events: auto;
|
||||
}
|
||||
|
||||
|
||||
@@ -14,7 +14,6 @@
|
||||
<link rel="stylesheet" href="css/layout.css">
|
||||
<link rel="stylesheet" href="css/components.css">
|
||||
<link rel="stylesheet" href="css/modals.css">
|
||||
<link rel="stylesheet" href="css/department.css">
|
||||
<link rel="stylesheet" href="css/departments-data.css">
|
||||
<link rel="stylesheet" href="css/auditorium-workload.css">
|
||||
</head>
|
||||
@@ -54,17 +53,6 @@
|
||||
</svg>
|
||||
<span>Пользователи</span>
|
||||
</a>
|
||||
<a href="#" class="nav-item" data-tab="department">
|
||||
<svg width="20" height="20" viewBox="0 0 24 24" fill="none"
|
||||
stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round">
|
||||
<path d="M4 21V5a2 2 0 0 1 2-2h12a2 2 0 0 1 2 2v16" />
|
||||
<path d="M2 21h20" />
|
||||
<path d="M8 7h0M12 7h0M16 7h0" />
|
||||
<path d="M8 11h0M12 11h0M16 11h0" />
|
||||
<path d="M10 21v-4h4v4" />
|
||||
</svg>
|
||||
<span>Кафедра</span>
|
||||
</a>
|
||||
<a href="#" class="nav-item" data-tab="departments-data">
|
||||
<svg width="20" height="20" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round">
|
||||
<path d="M16 4h2a2 2 0 0 1 2 2v14a2 2 0 0 1-2 2H6a2 2 0 0 1-2-2V6a2 2 0 0 1 2-2h2"></path>
|
||||
@@ -204,4 +192,4 @@
|
||||
<script type="module" src="js/main.js"></script>
|
||||
</body>
|
||||
|
||||
</html>
|
||||
</html>
|
||||
|
||||
@@ -26,7 +26,6 @@ import { initClassrooms } from './views/classrooms.js';
|
||||
import { initSubjects } from './views/subjects.js';
|
||||
import {initSchedule} from "./views/schedule.js";
|
||||
import {initDatabase} from "./views/database.js";
|
||||
import {initDepartment} from "./views/department.js";
|
||||
import {initDepartmentsData} from "./views/departments-data.js";
|
||||
import {initAuditoriumWorkload} from "./views/auditorium-workload.js";
|
||||
|
||||
@@ -41,7 +40,6 @@ const ROUTES = {
|
||||
schedule: { title: 'Расписание занятий', file: 'views/schedule.html', init: initSchedule },
|
||||
'auditorium-workload': { title: 'Загруженность аудиторий', file: 'views/auditorium-workload.html', init: initAuditoriumWorkload },
|
||||
database: { title: 'База данных', file: 'views/database.html', init: initDatabase },
|
||||
department: { title: 'Кафедры', file: 'views/department.html', init: initDepartment },
|
||||
'departments-data': { title: 'Создание кафедры/специальности', file: 'views/departments-data.html', init: initDepartmentsData },
|
||||
};
|
||||
|
||||
|
||||
@@ -90,7 +90,7 @@ function renderMockGrid() {
|
||||
];
|
||||
|
||||
// Mock schedule data mapped by room and time
|
||||
// Key: "roomId_timeSlotId", Value: Lesson object
|
||||
// Ключ: "roomId_timeSlotId", значение: объект занятия
|
||||
const mockSchedule = {
|
||||
"201_8:00-9:30": { subject: "Физика", group: "ИБ-41м", teacher: "Атлетов А.Р." },
|
||||
"201_9:40-11:10": { subject: "Физика", group: "ИВТ-21-1", teacher: "Атлетов А.Р." },
|
||||
|
||||
@@ -1,456 +0,0 @@
|
||||
import { api } from '../api.js';
|
||||
import { escapeHtml, showAlert, hideAlert } from '../utils.js';
|
||||
|
||||
// Ключ для хранения данных в sessionStorage
|
||||
const STORAGE_KEY = 'department_schedule_blocks';
|
||||
|
||||
export async function initDepartment() {
|
||||
const form = document.getElementById('department-schedule-form');
|
||||
const departmentSelect = document.getElementById('filter-department');
|
||||
const container = document.getElementById('schedule-blocks-container');
|
||||
|
||||
let departments = [];
|
||||
|
||||
// Загрузка кафедр
|
||||
try {
|
||||
departments = await api.get('/api/departments');
|
||||
departmentSelect.innerHTML = '<option value="">Выберите кафедру...</option>' +
|
||||
departments.map(d => `<option value="${d.id}">${escapeHtml(d.departmentName || d.name)}</option>`).join('');
|
||||
} catch (e) {
|
||||
departmentSelect.innerHTML = '<option value="">Ошибка загрузки</option>';
|
||||
}
|
||||
|
||||
// ===== Восстанавливаем ранее загруженные таблицы из sessionStorage =====
|
||||
restoreScheduleBlocks();
|
||||
|
||||
form.addEventListener('submit', async (e) => {
|
||||
e.preventDefault();
|
||||
hideAlert('schedule-form-alert');
|
||||
|
||||
const departmentId = departmentSelect.value;
|
||||
const period = document.getElementById('filter-period').value;
|
||||
const semesterType = document.querySelector('input[name="semesterType"]:checked')?.value;
|
||||
|
||||
if (!departmentId || !period || !semesterType) {
|
||||
showAlert('schedule-form-alert', 'Заполните все поля', 'error');
|
||||
return;
|
||||
}
|
||||
|
||||
const deptName = departmentSelect.options[departmentSelect.selectedIndex].text;
|
||||
|
||||
try {
|
||||
const params = new URLSearchParams({ departmentId, semesterType, period });
|
||||
const data = await api.get(`/api/department/schedule?${params.toString()}`);
|
||||
|
||||
const semesterName = semesterType === 'spring' ? 'весенний' : (semesterType === 'autumn' ? 'осенний' : semesterType);
|
||||
const periodName = period.replace('-', '/');
|
||||
|
||||
renderScheduleBlock(deptName, semesterName, periodName, data, departmentId, semesterType, period);
|
||||
|
||||
// НЕ сбрасываем форму — фильтры остаются заполненными (fix #3)
|
||||
|
||||
} catch (err) {
|
||||
showAlert('schedule-form-alert', err.message || 'Ошибка загрузки данных', 'error');
|
||||
}
|
||||
});
|
||||
|
||||
// ===== Уникальный ключ для таблицы по параметрам =====
|
||||
function blockKey(departmentId, semesterType, period) {
|
||||
return `${departmentId}_${semesterType}_${period}`;
|
||||
}
|
||||
|
||||
// ===== Рендер блока таблицы (с дедупликацией — fix #6) =====
|
||||
function renderScheduleBlock(deptName, semester, period, schedule, departmentId, semesterType, rawPeriod) {
|
||||
const key = blockKey(departmentId, semesterType, rawPeriod);
|
||||
|
||||
// Удаляем ранее загруженный блок с тем же ключом
|
||||
const existing = container.querySelector(`[data-block-key="${key}"]`);
|
||||
if (existing) existing.remove();
|
||||
|
||||
const details = document.createElement('details');
|
||||
details.className = 'table-item';
|
||||
details.open = true;
|
||||
details.setAttribute('data-block-key', key);
|
||||
details.innerHTML = `
|
||||
<summary>
|
||||
<div class="chev" aria-hidden="true">
|
||||
<svg viewBox="0 0 20 20" class="chev-icon" focusable="false" aria-hidden="true">
|
||||
<path d="M5.5 7.5L10 12l4.5-4.5" fill="none" stroke="currentColor" stroke-width="2"
|
||||
stroke-linecap="round" stroke-linejoin="round"/>
|
||||
</svg>
|
||||
</div>
|
||||
<div class="title title-multiline">
|
||||
<span class="title-main">Данные к составлению расписания</span>
|
||||
<span class="title-sub">Кафедра: <b>${escapeHtml(deptName)}</b></span>
|
||||
<span class="title-sub">Семестр: <b>${escapeHtml(semester)}</b></span>
|
||||
<span class="title-sub">Уч. год: <b>${escapeHtml(period)}</b></span>
|
||||
</div>
|
||||
<div class="meta">${Array.isArray(schedule) ? schedule.length : 0} записей</div>
|
||||
</summary>
|
||||
<div class="content">
|
||||
<table>
|
||||
<thead>
|
||||
<tr>
|
||||
<th>Специальность</th>
|
||||
<th>Курс/семестр</th>
|
||||
<th>Группа</th>
|
||||
<th>Дисциплина</th>
|
||||
<th>Вид занятий</th>
|
||||
<th>Часов в неделю</th>
|
||||
<th>Деление на подгруппы</th>
|
||||
<th>Преподаватель</th>
|
||||
</tr>
|
||||
</thead>
|
||||
<tbody>
|
||||
${renderRows(schedule)}
|
||||
</tbody>
|
||||
</table>
|
||||
</div>
|
||||
`;
|
||||
|
||||
container.prepend(details);
|
||||
|
||||
// Сохраняем в sessionStorage
|
||||
saveScheduleBlock(key, { deptName, semester, period, schedule, departmentId, semesterType, rawPeriod });
|
||||
}
|
||||
|
||||
function renderRows(schedule) {
|
||||
if (!Array.isArray(schedule) || schedule.length === 0) {
|
||||
return '<tr><td colspan="8" class="loading-row">Нет данных</td></tr>';
|
||||
}
|
||||
return schedule.map(r => `
|
||||
<tr>
|
||||
<td>${escapeHtml(r.specialityCode || '-')}</td>
|
||||
<td>${(() => {
|
||||
const course = r.groupCourse || '-';
|
||||
const semester = r.semester || '-';
|
||||
if (course === '-' && semester === '-') return '-';
|
||||
return `${course} | ${semester}`;
|
||||
})()}</td>
|
||||
<td>${escapeHtml(r.groupName || '-')}</td>
|
||||
<td>${escapeHtml(r.subjectName || '-')}</td>
|
||||
<td>${escapeHtml(r.lessonType || '-')}</td>
|
||||
<td>${escapeHtml(r.numberOfHours || '-')}</td>
|
||||
<td>${r.division === true ? '✓' : ''}</td>
|
||||
<td>${(() => {
|
||||
const jobTitle = r.teacherJobTitle || '-';
|
||||
const teacherName = r.teacherName || '-';
|
||||
if (jobTitle === '-' && teacherName === '-') return '-';
|
||||
return `${jobTitle}, ${teacherName}`;
|
||||
})()}</td>
|
||||
</tr>
|
||||
`).join('');
|
||||
}
|
||||
|
||||
// ===== Persistence: sessionStorage (fix #4) =====
|
||||
function saveScheduleBlock(key, blockData) {
|
||||
try {
|
||||
const stored = JSON.parse(sessionStorage.getItem(STORAGE_KEY) || '{}');
|
||||
stored[key] = blockData;
|
||||
sessionStorage.setItem(STORAGE_KEY, JSON.stringify(stored));
|
||||
} catch (e) {
|
||||
console.warn('Ошибка сохранения в sessionStorage:', e);
|
||||
}
|
||||
}
|
||||
|
||||
function restoreScheduleBlocks() {
|
||||
try {
|
||||
const stored = JSON.parse(sessionStorage.getItem(STORAGE_KEY) || '{}');
|
||||
const keys = Object.keys(stored);
|
||||
if (keys.length === 0) return;
|
||||
|
||||
keys.forEach(key => {
|
||||
const b = stored[key];
|
||||
renderScheduleBlock(b.deptName, b.semester, b.period, b.schedule, b.departmentId, b.semesterType, b.rawPeriod);
|
||||
});
|
||||
} catch (e) {
|
||||
console.warn('Ошибка восстановления из sessionStorage:', e);
|
||||
}
|
||||
}
|
||||
|
||||
// =========================================================
|
||||
// ЛОГИКА ДЛЯ ФУНКЦИОНАЛА "СОЗДАТЬ ЗАПИСЬ (К/Ф)"
|
||||
// Два модальных окна поверх всего контента в одном оверлее
|
||||
// =========================================================
|
||||
const btnCreateSchedule = document.getElementById('btn-create-schedule');
|
||||
const csOverlay = document.getElementById('cs-overlay');
|
||||
|
||||
const modalCreateSchedule = document.getElementById('modal-create-schedule');
|
||||
const modalCreateScheduleClose = document.getElementById('modal-create-schedule-close');
|
||||
const formCreateSchedule = document.getElementById('create-schedule-form');
|
||||
|
||||
const modalViewSchedules = document.getElementById('modal-view-schedules');
|
||||
const btnSaveSchedules = document.getElementById('btn-save-schedules');
|
||||
const preparedSchedulesTbody = document.getElementById('prepared-schedules-tbody');
|
||||
|
||||
const csGroupSelect = document.getElementById('cs-group');
|
||||
const csSubjectSelect = document.getElementById('cs-subject');
|
||||
const csTeacherSelect = document.getElementById('cs-teacher');
|
||||
const csDepartmentIdInput = document.getElementById('cs-department-id');
|
||||
|
||||
let preparedSchedules = [];
|
||||
let csGroups = [];
|
||||
let csSubjects = [];
|
||||
let csTeachers = [];
|
||||
|
||||
const SEMESTER_LABELS = { autumn: 'Осенний', spring: 'Весенний' };
|
||||
const LESSON_TYPE_LABELS = { 1: 'Лекция', 2: 'Практическая работа', 3: 'Лабораторная работа' };
|
||||
|
||||
const localDepartmentId = localStorage.getItem('departmentId');
|
||||
|
||||
// ===== Загрузка справочников =====
|
||||
async function loadDictionariesForSchedule() {
|
||||
try {
|
||||
csGroups = await api.get('/api/groups');
|
||||
csGroupSelect.innerHTML = '<option value="">Выберите группу</option>' +
|
||||
csGroups.map(g => `<option value="${g.id}">${escapeHtml(g.name)}</option>`).join('');
|
||||
|
||||
csSubjects = await api.get('/api/subjects');
|
||||
csSubjectSelect.innerHTML = '<option value="">Выберите дисциплину</option>' +
|
||||
csSubjects.map(s => `<option value="${s.id}">${escapeHtml(s.name)}</option>`).join('');
|
||||
|
||||
// Загрузка преподавателей: сначала по кафедре, при ошибке — все преподаватели
|
||||
csTeachers = [];
|
||||
if (localDepartmentId) {
|
||||
try {
|
||||
csTeachers = await api.get(`/api/users/teachers/${localDepartmentId}`);
|
||||
} catch (e) {
|
||||
console.warn('Не удалось загрузить преподавателей для кафедры, загружаем всех:', e);
|
||||
}
|
||||
}
|
||||
// Фолбэк: загружаем всех преподавателей
|
||||
if (!Array.isArray(csTeachers) || csTeachers.length === 0) {
|
||||
try {
|
||||
csTeachers = await api.get('/api/users/teachers');
|
||||
} catch (e2) {
|
||||
console.error('Ошибка загрузки всех преподавателей:', e2);
|
||||
}
|
||||
}
|
||||
if (Array.isArray(csTeachers) && csTeachers.length > 0) {
|
||||
csTeacherSelect.innerHTML = '<option value="">Выберите преподавателя</option>' +
|
||||
csTeachers.map(t => `<option value="${t.id}">${escapeHtml(t.fullName || t.username)}</option>`).join('');
|
||||
} else {
|
||||
csTeacherSelect.innerHTML = '<option value="">Нет преподавателей</option>';
|
||||
}
|
||||
} catch (e) {
|
||||
console.error('Ошибка загрузки справочников:', e);
|
||||
}
|
||||
}
|
||||
|
||||
loadDictionariesForSchedule();
|
||||
|
||||
// ===== Открытие / Закрытие оверлея =====
|
||||
function openOverlay() {
|
||||
csOverlay.classList.add('open');
|
||||
document.body.style.overflow = 'hidden';
|
||||
}
|
||||
|
||||
function closeOverlay() {
|
||||
csOverlay.classList.remove('open');
|
||||
document.body.style.overflow = '';
|
||||
hideAlert('create-schedule-alert');
|
||||
hideAlert('save-schedules-alert');
|
||||
}
|
||||
|
||||
function updateTableVisibility() {
|
||||
modalViewSchedules.style.display = preparedSchedules.length > 0 ? '' : 'none';
|
||||
}
|
||||
|
||||
// ===== Кнопка «Создать запись» =====
|
||||
btnCreateSchedule.addEventListener('click', () => {
|
||||
if (localDepartmentId) {
|
||||
csDepartmentIdInput.value = localDepartmentId;
|
||||
} else {
|
||||
showAlert('schedule-form-alert', 'Требуется перезайти (отсутствует ID кафедры)', 'error');
|
||||
return;
|
||||
}
|
||||
openOverlay();
|
||||
});
|
||||
|
||||
// ===== Закрытие =====
|
||||
modalCreateScheduleClose.addEventListener('click', closeOverlay);
|
||||
|
||||
csOverlay.addEventListener('click', (e) => {
|
||||
if (e.target === csOverlay || e.target.classList.contains('cs-overlay-scroll')) {
|
||||
closeOverlay();
|
||||
}
|
||||
});
|
||||
|
||||
document.addEventListener('keydown', (e) => {
|
||||
if (e.key === 'Escape' && csOverlay.classList.contains('open')) {
|
||||
closeOverlay();
|
||||
}
|
||||
});
|
||||
|
||||
// ===== Рендер таблицы подготовленных записей =====
|
||||
function renderPreparedSchedules() {
|
||||
if (preparedSchedules.length === 0) {
|
||||
preparedSchedulesTbody.innerHTML = '<tr><td colspan="9" class="loading-row">Нет записей</td></tr>';
|
||||
return;
|
||||
}
|
||||
preparedSchedulesTbody.innerHTML = preparedSchedules.map((s, index) => {
|
||||
const groupName = csGroups.find(g => g.id == s.groupId)?.name || s.groupId;
|
||||
const subjectName = csSubjects.find(sub => sub.id == s.subjectsId)?.name || s.subjectsId;
|
||||
const teacherName = csTeachers.find(t => t.id == s.teacherId)?.fullName
|
||||
|| csTeachers.find(t => t.id == s.teacherId)?.username || s.teacherId;
|
||||
const lessonTypeName = LESSON_TYPE_LABELS[s.lessonTypeId] || 'Неизвестно';
|
||||
const semLabel = SEMESTER_LABELS[s.semesterType] || s.semesterType;
|
||||
const periodDisplay = s.period.replace('-', '/');
|
||||
const divText = s.isDivision ? '✓' : '';
|
||||
const hasError = !!s._errorMsg;
|
||||
const rowStyle = hasError ? ' style="background: rgba(239, 68, 68, 0.08);"' : '';
|
||||
let row = `
|
||||
<tr${rowStyle}>
|
||||
<td>${escapeHtml(periodDisplay)}</td>
|
||||
<td>${escapeHtml(semLabel)}</td>
|
||||
<td>${escapeHtml(String(groupName))}</td>
|
||||
<td>${escapeHtml(String(subjectName))}</td>
|
||||
<td>${escapeHtml(lessonTypeName)}</td>
|
||||
<td>${s.numberOfHours}</td>
|
||||
<td>${divText}</td>
|
||||
<td>${escapeHtml(String(teacherName))}</td>
|
||||
<td><button type="button" class="btn-delete" data-index="${index}">Удалить</button></td>
|
||||
</tr>`;
|
||||
if (hasError) {
|
||||
row += `<tr style="background: rgba(239, 68, 68, 0.05);">
|
||||
<td colspan="9" style="color: var(--error); font-size: 0.85rem; padding: 0.4rem 0.85rem;">
|
||||
⚠ ${escapeHtml(s._errorMsg)}
|
||||
</td>
|
||||
</tr>`;
|
||||
}
|
||||
return row;
|
||||
}).join('');
|
||||
}
|
||||
|
||||
// ===== Удаление строки из таблицы =====
|
||||
preparedSchedulesTbody.addEventListener('click', (e) => {
|
||||
if (e.target.classList.contains('btn-delete')) {
|
||||
const idx = parseInt(e.target.getAttribute('data-index'), 10);
|
||||
preparedSchedules.splice(idx, 1);
|
||||
renderPreparedSchedules();
|
||||
updateTableVisibility();
|
||||
}
|
||||
});
|
||||
|
||||
// ===== Очистка полей формы (частичная) =====
|
||||
function clearFormFields() {
|
||||
document.getElementById('cs-hours').value = '';
|
||||
document.getElementById('cs-division').checked = false;
|
||||
}
|
||||
|
||||
// ===== Добавление записи в список =====
|
||||
formCreateSchedule.addEventListener('submit', (e) => {
|
||||
e.preventDefault();
|
||||
hideAlert('create-schedule-alert');
|
||||
|
||||
const depId = csDepartmentIdInput.value;
|
||||
const period = document.getElementById('cs-period').value;
|
||||
const semesterType = document.querySelector('input[name="csSemesterType"]:checked')?.value;
|
||||
const groupId = csGroupSelect.value;
|
||||
const subjectId = csSubjectSelect.value;
|
||||
const lessonTypeId = document.getElementById('cs-lesson-type').value;
|
||||
const hours = document.getElementById('cs-hours').value;
|
||||
const isDivision = document.getElementById('cs-division').checked;
|
||||
const teacherId = csTeacherSelect.value;
|
||||
|
||||
if (!period || !semesterType || !groupId || !subjectId || !lessonTypeId || !hours || !teacherId) {
|
||||
showAlert('create-schedule-alert', 'Заполните все обязательные поля', 'error');
|
||||
return;
|
||||
}
|
||||
|
||||
const newRecord = {
|
||||
departmentId: Number(depId),
|
||||
groupId: Number(groupId),
|
||||
subjectsId: Number(subjectId),
|
||||
lessonTypeId: Number(lessonTypeId),
|
||||
numberOfHours: Number(hours),
|
||||
isDivision: isDivision,
|
||||
teacherId: Number(teacherId),
|
||||
semesterType: semesterType,
|
||||
period: period
|
||||
};
|
||||
|
||||
// Проверка на дубликат
|
||||
const isDuplicate = preparedSchedules.some(s =>
|
||||
s.period === newRecord.period &&
|
||||
s.semesterType === newRecord.semesterType &&
|
||||
s.groupId === newRecord.groupId &&
|
||||
s.subjectsId === newRecord.subjectsId &&
|
||||
s.lessonTypeId === newRecord.lessonTypeId &&
|
||||
s.numberOfHours === newRecord.numberOfHours &&
|
||||
s.isDivision === newRecord.isDivision &&
|
||||
s.teacherId === newRecord.teacherId
|
||||
);
|
||||
|
||||
if (isDuplicate) {
|
||||
showAlert('create-schedule-alert', 'Такая запись уже есть в списке', 'error');
|
||||
return;
|
||||
}
|
||||
|
||||
preparedSchedules.push(newRecord);
|
||||
|
||||
clearFormFields();
|
||||
|
||||
showAlert('create-schedule-alert', 'Запись добавлена ✓', 'success');
|
||||
setTimeout(() => hideAlert('create-schedule-alert'), 4000); // fix #1: 4 секунды
|
||||
|
||||
renderPreparedSchedules();
|
||||
updateTableVisibility();
|
||||
});
|
||||
|
||||
// ===== Сохранение в БД =====
|
||||
btnSaveSchedules.addEventListener('click', async () => {
|
||||
if (preparedSchedules.length === 0) {
|
||||
showAlert('save-schedules-alert', 'Нет записей для сохранения', 'error');
|
||||
return;
|
||||
}
|
||||
|
||||
btnSaveSchedules.disabled = true;
|
||||
btnSaveSchedules.textContent = 'Сохранение...';
|
||||
hideAlert('save-schedules-alert');
|
||||
|
||||
let errors = 0;
|
||||
let saved = 0;
|
||||
const failedRecords = [];
|
||||
|
||||
for (const record of preparedSchedules) {
|
||||
try {
|
||||
await api.post('/api/department/schedule/create', record);
|
||||
saved++;
|
||||
} catch (err) {
|
||||
console.error('Ошибка сохранения записи:', err);
|
||||
errors++;
|
||||
const isDuplicate = err.status === 409 ||
|
||||
(err.message && err.message.toLowerCase().includes('уже существует'));
|
||||
failedRecords.push({
|
||||
...record,
|
||||
_errorMsg: isDuplicate
|
||||
? 'Такая запись уже есть в базе данных'
|
||||
: (err.message || 'Ошибка сохранения')
|
||||
});
|
||||
}
|
||||
}
|
||||
|
||||
btnSaveSchedules.disabled = false;
|
||||
btnSaveSchedules.textContent = 'Сохранить в БД';
|
||||
|
||||
if (errors === 0) {
|
||||
showAlert('save-schedules-alert', `Все записи (${saved}) успешно сохранены!`, 'success');
|
||||
preparedSchedules = [];
|
||||
renderPreparedSchedules();
|
||||
updateTableVisibility();
|
||||
setTimeout(closeOverlay, 2000);
|
||||
} else {
|
||||
preparedSchedules = failedRecords;
|
||||
renderPreparedSchedules();
|
||||
if (saved > 0) {
|
||||
showAlert('save-schedules-alert',
|
||||
`Сохранено: ${saved}. Ошибок: ${errors}. Проблемные записи отмечены в таблице.`, 'error');
|
||||
} else {
|
||||
showAlert('save-schedules-alert',
|
||||
`Не удалось сохранить. Ошибок: ${errors}. Проблемные записи отмечены в таблице.`, 'error');
|
||||
}
|
||||
}
|
||||
});
|
||||
|
||||
}
|
||||
@@ -7,6 +7,12 @@ export async function initDepartmentsData() {
|
||||
|
||||
const createDeptForm = document.getElementById('create-department-form');
|
||||
const createSpecForm = document.getElementById('create-specialty-form');
|
||||
const editDeptForm = document.getElementById('edit-department-form');
|
||||
const editSpecForm = document.getElementById('edit-specialty-form');
|
||||
const editDeptModal = document.getElementById('modal-edit-department');
|
||||
const editSpecModal = document.getElementById('modal-edit-specialty');
|
||||
const editDeptClose = document.getElementById('modal-edit-department-close');
|
||||
const editSpecClose = document.getElementById('modal-edit-specialty-close');
|
||||
|
||||
let departments = [];
|
||||
let specialties = [];
|
||||
@@ -17,7 +23,7 @@ export async function initDepartmentsData() {
|
||||
departments = await api.get('/api/departments');
|
||||
renderDepartments();
|
||||
} catch (e) {
|
||||
deptTbody.innerHTML = '<tr><td colspan="3" class="loading-row">-</td></tr>';
|
||||
deptTbody.innerHTML = '<tr><td colspan="4" class="loading-row">-</td></tr>';
|
||||
}
|
||||
|
||||
// Load Specialties
|
||||
@@ -25,13 +31,13 @@ export async function initDepartmentsData() {
|
||||
specialties = await api.get('/api/specialties');
|
||||
renderSpecialties();
|
||||
} catch (e) {
|
||||
specTbody.innerHTML = '<tr><td colspan="3" class="loading-row">-</td></tr>';
|
||||
specTbody.innerHTML = '<tr><td colspan="4" class="loading-row">-</td></tr>';
|
||||
}
|
||||
}
|
||||
|
||||
function renderDepartments() {
|
||||
if (!departments || !departments.length) {
|
||||
deptTbody.innerHTML = '<tr><td colspan="3" class="loading-row">-</td></tr>';
|
||||
deptTbody.innerHTML = '<tr><td colspan="4" class="loading-row">-</td></tr>';
|
||||
return;
|
||||
}
|
||||
deptTbody.innerHTML = departments.map(d => `
|
||||
@@ -39,13 +45,17 @@ export async function initDepartmentsData() {
|
||||
<td>${d.id}</td>
|
||||
<td>${escapeHtml(d.departmentName || d.name)}</td>
|
||||
<td>${escapeHtml(String(d.departmentCode || d.code))}</td>
|
||||
<td>
|
||||
<button class="btn-edit-classroom btn-edit-department" data-id="${d.id}">Изменить</button>
|
||||
<button class="btn-delete btn-delete-department" data-id="${d.id}">Удалить</button>
|
||||
</td>
|
||||
</tr>
|
||||
`).join('');
|
||||
}
|
||||
|
||||
function renderSpecialties() {
|
||||
if (!specialties || !specialties.length) {
|
||||
specTbody.innerHTML = '<tr><td colspan="3" class="loading-row">-</td></tr>';
|
||||
specTbody.innerHTML = '<tr><td colspan="4" class="loading-row">-</td></tr>';
|
||||
return;
|
||||
}
|
||||
specTbody.innerHTML = specialties.map(s => `
|
||||
@@ -53,6 +63,10 @@ export async function initDepartmentsData() {
|
||||
<td>${s.id}</td>
|
||||
<td>${escapeHtml(s.specialityName || s.name)}</td>
|
||||
<td>${escapeHtml(s.specialityCode || s.specialtyCode || s.specialty_code)}</td>
|
||||
<td>
|
||||
<button class="btn-edit-classroom btn-edit-specialty" data-id="${s.id}">Изменить</button>
|
||||
<button class="btn-delete btn-delete-specialty" data-id="${s.id}">Удалить</button>
|
||||
</td>
|
||||
</tr>
|
||||
`).join('');
|
||||
}
|
||||
@@ -78,6 +92,34 @@ export async function initDepartmentsData() {
|
||||
}
|
||||
});
|
||||
|
||||
deptTbody.addEventListener('click', async (e) => {
|
||||
const editBtn = e.target.closest('.btn-edit-department');
|
||||
const deleteBtn = e.target.closest('.btn-delete-department');
|
||||
|
||||
if (editBtn) {
|
||||
const department = departments.find(item => item.id == editBtn.dataset.id);
|
||||
if (!department) return;
|
||||
|
||||
document.getElementById('edit-dept-id').value = department.id;
|
||||
document.getElementById('edit-dept-name').value = department.departmentName || department.name || '';
|
||||
document.getElementById('edit-dept-code').value = department.departmentCode || department.code || '';
|
||||
hideAlert('edit-dept-alert');
|
||||
editDeptModal.classList.add('open');
|
||||
return;
|
||||
}
|
||||
|
||||
if (deleteBtn) {
|
||||
if (!confirm('Удалить кафедру?')) return;
|
||||
try {
|
||||
await api.delete('/api/departments/' + deleteBtn.dataset.id);
|
||||
showAlert('create-dept-alert', 'Кафедра удалена', 'success');
|
||||
await loadData();
|
||||
} catch (error) {
|
||||
showAlert('create-dept-alert', error.message || 'Ошибка удаления кафедры', 'error');
|
||||
}
|
||||
}
|
||||
});
|
||||
|
||||
createSpecForm.addEventListener('submit', async (e) => {
|
||||
e.preventDefault();
|
||||
hideAlert('create-spec-alert');
|
||||
@@ -99,5 +141,86 @@ export async function initDepartmentsData() {
|
||||
}
|
||||
});
|
||||
|
||||
loadData();
|
||||
specTbody.addEventListener('click', async (e) => {
|
||||
const editBtn = e.target.closest('.btn-edit-specialty');
|
||||
const deleteBtn = e.target.closest('.btn-delete-specialty');
|
||||
|
||||
if (editBtn) {
|
||||
const speciality = specialties.find(item => item.id == editBtn.dataset.id);
|
||||
if (!speciality) return;
|
||||
|
||||
document.getElementById('edit-spec-id').value = speciality.id;
|
||||
document.getElementById('edit-spec-name').value = speciality.specialityName || speciality.name || '';
|
||||
document.getElementById('edit-spec-code').value = speciality.specialityCode || speciality.specialtyCode || speciality.specialty_code || '';
|
||||
hideAlert('edit-spec-alert');
|
||||
editSpecModal.classList.add('open');
|
||||
return;
|
||||
}
|
||||
|
||||
if (deleteBtn) {
|
||||
if (!confirm('Удалить специальность?')) return;
|
||||
try {
|
||||
await api.delete('/api/specialties/' + deleteBtn.dataset.id);
|
||||
showAlert('create-spec-alert', 'Специальность удалена', 'success');
|
||||
await loadData();
|
||||
} catch (error) {
|
||||
showAlert('create-spec-alert', error.message || 'Ошибка удаления специальности', 'error');
|
||||
}
|
||||
}
|
||||
});
|
||||
|
||||
editDeptForm.addEventListener('submit', async (e) => {
|
||||
e.preventDefault();
|
||||
hideAlert('edit-dept-alert');
|
||||
const id = document.getElementById('edit-dept-id').value;
|
||||
const name = document.getElementById('edit-dept-name').value.trim();
|
||||
const code = document.getElementById('edit-dept-code').value.trim();
|
||||
|
||||
if (!name || !code) {
|
||||
showAlert('edit-dept-alert', 'Заполните все поля', 'error');
|
||||
return;
|
||||
}
|
||||
|
||||
try {
|
||||
await api.put('/api/departments/' + id, { departmentName: name, departmentCode: Number(code) });
|
||||
editDeptModal.classList.remove('open');
|
||||
showAlert('create-dept-alert', `Кафедра "${name}" обновлена`, 'success');
|
||||
await loadData();
|
||||
} catch (error) {
|
||||
showAlert('edit-dept-alert', error.message || 'Ошибка обновления кафедры', 'error');
|
||||
}
|
||||
});
|
||||
|
||||
editSpecForm.addEventListener('submit', async (e) => {
|
||||
e.preventDefault();
|
||||
hideAlert('edit-spec-alert');
|
||||
const id = document.getElementById('edit-spec-id').value;
|
||||
const name = document.getElementById('edit-spec-name').value.trim();
|
||||
const code = document.getElementById('edit-spec-code').value.trim();
|
||||
|
||||
if (!name || !code) {
|
||||
showAlert('edit-spec-alert', 'Заполните все поля', 'error');
|
||||
return;
|
||||
}
|
||||
|
||||
try {
|
||||
await api.put('/api/specialties/' + id, { specialityName: name, specialityCode: code });
|
||||
editSpecModal.classList.remove('open');
|
||||
showAlert('create-spec-alert', `Специальность "${name}" обновлена`, 'success');
|
||||
await loadData();
|
||||
} catch (error) {
|
||||
showAlert('edit-spec-alert', error.message || 'Ошибка обновления специальности', 'error');
|
||||
}
|
||||
});
|
||||
|
||||
editDeptClose.addEventListener('click', () => editDeptModal.classList.remove('open'));
|
||||
editSpecClose.addEventListener('click', () => editSpecModal.classList.remove('open'));
|
||||
editDeptModal.addEventListener('click', (e) => {
|
||||
if (e.target === editDeptModal) editDeptModal.classList.remove('open');
|
||||
});
|
||||
editSpecModal.addEventListener('click', (e) => {
|
||||
if (e.target === editSpecModal) editSpecModal.classList.remove('open');
|
||||
});
|
||||
|
||||
await loadData();
|
||||
}
|
||||
|
||||
@@ -6,15 +6,25 @@ export async function initGroups() {
|
||||
const groupsTbody = document.getElementById('groups-tbody');
|
||||
const createGroupForm = document.getElementById('create-group-form');
|
||||
const newGroupEfSelect = document.getElementById('new-group-ef');
|
||||
const newGroupDepartmentSelect = document.getElementById('new-group-department');
|
||||
const newGroupSpecialitySelect = document.getElementById('new-group-speciality-code');
|
||||
const filterEfSelect = document.getElementById('filter-ef');
|
||||
|
||||
let allGroups = [];
|
||||
let educationForms = [];
|
||||
let departments = [];
|
||||
let specialties = [];
|
||||
|
||||
async function loadInitialData() {
|
||||
try {
|
||||
educationForms = await fetchEducationForms();
|
||||
[educationForms, departments, specialties] = await Promise.all([
|
||||
fetchEducationForms(),
|
||||
api.get('/api/departments'),
|
||||
api.get('/api/specialties')
|
||||
]);
|
||||
populateEfSelects(educationForms);
|
||||
populateDepartmentSelect(departments);
|
||||
populateSpecialitySelect(specialties);
|
||||
await loadGroups();
|
||||
} catch (e) {
|
||||
groupsTbody.innerHTML = '<tr><td colspan="8" class="loading-row">Ошибка загрузки данных</td></tr>';
|
||||
@@ -49,6 +59,7 @@ export async function initGroups() {
|
||||
if (currentVal && forms.find(f => f.id == currentVal)) {
|
||||
newGroupEfSelect.value = currentVal;
|
||||
}
|
||||
syncSelects(newGroupEfSelect);
|
||||
|
||||
// Filter select
|
||||
const currentFilter = filterEfSelect.value;
|
||||
@@ -57,6 +68,59 @@ export async function initGroups() {
|
||||
`<option value="${ef.id}">${escapeHtml(ef.name)}</option>`
|
||||
).join('');
|
||||
if (currentFilter) filterEfSelect.value = currentFilter;
|
||||
syncSelects(filterEfSelect);
|
||||
}
|
||||
|
||||
function populateDepartmentSelect(items) {
|
||||
const currentVal = newGroupDepartmentSelect.value;
|
||||
if (!items || !items.length) {
|
||||
newGroupDepartmentSelect.innerHTML = '<option value="">Нет кафедр</option>';
|
||||
return;
|
||||
}
|
||||
|
||||
newGroupDepartmentSelect.innerHTML = '<option value="">Выберите кафедру</option>' +
|
||||
items.map(department => {
|
||||
const name = department.departmentName || department.name || 'Без названия';
|
||||
const code = department.departmentCode || department.code || department.id;
|
||||
return `<option value="${department.id}">${escapeHtml(name)} (${escapeHtml(String(code))})</option>`;
|
||||
}).join('');
|
||||
if (currentVal && items.find(department => department.id == currentVal)) {
|
||||
newGroupDepartmentSelect.value = currentVal;
|
||||
}
|
||||
syncSelects(newGroupDepartmentSelect);
|
||||
}
|
||||
|
||||
function populateSpecialitySelect(items) {
|
||||
const currentVal = newGroupSpecialitySelect.value;
|
||||
if (!items || !items.length) {
|
||||
newGroupSpecialitySelect.innerHTML = '<option value="">Нет специальностей</option>';
|
||||
return;
|
||||
}
|
||||
|
||||
newGroupSpecialitySelect.innerHTML = '<option value="">Выберите специальность</option>' +
|
||||
items.map(speciality => {
|
||||
const name = speciality.specialityName || speciality.name || 'Без названия';
|
||||
const code = speciality.specialityCode || speciality.specialtyCode || speciality.specialty_code || speciality.id;
|
||||
return `<option value="${speciality.id}">${escapeHtml(code)} — ${escapeHtml(name)}</option>`;
|
||||
}).join('');
|
||||
if (currentVal && items.find(speciality => speciality.id == currentVal)) {
|
||||
newGroupSpecialitySelect.value = currentVal;
|
||||
}
|
||||
syncSelects(newGroupSpecialitySelect);
|
||||
}
|
||||
|
||||
function departmentLabel(departmentId) {
|
||||
const department = departments.find(item => item.id == departmentId);
|
||||
if (!department) return departmentId || '-';
|
||||
return department.departmentName || department.name || departmentId;
|
||||
}
|
||||
|
||||
function specialityLabel(specialityId) {
|
||||
const speciality = specialties.find(item => item.id == specialityId);
|
||||
if (!speciality) return specialityId || '-';
|
||||
const code = speciality.specialityCode || speciality.specialtyCode || speciality.specialty_code || speciality.id;
|
||||
const name = speciality.specialityName || speciality.name || '';
|
||||
return name ? `${code} — ${name}` : code;
|
||||
}
|
||||
|
||||
function renderGroups(groups) {
|
||||
@@ -70,9 +134,9 @@ export async function initGroups() {
|
||||
<td>${escapeHtml(g.name)}</td>
|
||||
<td>${escapeHtml(g.groupSize)}</td>
|
||||
<td><span class="badge badge-ef">${escapeHtml(g.educationFormName)}</span></td>
|
||||
<td>${g.departmentId || '-'}</td>
|
||||
<td>${escapeHtml(departmentLabel(g.departmentId))}</td>
|
||||
<td>${g.course || '-'}</td>
|
||||
<td>${escapeHtml(g.specialityCode || '-')}</td>
|
||||
<td>${escapeHtml(specialityLabel(g.specialityCode))}</td>
|
||||
<td><button class="btn-delete" data-id="${g.id}">Удалить</button></td>
|
||||
</tr>`).join('');
|
||||
}
|
||||
@@ -83,16 +147,16 @@ export async function initGroups() {
|
||||
const name = document.getElementById('new-group-name').value.trim();
|
||||
const groupSize = document.getElementById('new-group-size').value;
|
||||
const educationFormId = newGroupEfSelect.value;
|
||||
const departmentId = document.getElementById('new-group-department').value;
|
||||
const course = document.getElementById('new-group-course').value;
|
||||
const specialityCode = document.getElementById('new-group-speciality-code').value.trim();
|
||||
const departmentId = newGroupDepartmentSelect.value;
|
||||
const yearStartStudy = document.getElementById('new-group-yearStartStudy').value;
|
||||
const specialityCode = newGroupSpecialitySelect.value;
|
||||
|
||||
if (!name) { showAlert('create-group-alert', 'Введите название группы', 'error'); return; }
|
||||
if (!groupSize) { showAlert('create-group-alert', 'Введите размер группы', 'error'); return; }
|
||||
if (!educationFormId) { showAlert('create-group-alert', 'Выберите форму обучения', 'error'); return; }
|
||||
if (!departmentId) { showAlert('create-group-alert', 'Введите ID кафедры', 'error'); return; }
|
||||
if (!course) { showAlert('create-group-alert', 'Введите курс', 'error'); return; }
|
||||
if (!specialityCode) { showAlert('create-group-alert', 'Введите код специальности', 'error'); return; }
|
||||
if (!departmentId) { showAlert('create-group-alert', 'Выберите кафедру', 'error'); return; }
|
||||
if (!yearStartStudy) { showAlert('create-group-alert', 'Введите год начала обучения', 'error'); return; }
|
||||
if (!specialityCode) { showAlert('create-group-alert', 'Выберите специальность', 'error'); return; }
|
||||
|
||||
try {
|
||||
const data = await api.post('/api/groups', {
|
||||
@@ -100,11 +164,12 @@ export async function initGroups() {
|
||||
groupSize: Number(groupSize),
|
||||
educationFormId: Number(educationFormId),
|
||||
departmentId: Number(departmentId),
|
||||
course: Number(course),
|
||||
specialityCode: specialityCode
|
||||
yearStartStudy: Number(yearStartStudy),
|
||||
specialityCode: Number(specialityCode)
|
||||
});
|
||||
showAlert('create-group-alert', `Группа "${escapeHtml(data.name || name)}" создана`, 'success');
|
||||
createGroupForm.reset();
|
||||
syncSelects(newGroupEfSelect, newGroupDepartmentSelect, newGroupSpecialitySelect);
|
||||
loadGroups();
|
||||
} catch (e) {
|
||||
showAlert('create-group-alert', e.message || 'Ошибка создания', 'error');
|
||||
@@ -123,5 +188,11 @@ export async function initGroups() {
|
||||
}
|
||||
});
|
||||
|
||||
loadInitialData();
|
||||
await loadInitialData();
|
||||
|
||||
function syncSelects(...selects) {
|
||||
selects.filter(Boolean).forEach(select => {
|
||||
select.dispatchEvent(new Event('change', { bubbles: true }));
|
||||
});
|
||||
}
|
||||
}
|
||||
|
||||
1482
frontend/admin/js/views/schedule.js
Executable file → Normal file
1482
frontend/admin/js/views/schedule.js
Executable file → Normal file
File diff suppressed because it is too large
Load Diff
431
frontend/admin/js/views/users.js
Executable file → Normal file
431
frontend/admin/js/views/users.js
Executable file → Normal file
@@ -8,173 +8,20 @@ export async function initUsers() {
|
||||
const usersTbody = document.getElementById('users-tbody');
|
||||
const createForm = document.getElementById('create-form');
|
||||
|
||||
// ===== Оверлей (cs-overlay) =====
|
||||
const usersOverlay = document.getElementById('users-overlay');
|
||||
|
||||
// ===== 1-е модальное окно: Добавить занятие =====
|
||||
const modalAddLesson = document.getElementById('modal-add-lesson');
|
||||
const modalAddLessonClose = document.getElementById('modal-add-lesson-close');
|
||||
const addLessonForm = document.getElementById('add-lesson-form');
|
||||
|
||||
const lessonGroupSelect = document.getElementById('lesson-group');
|
||||
const lessonDisciplineSelect = document.getElementById('lesson-discipline');
|
||||
const lessonClassroomSelect = document.getElementById('lesson-classroom');
|
||||
const lessonTypeSelect = document.getElementById('lesson-type');
|
||||
const lessonOnlineFormat = document.getElementById('format-online');
|
||||
const lessonOfflineFormat = document.getElementById('format-offline');
|
||||
const lessonUserId = document.getElementById('lesson-user-id');
|
||||
const lessonDaySelect = document.getElementById('lesson-day');
|
||||
const weekUpper = document.getElementById('week-upper');
|
||||
const weekLower = document.getElementById('week-lower');
|
||||
const lessonTimeSelect = document.getElementById('lesson-time');
|
||||
|
||||
// ===== 2-е модальное окно: Просмотр занятий =====
|
||||
const modalViewLessons = document.getElementById('modal-view-lessons');
|
||||
const lessonsContainer = document.getElementById('lessons-container');
|
||||
const modalTeacherName = document.getElementById('modal-teacher-name');
|
||||
|
||||
let currentLessonsTeacherId = null;
|
||||
let currentLessonsTeacherName = '';
|
||||
// ===== Данные =====
|
||||
let groups = [];
|
||||
let subjects = [];
|
||||
let classrooms = [];
|
||||
|
||||
const weekdaysTimes = [
|
||||
"8:00-9:30",
|
||||
"9:40-11:10",
|
||||
"11:40-13:10",
|
||||
"13:20-14:50",
|
||||
"15:00-16:30",
|
||||
"16:50-18:20",
|
||||
"18:30-19:00"
|
||||
];
|
||||
|
||||
const saturdayTimes = [
|
||||
"8:20-9:50",
|
||||
"10:00-11:30",
|
||||
"11:40-13:10",
|
||||
"13:20-14:50"
|
||||
];
|
||||
|
||||
// =========================================================
|
||||
// Загрузка справочников
|
||||
// =========================================================
|
||||
async function loadGroups() {
|
||||
try {
|
||||
groups = await api.get('/api/groups');
|
||||
renderGroupOptions();
|
||||
} catch (e) {
|
||||
console.error('Ошибка загрузки групп:', e);
|
||||
}
|
||||
}
|
||||
|
||||
async function loadSubjects() {
|
||||
try {
|
||||
subjects = await api.get('/api/subjects');
|
||||
renderSubjectOptions();
|
||||
} catch (e) {
|
||||
console.error('Ошибка загрузки дисциплин:', e);
|
||||
}
|
||||
}
|
||||
|
||||
async function loadClassrooms() {
|
||||
try {
|
||||
classrooms = await api.get('/api/classrooms');
|
||||
renderClassroomsOptions();
|
||||
} catch (e) {
|
||||
console.error('Ошибка загрузки аудиторий:', e);
|
||||
}
|
||||
}
|
||||
|
||||
function renderGroupOptions() {
|
||||
if (!groups || groups.length === 0) {
|
||||
lessonGroupSelect.innerHTML = '<option value="">Нет доступных групп</option>';
|
||||
return;
|
||||
}
|
||||
|
||||
lessonGroupSelect.innerHTML =
|
||||
'<option value="">Выберите группу</option>' +
|
||||
groups.map(g => {
|
||||
let optionText = escapeHtml(g.name);
|
||||
if (g.groupSize) optionText += ` (численность: ${g.groupSize} чел.)`;
|
||||
return `<option value="${g.id}">${optionText}</option>`;
|
||||
}).join('');
|
||||
}
|
||||
|
||||
function renderSubjectOptions() {
|
||||
lessonDisciplineSelect.innerHTML =
|
||||
'<option value="">Выберите дисциплину</option>' +
|
||||
subjects.map(s => `<option value="${s.id}">${escapeHtml(s.name)}</option>`).join('');
|
||||
}
|
||||
|
||||
function renderClassroomsOptions() {
|
||||
if (!classrooms || classrooms.length === 0) {
|
||||
lessonClassroomSelect.innerHTML = '<option value="">Нет доступных аудиторий</option>';
|
||||
return;
|
||||
}
|
||||
|
||||
const selectedGroupId = lessonGroupSelect.value;
|
||||
const selectedGroup = groups?.find(g => g.id == selectedGroupId);
|
||||
const groupSize = selectedGroup?.groupSize || 0;
|
||||
|
||||
lessonClassroomSelect.innerHTML =
|
||||
'<option value="">Выберите аудиторию</option>' +
|
||||
classrooms.map(c => {
|
||||
let optionText = escapeHtml(c.name);
|
||||
|
||||
if (c.capacity) optionText += ` (вместимость: ${c.capacity} чел.)`;
|
||||
|
||||
if (c.isAvailable === false) {
|
||||
optionText += ` ❌ Занята`;
|
||||
} else if (selectedGroupId && groupSize > 0 && c.capacity && groupSize > c.capacity) {
|
||||
optionText += ` ⚠️ Недостаточно места`;
|
||||
}
|
||||
|
||||
return `<option value="${c.id}">${optionText}</option>`;
|
||||
}).join('');
|
||||
}
|
||||
|
||||
lessonGroupSelect.addEventListener('change', function () {
|
||||
renderClassroomsOptions();
|
||||
requestAnimationFrame(() => syncAddLessonHeight());
|
||||
});
|
||||
|
||||
function updateTimeOptions(dayValue) {
|
||||
let times = [];
|
||||
if (dayValue === "Суббота") {
|
||||
times = saturdayTimes;
|
||||
} else if (dayValue && dayValue !== '') {
|
||||
times = weekdaysTimes;
|
||||
} else {
|
||||
lessonTimeSelect.innerHTML = '<option value="">Сначала выберите день</option>';
|
||||
lessonTimeSelect.disabled = true;
|
||||
return;
|
||||
}
|
||||
|
||||
lessonTimeSelect.innerHTML =
|
||||
'<option value="">Выберите время</option>' +
|
||||
times.map(t => `<option value="${t}">${t}</option>`).join('');
|
||||
lessonTimeSelect.disabled = false;
|
||||
}
|
||||
|
||||
// =========================================================
|
||||
// Пользователи
|
||||
// =========================================================
|
||||
async function loadUsers() {
|
||||
try {
|
||||
const users = await api.get('/api/users');
|
||||
renderUsers(users);
|
||||
} catch (e) {
|
||||
usersTbody.innerHTML =
|
||||
'<tr><td colspan="8" class="loading-row">Ошибка загрузки: ' +
|
||||
'<tr><td colspan="7" class="loading-row">Ошибка загрузки: ' +
|
||||
escapeHtml(e.message) + '</td></tr>';
|
||||
}
|
||||
}
|
||||
|
||||
function renderUsers(users) {
|
||||
if (!users || !users.length) {
|
||||
usersTbody.innerHTML = '<tr><td colspan="8" class="loading-row">Нет пользователей</td></tr>';
|
||||
usersTbody.innerHTML = '<tr><td colspan="7" class="loading-row">Нет пользователей</td></tr>';
|
||||
return;
|
||||
}
|
||||
|
||||
@@ -184,148 +31,15 @@ export async function initUsers() {
|
||||
<td>${escapeHtml(u.username)}</td>
|
||||
<td>${escapeHtml(u.fullName || '-')}</td>
|
||||
<td>${escapeHtml(u.jobTitle || '-')}</td>
|
||||
<td>${u.departmentName || '-'}</td>
|
||||
<td>${escapeHtml(u.departmentName || '-')}</td>
|
||||
<td><span class="badge ${ROLE_BADGE[u.role] || ''}">${ROLE_LABELS[u.role] || escapeHtml(u.role)}</span></td>
|
||||
<td>
|
||||
<button class="btn-delete" data-id="${u.id}">Удалить</button>
|
||||
</td>
|
||||
<td>
|
||||
<button class="btn-add-lesson" data-id="${u.id}" data-name="${escapeHtml(u.username)}">Добавить занятие</button>
|
||||
</td>
|
||||
</tr>
|
||||
`).join('');
|
||||
}
|
||||
|
||||
// ===== Открытие / закрытие оверлея =====
|
||||
function openOverlay() {
|
||||
if (usersOverlay) usersOverlay.classList.add('open');
|
||||
}
|
||||
function closeOverlay() {
|
||||
if (usersOverlay) usersOverlay.classList.remove('open');
|
||||
if (modalViewLessons) modalViewLessons.style.display = 'none';
|
||||
resetLessonForm();
|
||||
}
|
||||
|
||||
// =========================================================
|
||||
// 1-я модалка: добавление занятия
|
||||
// =========================================================
|
||||
function resetLessonForm() {
|
||||
addLessonForm.reset();
|
||||
lessonUserId.value = '';
|
||||
|
||||
if (weekUpper) weekUpper.checked = false;
|
||||
if (weekLower) weekLower.checked = false;
|
||||
|
||||
if (lessonOfflineFormat) lessonOfflineFormat.checked = true;
|
||||
if (lessonOnlineFormat) lessonOnlineFormat.checked = false;
|
||||
|
||||
lessonTimeSelect.innerHTML = '<option value="">Сначала выберите день</option>';
|
||||
lessonTimeSelect.disabled = true;
|
||||
|
||||
hideAlert('add-lesson-alert');
|
||||
}
|
||||
|
||||
function openAddLessonModal(userId) {
|
||||
lessonUserId.value = userId;
|
||||
|
||||
lessonDaySelect.value = '';
|
||||
updateTimeOptions('');
|
||||
|
||||
openOverlay();
|
||||
}
|
||||
|
||||
addLessonForm.addEventListener('submit', async (e) => {
|
||||
e.preventDefault();
|
||||
hideAlert('add-lesson-alert');
|
||||
|
||||
const userId = lessonUserId.value;
|
||||
const groupId = lessonGroupSelect.value;
|
||||
const subjectId = lessonDisciplineSelect.value;
|
||||
const classroomId = lessonClassroomSelect.value;
|
||||
const lessonType = lessonTypeSelect.value;
|
||||
const dayOfWeek = lessonDaySelect.value;
|
||||
const timeSlot = lessonTimeSelect.value;
|
||||
|
||||
const lessonFormat = document.querySelector('input[name="lessonFormat"]:checked')?.value;
|
||||
|
||||
if (!groupId) { showAlert('add-lesson-alert', 'Выберите группу', 'error'); return; }
|
||||
if (!subjectId) { showAlert('add-lesson-alert', 'Выберите дисциплину', 'error'); return; }
|
||||
if (!classroomId) { showAlert('add-lesson-alert', 'Выберите аудиторию', 'error'); return; }
|
||||
if (!dayOfWeek) { showAlert('add-lesson-alert', 'Выберите день недели', 'error'); return; }
|
||||
if (!timeSlot) { showAlert('add-lesson-alert', 'Выберите время', 'error'); return; }
|
||||
|
||||
const weekUpperChecked = weekUpper?.checked || false;
|
||||
const weekLowerChecked = weekLower?.checked || false;
|
||||
|
||||
if (!weekUpperChecked && !weekLowerChecked) {
|
||||
showAlert('add-lesson-alert', 'Не выбран тип недели', 'error');
|
||||
return;
|
||||
}
|
||||
|
||||
let weekType = null;
|
||||
if (weekUpperChecked && weekLowerChecked) weekType = 'Обе';
|
||||
else if (weekUpperChecked) weekType = 'Верхняя';
|
||||
else if (weekLowerChecked) weekType = 'Нижняя';
|
||||
|
||||
try {
|
||||
await api.post('/api/users/lessons/create', {
|
||||
teacherId: parseInt(userId),
|
||||
groupId: parseInt(groupId),
|
||||
subjectId: parseInt(subjectId),
|
||||
classroomId: parseInt(classroomId),
|
||||
typeLesson: lessonType,
|
||||
lessonFormat: lessonFormat,
|
||||
day: dayOfWeek,
|
||||
week: weekType,
|
||||
time: timeSlot
|
||||
});
|
||||
|
||||
if (modalViewLessons?.style.display !== 'none' && currentLessonsTeacherId == userId) {
|
||||
await loadTeacherLessons(currentLessonsTeacherId, currentLessonsTeacherName);
|
||||
}
|
||||
|
||||
showAlert('add-lesson-alert', 'Занятие добавлено ✓', 'success');
|
||||
|
||||
lessonGroupSelect.selectedIndex = 0;
|
||||
lessonDisciplineSelect.selectedIndex = 0;
|
||||
lessonClassroomSelect.selectedIndex = 0;
|
||||
lessonTypeSelect.selectedIndex = 0;
|
||||
lessonDaySelect.selectedIndex = 0;
|
||||
lessonTimeSelect.innerHTML = '<option value="">Сначала выберите день</option>';
|
||||
lessonTimeSelect.disabled = true;
|
||||
|
||||
weekUpper.checked = false;
|
||||
weekLower.checked = false;
|
||||
document.querySelector('input[name="lessonFormat"][value="Очно"]').checked = true;
|
||||
|
||||
setTimeout(() => {
|
||||
hideAlert('add-lesson-alert');
|
||||
}, 3000);
|
||||
} catch (err) {
|
||||
showAlert('add-lesson-alert', err.message || 'Ошибка добавления занятия', 'error');
|
||||
}
|
||||
});
|
||||
|
||||
lessonDaySelect.addEventListener('change', function () {
|
||||
updateTimeOptions(this.value);
|
||||
});
|
||||
|
||||
if (modalAddLessonClose) {
|
||||
modalAddLessonClose.addEventListener('click', () => closeOverlay());
|
||||
}
|
||||
|
||||
// Клик по оверлею (мимо модалок) закрывает всё
|
||||
if (usersOverlay) {
|
||||
usersOverlay.querySelector('.cs-overlay-scroll')?.addEventListener('click', (e) => {
|
||||
if (e.target.classList.contains('cs-overlay-scroll')) {
|
||||
closeOverlay();
|
||||
}
|
||||
});
|
||||
}
|
||||
|
||||
// =========================================================
|
||||
// Создание пользователя
|
||||
// =========================================================
|
||||
createForm.addEventListener('submit', async (e) => {
|
||||
e.preventDefault();
|
||||
hideAlert('create-alert');
|
||||
@@ -343,9 +57,9 @@ export async function initUsers() {
|
||||
}
|
||||
|
||||
try {
|
||||
const data = await api.post('/api/users', {
|
||||
username,
|
||||
password,
|
||||
const data = await api.post('/api/users', {
|
||||
username,
|
||||
password,
|
||||
role,
|
||||
fullName,
|
||||
jobTitle,
|
||||
@@ -359,133 +73,18 @@ export async function initUsers() {
|
||||
}
|
||||
});
|
||||
|
||||
// =========================================================
|
||||
// Инициализация
|
||||
// =========================================================
|
||||
await Promise.all([loadUsers(), loadGroups(), loadSubjects(), loadClassrooms()]);
|
||||
|
||||
// =========================================================
|
||||
// 2-я модалка: просмотр занятий
|
||||
// =========================================================
|
||||
async function loadTeacherLessons(teacherId, teacherName) {
|
||||
try {
|
||||
lessonsContainer.innerHTML = '<div class="loading-lessons">Загрузка занятий...</div>';
|
||||
|
||||
modalTeacherName.textContent = teacherName
|
||||
? `Занятия преподавателя: ${teacherName}`
|
||||
: 'Занятия преподавателя';
|
||||
|
||||
const lessons = await api.get(`/api/users/lessons/${teacherId}`);
|
||||
|
||||
if (!lessons || lessons.length === 0) {
|
||||
lessonsContainer.innerHTML = '<div class="no-lessons">У преподавателя пока нет занятий</div>';
|
||||
return;
|
||||
}
|
||||
|
||||
const daysOrder = ['Понедельник', 'Вторник', 'Среда', 'Четверг', 'Пятница', 'Суббота'];
|
||||
const lessonsByDay = {};
|
||||
|
||||
lessons.forEach(lesson => {
|
||||
if (!lessonsByDay[lesson.day]) lessonsByDay[lesson.day] = [];
|
||||
lessonsByDay[lesson.day].push(lesson);
|
||||
});
|
||||
|
||||
Object.keys(lessonsByDay).forEach(day => {
|
||||
lessonsByDay[day].sort((a, b) => a.time.localeCompare(b.time));
|
||||
});
|
||||
|
||||
let html = '';
|
||||
|
||||
daysOrder.forEach(day => {
|
||||
if (!lessonsByDay[day]) return;
|
||||
|
||||
html += `<div class="lesson-day-divider">${day}</div>`;
|
||||
|
||||
lessonsByDay[day].forEach(lesson => {
|
||||
html += `
|
||||
<div class="lesson-card">
|
||||
<div class="lesson-card-header">
|
||||
<span class="lesson-group">${escapeHtml(lesson.groupName)}</span>
|
||||
<span class="lesson-time">${escapeHtml(lesson.time)}</span>
|
||||
</div>
|
||||
<div class="lesson-card-body">
|
||||
<div class="lesson-subject">${escapeHtml(lesson.subjectName)}</div>
|
||||
<div class="lesson-details">
|
||||
<span class="lesson-detail-item">${escapeHtml(lesson.typeLesson)}</span>
|
||||
<span class="lesson-detail-item">${escapeHtml(lesson.lessonFormat)}</span>
|
||||
<span class="lesson-detail-item">${escapeHtml(lesson.week)}</span>
|
||||
<span class="lesson-detail-item">${escapeHtml(lesson.classroomName)}</span>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
`;
|
||||
});
|
||||
});
|
||||
|
||||
lessonsContainer.innerHTML = html;
|
||||
} catch (e) {
|
||||
lessonsContainer.innerHTML = `<div class="no-lessons">Ошибка загрузки: ${escapeHtml(e.message)}</div>`;
|
||||
console.error('Ошибка загрузки занятий:', e);
|
||||
}
|
||||
}
|
||||
|
||||
function openViewLessonsModal(teacherId, teacherName) {
|
||||
currentLessonsTeacherId = teacherId;
|
||||
currentLessonsTeacherName = teacherName || '';
|
||||
|
||||
if (modalViewLessons) modalViewLessons.style.display = '';
|
||||
loadTeacherLessons(teacherId, teacherName);
|
||||
}
|
||||
|
||||
function closeViewLessonsModal() {
|
||||
if (modalViewLessons) modalViewLessons.style.display = 'none';
|
||||
currentLessonsTeacherId = null;
|
||||
currentLessonsTeacherName = '';
|
||||
}
|
||||
|
||||
document.addEventListener('keydown', (e) => {
|
||||
if (e.key !== 'Escape') return;
|
||||
if (usersOverlay?.classList.contains('open')) {
|
||||
closeOverlay();
|
||||
}
|
||||
});
|
||||
|
||||
// =========================================================
|
||||
// ЕДИНЫЙ обработчик кликов по таблице (ВАЖНО: без дубля)
|
||||
// =========================================================
|
||||
usersTbody.addEventListener('click', async (e) => {
|
||||
const deleteBtn = e.target.closest('.btn-delete');
|
||||
if (deleteBtn) {
|
||||
if (!confirm('Удалить пользователя?')) return;
|
||||
try {
|
||||
await api.delete('/api/users/' + deleteBtn.dataset.id);
|
||||
loadUsers();
|
||||
} catch (err) {
|
||||
alert(err.message || 'Ошибка удаления');
|
||||
}
|
||||
return;
|
||||
}
|
||||
if (!deleteBtn) return;
|
||||
|
||||
const addLessonBtn = e.target.closest('.btn-add-lesson');
|
||||
if (addLessonBtn) {
|
||||
e.preventDefault();
|
||||
|
||||
const teacherId = addLessonBtn.dataset.id;
|
||||
const teacherName = addLessonBtn.dataset.name;
|
||||
|
||||
openAddLessonModal(teacherId);
|
||||
openViewLessonsModal(teacherId, teacherName);
|
||||
|
||||
return;
|
||||
}
|
||||
|
||||
const viewLessonsBtn = e.target.closest('.btn-view-lessons');
|
||||
if (viewLessonsBtn) {
|
||||
e.preventDefault();
|
||||
const teacherId = viewLessonsBtn.dataset.id;
|
||||
const teacherName = viewLessonsBtn.dataset.name;
|
||||
openViewLessonsModal(teacherId, teacherName);
|
||||
return;
|
||||
if (!confirm('Удалить пользователя?')) return;
|
||||
try {
|
||||
await api.delete('/api/users/' + deleteBtn.dataset.id);
|
||||
loadUsers();
|
||||
} catch (err) {
|
||||
alert(err.message || 'Ошибка удаления');
|
||||
}
|
||||
});
|
||||
|
||||
await loadUsers();
|
||||
}
|
||||
|
||||
@@ -1,180 +0,0 @@
|
||||
<div class="card create-card">
|
||||
<div style="display: flex; justify-content: space-between; align-items: center; margin-bottom: 1rem;">
|
||||
<h2>Запрос расписания кафедры</h2>
|
||||
<button id="btn-create-schedule" class="btn-primary" style="margin-top: 0;">Создать запись</button>
|
||||
</div>
|
||||
<form id="department-schedule-form">
|
||||
<div class="form-row">
|
||||
<div class="form-group">
|
||||
<label for="filter-department">Кафедра</label>
|
||||
<select id="filter-department" required>
|
||||
<option value="">Загрузка...</option>
|
||||
</select>
|
||||
</div>
|
||||
|
||||
<div class="form-group">
|
||||
<label>Семестр</label>
|
||||
<div style="display: flex; gap: 0.2rem;">
|
||||
<label class="btn-checkbox">
|
||||
<input type="radio" name="semesterType" value="autumn" id="sem-autumn" required>
|
||||
<span class="checkbox-btn">Осенний</span>
|
||||
</label>
|
||||
<label class="btn-checkbox">
|
||||
<input type="radio" name="semesterType" value="spring" id="sem-spring" required>
|
||||
<span class="checkbox-btn">Весенний</span>
|
||||
</label>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div class="form-group">
|
||||
<label for="filter-period">Учебный год</label>
|
||||
<select id="filter-period" required>
|
||||
<option value="">Выберите...</option>
|
||||
<option value="2026-2027">2026/2027</option>
|
||||
<option value="2025-2026">2025/2026</option>
|
||||
<option value="2024-2025">2024/2025</option>
|
||||
<option value="2023-2024">2023/2024</option>
|
||||
<option value="2022-2023">2022/2023</option>
|
||||
</select>
|
||||
</div>
|
||||
|
||||
<button type="submit" class="btn-primary" style="align-self: flex-end;">Запросить</button>
|
||||
</div>
|
||||
<div class="form-alert" id="schedule-form-alert" role="alert"></div>
|
||||
</form>
|
||||
</div>
|
||||
|
||||
<!-- ===== Общий оверлей для обеих модалок ===== -->
|
||||
<div class="cs-overlay" id="cs-overlay">
|
||||
<div class="cs-overlay-scroll">
|
||||
|
||||
<!-- Модалка 1: Форма создания записи -->
|
||||
<div class="cs-modal cs-modal-form card" id="modal-create-schedule">
|
||||
<div class="cs-modal-header">
|
||||
<h2>Создать запись (к/ф)</h2>
|
||||
<button class="btn-close-panel" id="modal-create-schedule-close" title="Закрыть (Esc)">×</button>
|
||||
</div>
|
||||
<form id="create-schedule-form">
|
||||
<input type="hidden" id="cs-department-id" value="">
|
||||
<div class="form-row"
|
||||
style="align-items: flex-start; gap: 1rem; flex-wrap: wrap; width: 100%; justify-content: space-between;">
|
||||
|
||||
<div class="form-group" style="flex: 1 1 180px;">
|
||||
<label for="cs-period">Учебный год</label>
|
||||
<select id="cs-period" required>
|
||||
<option value="">Выберите...</option>
|
||||
<option value="2026-2027">2026/2027</option>
|
||||
<option value="2025-2026">2025/2026</option>
|
||||
<option value="2024-2025">2024/2025</option>
|
||||
</select>
|
||||
</div>
|
||||
|
||||
<div class="form-group" style="flex: 1 1 180px;">
|
||||
<label>Семестр</label>
|
||||
<div style="display: flex; gap: 0.2rem;">
|
||||
<label class="btn-checkbox">
|
||||
<input type="radio" name="csSemesterType" value="autumn" required>
|
||||
<span class="checkbox-btn">Осенний</span>
|
||||
</label>
|
||||
<label class="btn-checkbox">
|
||||
<input type="radio" name="csSemesterType" value="spring" required>
|
||||
<span class="checkbox-btn">Весенний</span>
|
||||
</label>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div class="form-group" style="flex: 1 1 180px;">
|
||||
<label for="cs-group">Группа</label>
|
||||
<select id="cs-group" required>
|
||||
<option value="">Загрузка...</option>
|
||||
</select>
|
||||
</div>
|
||||
|
||||
<div class="form-group" style="flex: 1 1 180px;">
|
||||
<label for="cs-subject">Дисциплина</label>
|
||||
<select id="cs-subject" required>
|
||||
<option value="">Загрузка...</option>
|
||||
</select>
|
||||
</div>
|
||||
|
||||
<div class="form-group" style="flex: 1 1 180px;">
|
||||
<label for="cs-lesson-type">Вид занятий</label>
|
||||
<select id="cs-lesson-type" required>
|
||||
<option value="">Выберите тип</option>
|
||||
<option value="1">Лекция</option>
|
||||
<option value="2">Практическая работа</option>
|
||||
<option value="3">Лабораторная работа</option>
|
||||
</select>
|
||||
</div>
|
||||
|
||||
<div class="form-group" style="flex: 1 1 150px;">
|
||||
<label for="cs-hours">Часов (семестр)</label>
|
||||
<input type="number" id="cs-hours" required min="1" max="500" placeholder="Например: 36">
|
||||
</div>
|
||||
|
||||
<div class="form-group" style="flex: 1 1 180px;">
|
||||
<label>Деление на подгруппы</label>
|
||||
<div style="display: flex; gap: 0.5rem; align-items: center; height: 42px;">
|
||||
<label class="btn-checkbox" style="width:100%;">
|
||||
<input type="checkbox" id="cs-division" value="true">
|
||||
<span class="checkbox-btn" style="width:100%; text-align:center;">Есть деление</span>
|
||||
</label>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div class="form-group" style="flex: 1 1 250px;">
|
||||
<label for="cs-teacher">Преподаватель</label>
|
||||
<select id="cs-teacher" required>
|
||||
<option value="">Выберите преподавателя</option>
|
||||
</select>
|
||||
</div>
|
||||
|
||||
<div class="form-group" style="flex: 0 0 auto; display:flex; align-items: flex-end;">
|
||||
<button type="submit" class="btn-primary" style="white-space: nowrap;">Добавить в список</button>
|
||||
</div>
|
||||
</div>
|
||||
<div class="form-alert" id="create-schedule-alert" role="alert" style="margin-top: 1rem;"></div>
|
||||
</form>
|
||||
</div>
|
||||
|
||||
<!-- Модалка 2: Таблица подготовленных записей -->
|
||||
<div class="cs-modal cs-modal-table card" id="modal-view-schedules" style="display: none;">
|
||||
<div class="cs-modal-header">
|
||||
<h2>Подготовленные записи</h2>
|
||||
<div style="display:flex; gap: 0.75rem; align-items:center;">
|
||||
<button id="btn-save-schedules" class="btn-primary">Сохранить в БД</button>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div class="form-alert" id="save-schedules-alert" role="alert" style="margin-bottom: 1rem;"></div>
|
||||
|
||||
<div class="table-wrap">
|
||||
<table id="prepared-schedules-table">
|
||||
<thead>
|
||||
<tr>
|
||||
<th>Уч. год</th>
|
||||
<th>Семестр</th>
|
||||
<th>Группа</th>
|
||||
<th>Дисциплина</th>
|
||||
<th>Вид</th>
|
||||
<th>Часы</th>
|
||||
<th>Деление</th>
|
||||
<th>Преподаватель</th>
|
||||
<th>Действие</th>
|
||||
</tr>
|
||||
</thead>
|
||||
<tbody id="prepared-schedules-tbody">
|
||||
<tr>
|
||||
<td colspan="9" class="loading-row">Нет записей</td>
|
||||
</tr>
|
||||
</tbody>
|
||||
</table>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div class="table-wrap" id="schedule-blocks-container">
|
||||
<!-- Сгенерированные блоки таблиц будут появляться здесь -->
|
||||
</div>
|
||||
@@ -28,11 +28,12 @@
|
||||
<th>ID</th>
|
||||
<th>Название</th>
|
||||
<th>Код</th>
|
||||
<th>Действия</th>
|
||||
</tr>
|
||||
</thead>
|
||||
<tbody id="departments-tbody">
|
||||
<tr>
|
||||
<td colspan="3" class="loading-row">Загрузка...</td>
|
||||
<td colspan="4" class="loading-row">Загрузка...</td>
|
||||
</tr>
|
||||
</tbody>
|
||||
</table>
|
||||
@@ -68,13 +69,58 @@
|
||||
<th>ID</th>
|
||||
<th>Название</th>
|
||||
<th>Код специальности</th>
|
||||
<th>Действия</th>
|
||||
</tr>
|
||||
</thead>
|
||||
<tbody id="specialties-tbody">
|
||||
<tr>
|
||||
<td colspan="3" class="loading-row">Загрузка...</td>
|
||||
<td colspan="4" class="loading-row">Загрузка...</td>
|
||||
</tr>
|
||||
</tbody>
|
||||
</table>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div class="modal-overlay" id="modal-edit-department">
|
||||
<div class="modal-content card">
|
||||
<h2>Редактирование кафедры</h2>
|
||||
<button class="modal-close" id="modal-edit-department-close">×</button>
|
||||
<form id="edit-department-form">
|
||||
<input type="hidden" id="edit-dept-id">
|
||||
<div class="form-row">
|
||||
<div class="form-group">
|
||||
<label for="edit-dept-name">Название кафедры</label>
|
||||
<input type="text" id="edit-dept-name" required>
|
||||
</div>
|
||||
<div class="form-group">
|
||||
<label for="edit-dept-code">Код кафедры</label>
|
||||
<input type="number" id="edit-dept-code" required>
|
||||
</div>
|
||||
<button type="submit" class="btn-primary">Сохранить</button>
|
||||
</div>
|
||||
<div class="form-alert" id="edit-dept-alert" role="alert"></div>
|
||||
</form>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div class="modal-overlay" id="modal-edit-specialty">
|
||||
<div class="modal-content card">
|
||||
<h2>Редактирование специальности</h2>
|
||||
<button class="modal-close" id="modal-edit-specialty-close">×</button>
|
||||
<form id="edit-specialty-form">
|
||||
<input type="hidden" id="edit-spec-id">
|
||||
<div class="form-row">
|
||||
<div class="form-group">
|
||||
<label for="edit-spec-name">Название специальности</label>
|
||||
<input type="text" id="edit-spec-name" required>
|
||||
</div>
|
||||
<div class="form-group">
|
||||
<label for="edit-spec-code">Код специальности</label>
|
||||
<input type="text" id="edit-spec-code" required>
|
||||
</div>
|
||||
<button type="submit" class="btn-primary">Сохранить</button>
|
||||
</div>
|
||||
<div class="form-alert" id="edit-spec-alert" role="alert"></div>
|
||||
</form>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
@@ -9,7 +9,7 @@
|
||||
</div>
|
||||
<div class="form-group">
|
||||
<label for="new-group-size">Численность группы</label>
|
||||
<input type="text" id="new-group-size" placeholder="20" required>
|
||||
<input type="number" id="new-group-size" min="1" placeholder="20" required>
|
||||
</div>
|
||||
<div class="form-group">
|
||||
<label for="new-group-ef">Форма обучения</label>
|
||||
@@ -18,16 +18,20 @@
|
||||
</select>
|
||||
</div>
|
||||
<div class="form-group">
|
||||
<label for="new-group-department">ID кафедры</label>
|
||||
<input type="number" id="new-group-department" placeholder="ID" required>
|
||||
<label for="new-group-department">Кафедра</label>
|
||||
<select id="new-group-department">
|
||||
<option value="">Загрузка...</option>
|
||||
</select>
|
||||
</div>
|
||||
<div class="form-group">
|
||||
<label for="new-group-yearStartStudy">Год начала обучения</label>
|
||||
<input type="number" id="new-group-yearStartStudy" required pattern="^20\d{2}$" maxlength="3" placeholder="2026">
|
||||
<input type="number" id="new-group-yearStartStudy" min="2000" max="2100" placeholder="2026" required>
|
||||
</div>
|
||||
<div class="form-group">
|
||||
<label for="new-group-speciality-code">Код специальности</label>
|
||||
<input type="text" id="new-group-speciality-code" placeholder="09.03.01" required>
|
||||
<label for="new-group-speciality-code">Специальность</label>
|
||||
<select id="new-group-speciality-code">
|
||||
<option value="">Загрузка...</option>
|
||||
</select>
|
||||
</div>
|
||||
<button type="submit" class="btn-primary">Создать</button>
|
||||
</div>
|
||||
@@ -53,9 +57,9 @@
|
||||
<th>Название</th>
|
||||
<th>Численность (чел.)</th>
|
||||
<th>Форма обучения</th>
|
||||
<th>ID кафедры</th>
|
||||
<th>Кафедра</th>
|
||||
<th>Курс</th>
|
||||
<th>Код специальности</th>
|
||||
<th>Специальность</th>
|
||||
<th>Действия</th>
|
||||
</tr>
|
||||
</thead>
|
||||
@@ -66,4 +70,4 @@
|
||||
</tbody>
|
||||
</table>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
424
frontend/admin/views/schedule.html
Executable file → Normal file
424
frontend/admin/views/schedule.html
Executable file → Normal file
@@ -1,179 +1,281 @@
|
||||
<div class="card create-card">
|
||||
<div class="card-header-row">
|
||||
<h2 id="schedule-rule-form-title">Новое правило расписания</h2>
|
||||
<button type="button" class="btn-edit-classroom" id="schedule-rule-reset">Очистить форму</button>
|
||||
</div>
|
||||
<form id="schedule-rule-form" novalidate>
|
||||
<input type="hidden" id="schedule-rule-id">
|
||||
<div class="form-row">
|
||||
<div class="form-group">
|
||||
<label for="schedule-rule-subject">Дисциплина</label>
|
||||
<select id="schedule-rule-subject" required>
|
||||
<option value="">Загрузка...</option>
|
||||
</select>
|
||||
</div>
|
||||
<div class="form-group">
|
||||
<label for="schedule-rule-semester">Семестр</label>
|
||||
<select id="schedule-rule-semester" required>
|
||||
<option value="">Загрузка...</option>
|
||||
</select>
|
||||
</div>
|
||||
<div class="form-group">
|
||||
<label for="schedule-rule-active-from">Дата начала</label>
|
||||
<input type="date" id="schedule-rule-active-from" required>
|
||||
</div>
|
||||
<div class="form-group">
|
||||
<label for="schedule-rule-hours">Академические часы</label>
|
||||
<input type="number" id="schedule-rule-hours" min="1" step="1" placeholder="72" required>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div class="schedule-groups-panel">
|
||||
<label class="schedule-section-label">Группы</label>
|
||||
<div id="schedule-rule-groups" class="schedule-checkbox-grid"></div>
|
||||
</div>
|
||||
|
||||
<div class="schedule-slots-panel">
|
||||
<div class="card-header-row">
|
||||
<h2>Слоты правила</h2>
|
||||
<button type="button" class="btn-edit-classroom" id="schedule-slot-add">Добавить слот</button>
|
||||
</div>
|
||||
<div id="schedule-rule-slots" class="schedule-slots-list"></div>
|
||||
</div>
|
||||
|
||||
<div class="form-row">
|
||||
<button type="submit" class="btn-primary">Сохранить правило</button>
|
||||
</div>
|
||||
<div class="form-alert" id="schedule-rule-alert" role="alert"></div>
|
||||
</form>
|
||||
</div>
|
||||
|
||||
<div class="card">
|
||||
<div class="card-header-row">
|
||||
<h2>Расписание занятий</h2>
|
||||
<button class="btn-primary" id="sch-btn-add-lesson">Добавить занятие</button>
|
||||
<h2>Правила динамического расписания</h2>
|
||||
<button class="btn-primary" id="schedule-refresh">Обновить</button>
|
||||
</div>
|
||||
<div class="table-wrap">
|
||||
<table id="schedule-table">
|
||||
<thead>
|
||||
<tr>
|
||||
<th class="sortable" data-sort-key="id">ID <span class="sort-arrow"></span></th>
|
||||
<th class="filterable" data-filter-key="teacher">
|
||||
Преподаватель <span class="filter-icon">▾</span>
|
||||
</th>
|
||||
<th class="filterable" data-filter-key="group">
|
||||
Группа <span class="filter-icon">▾</span>
|
||||
</th>
|
||||
<th class="filterable" data-filter-key="classroomName">
|
||||
Аудитория <span class="filter-icon">▾</span>
|
||||
</th>
|
||||
<th class="filterable" data-filter-key="educationForm">
|
||||
Форма обучения <span class="filter-icon">▾</span>
|
||||
</th>
|
||||
<th class="filterable" data-filter-key="subject">
|
||||
Дисциплина <span class="filter-icon">▾</span>
|
||||
</th>
|
||||
<th class="filterable" data-filter-key="lessonFormat">
|
||||
Формат занятия <span class="filter-icon">▾</span>
|
||||
</th>
|
||||
<th class="filterable" data-filter-key="typeLesson">
|
||||
Тип занятия <span class="filter-icon">▾</span>
|
||||
</th>
|
||||
<th class="filterable" data-filter-key="day">
|
||||
День недели <span class="filter-icon">▾</span>
|
||||
</th>
|
||||
<th>Неделя</th>
|
||||
<th>Время</th>
|
||||
<th>ID</th>
|
||||
<th>Дисциплина</th>
|
||||
<th>Семестр</th>
|
||||
<th>Группы</th>
|
||||
<th>Начало</th>
|
||||
<th>Часы</th>
|
||||
<th>Слоты</th>
|
||||
<th>Действия</th>
|
||||
</tr>
|
||||
</thead>
|
||||
<tbody id="schedule-tbody">
|
||||
<tr>
|
||||
<td colspan="11" class="loading-row">Загрузка...</td>
|
||||
<td colspan="8" class="loading-row">Загрузка...</td>
|
||||
</tr>
|
||||
</tbody>
|
||||
</table>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<!-- ===== Оверлей для модалок добавления занятия ===== -->
|
||||
<div class="cs-overlay" id="sch-overlay">
|
||||
<div class="cs-overlay-scroll">
|
||||
|
||||
<!-- Модалка 1: Форма добавления -->
|
||||
<div class="cs-modal cs-modal-form card" id="sch-modal-form">
|
||||
<div class="cs-modal-header">
|
||||
<h2>Добавить занятие</h2>
|
||||
<button class="btn-close-panel" id="sch-modal-close">×</button>
|
||||
</div>
|
||||
|
||||
<form id="sch-add-lesson-form">
|
||||
<div class="form-row" style="align-items: flex-end; gap: 1rem; flex-wrap: wrap; width: 100%; justify-content: space-between;">
|
||||
|
||||
<!-- Преподаватель -->
|
||||
<div class="form-group" style="flex: 0 1 auto; max-width: 220px">
|
||||
<label for="sch-teacher">Преподаватель</label>
|
||||
<select id="sch-teacher" required>
|
||||
<option value="">Выберите преподавателя</option>
|
||||
</select>
|
||||
</div>
|
||||
|
||||
<!-- Группа -->
|
||||
<div class="form-group" style="flex: 0 1 auto; max-width: 190px">
|
||||
<label for="sch-group">Группа</label>
|
||||
<select id="sch-group" required>
|
||||
<option value="">Выберите группу</option>
|
||||
</select>
|
||||
</div>
|
||||
|
||||
<!-- Дисциплина -->
|
||||
<div class="form-group" style="flex: 0 1 auto; max-width: 220px">
|
||||
<label for="sch-discipline">Дисциплина</label>
|
||||
<select id="sch-discipline" required>
|
||||
<option value="">Выберите дисциплину</option>
|
||||
</select>
|
||||
</div>
|
||||
|
||||
<!-- Аудитория -->
|
||||
<div class="form-group" style="flex: 0 1 auto; max-width: 215px">
|
||||
<label for="sch-classroom">Аудитория</label>
|
||||
<select id="sch-classroom" required>
|
||||
<option value="">Выберите аудиторию</option>
|
||||
</select>
|
||||
</div>
|
||||
|
||||
<!-- День недели -->
|
||||
<div class="form-group" style="flex: 0 1 auto; max-width: 170px">
|
||||
<label for="sch-day">День недели</label>
|
||||
<select id="sch-day" required>
|
||||
<option value="">Выберите день</option>
|
||||
<option value="Понедельник">Понедельник</option>
|
||||
<option value="Вторник">Вторник</option>
|
||||
<option value="Среда">Среда</option>
|
||||
<option value="Четверг">Четверг</option>
|
||||
<option value="Пятница">Пятница</option>
|
||||
<option value="Суббота">Суббота</option>
|
||||
</select>
|
||||
</div>
|
||||
|
||||
<!-- Неделя -->
|
||||
<div class="form-group" style="flex: 0 1 auto; max-width: 192px">
|
||||
<label>Неделя</label>
|
||||
<div style="display: flex; gap: 0.2rem;">
|
||||
<label class="btn-checkbox">
|
||||
<input type="checkbox" name="schWeekType" value="Верхняя" id="sch-week-upper">
|
||||
<span class="checkbox-btn">Верхняя</span>
|
||||
</label>
|
||||
<label class="btn-checkbox">
|
||||
<input type="checkbox" name="schWeekType" value="Нижняя" id="sch-week-lower">
|
||||
<span class="checkbox-btn">Нижняя</span>
|
||||
</label>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<!-- Тип занятия -->
|
||||
<div class="form-group" style="flex: 0 1 auto; max-width: 160px">
|
||||
<label for="sch-type">Тип занятия</label>
|
||||
<select id="sch-type" required>
|
||||
<option value="">Выберите тип</option>
|
||||
<option value="Практическая работа">Практическая</option>
|
||||
<option value="Лекция">Лекция</option>
|
||||
<option value="Лабораторная работа">Лабораторная</option>
|
||||
</select>
|
||||
</div>
|
||||
|
||||
<!-- Формат занятия -->
|
||||
<div class="form-group" style="flex: 0 1 auto; max-width: 170px">
|
||||
<label>Формат занятия</label>
|
||||
<div style="display: flex; gap: 0.2rem;">
|
||||
<label class="btn-checkbox">
|
||||
<input type="radio" name="schLessonFormat" value="Очно" id="sch-format-offline" checked>
|
||||
<span class="checkbox-btn">Очно</span>
|
||||
</label>
|
||||
<label class="btn-checkbox">
|
||||
<input type="radio" name="schLessonFormat" value="Онлайн" id="sch-format-online">
|
||||
<span class="checkbox-btn">Онлайн</span>
|
||||
</label>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<!-- Время занятия -->
|
||||
<div class="form-group" style="flex: 0 0 auto; max-width: 235px">
|
||||
<label for="sch-time">Время занятия</label>
|
||||
<select id="sch-time" required disabled>
|
||||
<option value="">Сначала выберите день</option>
|
||||
</select>
|
||||
</div>
|
||||
|
||||
<!-- Кнопка Сохранить -->
|
||||
<div class="form-group" style="flex: 0 0 auto;">
|
||||
<button type="submit" class="btn-primary" style="white-space: nowrap;">Сохранить</button>
|
||||
</div>
|
||||
|
||||
</div>
|
||||
|
||||
<div class="form-alert" id="sch-add-alert" role="alert" style="margin-top: 1rem;"></div>
|
||||
</form>
|
||||
</div>
|
||||
|
||||
<!-- Модалка 2: Занятия выбранного преподавателя -->
|
||||
<div class="cs-modal cs-modal-table card" id="sch-modal-lessons" style="display:none;">
|
||||
<div class="cs-modal-header">
|
||||
<h2 id="sch-teacher-name">Занятия преподавателя</h2>
|
||||
</div>
|
||||
<div class="lessons-container" id="sch-lessons-container">
|
||||
<div class="no-lessons">Выберите преподавателя для просмотра занятий</div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div class="card create-card">
|
||||
<div class="card-header-row">
|
||||
<h2 id="time-slot-form-title">Новый временной слот</h2>
|
||||
<button type="button" class="btn-edit-classroom" id="time-slot-reset">Очистить форму</button>
|
||||
</div>
|
||||
</div>
|
||||
<form id="time-slot-form" novalidate>
|
||||
<input type="hidden" id="time-slot-id">
|
||||
<div class="form-row">
|
||||
<div class="form-group">
|
||||
<label for="time-slot-order">Номер пары</label>
|
||||
<input type="number" id="time-slot-order" min="1" step="1" required>
|
||||
</div>
|
||||
<div class="form-group">
|
||||
<label for="time-slot-start">Начало</label>
|
||||
<input type="time" id="time-slot-start" required>
|
||||
</div>
|
||||
<div class="form-group">
|
||||
<label for="time-slot-end">Окончание</label>
|
||||
<input type="time" id="time-slot-end" required>
|
||||
</div>
|
||||
<div class="form-group">
|
||||
<label for="time-slot-duration">Минут</label>
|
||||
<input type="number" id="time-slot-duration" min="1" step="1" placeholder="90">
|
||||
</div>
|
||||
<button type="submit" class="btn-primary">Сохранить слот</button>
|
||||
</div>
|
||||
<div class="form-alert" id="time-slot-alert" role="alert"></div>
|
||||
</form>
|
||||
</div>
|
||||
|
||||
<div class="card">
|
||||
<div class="card-header-row">
|
||||
<h2>Сетка пар</h2>
|
||||
<button class="btn-primary" id="time-slots-refresh">Обновить</button>
|
||||
</div>
|
||||
<div class="table-wrap">
|
||||
<table id="time-slots-table">
|
||||
<thead>
|
||||
<tr>
|
||||
<th>Пара</th>
|
||||
<th>Начало</th>
|
||||
<th>Окончание</th>
|
||||
<th>Минут</th>
|
||||
<th>Действия</th>
|
||||
</tr>
|
||||
</thead>
|
||||
<tbody id="time-slots-tbody">
|
||||
<tr>
|
||||
<td colspan="5" class="loading-row">Загрузка...</td>
|
||||
</tr>
|
||||
</tbody>
|
||||
</table>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div class="card create-card">
|
||||
<h2 id="academic-year-form-title">Учебный год</h2>
|
||||
<form id="academic-year-form" novalidate>
|
||||
<input type="hidden" id="academic-year-id">
|
||||
<div class="form-row">
|
||||
<div class="form-group">
|
||||
<label for="academic-year-title">Название</label>
|
||||
<input type="text" id="academic-year-title" placeholder="2026-2027" required>
|
||||
</div>
|
||||
<div class="form-group">
|
||||
<label for="academic-year-start">Начало</label>
|
||||
<input type="date" id="academic-year-start" required>
|
||||
</div>
|
||||
<div class="form-group">
|
||||
<label for="academic-year-end">Окончание</label>
|
||||
<input type="date" id="academic-year-end" required>
|
||||
</div>
|
||||
<button type="submit" class="btn-primary">Сохранить год</button>
|
||||
<button type="button" class="btn-edit-classroom" id="academic-year-reset">Очистить</button>
|
||||
</div>
|
||||
<div class="form-alert" id="academic-year-alert" role="alert"></div>
|
||||
</form>
|
||||
</div>
|
||||
|
||||
<div class="card">
|
||||
<div class="card-header-row">
|
||||
<h2>Учебные годы</h2>
|
||||
<button class="btn-primary" id="academic-years-refresh">Обновить</button>
|
||||
</div>
|
||||
<div class="table-wrap">
|
||||
<table>
|
||||
<thead>
|
||||
<tr>
|
||||
<th>Название</th>
|
||||
<th>Период</th>
|
||||
<th>Семестры</th>
|
||||
<th>Действия</th>
|
||||
</tr>
|
||||
</thead>
|
||||
<tbody id="academic-years-tbody">
|
||||
<tr>
|
||||
<td colspan="4" class="loading-row">Загрузка...</td>
|
||||
</tr>
|
||||
</tbody>
|
||||
</table>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div class="card create-card">
|
||||
<h2 id="semester-form-title">Семестр</h2>
|
||||
<form id="semester-form" novalidate>
|
||||
<input type="hidden" id="semester-id">
|
||||
<div class="form-row">
|
||||
<div class="form-group">
|
||||
<label for="semester-year">Учебный год</label>
|
||||
<select id="semester-year" required>
|
||||
<option value="">Загрузка...</option>
|
||||
</select>
|
||||
</div>
|
||||
<div class="form-group">
|
||||
<label for="semester-type">Тип семестра</label>
|
||||
<select id="semester-type" required>
|
||||
<option value="autumn">Осенний</option>
|
||||
<option value="spring">Весенний</option>
|
||||
</select>
|
||||
</div>
|
||||
<div class="form-group">
|
||||
<label for="semester-start">Начало</label>
|
||||
<input type="date" id="semester-start" required>
|
||||
</div>
|
||||
<div class="form-group">
|
||||
<label for="semester-end">Окончание</label>
|
||||
<input type="date" id="semester-end" required>
|
||||
</div>
|
||||
<button type="submit" class="btn-primary">Сохранить семестр</button>
|
||||
<button type="button" class="btn-edit-classroom" id="semester-reset">Очистить</button>
|
||||
</div>
|
||||
<div class="form-alert" id="semester-alert" role="alert"></div>
|
||||
</form>
|
||||
</div>
|
||||
|
||||
<div class="card create-card">
|
||||
<h2 id="holiday-form-title">Праздники и исключения</h2>
|
||||
<form id="holiday-form" novalidate>
|
||||
<input type="hidden" id="holiday-id">
|
||||
<div class="form-row">
|
||||
<div class="form-group">
|
||||
<label for="holiday-year">Учебный год</label>
|
||||
<select id="holiday-year" required>
|
||||
<option value="">Загрузка...</option>
|
||||
</select>
|
||||
</div>
|
||||
<div class="form-group">
|
||||
<label for="holiday-date">Дата</label>
|
||||
<input type="date" id="holiday-date" required>
|
||||
</div>
|
||||
<div class="form-group">
|
||||
<label for="holiday-description">Описание</label>
|
||||
<input type="text" id="holiday-description" placeholder="Праздничный день">
|
||||
</div>
|
||||
<button type="submit" class="btn-primary">Сохранить дату</button>
|
||||
<button type="button" class="btn-edit-classroom" id="holiday-reset">Очистить</button>
|
||||
</div>
|
||||
<div class="form-alert" id="holiday-alert" role="alert"></div>
|
||||
</form>
|
||||
<div class="table-wrap schedule-inline-table">
|
||||
<table>
|
||||
<thead>
|
||||
<tr>
|
||||
<th>Дата</th>
|
||||
<th>Описание</th>
|
||||
<th>Действия</th>
|
||||
</tr>
|
||||
</thead>
|
||||
<tbody id="holidays-tbody">
|
||||
<tr>
|
||||
<td colspan="3" class="loading-row">Выберите учебный год</td>
|
||||
</tr>
|
||||
</tbody>
|
||||
</table>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div class="card create-card">
|
||||
<h2>Матрица учебного графика</h2>
|
||||
<div class="form-row">
|
||||
<div class="form-group">
|
||||
<label for="matrix-semester">Семестр</label>
|
||||
<select id="matrix-semester">
|
||||
<option value="">Загрузка...</option>
|
||||
</select>
|
||||
</div>
|
||||
<div class="form-group">
|
||||
<label for="matrix-course">Курс</label>
|
||||
<input type="number" id="matrix-course" min="1" step="1" placeholder="1">
|
||||
</div>
|
||||
<div class="form-group">
|
||||
<label for="matrix-specialty">Специальность</label>
|
||||
<select id="matrix-specialty">
|
||||
<option value="">Загрузка...</option>
|
||||
</select>
|
||||
</div>
|
||||
<button type="button" class="btn-primary" id="matrix-load">Загрузить</button>
|
||||
<button type="button" class="btn-primary" id="matrix-save">Сохранить</button>
|
||||
</div>
|
||||
<div class="form-alert" id="matrix-alert" role="alert"></div>
|
||||
<div id="matrix-grid" class="matrix-grid"></div>
|
||||
</div>
|
||||
|
||||
@@ -49,141 +49,14 @@
|
||||
<th>Должность</th>
|
||||
<th>Кафедра</th>
|
||||
<th>Роль</th>
|
||||
<th colspan="2">Действия</th>
|
||||
<th>Действия</th>
|
||||
</tr>
|
||||
</thead>
|
||||
<tbody id="users-tbody">
|
||||
<tr>
|
||||
<td colspan="8" class="loading-row">Загрузка...</td>
|
||||
<td colspan="7" class="loading-row">Загрузка...</td>
|
||||
</tr>
|
||||
</tbody>
|
||||
</table>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<!-- ===== Оверлей для модалок добавления/просмотра занятий ===== -->
|
||||
<div class="cs-overlay" id="users-overlay">
|
||||
<div class="cs-overlay-scroll">
|
||||
|
||||
<!-- Модалка 1: Форма добавления -->
|
||||
<div class="cs-modal cs-modal-form card" id="modal-add-lesson">
|
||||
<div class="cs-modal-header">
|
||||
<h2>Добавить занятие</h2>
|
||||
<button class="btn-close-panel" id="modal-add-lesson-close">×</button>
|
||||
</div>
|
||||
<form id="add-lesson-form">
|
||||
<input type="hidden" id="lesson-user-id">
|
||||
|
||||
<!-- Один общий ряд для всех элементов -->
|
||||
<div class="form-row" style="align-items: flex-end; gap: 1rem; flex-wrap: wrap; width: 100%; justify-content: space-between;">
|
||||
|
||||
<!-- Группа -->
|
||||
<div class="form-group" style="flex: 0 1 auto; max-width: 190px">
|
||||
<label for="lesson-group">Группа</label>
|
||||
<select id="lesson-group" required>
|
||||
<option value="">Выберите группу</option>
|
||||
</select>
|
||||
</div>
|
||||
|
||||
<!-- Дисциплина -->
|
||||
<div class="form-group" style="flex: 0 1 auto; max-width: 220px">
|
||||
<label for="lesson-discipline">Дисциплина</label>
|
||||
<select id="lesson-discipline" required>
|
||||
<option value="">Выберите дисциплину</option>
|
||||
</select>
|
||||
</div>
|
||||
|
||||
<!-- Аудитория -->
|
||||
<div class="form-group" style="flex: 0 1 auto; max-width: 215px">
|
||||
<label for="lesson-classroom">Аудитория</label>
|
||||
<select id="lesson-classroom" required>
|
||||
<option value="">Выберите аудиторию</option>
|
||||
</select>
|
||||
</div>
|
||||
|
||||
<!-- День недели -->
|
||||
<div class="form-group" style="flex: 0 1 auto; max-width: 170px">
|
||||
<label for="lesson-day">День недели</label>
|
||||
<select id="lesson-day" required>
|
||||
<option value="">Выберите день</option>
|
||||
<option value="Понедельник">Понедельник</option>
|
||||
<option value="Вторник">Вторник</option>
|
||||
<option value="Среда">Среда</option>
|
||||
<option value="Четверг">Четверг</option>
|
||||
<option value="Пятница">Пятница</option>
|
||||
<option value="Суббота">Суббота</option>
|
||||
</select>
|
||||
</div>
|
||||
|
||||
<!-- Тип недели -->
|
||||
<div class="form-group" style="flex: 0 1 auto; max-width: 192px">
|
||||
<label>Неделя</label>
|
||||
<div style="display: flex; gap: 0.2rem;">
|
||||
<label class="btn-checkbox">
|
||||
<input type="checkbox" name="weekType" value="Верхняя" id="week-upper">
|
||||
<span class="checkbox-btn">Верхняя</span>
|
||||
</label>
|
||||
<label class="btn-checkbox">
|
||||
<input type="checkbox" name="weekType" value="Нижняя" id="week-lower">
|
||||
<span class="checkbox-btn">Нижняя</span>
|
||||
</label>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<!-- Тип занятия -->
|
||||
<div class="form-group" style="flex: 0 1 auto; max-width: 160px">
|
||||
<label for="lesson-type">Тип занятия</label>
|
||||
<select id="lesson-type" required>
|
||||
<option value="">Выберите тип</option>
|
||||
<option value="Практическая работа">Практическая</option>
|
||||
<option value="Лекция">Лекция</option>
|
||||
<option value="Лабораторная работа">Лабораторная</option>
|
||||
</select>
|
||||
</div>
|
||||
|
||||
<!-- Формат занятия -->
|
||||
<div class="form-group" style="flex: 0 1 auto; max-width: 170px">
|
||||
<label>Формат занятия</label>
|
||||
<div style="display: flex; gap: 0.2rem;">
|
||||
<label class="btn-checkbox">
|
||||
<input type="radio" name="lessonFormat" value="Очно" id="format-offline" checked>
|
||||
<span class="checkbox-btn">Очно</span>
|
||||
</label>
|
||||
<label class="btn-checkbox">
|
||||
<input type="radio" name="lessonFormat" value="Онлайн" id="format-online">
|
||||
<span class="checkbox-btn">Онлайн</span>
|
||||
</label>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<!-- Время занятия -->
|
||||
<div class="form-group" style="flex: 0 0 auto; max-width: 235px">
|
||||
<label for="lesson-time">Время занятия</label>
|
||||
<select id="lesson-time" required disabled>
|
||||
<option value="">Сначала выберите день</option>
|
||||
</select>
|
||||
</div>
|
||||
|
||||
<!-- Кнопка Сохранить -->
|
||||
<div class="form-group" style="flex: 0 0 auto;">
|
||||
<button type="submit" class="btn-primary" style="white-space: nowrap;">Сохранить</button>
|
||||
</div>
|
||||
|
||||
</div>
|
||||
|
||||
<div class="form-alert" id="add-lesson-alert" role="alert" style="margin-top: 1rem;"></div>
|
||||
</form>
|
||||
</div>
|
||||
|
||||
<!-- Модалка 2: Просмотр занятий преподавателя -->
|
||||
<div class="cs-modal cs-modal-table card" id="modal-view-lessons" style="display:none;">
|
||||
<div class="cs-modal-header">
|
||||
<h2 id="modal-teacher-name">Занятия преподавателя</h2>
|
||||
</div>
|
||||
<div class="lessons-container" id="lessons-container">
|
||||
<div class="loading-lessons">Загрузка занятий...</div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
Reference in New Issue
Block a user