diff --git a/~dev_rating/application/classes/Controller/Admin/Accounts.php b/~dev_rating/application/classes/Controller/Admin/Accounts.php index 84d529a834a011b7c9b17d290119f2d629fc2c3a..2f6985dc5502b9df539908b2db438ac0e50c86a1 100644 --- a/~dev_rating/application/classes/Controller/Admin/Accounts.php +++ b/~dev_rating/application/classes/Controller/Admin/Accounts.php @@ -15,7 +15,7 @@ class Controller_Admin_Accounts extends Controller_UserEnvi { $model = new Model_Students(); Cookie::set('fD', 'true'); $twig = Twig::factory('admin/accounts/codes'); - $twig->Faculties = Model_Faculties::create()->common()->asArray(); + $twig->Faculties = Model_Faculties::toArray(); $twig->Grades = Model_Grades::create()->structured()->asArray(); $twig->User = $this->UserInfo; $this->response->body($twig); diff --git a/~dev_rating/application/classes/Controller/Admin/Students.php b/~dev_rating/application/classes/Controller/Admin/Students.php index 9ae2732d8089f3b802d3f6dd0157ba5de4b07192..b6d79ea8740416cf8f63c6b19c97114331cb12c8 100644 --- a/~dev_rating/application/classes/Controller/Admin/Students.php +++ b/~dev_rating/application/classes/Controller/Admin/Students.php @@ -6,7 +6,7 @@ class Controller_Admin_Students extends Controller_UserEnvi { { // VIEW $twig = Twig::factory('admin/students/index'); - $twig->Faculties = Model_Faculties::create()->common()->asArray(); + $twig->Faculties = Model_Faculties::toArray(); $twig->Grades = Model_Grades::create()->structured()->asArray(); $twig->User = $this->UserInfo; $this->response->body($twig); @@ -15,7 +15,7 @@ class Controller_Admin_Students extends Controller_UserEnvi { public function action_add() { $twig = Twig::factory('admin/students/add'); - $twig->Faculties = Model_Faculties::create()->common()->asArray(); + $twig->Faculties = Model_Faculties::toArray(); $twig->Grades = Model_Grades::create()->structured()->asArray(); $twig->User = $this->UserInfo; $this->response->body($twig); @@ -29,7 +29,7 @@ class Controller_Admin_Students extends Controller_UserEnvi { } // VIEW $twig = Twig::factory('admin/students/upload'); - $twig->Faculties = Model_Faculties::create()->common()->asArray(); + $twig->Faculties = Model_Faculties::toArray(); $twig->UploadingResult = $result; $twig->User = $this->UserInfo; $this->response->body($twig); diff --git a/~dev_rating/application/classes/Controller/Admin/Subjects.php b/~dev_rating/application/classes/Controller/Admin/Subjects.php index 33c8b20ae91e9b307a68e4ccd4d73058552683df..458c98b3494036069e974c47b41392b76c56748f 100644 --- a/~dev_rating/application/classes/Controller/Admin/Subjects.php +++ b/~dev_rating/application/classes/Controller/Admin/Subjects.php @@ -13,7 +13,7 @@ class Controller_Admin_Subjects extends Controller_UserEnvi { } // VIEW $twig = Twig::factory('admin/subjects/upload'); - $twig->Faculties = Model_Faculties::create()->common()->asArray(); + $twig->Faculties = Model_Faculties::toArray(); $twig->UploadingResult = $result; $twig->User = $this->UserInfo; $this->response->body($twig); diff --git a/~dev_rating/application/classes/Controller/Admin/Teachers.php b/~dev_rating/application/classes/Controller/Admin/Teachers.php index 427d039f9180ea515163b7f78629650d4407b434..9eff7f5657f3497a391b7ef3f8b07e08f74ec446 100644 --- a/~dev_rating/application/classes/Controller/Admin/Teachers.php +++ b/~dev_rating/application/classes/Controller/Admin/Teachers.php @@ -6,7 +6,7 @@ class Controller_Admin_Teachers extends Controller_UserEnvi { { // VIEW $twig = Twig::factory('admin/teachers/index'); - $twig->Faculties = Model_Faculties::create()->common()->asArray(); + $twig->Faculties = Model_Faculties::toArray(); $twig->User = $this->UserInfo; $this->response->body($twig); } @@ -15,7 +15,7 @@ class Controller_Admin_Teachers extends Controller_UserEnvi { { $twig = Twig::factory('admin/teachers/add'); $twig->JobPositions = $this->getJobPositions(); - $twig->Faculties = Model_Faculties::create()->common()->asArray(); + $twig->Faculties = Model_Faculties::toArray(); $twig->User = $this->UserInfo; $this->response->body($twig); } @@ -28,7 +28,7 @@ class Controller_Admin_Teachers extends Controller_UserEnvi { } // VIEW $twig = Twig::factory('admin/teachers/upload'); - $twig->Faculties = Model_Faculties::create()->common()->asArray(); + $twig->Faculties = Model_Faculties::toArray(); $twig->UploadingResult = $result; $twig->User = $this->UserInfo; $this->response->body($twig); diff --git a/~dev_rating/application/classes/Controller/Teacher/Discipline.php b/~dev_rating/application/classes/Controller/Teacher/Discipline.php index da6439e99775b1ec6ce4a45610c3d22a5ec9c145..bb7b97a72334efdda034655b07746277c6c8b07a 100644 --- a/~dev_rating/application/classes/Controller/Teacher/Discipline.php +++ b/~dev_rating/application/classes/Controller/Teacher/Discipline.php @@ -7,7 +7,7 @@ class Controller_Teacher_Discipline extends Controller_UserEnvi { $twig = Twig::factory('teacher/discipline/CreateDiscipline'); $db = new Model_Teacher_Map; $twig->User = $this->UserInfo; - $twig->FacultiesList = Model_Faculties::create()->common()->asArray(); + $twig->FacultiesList = Model_Faculties::toArray(); $twig->SubjectsList = Model_Subjects::create()->byFaculty($this->UserInfo['FacultyID'])->asArray(); $twig->GradesList = Model_Grades::create()->common()->asArray(); $this->response->body($twig); @@ -145,7 +145,7 @@ class Controller_Teacher_Discipline extends Controller_UserEnvi { $twig->User = $this->UserInfo; $twig->Discipline = $this->getDisciplineInfo($db, $id); $twig->BindTeachersList = Model_Teachers::create()->forDiscipline($id)->asArray(); - $twig->FacultiesList = Model_Faculties::create()->common()->asArray(); + $twig->FacultiesList = Model_Faculties::toArray(); $twig->Departments = Model_Departments::byFaculty($this->UserInfo['FacultyID']); $this->response->body($twig); diff --git a/~dev_rating/application/classes/Model/Faculties.php b/~dev_rating/application/classes/Model/Faculties.php index 5e37220f5d81c032cc375596a024b2ef39dd77b3..83ad3a47ca7646d6ddb46d58b934f716ceae19dd 100644 --- a/~dev_rating/application/classes/Model/Faculties.php +++ b/~dev_rating/application/classes/Model/Faculties.php @@ -2,24 +2,17 @@ class Model_Faculties extends Model { - public static function create() { - return new self(); - } - - public function getFaculties() { + public static function getFaculties() { $sql = "CALL `GetFaculties`(); "; return DB::query(Database::SELECT, $sql)->execute(); } - public function common() { - $faculties = $this->GetFaculties(); + public static function toArray() { + $faculties = self::getFaculties(); $list = array(); foreach ($faculties as $row) $list[] = $row; - - return new DataArray_Result($list); + return $list; } - - // TODO Метод для получения факультетов }