diff --git a/.gitea/workflows/docker-build.yaml b/.gitea/workflows/docker-build.yaml new file mode 100644 index 0000000..32e7b72 --- /dev/null +++ b/.gitea/workflows/docker-build.yaml @@ -0,0 +1,68 @@ +name: Build and Push Docker Images + +on: + push: + branches: + - main + tags: + - 'v*' + +env: + REGISTRY: gitea.zuev.company # Замените на реальный домен вашего Gitea + BACKEND_IMAGE: zuev/magistr-backend + FRONTEND_IMAGE: zuev/magistr-frontend + +jobs: + build-and-push-backend: + runs-on: ubuntu-latest + steps: + - name: Checkout repository + uses: actions/checkout@v3 + + - name: Log in to the Container registry + uses: docker/login-action@v2 + with: + registry: ${{ env.REGISTRY }} + username: ${{ github.actor }} + password: ${{ secrets.ZUEV_TOKEN }} # Нужно создать секрет ZUEV_TOKEN в настройках репозитория (Personal Access Token) + + - name: Extract metadata (tags, labels) for Docker + id: meta + uses: docker/metadata-action@v4 + with: + images: ${{ env.REGISTRY }}/${{ env.BACKEND_IMAGE }} + + - name: Build and push Docker image + uses: docker/build-push-action@v4 + with: + context: ./backend + push: true + tags: ${{ steps.meta.outputs.tags }} + labels: ${{ steps.meta.outputs.labels }} + + build-and-push-frontend: + runs-on: ubuntu-latest + steps: + - name: Checkout repository + uses: actions/checkout@v3 + + - name: Log in to the Container registry + uses: docker/login-action@v2 + with: + registry: ${{ env.REGISTRY }} + username: ${{ github.actor }} + password: ${{ secrets.ZUEV_TOKEN }} + + - name: Extract metadata (tags, labels) for Docker + id: meta + uses: docker/metadata-action@v4 + with: + images: ${{ env.REGISTRY }}/${{ env.FRONTEND_IMAGE }} + + - name: Build and push Docker image + uses: docker/build-push-action@v4 + with: + context: ./frontend + push: true + tags: ${{ steps.meta.outputs.tags }} + labels: ${{ steps.meta.outputs.labels }} diff --git a/.gitignore b/.gitignore index 95e33b9..6b4c2cd 100755 --- a/.gitignore +++ b/.gitignore @@ -1,18 +1,15 @@ -# Игнорируем данные БД (но не init-скрипты) db/data/ - -# Игнорируем секреты .env -!GEMINI.md -!AGENTS.md -# Игнорируем системные папки IDE (если редактируете с ПК) -.idea/ -.vscode/ -*.DS_Store -.agent/ # Игнорируем временные файлы сборки (на будущее) backend/target/ backend/build/ frontend/node_modules/ frontend/dist/ + +.agents +.idea/ +.vscode/ +*.DS_Store +AGENTS.md +GEMINI.md \ No newline at end of file diff --git a/backend/Dockerfile b/backend/Dockerfile old mode 100644 new mode 100755 diff --git a/backend/pom.xml b/backend/pom.xml old mode 100644 new mode 100755 diff --git a/backend/src/main/java/com/magistr/app/Application.java b/backend/src/main/java/com/magistr/app/Application.java old mode 100644 new mode 100755 diff --git a/backend/src/main/java/com/magistr/app/README.md b/backend/src/main/java/com/magistr/app/README.md old mode 100644 new mode 100755 diff --git a/backend/src/main/java/com/magistr/app/config/AppConfig.java b/backend/src/main/java/com/magistr/app/config/AppConfig.java old mode 100644 new mode 100755 diff --git a/backend/src/main/java/com/magistr/app/config/DataInitializer.java b/backend/src/main/java/com/magistr/app/config/DataInitializer.java old mode 100644 new mode 100755 diff --git a/backend/src/main/java/com/magistr/app/controller/AuthController.java b/backend/src/main/java/com/magistr/app/controller/AuthController.java old mode 100644 new mode 100755 diff --git a/backend/src/main/java/com/magistr/app/controller/ClassroomController.java b/backend/src/main/java/com/magistr/app/controller/ClassroomController.java old mode 100644 new mode 100755 diff --git a/backend/src/main/java/com/magistr/app/controller/EducationFormController.java b/backend/src/main/java/com/magistr/app/controller/EducationFormController.java old mode 100644 new mode 100755 diff --git a/backend/src/main/java/com/magistr/app/controller/EquipmentController.java b/backend/src/main/java/com/magistr/app/controller/EquipmentController.java old mode 100644 new mode 100755 diff --git a/backend/src/main/java/com/magistr/app/controller/GroupController.java b/backend/src/main/java/com/magistr/app/controller/GroupController.java old mode 100644 new mode 100755 diff --git a/backend/src/main/java/com/magistr/app/controller/LessonsController.java b/backend/src/main/java/com/magistr/app/controller/LessonsController.java new file mode 100755 index 0000000..f124e97 --- /dev/null +++ b/backend/src/main/java/com/magistr/app/controller/LessonsController.java @@ -0,0 +1,240 @@ +package com.magistr.app.controller; + +import com.magistr.app.dto.CreateLessonRequest; +import com.magistr.app.dto.LessonResponse; +import com.magistr.app.model.*; +import com.magistr.app.repository.*; +import com.magistr.app.utils.DayAndWeekValidator; +import org.slf4j.LoggerFactory; +import org.springframework.http.ResponseEntity; +import org.springframework.web.bind.annotation.*; + +import java.util.*; + +import org.slf4j.Logger; +import org.springframework.http.HttpStatus; + +@RestController +@RequestMapping("/api/users/lessons") +public class LessonsController { + + private static final Logger logger = LoggerFactory.getLogger(LessonsController.class); + + private final LessonRepository lessonRepository; + private final UserRepository teacherRepository; + private final GroupRepository groupRepository; + private final SubjectRepository subjectRepository; + private final EducationFormRepository educationFormRepository; + + public LessonsController(LessonRepository lessonRepository, UserRepository teacherRepository, GroupRepository groupRepository, SubjectRepository subjectRepository, EducationFormRepository educationForm) { + this.lessonRepository = lessonRepository; + this.teacherRepository = teacherRepository; + this.groupRepository = groupRepository; + this.subjectRepository = subjectRepository; + this.educationFormRepository = educationForm; + } + + @PostMapping("/create") + public ResponseEntity createLesson(@RequestBody CreateLessonRequest request) { + //Полное логирование входящего запроса + logger.info("Получен запрос на создание занятия: teacherId={}, groupId={}, lessonTypeId={}, day={}, week={}, time={}", + request.getTeacherId(), request.getGroupId(), request.getSubjectId(), request.getDay(), request.getWeek(), request.getTime()); + + //Проверка teacherId + if (request.getTeacherId() == null || request.getTeacherId() == 0) { + String errorMessage = "ID преподавателя обязателен"; + logger.info("Ошибка валидации: {}", errorMessage); + return ResponseEntity.badRequest().body(Map.of("message", errorMessage)); + } + + //Проверка groupId + if (request.getGroupId() == null || request.getGroupId() == 0) { + String errorMessage = "ID группы обязателен"; + logger.info("Ошибка валидации: {}", errorMessage); + return ResponseEntity.badRequest().body(Map.of("message", errorMessage)); + } + + //Проверка lessonTypeId + if (request.getSubjectId() == null || request.getSubjectId() == 0) { + String errorMessage = "ID предмета обязателен"; + logger.info("Ошибка валидации: {}", errorMessage); + return ResponseEntity.badRequest().body(Map.of("message", errorMessage)); + } + + //Проверка day + if (request.getDay() == null || request.getDay().isBlank()) { + String errorMessage = "Выбор дня обязателен"; + logger.info("Ошибка валидации: {}", errorMessage); + return ResponseEntity.badRequest().body(Map.of("message", errorMessage)); + } else if(!DayAndWeekValidator.isValidDay(request.getDay())){ + String errorMessage = "Некорректный день недели. " + DayAndWeekValidator.getValidDaysMessage(); + logger.info("Ошибка валидации дня: '{}' - {}", request.getDay(), errorMessage); + return ResponseEntity.badRequest().body(Map.of("message", errorMessage)); + } + + //Проверка week + if (request.getWeek() == null || request.getWeek().isBlank()) { + String errorMessage = "Выбор недели обязателен"; + logger.info("Ошибка валидации: {}", errorMessage); + return ResponseEntity.badRequest().body(Map.of("message", errorMessage)); + } else if(!DayAndWeekValidator.isValidWeek(request.getWeek())){ + String errorMessage = "Некорректная неделя. " + DayAndWeekValidator.getValidWeekMessage(); + logger.info("Ошибка валидации недели: '{}' - {}", request.getWeek(), errorMessage); + return ResponseEntity.badRequest().body(Map.of("message", errorMessage)); + } + + //Проверка time + if (request.getTime() == null || request.getTime().isBlank()) { + String errorMessage = "Время обязательно"; + logger.info("Ошибка валидации: {}", errorMessage); + return ResponseEntity.badRequest().body(Map.of("message", errorMessage)); + } + + //Сохранение полученных данных и формирование ответа клиенту + try { + Lesson lesson = new Lesson(); + lesson.setTeacherId(request.getTeacherId()); + lesson.setSubjectId(request.getSubjectId()); + lesson.setGroupId(request.getGroupId()); + lesson.setDay(request.getDay()); + lesson.setWeek(request.getWeek()); + lesson.setTime(request.getTime()); + + Lesson savedLesson = lessonRepository.save(lesson); + + Map response = new LinkedHashMap<>(); + response.put("id", savedLesson.getId()); + response.put("teacherId", savedLesson.getTeacherId()); + response.put("groupId", savedLesson.getGroupId()); + response.put("subjectId", savedLesson.getSubjectId()); + response.put("day", savedLesson.getDay()); + response.put("week", savedLesson.getWeek()); + response.put("time", savedLesson.getTime()); + + logger.info("Занятие успешно создано с ID: {}", savedLesson.getId()); + + return ResponseEntity.ok(response); + } catch (Exception e) { + logger.error("Ошибка при сохранении занятия: {}", e.getMessage(),e); + + return ResponseEntity.status(HttpStatus.INTERNAL_SERVER_ERROR) + .body(Map.of("message", "Произошла ошибка при создании занятия: " + e.getMessage())); + } + } + + @GetMapping + public List getAllLessons() { + logger.info("Запрос на получение всех занятий"); + + try { + List lessons = lessonRepository.findAll(); + + List response = lessons.stream() + .map(lesson -> { + String teacherName = teacherRepository.findById(lesson.getTeacherId()) + .map(User::getUsername) + .orElse("Неизвестно"); + + StudentGroup group = groupRepository.findById(lesson.getGroupId()).orElse(null); + String groupName = groupRepository.findById(lesson.getGroupId()) + .map(StudentGroup::getName) + .orElse("Неизвестно"); + + String educationFormName = "Неизвестно"; + if(group != null && group.getEducationForm() != null) { + Long educationFormId = group.getEducationForm().getId(); + educationFormName = educationFormRepository.findById(educationFormId) + .map(EducationForm::getName) + .orElse("Неизвестно"); + } + + String subjectName = subjectRepository.findById(lesson.getSubjectId()) + .map(Subject::getName) + .orElse("Неизвестно"); + + return new LessonResponse( + lesson.getId(), + teacherName, + groupName, + educationFormName, + subjectName, + lesson.getDay(), + lesson.getWeek(), + lesson.getTime() + ); + }) + .toList(); + + logger.info("Получено {} занятий", lessons.size()); + return response; + } catch (Exception e) { + logger.error("Ошибка при получении списка всех занятий: {}", e.getMessage(), e); + throw e; + } + } + + @GetMapping("/{teacherId}") + public ResponseEntity getLessonsById(@PathVariable Long teacherId) { + logger.info("Запрос на получение занятий для преподавателя с ID: {}", teacherId); + try { + List lessons = lessonRepository.findByTeacherId(teacherId); + + if(lessons.isEmpty()) { + logger.info("У преподавателя с ID {} нет занятий", teacherId); + return ResponseEntity.ok(Map.of( + "message", "У преподавателя с ID " + teacherId +" нет занятий.", + "lessons", Collections.emptyList() + )); + } + + List lessonResponses = lessons.stream() + .map(l -> new LessonResponse( + l.getId(), + l.getTeacherId(), + l.getSubjectId(), + l.getGroupId(), + l.getDay(), + l.getWeek(), + l.getTime() + )) + .toList(); + logger.info("Найдено {} занянтий для преподавателя с ID: {}", lessonResponses.size(), teacherId); + return ResponseEntity.ok(lessonResponses); + } catch (Exception e ){ + logger.error("Ошибка при получении занятий для преподавателя с ID {}: {}", teacherId, e.getMessage(), e); + return ResponseEntity.status(HttpStatus.INTERNAL_SERVER_ERROR) + .body(Map.of("message", "Ошибка при поиске занятий: " + e.getMessage())); + } + } + + @GetMapping("/debug/subjects") + public ResponseEntity debugSubjects() { + Map result = new HashMap<>(); + + // Через JPA репозиторий + List allSubjects = subjectRepository.findAll(); + result.put("jpa_count", allSubjects.size()); + result.put("jpa_subjects", allSubjects.stream() + .map(s -> Map.of("id", s.getId(), "name", s.getName())) + .toList()); + + // Проверка конкретных ID + Map existenceCheck = new HashMap<>(); + for (long id = 1; id <= 6; id++) { + boolean exists = subjectRepository.existsById(id); + existenceCheck.put(id, exists); + } + result.put("existence_check", existenceCheck); + + return ResponseEntity.ok(result); + } + + //Тестовый запрос на проверку доступности контроллера + @GetMapping("/ping") + public String ping() { + logger.debug("Получен ping запрос"); + String response = "pong"; + logger.debug("Ответ на ping: {}", response); + return response; + } +} \ No newline at end of file diff --git a/backend/src/main/java/com/magistr/app/controller/SubjectController.java b/backend/src/main/java/com/magistr/app/controller/SubjectController.java old mode 100644 new mode 100755 diff --git a/backend/src/main/java/com/magistr/app/controller/TeacherSubjectController.java b/backend/src/main/java/com/magistr/app/controller/TeacherSubjectController.java old mode 100644 new mode 100755 diff --git a/backend/src/main/java/com/magistr/app/controller/TestController.java b/backend/src/main/java/com/magistr/app/controller/TestController.java deleted file mode 100644 index 1f7bde5..0000000 --- a/backend/src/main/java/com/magistr/app/controller/TestController.java +++ /dev/null @@ -1,67 +0,0 @@ -package com.magistr.app.controller; - -import com.magistr.app.dto.CreateLessonRequest; -import com.magistr.app.dto.LessonResponse; -import com.magistr.app.model.Lesson; -import com.magistr.app.repository.LessonRepository; -import org.springframework.http.ResponseEntity; -import org.springframework.web.bind.annotation.*; - -import java.util.List; -import java.util.Map; - -@RestController -@RequestMapping("/api/users/test") -public class TestController { - - private final LessonRepository lessonRepository; - - public TestController(LessonRepository lessonRepository) { - this.lessonRepository = lessonRepository; - } - - @PostMapping("/create") - public ResponseEntity createLesson(@RequestBody CreateLessonRequest request) { - if (request.getTeacherId() == null || request.getTeacherId() == 0) { - return ResponseEntity.badRequest().body(Map.of("message", "ID преподавателя обязателен")); - } - if (request.getGroupId() == null || request.getGroupId() == 0) { - return ResponseEntity.badRequest().body(Map.of("message", "ID группы обязателен")); - } - if (request.getLessonTypeId() == null || request.getLessonTypeId() == 0) { - return ResponseEntity.badRequest().body(Map.of("message", "ID предмета обязателен")); - } - if (request.getDay() == null || request.getDay().isBlank()) { - return ResponseEntity.badRequest().body(Map.of("message", "Выбор дня обязателен")); - } - if (request.getWeek() == null || request.getWeek().isBlank()) { - return ResponseEntity.badRequest().body(Map.of("message", "Выбор недели обязателен")); - } - if (request.getTime() == null || request.getTime().isBlank()) { - return ResponseEntity.badRequest().body(Map.of("message", "Время обязательно")); - } - - Lesson lesson = new Lesson(); - lesson.setTeacherId(request.getTeacherId()); - lesson.setLessonTypeId(request.getLessonTypeId()); - lesson.setGroupId(request.getGroupId()); - lesson.setDay(request.getDay()); - lesson.setWeek(request.getWeek()); - lesson.setTime(request.getTime()); - lessonRepository.save(lesson); - - return ResponseEntity.ok(new LessonResponse(lesson.getId(), lesson.getDay(), lesson.getWeek(), lesson.getTime())); - } - - @GetMapping - public List getAllLessons() { - return lessonRepository.findAll().stream() - .map(l -> new LessonResponse(l.getId(), l.getTeacherId(), l.getLessonTypeId(), l.getDay(), l.getWeek(), l.getTime())) - .toList(); - } - - @GetMapping("/ping") - public String ping() { - return "pong"; - } -} \ No newline at end of file diff --git a/backend/src/main/java/com/magistr/app/controller/UserController.java b/backend/src/main/java/com/magistr/app/controller/UserController.java old mode 100644 new mode 100755 diff --git a/backend/src/main/java/com/magistr/app/dto/ClassroomRequest.java b/backend/src/main/java/com/magistr/app/dto/ClassroomRequest.java old mode 100644 new mode 100755 diff --git a/backend/src/main/java/com/magistr/app/dto/ClassroomResponse.java b/backend/src/main/java/com/magistr/app/dto/ClassroomResponse.java old mode 100644 new mode 100755 diff --git a/backend/src/main/java/com/magistr/app/dto/CreateGroupRequest.java b/backend/src/main/java/com/magistr/app/dto/CreateGroupRequest.java old mode 100644 new mode 100755 diff --git a/backend/src/main/java/com/magistr/app/dto/CreateLessonRequest.java b/backend/src/main/java/com/magistr/app/dto/CreateLessonRequest.java old mode 100644 new mode 100755 index 8affb79..bb9a3ed --- a/backend/src/main/java/com/magistr/app/dto/CreateLessonRequest.java +++ b/backend/src/main/java/com/magistr/app/dto/CreateLessonRequest.java @@ -4,7 +4,7 @@ public class CreateLessonRequest { private Long teacherId; private Long groupId; - private Long lessonTypeId; + private Long subjectId; private String day; private String week; private String time; @@ -28,12 +28,12 @@ public class CreateLessonRequest { this.groupId = groupId; } - public Long getLessonTypeId() { - return lessonTypeId; + public Long getSubjectId() { + return subjectId; } - public void setLessonTypeId(Long lessonTypeId) { - this.lessonTypeId= lessonTypeId; + public void setSubjectId(Long subjectId) { + this.subjectId = subjectId; } public String getDay() { diff --git a/backend/src/main/java/com/magistr/app/dto/CreateUserRequest.java b/backend/src/main/java/com/magistr/app/dto/CreateUserRequest.java old mode 100644 new mode 100755 diff --git a/backend/src/main/java/com/magistr/app/dto/GroupResponse.java b/backend/src/main/java/com/magistr/app/dto/GroupResponse.java old mode 100644 new mode 100755 diff --git a/backend/src/main/java/com/magistr/app/dto/LessonResponse.java b/backend/src/main/java/com/magistr/app/dto/LessonResponse.java old mode 100644 new mode 100755 index 873de27..b718edc --- a/backend/src/main/java/com/magistr/app/dto/LessonResponse.java +++ b/backend/src/main/java/com/magistr/app/dto/LessonResponse.java @@ -1,11 +1,19 @@ package com.magistr.app.dto; + +import com.fasterxml.jackson.annotation.JsonInclude; + +@JsonInclude(JsonInclude.Include.NON_NULL) public class LessonResponse { private Long id; private Long teacherId; + private String teacherName; private Long groupId; - private Long lessonTypeId; + private String groupName; + private String educationFormName; + private Long subjectId; + private String subjectName; private String day; private String week; private String time; @@ -13,17 +21,22 @@ public class LessonResponse { public LessonResponse() { } - public LessonResponse(Long lessonTypeId, String day, String week, String time) { - this.lessonTypeId = lessonTypeId; + public LessonResponse(Long id, Long teacherId, Long groupId, Long subjectId, String day, String week, String time) { + this.id = id; + this.teacherId = teacherId; + this.groupId = groupId; + this.subjectId = subjectId; this.day = day; this.week = week; this.time = time; } - public LessonResponse(Long id, Long teacherId, Long lessonTypeId, String day, String week, String time) { + public LessonResponse(Long id, String teacherName, String groupName, String educationFormName, String subjectName, String day, String week, String time) { this.id = id; - this.teacherId = teacherId; - this.lessonTypeId = lessonTypeId; + this.teacherName = teacherName; + this.groupName = groupName; + this.educationFormName = educationFormName; + this.subjectName = subjectName; this.day = day; this.week = week; this.time = time; @@ -45,6 +58,14 @@ public class LessonResponse { this.teacherId = teacherId; } + public String getTeacherName() { + return teacherName; + } + + public void setTeacherName(String teacherName) { + this.teacherName = teacherName; + } + public Long getGroupId() { return groupId; } @@ -53,12 +74,36 @@ public class LessonResponse { this.groupId = groupId; } - public Long getLessonTypeId() { - return lessonTypeId; + public String getGroupName() { + return groupName; } - public void setLessonTypeId(Long lessonTypeId) { - this.lessonTypeId = lessonTypeId; + public void setGroupName(String groupName) { + this.groupName = groupName; + } + + public String getEducationFormName() { + return educationFormName; + } + + public void setEducationFormName(String educationFormName) { + this.educationFormName = educationFormName; + } + + public Long getSubjectId() { + return subjectId; + } + + public void setSubjectId(Long subjectId) { + this.subjectId = subjectId; + } + + public String getSubjectName() { + return subjectName; + } + + public void setSubjectName(String subjectName) { + this.subjectName = subjectName; } public String getDay() { diff --git a/backend/src/main/java/com/magistr/app/dto/LoginRequest.java b/backend/src/main/java/com/magistr/app/dto/LoginRequest.java old mode 100644 new mode 100755 diff --git a/backend/src/main/java/com/magistr/app/dto/LoginResponse.java b/backend/src/main/java/com/magistr/app/dto/LoginResponse.java old mode 100644 new mode 100755 diff --git a/backend/src/main/java/com/magistr/app/dto/TeacherSubjectResponse.java b/backend/src/main/java/com/magistr/app/dto/TeacherSubjectResponse.java old mode 100644 new mode 100755 diff --git a/backend/src/main/java/com/magistr/app/dto/UserResponse.java b/backend/src/main/java/com/magistr/app/dto/UserResponse.java old mode 100644 new mode 100755 diff --git a/backend/src/main/java/com/magistr/app/model/Classroom.java b/backend/src/main/java/com/magistr/app/model/Classroom.java old mode 100644 new mode 100755 diff --git a/backend/src/main/java/com/magistr/app/model/EducationForm.java b/backend/src/main/java/com/magistr/app/model/EducationForm.java old mode 100644 new mode 100755 diff --git a/backend/src/main/java/com/magistr/app/model/Equipment.java b/backend/src/main/java/com/magistr/app/model/Equipment.java old mode 100644 new mode 100755 diff --git a/backend/src/main/java/com/magistr/app/model/Lesson.java b/backend/src/main/java/com/magistr/app/model/Lesson.java old mode 100644 new mode 100755 index b5bd559..5d89202 --- a/backend/src/main/java/com/magistr/app/model/Lesson.java +++ b/backend/src/main/java/com/magistr/app/model/Lesson.java @@ -16,8 +16,8 @@ public class Lesson { @Column(name = "group_id", nullable = false) private Long groupId; - @Column(name = "lesson_type_id", nullable = false) - private Long lessonTypeId; + @Column(name = "subject_id", nullable = false) + private Long subjectId; @Column(name = "day", nullable = false, length = 255) private String day; @@ -55,12 +55,12 @@ public class Lesson { this.groupId = groupId; } - public Long getLessonTypeId() { - return lessonTypeId; + public Long getSubjectId() { + return subjectId; } - public void setLessonTypeId(Long lessonTypeId) { - this.lessonTypeId = lessonTypeId; + public void setSubjectId(Long subjectId) { + this.subjectId = subjectId; } public String getDay() { diff --git a/backend/src/main/java/com/magistr/app/model/Role.java b/backend/src/main/java/com/magistr/app/model/Role.java old mode 100644 new mode 100755 diff --git a/backend/src/main/java/com/magistr/app/model/StudentGroup.java b/backend/src/main/java/com/magistr/app/model/StudentGroup.java old mode 100644 new mode 100755 diff --git a/backend/src/main/java/com/magistr/app/model/Subject.java b/backend/src/main/java/com/magistr/app/model/Subject.java old mode 100644 new mode 100755 diff --git a/backend/src/main/java/com/magistr/app/model/TeacherSubject.java b/backend/src/main/java/com/magistr/app/model/TeacherSubject.java old mode 100644 new mode 100755 diff --git a/backend/src/main/java/com/magistr/app/model/TeacherSubjectId.java b/backend/src/main/java/com/magistr/app/model/TeacherSubjectId.java old mode 100644 new mode 100755 diff --git a/backend/src/main/java/com/magistr/app/model/User.java b/backend/src/main/java/com/magistr/app/model/User.java old mode 100644 new mode 100755 diff --git a/backend/src/main/java/com/magistr/app/repository/ClassroomRepository.java b/backend/src/main/java/com/magistr/app/repository/ClassroomRepository.java old mode 100644 new mode 100755 diff --git a/backend/src/main/java/com/magistr/app/repository/EducationFormRepository.java b/backend/src/main/java/com/magistr/app/repository/EducationFormRepository.java old mode 100644 new mode 100755 diff --git a/backend/src/main/java/com/magistr/app/repository/EquipmentRepository.java b/backend/src/main/java/com/magistr/app/repository/EquipmentRepository.java old mode 100644 new mode 100755 diff --git a/backend/src/main/java/com/magistr/app/repository/GroupRepository.java b/backend/src/main/java/com/magistr/app/repository/GroupRepository.java old mode 100644 new mode 100755 diff --git a/backend/src/main/java/com/magistr/app/repository/LessonRepository.java b/backend/src/main/java/com/magistr/app/repository/LessonRepository.java old mode 100644 new mode 100755 index 3af1d8f..f02e9b5 --- a/backend/src/main/java/com/magistr/app/repository/LessonRepository.java +++ b/backend/src/main/java/com/magistr/app/repository/LessonRepository.java @@ -3,9 +3,12 @@ package com.magistr.app.repository; import com.magistr.app.model.Lesson; import org.springframework.data.jpa.repository.JpaRepository; +import java.util.List; import java.util.Optional; public interface LessonRepository extends JpaRepository { - Optional findByLessonTypeId(Long lessonTypeId); + Optional findBySubjectId(Long subjectId); + + List findByTeacherId(Long teacherId); } diff --git a/backend/src/main/java/com/magistr/app/repository/SubjectRepository.java b/backend/src/main/java/com/magistr/app/repository/SubjectRepository.java old mode 100644 new mode 100755 diff --git a/backend/src/main/java/com/magistr/app/repository/TeacherSubjectRepository.java b/backend/src/main/java/com/magistr/app/repository/TeacherSubjectRepository.java old mode 100644 new mode 100755 diff --git a/backend/src/main/java/com/magistr/app/repository/UserRepository.java b/backend/src/main/java/com/magistr/app/repository/UserRepository.java old mode 100644 new mode 100755 diff --git a/backend/src/main/java/com/magistr/app/utils/DayAndWeekValidator.java b/backend/src/main/java/com/magistr/app/utils/DayAndWeekValidator.java new file mode 100755 index 0000000..b4461f9 --- /dev/null +++ b/backend/src/main/java/com/magistr/app/utils/DayAndWeekValidator.java @@ -0,0 +1,30 @@ +package com.magistr.app.utils; + +import java.util.Set; + +public class DayAndWeekValidator { + + private static final Set VALID_DAYS = Set.of( + "Понедельник", "Вторник", "Среда", "Четверг", "Пятница", "Суббота" + ); + + private static final Set VALID_WEEKS = Set.of( + "Верхняя", "Нижняя", "Обе" + ); + + public static boolean isValidDay(String day) { + return day != null && VALID_DAYS.contains(day); + } + + public static boolean isValidWeek(String week) { + return week != null && VALID_WEEKS.contains(week); + } + + public static String getValidDaysMessage() { + return "Допустимые дни: " + String.join(", ", VALID_DAYS); + } + + public static String getValidWeekMessage() { + return "Допустимы для выбора: " + String.join(", ", VALID_WEEKS); + } +} diff --git a/backend/src/main/resources/application.properties b/backend/src/main/resources/application.properties old mode 100644 new mode 100755 index 35a3635..05625aa --- a/backend/src/main/resources/application.properties +++ b/backend/src/main/resources/application.properties @@ -10,3 +10,6 @@ spring.datasource.driver-class-name=org.postgresql.Driver spring.jpa.hibernate.ddl-auto=validate spring.jpa.show-sql=false spring.jpa.open-in-view=false + +#Eta nastroyka otvechayet za vklyucheniye vidimosti logov urovnya DEBUG v logakh BE, poka vyklyuchil chtoby ne zasoryat'. Zapisi INFO otobrazhat'sya budut +#logging.level.root=DEBUG diff --git a/compose.yaml b/compose.yaml old mode 100644 new mode 100755 diff --git a/db/init/init.sql b/db/init/init.sql old mode 100644 new mode 100755 index 87f4c46..eb434fb --- a/db/init/init.sql +++ b/db/init/init.sql @@ -185,7 +185,7 @@ CREATE TABLE IF NOT EXISTS lessons ( id BIGSERIAL PRIMARY KEY, teacher_id BIGINT NOT NULL REFERENCES users(id), group_id BIGINT NOT NULL REFERENCES student_groups(id), - lesson_type_id BIGINT NOT NULL REFERENCES lesson_types(id), + subject_id BIGINT NOT NULL REFERENCES subjects(id), day VARCHAR(255) NOT NULL, week VARCHAR(255) NOT NULL, time VARCHAR(255) NOT NULL diff --git a/frontend/.dockerignore b/frontend/.dockerignore old mode 100644 new mode 100755 diff --git a/frontend/Dockerfile b/frontend/Dockerfile old mode 100644 new mode 100755 diff --git a/frontend/admin/admin.js b/frontend/admin/admin.js deleted file mode 100644 index 9d0c01b..0000000 --- a/frontend/admin/admin.js +++ /dev/null @@ -1,911 +0,0 @@ -(() => { - 'use strict'; - - const token = localStorage.getItem('token'); - const role = localStorage.getItem('role'); - - if (!token || role !== 'ADMIN') { - window.location.href = '/'; - return; - } - - // ---- DOM refs ---- - const pageTitle = document.getElementById('page-title'); - const btnLogout = document.getElementById('btn-logout'); - const menuToggle = document.getElementById('menu-toggle'); - const sidebar = document.querySelector('.sidebar'); - const sidebarOverlay = document.getElementById('sidebar-overlay'); - - // Global Ripple Effect - document.addEventListener('click', function (e) { - const btn = e.target.closest('.btn-create, .btn-delete, .btn-logout'); - if (!btn) return; - - const rect = btn.getBoundingClientRect(); - const x = e.clientX - rect.left; - const y = e.clientY - rect.top; - - const ripple = document.createElement('span'); - ripple.classList.add('ripple'); - ripple.style.left = `${x}px`; - ripple.style.top = `${y}px`; - - if (getComputedStyle(btn).position === 'static') { - btn.style.position = 'relative'; - } - btn.style.overflow = 'hidden'; - - btn.appendChild(ripple); - - setTimeout(() => ripple.remove(), 600); - }); - - // Users - const usersTbody = document.getElementById('users-tbody'); - const createForm = document.getElementById('create-form'); - const createAlert = document.getElementById('create-alert'); - - // Groups - const groupsTbody = document.getElementById('groups-tbody'); - const createGroupForm = document.getElementById('create-group-form'); - const createGroupAlert = document.getElementById('create-group-alert'); - const newGroupEfSelect = document.getElementById('new-group-ef'); - const filterEfSelect = document.getElementById('filter-ef'); - - // Education Forms - const efTbody = document.getElementById('ef-tbody'); - const createEfForm = document.getElementById('create-ef-form'); - const createEfAlert = document.getElementById('create-ef-alert'); - - // Classrooms - const classroomsTbody = document.getElementById('classrooms-tbody'); - const createClassroomForm = document.getElementById('create-classroom-form'); - const createClassroomAlert = document.getElementById('create-classroom-alert'); - const modalEditClassroom = document.getElementById('modal-edit-classroom'); - const modalEditClassroomClose = document.getElementById('modal-edit-classroom-close'); - const editClassroomForm = document.getElementById('edit-classroom-form'); - const editClassroomAlert = document.getElementById('edit-classroom-alert'); - const editEquipmentCheckboxes = document.getElementById('edit-equipment-checkboxes'); - - // Equipments - const equipmentsTbody = document.getElementById('equipments-tbody'); - const createEquipmentForm = document.getElementById('create-equipment-form'); - const createEquipmentAlert = document.getElementById('create-equipment-alert'); - const equipmentCheckboxes = document.getElementById('equipment-checkboxes'); - - // Subjects - const subjectsTbody = document.getElementById('subjects-tbody'); - const createSubjectForm = document.getElementById('create-subject-form'); - const createSubjectAlert = document.getElementById('create-subject-alert'); - const assignTeacherForm = document.getElementById('assign-teacher-form'); - const assignTeacherAlert = document.getElementById('assign-teacher-alert'); - const assignTeacherSelect = document.getElementById('assign-teacher-select'); - const assignSubjectSelect = document.getElementById('assign-subject-select'); - const teacherSubjectsTbody = document.getElementById('teacher-subjects-tbody'); - - // --- Multi-select logic --- - function updateSelectText(containerId, textId) { - const container = document.getElementById(containerId); - const textEl = document.getElementById(textId); - if (!container || !textEl) return; - const checked = Array.from(container.querySelectorAll('input:checked')); - if (checked.length === 0) { - textEl.textContent = 'Выберите оборудование...'; - } else if (checked.length === 1) { - textEl.textContent = checked[0].parentElement.textContent.trim(); - } else { - textEl.textContent = `Выбрано: ${checked.length}`; - } - } - - function initMultiSelect(boxId, menuId, textId, checkboxContainerId) { - const box = document.getElementById(boxId); - const menu = document.getElementById(menuId); - const container = document.getElementById(checkboxContainerId); - if (!box || !menu || !container) return; - - box.addEventListener('click', (e) => { - e.stopPropagation(); - const isOpen = menu.classList.contains('open'); - document.querySelectorAll('.dropdown-menu').forEach(m => m.classList.remove('open')); - document.querySelectorAll('.select-box').forEach(b => b.classList.remove('active')); - if (!isOpen) { - menu.classList.add('open'); - box.classList.add('active'); - } - }); - - menu.addEventListener('click', (e) => { - e.stopPropagation(); - }); - - container.addEventListener('change', () => { - updateSelectText(checkboxContainerId, textId); - }); - } - - initMultiSelect('equipment-select-box', 'equipment-dropdown-menu', 'equipment-select-text', 'equipment-checkboxes'); - initMultiSelect('edit-equipment-select-box', 'edit-equipment-dropdown-menu', 'edit-equipment-select-text', 'edit-equipment-checkboxes'); - - document.addEventListener('click', () => { - document.querySelectorAll('.dropdown-menu').forEach(m => m.classList.remove('open')); - document.querySelectorAll('.select-box').forEach(b => b.classList.remove('active')); - }); - // -------------------------- - - const navItems = document.querySelectorAll('.nav-item[data-tab]'); - const tabContents = document.querySelectorAll('.tab-content'); - - // ---- State ---- - let allGroups = []; - let allEducationForms = []; - let allEquipments = []; - let allSubjects = []; - let allTeachers = []; - - // ---- Tab Switching ---- - const TAB_TITLES = { - users: 'Управление пользователями', - groups: 'Управление группами', - 'edu-forms': 'Формы обучения', - equipments: 'Оборудование', - classrooms: 'Аудитории', - subjects: 'Дисциплины и преподаватели' - }; - - navItems.forEach(item => { - item.addEventListener('click', (e) => { - e.preventDefault(); - switchTab(item.dataset.tab); - }); - }); - - function switchTab(tab) { - navItems.forEach(n => n.classList.remove('active')); - document.querySelector(`.nav-item[data-tab="${tab}"]`)?.classList.add('active'); - - tabContents.forEach(tc => tc.style.display = 'none'); - const target = document.getElementById('tab-' + tab); - if (target) target.style.display = ''; - - pageTitle.textContent = TAB_TITLES[tab] || ''; - - if (tab === 'users') loadUsers(); - if (tab === 'groups') { loadEducationForms().then(() => loadGroups()); } - if (tab === 'edu-forms') loadEducationForms(); - if (tab === 'equipments') loadEquipments(); - if (tab === 'classrooms') { loadEquipments().then(() => loadClassrooms()); } - if (tab === 'subjects') { Promise.all([loadSubjects(), loadTeachers()]).then(() => loadTeacherSubjects()); } - - sidebar.classList.remove('open'); - sidebarOverlay.classList.remove('open'); - } - - // ---- Mobile Menu ---- - menuToggle.addEventListener('click', () => { - sidebar.classList.toggle('open'); - sidebarOverlay.classList.toggle('open'); - }); - sidebarOverlay.addEventListener('click', () => { - sidebar.classList.remove('open'); - sidebarOverlay.classList.remove('open'); - }); - - // ---- Helpers ---- - const ROLE_LABELS = { ADMIN: 'Администратор', TEACHER: 'Преподаватель', STUDENT: 'Студент' }; - const ROLE_BADGE = { ADMIN: 'badge-admin', TEACHER: 'badge-teacher', STUDENT: 'badge-student' }; - - function escapeHtml(str) { - const div = document.createElement('div'); - div.textContent = str; - return div.innerHTML; - } - - function showAlert(el, msg, type) { - el.className = 'form-alert ' + type; - el.textContent = msg; - } - - function hideAlert(el) { - el.className = 'form-alert'; - el.textContent = ''; - } - - // ============================================================ - // USERS - // ============================================================ - - async function loadUsers() { - try { - const res = await fetch('/api/users', { - headers: { 'Authorization': 'Bearer ' + token }, - }); - const users = await res.json(); - renderUsers(users); - } catch (e) { - usersTbody.innerHTML = 'Ошибка загрузки'; - } - } - - function renderUsers(users) { - if (!users.length) { - usersTbody.innerHTML = 'Нет пользователей'; - return; - } - usersTbody.innerHTML = users.map(u => ` - - ${u.id} - ${escapeHtml(u.username)} - ${ROLE_LABELS[u.role] || u.role} - - - `).join(''); - } - - createForm.addEventListener('submit', async (e) => { - e.preventDefault(); - hideAlert(createAlert); - const username = document.getElementById('new-username').value.trim(); - const password = document.getElementById('new-password').value; - const role = document.getElementById('new-role').value; - if (!username || !password) { showAlert(createAlert, 'Заполните все поля', 'error'); return; } - - try { - const res = await fetch('/api/users', { - method: 'POST', - headers: { 'Content-Type': 'application/json', 'Authorization': 'Bearer ' + token }, - body: JSON.stringify({ username, password, role }), - }); - const data = await res.json(); - if (res.ok) { - showAlert(createAlert, `Пользователь "${data.username}" создан`, 'success'); - createForm.reset(); - loadUsers(); - } else { - showAlert(createAlert, data.message || 'Ошибка создания', 'error'); - } - } catch (e) { showAlert(createAlert, 'Ошибка соединения', 'error'); } - }); - - usersTbody.addEventListener('click', async (e) => { - const btn = e.target.closest('.btn-delete'); - if (!btn) return; - if (!confirm('Удалить пользователя?')) return; - try { - const res = await fetch('/api/users/' + btn.dataset.id, { - method: 'DELETE', - headers: { 'Authorization': 'Bearer ' + token }, - }); - if (res.ok) loadUsers(); - else alert('Ошибка удаления'); - } catch (e) { alert('Ошибка соединения'); } - }); - - // ============================================================ - // EDUCATION FORMS - // ============================================================ - - async function loadEducationForms() { - try { - const res = await fetch('/api/education-forms', { - headers: { 'Authorization': 'Bearer ' + token }, - }); - allEducationForms = await res.json(); - renderEfTable(allEducationForms); - populateEfSelects(allEducationForms); - } catch (e) { - efTbody.innerHTML = 'Ошибка загрузки'; - } - } - - function renderEfTable(forms) { - if (!forms.length) { - efTbody.innerHTML = 'Нет форм обучения'; - return; - } - efTbody.innerHTML = forms.map(ef => ` - - ${ef.id} - ${escapeHtml(ef.name)} - - `).join(''); - } - - function populateEfSelects(forms) { - // Group creation select - const currentVal = newGroupEfSelect.value; - newGroupEfSelect.innerHTML = forms.map(ef => - `` - ).join(''); - if (currentVal && forms.find(f => f.id == currentVal)) { - newGroupEfSelect.value = currentVal; - } - - // Filter select - const currentFilter = filterEfSelect.value; - filterEfSelect.innerHTML = '' + - forms.map(ef => - `` - ).join(''); - if (currentFilter) filterEfSelect.value = currentFilter; - } - - createEfForm.addEventListener('submit', async (e) => { - e.preventDefault(); - hideAlert(createEfAlert); - const name = document.getElementById('new-ef-name').value.trim(); - if (!name) { showAlert(createEfAlert, 'Введите название', 'error'); return; } - - try { - const res = await fetch('/api/education-forms', { - method: 'POST', - headers: { 'Content-Type': 'application/json', 'Authorization': 'Bearer ' + token }, - body: JSON.stringify({ name }), - }); - const data = await res.json(); - if (res.ok) { - showAlert(createEfAlert, `Форма "${data.name}" создана`, 'success'); - createEfForm.reset(); - loadEducationForms(); - } else { - showAlert(createEfAlert, data.message || 'Ошибка создания', 'error'); - } - } catch (e) { showAlert(createEfAlert, 'Ошибка соединения', 'error'); } - }); - - efTbody.addEventListener('click', async (e) => { - const btn = e.target.closest('.btn-delete'); - if (!btn) return; - if (!confirm('Удалить форму обучения?')) return; - try { - const res = await fetch('/api/education-forms/' + btn.dataset.id, { - method: 'DELETE', - headers: { 'Authorization': 'Bearer ' + token }, - }); - if (res.ok) { - loadEducationForms(); - } else { - const data = await res.json(); - alert(data.message || 'Ошибка удаления'); - } - } catch (e) { alert('Ошибка соединения'); } - }); - - // ============================================================ - // GROUPS - // ============================================================ - - async function loadGroups() { - try { - const res = await fetch('/api/groups', { - headers: { 'Authorization': 'Bearer ' + token }, - }); - allGroups = await res.json(); - applyGroupFilter(); - } catch (e) { - groupsTbody.innerHTML = 'Ошибка загрузки'; - } - } - - function applyGroupFilter() { - const filterId = filterEfSelect.value; - const filtered = filterId - ? allGroups.filter(g => g.educationFormId == filterId) - : allGroups; - renderGroups(filtered); - } - - filterEfSelect.addEventListener('change', applyGroupFilter); - - function renderGroups(groups) { - if (!groups.length) { - groupsTbody.innerHTML = 'Нет групп'; - return; - } - groupsTbody.innerHTML = groups.map(g => ` - - ${g.id} - ${escapeHtml(g.name)} - ${escapeHtml(g.educationFormName)} - - `).join(''); - } - - createGroupForm.addEventListener('submit', async (e) => { - e.preventDefault(); - hideAlert(createGroupAlert); - const name = document.getElementById('new-group-name').value.trim(); - const educationFormId = newGroupEfSelect.value; - if (!name) { showAlert(createGroupAlert, 'Введите название группы', 'error'); return; } - if (!educationFormId) { showAlert(createGroupAlert, 'Выберите форму обучения', 'error'); return; } - - try { - const res = await fetch('/api/groups', { - method: 'POST', - headers: { 'Content-Type': 'application/json', 'Authorization': 'Bearer ' + token }, - body: JSON.stringify({ name, educationFormId: Number(educationFormId) }), - }); - const data = await res.json(); - if (res.ok) { - showAlert(createGroupAlert, `Группа "${data.name}" создана`, 'success'); - createGroupForm.reset(); - loadGroups(); - } else { - showAlert(createGroupAlert, data.message || 'Ошибка создания', 'error'); - } - } catch (e) { showAlert(createGroupAlert, 'Ошибка соединения', 'error'); } - }); - - groupsTbody.addEventListener('click', async (e) => { - const btn = e.target.closest('.btn-delete'); - if (!btn) return; - if (!confirm('Удалить группу?')) return; - try { - const res = await fetch('/api/groups/' + btn.dataset.id, { - method: 'DELETE', - headers: { 'Authorization': 'Bearer ' + token }, - }); - if (res.ok) loadGroups(); - else alert('Ошибка удаления'); - } catch (e) { alert('Ошибка соединения'); } - }); - - // ============================================================ - // EQUIPMENTS - // ============================================================ - - async function loadEquipments() { - try { - const res = await fetch('/api/equipments', { - headers: { 'Authorization': 'Bearer ' + token }, - }); - allEquipments = await res.json(); - renderEquipments(allEquipments); - renderEquipmentCheckboxes(allEquipments); - } catch (e) { - if (equipmentsTbody) equipmentsTbody.innerHTML = 'Ошибка загрузки'; - if (equipmentCheckboxes) equipmentCheckboxes.innerHTML = '

Ошибка загрузки

'; - } - } - - function renderEquipments(equipments) { - if (!equipments.length) { - equipmentsTbody.innerHTML = 'Нет оборудования'; - return; - } - equipmentsTbody.innerHTML = equipments.map(eq => ` - - ${eq.id} - ${escapeHtml(eq.name)} - - `).join(''); - } - - function renderEquipmentCheckboxes(equipments) { - if (!equipments.length) { - equipmentCheckboxes.innerHTML = '

Нет доступного оборудования

'; - return; - } - equipmentCheckboxes.innerHTML = equipments.map(eq => ` - - `).join(''); - updateSelectText('equipment-checkboxes', 'equipment-select-text'); - } - - createEquipmentForm.addEventListener('submit', async (e) => { - e.preventDefault(); - hideAlert(createEquipmentAlert); - const name = document.getElementById('new-equipment-name').value.trim(); - if (!name) { showAlert(createEquipmentAlert, 'Введите название', 'error'); return; } - - try { - const res = await fetch('/api/equipments', { - method: 'POST', - headers: { 'Content-Type': 'application/json', 'Authorization': 'Bearer ' + token }, - body: JSON.stringify({ name }), - }); - const data = await res.json(); - if (res.ok) { - showAlert(createEquipmentAlert, `Оборудование "${data.name}" добавлено`, 'success'); - createEquipmentForm.reset(); - loadEquipments(); - } else { - showAlert(createEquipmentAlert, data.message || 'Ошибка создания', 'error'); - } - } catch (e) { showAlert(createEquipmentAlert, 'Ошибка соединения', 'error'); } - }); - - equipmentsTbody.addEventListener('click', async (e) => { - const btn = e.target.closest('.btn-delete'); - if (!btn) return; - if (!confirm('Удалить оборудование?')) return; - try { - const res = await fetch('/api/equipments/' + btn.dataset.id, { - method: 'DELETE', - headers: { 'Authorization': 'Bearer ' + token }, - }); - if (res.ok) { - loadEquipments(); - } else { - const data = await res.json(); - alert(data.message || 'Ошибка удаления'); - } - } catch (e) { alert('Ошибка соединения'); } - }); - - // ============================================================ - // CLASSROOMS - // ============================================================ - - async function loadClassrooms() { - try { - const res = await fetch('/api/classrooms', { - headers: { 'Authorization': 'Bearer ' + token }, - }); - const classrooms = await res.json(); - renderClassrooms(classrooms); - } catch (e) { - classroomsTbody.innerHTML = 'Ошибка загрузки'; - } - } - - function renderClassrooms(classrooms) { - if (!classrooms.length) { - classroomsTbody.innerHTML = 'Нет аудиторий'; - return; - } - classroomsTbody.innerHTML = classrooms.map(c => { - const equipHtml = c.equipments && c.equipments.length - ? c.equipments.map(eq => escapeHtml(eq.name)).join(', ') - : '—'; - - return ` - - ${c.id} - ${escapeHtml(c.name)} - ${c.capacity} чел. - ${equipHtml} - -
- - ${c.isAvailable ? 'Доступна' : 'Не доступна'} - - -
- - - - - - `; - }).join(''); - } - - createClassroomForm.addEventListener('submit', async (e) => { - e.preventDefault(); - hideAlert(createClassroomAlert); - const name = document.getElementById('new-classroom-name').value.trim(); - const capacity = parseInt(document.getElementById('new-classroom-capacity').value, 10); - - const checkedBoxes = Array.from(equipmentCheckboxes.querySelectorAll('input:checked')); - const equipmentIds = checkedBoxes.map(chk => parseInt(chk.value, 10)); - - if (!name || isNaN(capacity)) { showAlert(createClassroomAlert, 'Заполните обязательные поля', 'error'); return; } - - try { - const res = await fetch('/api/classrooms', { - method: 'POST', - headers: { 'Content-Type': 'application/json', 'Authorization': 'Bearer ' + token }, - body: JSON.stringify({ name, capacity, equipmentIds, isAvailable: true }), - }); - const data = await res.json(); - if (res.ok) { - showAlert(createClassroomAlert, `Аудитория "${data.name}" добавлена`, 'success'); - createClassroomForm.reset(); - updateSelectText('equipment-checkboxes', 'equipment-select-text'); - loadClassrooms(); - } else { - showAlert(createClassroomAlert, data.message || 'Ошибка создания', 'error'); - } - } catch (e) { showAlert(createClassroomAlert, 'Ошибка соединения', 'error'); } - }); - - classroomsTbody.addEventListener('click', async (e) => { - const btnDelete = e.target.closest('.btn-delete'); - const btnToggleStatus = e.target.closest('.btn-icon-toggle'); - const btnEdit = e.target.closest('.btn-edit-classroom'); - - if (btnDelete) { - if (!confirm('Удалить аудиторию?')) return; - try { - const res = await fetch('/api/classrooms/' + btnDelete.dataset.id, { - method: 'DELETE', - headers: { 'Authorization': 'Bearer ' + token }, - }); - if (res.ok) loadClassrooms(); - else alert('Ошибка удаления'); - } catch (err) { alert('Ошибка соединения'); } - } - - if (btnToggleStatus) { - const id = btnToggleStatus.dataset.id; - const currentStatus = btnToggleStatus.dataset.currentStatus === 'true'; - try { - const res = await fetch('/api/classrooms/' + id, { - method: 'PUT', - headers: { 'Content-Type': 'application/json', 'Authorization': 'Bearer ' + token }, - body: JSON.stringify({ isAvailable: !currentStatus }), - }); - if (res.ok) loadClassrooms(); - else alert('Ошибка изменения статуса'); - } catch (err) { alert('Ошибка соединения'); } - } - - if (btnEdit) { - const id = btnEdit.dataset.id; - openEditClassroomModal(id); - } - }); - - let editingClassroomData = null; - - async function openEditClassroomModal(id) { - try { - const res = await fetch('/api/classrooms', { headers: { 'Authorization': 'Bearer ' + token } }); - const classrooms = await res.json(); - editingClassroomData = classrooms.find(c => c.id == id); - - if (!editingClassroomData) return; - - document.getElementById('edit-classroom-id').value = editingClassroomData.id; - document.getElementById('edit-classroom-name').value = editingClassroomData.name; - document.getElementById('edit-classroom-capacity').value = editingClassroomData.capacity; - - if (allEquipments.length) { - editEquipmentCheckboxes.innerHTML = allEquipments.map(eq => { - const isChecked = editingClassroomData.equipments.some(e => e.id === eq.id) ? 'checked' : ''; - return ` - - `; - }).join(''); - } else { - editEquipmentCheckboxes.innerHTML = '

Нет доступного оборудования

'; - } - updateSelectText('edit-equipment-checkboxes', 'edit-equipment-select-text'); - - hideAlert(editClassroomAlert); - modalEditClassroom.classList.add('open'); - } catch (e) { - alert('Ошибка загрузки данных аудитории'); - } - } - - modalEditClassroomClose.addEventListener('click', () => { - modalEditClassroom.classList.remove('open'); - }); - - modalEditClassroom.addEventListener('click', (e) => { - if (e.target === modalEditClassroom) { - modalEditClassroom.classList.remove('open'); - } - }); - - editClassroomForm.addEventListener('submit', async (e) => { - e.preventDefault(); - hideAlert(editClassroomAlert); - const id = document.getElementById('edit-classroom-id').value; - const name = document.getElementById('edit-classroom-name').value.trim(); - const capacity = parseInt(document.getElementById('edit-classroom-capacity').value, 10); - - const checkedBoxes = Array.from(editEquipmentCheckboxes.querySelectorAll('input:checked')); - const equipmentIds = checkedBoxes.map(chk => parseInt(chk.value, 10)); - - if (!name || isNaN(capacity)) { showAlert(editClassroomAlert, 'Заполните обязательные поля', 'error'); return; } - - try { - const res = await fetch('/api/classrooms/' + id, { - method: 'PUT', - headers: { 'Content-Type': 'application/json', 'Authorization': 'Bearer ' + token }, - body: JSON.stringify({ name, capacity, equipmentIds, isAvailable: editingClassroomData.isAvailable }), - }); - const data = await res.json(); - if (res.ok) { - modalEditClassroom.classList.remove('open'); - showAlert(createClassroomAlert, `Аудитория "${data.name}" обновлена`, 'success'); - loadClassrooms(); - } else { - showAlert(editClassroomAlert, data.message || 'Ошибка обновления', 'error'); - } - } catch (e) { showAlert(editClassroomAlert, 'Ошибка соединения', 'error'); } - }); - - // ============================================================ - // SUBJECTS - // ============================================================ - - async function loadSubjects() { - try { - const res = await fetch('/api/subjects', { - headers: { 'Authorization': 'Bearer ' + token }, - }); - allSubjects = await res.json(); - renderSubjects(allSubjects); - populateSubjectSelect(allSubjects); - } catch (e) { - if (subjectsTbody) subjectsTbody.innerHTML = 'Ошибка загрузки'; - } - } - - function renderSubjects(subjects) { - if (!subjects.length) { - subjectsTbody.innerHTML = 'Нет дисциплин'; - return; - } - subjectsTbody.innerHTML = subjects.map(s => ` - - ${s.id} - ${escapeHtml(s.name)} - - `).join(''); - } - - function populateSubjectSelect(subjects) { - if (!assignSubjectSelect) return; - const currentVal = assignSubjectSelect.value; - assignSubjectSelect.innerHTML = '' + - subjects.map(s => ``).join(''); - if (currentVal && subjects.find(s => s.id == currentVal)) { - assignSubjectSelect.value = currentVal; - } - } - - async function loadTeachers() { - try { - const res = await fetch('/api/users/teachers', { - headers: { 'Authorization': 'Bearer ' + token }, - }); - allTeachers = await res.json(); - populateTeacherSelect(allTeachers); - } catch (e) { - if (assignTeacherSelect) assignTeacherSelect.innerHTML = ''; - } - } - - function populateTeacherSelect(teachers) { - if (!assignTeacherSelect) return; - const currentVal = assignTeacherSelect.value; - if (!teachers.length) { - assignTeacherSelect.innerHTML = ''; - return; - } - assignTeacherSelect.innerHTML = '' + - teachers.map(t => ``).join(''); - if (currentVal && teachers.find(t => t.id == currentVal)) { - assignTeacherSelect.value = currentVal; - } - } - - async function loadTeacherSubjects() { - try { - const res = await fetch('/api/teacher-subjects', { - headers: { 'Authorization': 'Bearer ' + token }, - }); - const tsData = await res.json(); - renderTeacherSubjects(tsData); - } catch (e) { - if (teacherSubjectsTbody) teacherSubjectsTbody.innerHTML = 'Ошибка загрузки'; - } - } - - function renderTeacherSubjects(tsArray) { - if (!tsArray.length) { - teacherSubjectsTbody.innerHTML = 'Нет привязок'; - return; - } - teacherSubjectsTbody.innerHTML = tsArray.map(ts => ` - - ${escapeHtml(ts.username)} - ${escapeHtml(ts.subjectName)} - - `).join(''); - } - - createSubjectForm.addEventListener('submit', async (e) => { - e.preventDefault(); - hideAlert(createSubjectAlert); - const name = document.getElementById('new-subject-name').value.trim(); - if (!name) { showAlert(createSubjectAlert, 'Введите название', 'error'); return; } - - try { - const res = await fetch('/api/subjects', { - method: 'POST', - headers: { 'Content-Type': 'application/json', 'Authorization': 'Bearer ' + token }, - body: JSON.stringify({ name }), - }); - const data = await res.json(); - if (res.ok) { - showAlert(createSubjectAlert, `Дисциплина "${data.name}" добавлена`, 'success'); - createSubjectForm.reset(); - loadSubjects(); - } else { - showAlert(createSubjectAlert, data.message || 'Ошибка создания', 'error'); - } - } catch (e) { showAlert(createSubjectAlert, 'Ошибка соединения', 'error'); } - }); - - subjectsTbody.addEventListener('click', async (e) => { - const btn = e.target.closest('.btn-delete'); - if (!btn) return; - if (!confirm('Удалить дисциплину?')) return; - try { - const res = await fetch('/api/subjects/' + btn.dataset.id, { - method: 'DELETE', - headers: { 'Authorization': 'Bearer ' + token }, - }); - if (res.ok) { - loadSubjects(); - loadTeacherSubjects(); - } else { - const data = await res.json(); - alert(data.message || 'Ошибка удаления'); - } - } catch (e) { alert('Ошибка соединения'); } - }); - - assignTeacherForm.addEventListener('submit', async (e) => { - e.preventDefault(); - hideAlert(assignTeacherAlert); - const userId = assignTeacherSelect.value; - const subjectId = assignSubjectSelect.value; - if (!userId) { showAlert(assignTeacherAlert, 'Выберите преподавателя', 'error'); return; } - if (!subjectId) { showAlert(assignTeacherAlert, 'Выберите дисциплину', 'error'); return; } - - try { - const res = await fetch('/api/teacher-subjects', { - method: 'POST', - headers: { 'Content-Type': 'application/json', 'Authorization': 'Bearer ' + token }, - body: JSON.stringify({ userId: Number(userId), subjectId: Number(subjectId) }), - }); - const data = await res.json(); - if (res.ok) { - showAlert(assignTeacherAlert, 'Привязка создана', 'success'); - loadTeacherSubjects(); - } else { - showAlert(assignTeacherAlert, data.message || 'Ошибка привязки', 'error'); - } - } catch (e) { showAlert(assignTeacherAlert, 'Ошибка соединения', 'error'); } - }); - - teacherSubjectsTbody.addEventListener('click', async (e) => { - const btn = e.target.closest('.btn-delete'); - if (!btn) return; - if (!confirm('Удалить привязку?')) return; - try { - const res = await fetch('/api/teacher-subjects', { - method: 'DELETE', - headers: { 'Content-Type': 'application/json', 'Authorization': 'Bearer ' + token }, - body: JSON.stringify({ userId: Number(btn.dataset.userId), subjectId: Number(btn.dataset.subjectId) }), - }); - if (res.ok) loadTeacherSubjects(); - else alert('Ошибка удаления'); - } catch (e) { alert('Ошибка соединения'); } - }); - - // ============================================================ - // LOGOUT & INIT - // ============================================================ - - btnLogout.addEventListener('click', () => { - localStorage.removeItem('token'); - localStorage.removeItem('role'); - window.location.href = '/'; - }); - - loadUsers(); -})(); diff --git a/frontend/admin/admin.css b/frontend/admin/css/components.css old mode 100644 new mode 100755 similarity index 52% rename from frontend/admin/admin.css rename to frontend/admin/css/components.css index f178ab8..e579611 --- a/frontend/admin/admin.css +++ b/frontend/admin/css/components.css @@ -1,338 +1,4 @@ -/* ===== Reset & Base ===== */ -*, -*::before, -*::after { - margin: 0; - padding: 0; - box-sizing: border-box; -} - -:root { - /* Deep dark premium background */ - --bg-primary: #0a0a0f; - --bg-sidebar: rgba(255, 255, 255, 0.02); - --bg-card: rgba(255, 255, 255, 0.03); - --bg-card-border: rgba(255, 255, 255, 0.05); - --bg-input: rgba(255, 255, 255, 0.04); - --bg-input-focus: rgba(255, 255, 255, 0.08); - --bg-hover: rgba(255, 255, 255, 0.06); - - /* Typography */ - --text-primary: #f8fafc; - --text-secondary: #94a3b8; - --text-placeholder: #475569; - - /* Vibrant Accents */ - --accent: #8b5cf6; - --accent-hover: #a78bfa; - --accent-glow: rgba(139, 92, 246, 0.4); - --accent-secondary: #ec4899; - - /* Status Colors */ - --error: #ef4444; - --success: #10b981; - --warning: #f59e0b; - - /* Spatial */ - --radius-sm: 10px; - --radius-md: 16px; - --transition: 0.3s cubic-bezier(0.25, 0.8, 0.25, 1); -} - -/* ===== Light Theme ===== */ -[data-theme="light"] { - --bg-primary: #f8fafc; - --bg-sidebar: rgba(255, 255, 255, 0.7); - --bg-card: rgba(255, 255, 255, 0.7); - --bg-card-border: rgba(0, 0, 0, 0.08); - --bg-input: rgba(0, 0, 0, 0.03); - --bg-input-focus: rgba(0, 0, 0, 0.06); - --bg-hover: rgba(0, 0, 0, 0.05); - --text-primary: #0f172a; - --text-secondary: #475569; - --text-placeholder: #94a3b8; - --accent: #6366f1; - --accent-hover: #4f46e5; - --accent-glow: rgba(99, 102, 241, 0.3); - --accent-secondary: #d946ef; - --error: #ef4444; - --success: #10b981; - --warning: #f59e0b; -} - -[data-theme="light"] .form-group select option, -[data-theme="light"] .filter-row select option { - background: #fff; - color: #1a1a2e; -} - -[data-theme="light"] .nav-item.active { - background: rgba(99, 102, 241, 0.18); -} - -[data-theme="light"] .custom-multi-select .dropdown-menu { - background: rgba(255, 255, 255, 0.98); -} - -[data-theme="light"] .form-group input, -[data-theme="light"] .form-group select, -[data-theme="light"] .filter-row select { - border-color: rgba(0, 0, 0, 0.15); -} - -[data-theme="light"] tbody td { - border-bottom-color: rgba(0, 0, 0, 0.08); -} - -html { - font-size: 16px; - -webkit-font-smoothing: antialiased; -} - -body { - font-family: 'Inter', -apple-system, BlinkMacSystemFont, sans-serif; - background: var(--bg-primary); - color: var(--text-primary); - min-height: 100vh; - display: flex; - transition: background 0.4s ease, color 0.4s ease; -} - -/* ===== Sidebar ===== */ -.sidebar { - width: 260px; - min-height: 100vh; - background: var(--bg-sidebar); - backdrop-filter: blur(20px); - -webkit-backdrop-filter: blur(20px); - border-right: 1px solid var(--bg-card-border); - display: flex; - flex-direction: column; - position: fixed; - left: 0; - top: 0; - bottom: 0; - z-index: 10; - transition: background 0.4s ease, border-color 0.4s ease, transform 0.4s cubic-bezier(0.25, 0.8, 0.25, 1); -} - -.sidebar-header { - padding: 1.25rem; - border-bottom: 1px solid var(--bg-card-border); -} - -.logo { - display: flex; - align-items: center; - gap: 0.75rem; - font-size: 1.15rem; - font-weight: 700; - letter-spacing: -0.02em; -} - -.sidebar-nav { - flex: 1; - padding: 0.75rem; -} - -.nav-item { - display: flex; - align-items: center; - gap: 0.75rem; - padding: 0.75rem 1rem; - margin-bottom: 0.25rem; - border-radius: var(--radius-sm); - color: var(--text-secondary); - text-decoration: none; - font-size: 0.95rem; - font-weight: 500; - transition: all var(--transition); - position: relative; - overflow: hidden; -} - -.nav-item::before { - content: ''; - position: absolute; - left: 0; - top: 0; - bottom: 0; - width: 3px; - background: var(--accent); - border-radius: 0 4px 4px 0; - transform: scaleY(0); - transition: transform var(--transition); - opacity: 0; -} - -.nav-item:hover { - background: var(--bg-hover); - color: var(--text-primary); - transform: translateX(4px); -} - -.nav-item.active { - background: rgba(139, 92, 246, 0.12); - color: var(--accent-hover); -} - -.nav-item.active::before { - transform: scaleY(1); - opacity: 1; -} - -.nav-item svg { - transition: transform var(--transition); -} - -.nav-item:hover svg, -.nav-item.active svg { - transform: scale(1.15) rotate(-5deg); -} - -/* Checkbox list styling */ -.checkbox-group { - display: flex; - flex-wrap: wrap; - gap: 12px; - padding: 8px 0; -} - -.checkbox-item { - display: flex; - align-items: center; - gap: 6px; - font-size: 0.9rem; - color: var(--text-base); - cursor: pointer; -} - -.checkbox-item input[type="checkbox"] { - cursor: pointer; - width: 16px; - height: 16px; - accent-color: var(--primary-color); -} - -/* Classroom Status Badges */ -.badge-available { - background-color: var(--success-bg); - color: var(--success-color); -} - -.badge-unavailable { - background-color: var(--error-bg); - color: var(--error-color); -} - -.status-cell { - display: flex; - align-items: center; - gap: 8px; -} - -.btn-icon-toggle { - background: var(--bg-body); - border: 1px solid var(--border-color); - color: var(--text-muted); - width: 28px; - height: 28px; - display: flex; - align-items: center; - justify-content: center; - border-radius: 6px; - cursor: pointer; - transition: all 0.2s cubic-bezier(0.4, 0, 0.2, 1); - padding: 0; -} - -.btn-icon-toggle:hover { - background: var(--card-bg); - border-color: var(--primary-color); - color: var(--primary-color); - transform: rotate(45deg); - box-shadow: 0 0 10px rgba(99, 102, 241, 0.2); -} - -.btn-icon-toggle svg { - display: block; -} - -.nav-item.active { - background: rgba(99, 102, 241, 0.12); - color: var(--accent-hover); -} - -.sidebar-footer { - padding: 0.75rem; - border-top: 1px solid var(--bg-card-border); -} - -.btn-logout { - width: 100%; - display: flex; - align-items: center; - gap: 0.6rem; - padding: 0.65rem 0.8rem; - border: none; - border-radius: var(--radius-sm); - background: none; - color: var(--text-secondary); - font-family: inherit; - font-size: 0.9rem; - cursor: pointer; - transition: background var(--transition), color var(--transition); -} - -.btn-logout:hover { - background: rgba(248, 113, 113, 0.1); - color: var(--error); -} - -/* ===== Main ===== */ -.main { - flex: 1; - margin-left: 260px; - min-height: 100vh; -} - -.topbar { - padding: 1.5rem 2rem; - border-bottom: 1px solid var(--bg-card-border); - transition: border-color 0.4s ease; - display: flex; - align-items: center; - justify-content: space-between; - gap: 1rem; -} - -.topbar h1 { - font-size: 1.3rem; - font-weight: 700; - letter-spacing: -0.02em; - flex: 1; -} - -.content { - padding: 1.5rem 2rem; - display: flex; - flex-direction: column; - gap: 1.5rem; -} - /* ===== Cards ===== */ -@keyframes slideUpCard { - from { - opacity: 0; - transform: translateY(15px); - } - - to { - opacity: 1; - transform: translateY(0); - } -} - .card { background: var(--bg-card); backdrop-filter: blur(20px); @@ -369,20 +35,6 @@ body { opacity: 1; } -/* Staggered cards */ -.card:nth-child(1) { - animation-delay: 0.1s; -} - -.card:nth-child(2) { - animation-delay: 0.2s; -} - -.card:nth-child(3) { - animation-delay: 0.3s; -} - -/* Specific Cards */ .create-card { z-index: 10; } @@ -396,7 +48,7 @@ body { letter-spacing: 0.04em; } -/* ===== Create Form ===== */ +/* ===== Form Structure ===== */ .form-row { display: flex; gap: 1rem; @@ -404,7 +56,7 @@ body { flex-wrap: wrap; } -.form-row .form-group { +.form-group { flex: 1; min-width: 160px; } @@ -459,9 +111,12 @@ input[type="number"]::-webkit-inner-spin-button { input[type="number"] { -moz-appearance: textfield; + appearance: textfield; } -.form-group select { +/* Select Base Style */ +.form-group select, +.filter-row select { cursor: pointer; appearance: none; background-image: url("data:image/svg+xml,%3Csvg width='12' height='8' viewBox='0 0 12 8' fill='none' xmlns='http://www.w3.org/2000/svg'%3E%3Cpath d='M1 1.5L6 6.5L11 1.5' stroke='%239ca3af' stroke-width='2' stroke-linecap='round' stroke-linejoin='round'/%3E%3C/svg%3E"); @@ -470,12 +125,166 @@ input[type="number"] { padding-right: 2.25rem; } -.form-group select option { +.form-group select option, +.filter-row select option { background: #1a1a2e; color: var(--text-primary); } -.btn-create { +/* Light theme selects */ +[data-theme="light"] .form-group input, +[data-theme="light"] .form-group select, +[data-theme="light"] .filter-row select { + border-color: rgba(0, 0, 0, 0.15); +} + +[data-theme="light"] .form-group select option, +[data-theme="light"] .filter-row select option { + background: #fff; + color: #1a1a2e; +} + +/* Filter Row */ +.card-header-row { + display: flex; + justify-content: space-between; + align-items: center; + flex-wrap: wrap; + gap: 0.75rem; +} + +.card-header-row h2 { + margin-bottom: 0; +} + +.filter-row { + display: flex; + align-items: center; + gap: 0.5rem; +} + +.filter-row label { + font-size: 0.78rem; + font-weight: 500; + color: var(--text-secondary); + text-transform: uppercase; + letter-spacing: 0.04em; + white-space: nowrap; +} + +.filter-row select { + padding: 0.45rem 2rem 0.45rem 0.7rem; + background: var(--bg-input); + border: 1px solid transparent; + border-radius: var(--radius-sm); + color: var(--text-primary); + font-size: 0.85rem; + transition: background var(--transition), border-color var(--transition), box-shadow var(--transition); +} + +.filter-row select:focus { + background-color: var(--bg-input-focus); + border-color: var(--accent); + box-shadow: 0 0 0 3px var(--accent-glow); +} + + +/* ===== Custom Multi-Select ===== */ +.custom-multi-select { + position: relative; + user-select: none; + width: 100%; +} + +.select-box { + display: flex; + align-items: center; + justify-content: space-between; + width: 100%; + padding: 0.75rem 1rem; + background: var(--bg-input); + border: 1px solid var(--bg-card-border); + border-radius: var(--radius-sm); + color: var(--text-primary); + font-size: 0.95rem; + cursor: pointer; + transition: all var(--transition); +} + +.select-box:hover { + background: var(--bg-hover); +} + +.select-box.active { + border-color: var(--accent); + box-shadow: 0 0 0 4px var(--accent-glow); +} + +.dropdown-icon { + transition: transform var(--transition); +} + +.select-box.active .dropdown-icon { + transform: rotate(180deg); +} + +.dropdown-menu { + position: absolute; + top: 100%; + left: 0; + width: 100%; + margin-top: 0.5rem; + background: rgba(15, 23, 42, 0.95); + backdrop-filter: blur(12px); + -webkit-backdrop-filter: blur(12px); + border: 1px solid var(--bg-card-border); + border-radius: var(--radius-sm); + box-shadow: 0 10px 25px rgba(0, 0, 0, 0.3); + padding: 1rem; + z-index: 100; + opacity: 0; + visibility: hidden; + transform: translateY(-10px); + transition: all var(--transition); +} + +[data-theme="light"] .custom-multi-select .dropdown-menu { + background: rgba(255, 255, 255, 0.98); +} + +.dropdown-menu.open { + opacity: 1; + visibility: visible; + transform: translateY(0); +} + +.checkbox-group-vertical { + display: flex; + flex-direction: column; + gap: 0.75rem; + max-height: 200px; + overflow-y: auto; +} + +.checkbox-item { + display: flex; + align-items: center; + gap: 0.75rem; + cursor: pointer; + font-size: 0.9rem; + color: var(--text-primary); + padding: 0.25rem 0; +} + +.checkbox-item input[type="checkbox"] { + cursor: pointer; + width: 1.1rem; + height: 1.1rem; + accent-color: var(--accent); +} + +/* ===== Buttons ===== */ +.btn-primary { position: relative; overflow: hidden; padding: 0.75rem 1.75rem; @@ -493,7 +302,7 @@ input[type="number"] { box-shadow: 0 4px 15px var(--accent-glow); } -.btn-create::before { +.btn-primary::before { content: ''; position: absolute; top: 0; @@ -506,32 +315,78 @@ input[type="number"] { transition: opacity var(--transition); } -.btn-create:hover { +.btn-primary:hover { transform: translateY(-2px); box-shadow: 0 8px 25px var(--accent-glow); } -.btn-create:hover::before { +.btn-primary:hover::before { opacity: 1; } -.btn-create:active { +.btn-primary:active { transform: translateY(1px); box-shadow: 0 2px 10px var(--accent-glow); } -@keyframes slideDownAlert { - from { - opacity: 0; - transform: translateY(-10px); - } - - to { - opacity: 1; - transform: translateY(0); - } +.btn-delete { + padding: 0.35rem 0.7rem; + background: rgba(248, 113, 113, 0.1); + border: 1px solid rgba(248, 113, 113, 0.2); + border-radius: var(--radius-sm); + color: var(--error); + font-family: inherit; + font-size: 0.8rem; + cursor: pointer; + transition: background var(--transition), transform var(--transition); + position: relative; + overflow: hidden; } +.btn-delete:hover { + background: rgba(248, 113, 113, 0.2); + transform: scale(1.05); +} + +.btn-icon-toggle { + background: transparent; + border: 1px solid var(--bg-card-border); + color: var(--text-secondary); + width: 28px; + height: 28px; + display: flex; + align-items: center; + justify-content: center; + border-radius: 6px; + cursor: pointer; + transition: all 0.2s cubic-bezier(0.4, 0, 0.2, 1); + padding: 0; +} + +.btn-icon-toggle:hover { + background: var(--bg-card); + border-color: var(--accent); + color: var(--accent); + transform: rotate(45deg); + box-shadow: 0 0 10px var(--accent-glow); +} + +.btn-edit-classroom { + 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-hover); + cursor: pointer; + transition: all var(--transition); +} + +.btn-edit-classroom:hover { + background: rgba(99, 102, 241, 0.2); + transform: translateY(-1px); +} + +/* ===== Alerts ===== */ .form-alert { display: none; padding: 0.6rem 1rem; @@ -558,7 +413,7 @@ input[type="number"] { /* ===== Table ===== */ .table-wrap { - overflow-x: visible; + overflow-x: auto; } table { @@ -577,17 +432,113 @@ thead th { border-bottom: 1px solid var(--bg-card-border); } -tbody td { - padding: 0.85rem 1rem; - font-size: 0.95rem; - border-bottom: 1px solid var(--bg-card-border); - transition: background var(--transition); +/* Sortable columns */ +thead th.sortable { + cursor: pointer; + user-select: none; + white-space: nowrap; + transition: color 0.2s ease; } -@keyframes slideInRow { +thead th.sortable:hover { + color: var(--accent); +} + +thead th.sortable.sort-active { + color: var(--accent); +} + +.sort-arrow { + display: inline-block; + width: 0; + height: 0; + margin-left: 5px; + vertical-align: middle; + border-left: 4px solid transparent; + border-right: 4px solid transparent; + border-bottom: 5px solid currentColor; + opacity: 0.3; + transition: transform 0.25s ease, opacity 0.25s ease; +} + +thead th.sortable:hover .sort-arrow { + opacity: 0.6; +} + +thead th.sortable.sort-asc .sort-arrow { + opacity: 1; + border-bottom: 5px solid var(--accent); + transform: rotate(0deg); +} + +thead th.sortable.sort-desc .sort-arrow { + opacity: 1; + border-bottom: 5px solid var(--accent); + transform: rotate(180deg); +} + +/* ===== Filter Icon & Popup ===== */ +thead th.filterable { + cursor: pointer; + user-select: none; + white-space: nowrap; + transition: color 0.2s ease; +} + +thead th.filterable:hover { + color: var(--accent); +} + +.filter-icon { + display: inline-block; + margin-left: 4px; + font-size: 0.65rem; + opacity: 0.4; + cursor: pointer; + transition: opacity 0.2s ease, color 0.2s ease; + vertical-align: middle; +} + +thead th.filterable:hover .filter-icon { + opacity: 0.8; +} + +thead th.filter-active .filter-icon { + opacity: 1; + color: var(--accent); +} + +thead th.filter-active { + color: var(--accent); +} + +.filter-popup { + position: absolute; + top: 100%; + left: 0; + min-width: 220px; + max-width: 280px; + background: rgba(15, 23, 42, 0.97); + backdrop-filter: blur(16px); + -webkit-backdrop-filter: blur(16px); + border: 1px solid var(--bg-card-border); + border-radius: var(--radius-sm); + box-shadow: 0 12px 32px rgba(0, 0, 0, 0.45); + padding: 0.75rem; + z-index: 200; + animation: filterPopupIn 0.2s ease-out both; + text-transform: none; +} + +[data-theme="light"] .filter-popup { + background: rgba(255, 255, 255, 0.98); + box-shadow: 0 12px 32px rgba(0, 0, 0, 0.15); +} + +@keyframes filterPopupIn { from { opacity: 0; - transform: translateY(10px); + transform: translateY(-6px); } to { @@ -596,16 +547,124 @@ tbody td { } } -@keyframes slideInRow { - from { - opacity: 0; - transform: translateX(-10px); - } +.filter-search { + width: 100%; + padding: 0.5rem 0.7rem; + background: var(--bg-input); + border: 1px solid var(--bg-card-border); + border-radius: 6px; + color: var(--text-primary); + font-family: inherit; + font-size: 0.85rem; + outline: none; + transition: border-color 0.2s ease, box-shadow 0.2s ease; + margin-bottom: 0.5rem; +} - to { - opacity: 1; - transform: translateX(0); - } +.filter-search::placeholder { + color: var(--text-placeholder); +} + +.filter-search:focus { + border-color: var(--accent); + box-shadow: 0 0 0 3px var(--accent-glow); +} + +.filter-btn-row { + display: flex; + gap: 0.4rem; + margin-bottom: 0.5rem; +} + +.filter-btn-action { + flex: 1; + padding: 0.3rem 0.5rem; + background: var(--bg-input); + border: 1px solid var(--bg-card-border); + border-radius: 6px; + color: var(--text-secondary); + font-family: inherit; + font-size: 0.75rem; + cursor: pointer; + transition: all 0.2s ease; +} + +.filter-btn-action:hover { + background: var(--bg-hover); + color: var(--text-primary); + border-color: var(--accent); +} + +.filter-list { + max-height: 180px; + overflow-y: auto; + margin-bottom: 0.5rem; + scrollbar-width: thin; + scrollbar-color: var(--bg-card-border) transparent; +} + +.filter-list::-webkit-scrollbar { + width: 4px; +} + +.filter-list::-webkit-scrollbar-thumb { + background: var(--bg-card-border); + border-radius: 2px; +} + +.filter-item { + display: flex; + align-items: center; + gap: 0.5rem; + padding: 0.35rem 0.3rem; + border-radius: 4px; + cursor: pointer; + font-size: 0.85rem; + color: var(--text-primary); + transition: background 0.15s ease; +} + +.filter-item:hover { + background: var(--bg-hover); +} + +.filter-item input[type="checkbox"] { + cursor: pointer; + width: 1rem; + height: 1rem; + accent-color: var(--accent); + flex-shrink: 0; +} + +.filter-btn-apply { + width: 100%; + padding: 0.5rem; + background: linear-gradient(135deg, var(--accent), var(--accent-secondary)); + border: none; + border-radius: 6px; + color: #fff; + font-family: inherit; + font-size: 0.82rem; + font-weight: 600; + cursor: pointer; + transition: transform 0.2s ease, box-shadow 0.2s ease; + box-shadow: 0 3px 10px var(--accent-glow); +} + +.filter-btn-apply:hover { + transform: translateY(-1px); + box-shadow: 0 5px 15px var(--accent-glow); +} + +tbody td { + padding: 0.85rem 1rem; + font-size: 0.95rem; + border-bottom: 1px solid var(--bg-card-border); + transition: background var(--transition); +} + +[data-theme="light"] tbody td { + border-bottom-color: rgba(0, 0, 0, 0.08); } tbody tr { @@ -613,6 +672,7 @@ tbody tr { animation: slideInRow 0.3s ease-out both; } +/* Animation delays */ tbody tr:nth-child(1) { animation-delay: 0.05s; } @@ -647,7 +707,7 @@ tbody tr:hover { padding: 2rem !important; } -/* ===== Role Badges ===== */ +/* ===== Badges ===== */ .badge { display: inline-block; padding: 0.2rem 0.6rem; @@ -673,281 +733,48 @@ tbody tr:hover { color: var(--success); } -/* ===== Education Form Badge ===== */ .badge-ef { background: rgba(99, 102, 241, 0.15); color: var(--accent-hover); } -/* ===== Card Header Row ===== */ -.card-header-row { - display: flex; - justify-content: space-between; - align-items: center; - flex-wrap: wrap; - gap: 0.75rem; - margin-bottom: 1rem; +/* Classroom Status */ +.badge-available { + background: rgba(16, 185, 129, 0.15); + color: var(--success); } -.card-header-row h2 { - margin-bottom: 0; -} - -.filter-row { - display: flex; - align-items: center; - gap: 0.5rem; -} - -.filter-row label { - font-size: 0.78rem; - font-weight: 500; - color: var(--text-secondary); - text-transform: uppercase; - letter-spacing: 0.04em; - white-space: nowrap; -} - -.filter-row select { - padding: 0.45rem 2rem 0.45rem 0.7rem; - background: var(--bg-input); - border: 1px solid transparent; - border-radius: var(--radius-sm); - color: var(--text-primary); - font-family: inherit; - font-size: 0.85rem; - outline: none; - cursor: pointer; - appearance: none; - background-image: url("data:image/svg+xml,%3Csvg width='12' height='8' viewBox='0 0 12 8' fill='none' xmlns='http://www.w3.org/2000/svg'%3E%3Cpath d='M1 1.5L6 6.5L11 1.5' stroke='%239ca3af' stroke-width='2' stroke-linecap='round' stroke-linejoin='round'/%3E%3C/svg%3E"); - background-repeat: no-repeat; - background-position: right 0.6rem center; - transition: background var(--transition), border-color var(--transition), box-shadow var(--transition); -} - -.filter-row select:focus { - background-color: var(--bg-input-focus); - border-color: var(--accent); - box-shadow: 0 0 0 3px var(--accent-glow); -} - -.filter-row select option { - background: #1a1a2e; - color: var(--text-primary); -} - -/* ===== Tab Content ===== */ -.tab-content { - animation: fadeIn 0.2s ease; -} - -@keyframes fadeIn { - from { - opacity: 0; - transform: translateY(4px); - } - - to { - opacity: 1; - transform: translateY(0); - } -} - -/* ===== Delete Button ===== */ -.btn-delete { - padding: 0.35rem 0.7rem; - background: rgba(248, 113, 113, 0.1); - border: 1px solid rgba(248, 113, 113, 0.2); - border-radius: var(--radius-sm); +.badge-unavailable { + background: rgba(248, 113, 113, 0.15); color: var(--error); - font-family: inherit; - font-size: 0.8rem; - cursor: pointer; - transition: background var(--transition), transform var(--transition); } -.btn-delete:hover { - background: rgba(248, 113, 113, 0.2); - transform: scale(1.05); -} - -/* ===== Ripple Effect ===== */ -.ripple { - position: absolute; - border-radius: 50%; - transform: scale(0); - animation: admin-ripple 0.6s linear; - background-color: rgba(255, 255, 255, 0.3); - pointer-events: none; -} - -@keyframes admin-ripple { - to { - transform: scale(4); - opacity: 0; - } -} - -/* ===== Mobile Menu Toggle ===== */ -.menu-toggle { - display: none; - padding: 0.4rem; - background: none; - border: none; - color: var(--text-primary); - cursor: pointer; - border-radius: var(--radius-sm); - transition: background var(--transition); -} - -.menu-toggle:hover { - background: var(--bg-hover); -} - -/* ===== Sidebar Overlay ===== */ -.sidebar-overlay { - display: none; - position: fixed; - inset: 0; - background: rgba(0, 0, 0, 0.5); - z-index: 9; - backdrop-filter: blur(2px); -} - -/* ===== Theme Toggle Button ===== */ -.theme-toggle { - width: 40px; - height: 40px; - border: none; - border-radius: 50%; - background: var(--bg-card); - border: 1px solid var(--bg-card-border); - color: var(--text-primary); - cursor: pointer; - display: flex; - align-items: center; - justify-content: center; - backdrop-filter: blur(12px); - -webkit-backdrop-filter: blur(12px); - transition: all var(--transition); - z-index: 100; - flex-shrink: 0; -} - -.theme-toggle svg { - width: 20px; - height: 20px; - transition: transform 0.4s ease; -} - -.theme-toggle:hover { - transform: scale(1.1); - box-shadow: 0 4px 16px var(--accent-glow); -} - -.theme-toggle:active { - transform: scale(0.95); -} - -/* ===== Custom Multi Select ===== */ -.custom-multi-select { - position: relative; - width: 100%; -} - -.custom-multi-select .select-box { - width: 100%; - padding: 0.75rem 1rem; - background: var(--bg-input); - border: 1px solid var(--bg-card-border); - border-radius: var(--radius-sm); - color: var(--text-primary); - font-family: inherit; - font-size: 0.95rem; - cursor: pointer; - display: flex; - align-items: center; - justify-content: space-between; - transition: all var(--transition); -} - -.custom-multi-select .select-box.active { - background: var(--bg-input-focus); - border-color: var(--accent); - box-shadow: 0 0 0 4px var(--accent-glow); -} - -.custom-multi-select .dropdown-icon { - transition: transform var(--transition); -} - -.custom-multi-select .select-box.active .dropdown-icon { - transform: rotate(180deg); -} - -.custom-multi-select .dropdown-menu { - position: absolute; - top: calc(100% + 5px); - left: 0; - width: 100%; - background: rgba(15, 15, 26, 0.98); - backdrop-filter: blur(24px); - -webkit-backdrop-filter: blur(24px); - border: 1px solid var(--bg-card-border); - border-radius: var(--radius-md); - box-shadow: 0 10px 30px rgba(0, 0, 0, 0.2); - padding: 0.75rem; - z-index: 9999; - opacity: 0; - visibility: hidden; - transform: translateY(-10px); - transition: all var(--transition); - max-height: 250px; - overflow-y: auto; -} - -.custom-multi-select .dropdown-menu.open { - opacity: 1; - visibility: visible; - transform: translateY(0); -} - -.checkbox-group-vertical { - display: flex; - flex-direction: column; - gap: 8px; -} - -.checkbox-group-vertical .checkbox-item { - padding: 6px 8px; - border-radius: 6px; - transition: background var(--transition); +.status-cell { display: flex; align-items: center; gap: 8px; - cursor: pointer; } -.checkbox-group-vertical .checkbox-item:hover { - background: var(--bg-hover); -} - -/* ===== Modals ===== */ +/* ===== Modal ===== */ .modal-overlay { display: none; position: fixed; - inset: 0; - background: rgba(0, 0, 0, 0.5); + top: 0; + left: 0; + right: 0; + bottom: 0; + background: rgba(0, 0, 0, 0.6); + backdrop-filter: blur(4px); z-index: 1000; - backdrop-filter: blur(2px); align-items: center; justify-content: center; - padding: 1rem; + opacity: 0; + transition: opacity var(--transition); } .modal-overlay.open { display: flex; - animation: fadeIn 0.2s ease; + opacity: 1; } .modal-content { @@ -955,31 +782,27 @@ tbody tr:hover { border: 1px solid var(--bg-card-border); border-radius: var(--radius-md); padding: 2rem; - width: 100%; - max-width: 600px; + width: 90%; + max-width: 500px; position: relative; - box-shadow: 0 10px 25px rgba(0, 0, 0, 0.2); + transform: scale(0.95); + transition: transform 0.3s cubic-bezier(0.175, 0.885, 0.32, 1.275); + box-shadow: 0 20px 50px rgba(0, 0, 0, 0.5); } -.modal-content h2 { - font-size: 1.2rem; - font-weight: 600; - margin-bottom: 0.5rem; - color: var(--text-primary); - border-bottom: 1px solid var(--bg-card-border); - padding-bottom: 1rem; +.modal-overlay.open .modal-content { + transform: scale(1); } .modal-close { position: absolute; - top: 1.5rem; - right: 1.5rem; + top: 1rem; + right: 1rem; background: none; border: none; - color: var(--text-secondary); font-size: 1.5rem; + color: var(--text-secondary); cursor: pointer; - line-height: 1; transition: color var(--transition); } @@ -987,92 +810,52 @@ tbody tr:hover { color: var(--error); } -/* ===== Responsive ===== */ -@media (max-width: 768px) { - .sidebar { - width: 240px; - transform: translateX(-100%); - transition: transform 0.3s ease; - z-index: 20; - } - - .sidebar.open { - transform: translateX(0); - } - - .sidebar-overlay.open { - display: block; - } - - .menu-toggle { - display: flex; - } - - .main { - margin-left: 0; - } - - .topbar { - padding: 1rem; - display: flex; - align-items: center; - gap: 0.75rem; - } - - .topbar h1 { - font-size: 1.1rem; - } - - .content { - padding: 1rem; - } - - .card { - padding: 1rem; - } - - .form-row { - flex-direction: column; - align-items: stretch; - } - - .form-row .form-group { - min-width: 0; - } - - .btn-create { - width: 100%; - text-align: center; - } - - tbody td { - padding: 0.5rem 0.6rem; - font-size: 0.82rem; - } - - thead th { - padding: 0.5rem 0.6rem; - font-size: 0.72rem; - } - - .table-wrap { - margin: 0 -1rem; - padding: 0 1rem; - } +.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; } -@media (max-width: 480px) { - .topbar h1 { - font-size: 0.95rem; - } +.btn-add-lesson:hover { + background: rgba(16, 185, 129, 0.2); + transform: scale(1.05); +} - .badge { - font-size: 0.65rem; - padding: 0.15rem 0.45rem; - } +/* Кнопки-переключатели для недели */ +.btn-checkbox { + display: inline-block; + cursor: pointer; +} - .btn-delete { - padding: 0.25rem 0.5rem; - font-size: 0.72rem; - } +.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); + /* используем success или зелёный */ + border-color: var(--success, #10b981); + color: white; } \ No newline at end of file diff --git a/frontend/admin/css/layout.css b/frontend/admin/css/layout.css new file mode 100755 index 0000000..d6386ac --- /dev/null +++ b/frontend/admin/css/layout.css @@ -0,0 +1,216 @@ +/* ===== Sidebar ===== */ +.sidebar { + width: 260px; + min-height: 100vh; + background: var(--bg-sidebar); + backdrop-filter: blur(20px); + -webkit-backdrop-filter: blur(20px); + border-right: 1px solid var(--bg-card-border); + display: flex; + flex-direction: column; + position: fixed; + left: 0; + top: 0; + bottom: 0; + z-index: 10; + transition: background 0.4s ease, border-color 0.4s ease, transform 0.4s cubic-bezier(0.25, 0.8, 0.25, 1); +} + +.sidebar-header { + padding: 1.25rem; + border-bottom: 1px solid var(--bg-card-border); +} + +.logo { + display: flex; + align-items: center; + gap: 0.75rem; + font-size: 1.15rem; + font-weight: 700; + letter-spacing: -0.02em; +} + +.sidebar-nav { + flex: 1; + padding: 0.75rem; +} + +.nav-item { + display: flex; + align-items: center; + gap: 0.75rem; + padding: 0.75rem 1rem; + margin-bottom: 0.25rem; + border-radius: var(--radius-sm); + color: var(--text-secondary); + text-decoration: none; + font-size: 0.95rem; + font-weight: 500; + transition: all var(--transition); + position: relative; + overflow: hidden; +} + +.nav-item::before { + content: ''; + position: absolute; + left: 0; + top: 0; + bottom: 0; + width: 3px; + background: var(--accent); + border-radius: 0 4px 4px 0; + transform: scaleY(0); + transition: transform var(--transition); + opacity: 0; +} + +.nav-item:hover { + background: var(--bg-hover); + color: var(--text-primary); + transform: translateX(4px); +} + +.nav-item.active { + background: rgba(139, 92, 246, 0.12); + color: var(--accent-hover); +} + +[data-theme="light"] .nav-item.active { + background: rgba(99, 102, 241, 0.18); +} + +.nav-item.active::before { + transform: scaleY(1); + opacity: 1; +} + +.nav-item svg { + transition: transform var(--transition); +} + +.nav-item:hover svg, +.nav-item.active svg { + transform: scale(1.15) rotate(-5deg); +} + +.sidebar-footer { + padding: 0.75rem; + border-top: 1px solid var(--bg-card-border); +} + +.btn-logout { + width: 100%; + display: flex; + align-items: center; + gap: 0.6rem; + padding: 0.65rem 0.8rem; + border: none; + border-radius: var(--radius-sm); + background: none; + color: var(--text-secondary); + font-family: inherit; + font-size: 0.9rem; + cursor: pointer; + transition: background var(--transition), color var(--transition); + position: relative; +} + +.btn-logout:hover { + background: rgba(248, 113, 113, 0.1); + color: var(--error); +} + +/* ===== Main ===== */ +.main { + flex: 1; + margin-left: 260px; + min-height: 100vh; +} + +.topbar { + padding: 1.5rem 2rem; + border-bottom: 1px solid var(--bg-card-border); + transition: border-color 0.4s ease; + display: flex; + align-items: center; + justify-content: space-between; + gap: 1rem; +} + +.topbar h1 { + font-size: 1.3rem; + font-weight: 700; + letter-spacing: -0.02em; + flex: 1; +} + +.content { + padding: 1.5rem 2rem; + display: flex; + flex-direction: column; + gap: 1.5rem; + animation: fadeIn 0.2s ease; +} + +/* ===== Mobile Menu Toggle ===== */ +.menu-toggle { + display: none; + padding: 0.4rem; + background: none; + border: none; + color: var(--text-primary); + cursor: pointer; + border-radius: var(--radius-sm); + transition: background var(--transition); +} + +.menu-toggle:hover { + background: var(--bg-hover); +} + +.sidebar-overlay { + display: none; + position: fixed; + top: 0; + left: 0; + right: 0; + bottom: 0; + background: rgba(0, 0, 0, 0.5); + backdrop-filter: blur(2px); + z-index: 9; + opacity: 0; + transition: opacity var(--transition); +} + +/* ===== Responsive Mobile ===== */ +@media (max-width: 768px) { + .sidebar { + transform: translateX(-100%); + } + + .sidebar.open { + transform: translateX(0); + } + + .main { + margin-left: 0; + } + + .topbar { + padding: 1rem 1.25rem; + } + + .content { + padding: 1.25rem; + } + + .menu-toggle, + .sidebar-overlay { + display: block; + } + + .sidebar-overlay.open { + opacity: 1; + } +} \ No newline at end of file diff --git a/frontend/admin/css/main.css b/frontend/admin/css/main.css new file mode 100755 index 0000000..a03d06e --- /dev/null +++ b/frontend/admin/css/main.css @@ -0,0 +1,110 @@ +/* ===== Reset & Base ===== */ +*, +*::before, +*::after { + margin: 0; + padding: 0; + box-sizing: border-box; +} + +:root { + /* Deep dark premium background */ + --bg-primary: #0a0a0f; + --bg-sidebar: rgba(255, 255, 255, 0.02); + --bg-card: rgba(255, 255, 255, 0.03); + --bg-card-border: rgba(255, 255, 255, 0.05); + --bg-input: rgba(255, 255, 255, 0.04); + --bg-input-focus: rgba(255, 255, 255, 0.08); + --bg-hover: rgba(255, 255, 255, 0.06); + + /* Typography */ + --text-primary: #f8fafc; + --text-secondary: #94a3b8; + --text-placeholder: #475569; + + /* Vibrant Accents */ + --accent: #8b5cf6; + --accent-hover: #a78bfa; + --accent-glow: rgba(139, 92, 246, 0.4); + --accent-secondary: #ec4899; + + /* Status Colors */ + --error: #ef4444; + --success: #10b981; + --warning: #f59e0b; + + /* Spatial */ + --radius-sm: 10px; + --radius-md: 16px; + --transition: 0.3s cubic-bezier(0.25, 0.8, 0.25, 1); +} + +/* ===== Light Theme ===== */ +[data-theme="light"] { + --bg-primary: #f8fafc; + --bg-sidebar: rgba(255, 255, 255, 0.7); + --bg-card: rgba(255, 255, 255, 0.75); + --bg-card-border: rgba(0, 0, 0, 0.08); + --bg-input: rgba(0, 0, 0, 0.03); + --bg-input-focus: rgba(0, 0, 0, 0.06); + --bg-hover: rgba(0, 0, 0, 0.05); + --text-primary: #0f172a; + --text-secondary: #475569; + --text-placeholder: #94a3b8; + --accent: #6366f1; + --accent-hover: #4f46e5; + --accent-glow: rgba(99, 102, 241, 0.3); + --accent-secondary: #d946ef; + + --error: #ef4444; + --success: #10b981; + --warning: #f59e0b; +} + +html { + font-size: 16px; + -webkit-font-smoothing: antialiased; +} + +body { + font-family: 'Inter', -apple-system, BlinkMacSystemFont, sans-serif; + background: var(--bg-primary); + color: var(--text-primary); + min-height: 100vh; + display: flex; + transition: background 0.4s ease, color 0.4s ease; +} + +/* ===== Animations ===== */ +@keyframes fadeIn { + from { opacity: 0; transform: translateY(4px); } + to { opacity: 1; transform: translateY(0); } +} + +@keyframes slideUpCard { + from { opacity: 0; transform: translateY(15px); } + to { opacity: 1; transform: translateY(0); } +} + +@keyframes slideDownAlert { + from { opacity: 0; transform: translateY(-10px); } + to { opacity: 1; transform: translateY(0); } +} + +@keyframes slideInRow { + from { opacity: 0; transform: translateX(-10px); } + to { opacity: 1; transform: translateX(0); } +} + +@keyframes admin-ripple { + to { transform: scale(4); opacity: 0; } +} + +.ripple { + position: absolute; + border-radius: 50%; + transform: scale(0); + animation: admin-ripple 0.6s linear; + background-color: rgba(255, 255, 255, 0.3); + pointer-events: none; +} diff --git a/frontend/admin/index.html b/frontend/admin/index.html old mode 100644 new mode 100755 index c8fa44a..860acd3 --- a/frontend/admin/index.html +++ b/frontend/admin/index.html @@ -8,7 +8,11 @@ - + + + + + @@ -31,7 +35,7 @@
-

Управление пользователями

+

Загрузка...

- -
-
-

Новый пользователь

-
-
-
- - -
-
- - -
-
- - -
- -
- -
-
-
-

Все пользователи

-
- - - - - - - - - - - - - - -
IDИмя пользователяРоль
Загрузка...
-
-
+ +
+
- - - - - - - - - - - - - - - - - - - + \ No newline at end of file diff --git a/frontend/admin/js/api.js b/frontend/admin/js/api.js new file mode 100755 index 0000000..0c3cec1 --- /dev/null +++ b/frontend/admin/js/api.js @@ -0,0 +1,57 @@ +const token = localStorage.getItem('token'); + +export function getToken() { + return token; +} + +export function isAuthenticatedAsAdmin() { + const role = localStorage.getItem('role'); + return token && role === 'ADMIN'; +} + +function getHeaders(contentType = 'application/json') { + const headers = { + 'Authorization': `Bearer ${token}` + }; + if (contentType) { + headers['Content-Type'] = contentType; + } + return headers; +} + +export async function apiFetch(endpoint, method = 'GET', body = null) { + const options = { + method, + headers: getHeaders(body ? 'application/json' : null) + }; + + if (body) { + options.body = JSON.stringify(body); + } + + const response = await fetch(endpoint, options); + + // Si status is 401 or 403, we should probably redirect to login, + // but for now let's just throw an error or handle it in the view. + + let data; + try { + data = await response.json(); + } catch (e) { + data = null; + } + + if (!response.ok) { + throw new Error(data?.message || `Ошибка HTTP: ${response.status}`); + } + + return data; +} + +// Shortcut methods +export const api = { + get: (url) => apiFetch(url, 'GET'), + post: (url, body) => apiFetch(url, 'POST', body), + put: (url, body) => apiFetch(url, 'PUT', body), + delete: (url, body = null) => apiFetch(url, 'DELETE', body) +}; diff --git a/frontend/admin/js/main.js b/frontend/admin/js/main.js new file mode 100755 index 0000000..f8c51d7 --- /dev/null +++ b/frontend/admin/js/main.js @@ -0,0 +1,104 @@ +import { isAuthenticatedAsAdmin } from './api.js'; +import { applyRippleEffect, closeAllDropdownsOnOutsideClick } from './utils.js'; + +import { initUsers } from './views/users.js'; +import { initGroups } from './views/groups.js'; +import { initEduForms } from './views/edu-forms.js'; +import { initEquipments } from './views/equipments.js'; +import { initClassrooms } from './views/classrooms.js'; +import { initSubjects } from './views/subjects.js'; +import {initSchedule} from "./views/schedule.js"; + +// Configuration +const ROUTES = { + users: { title: 'Управление пользователями', file: 'views/users.html', init: initUsers }, + groups: { title: 'Управление группами', file: 'views/groups.html', init: initGroups }, + 'edu-forms': { title: 'Формы обучения', file: 'views/edu-forms.html', init: initEduForms }, + equipments: { title: 'Оборудование', file: 'views/equipments.html', init: initEquipments }, + classrooms: { title: 'Аудитории', file: 'views/classrooms.html', init: initClassrooms }, + subjects: { title: 'Дисциплины и преподаватели', file: 'views/subjects.html', init: initSubjects }, + // Новая вкладка + schedule: { title: 'Расписание занятий', file: 'views/schedule.html', init: initSchedule }, +}; + +let currentTab = null; + +// DOM Elements +const appContent = document.getElementById('app-content'); +const pageTitle = document.getElementById('page-title'); +const navItems = document.querySelectorAll('.nav-item[data-tab]'); +const sidebar = document.querySelector('.sidebar'); +const sidebarOverlay = document.getElementById('sidebar-overlay'); +const menuToggle = document.getElementById('menu-toggle'); +const btnLogout = document.getElementById('btn-logout'); + +// Initial auth check +if (!isAuthenticatedAsAdmin()) { + window.location.href = '/'; +} + +// Setup Global Effects +applyRippleEffect(); +closeAllDropdownsOnOutsideClick(); + +// Menu Toggle +menuToggle.addEventListener('click', () => { + sidebar.classList.toggle('open'); + sidebarOverlay.classList.toggle('open'); +}); +sidebarOverlay.addEventListener('click', () => { + sidebar.classList.remove('open'); + sidebarOverlay.classList.remove('open'); +}); + +// Logout +btnLogout.addEventListener('click', () => { + localStorage.removeItem('token'); + localStorage.removeItem('role'); + window.location.href = '/'; +}); + +// Navigation +navItems.forEach(item => { + item.addEventListener('click', (e) => { + e.preventDefault(); + const tab = item.dataset.tab; + switchTab(tab); + }); +}); + +async function switchTab(tab) { + if (currentTab === tab || !ROUTES[tab]) return; + + // UI Update + navItems.forEach(n => n.classList.remove('active')); + document.querySelector(`.nav-item[data-tab="${tab}"]`)?.classList.add('active'); + pageTitle.textContent = ROUTES[tab].title; + + // Load template + try { + appContent.innerHTML = '
Загрузка...
'; + const response = await fetch(ROUTES[tab].file); + if (!response.ok) throw new Error('Failed to load view'); + + const html = await response.text(); + appContent.innerHTML = html; + + // Initialize logic for the tab + if (ROUTES[tab].init) { + ROUTES[tab].init(); + } + + currentTab = tab; + } catch (e) { + appContent.innerHTML = `
Ошибка загрузки вкладки: ${e.message}
`; + console.error(e); + } + + // Close mobile menu if open + sidebar.classList.remove('open'); + sidebarOverlay.classList.remove('open'); +} + +// Load default tab +switchTab('users'); diff --git a/frontend/admin/js/utils.js b/frontend/admin/js/utils.js new file mode 100755 index 0000000..722ba6c --- /dev/null +++ b/frontend/admin/js/utils.js @@ -0,0 +1,102 @@ +export const ESCAPE_MAP = { + '&': '&', + '<': '<', + '>': '>', + '"': '"', + "'": ''' +}; + +export function escapeHtml(str) { + if (!str) return ''; + return String(str).replace(/[&<>"']/g, m => ESCAPE_MAP[m]); +} + +export function showAlert(elementId, msg, type) { + const el = document.getElementById(elementId); + if (!el) return; + el.className = 'form-alert ' + type; + el.textContent = msg; +} + +export function hideAlert(elementId) { + const el = document.getElementById(elementId); + if (!el) return; + el.className = 'form-alert'; + el.textContent = ''; +} + +export function applyRippleEffect() { + document.addEventListener('click', function (e) { + const btn = e.target.closest('.btn-primary, .btn-delete, .btn-logout'); + if (!btn) return; + + const rect = btn.getBoundingClientRect(); + const x = e.clientX - rect.left; + const y = e.clientY - rect.top; + + const ripple = document.createElement('span'); + ripple.classList.add('ripple'); + ripple.style.left = `${x}px`; + ripple.style.top = `${y}px`; + + if (getComputedStyle(btn).position === 'static') { + btn.style.position = 'relative'; + } + btn.style.overflow = 'hidden'; + + btn.appendChild(ripple); + + setTimeout(() => ripple.remove(), 600); + }); +} + +export function initMultiSelect(boxId, menuId, textId, checkboxContainerId) { + const box = document.getElementById(boxId); + const menu = document.getElementById(menuId); + const container = document.getElementById(checkboxContainerId); + if (!box || !menu || !container) return; + + // Remove old listeners to prevent duplication if re-initialized + const newBox = box.cloneNode(true); + box.parentNode.replaceChild(newBox, box); + + newBox.addEventListener('click', (e) => { + e.stopPropagation(); + const isOpen = menu.classList.contains('open'); + document.querySelectorAll('.dropdown-menu').forEach(m => m.classList.remove('open')); + document.querySelectorAll('.select-box').forEach(b => b.classList.remove('active')); + if (!isOpen) { + menu.classList.add('open'); + newBox.classList.add('active'); + } + }); + + menu.addEventListener('click', (e) => { + e.stopPropagation(); + }); + + container.addEventListener('change', () => { + updateSelectText(checkboxContainerId, textId); + }); +} + +export function updateSelectText(containerId, textId) { + const container = document.getElementById(containerId); + const textEl = document.getElementById(textId); + if (!container || !textEl) return; + const checked = Array.from(container.querySelectorAll('input:checked')); + if (checked.length === 0) { + textEl.textContent = 'Выберите оборудование...'; + } else if (checked.length === 1) { + textEl.textContent = checked[0].parentElement.textContent.trim(); + } else { + textEl.textContent = `Выбрано: ${checked.length}`; + } +} + +export function closeAllDropdownsOnOutsideClick() { + document.addEventListener('click', () => { + document.querySelectorAll('.dropdown-menu').forEach(m => m.classList.remove('open')); + document.querySelectorAll('.select-box').forEach(b => b.classList.remove('active')); + }); +} diff --git a/frontend/admin/js/views/classrooms.js b/frontend/admin/js/views/classrooms.js new file mode 100755 index 0000000..419aa2e --- /dev/null +++ b/frontend/admin/js/views/classrooms.js @@ -0,0 +1,185 @@ +import { api } from '../api.js'; +import { escapeHtml, showAlert, hideAlert, initMultiSelect, updateSelectText } from '../utils.js'; +import { fetchEquipments, renderEquipmentCheckboxes } from './equipments.js'; + +export async function initClassrooms() { + const classroomsTbody = document.getElementById('classrooms-tbody'); + const createClassroomForm = document.getElementById('create-classroom-form'); + + const equipmentCheckboxes = document.getElementById('equipment-checkboxes'); + const editEquipmentCheckboxes = document.getElementById('edit-equipment-checkboxes'); + + const modalEditClassroom = document.getElementById('modal-edit-classroom'); + const modalEditClassroomClose = document.getElementById('modal-edit-classroom-close'); + const editClassroomForm = document.getElementById('edit-classroom-form'); + + let allEquipments = []; + let editingClassroomData = null; + + initMultiSelect('equipment-select-box', 'equipment-dropdown-menu', 'equipment-select-text', 'equipment-checkboxes'); + initMultiSelect('edit-equipment-select-box', 'edit-equipment-dropdown-menu', 'edit-equipment-select-text', 'edit-equipment-checkboxes'); + + async function loadInitialData() { + try { + allEquipments = await fetchEquipments(); + renderEquipmentCheckboxes(allEquipments, 'equipment-checkboxes', 'equipment-select-text'); + await loadClassrooms(); + } catch (e) { + classroomsTbody.innerHTML = 'Ошибка загрузки данных'; + } + } + + async function loadClassrooms() { + try { + const classrooms = await api.get('/api/classrooms'); + renderClassrooms(classrooms); + } catch (e) { + classroomsTbody.innerHTML = 'Ошибка загрузки'; + } + } + + function renderClassrooms(classrooms) { + if (!classrooms || !classrooms.length) { + classroomsTbody.innerHTML = 'Нет аудиторий'; + return; + } + classroomsTbody.innerHTML = classrooms.map(c => { + const equipHtml = c.equipments && c.equipments.length + ? c.equipments.map(eq => escapeHtml(eq.name)).join(', ') + : '—'; + + return ` + + ${c.id} + ${escapeHtml(c.name)} + ${c.capacity} чел. + ${equipHtml} + +
+ + ${c.isAvailable ? 'Доступна' : 'Не доступна'} + + +
+ + + + + + `; + }).join(''); + } + + createClassroomForm.addEventListener('submit', async (e) => { + e.preventDefault(); + hideAlert('create-classroom-alert'); + const name = document.getElementById('new-classroom-name').value.trim(); + const capacity = parseInt(document.getElementById('new-classroom-capacity').value, 10); + + const checkedBoxes = Array.from(equipmentCheckboxes.querySelectorAll('input:checked')); + const equipmentIds = checkedBoxes.map(chk => parseInt(chk.value, 10)); + + if (!name || isNaN(capacity)) { showAlert('create-classroom-alert', 'Заполните обязательные поля', 'error'); return; } + + try { + const data = await api.post('/api/classrooms', { name, capacity, equipmentIds, isAvailable: true }); + showAlert('create-classroom-alert', `Аудитория "${escapeHtml(data.name)}" добавлена`, 'success'); + createClassroomForm.reset(); + updateSelectText('equipment-checkboxes', 'equipment-select-text'); + loadClassrooms(); + } catch (e) { + showAlert('create-classroom-alert', e.message || 'Ошибка создания', 'error'); + } + }); + + classroomsTbody.addEventListener('click', async (e) => { + const btnDelete = e.target.closest('.btn-delete'); + const btnToggleStatus = e.target.closest('.btn-icon-toggle'); + const btnEdit = e.target.closest('.btn-edit-classroom'); + + if (btnDelete) { + if (!confirm('Удалить аудиторию?')) return; + try { + await api.delete('/api/classrooms/' + btnDelete.dataset.id); + loadClassrooms(); + } catch (err) { alert('Ошибка удаления'); } + } + + if (btnToggleStatus) { + const id = btnToggleStatus.dataset.id; + const currentStatus = btnToggleStatus.dataset.currentStatus === 'true'; + try { + await api.put('/api/classrooms/' + id, { isAvailable: !currentStatus }); + loadClassrooms(); + } catch (err) { alert('Ошибка изменения статуса'); } + } + + if (btnEdit) { + openEditClassroomModal(btnEdit.dataset.id); + } + }); + + async function openEditClassroomModal(id) { + try { + // Can optimize by using already loaded classrooms, but fetch is safer to get fresh data + const classrooms = await api.get('/api/classrooms'); + editingClassroomData = classrooms.find(c => c.id == id); + + if (!editingClassroomData) return; + + document.getElementById('edit-classroom-id').value = editingClassroomData.id; + document.getElementById('edit-classroom-name').value = editingClassroomData.name; + document.getElementById('edit-classroom-capacity').value = editingClassroomData.capacity; + + const existingEquipIds = editingClassroomData.equipments.map(e => e.id); + renderEquipmentCheckboxes(allEquipments, 'edit-equipment-checkboxes', 'edit-equipment-select-text', existingEquipIds); + + hideAlert('edit-classroom-alert'); + modalEditClassroom.classList.add('open'); + } catch (e) { + alert('Ошибка загрузки данных аудитории'); + } + } + + modalEditClassroomClose.addEventListener('click', () => { + modalEditClassroom.classList.remove('open'); + }); + + modalEditClassroom.addEventListener('click', (e) => { + if (e.target === modalEditClassroom) { + modalEditClassroom.classList.remove('open'); + } + }); + + editClassroomForm.addEventListener('submit', async (e) => { + e.preventDefault(); + hideAlert('edit-classroom-alert'); + const id = document.getElementById('edit-classroom-id').value; + const name = document.getElementById('edit-classroom-name').value.trim(); + const capacity = parseInt(document.getElementById('edit-classroom-capacity').value, 10); + + const checkedBoxes = Array.from(editEquipmentCheckboxes.querySelectorAll('input:checked')); + const equipmentIds = checkedBoxes.map(chk => parseInt(chk.value, 10)); + + if (!name || isNaN(capacity)) { showAlert('edit-classroom-alert', 'Заполните обязательные поля', 'error'); return; } + + try { + const data = await api.put('/api/classrooms/' + id, { + name, + capacity, + equipmentIds, + isAvailable: editingClassroomData.isAvailable + }); + modalEditClassroom.classList.remove('open'); + // We show alert on the main create form area or we could use toast + showAlert('create-classroom-alert', `Аудитория "${escapeHtml(data.name)}" обновлена`, 'success'); + loadClassrooms(); + } catch (e) { + showAlert('edit-classroom-alert', e.message || 'Ошибка обновления', 'error'); + } + }); + + loadInitialData(); +} diff --git a/frontend/admin/js/views/edu-forms.js b/frontend/admin/js/views/edu-forms.js new file mode 100755 index 0000000..c2c1f4d --- /dev/null +++ b/frontend/admin/js/views/edu-forms.js @@ -0,0 +1,71 @@ +import { api } from '../api.js'; +import { escapeHtml, showAlert, hideAlert } from '../utils.js'; + +export let allEducationForms = []; + +export async function fetchEducationForms() { + try { + allEducationForms = await api.get('/api/education-forms'); + return allEducationForms; + } catch (e) { + console.error("Failed to fetch education forms", e); + return []; + } +} + +export async function initEduForms() { + const efTbody = document.getElementById('ef-tbody'); + const createEfForm = document.getElementById('create-ef-form'); + + async function loadEF() { + try { + const forms = await fetchEducationForms(); + renderEfTable(forms); + } catch (e) { + efTbody.innerHTML = 'Ошибка загрузки'; + } + } + + function renderEfTable(forms) { + if (!forms || !forms.length) { + efTbody.innerHTML = 'Нет форм обучения'; + return; + } + efTbody.innerHTML = forms.map(ef => ` + + ${ef.id} + ${escapeHtml(ef.name)} + + `).join(''); + } + + createEfForm.addEventListener('submit', async (e) => { + e.preventDefault(); + hideAlert('create-ef-alert'); + const name = document.getElementById('new-ef-name').value.trim(); + if (!name) { showAlert('create-ef-alert', 'Введите название', 'error'); return; } + + try { + const data = await api.post('/api/education-forms', { name }); + showAlert('create-ef-alert', `Форма "${escapeHtml(data.name)}" создана`, 'success'); + createEfForm.reset(); + loadEF(); + } catch (e) { + showAlert('create-ef-alert', e.message || 'Ошибка создания', 'error'); + } + }); + + efTbody.addEventListener('click', async (e) => { + const btn = e.target.closest('.btn-delete'); + if (!btn) return; + if (!confirm('Удалить форму обучения?')) return; + try { + await api.delete('/api/education-forms/' + btn.dataset.id); + loadEF(); + } catch (e) { + alert(e.message || 'Ошибка удаления'); + } + }); + + loadEF(); +} diff --git a/frontend/admin/js/views/equipments.js b/frontend/admin/js/views/equipments.js new file mode 100755 index 0000000..9f7a083 --- /dev/null +++ b/frontend/admin/js/views/equipments.js @@ -0,0 +1,88 @@ +import { api } from '../api.js'; +import { escapeHtml, showAlert, hideAlert, updateSelectText } from '../utils.js'; + +export let allEquipments = []; + +export async function fetchEquipments() { + try { + allEquipments = await api.get('/api/equipments'); + return allEquipments; + } catch (e) { + console.error("Failed to fetch equipments", e); + return []; + } +} + +export function renderEquipmentCheckboxes(equipments, containerId, textId, checkedIds = []) { + const container = document.getElementById(containerId); + if (!container) return; + if (!equipments.length) { + container.innerHTML = '

Нет доступного оборудования

'; + return; + } + container.innerHTML = equipments.map(eq => { + const isChecked = checkedIds.includes(eq.id) ? 'checked' : ''; + return ` + + `}).join(''); + updateSelectText(containerId, textId); +} + +export async function initEquipments() { + const equipmentsTbody = document.getElementById('equipments-tbody'); + const createEquipmentForm = document.getElementById('create-equipment-form'); + + async function loadEquipments() { + try { + const equipments = await fetchEquipments(); + renderEquipments(equipments); + } catch (e) { + if (equipmentsTbody) equipmentsTbody.innerHTML = 'Ошибка загрузки'; + } + } + + function renderEquipments(equipments) { + if (!equipments || !equipments.length) { + equipmentsTbody.innerHTML = 'Нет оборудования'; + return; + } + equipmentsTbody.innerHTML = equipments.map(eq => ` + + ${eq.id} + ${escapeHtml(eq.name)} + + `).join(''); + } + + createEquipmentForm.addEventListener('submit', async (e) => { + e.preventDefault(); + hideAlert('create-equipment-alert'); + const name = document.getElementById('new-equipment-name').value.trim(); + if (!name) { showAlert('create-equipment-alert', 'Введите название', 'error'); return; } + + try { + const data = await api.post('/api/equipments', { name }); + showAlert('create-equipment-alert', `Оборудование "${escapeHtml(data.name)}" добавлено`, 'success'); + createEquipmentForm.reset(); + loadEquipments(); + } catch (e) { + showAlert('create-equipment-alert', e.message || 'Ошибка создания', 'error'); + } + }); + + equipmentsTbody.addEventListener('click', async (e) => { + const btn = e.target.closest('.btn-delete'); + if (!btn) return; + if (!confirm('Удалить оборудование?')) return; + try { + await api.delete('/api/equipments/' + btn.dataset.id); + loadEquipments(); + } catch (e) { + alert(e.message || 'Ошибка удаления'); + } + }); + + loadEquipments(); +} diff --git a/frontend/admin/js/views/groups.js b/frontend/admin/js/views/groups.js new file mode 100755 index 0000000..1a2b1d6 --- /dev/null +++ b/frontend/admin/js/views/groups.js @@ -0,0 +1,108 @@ +import { api } from '../api.js'; +import { escapeHtml, showAlert, hideAlert } from '../utils.js'; +import { fetchEducationForms } from './edu-forms.js'; + +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 filterEfSelect = document.getElementById('filter-ef'); + + let allGroups = []; + let educationForms = []; + + async function loadInitialData() { + try { + educationForms = await fetchEducationForms(); + populateEfSelects(educationForms); + await loadGroups(); + } catch (e) { + groupsTbody.innerHTML = 'Ошибка загрузки данных'; + } + } + + async function loadGroups() { + try { + allGroups = await api.get('/api/groups'); + applyGroupFilter(); + } catch (e) { + groupsTbody.innerHTML = 'Ошибка загрузки'; + } + } + + function applyGroupFilter() { + const filterId = filterEfSelect.value; + const filtered = filterId + ? allGroups.filter(g => g.educationFormId == filterId) + : allGroups; + renderGroups(filtered); + } + + filterEfSelect.addEventListener('change', applyGroupFilter); + + function populateEfSelects(forms) { + // Group creation select + const currentVal = newGroupEfSelect.value; + newGroupEfSelect.innerHTML = forms.map(ef => + `` + ).join(''); + if (currentVal && forms.find(f => f.id == currentVal)) { + newGroupEfSelect.value = currentVal; + } + + // Filter select + const currentFilter = filterEfSelect.value; + filterEfSelect.innerHTML = '' + + forms.map(ef => + `` + ).join(''); + if (currentFilter) filterEfSelect.value = currentFilter; + } + + function renderGroups(groups) { + if (!groups || !groups.length) { + groupsTbody.innerHTML = 'Нет групп'; + return; + } + groupsTbody.innerHTML = groups.map(g => ` + + ${g.id} + ${escapeHtml(g.name)} + ${escapeHtml(g.educationFormName)} + + `).join(''); + } + + createGroupForm.addEventListener('submit', async (e) => { + e.preventDefault(); + hideAlert('create-group-alert'); + const name = document.getElementById('new-group-name').value.trim(); + const educationFormId = newGroupEfSelect.value; + + if (!name) { showAlert('create-group-alert', 'Введите название группы', 'error'); return; } + if (!educationFormId) { showAlert('create-group-alert', 'Выберите форму обучения', 'error'); return; } + + try { + const data = await api.post('/api/groups', { name, educationFormId: Number(educationFormId) }); + showAlert('create-group-alert', `Группа "${escapeHtml(data.name)}" создана`, 'success'); + createGroupForm.reset(); + loadGroups(); + } catch (e) { + showAlert('create-group-alert', e.message || 'Ошибка создания', 'error'); + } + }); + + groupsTbody.addEventListener('click', async (e) => { + const btn = e.target.closest('.btn-delete'); + if (!btn) return; + if (!confirm('Удалить группу?')) return; + try { + await api.delete('/api/groups/' + btn.dataset.id); + loadGroups(); + } catch (e) { + alert(e.message || 'Ошибка удаления'); + } + }); + + loadInitialData(); +} diff --git a/frontend/admin/js/views/schedule.js b/frontend/admin/js/views/schedule.js new file mode 100755 index 0000000..5312a3b --- /dev/null +++ b/frontend/admin/js/views/schedule.js @@ -0,0 +1,358 @@ +import { api } from '../api.js'; +import { escapeHtml } from '../utils.js'; + +export async function initSchedule() { + const tbody = document.getElementById('schedule-tbody'); + const table = document.getElementById('schedule-table'); + + let lessonsData = []; + let sortKey = null; + let sortDir = 'asc'; + + // Активные фильтры: { teacher: Set, group: Set, subject: Set, day: Set } + const activeFilters = {}; + + // Маппинг дней недели для корректной сортировки + const dayOrder = { + 'понедельник': 1, 'вторник': 2, 'среда': 3, + 'четверг': 4, 'пятница': 5, 'суббота': 6, 'воскресенье': 7 + }; + + // ===================== Фильтрация ===================== + + // Извлечение отображаемого значения поля для фильтрации + function getDisplayValue(lesson, key) { + switch (key) { + case 'teacher': + return lesson.teacher?.username || lesson.teacherName || '—'; + case 'group': + return lesson.group?.name || lesson.groupName || '—'; + case 'subject': + return lesson.subject?.name || lesson.subjectName || '—'; + case 'day': + return lesson.day || '—'; + case 'educationForm': + return lesson.educationForm?.name || lesson.educationFormName || '—'; + default: + return ''; + } + } + + // Собрать уникальные значения из данных + function getUniqueValues(key) { + const vals = new Set(); + lessonsData.forEach(lesson => { + vals.add(getDisplayValue(lesson, key)); + }); + // Для дней — сортируем по порядку + if (key === 'day') { + return [...vals].sort((a, b) => (dayOrder[a.toLowerCase()] ?? 99) - (dayOrder[b.toLowerCase()] ?? 99)); + } + return [...vals].sort((a, b) => a.localeCompare(b, 'ru')); + } + + // Применить все фильтры + function applyFilters(lessons) { + return lessons.filter(lesson => { + for (const key of Object.keys(activeFilters)) { + const filterSet = activeFilters[key]; + if (filterSet && filterSet.size > 0) { + const val = getDisplayValue(lesson, key); + if (!filterSet.has(val)) return false; + } + } + return true; + }); + } + + // ===================== Попап фильтра ===================== + + let currentPopup = null; + + function closePopup() { + if (currentPopup) { + currentPopup.remove(); + currentPopup = null; + } + document.removeEventListener('click', onDocumentClick, true); + } + + function onDocumentClick(e) { + if (currentPopup && !currentPopup.contains(e.target)) { + // Проверяем, не кликнули ли по иконке фильтра + if (!e.target.closest('.filter-icon')) { + closePopup(); + } + } + } + + function openFilterPopup(th, filterKey) { + // Если уже открыт этот же — закрыть + if (currentPopup && currentPopup.dataset.filterKey === filterKey) { + closePopup(); + return; + } + closePopup(); + + const uniqueValues = getUniqueValues(filterKey); + const currentFilter = activeFilters[filterKey]; + + // Создаём попап + const popup = document.createElement('div'); + popup.className = 'filter-popup'; + popup.dataset.filterKey = filterKey; + + // Поисковое поле + const searchInput = document.createElement('input'); + searchInput.type = 'text'; + searchInput.className = 'filter-search'; + searchInput.placeholder = 'Поиск...'; + popup.appendChild(searchInput); + + // Кнопки «Выбрать все» / «Сбросить» + const btnRow = document.createElement('div'); + btnRow.className = 'filter-btn-row'; + + const btnAll = document.createElement('button'); + btnAll.className = 'filter-btn-action'; + btnAll.textContent = 'Все'; + btnAll.addEventListener('click', (e) => { + e.stopPropagation(); + checkboxes.forEach(cb => { cb.checked = true; }); + }); + + const btnNone = document.createElement('button'); + btnNone.className = 'filter-btn-action'; + btnNone.textContent = 'Сбросить'; + btnNone.addEventListener('click', (e) => { + e.stopPropagation(); + checkboxes.forEach(cb => { cb.checked = false; }); + }); + + btnRow.appendChild(btnAll); + btnRow.appendChild(btnNone); + popup.appendChild(btnRow); + + // Список чекбоксов + const listWrap = document.createElement('div'); + listWrap.className = 'filter-list'; + + const checkboxes = []; + + uniqueValues.forEach(val => { + const label = document.createElement('label'); + label.className = 'filter-item'; + + const cb = document.createElement('input'); + cb.type = 'checkbox'; + cb.value = val; + // Если фильтр активен — отмечаем только выбранные; если нет — все отмечены + cb.checked = currentFilter ? currentFilter.has(val) : true; + + const span = document.createElement('span'); + span.textContent = val; + + label.appendChild(cb); + label.appendChild(span); + listWrap.appendChild(label); + checkboxes.push(cb); + }); + + popup.appendChild(listWrap); + + // Кнопка «Применить» + const btnApply = document.createElement('button'); + btnApply.className = 'filter-btn-apply'; + btnApply.textContent = 'Применить'; + btnApply.addEventListener('click', (e) => { + e.stopPropagation(); + const selected = new Set(); + checkboxes.forEach(cb => { + if (cb.checked) selected.add(cb.value); + }); + + // Если все выбраны — снимаем фильтр + if (selected.size === uniqueValues.length) { + delete activeFilters[filterKey]; + th.classList.remove('filter-active'); + } else { + activeFilters[filterKey] = selected; + th.classList.add('filter-active'); + } + + closePopup(); + renderSchedule(lessonsData); + }); + popup.appendChild(btnApply); + + // Поиск по чекбоксам + searchInput.addEventListener('input', () => { + const query = searchInput.value.toLowerCase(); + listWrap.querySelectorAll('.filter-item').forEach(item => { + const text = item.querySelector('span').textContent.toLowerCase(); + item.style.display = text.includes(query) ? '' : 'none'; + }); + }); + + // Предотвращаем всплытие кликов внутри попапа (чтобы не срабатывала сортировка th) + popup.addEventListener('click', (e) => e.stopPropagation()); + searchInput.addEventListener('click', (e) => e.stopPropagation()); + + // Позиционируем попап под th + th.style.position = 'relative'; + th.appendChild(popup); + currentPopup = popup; + + // Фокус на поиск + setTimeout(() => searchInput.focus(), 50); + + // Закрытие по клику вне + setTimeout(() => { + document.addEventListener('click', onDocumentClick, true); + }, 10); + } + + // Обработчики кликов по заголовкам с фильтрами (клик по всей ячейке) + table.querySelectorAll('thead th.filterable').forEach(th => { + th.addEventListener('click', (e) => { + // Не открываем попап при клике внутри самого попапа + if (e.target.closest('.filter-popup')) return; + const filterKey = th.dataset.filterKey; + openFilterPopup(th, filterKey); + }); + }); + + // ===================== Сортировка ===================== + + function getSortValue(lesson, key) { + switch (key) { + case 'id': + return lesson.id ?? 0; + case 'teacher': + return (lesson.teacher?.username || lesson.teacherName || '').toLowerCase(); + case 'group': + return (lesson.group?.name || lesson.groupName || '').toLowerCase(); + case 'educationForm': + return (lesson.educationForm?.name || lesson.educationFormName || '').toLowerCase(); + case 'subject': + return (lesson.subject?.name || lesson.subjectName || '').toLowerCase(); + case 'day': { + const d = (lesson.day || '').toLowerCase(); + return dayOrder[d] ?? 99; + } + case 'week': + return (lesson.week || '').toLowerCase(); + case 'time': { + // Составной ключ: день + время для правильной сортировки + const d = (lesson.day || '').toLowerCase(); + const dayNum = dayOrder[d] ?? 99; + const t = lesson.time || '99:99'; + return String(dayNum).padStart(2, '0') + '_' + t; + } + default: + return ''; + } + } + + function sortLessons(lessons) { + if (!sortKey) return lessons; + + return [...lessons].sort((a, b) => { + let va = getSortValue(a, sortKey); + let vb = getSortValue(b, sortKey); + + if (typeof va === 'number' && typeof vb === 'number') { + return sortDir === 'asc' ? va - vb : vb - va; + } + + va = String(va); + vb = String(vb); + const cmp = va.localeCompare(vb, 'ru'); + return sortDir === 'asc' ? cmp : -cmp; + }); + } + + function updateSortHeaders() { + table.querySelectorAll('thead th.sortable').forEach(th => { + th.classList.remove('sort-asc', 'sort-desc', 'sort-active'); + if (th.dataset.sortKey === sortKey) { + th.classList.add('sort-active', sortDir === 'asc' ? 'sort-asc' : 'sort-desc'); + } + }); + } + + // Навешиваем обработчики клика на заголовки (сортировка) + table.querySelectorAll('thead th.sortable').forEach(th => { + th.addEventListener('click', (e) => { + // Не сортируем, если кликнули по иконке фильтра или внутри попапа + if (e.target.closest('.filter-icon') || e.target.closest('.filter-popup')) return; + + const key = th.dataset.sortKey; + if (sortKey === key) { + if (sortDir === 'asc') { + sortDir = 'desc'; + } else { + sortKey = null; + sortDir = 'asc'; + } + } else { + sortKey = key; + sortDir = 'asc'; + } + updateSortHeaders(); + renderSchedule(lessonsData); + }); + }); + + // ===================== Загрузка и рендер ===================== + + async function loadSchedule() { + try { + const lessons = await api.get('/api/users/lessons'); + lessonsData = lessons; + renderSchedule(lessons); + } catch (e) { + tbody.innerHTML = `Ошибка загрузки: ${escapeHtml(e.message)}`; + } + } + + function renderSchedule(lessons) { + if (!lessons || !lessons.length) { + tbody.innerHTML = 'Нет занятий'; + return; + } + + // Сначала фильтруем, потом сортируем + const filtered = applyFilters(lessons); + + if (!filtered.length) { + tbody.innerHTML = 'Нет занятий по выбранным фильтрам'; + return; + } + + const sorted = sortLessons(filtered); + + tbody.innerHTML = sorted.map(lesson => { + const teacherName = lesson.teacher?.username || lesson.teacherName || '—'; + const groupName = lesson.group?.name || lesson.groupName || '—'; + const educationForm = lesson.educationForm?.name || lesson.educationFormName || '-'; + const subjectName = lesson.subject?.name || lesson.subjectName || '—'; + const day = lesson.day || '—'; + const week = lesson.week || '—'; + const time = lesson.time || '—'; + + return ` + ${escapeHtml(lesson.id)} + ${escapeHtml(teacherName)} + ${escapeHtml(groupName)} + ${escapeHtml(educationForm)} + ${escapeHtml(subjectName)} + ${escapeHtml(day)} + ${escapeHtml(week)} + ${escapeHtml(time)} + `; + }).join(''); + } + + await loadSchedule(); +} \ No newline at end of file diff --git a/frontend/admin/js/views/subjects.js b/frontend/admin/js/views/subjects.js new file mode 100755 index 0000000..2978419 --- /dev/null +++ b/frontend/admin/js/views/subjects.js @@ -0,0 +1,153 @@ +import { api } from '../api.js'; +import { escapeHtml, showAlert, hideAlert } from '../utils.js'; + +export async function initSubjects() { + const subjectsTbody = document.getElementById('subjects-tbody'); + const createSubjectForm = document.getElementById('create-subject-form'); + + const assignTeacherForm = document.getElementById('assign-teacher-form'); + const assignTeacherSelect = document.getElementById('assign-teacher-select'); + const assignSubjectSelect = document.getElementById('assign-subject-select'); + const teacherSubjectsTbody = document.getElementById('teacher-subjects-tbody'); + + let allSubjects = []; + let allTeachers = []; + + async function loadInitialData() { + await Promise.all([loadSubjects(), loadTeachers()]); + await loadTeacherSubjects(); + } + + async function loadSubjects() { + try { + allSubjects = await api.get('/api/subjects'); + renderSubjects(allSubjects); + populateSubjectSelect(allSubjects); + } catch (e) { + if (subjectsTbody) subjectsTbody.innerHTML = 'Ошибка загрузки'; + } + } + + function renderSubjects(subjects) { + if (!subjects || !subjects.length) { + subjectsTbody.innerHTML = 'Нет дисциплин'; + return; + } + subjectsTbody.innerHTML = subjects.map(s => ` + + ${s.id} + ${escapeHtml(s.name)} + + `).join(''); + } + + function populateSubjectSelect(subjects) { + if (!assignSubjectSelect) return; + const currentVal = assignSubjectSelect.value; + assignSubjectSelect.innerHTML = '' + + subjects.map(s => ``).join(''); + if (currentVal && subjects.find(s => s.id == currentVal)) { + assignSubjectSelect.value = currentVal; + } + } + + async function loadTeachers() { + try { + allTeachers = await api.get('/api/users/teachers'); + populateTeacherSelect(allTeachers); + } catch (e) { + if (assignTeacherSelect) assignTeacherSelect.innerHTML = ''; + } + } + + function populateTeacherSelect(teachers) { + if (!assignTeacherSelect) return; + const currentVal = assignTeacherSelect.value; + if (!teachers || !teachers.length) { + assignTeacherSelect.innerHTML = ''; + return; + } + assignTeacherSelect.innerHTML = '' + + teachers.map(t => ``).join(''); + if (currentVal && teachers.find(t => t.id == currentVal)) { + assignTeacherSelect.value = currentVal; + } + } + + async function loadTeacherSubjects() { + try { + const tsData = await api.get('/api/teacher-subjects'); + renderTeacherSubjects(tsData); + } catch (e) { + if (teacherSubjectsTbody) teacherSubjectsTbody.innerHTML = 'Ошибка загрузки'; + } + } + + function renderTeacherSubjects(tsArray) { + if (!tsArray || !tsArray.length) { + teacherSubjectsTbody.innerHTML = 'Нет привязок'; + return; + } + teacherSubjectsTbody.innerHTML = tsArray.map(ts => ` + + ${escapeHtml(ts.username)} + ${escapeHtml(ts.subjectName)} + + `).join(''); + } + + createSubjectForm.addEventListener('submit', async (e) => { + e.preventDefault(); + hideAlert('create-subject-alert'); + const name = document.getElementById('new-subject-name').value.trim(); + if (!name) { showAlert('create-subject-alert', 'Введите название', 'error'); return; } + + try { + const data = await api.post('/api/subjects', { name }); + showAlert('create-subject-alert', `Дисциплина "${escapeHtml(data.name)}" добавлена`, 'success'); + createSubjectForm.reset(); + loadSubjects(); + } catch (e) { showAlert('create-subject-alert', e.message || 'Ошибка создания', 'error'); } + }); + + subjectsTbody.addEventListener('click', async (e) => { + const btn = e.target.closest('.btn-delete'); + if (!btn) return; + if (!confirm('Удалить дисциплину?')) return; + try { + await api.delete('/api/subjects/' + btn.dataset.id); + loadSubjects(); + loadTeacherSubjects(); // May have deleted a subject that was assigned + } catch (e) { alert(e.message || 'Ошибка удаления'); } + }); + + assignTeacherForm.addEventListener('submit', async (e) => { + e.preventDefault(); + hideAlert('assign-teacher-alert'); + const userId = assignTeacherSelect.value; + const subjectId = assignSubjectSelect.value; + if (!userId) { showAlert('assign-teacher-alert', 'Выберите преподавателя', 'error'); return; } + if (!subjectId) { showAlert('assign-teacher-alert', 'Выберите дисциплину', 'error'); return; } + + try { + await api.post('/api/teacher-subjects', { userId: Number(userId), subjectId: Number(subjectId) }); + showAlert('assign-teacher-alert', 'Привязка создана', 'success'); + loadTeacherSubjects(); + } catch (e) { showAlert('assign-teacher-alert', e.message || 'Ошибка привязки', 'error'); } + }); + + teacherSubjectsTbody.addEventListener('click', async (e) => { + const btn = e.target.closest('.btn-delete'); + if (!btn) return; + if (!confirm('Удалить привязку?')) return; + try { + await api.delete('/api/teacher-subjects', { + userId: Number(btn.dataset.userId), + subjectId: Number(btn.dataset.subjectId) + }); + loadTeacherSubjects(); + } catch (e) { alert(e.message || 'Ошибка удаления'); } + }); + + loadInitialData(); +} diff --git a/frontend/admin/js/views/users.js b/frontend/admin/js/views/users.js new file mode 100755 index 0000000..b680515 --- /dev/null +++ b/frontend/admin/js/views/users.js @@ -0,0 +1,269 @@ +import { api } from '../api.js'; +import { escapeHtml, showAlert, hideAlert } from '../utils.js'; + +const ROLE_LABELS = { ADMIN: 'Администратор', TEACHER: 'Преподаватель', STUDENT: 'Студент' }; +const ROLE_BADGE = { ADMIN: 'badge-admin', TEACHER: 'badge-teacher', STUDENT: 'badge-student' }; + +export async function initUsers() { + const usersTbody = document.getElementById('users-tbody'); + const createForm = document.getElementById('create-form'); + + // Элементы модального окна добавления занятия + 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 lessonUserId = document.getElementById('lesson-user-id'); + const lessonDaySelect = document.getElementById('lesson-day'); + const weekUpper = document.getElementById('week-upper'); + const weekLower = document.getElementById('week-lower'); + // NEW: получаем элемент выбора времени + const lessonTimeSelect = document.getElementById('lesson-time'); + + // Переменные для хранения загруженных данных + let groups = []; + let subjects = []; + + // NEW: массивы с временными слотами + 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); + } + } + + // Заполнение select группами + function renderGroupOptions() { + lessonGroupSelect.innerHTML = '' + + groups.map(g => ``).join(''); + } + + // Заполнение select дисциплинами + function renderSubjectOptions() { + lessonDisciplineSelect.innerHTML = '' + + subjects.map(s => ``).join(''); + } + + // NEW: функция обновления списка времени в зависимости от дня + function updateTimeOptions(dayValue) { + let times = []; + if (dayValue === "Суббота") { + times = saturdayTimes; + } else if (dayValue && dayValue !== '') { + times = weekdaysTimes; + } else { + lessonTimeSelect.innerHTML = ''; + lessonTimeSelect.disabled = true; + return; + } + + lessonTimeSelect.innerHTML = '' + + times.map(t => ``).join(''); + lessonTimeSelect.disabled = false; + } + + async function loadUsers() { + try { + const users = await api.get('/api/users'); + renderUsers(users); + } catch (e) { + usersTbody.innerHTML = 'Ошибка загрузки: ' + escapeHtml(e.message) + ''; + } + } + + function renderUsers(users) { + if (!users || !users.length) { + usersTbody.innerHTML = 'Нет пользователей'; + return; + } + usersTbody.innerHTML = users.map(u => ` + + ${u.id} + ${escapeHtml(u.username)} + ${ROLE_LABELS[u.role] || escapeHtml(u.role)} + + + `).join(''); + } + + // Сброс формы модального окна + function resetLessonForm() { + addLessonForm.reset(); + lessonUserId.value = ''; + if (weekUpper) weekUpper.checked = false; + if (weekLower) weekLower.checked = false; + // NEW: сбрасываем селект времени + lessonTimeSelect.innerHTML = ''; + lessonTimeSelect.disabled = true; + hideAlert('add-lesson-alert'); + } + + // Открытие модалки с установкой userId + function openAddLessonModal(userId) { + lessonUserId.value = userId; + // NEW: сбрасываем выбранный день и время + lessonDaySelect.value = ''; + updateTimeOptions(''); + modalAddLesson.classList.add('open'); + } + + // Обработчик отправки формы добавления занятия + addLessonForm.addEventListener('submit', async (e) => { + e.preventDefault(); + hideAlert('add-lesson-alert'); + + const userId = lessonUserId.value; + const groupId = lessonGroupSelect.value; + const subjectId = lessonDisciplineSelect.value; + const dayOfWeek = lessonDaySelect.value; + const timeSlot = lessonTimeSelect.value; // NEW: получаем выбранное время + + // Проверка обязательных полей + if (!groupId) { + showAlert('add-lesson-alert', 'Выберите группу', 'error'); + return; + } + if (!subjectId) { + showAlert('add-lesson-alert', 'Выберите дисциплину', 'error'); + return; + } + if (!dayOfWeek) { + showAlert('add-lesson-alert', 'Выберите день недели', 'error'); + return; + } + // NEW: проверка времени + if (!timeSlot) { + showAlert('add-lesson-alert', 'Выберите время', 'error'); + return; + } + + // Определяем выбранный тип недели + const weekUpperChecked = weekUpper?.checked || false; + const weekLowerChecked = weekLower?.checked || false; + let weekType = null; + if (weekUpperChecked && weekLowerChecked) { + weekType = 'Обе'; + } else if (weekUpperChecked) { + weekType = 'Верхняя'; + } else if (weekLowerChecked) { + weekType = 'Нижняя'; + } + + try { + // Отправляем данные на сервер + const response = await api.post('/api/users/lessons/create', { + teacherId: parseInt(userId), + groupId: parseInt(groupId), + subjectId: parseInt(subjectId), + day: dayOfWeek, + week: weekType, + time: timeSlot // передаём время + }); + showAlert('add-lesson-alert', 'Занятие добавлено', 'success'); + setTimeout(() => { + modalAddLesson.classList.remove('open'); + resetLessonForm(); + }, 1500); + } catch (e) { + showAlert('add-lesson-alert', e.message || 'Ошибка добавления занятия', 'error'); + } + }); + + createForm.addEventListener('submit', async (e) => { + e.preventDefault(); + hideAlert('create-alert'); + const username = document.getElementById('new-username').value.trim(); + const password = document.getElementById('new-password').value; + const role = document.getElementById('new-role').value; + if (!username || !password) { showAlert('create-alert', 'Заполните все поля', 'error'); return; } + + try { + const data = await api.post('/api/users', { username, password, role }); + showAlert('create-alert', `Пользователь "${escapeHtml(data.username)}" создан`, 'success'); + createForm.reset(); + loadUsers(); + } catch (e) { + showAlert('create-alert', e.message || 'Ошибка соединения', 'error'); + } + }); + + // Обработчик кликов по таблице + 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 (e) { + alert(e.message || 'Ошибка удаления'); + } + return; + } + + const addLessonBtn = e.target.closest('.btn-add-lesson'); + if (addLessonBtn) { + e.preventDefault(); + if (modalAddLesson) { + openAddLessonModal(addLessonBtn.dataset.id); + } + } + }); + + // NEW: обработчик изменения дня недели для обновления списка времени + lessonDaySelect.addEventListener('change', function() { + updateTimeOptions(this.value); + }); + + // Закрытие модалки по крестику + if (modalAddLessonClose) { + modalAddLessonClose.addEventListener('click', () => { + modalAddLesson.classList.remove('open'); + resetLessonForm(); + }); + } + + // Закрытие по клику на overlay + if (modalAddLesson) { + modalAddLesson.addEventListener('click', (e) => { + if (e.target === modalAddLesson) { + modalAddLesson.classList.remove('open'); + resetLessonForm(); + } + }); + } + + // Загружаем все данные при инициализации + await Promise.all([loadUsers(), loadGroups(), loadSubjects()]); +} \ No newline at end of file diff --git a/frontend/admin/views/classrooms.html b/frontend/admin/views/classrooms.html new file mode 100755 index 0000000..b066193 --- /dev/null +++ b/frontend/admin/views/classrooms.html @@ -0,0 +1,109 @@ + +
+

Новая аудитория

+
+
+
+ + +
+
+ + +
+
+
+
+ +
+
+ Выберите оборудование... + + + +
+ +
+
+
+ +
+
+ +
+
+ +
+

Список аудиторий

+
+ + + + + + + + + + + + + + + + +
IDНазваниеВместимостьОборудованиеСтатусДействия
Загрузка...
+
+
+ + + \ No newline at end of file diff --git a/frontend/admin/views/edu-forms.html b/frontend/admin/views/edu-forms.html new file mode 100755 index 0000000..a2f51ca --- /dev/null +++ b/frontend/admin/views/edu-forms.html @@ -0,0 +1,34 @@ + +
+

Новая форма обучения

+
+
+
+ + +
+ +
+ +
+
+ +
+

Все формы обучения

+
+ + + + + + + + + + + + + +
IDНазваниеДействия
Загрузка...
+
+
\ No newline at end of file diff --git a/frontend/admin/views/equipments.html b/frontend/admin/views/equipments.html new file mode 100755 index 0000000..3754d76 --- /dev/null +++ b/frontend/admin/views/equipments.html @@ -0,0 +1,34 @@ + +
+

Новое оборудование

+
+
+
+ + +
+ +
+ +
+
+ +
+

Справочник оборудования

+
+ + + + + + + + + + + + + +
IDНазваниеДействия
Загрузка...
+
+
\ No newline at end of file diff --git a/frontend/admin/views/groups.html b/frontend/admin/views/groups.html new file mode 100755 index 0000000..2dc558c --- /dev/null +++ b/frontend/admin/views/groups.html @@ -0,0 +1,49 @@ + +
+

Новая группа

+
+
+
+ + +
+
+ + +
+ +
+ +
+
+ +
+
+

Все группы

+
+ + +
+
+
+ + + + + + + + + + + + + + +
IDНазваниеФорма обученияДействия
Загрузка...
+
+
\ No newline at end of file diff --git a/frontend/admin/views/schedule.html b/frontend/admin/views/schedule.html new file mode 100755 index 0000000..1ee1ce0 --- /dev/null +++ b/frontend/admin/views/schedule.html @@ -0,0 +1,34 @@ +
+

Расписание занятий

+
+ + + + + + + + + + + + + + + + + + +
ID + Преподаватель ▾ + + Группа ▾ + + Форма обучения ▾ + + Дисциплина ▾ + + День недели ▾ + НеделяВремя
Загрузка...
+
+
\ No newline at end of file diff --git a/frontend/admin/views/subjects.html b/frontend/admin/views/subjects.html new file mode 100755 index 0000000..a312430 --- /dev/null +++ b/frontend/admin/views/subjects.html @@ -0,0 +1,76 @@ + +
+

Новая дисциплина

+
+
+
+ + +
+ +
+ +
+
+ +
+

Привязка преподавателя к дисциплине

+
+
+
+ + +
+
+ + +
+ +
+ +
+
+ +
+

Все дисциплины

+
+ + + + + + + + + + + + + +
IDНазваниеДействия
Загрузка...
+
+
+ +
+

Привязки преподавателей

+
+ + + + + + + + + + + + + +
ПреподавательДисциплинаДействия
Загрузка...
+
+
\ No newline at end of file diff --git a/frontend/admin/views/users.html b/frontend/admin/views/users.html new file mode 100755 index 0000000..1303153 --- /dev/null +++ b/frontend/admin/views/users.html @@ -0,0 +1,110 @@ + +
+

Новый пользователь

+
+
+
+ + +
+
+ + +
+
+ + +
+ +
+ +
+
+ +
+

Все пользователи

+
+ + + + + + + + + + + + + + +
IDИмя пользователяРольДействия
Загрузка...
+
+
+ + + \ No newline at end of file diff --git a/frontend/index.html b/frontend/index.html old mode 100644 new mode 100755 diff --git a/frontend/script.js b/frontend/script.js old mode 100644 new mode 100755 diff --git a/frontend/student/index.html b/frontend/student/index.html old mode 100644 new mode 100755 diff --git a/frontend/style.css b/frontend/style.css old mode 100644 new mode 100755 diff --git a/frontend/teacher/index.html b/frontend/teacher/index.html old mode 100644 new mode 100755 diff --git a/frontend/theme-toggle.js b/frontend/theme-toggle.js old mode 100644 new mode 100755