Unified Model_Faculties class added

~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 = DataArray::factory('Faculties')->common()->asArray();
+        $twig->Faculties = Model_Faculties::factory()->common()->asArray();
         $twig->Grades = $this->getGrades();
         $twig->User = $this->UserInfo;
         $this->response->body($twig);

~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 = DataArray::factory('Faculties')->common()->asArray();
+        $twig->Faculties = Model_Faculties::factory()->common()->asArray();
         $twig->Grades = Model_Grades::factory()->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 = DataArray::factory('Faculties')->common()->asArray();
+        $twig->Faculties = Model_Faculties::factory()->common()->asArray();
         $twig->Grades = Model_Grades::factory()->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 = DataArray::factory('Faculties')->common()->asArray();
+        $twig->Faculties = Model_Faculties::factory()->common()->asArray();
         $twig->UploadingResult = $result;
         $twig->User = $this->UserInfo;
         $this->response->body($twig);

~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 = DataArray::factory('Faculties')->common()->asArray();
+        $twig->Faculties = Model_Faculties::factory()->common()->asArray();
         $twig->UploadingResult = $result;
         $twig->User = $this->UserInfo;
         $this->response->body($twig);

~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 = DataArray::factory('Faculties')->common()->asArray();
+        $twig->Faculties = Model_Faculties::factory()->common()->asArray();
         $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 = DataArray::factory('Faculties')->common()->asArray();
+        $twig->Faculties = Model_Faculties::factory()->common()->asArray();
         $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 = DataArray::factory('Faculties')->common()->asArray();
+        $twig->Faculties = Model_Faculties::factory()->common()->asArray();
         $twig->UploadingResult = $result;
         $twig->User = $this->UserInfo;
         $this->response->body($twig);

~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 = DataArray::factory('Faculties')->common()->asArray();
+        $twig->FacultiesList = Model_Faculties::factory()->common()->asArray();
         $twig->SubjectsList = Model_Subjects::factory()->byFaculty($this->UserInfo['FacultyID'])->asArray();
         $twig->GradesList = Model_Grades::factory()->common()->asArray();
         $this->response->body($twig);
@@ -22,7 +22,7 @@ class Controller_Teacher_Discipline extends Controller_UserEnvi {
         
         $twig->User = $this->UserInfo;
 
-        //$twig->FacultiesList = DataArray::factory('Faculties')->common()->asArray();
+        //$twig->FacultiesList = Model_Faculties::factory()->common()->asArray();
         $twig->Discipline = $this->GetDisciplineInfo($db, $id);
         $twig->SubjectsList = Model_Subjects::factory()->byFaculty($this->UserInfo['FacultyID'])->asArray();
         $twig->GradesList = Model_Grades::factory()->common()->asArray();
@@ -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::factory()->forDiscipline($id)->asArray();
-        $twig->FacultiesList = DataArray::factory('Faculties')->common()->asArray();
+        $twig->FacultiesList = Model_Faculties::factory()->common()->asArray();
         $twig->Departments = DataArray::factory('Departments')->byFaculty($this->UserInfo['FacultyID'])->asArray();
         
         $this->response->body($twig);

~dev_rating/application/classes/DataArr/Faculties.php

 <?php
 
+/** @deprecated use Model_Faculties instead. */
 class DataArr_Faculties {
     protected $model;
     
     public function __construct() {
         $this->model = new Model_DataArr_Faculties;
     }
-    
+
+	/** @deprecated */
 	public function common() {
 		$list = $this->model->GetFaculties();
 		
@@ -22,5 +24,5 @@ class DataArr_Faculties {
 		return new DataArray_Result($FacList);
 	}
 
-    // TODO: Метод для получения факультетов
+    // Метод для получения факультетов
 }
\ No newline at end of file

~dev_rating/application/classes/Model/DataArr/Faculties.php

 <?php defined('SYSPATH') or die('No direct script access.');
-  
+
+/** @deprecated use Model_Faculties instead. */
 class Model_DataArr_Faculties extends Model
 {
+    /** @deprecated */
     public function getFaculties()
     {
         $sql = "CALL `GetFaculties`(); ";

~dev_rating/application/classes/Model/Faculties.php

+<?php defined('SYSPATH') or die('No direct script access.');
+
+class Model_Faculties extends Model
+{
+    public static function factory() {
+        return new self();
+    }
+
+    public function getFaculties() {
+        $sql = "CALL `GetFaculties`(); ";
+        return DB::query(Database::SELECT, $sql)->execute();
+    }
+
+    public function common() {
+        $list = $this->GetFaculties();
+
+        $FacList = array();
+        foreach ($list as $row)
+            $FacList = $row;
+
+        return new DataArray_Result($FacList);
+    }
+
+    // TODO Метод для получения факультетов
+}