Добавил возможность решения конкфликтов при создании правил

This commit is contained in:
dipatrik10
2026-06-03 13:55:31 +03:00
parent 776728cf83
commit 53298d9d07
8 changed files with 972 additions and 26 deletions

View File

@@ -642,6 +642,185 @@
grid-template-columns: repeat(8, minmax(125px, 1fr)) auto;
}
.schedule-conflict-modal {
z-index: 1200;
}
.schedule-conflict-card {
width: min(1440px, calc(100vw - 2rem));
padding: 1.5rem;
}
.schedule-conflict-head {
display: grid;
gap: 0.45rem;
margin-right: 2rem;
margin-bottom: 1rem;
}
.schedule-conflict-head h2 {
margin: 0;
color: var(--text-primary);
font-size: 1.05rem;
letter-spacing: 0;
text-transform: none;
}
.schedule-conflict-head p {
margin: 0;
color: var(--text-secondary);
line-height: 1.45;
}
.schedule-conflict-kicker {
width: max-content;
padding: 0.2rem 0.55rem;
border: 1px solid rgba(245, 158, 11, 0.3);
border-radius: 999px;
background: rgba(245, 158, 11, 0.12);
color: var(--warning);
font-size: 0.72rem;
font-weight: 800;
text-transform: uppercase;
letter-spacing: 0.04em;
}
.schedule-conflict-rules {
display: grid;
grid-template-columns: repeat(2, minmax(0, 1fr));
gap: 0.75rem;
margin-bottom: 1rem;
}
.schedule-conflict-rule-box {
display: grid;
gap: 0.35rem;
min-width: 0;
padding: 0.85rem;
border: 1px solid var(--bg-card-border);
border-radius: var(--radius-sm);
background: var(--bg-input);
}
.schedule-conflict-rule-box-active {
border-color: rgba(245, 158, 11, 0.35);
background: rgba(245, 158, 11, 0.08);
}
.schedule-conflict-rule-box span,
.schedule-conflict-slot-fixed span {
color: var(--text-secondary);
font-size: 0.72rem;
font-weight: 700;
text-transform: uppercase;
letter-spacing: 0.04em;
}
.schedule-conflict-rule-box strong,
.schedule-conflict-slot-fixed strong {
min-width: 0;
color: var(--text-primary);
overflow-wrap: anywhere;
}
.schedule-conflict-rule-box small,
.schedule-conflict-slot-fixed small {
color: var(--text-secondary);
line-height: 1.4;
}
.schedule-conflict-form {
display: grid;
gap: 0.75rem;
}
.schedule-conflict-slots {
display: grid;
gap: 0.75rem;
max-height: none;
overflow: visible;
padding-right: 0.25rem;
}
.schedule-conflict-slot-row {
display: grid;
grid-template-columns: minmax(210px, 1.15fr) minmax(130px, 0.7fr) minmax(140px, 0.75fr) minmax(170px, 0.85fr) minmax(240px, 1.15fr) minmax(190px, 1fr);
gap: 0.65rem;
align-items: end;
padding: 0.75rem;
border: 1px solid var(--bg-card-border);
border-radius: var(--radius-sm);
background: color-mix(in srgb, var(--bg-input) 88%, transparent);
}
.schedule-conflict-slot-fixed {
display: grid;
gap: 0.25rem;
align-self: stretch;
align-content: center;
min-width: 0;
}
.schedule-conflict-actions {
display: flex;
justify-content: flex-end;
gap: 0.5rem;
padding-top: 0.25rem;
}
.schedule-visual-context-menu {
position: fixed;
z-index: 1300;
display: grid;
min-width: 220px;
padding: 0.35rem;
border: 1px solid var(--bg-card-border);
border-radius: var(--radius-sm);
background: rgba(10, 10, 15, 0.97);
box-shadow: 0 14px 36px rgba(0, 0, 0, 0.35);
}
.schedule-visual-context-menu[hidden] {
display: none;
}
[data-theme="light"] .schedule-visual-context-menu {
background: rgba(255, 255, 255, 0.98);
box-shadow: 0 14px 36px rgba(15, 23, 42, 0.16);
}
.schedule-visual-context-menu button {
width: 100%;
padding: 0.65rem 0.75rem;
border: 0;
border-radius: 6px;
background: transparent;
color: var(--text-primary);
font: inherit;
font-size: 0.88rem;
text-align: left;
cursor: pointer;
}
.schedule-visual-context-menu button:hover,
.schedule-visual-context-menu button:focus-visible {
outline: none;
background: var(--bg-hover);
}
.schedule-visual-context-menu button.danger {
color: var(--error);
}
.schedule-move-slot-card {
width: min(620px, calc(100vw - 2rem));
}
.schedule-move-slot-form {
display: grid;
gap: 0.9rem;
}
.subject-import-rows-list {
display: flex;
flex-direction: column;
@@ -861,6 +1040,23 @@
.subject-import-row .btn {
width: 100%;
}
.schedule-conflict-card {
padding: 1.25rem;
}
.schedule-conflict-rules,
.schedule-conflict-slot-row {
grid-template-columns: 1fr;
}
.schedule-conflict-actions {
flex-direction: column-reverse;
}
.schedule-conflict-actions .btn {
width: 100%;
}
}
.academic-year-semester-meta {