Merge branch 'branch-of-fixes'

.gitignore

@@ -8,7 +8,7 @@ db/disciplines activity.sql
 ~dev_rating/static/*
 !~dev_rating/static/img/
 !~dev_rating/static/other/
-*/node_modules
+node_modules/
 
 *.*~
 *.DS_STORE

Makefile

+default: deploy
+	@
+
+
+install: DB_install Tasker_install Tasker_run
+	@
+
+deploy: DB_deploy Tasker_deploy Tasker_run
+	@
+
+
+
+Tasker_install: Tasker_deploy
+	npm install -g gulp
+
+Tasker_deploy:
+	npm install
+
+Tasker_run:
+	gulp
+
+DB_%:
+	@$(MAKE) $* -C ./db

db/Makefile

+define GET_NAMES
+$(subst .sql, , $(wildcard $1/*.sql))
+endef
+
+
+USER := $(shell bash -c 'read -p "Username: " pwd; echo $$username')
+PASS := $(shell bash -c 'read -s -p "Password: " pwd; echo $$pwd')
+DB := mmcs_rating
+
+
+
+install: $(call GET_NAMES, structure) \
+$(call GET_NAMES, data) \
+$(call GET_NAMES, constraints) \
+deploy
+	@
+
+deploy: $(call GET_NAMES, stored)
+	@
+
+
+%:
+	mysql -u $(USER) $(PASS) $(DB) < $@.sql
+
+

db/constraints/base.sql

+--
+-- Ограничения внешнего ключа сохраненных таблиц
+--
+
+--
+-- Ограничения внешнего ключа таблицы `accounts`
+--
+ALTER TABLE `accounts`
+  ADD CONSTRAINT `accounts_ibfk_1` FOREIGN KEY (`UserRoleID`) REFERENCES `user_roles` (`ID`);
+
+--
+-- Ограничения внешнего ключа таблицы `departments`
+--
+ALTER TABLE `departments`
+  ADD CONSTRAINT `departments_ibfk_1` FOREIGN KEY (`FacultyID`) REFERENCES `faculties` (`ID`);
+
+--
+-- Ограничения внешнего ключа таблицы `disciplines`
+--
+ALTER TABLE `disciplines`
+  ADD CONSTRAINT `disciplines_ibfk_1` FOREIGN KEY (`SubjectID`) REFERENCES `subjects` (`ID`),
+  ADD CONSTRAINT `disciplines_ibfk_2` FOREIGN KEY (`SemesterID`) REFERENCES `semesters` (`ID`),
+  ADD CONSTRAINT `disciplines_ibfk_3` FOREIGN KEY (`AuthorID`) REFERENCES `teachers` (`ID`),
+  ADD CONSTRAINT `disciplines_ibfk_4` FOREIGN KEY (`FacultyID`) REFERENCES `faculties` (`ID`),
+  ADD CONSTRAINT `disciplines_ibfk_5` FOREIGN KEY (`GradeID`) REFERENCES `grades` (`ID`);
+
+--
+-- Ограничения внешнего ключа таблицы `disciplines_groups`
+--
+ALTER TABLE `disciplines_groups`
+  ADD CONSTRAINT `disciplines_groups_ibfk_1` FOREIGN KEY (`DisciplineID`) REFERENCES `disciplines` (`ID`),
+  ADD CONSTRAINT `disciplines_groups_ibfk_2` FOREIGN KEY (`GroupID`) REFERENCES `study_groups` (`ID`);
+
+--
+-- Ограничения внешнего ключа таблицы `disciplines_students`
+--
+ALTER TABLE `disciplines_students`
+  ADD CONSTRAINT `disciplines_students_ibfk_1` FOREIGN KEY (`DisciplineID`) REFERENCES `disciplines` (`ID`),
+  ADD CONSTRAINT `disciplines_students_ibfk_2` FOREIGN KEY (`StudentID`) REFERENCES `students` (`ID`);
+
+--
+-- Ограничения внешнего ключа таблицы `disciplines_teachers`
+--
+ALTER TABLE `disciplines_teachers`
+  ADD CONSTRAINT `disciplines_teachers_ibfk_1` FOREIGN KEY (`DisciplineID`) REFERENCES `disciplines` (`ID`),
+  ADD CONSTRAINT `disciplines_teachers_ibfk_2` FOREIGN KEY (`TeacherID`) REFERENCES `teachers` (`ID`);
+
+
+--
+-- Ограничения внешнего ключа таблицы `recovery_tokens`
+--
+ALTER TABLE `recovery_tokens`
+  ADD CONSTRAINT `recovery_tokens_ibfk_1` FOREIGN KEY (`AccountID`) REFERENCES `accounts` (`ID`);
+
+
+
+--
+-- Ограничения внешнего ключа таблицы `modules`
+--
+ALTER TABLE `modules`
+  ADD CONSTRAINT `modules_ibfk_1` FOREIGN KEY (`DisciplineID`) REFERENCES `disciplines` (`ID`);
+
+--
+-- Ограничения внешнего ключа таблицы `rating_table`
+--
+ALTER TABLE `rating_table`
+  ADD CONSTRAINT `rating_table_ibfk_1` FOREIGN KEY (`StudentID`) REFERENCES `students` (`ID`),
+  ADD CONSTRAINT `rating_table_ibfk_2` FOREIGN KEY (`SubmoduleID`) REFERENCES `submodules` (`ID`),
+  ADD CONSTRAINT `rating_table_ibfk_3` FOREIGN KEY (`TeacherID`) REFERENCES `teachers` (`ID`);
+
+
+--
+-- Ограничения внешнего ключа таблицы `specializations`
+--
+ALTER TABLE `specializations`
+  ADD CONSTRAINT `specializations_ibfk_1` FOREIGN KEY (`FacultyID`) REFERENCES `faculties` (`ID`);
+
+--
+-- Ограничения внешнего ключа таблицы `students`
+--
+ALTER TABLE `students`
+  ADD CONSTRAINT `students_ibfk_2` FOREIGN KEY (`AccountID`) REFERENCES `accounts` (`ID`);
+
+--
+-- Ограничения внешнего ключа таблицы `study_groups`
+--
+ALTER TABLE `study_groups`
+  ADD CONSTRAINT `study_groups_ibfk_1` FOREIGN KEY (`SpecializationID`) REFERENCES `specializations` (`ID`),
+  ADD CONSTRAINT `study_groups_ibfk_2` FOREIGN KEY (`GradeID`) REFERENCES `grades` (`ID`);
+
+--
+-- Ограничения внешнего ключа таблицы `submodules`
+--
+ALTER TABLE `submodules`
+  ADD CONSTRAINT `submodules_ibfk_1` FOREIGN KEY (`ModuleID`) REFERENCES `modules` (`ID`);
+
+--
+-- Ограничения внешнего ключа таблицы `teachers`
+--
+ALTER TABLE `teachers`
+  ADD CONSTRAINT `teachers_ibfk_1` FOREIGN KEY (`AccountID`) REFERENCES `accounts` (`ID`),
+  ADD CONSTRAINT `teachers_ibfk_2` FOREIGN KEY (`DepartmentID`) REFERENCES `departments` (`ID`),
+  ADD CONSTRAINT `teachers_ibfk_3` FOREIGN KEY (`JobPositionID`) REFERENCES `job_positions` (`ID`);
+
+
+--
+-- Ограничения внешнего ключа таблицы `subjects_faculties`
+--
+ALTER TABLE `subjects_faculties`
+  ADD CONSTRAINT `subjects_faculties_ibfk_1` FOREIGN KEY (`FacultyID`) REFERENCES `faculties` (`ID`),
+  ADD CONSTRAINT `subjects_faculties_ibfk_2` FOREIGN KEY (`SubjectID`) REFERENCES `subjects` (`ID`);
+
+
+--
+-- Ограничения внешнего ключа таблицы `students_groups`
+--
+ALTER TABLE  `students_groups`
+  ADD CONSTRAINT `students_groups_ibfk_1` FOREIGN KEY (`StudentID`) REFERENCES `students` (`ID`),
+  ADD CONSTRAINT `students_groups_ibfk_2` FOREIGN KEY (`GroupID`) REFERENCES `study_groups` (`ID`),
+  ADD CONSTRAINT `students_groups_ibfk_3` FOREIGN KEY (`SemesterID`) REFERENCES `semesters` (`ID`);
+
+
+--
+-- Ограничения внешнего ключа таблицы `exam_period_options`
+--
+ALTER TABLE `exam_period_options`
+  ADD CONSTRAINT `exam_period_options_ibfk_2` FOREIGN KEY (`StudentID`) REFERENCES `students` (`ID`),
+  ADD CONSTRAINT `exam_period_options_ibfk_1` FOREIGN KEY (`SubmoduleID`) REFERENCES `submodules` (`ID`);
+

db/constraints/logs.sql

+--
+-- Ограничения внешнего ключа таблицы `logs_rating`
+--
+ALTER TABLE `logs_rating`
+  ADD CONSTRAINT `logs_rating_ibfk_1` FOREIGN KEY (`StudentID`) REFERENCES `students` (`ID`),
+  ADD CONSTRAINT `logs_rating_ibfk_2` FOREIGN KEY (`SubmoduleID`) REFERENCES `submodules` (`ID`),
+  ADD CONSTRAINT `logs_rating_ibfk_3` FOREIGN KEY (`TeacherID`) REFERENCES `teachers` (`ID`);
+
+--
+-- Ограничения внешнего ключа таблицы `logs_signin`
+--
+ALTER TABLE `logs_signin`
+  ADD CONSTRAINT `logs_signin_ibfk_1` FOREIGN KEY (`AccountID`) REFERENCES `accounts` (`ID`);
+
+
+--
+-- Ограничения внешнего ключа таблицы `logs_binds_students`
+--
+ALTER TABLE `logs_binds_students`
+  ADD CONSTRAINT `logs_binds_students_ibfk_3` FOREIGN KEY (`StudentID`) REFERENCES `students` (`ID`),
+  ADD CONSTRAINT `logs_binds_students_ibfk_1` FOREIGN KEY (`DisciplineID`) REFERENCES `disciplines` (`ID`),
+  ADD CONSTRAINT `logs_binds_students_ibfk_2` FOREIGN KEY (`TeacherID`) REFERENCES `teachers` (`ID`);
+
+
+--
+-- Ограничения внешнего ключа таблицы `logs_binds_groups`
+--
+ALTER TABLE `logs_binds_groups`
+  ADD CONSTRAINT `logs_binds_groups_ibfk_3` FOREIGN KEY (`GroupID`) REFERENCES `study_groups` (`ID`),
+  ADD CONSTRAINT `logs_binds_groups_ibfk_1` FOREIGN KEY (`DisciplineID`) REFERENCES `disciplines` (`ID`),
+  ADD CONSTRAINT `logs_binds_groups_ibfk_2` FOREIGN KEY (`TeacherID`) REFERENCES `teachers` (`ID`);

db/data/userRoles.sql

+--
+-- Дамп данных таблицы `user_roles`
+--
+
+-- 1 - common
+-- 2 - student
+-- 4 - teacher
+-- 8 - admin
+-- 16 - deans
+INSERT INTO `user_roles` (`ID`, `Type`, `RoleName`, `Mark`) VALUES
+(1, 'student', 'Студент', 3),
+(2, 'teacher', 'Преподаватель', 5),
+(3, 'teacher', 'Преподаватель-Администратор', 31),
+(4, 'teacher', 'Работник деканата', 21);

db/extra/grants.sql

+REVOKE ALL PRIVILEGES, GRANT OPTION FROM  'mmcs_rating_view'@'localhost';
+GRANT USAGE ON  `mmcs_rating` . * TO  'mmcs_rating_view'@'localhost';
+
+GRANT SELECT (
+`ID` ,  `Login` ,  `EMail` ,  `UserRoleID` ,  `isEnabled` ,  `UserAgent`
+) ON  `mmcs_rating`.`accounts` TO  'mmcs_rating_view'@'localhost';
+GRANT SELECT ON  `mmcs_rating`.`departments` TO  'mmcs_rating_view'@'localhost';
+GRANT SELECT ON  `mmcs_rating`.`disciplines` TO  'mmcs_rating_view'@'localhost';
+GRANT SELECT ON  `mmcs_rating`.`disciplines_groups` TO  'mmcs_rating_view'@'localhost';
+GRANT SELECT ON  `mmcs_rating`.`disciplines_teachers` TO  'mmcs_rating_view'@'localhost';
+GRANT SELECT ON  `mmcs_rating`.`disciplines_students` TO  'mmcs_rating_view'@'localhost';
+GRANT SELECT ON  `mmcs_rating`.`teachers` TO  'mmcs_rating_view'@'localhost';
+GRANT SELECT ON  `mmcs_rating`.`rating_table` TO  'mmcs_rating_view'@'localhost';
+GRANT SELECT ON  `mmcs_rating`.`faculties` TO  'mmcs_rating_view'@'localhost';
+GRANT SELECT ON  `mmcs_rating`.`general_settings` TO  'mmcs_rating_view'@'localhost';
+GRANT SELECT ON  `mmcs_rating`.`grades` TO  'mmcs_rating_view'@'localhost';
+GRANT SELECT ON  `mmcs_rating`.`job_positions` TO  'mmcs_rating_view'@'localhost';
+GRANT SELECT ON  `mmcs_rating`.`logs_rating` TO  'mmcs_rating_view'@'localhost';
+GRANT SELECT ON  `mmcs_rating`.`logs_signin` TO  'mmcs_rating_view'@'localhost';
+GRANT SELECT ON  `mmcs_rating`.`modules` TO  'mmcs_rating_view'@'localhost';
+GRANT SELECT ON  `mmcs_rating`.`page_access` TO  'mmcs_rating_view'@'localhost';
+GRANT SELECT ON  `mmcs_rating`.`requests` TO  'mmcs_rating_view'@'localhost';
+GRANT SELECT ON  `mmcs_rating`.`semesters` TO  'mmcs_rating_view'@'localhost';
+GRANT SELECT ON  `mmcs_rating`.`specializations` TO  'mmcs_rating_view'@'localhost';
+GRANT SELECT ON  `mmcs_rating`.`students` TO  'mmcs_rating_view'@'localhost';
+GRANT SELECT ON  `mmcs_rating`.`study_groups` TO  'mmcs_rating_view'@'localhost';
+GRANT SELECT ON  `mmcs_rating`.`subjects` TO  'mmcs_rating_view'@'localhost';
+GRANT SELECT ON  `mmcs_rating`.`subjects_faculties` TO  'mmcs_rating_view'@'localhost';
+GRANT SELECT ON  `mmcs_rating`.`submodules` TO  'mmcs_rating_view'@'localhost';
+GRANT SELECT ON  `mmcs_rating`.`disciplines_teachers` TO  'mmcs_rating_view'@'localhost';
+GRANT SELECT ON  `mmcs_rating`.`user_roles` TO  'mmcs_rating_view'@'localhost';
+GRANT SELECT ON  `mmcs_rating`.`students_groups` TO  'mmcs_rating_view'@'localhost';
+
+GRANT SELECT ON  `mmcs_rating`.`view_disciplines` TO  'mmcs_rating_view'@'localhost';
+GRANT SELECT ON  `mmcs_rating`.`view_disciplines_students` TO  'mmcs_rating_view'@'localhost';
+GRANT SELECT ON  `mmcs_rating`.`view_disciplines_teachers` TO  'mmcs_rating_view'@'localhost';
+GRANT SELECT ON  `mmcs_rating`.`view_groups` TO  'mmcs_rating_view'@'localhost';
+GRANT SELECT ON  `mmcs_rating`.`view_rating_result` TO  'mmcs_rating_view'@'localhost';
+GRANT SELECT ON  `mmcs_rating`.`view_roadmap` TO  'mmcs_rating_view'@'localhost';
+GRANT SELECT ON  `mmcs_rating`.`view_students` TO  'mmcs_rating_view'@'localhost';
+GRANT SELECT ON  `mmcs_rating`.`view_teachers` TO  'mmcs_rating_view'@'localhost';