Skip to content
Snippets Groups Projects
Commit 1b586317 authored by xamgore's avatar xamgore
Browse files

Method GetTeachersForDiscipline moved to Teachers model

parent 1a426425
Branches
Tags
No related merge requests found
...@@ -38,8 +38,7 @@ class Controller_Student_Index extends Controller_UserEnvi { ...@@ -38,8 +38,7 @@ class Controller_Student_Index extends Controller_UserEnvi {
} }
protected function getTeachersForDiscipline($id) { protected function getTeachersForDiscipline($id) {
$model = new Model_Student; $teachers = Model_Teachers::ofDiscipline($id);
$teachers = $model->getTeachersForDiscipline($id);
$teachersHandled = array(); $i = 0; $teachersHandled = array(); $i = 0;
foreach ($teachers as $teacher) foreach ($teachers as $teacher)
{ {
......
...@@ -115,8 +115,7 @@ class Controller_Student_Subject extends Controller_UserEnvi { ...@@ -115,8 +115,7 @@ class Controller_Student_Subject extends Controller_UserEnvi {
} }
protected function getTeachersForDiscipline($id) { protected function getTeachersForDiscipline($id) {
$model = new Model_Student; $teachers = Model_Teachers::ofDiscipline($id);
$teachers = $model->getTeachersForDiscipline($id);
$teachersHandled = array(); $i = 0; $teachersHandled = array(); $i = 0;
foreach ($teachers as $teacher) foreach ($teachers as $teacher)
{ {
......
...@@ -14,12 +14,6 @@ class Model_Student extends Model ...@@ -14,12 +14,6 @@ class Model_Student extends Model
return DB::query(Database::SELECT, $sql)->execute(); return DB::query(Database::SELECT, $sql)->execute();
} }
public function getTeachersForDiscipline($discipline_id)
{
$sql = "CALL `GetTeachersForDiscipline`('$discipline_id'); ";
return DB::query(Database::SELECT, $sql)->execute();
}
public function getSemesterInfo($id) // TODO: перенести в common.php public function getSemesterInfo($id) // TODO: перенести в common.php
{ {
$sql = "CALL `GetSemesterInfo`('$id'); "; $sql = "CALL `GetSemesterInfo`('$id'); ";
......
...@@ -16,11 +16,6 @@ class Model_Teachers extends Model ...@@ -16,11 +16,6 @@ class Model_Teachers extends Model
return DB::query(Database::SELECT, $sql)->execute(); return DB::query(Database::SELECT, $sql)->execute();
} }
public function getTeachersForDiscipline($disciplineID) {
$sql = "CALL `GetTeachersForDiscipline`('$disciplineID'); ";
return DB::query(Database::SELECT, $sql)->execute();
}
public function getTeachersByFaculty($facultyID) { public function getTeachersByFaculty($facultyID) {
$sql = "CALL `GetTeachersByFaculty`('$facultyID'); "; $sql = "CALL `GetTeachersByFaculty`('$facultyID'); ";
return DB::query(Database::SELECT, $sql)->execute(); return DB::query(Database::SELECT, $sql)->execute();
...@@ -54,8 +49,17 @@ class Model_Teachers extends Model ...@@ -54,8 +49,17 @@ class Model_Teachers extends Model
return new DataArray_Result($list); return new DataArray_Result($list);
} }
public function forDiscipline($disciplineID, $asConcat = false, $asInitials = false) { /**
$teachers = $this->getTeachersForDiscipline($disciplineID); * @param $id int discipline id
* @return Database_Result select from <tt>view_disciplines_teachers</tt> table
*/
public static function ofDiscipline($id) {
$sql = "CALL `GetTeachersForDiscipline`('$id'); ";
return DB::query(Database::SELECT, $sql)->execute();
}
public static function forDiscipline($disciplineID, $asConcat = false, $asInitials = false) {
$teachers = self::ofDiscipline($disciplineID);
$list = array(); $list = array();
foreach ($teachers as $row) { foreach ($teachers as $row) {
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment