GetDisciplineInfoByID & GetTeachersForDiscipline

+ изменения в бд

db/DatabaseSample.sql

@@ -3,7 +3,7 @@
 -- http://www.phpmyadmin.net
 --
 -- Хост: 127.0.0.1:3306
--- Время создания: Авг 04 2014 г., 18:58
+-- Время создания: Авг 04 2014 г., 23:45
 -- Версия сервера: 5.5.37-log
 -- Версия PHP: 5.3.28
 
@@ -541,7 +541,7 @@ INSERT INTO `study_groups` (`ID`, `Grade`, `Group`, `SpecializationID`, `Faculty
 CREATE TABLE IF NOT EXISTS `subjects` (
   `ID` int(11) NOT NULL AUTO_INCREMENT,
   `Name` varchar(50) NOT NULL,
-  `SubjectAbbr` varchar(20) DEFAULT NULL,
+  `Abbr` varchar(20) DEFAULT NULL,
   PRIMARY KEY (`ID`)
 ) ENGINE=InnoDB  DEFAULT CHARSET=utf8 AUTO_INCREMENT=5 ;
 
@@ -549,7 +549,7 @@ CREATE TABLE IF NOT EXISTS `subjects` (
 -- Дамп данных таблицы `subjects`
 --
 
-INSERT INTO `subjects` (`ID`, `Name`, `SubjectAbbr`) VALUES
+INSERT INTO `subjects` (`ID`, `Name`, `Abbr`) VALUES
 (1, 'Математический анализ', 'Матан'),
 (2, 'Дифференциальные уравнения', 'Дифф. ур-я'),
 (3, 'Операционные системы', 'ОС'),

db/DatabaseStructure.sql

@@ -3,7 +3,7 @@
 -- http://www.phpmyadmin.net
 --
 -- Хост: 127.0.0.1:3306
--- Время создания: Авг 04 2014 г., 18:59
+-- Время создания: Авг 04 2014 г., 23:45
 -- Версия сервера: 5.5.37-log
 -- Версия PHP: 5.3.28
 
@@ -364,7 +364,7 @@ CREATE TABLE IF NOT EXISTS `study_groups` (
 CREATE TABLE IF NOT EXISTS `subjects` (
   `ID` int(11) NOT NULL AUTO_INCREMENT,
   `Name` varchar(50) NOT NULL,
-  `SubjectAbbr` varchar(20) DEFAULT NULL,
+  `Abbr` varchar(20) DEFAULT NULL,
   PRIMARY KEY (`ID`)
 ) ENGINE=InnoDB  DEFAULT CHARSET=utf8;
 

db/StoredProcedures.sql

@@ -163,9 +163,9 @@ BEGIN
 				faculties.ID 			AS 'FacultyID', 
 				faculties.Name 			AS 'FacultyName', 
 				faculties.Abbr 			AS 'FacultyAbbreviation'
-		FROM accounts
-		INNER JOIN teachers ON UserID = AccountID
-		INNER JOIN faculties ON teachers.FacultyID = faculties.ID
+		FROM `accounts`
+		INNER JOIN `teachers` ON UserID = teachers.AccountID
+		INNER JOIN `faculties` ON teachers.FacultyID = faculties.ID
 		WHERE accounts.ID = UserID;
 
 	END IF;
@@ -460,6 +460,53 @@ END //
 
 
 
+DROP PROCEDURE IF EXISTS GetDisciplineInfoByID; //
+CREATE PROCEDURE `GetDisciplineInfoByID`(IN `DiscID` INT)
+    NO SQL
+BEGIN  
+
+	SELECT 	disciplines.Name 			AS 'DisciplineName',
+			disciplines.AuthorID 		AS 'AuthorID',
+			disciplines.Grade 			AS 'DisciplineGrade',
+			disciplines.ExamType,
+			disciplines.Type 			AS 'LessonType',
+			disciplines.LectionCount,
+			disciplines.PracticeCount,
+			disciplines.SemesterID,
+			subjects.ID 				AS 'SubjectID',
+			subjects.Name 				AS 'SubjectName',
+			subjects.Abbr 				AS 'SubjectAbbr'
+
+
+	FROM `disciplines`
+	INNER JOIN `subjects` ON subjects.ID = disciplines.SubjectID
+	WHERE disciplines.ID = DiscID;
+END //
+
+
+DROP PROCEDURE IF EXISTS GetTeachersForDiscipline; //
+CREATE PROCEDURE `GetTeachersForDiscipline`(IN `DiscID` INT)
+    NO SQL
+BEGIN  
+
+		SELECT 	teachers.ID 			AS 'TeacherID', 
+				teachers.LastName, 
+				teachers.FirstName, 
+				teachers.SecondName, 
+				teachers.Degree, 
+				faculties.ID 			AS 'FacultyID', 
+				faculties.Name 			AS 'FacultyName', 
+				faculties.Abbr 			AS 'FacultyAbbreviation'
+		FROM `disciplines_teachers`
+		INNER JOIN `teachers` ON teachers.ID = disciplines_teachers.TeacherID
+		INNER JOIN `faculties` ON teachers.FacultyID = faculties.ID
+		WHERE disciplines_teachers.DisciplineID = DiscID;
+END //
+
+
+
+
+
 -- Desc: Вывод всех курсов (ID курса, название курса, базовая студ.группа-слушатель), которые ведет преподаватель
 DROP PROCEDURE IF EXISTS GetDisciplinesForTeacher; //
 CREATE PROCEDURE `GetDisciplinesForTeacher`(IN `TeacherID` INT)